From c4a48600bf1441fdba94cee09402663763bee895 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 29 Apr 2017 23:12:20 +0200
Subject: [PATCH 0001/1490] virtualbox: 5.1.18 -> 5.1.22

---
 pkgs/applications/virtualization/virtualbox/default.nix  | 9 ++++-----
 .../virtualbox/guest-additions/default.nix               | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6c49e95b6b9..6f7ab711541 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -17,11 +17,10 @@ with stdenv.lib;
 let
   python = python2;
   buildType = "release";
-
-  extpack = "996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd";
-  extpackRev = "114002";
-  main = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9";
-  version = "5.1.18";
+  extpack = "244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf";
+  extpackRev = "115126";
+  main = "fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899";
+  version = "5.1.22";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index df59f3e0e2e..101233589b7 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a";
+    sha256 = "54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
@@ -139,7 +139,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Guest additions for VirtualBox";
-    longDescriptions = ''
+    longDescription = ''
       Various add-ons which makes NixOS work better as guest OS inside VirtualBox.
       This add-on provides support for dynamic resizing of the X Display, shared
       host/guest clipboard support and guest OpenGL support.
-- 
GitLab


From 42e179667e4f00d696bcb400e211d59178cc2e4d Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 2 May 2017 10:18:04 +0000
Subject: [PATCH 0002/1490] far2l: add .desktop file

---
 pkgs/applications/misc/far2l/default.nix | 30 +++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index de22e08c705..0e6d6f49b95 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
-  xdg_utils, xterm, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz }:
+  xdg_utils, xterm, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
 
 stdenv.mkDerivation rec {
-  rev = "c2f2b89db31b1c3cb9bed53267873f4cd7bc996d";
-  build = "2017-03-18-${builtins.substring 0 10 rev}";
+  rev = "94b09a84db803a2e7071094e7fa776948c6a64f2";
+  build = "2017-04-05-${builtins.substring 0 10 rev}";
   name = "far2l-2.1.${build}";
 
   src = fetchFromGitHub {
     owner = "elfmz";
     repo = "far2l";
     rev = rev;
-    sha256 = "1172ajg4n8g4ag14b6nb9lclwh2r6v7ccndmvhnj066w35ixnqgb";
+    sha256 = "05yaynwn88m1vv15ww50rasjwhcrfgkha4z51qmm2v06638kbxhl";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper ];
+  nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
 
   buildInputs = [ wxGTK30 glib pcre ];
 
@@ -41,12 +41,20 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/{bin,share}
-    rm install/{far2l_askpass,far2l_sudoapp}
-    mv install/far2l $out/bin/far2l
-    mv install $out/share/far2l
-    ln -s -r $out/bin/far2l $out/share/far2l/far2l_askpass
-    ln -s -r $out/bin/far2l $out/share/far2l/far2l_sudoapp
+    mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/scalable/apps
+    cp -dpR install $out/share/far2l
+    mv $out/share/far2l/far2l $out/bin/
+    ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_askpass
+    ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_sudoapp
+
+    sed "s,/usr/bin/,$out/bin/," ../far2l/DE/far2l.desktop > $out/share/applications/far2l.desktop
+
+    cp ../far2l/DE/icons/hicolor/1024x1024/apps/far2l.svg $out/share/icons/hicolor/scalable/apps/
+    convert -size 128x128 ../far2l/DE/icons/far2l.svg $out/share/icons/far2l.png
+    for size in 16x16 24x24 32x32 48x48 64x64 72x72 96x96 128x128 192x192 256x256 512x512 1024x1024; do
+      mkdir -p $out/share/icons/hicolor/$size/apps
+      convert -size $size ../far2l/DE/icons/hicolor/$size/apps/far2l.svg $out/share/icons/hicolor/$size/apps/far2l.png
+    done
   '';
 
   stripDebugList = "bin share";
-- 
GitLab


From 7680f83f9d586ee9b6e984de9f77a3bfefcd3b01 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Mon, 1 May 2017 16:14:25 -0400
Subject: [PATCH 0003/1490] draftsight: init at 2017-SP1

DraftSight is "a professional-grade 2D design and drafting solution
that lets you create, edit, view and markup any kind of 2D drawing."
It is available as a binary .deb package for Linux. This package jumps
through the necessary hoops to make it run properly.
---
 .../graphics/draftsight/default.nix           | 76 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/applications/graphics/draftsight/default.nix

diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
new file mode 100644
index 00000000000..a1cf91989eb
--- /dev/null
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -0,0 +1,76 @@
+{ stdenv, requireFile, dpkg, makeWrapper, gcc, mesa, xdg_utils,
+  dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
+  xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc,
+  libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
+  libXrender, libXcomposite }:
+
+assert stdenv.system == "x86_64-linux";
+
+let version = "2017-SP1"; in
+stdenv.mkDerivation {
+  name = "draftsight-${version}";
+
+  nativeBuildInputs = [ dpkg makeWrapper ];
+
+  unpackPhase = ''
+    mkdir $out
+    mkdir $out/draftsight
+    dpkg -x $src $out/draftsight
+  '';
+
+  # Both executables and bundled libraries need patching to find their
+  # dependencies.  The makeWrapper & QT_XKB_CONFIG_ROOT is to
+  # alleviate "xkbcommon: ERROR: failed to add default include path
+  # /usr/share/X11/xkb" and "Qt: Failed to create XKB context!".
+  installPhase = ''
+    mkdir $out/bin
+    for exe in DraftSight dsHttpApiController dsHttpApiService FxCrashRptApp HelpGuide; do
+      echo "Patching $exe..."
+      patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+               --set-rpath $libPath:\$ORIGIN/../Libraries \
+               $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe
+      makeWrapper $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe \
+          $out/bin/$exe \
+          --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
+    done
+    for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so; do
+      # DraftSight ships with broken symlinks for some reason
+      if [ -f $(readlink -f $lib) ]
+      then
+        echo "Patching $lib..."
+        patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib
+      else
+        echo "Ignoring broken link $lib"
+      fi
+    done
+  '';
+
+  # TODO: Figure out why HelpGuide segfaults at startup.
+
+  # This must be here for main window graphics to appear (without it
+  # it also gives the error: "QXcbIntegration: Cannot create platform
+  # OpenGL context, neither GLX nor EGL are enabled"). My guess is
+  # that it dlopen()'s libraries in paths removed by shrinking RPATH.
+  dontPatchELF = true;
+
+  src = requireFile {
+    name = "draftSight.deb";
+    url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0";
+    sha256 = "0s7b74685r0961kd59hxpdp9s5yhvzx8307imsxm66f99s8rswdv";
+  };
+
+  libPath = stdenv.lib.makeLibraryPath [ gcc.cc mesa xdg_utils
+    dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
+    xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11
+    libXcursor libXrandr libxcb libXi libSM libICE libXrender
+    libXcomposite ];
+
+  meta = with stdenv.lib; {
+    description = "2D design & drafting application, meant to be similar to AutoCAD";
+    longDescription = "Professional-grade 2D design and drafting solution from Dassault Systèmes that lets you create, edit, view and mark up any kind of 2D CAD drawing.";
+    homepage = https://www.3ds.com/products-services/draftsight-cad-software/;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = with maintainers; [ hodapp ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8692977cec2..1bda587b51e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13385,6 +13385,8 @@ with pkgs;
 
   doodle = callPackage ../applications/search/doodle { };
 
+  draftsight = callPackage ../applications/graphics/draftsight { };
+  
   droopy = callPackage ../applications/networking/droopy {
     inherit (python3Packages) wrapPython;
   };
-- 
GitLab


From c780d1a157ac885d07d1cc27c3de69a051328630 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 4 May 2017 22:34:11 +0000
Subject: [PATCH 0004/1490] far2l: no need to fix xterm's path, it is used only
 when xterm is on $PATH

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

diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 0e6d6f49b95..105f3448600 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
-  xdg_utils, xterm, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
+  xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
 
 stdenv.mkDerivation rec {
   rev = "94b09a84db803a2e7071094e7fa776948c6a64f2";
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
     substituteInPlace far2l/bootstrap/open.sh              \
       --replace 'gvfs-trash'  '${gvfs}/bin/gvfs-trash'
     substituteInPlace far2l/bootstrap/open.sh              \
-      --replace 'xdg-open'    '${xdg_utils}/bin/xdg-open'  \
-      --replace 'xterm'       '${xterm}/bin/xterm'
+      --replace 'xdg-open'    '${xdg_utils}/bin/xdg-open'
     substituteInPlace far2l/vtcompletor.cpp                \
       --replace '"/bin/bash"' '"${bash}/bin/bash"'
     substituteInPlace multiarc/src/formats/zip/zip.cpp     \
-- 
GitLab


From e905cf95bbe7d627f7292bfc4de2dc6a4a5aa626 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 9 May 2017 15:20:54 +0000
Subject: [PATCH 0005/1490] far2l: VT: support 'keypad' switching (fix
 https://github.com/elfmz/far2l/issues/273)

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

diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 105f3448600..87709ec102b 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -2,15 +2,15 @@
   xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
 
 stdenv.mkDerivation rec {
-  rev = "94b09a84db803a2e7071094e7fa776948c6a64f2";
-  build = "2017-04-05-${builtins.substring 0 10 rev}";
+  rev = "ab240373f69824c56e9255d452b689cff3b1ecfb";
+  build = "2017-05-09-${builtins.substring 0 10 rev}";
   name = "far2l-2.1.${build}";
 
   src = fetchFromGitHub {
     owner = "elfmz";
     repo = "far2l";
     rev = rev;
-    sha256 = "05yaynwn88m1vv15ww50rasjwhcrfgkha4z51qmm2v06638kbxhl";
+    sha256 = "1b6w6xhja3xkfzhrdy8a8qpbhxws75khm1zhwz8sc8la9ykd541q";
   };
 
   nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
-- 
GitLab


From d25bf8e72fe70142f66fa9144842000b756b88cf Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Thu, 11 May 2017 12:09:41 +0200
Subject: [PATCH 0006/1490] elasticsearch service: remove postStart script

---
 nixos/modules/services/search/elasticsearch.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 574f74d547a..35dae1747ac 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -148,11 +148,6 @@ in {
         ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules
         if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
       '';
-      postStart = mkBefore ''
-        until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do
-          sleep 1
-        done
-      '';
     };
 
     environment.systemPackages = [ cfg.package ];
-- 
GitLab


From 3775a9070193de40c36e65ef065dfeb9efb90b19 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Sat, 13 May 2017 21:08:43 +0200
Subject: [PATCH 0007/1490] gimp: 2.8.20 -> 2.8.22

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

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 8c430435dd7..47004a02500 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -8,7 +8,7 @@ let
   inherit (python2Packages) pygtk wrapPython python;
 in stdenv.mkDerivation rec {
   name = "gimp-${version}";
-  version = "2.8.20";
+  version = "2.8.22";
 
   # This declarations for `gimp-with-plugins` wrapper,
   # (used for determining $out/lib/gimp/${majorVersion}/ paths)
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    sha256 = "939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805";
+    sha256 = "12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi";
   };
 
   buildInputs =
-- 
GitLab


From 2f7152f997feca9261a67fd9368dc3547d676c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 11 May 2017 16:53:23 +0200
Subject: [PATCH 0008/1490] glusterfs: Remove no longer needed subsitutions of
 DESTDIR.

They were made unnecessary in commit d07154b3bc8, which added
`makeFlags = "DESTDIR=$(out)";`.
---
 pkgs/tools/filesystems/glusterfs/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 4689207e835..0eeff408d07 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -36,14 +36,6 @@ rec {
 
   makeFlags = "DESTDIR=$(out)";
 
-  preInstall = ''
-    substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out
-    substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out
-    substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out
-    substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out
-    substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out
-    '';
-
   postInstall = ''
     cp -r $out/$out/* $out
     rm -r $out/nix
-- 
GitLab


From 833acf9ff1aad07193c405e934d8c4982a45837f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 14 May 2017 19:18:07 +0200
Subject: [PATCH 0009/1490] glusterfs: Use github instead of
 download.gluster.org to obtain source.

This is because the source tarball available on
  https://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.1/glusterfs-3.10.1.tar.gz
has different contents than the v3.10.1 tag;
for example, it lacks the file `xlators/features/ganesha/src/Makefile.am`,
which the tag has.
This is because GluserFS's release process removes some unused files.

This made impossible to apply patches written by or for upstream, as those
are written against what's in upstream's git.

As a nice side effect, we no longer have to hardcode the "3.10" in the
`3.10/${version}` part of the URL.
---
 pkgs/tools/filesystems/glusterfs/default.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 0eeff408d07..6d6f0f3b1c8 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -2,14 +2,14 @@
  autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
  , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which
 }:
-let 
+let
   s =
   rec {
     baseName="glusterfs";
     version = "3.10.1";
     name="${baseName}-${version}";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.10/${version}/glusterfs-${version}.tar.gz";
-    sha256 = "05qmn85lg3d1gz0fhn1v2z7nwl2qwbflvjc8nvkfyr4r57rkvhnk";
+    url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
+    sha256 = "0gmb3m98djljcycjggi1qv99ai6k4cvn2rqym2q9f58q8n8kdhh7";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python2 ncurses readline
@@ -26,7 +26,17 @@ rec {
   inherit (s) name version;
   inherit buildInputs propagatedBuildInputs;
 
-  preConfigure = ''
+   # Note that the VERSION file is something that is present in release tarballs
+   # but not in git tags (at least not as of writing in v3.10.1).
+   # That's why we have to create it.
+   # Without this, gluster (at least 3.10.1) will fail very late and cryptically,
+   # for example when setting up geo-replication, with a message like
+   #   Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume.
+   # What happens here is that the gverify.sh script tries to compare the versions,
+   # but fails when the version is empty.
+   # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705
+   preConfigure = ''
+     echo "v${s.version}" > VERSION
     ./autogen.sh
     '';
 
@@ -52,7 +62,7 @@ rec {
     maintainers = [
       stdenv.lib.maintainers.raskin
     ];
-    platforms = with stdenv.lib.platforms; 
+    platforms = with stdenv.lib.platforms;
       linux ++ freebsd;
   };
 }
-- 
GitLab


From 85f6ff48e1eea58fc728c4ffe4f35afe2a2e18b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 11 May 2017 16:56:07 +0200
Subject: [PATCH 0010/1490] glusterfs: Make commands that gluster calls work.
 Fixes #25620.

Done by setting PATH and PYTHONPATH appropriately.

Adds the following patches:

* One that removes hardcodes to /sbin, /usr/bin, etc.
  from gluster, so that programs like `lvm` and `xfs_info` can be
  called at runtime; see https://bugzilla.redhat.com/show_bug.cgi?id=1450546.
* One that fixes unsubstituted autoconf macros in paths (a problem
  in the 3.10 release); see https://bugzilla.redhat.com/show_bug.cgi?id=1450588.
* One that removes uses of the `find_library()` Python function that does
  not behave as expected in Python < 3.6 (and would not behave correctly
  even on 3.6 in nixpkgs due to #25763);
  see https://bugzilla.redhat.com/show_bug.cgi?id=1450593.

I think that all of these patches should be upstreamed.

Also adds tests to check that none of the Python based utilities
throw import errors, calling `--help` or equivalent on them.
---
 pkgs/tools/filesystems/glusterfs/default.nix  | 119 ++++++++-
 ...fs-fix-unsubstituted-autoconf-macros.patch | 236 ++++++++++++++++++
 ...glusterfs-python-remove-find_library.patch | 151 +++++++++++
 ...sterfs-use-PATH-instead-of-hardcodes.patch | 160 ++++++++++++
 4 files changed, 662 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch
 create mode 100644 pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
 create mode 100644 pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 6d6f0f3b1c8..de36606678a 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,31 +1,76 @@
 {stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,
- autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
- , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which
+ autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
+ liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, python2Packages,
+ openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
+ rsync, glibc
 }:
 let
   s =
   rec {
     baseName="glusterfs";
+    # NOTE: On each glusterfs release, it should be checked if gluster added
+    #       new, or changed, Python scripts whose PYTHONPATH has to be set in
+    #       `postFixup` below, and whose runtime deps need to go into
+    #       `nativeBuildInputs`.
+    #       The command
+    #         find /nix/store/...-glusterfs-.../ -name '*.py' -executable
+    #       can help with finding new Python scripts.
     version = "3.10.1";
     name="${baseName}-${version}";
     url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
     sha256 = "0gmb3m98djljcycjggi1qv99ai6k4cvn2rqym2q9f58q8n8kdhh7";
   };
   buildInputs = [
-    fuse bison flex_2_5_35 openssl python2 ncurses readline
+    fuse bison flex_2_5_35 openssl ncurses readline
     autoconf automake libtool pkgconfig zlib libaio libxml2
     acl sqlite liburcu attr makeWrapper
+    (python2.withPackages (pkgs: [
+      pkgs.flask
+      pkgs.prettytable
+      pkgs.requests
+      pkgs.xattr
+    ]))
+    # NOTE: `python2` has to be *AFTER* the above `python2.withPackages`,
+    #       to ensure that the packages are available but the `toPythonPath`
+    #       shell function used in `postFixup` is also still available.
+    python2
   ];
   # Some of the headers reference acl
   propagatedBuildInputs = [
     acl
   ];
+  # Packages from which GlusterFS calls binaries at run-time from PATH,
+  # with comments on which commands are known to be called by it.
+  runtimePATHdeps = [
+    attr # getfattr setfattr
+    btrfs-progs # btrfs
+    coreutils # lots of commands in bash scripts
+    e2fsprogs # tune2fs
+    findutils # find
+    gawk # awk
+    glibc # getent
+    gnugrep # grep
+    gnused # sed
+    lvm2 # lvs
+    openssh # ssh
+    rsync # rsync, e.g. for geo-replication
+    systemd # systemctl
+    utillinux # mount umount
+    which # which
+    xfsprogs # xfs_info
+  ];
 in
 stdenv.mkDerivation
 rec {
   inherit (s) name version;
   inherit buildInputs propagatedBuildInputs;
 
+  patches = [
+    ./glusterfs-use-PATH-instead-of-hardcodes.patch
+    ./glusterfs-fix-unsubstituted-autoconf-macros.patch
+    ./glusterfs-python-remove-find_library.patch
+  ];
+
    # Note that the VERSION file is something that is present in release tarballs
    # but not in git tags (at least not as of writing in v3.10.1).
    # That's why we have to create it.
@@ -49,7 +94,73 @@ rec {
   postInstall = ''
     cp -r $out/$out/* $out
     rm -r $out/nix
-    wrapProgram $out/sbin/mount.glusterfs --set PATH "${stdenv.lib.makeBinPath [ coreutils gnused attr gnugrep which]}"
+    '';
+
+  postFixup = ''
+    # glusterd invokes `gluster` and other utilities when telling other glusterd nodes to run commands.
+    # For example for `peer_georep-sshkey` key generation, so `$out/bin` is needed in the PATH.
+    # It also invokes bash scripts like `gverify.sh`.
+    # It also invokes executable Python scripts in `$out/libexec/glusterfs`, which is why we set up PYTHONPATH accordingly.
+    # We set up the paths for the main entry point executables.
+
+    GLUSTER_PATH="${stdenv.lib.makeBinPath runtimePATHdeps}:$out/bin"
+    GLUSTER_PYTHONPATH="$(toPythonPath $out):$out/libexec/glusterfs"
+    GLUSTER_LD_LIBRARY_PATH="$out/lib"
+
+    wrapProgram $out/bin/glusterd --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+    wrapProgram $out/bin/gluster --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+    wrapProgram $out/sbin/mount.glusterfs --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+
+    # Set Python environment for the Python based utilities.
+    # It would be nice if there was a better way to do this, automatically for all of them.
+    # Also, this is brittle: If we forget a dependency or gluster adds a new one, things will break deep inside gluster.
+    # We should better try to get an explicit list of Python dependencies from gluster and ensure all of them are in the PYTHONPATH of all these python scripts.
+    # But at the time of writing (gluster 3.10), gluster only provides this in form of a gluster.spec file for RPM creation,
+    # and even that one is not complete (for example it doesn't mention the `flask` dependency).
+
+    wrapProgram $out/bin/gluster-eventsapi --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+    wrapProgram $out/bin/gluster-georep-sshkey --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+    wrapProgram $out/bin/gluster-mountbroker --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+    wrapProgram $out/bin/glusterfind --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+
+    # Note that we only wrap the symlinks in $out/bin, not the actual executable scripts in $out/libexec/glusterfs.
+    # This is because those scripts use `__file__` in their program logic
+    # (see https://github.com/gluster/glusterfs/blob/v3.10.1/extras/cliutils/cliutils.py#L116)
+    # which would break if we changed the file name (which is what `wrapProgram` does).
+    # Luckily, `libexec` scripts are never supposed to be invoked straight from PATH,
+    # instead they are invoked directly from `gluster` or `glusterd`, which is why it is
+    # sufficient to set PYTHONPATH for those executables.
+
+    wrapProgram $out/share/glusterfs/scripts/eventsdash.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+    '';
+
+  doInstallCheck = true;
+
+  # Below we run Python programs. That generates .pyc/.pyo files.
+  # By default they are indeterministic because such files contain time stamps
+  # (see https://nedbatchelder.com/blog/200804/the_structure_of_pyc_files.html).
+  # So we use the same environment variables as in
+  #   https://github.com/NixOS/nixpkgs/blob/249b34aadca7038207492f29142a3456d0cecec3/pkgs/development/interpreters/python/mk-python-derivation.nix#L61
+  # to make these files deterministic.
+  # A general solution to this problem might be brought by #25707.
+  DETERMINISTIC_BUILD = 1;
+  PYTHONHASHSEED = 0;
+
+  installCheckPhase = ''
+    # Tests that the above programs work without import errors.
+    # For testing it manually in a shell you may want to substitute `$out` with `$(dirname $(readlink -f $(which gluster)))/../`.
+    $out/bin/glusterd --help
+    # $out/bin/gluster help # can't do this because even `gluster help` tries to write to `/var/log/glusterfs/cli.log`
+    $out/bin/gluster-eventsapi --help
+    $out/bin/gluster-georep-sshkey --help
+    $out/bin/gluster-mountbroker --help
+    $out/bin/glusterfind --help
+    # gfid_to_path.py doesn't accept --help, and it requires different arguments
+    # (a dir as single argument) than the usage prints when stdin is not a TTY.
+    # The `echo ""` is just so that stdin is not a TTY even if you try this line
+    # on a real TTY for testing purposes.
+    echo "" | (mkdir -p nix-test-dir-for-gfid_to_path && touch b && $out/libexec/glusterfs/gfind_missing_files/gfid_to_path.py nix-test-dir-for-gfid_to_path)
+    $out/share/glusterfs/scripts/eventsdash.py --help
     '';
 
   src = fetchurl {
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch
new file mode 100644
index 00000000000..de3c2fa9f62
--- /dev/null
+++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch
@@ -0,0 +1,236 @@
+From b37e0222a6a60505868a6fbb8591608cdc4bba57 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
+Date: Sat, 13 May 2017 15:33:27 +0200
+Subject: [PATCH] Revert "build/packaging: Debian and Ubuntu don't have
+ /usr/libexec". Fixes #1450588
+
+This reverts commit 18509e436f8a728ef522f3e76e2f2dc30e1bd8ac.
+
+This fixes autoconf unsubstituted strings to appear in generated source code.
+---
+ cli/src/Makefile.am                      |  2 +-
+ configure.ac                             | 12 ++++++------
+ events/src/Makefile.am                   |  8 ++++----
+ extras/Makefile.am                       |  2 +-
+ geo-replication/src/Makefile.am          |  8 ++++----
+ geo-replication/syncdaemon/Makefile.am   |  2 +-
+ tools/gfind_missing_files/Makefile.am    |  4 ++--
+ tools/glusterfind/Makefile.am            |  4 ++--
+ tools/glusterfind/src/Makefile.am        |  2 +-
+ xlators/features/ganesha/src/Makefile.am |  2 +-
+ xlators/mgmt/glusterd/src/Makefile.am    |  2 +-
+ 11 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
+index 5ef9389..f5b8d00 100644
+--- a/cli/src/Makefile.am
++++ b/cli/src/Makefile.am
+@@ -18,7 +18,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \
+ 	-I$(top_builddir)/rpc/xdr/src\
+ 	-DDATADIR=\"$(localstatedir)\" \
+ 	-DCONFDIR=\"$(sysconfdir)/glusterfs\" \
+-	-DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\
++	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
+ 	-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\
+ 	$(XML_CPPFLAGS)
+ 
+diff --git a/configure.ac b/configure.ac
+index c9742e2..0c3a386 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1056,24 +1056,24 @@ old_prefix=$prefix
+ if test "x$prefix" = xNONE; then
+ 	prefix=$ac_default_prefix
+ fi
+-GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs"
+-GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd"
++GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs"
++GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd"
+ prefix=$old_prefix
+ 
+ ### Dirty hacky stuff to make LOCALSTATEDIR work
+ if test "x$prefix" = xNONE; then
+-   test $localstatedir = '$prefix/var' && localstatedir=$ac_default_prefix/var
++   test $localstatedir = '${prefix}/var' && localstatedir=$ac_default_prefix/var
+    localstatedir=/var
+-   LOCALSTATEDIR=$localstatedir
++   LOCALSTATEDIR=$(eval echo ${localstatedir})
+ else
+-   LOCALSTATEDIR=$localstatedir
++   LOCALSTATEDIR=$(eval echo ${localstatedir})
+ fi
+ 
+ old_prefix=$prefix
+ if test "x$prefix" = xNONE; then
+     prefix=$ac_default_prefix
+ fi
+-GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol"
++GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol"
+ prefix=$old_prefix
+ 
+ 
+diff --git a/events/src/Makefile.am b/events/src/Makefile.am
+index 8493abd..87282c6 100644
+--- a/events/src/Makefile.am
++++ b/events/src/Makefile.am
+@@ -5,7 +5,7 @@ EXTRA_DIST = glustereventsd.py __init__.py  eventsapiconf.py.in \
+ BUILT_SOURCES = eventtypes.py
+ CLEANFILES = eventtypes.py
+ 
+-eventsdir = $(GLUSTERFS_LIBEXECDIR)/events
++eventsdir = $(libexecdir)/glusterfs/events
+ events_PYTHON = __init__.py gf_event.py eventsapiconf.py eventtypes.py \
+ 	utils.py
+ 
+@@ -13,7 +13,7 @@ eventtypes.py: $(top_srcdir)/events/eventskeygen.py
+ 	$(PYTHON) $(top_srcdir)/events/eventskeygen.py PY_HEADER
+ 
+ if BUILD_EVENTS
+-eventspeerscriptdir = $(GLUSTERFS_LIBEXECDIR)
++eventspeerscriptdir = $(libexecdir)/glusterfs
+ eventsconfdir = $(sysconfdir)/glusterfs
+ eventsconf_DATA = eventsconfig.json
+ 
+@@ -24,10 +24,10 @@ eventspeerscript_SCRIPTS = peer_eventsapi.py
+ install-exec-hook:
+ 	$(mkdir_p) $(DESTDIR)$(sbindir)
+ 	rm -f $(DESTDIR)$(sbindir)/glustereventsd
+-	ln -s $(GLUSTERFS_LIBEXECDIR)/events/glustereventsd.py \
++	ln -s $(libexecdir)/glusterfs/events/glustereventsd.py \
+ 		$(DESTDIR)$(sbindir)/glustereventsd
+ 	rm -f $(DESTDIR)$(sbindir)/gluster-eventsapi
+-	ln -s $(GLUSTERFS_LIBEXECDIR)/peer_eventsapi.py \
++	ln -s $(libexecdir)/glusterfs/peer_eventsapi.py \
+ 		$(DESTDIR)$(sbindir)/gluster-eventsapi
+ 
+ uninstall-hook:
+diff --git a/extras/Makefile.am b/extras/Makefile.am
+index 9dfc93d..53ac476 100644
+--- a/extras/Makefile.am
++++ b/extras/Makefile.am
+@@ -1,4 +1,4 @@
+-addonexecdir = $(GLUSTERFS_LIBEXECDIR)
++addonexecdir = $(libexecdir)/glusterfs
+ addonexec_SCRIPTS = peer_add_secret_pub
+ 
+ EditorModedir = $(docdir)
+diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am
+index 9937a0b..87435d5 100644
+--- a/geo-replication/src/Makefile.am
++++ b/geo-replication/src/Makefile.am
+@@ -1,4 +1,4 @@
+-gsyncddir = $(GLUSTERFS_LIBEXECDIR)
++gsyncddir = $(libexecdir)/glusterfs
+ 
+ gsyncd_SCRIPTS = gverify.sh peer_gsec_create \
+ 	set_geo_rep_pem_keys.sh peer_mountbroker peer_mountbroker.py \
+@@ -21,7 +21,7 @@ noinst_HEADERS = procdiggy.h
+ 
+ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+ 	-I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \
+-	-DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \
++	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" -DUSE_LIBGLUSTERFS \
+ 	-DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\"
+ 
+ AM_CFLAGS = -Wall $(GF_CFLAGS)
+@@ -35,11 +35,11 @@ $(top_builddir)/libglusterfs/src/libglusterfs.la:
+ install-exec-hook:
+ 	$(mkdir_p) $(DESTDIR)$(sbindir)
+ 	rm -f $(DESTDIR)$(sbindir)/gluster-mountbroker
+-	ln -s $(GLUSTERFS_LIBEXECDIR)/peer_mountbroker.py \
++	ln -s $(libexecdir)/glusterfs/peer_mountbroker.py \
+ 		$(DESTDIR)$(sbindir)/gluster-mountbroker
+ 
+ 	rm -f $(DESTDIR)$(sbindir)/gluster-georep-sshkey
+-	ln -s $(GLUSTERFS_LIBEXECDIR)/peer_georep-sshkey.py \
++	ln -s $(libexecdir)/glusterfs/peer_georep-sshkey.py \
+ 		$(DESTDIR)$(sbindir)/gluster-georep-sshkey
+ 
+ 
+diff --git a/geo-replication/syncdaemon/Makefile.am b/geo-replication/syncdaemon/Makefile.am
+index f80fb26..7cdaf45 100644
+--- a/geo-replication/syncdaemon/Makefile.am
++++ b/geo-replication/syncdaemon/Makefile.am
+@@ -1,4 +1,4 @@
+-syncdaemondir = $(GLUSTERFS_LIBEXECDIR)/python/syncdaemon
++syncdaemondir = $(libexecdir)/glusterfs/python/syncdaemon
+ 
+ syncdaemon_PYTHON = gconf.py gsyncd.py __init__.py master.py README.md repce.py \
+ 	resource.py configinterface.py syncdutils.py monitor.py libcxattr.py \
+diff --git a/tools/gfind_missing_files/Makefile.am b/tools/gfind_missing_files/Makefile.am
+index f77f789..043c34c 100644
+--- a/tools/gfind_missing_files/Makefile.am
++++ b/tools/gfind_missing_files/Makefile.am
+@@ -1,4 +1,4 @@
+-gfindmissingfilesdir = $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files
++gfindmissingfilesdir = $(libexecdir)/glusterfs/gfind_missing_files
+ 
+ gfindmissingfiles_SCRIPTS = gfind_missing_files.sh gfid_to_path.sh \
+ 	gfid_to_path.py
+@@ -21,6 +21,6 @@ uninstall-local:
+ 
+ install-data-local:
+ 	rm -f $(DESTDIR)$(sbindir)/gfind_missing_files
+-	ln -s $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files
++	ln -s $(libexecdir)/glusterfs/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files
+ 
+ CLEANFILES =
+diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am
+index 92fa614..37f23be 100644
+--- a/tools/glusterfind/Makefile.am
++++ b/tools/glusterfind/Makefile.am
+@@ -6,7 +6,7 @@ bin_SCRIPTS = glusterfind
+ 
+ CLEANFILES = $(bin_SCRIPTS)
+ 
+-deletehookscriptsdir = $(GLUSTERFS_LIBEXECDIR)/glusterfind/
++deletehookscriptsdir = $(libexecdir)/glusterfs/glusterfind/
+ deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py
+ 
+ uninstall-local:
+@@ -16,5 +16,5 @@ install-data-local:
+ 	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys
+ 	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/
+ 	rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post
+-	ln -s $(GLUSTERFS_LIBEXECDIR)/glusterfind/S57glusterfind-delete-post.py \
++	ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \
+ 		$(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post
+diff --git a/tools/glusterfind/src/Makefile.am b/tools/glusterfind/src/Makefile.am
+index e4469c1..541ff94 100644
+--- a/tools/glusterfind/src/Makefile.am
++++ b/tools/glusterfind/src/Makefile.am
+@@ -1,4 +1,4 @@
+-glusterfinddir = $(GLUSTERFS_LIBEXECDIR)/glusterfind
++glusterfinddir = $(libexecdir)/glusterfs/glusterfind
+ 
+ glusterfind_PYTHON = conf.py utils.py __init__.py \
+ 	main.py libgfchangelog.py changelogdata.py
+diff --git a/xlators/features/ganesha/src/Makefile.am b/xlators/features/ganesha/src/Makefile.am
+index 78715d6..54cfcb3 100644
+--- a/xlators/features/ganesha/src/Makefile.am
++++ b/xlators/features/ganesha/src/Makefile.am
+@@ -12,7 +12,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+ 	-fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\
+ 	-I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \
+ 	-DGANESHA_DIR=\"$(sysconfdir)/ganesha\" \
+-	-DGYSNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"
++	-DGYSNCD_PREFIX=\"$(libexecdir)/glusterfs\"
+ 
+ AM_CFLAGS = -Wall $(GF_CFLAGS)
+ 
+diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
+index 23ebf37..4f2fffd 100644
+--- a/xlators/mgmt/glusterd/src/Makefile.am
++++ b/xlators/mgmt/glusterd/src/Makefile.am
+@@ -47,7 +47,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+ 	-I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/rpc-lib/src \
+ 	-I$(CONTRIBDIR)/mount -I$(CONTRIBDIR)/userspace-rcu \
+ 	-DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \
+-	-DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" \
++	-DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \
+ 	-DCONFDIR=\"$(localstatedir)/run/gluster/shared_storage/nfs-ganesha\" \
+ 	-DGANESHA_PREFIX=\"$(libexecdir)/ganesha\" \
+ 	-DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS)
+-- 
+2.7.4
+
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
new file mode 100644
index 00000000000..6dd1baad5df
--- /dev/null
+++ b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
@@ -0,0 +1,151 @@
+From d321df349d10f038f0c89b9c11f8059572264f1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
+Date: Sat, 13 May 2017 18:54:36 +0200
+Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593
+
+`find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6.
+---
+ api/examples/getvolfile.py                                     |  2 +-
+ geo-replication/syncdaemon/libcxattr.py                        |  3 +--
+ geo-replication/syncdaemon/libgfchangelog.py                   |  3 +--
+ tests/features/ipctest.py                                      | 10 ++--------
+ tests/utils/libcxattr.py                                       |  5 ++---
+ tools/glusterfind/src/libgfchangelog.py                        |  3 +--
+ .../features/changelog/lib/examples/python/libgfchangelog.py   |  3 +--
+ 7 files changed, 9 insertions(+), 20 deletions(-)
+
+diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py
+index 0c95213..32c2268 100755
+--- a/api/examples/getvolfile.py
++++ b/api/examples/getvolfile.py
+@@ -3,7 +3,7 @@
+ import ctypes
+ import ctypes.util
+ 
+-api = ctypes.CDLL(ctypes.util.find_library("gfapi"))
++api = ctypes.CDLL("libgfapi.so")
+ api.glfs_get_volfile.argtypes = [ctypes.c_void_p,
+                                  ctypes.c_void_p,
+                                  ctypes.c_ulong]
+diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py
+index 3671e10..f576648 100644
+--- a/geo-replication/syncdaemon/libcxattr.py
++++ b/geo-replication/syncdaemon/libcxattr.py
+@@ -10,7 +10,6 @@
+ 
+ import os
+ from ctypes import CDLL, create_string_buffer, get_errno
+-from ctypes.util import find_library
+ 
+ 
+ class Xattr(object):
+@@ -25,7 +24,7 @@ class Xattr(object):
+          sizes we expect
+     """
+ 
+-    libc = CDLL(find_library("c"), use_errno=True)
++    libc = CDLL("libc.so.6", use_errno=True)
+ 
+     @classmethod
+     def geterrno(cls):
+diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py
+index d87b56c..003c28c 100644
+--- a/geo-replication/syncdaemon/libgfchangelog.py
++++ b/geo-replication/syncdaemon/libgfchangelog.py
+@@ -10,12 +10,11 @@
+ 
+ import os
+ from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong
+-from ctypes.util import find_library
+ from syncdutils import ChangelogException, ChangelogHistoryNotAvailable
+ 
+ 
+ class Changes(object):
+-    libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True)
++    libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True)
+ 
+     @classmethod
+     def geterrno(cls):
+diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py
+index 5aff319..9339248 100755
+--- a/tests/features/ipctest.py
++++ b/tests/features/ipctest.py
+@@ -1,14 +1,8 @@
+ #!/usr/bin/python
+ 
+ import ctypes
+-import ctypes.util
+-
+-# find_library does not lookup LD_LIBRARY_PATH and may miss the
+-# function. In that case, retry with less portable but explicit name.
+-libgfapi = ctypes.util.find_library("gfapi")
+-if libgfapi == None:
+-	libgfapi = "libgfapi.so"
+-api = ctypes.CDLL(libgfapi,mode=ctypes.RTLD_GLOBAL)
++
++api = ctypes.CDLL("libgfapi.so",mode=ctypes.RTLD_GLOBAL)
+ 
+ api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ]
+ api.glfs_ipc.restype = ctypes.c_int
+diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py
+index 149db72..4e6e6c4 100644
+--- a/tests/utils/libcxattr.py
++++ b/tests/utils/libcxattr.py
+@@ -11,7 +11,6 @@
+ import os
+ import sys
+ from ctypes import CDLL, c_int, create_string_buffer
+-from ctypes.util import find_library
+ 
+ 
+ class Xattr(object):
+@@ -28,9 +27,9 @@ class Xattr(object):
+ 
+     if sys.hexversion >= 0x02060000:
+         from ctypes import DEFAULT_MODE
+-        libc = CDLL(find_library("libc"), DEFAULT_MODE, None, True)
++        libc = CDLL("libc.so.6", DEFAULT_MODE, None, True)
+     else:
+-        libc = CDLL(find_library("libc"))
++        libc = CDLL("libc.so.6")
+ 
+     @classmethod
+     def geterrno(cls):
+diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py
+index dd8153e..da822cf 100644
+--- a/tools/glusterfind/src/libgfchangelog.py
++++ b/tools/glusterfind/src/libgfchangelog.py
+@@ -12,14 +12,13 @@
+ import os
+ from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref
+ from ctypes import RTLD_GLOBAL
+-from ctypes.util import find_library
+ 
+ 
+ class ChangelogException(OSError):
+     pass
+ 
+ 
+-libgfc = CDLL(find_library("gfchangelog"), use_errno=True, mode=RTLD_GLOBAL)
++libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL)
+ 
+ 
+ def raise_oserr():
+diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py
+index 10e73c0..2cdbf11 100644
+--- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py
++++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py
+@@ -1,9 +1,8 @@
+ import os
+ from ctypes import *
+-from ctypes.util import find_library
+ 
+ class Changes(object):
+-    libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True)
++    libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True)
+ 
+     @classmethod
+     def geterrno(cls):
+-- 
+2.7.4
+
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
new file mode 100644
index 00000000000..874d47cc148
--- /dev/null
+++ b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
@@ -0,0 +1,160 @@
+From 67fbd3aadc2c4caeb14418609f5c7af6de36081b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
+Date: Sat, 13 May 2017 02:45:49 +0200
+Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes
+ #1450546.
+
+Instead, rely on programs to be in PATH, as gluster already
+does in many places across its code base.
+---
+ contrib/fuse-lib/mount-common.c               |  8 ++++----
+ xlators/mgmt/glusterd/src/glusterd-ganesha.c  |  8 ++++----
+ xlators/mgmt/glusterd/src/glusterd-quota.c    |  6 +++---
+ xlators/mgmt/glusterd/src/glusterd-snapshot.c |  4 ++--
+ xlators/mgmt/glusterd/src/glusterd-utils.c    | 13 +------------
+ 5 files changed, 14 insertions(+), 25 deletions(-)
+
+diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c
+index e9f80fe..6380dd8 100644
+--- a/contrib/fuse-lib/mount-common.c
++++ b/contrib/fuse-lib/mount-common.c
+@@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt,
+                         exit (1);
+                 }
+ #ifdef GF_LINUX_HOST_OS
+-                execl ("/bin/umount", "/bin/umount", "-i", rel_mnt,
++                execl ("umount", "umount", "-i", rel_mnt,
+                        lazy ? "-l" : NULL, NULL);
+-                GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s",
++                GFFUSE_LOGERR ("%s: failed to execute umount: %s",
+                                progname, strerror (errno));
+ #elif __NetBSD__
+                 /* exitting the filesystem causes the umount */
+                 exit (0);
+ #else
+-                execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL);
+-                GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s",
++                execl ("umount", "umount", "-f", rel_mnt, NULL);
++                GFFUSE_LOGERR ("%s: failed to execute umount: %s",
+                                progname, strerror (errno));
+ #endif /* GF_LINUX_HOST_OS */
+                 exit (1);
+diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
+index 8dde82e..0038e69 100644
+--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
++++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
+@@ -123,15 +123,15 @@ manage_service (char *action)
+         int     i               = 0;
+         int     ret             = 0;
+         struct service_command sc_list[] = {
+-                { .binary  = "/usr/bin/systemctl",
++                { .binary  = "systemctl",
+                   .service = "nfs-ganesha",
+                   .action  = sc_systemctl_action
+                 },
+-                { .binary  = "/sbin/invoke-rc.d",
++                { .binary  = "invoke-rc.d",
+                   .service = "nfs-ganesha",
+                   .action  = sc_service_action
+                 },
+-                { .binary  = "/sbin/service",
++                { .binary  = "service",
+                   .service = "nfs-ganesha",
+                   .action  = sc_service_action
+                 },
+@@ -144,7 +144,7 @@ manage_service (char *action)
+                 if (ret == 0) {
+                         gf_msg_debug (THIS->name, 0,
+                                 "%s found.", sc_list[i].binary);
+-                        if (strcmp (sc_list[i].binary, "/usr/bin/systemctl") == 0)
++                        if (strcmp (sc_list[i].binary, "systemctl") == 0)
+                                 ret = sc_systemctl_action (&sc_list[i], action);
+                         else
+                                 ret = sc_service_action (&sc_list[i], action);
+diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
+index c1c95ae..a6eeb69 100644
+--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
++++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
+@@ -30,7 +30,7 @@
+ 
+ #ifndef _PATH_SETFATTR
+ # ifdef GF_LINUX_HOST_OS
+-#  define _PATH_SETFATTR "/usr/bin/setfattr"
++#  define _PATH_SETFATTR "setfattr"
+ # endif
+ # ifdef __NetBSD__
+ #  define _PATH_SETFATTR "/usr/pkg/bin/setfattr"
+@@ -335,7 +335,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
+ 
+                 if (type == GF_QUOTA_OPTION_TYPE_ENABLE ||
+                     type == GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS)
+-                        runner_add_args (&runner, "/usr/bin/find", ".", NULL);
++                        runner_add_args (&runner, "find", ".", NULL);
+ 
+                 else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) {
+ 
+@@ -351,7 +351,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
+                                          VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1",
+                                          "{}", "\\", ";", NULL);
+ #else
+-                        runner_add_args (&runner, "/usr/bin/find", ".",
++                        runner_add_args (&runner, "find", ".",
+                                          "-exec", _PATH_SETFATTR, "-n",
+                                          VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v",
+                                          "1", "{}", "\\", ";", NULL);
+diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+index c75a101..b7b659e 100644
+--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
++++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+@@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname,
+         }
+ 
+         runinit (&runner);
+-        runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "vg_name",
++        runner_add_args (&runner, "lvs", "--noheadings", "-o", "vg_name",
+                          device, NULL);
+         runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
+         snprintf (msg, sizeof (msg), "Get volume group for device %s", device);
+@@ -1982,7 +1982,7 @@ glusterd_is_thinp_brick (char *device, uint32_t *op_errno)
+ 
+         runinit (&runner);
+ 
+-        runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "pool_lv",
++        runner_add_args (&runner, "lvs", "--noheadings", "-o", "pool_lv",
+                          device, NULL);
+         runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
+         runner_log (&runner, this->name, GF_LOG_DEBUG, msg);
+diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
+index 8f8447a..63d8add 100644
+--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
++++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
+@@ -5899,7 +5899,6 @@ static struct fs_info {
+         char *fs_tool_pattern;
+         char *fs_tool_pkg;
+ } glusterd_fs[] = {
+-        /* some linux have these in /usr/sbin/and others in /sbin/? */
+         { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" },
+         { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
+         { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
+@@ -5957,17 +5956,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
+                                 cur_word = "N/A";
+                                 goto cached;
+                         }
+-
+-                        snprintf (fs_tool_name, sizeof (fs_tool_name),
+-                                  "/usr/sbin/%s", fs->fs_tool_name);
+-                        if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
+-                                runner_add_arg (&runner, fs_tool_name);
+-                        else {
+-                                snprintf (fs_tool_name, sizeof (fs_tool_name),
+-                                          "/sbin/%s", fs->fs_tool_name);
+-                                if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
+-                                        runner_add_arg (&runner, fs_tool_name);
+-                        }
++                        runner_add_arg (&runner, fs->fs_tool_name);
+                         break;
+                 }
+         }
+-- 
+2.7.4
+
-- 
GitLab


From 01bbdae2fea6b68c05ff1c5b14a0243854861600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Thu, 11 May 2017 18:28:46 +0200
Subject: [PATCH 0011/1490] glusterfs: Enable parallel building.

I checked for determinism with `nix-build --option build-repeat 10`.
---
 pkgs/tools/filesystems/glusterfs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index de36606678a..ef813a627d5 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -91,6 +91,8 @@ rec {
 
   makeFlags = "DESTDIR=$(out)";
 
+  enableParallelBuilding = true;
+
   postInstall = ''
     cp -r $out/$out/* $out
     rm -r $out/nix
-- 
GitLab


From ff4eb1eaa6693dbdee5e186f8c9832c11c51f9c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 13 May 2017 03:07:04 +0200
Subject: [PATCH 0012/1490] glusterfs service: Copy hooks to /var at startup.

This is where glusterfs expects them; see also
https://github.com/gluster/glusterfs/blob/v3.10.1/extras/hook-scripts/Makefile.am#L4

Also see upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761
---
 nixos/modules/services/network-filesystems/glusterfs.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix
index a2f2c033951..f7fed793066 100644
--- a/nixos/modules/services/network-filesystems/glusterfs.nix
+++ b/nixos/modules/services/network-filesystems/glusterfs.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  inherit (pkgs) glusterfs;
+  inherit (pkgs) glusterfs rsync;
 
   cfg = config.services.glusterfs;
 
@@ -50,8 +50,11 @@ in
       after = [ "rpcbind.service" "network.target" "local-fs.target" ];
       before = [ "network-online.target" ];
 
+      # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761
       preStart = ''
         install -m 0755 -d /var/log/glusterfs
+        mkdir -p /var/lib/glusterd/hooks/
+        ${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/
       '';
 
       serviceConfig = {
-- 
GitLab


From 13eefe13cd719f2d028d87a895b39189da5c8653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 19 May 2017 01:04:51 +0200
Subject: [PATCH 0013/1490] glusterfs: Upgrade to 3.10.2

---
 pkgs/tools/filesystems/glusterfs/default.nix  |  4 +-
 ...sterfs-use-PATH-instead-of-hardcodes.patch | 47 ++++++++++---------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index ef813a627d5..60e49486454 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -15,10 +15,10 @@ let
     #       The command
     #         find /nix/store/...-glusterfs-.../ -name '*.py' -executable
     #       can help with finding new Python scripts.
-    version = "3.10.1";
+    version = "3.10.2";
     name="${baseName}-${version}";
     url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
-    sha256 = "0gmb3m98djljcycjggi1qv99ai6k4cvn2rqym2q9f58q8n8kdhh7";
+    sha256 = "09hpvw42sc77nc3bfv7395wjn7fxvp0n8qnmrlyxq83hf0w81gfs";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl ncurses readline
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
index 874d47cc148..eb4bd5b7d56 100644
--- a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
+++ b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
@@ -1,4 +1,4 @@
-From 67fbd3aadc2c4caeb14418609f5c7af6de36081b Mon Sep 17 00:00:00 2001
+From 616381bc25b0e90198683fb049f994e82d467d96 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
 Date: Sat, 13 May 2017 02:45:49 +0200
 Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes
@@ -6,16 +6,18 @@ Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes
 
 Instead, rely on programs to be in PATH, as gluster already
 does in many places across its code base.
+
+Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246
 ---
  contrib/fuse-lib/mount-common.c               |  8 ++++----
- xlators/mgmt/glusterd/src/glusterd-ganesha.c  |  8 ++++----
+ xlators/mgmt/glusterd/src/glusterd-ganesha.c  |  6 +++---
  xlators/mgmt/glusterd/src/glusterd-quota.c    |  6 +++---
  xlators/mgmt/glusterd/src/glusterd-snapshot.c |  4 ++--
- xlators/mgmt/glusterd/src/glusterd-utils.c    | 13 +------------
- 5 files changed, 14 insertions(+), 25 deletions(-)
+ xlators/mgmt/glusterd/src/glusterd-utils.c    | 14 +-------------
+ 5 files changed, 13 insertions(+), 25 deletions(-)
 
 diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c
-index e9f80fe..6380dd8 100644
+index e9f80fe81..6380dd867 100644
 --- a/contrib/fuse-lib/mount-common.c
 +++ b/contrib/fuse-lib/mount-common.c
 @@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt,
@@ -40,14 +42,14 @@ index e9f80fe..6380dd8 100644
  #endif /* GF_LINUX_HOST_OS */
                  exit (1);
 diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
-index 8dde82e..0038e69 100644
+index da1fee066..dcb9e5725 100644
 --- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
 +++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
-@@ -123,15 +123,15 @@ manage_service (char *action)
+@@ -122,15 +122,15 @@ manage_service (char *action)
          int     i               = 0;
          int     ret             = 0;
          struct service_command sc_list[] = {
--                { .binary  = "/usr/bin/systemctl",
+-                { .binary  = "/bin/systemctl",
 +                { .binary  = "systemctl",
                    .service = "nfs-ganesha",
                    .action  = sc_systemctl_action
@@ -62,17 +64,8 @@ index 8dde82e..0038e69 100644
                    .service = "nfs-ganesha",
                    .action  = sc_service_action
                  },
-@@ -144,7 +144,7 @@ manage_service (char *action)
-                 if (ret == 0) {
-                         gf_msg_debug (THIS->name, 0,
-                                 "%s found.", sc_list[i].binary);
--                        if (strcmp (sc_list[i].binary, "/usr/bin/systemctl") == 0)
-+                        if (strcmp (sc_list[i].binary, "systemctl") == 0)
-                                 ret = sc_systemctl_action (&sc_list[i], action);
-                         else
-                                 ret = sc_service_action (&sc_list[i], action);
 diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
-index c1c95ae..a6eeb69 100644
+index 0e6629cf0..fcb4738b7 100644
 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c
 +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
 @@ -30,7 +30,7 @@
@@ -103,7 +96,7 @@ index c1c95ae..a6eeb69 100644
                                           VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v",
                                           "1", "{}", "\\", ";", NULL);
 diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
-index c75a101..b7b659e 100644
+index da0152366..f0d135350 100644
 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
 +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
 @@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname,
@@ -125,10 +118,10 @@ index c75a101..b7b659e 100644
          runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
          runner_log (&runner, this->name, GF_LOG_DEBUG, msg);
 diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
-index 8f8447a..63d8add 100644
+index 51db13df0..6fa7b92f9 100644
 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c
 +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
-@@ -5899,7 +5899,6 @@ static struct fs_info {
+@@ -6027,7 +6027,6 @@ static struct fs_info {
          char *fs_tool_pattern;
          char *fs_tool_pkg;
  } glusterd_fs[] = {
@@ -136,7 +129,15 @@ index 8f8447a..63d8add 100644
          { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" },
          { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
          { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
-@@ -5957,17 +5956,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
+@@ -6048,7 +6047,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
+         char           *trail             = NULL;
+         runner_t        runner            = {0, };
+         struct fs_info *fs                = NULL;
+-        char            fs_tool_name[256] = {0, };
+         static dict_t  *cached_fs         = NULL;
+ 
+         memset (key, 0, sizeof (key));
+@@ -6085,17 +6083,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
                                  cur_word = "N/A";
                                  goto cached;
                          }
@@ -156,5 +157,5 @@ index 8f8447a..63d8add 100644
                  }
          }
 -- 
-2.7.4
+2.12.0
 
-- 
GitLab


From 9aa3548931e90d3a853c0cbf7fe45efe7f3b6a5a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 19 May 2017 07:26:05 -0500
Subject: [PATCH 0014/1490] llvm-4/clang-4: Build and install man pages

---
 .../compilers/llvm/4/clang/default.nix        | 22 +++++++++++++++++--
 pkgs/development/compilers/llvm/4/llvm.nix    | 13 ++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index c9387159283..7e090f5b57a 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -13,10 +13,15 @@ let
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
-    buildInputs = [ cmake libedit libxml2 llvm python ];
+    buildInputs = [ cmake libedit libxml2 llvm python python.pkgs.sphinx ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
+      "-DCLANG_INCLUDE_DOCS=ON"
+      "-DLLVM_ENABLE_SPHINX=ON"
+      "-DSPHINX_OUTPUT_MAN=ON"
+      "-DSPHINX_OUTPUT_HTML=OFF"
+      "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
     ] ++
     # Maybe with compiler-rt this won't be needed?
     (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
@@ -24,12 +29,19 @@ let
 
     patches = [ ./purity.patch ];
 
+    postBuild = ''
+      cmake --build . --target docs-clang-man
+    '';
+
     postPatch = ''
       sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
       sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+
+      # Patch for standalone doc building
+      sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
     '';
 
-    outputs = [ "out" "python" ];
+    outputs = [ "out" "man" "python" ];
 
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
@@ -46,6 +58,12 @@ let
       mv $out/share/clang/*.py $python/share/clang
 
       rm $out/bin/c-index-test
+
+      # Manually install clang manpage
+      cp docs/man/*.1 $out/share/man/man1/
+
+      # Move it and other man pages to 'man' output
+      moveToOutput "share/man" "$man"
     '';
 
     enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 83a14b7fc4d..29fd3c1f7a3 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -38,9 +38,9 @@ in stdenv.mkDerivation rec {
     mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
-  outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
+  outputs = [ "out" "man" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
 
-  buildInputs = [ perl groff cmake libxml2 python libffi ]
+  buildInputs = [ perl groff cmake libxml2 python libffi python.pkgs.sphinx ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
 
   propagatedBuildInputs = [ ncurses zlib ];
@@ -80,6 +80,11 @@ in stdenv.mkDerivation rec {
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
     "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
+    "-DLLVM_BUILD_DOCS=ON"
+    "-DLLVM_ENABLE_SPHINX=ON"
+    "-DSPHINX_OUTPUT_MAN=ON"
+    "-DSPHINX_OUTPUT_HTML=OFF"
+    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
   ] ++ stdenv.lib.optional enableSharedLibraries [
     "-DLLVM_LINK_LLVM_DYLIB=ON"
   ] ++ stdenv.lib.optional (!isDarwin)
@@ -103,7 +108,9 @@ in stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
   '';
 
-  postInstall = ""
+  postInstall = ''
+    moveToOutput "share/man" "$man"
+  ''
   + stdenv.lib.optionalString (enableSharedLibraries) ''
     moveToOutput "lib/libLLVM-*" "$lib"
     moveToOutput "lib/libLLVM.${shlib}" "$lib"
-- 
GitLab


From 3d1c1c5af3e1d97c2c6d0baf877817d09bb0c444 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 19 May 2017 12:34:39 -0500
Subject: [PATCH 0015/1490] llvm-4/*: indicate which build inputs are
 nativeBuildInputs.

---
 pkgs/development/compilers/llvm/4/clang/default.nix | 3 ++-
 pkgs/development/compilers/llvm/4/libc++abi.nix     | 3 ++-
 pkgs/development/compilers/llvm/4/lld.nix           | 3 ++-
 pkgs/development/compilers/llvm/4/lldb.nix          | 3 ++-
 pkgs/development/compilers/llvm/4/llvm.nix          | 3 ++-
 pkgs/development/compilers/llvm/4/openmp.nix        | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 7e090f5b57a..4fa180a2701 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -13,7 +13,8 @@ let
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
-    buildInputs = [ cmake libedit libxml2 llvm python python.pkgs.sphinx ];
+    nativeBuildInputs = [ cmake python python.pkgs.sphinx ];
+    buildInputs = [ libedit libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index 559b6b26bc5..3a0e996fb9a 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation {
 
   src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw";
 
-  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  nativeBuildInputs = [ cmake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index 549fa863c15..f9cd72b4200 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
 
   src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k";
 
-  buildInputs = [ cmake llvm ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ llvm ];
 
   outputs = [ "out" "dev" ];
 
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index 6e6fdf012dd..a0f0a606ad9 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -29,7 +29,8 @@ stdenv.mkDerivation {
       cmake/modules/LLDBStandalone.cmake
   '';
 
-  buildInputs = [ cmake python which swig ncurses zlib libedit libxml2 llvm ]
+  nativeBuildInputs = [ cmake python which swig ];
+  buildInputs = [ ncurses zlib libedit libxml2 llvm ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ];
 
   CXXFLAGS = "-fno-rtti";
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 29fd3c1f7a3..1a78d672bfe 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -40,7 +40,8 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
 
-  buildInputs = [ perl groff cmake libxml2 python libffi python.pkgs.sphinx ]
+  nativeBuildInputs = [ perl groff cmake python python.pkgs.sphinx ];
+  buildInputs = [ libxml2 libffi ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
 
   propagatedBuildInputs = [ ncurses zlib ];
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix
index c8ba770e241..197e9a78465 100644
--- a/pkgs/development/compilers/llvm/4/openmp.nix
+++ b/pkgs/development/compilers/llvm/4/openmp.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
 
   src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv";
 
-  buildInputs = [ cmake llvm perl ];
+  nativeBuildInputs = [ cmake perl ];
+  buildInputs = [ llvm ];
 
   enableParallelBuilding = true;
 
-- 
GitLab


From f469bd83bb9390807f1cdbe2de8d56bb8a710eb5 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 20 May 2017 00:30:51 +0200
Subject: [PATCH 0016/1490] mysql service: change default data directory for
 17.09

The new directory is now moved to /var/lib/mysql. This makes it consistent with
with upstream.
---
 nixos/modules/services/databases/mysql.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index fcf1f123cfb..bae6b170c47 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -72,7 +72,7 @@ in
 
       dataDir = mkOption {
         type = types.path;
-        default = "/var/mysql"; # !!! should be /var/db/mysql
+        example = "/var/lib/mysql";
         description = "Location where MySQL stores its table files";
       };
 
@@ -166,6 +166,10 @@ in
 
   config = mkIf config.services.mysql.enable {
 
+    services.mysql.dataDir =
+      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql"
+                 else "/var/mysql");
+
     users.extraUsers.mysql = {
       description = "MySQL server user";
       group = "mysql";
-- 
GitLab


From 6509ba66a804390191e4bcf2f068686946e6fc56 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 12 May 2017 13:22:17 +0200
Subject: [PATCH 0017/1490] ninja: 1.7.1 -> 1.7.2

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

diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index cadda36a0e6..39d0d4e0e39 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ninja-${version}";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchurl {
     name = "${name}.tar.gz";
     url = "https://github.com/ninja-build/ninja/archive/v${version}.tar.gz";
-    sha256 = "06dy2dc1aafm61ynw9gzig88la3km9dsh53bxf4mnw7l7kjisn2i";
+    sha256 = "1n8n3g26ppwh7zwrc37n3alkbpbj0wki34ih53s3rkhs8ajs1p9f";
   };
 
   buildInputs = [ python asciidoc re2c ];
-- 
GitLab


From ab65bf9dbdfdd1f5c3750ac3ec39d1217381de85 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 4 May 2017 13:39:55 +0200
Subject: [PATCH 0018/1490] chromium: 57.0.2987.133 -> 58.0.3029.96

---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 2800a3ed5d2..475ff464504 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1q9iqmq5amzfw03jiw18g1w285b6x2qckn8gc60r5m3xx1hbivv2";
-    sha256bin64 = "1ddhhcydcwwc2pkwm4c8rlr60968zy5vda410g4bwx0v5q7p22q9";
-    version = "58.0.3029.68";
+    sha256 = "16m7q5xfbzf1j9figilis56m1ls68v0i4zm9vp0rg64n8xny2qhw";
+    sha256bin64 = "0wzzmsyp0qvbvbb8g1gjzc572c1gnn442kx3rkvcmdfakjamq93s";
+    version = "59.0.3071.36";
   };
   dev = {
-    sha256 = "0zvnj9n2p057fxx7n4d1qc0nw34qhlsvrx20fwigq96blamckvd8";
-    sha256bin64 = "1s1r3h7x49bp64lzzphm4jcg7g68l0x7mr3airj3hqii58dvndm0";
-    version = "59.0.3067.0";
+    sha256 = "0dmmkv0vf7l37x394brb81s0b4ganq3kflzq09xl3d0lp9pc2v3x";
+    sha256bin64 = "04z1ck7lnxdgwni99mgx8d6iwbk6jypq4hcmrdiywp7pp3sizv89";
+    version = "60.0.3080.5";
   };
   stable = {
-    sha256 = "1xwchazqqx0cs9rd15r80kw6p918zp9libx34qlcj8p5lxq1f0bh";
-    sha256bin64 = "0ggn5rljch36sx0i37qzp6ldcy3ibdj0z9217lqzjq3r7ixsfqja";
-    version = "57.0.2987.133";
+    sha256 = "10ai9bzw6b5p6ak2fd90pg8jlk79ahiz21gzm2fx12xmsdxgsf2x";
+    sha256bin64 = "06k6h93jff9slrmhl3bblq3kskxdp1357jqrzajg2zl23ja47f8m";
+    version = "58.0.3029.96";
   };
 }
-- 
GitLab


From 232507a73cedbc3acfe9edb1b84938c016bf25af Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 12 May 2017 13:28:48 +0200
Subject: [PATCH 0019/1490] chromium: 58.0.3029.96 -> 58.0.3029.110

---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 475ff464504..7ee28c7fc27 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "16m7q5xfbzf1j9figilis56m1ls68v0i4zm9vp0rg64n8xny2qhw";
-    sha256bin64 = "0wzzmsyp0qvbvbb8g1gjzc572c1gnn442kx3rkvcmdfakjamq93s";
-    version = "59.0.3071.36";
+    sha256 = "1dcad79kfayagqiv85ycla3iv3gc99k0rvnvnpar9hd6x1iv8cfl";
+    sha256bin64 = "0ywf50rfzv1kkfpld62fi5g0kz33an0p03xqf7wkcqi7hild607v";
+    version = "59.0.3071.47";
   };
   dev = {
-    sha256 = "0dmmkv0vf7l37x394brb81s0b4ganq3kflzq09xl3d0lp9pc2v3x";
-    sha256bin64 = "04z1ck7lnxdgwni99mgx8d6iwbk6jypq4hcmrdiywp7pp3sizv89";
-    version = "60.0.3080.5";
+    sha256 = "05kxl938mh41341lh5xsxcqxv9hhx8yn6nkawgg241sfwdx72db8";
+    sha256bin64 = "1mr2615r30zjxa55mdcbfi0k2grgyykzawslmg41aw0jy5hfamal";
+    version = "60.0.3095.5";
   };
   stable = {
-    sha256 = "10ai9bzw6b5p6ak2fd90pg8jlk79ahiz21gzm2fx12xmsdxgsf2x";
-    sha256bin64 = "06k6h93jff9slrmhl3bblq3kskxdp1357jqrzajg2zl23ja47f8m";
-    version = "58.0.3029.96";
+    sha256 = "1zvqim75mlqckvf7awrbyggis71dlkz4gjpfrmfdvydcs8yyyk7j";
+    sha256bin64 = "0vfx2m5zqfvfb6sgd3dg1sji72dzjcd1sf4r6qwhnz38wadys7id";
+    version = "58.0.3029.110";
   };
 }
-- 
GitLab


From bafcf4226ead4a6bdc5d652164e4d18509af35a7 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 12 May 2017 13:22:39 +0200
Subject: [PATCH 0020/1490] chromium: add bootstrap gn patch

---
 .../networking/browsers/chromium/common.nix          |  1 +
 .../browsers/chromium/patches/fix-bootstrap-gn.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index dac821a4898..fc7483d2fa2 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -105,6 +105,7 @@ let
 
     patches = [
       ./patches/nix_plugin_paths_52.patch
+      ./patches/fix-bootstrap-gn.patch
     ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
       ++ optional enableWideVine ./patches/widevine.patch;
 
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch
new file mode 100644
index 00000000000..34efb4f7a45
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch
@@ -0,0 +1,12 @@
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 3148ccf..38cfb11 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+       'base/base_switches.cc',
+       'base/build_time.cc',
+       'base/callback_internal.cc',
++      'base/callback_helpers.cc',
+       'base/command_line.cc',
+       'base/debug/activity_tracker.cc',
+       'base/debug/alias.cc',
-- 
GitLab


From 1fe7bd9ed6a5dd780e4991241b75fc0640576b2b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 14 May 2017 15:03:21 +0200
Subject: [PATCH 0021/1490] chromium: softlink system nodejs into third_party

somehow, the build seems to have changed with chromium 58, to not auto
download the node binary. It is needed to generate webui files and we
can substitute our own.
---
 pkgs/applications/networking/browsers/chromium/common.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index fc7483d2fa2..f36f28ac880 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, ninja, which
+{ stdenv, ninja, which, nodejs
 
 # default dependencies
 , bzip2, flac, speex, libopus
@@ -87,7 +87,7 @@ let
 
     nativeBuildInputs = [
       ninja which python2Packages.python perl pkgconfig
-      python2Packages.ply python2Packages.jinja2
+      python2Packages.ply python2Packages.jinja2 nodejs
     ];
 
     buildInputs = defaultDependencies ++ [
@@ -131,6 +131,9 @@ let
       }' gpu/config/gpu_control_list.cc
 
       patchShebangs .
+      # use our own nodejs
+      mkdir -p third_party/node/linux/node-linux-x64/bin
+      ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node
     '' + optionalString (versionAtLeast version "52.0.0.0") ''
       sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \
         third_party/pdfium/xfa/fxbarcode/utils.h
-- 
GitLab


From 64bddb3f1ed85b0f8e8c98f95efffd667596258a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 20 May 2017 21:05:16 -0500
Subject: [PATCH 0022/1490] manual: add "Emacs" section to manual
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This gives some basics on configuring Emacs within Nix. The
configuration is fairly long just to give a good idea of what’s going
on. I can trim out some of it if it’s not necessary. Note that there
is already a section for Emacs in the NixOS manual. However, this is
aimed at avoiding using modules altogether to make things easier for
non-NixOS users. This configuration should work on NixOS anyway,
however.

Fixes #24243
Fixes #19956
---
 doc/package-notes.xml | 136 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 0f148f5c898..33a61f31938 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -516,4 +516,140 @@ to your configuration, rebuild, and run the game with
 
 </section>
 
+<section xml:id="sec-emacs">
+
+<title>Emacs</title>
+
+<section xml:id="sec-emacs-config">
+
+<title>Configuring Emacs</title>
+
+<para>
+  The Emacs package comes with some extra helpers to make it easier to
+  configure. <varname>emacsWithPackages</varname> allows you to manage
+  packages from ELPA. This means that you will not have to install
+  that packages from within Emacs. For instance, if you wanted to use
+  <literal>company</literal>, <literal>counsel</literal>,
+  <literal>flycheck</literal>, <literal>ivy</literal>,
+  <literal>magit</literal>, <literal>projectile</literal>, and
+  <literal>use-package</literal> you could use this as a
+  <filename>~/.config/nixpkgs/config.nix</filename> override:
+</para>
+
+<screen>
+{
+  packageOverrides = pkgs: with pkgs; {
+    myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
+      company
+      counsel
+      flycheck
+      ivy
+      magit
+      projectile
+      use-package
+    ]));
+  }
+}
+</screen>
+
+<para>
+  You can install it like any other packages via <command>nix-env -iA
+  myEmacs</command>. However, this will only install those packages.
+  It will not <literal>configure</literal> them for us. To do this, we
+  need to provide a configuration file. Luckily, it is possible to do
+  this from within Nix! By modifying the above example, we can make
+  Emacs load a custom config file. The key is to create a package that
+  provide a <filename>default.el</filename> file in
+  <filename>/share/emacs/site-start/</filename>. Emacs knows to load
+  this file automatically when it starts.
+</para>
+
+<screen>
+{
+  packageOverrides = pkgs: with pkgs; rec {
+    myEmacsConfig = writeText "default.el" ''
+;; initialize package
+
+(require 'package)
+(package-initialize 'noactivate)
+(eval-when-compile
+  (require 'use-package))
+
+;; load some packages
+
+(use-package company
+  :bind ("&lt;C-tab&gt;" . company-complete)
+  :diminish company-mode
+  :commands (company-mode global-company-mode)
+  :defer 1
+  :config
+  (global-company-mode))
+
+(use-package counsel
+  :commands (counsel-descbinds)
+  :bind (([remap execute-extended-command] . counsel-M-x)
+         ("C-x C-f" . counsel-find-file)
+         ("C-c g" . counsel-git)
+         ("C-c j" . counsel-git-grep)
+         ("C-c k" . counsel-ag)
+         ("C-x l" . counsel-locate)
+         ("M-y" . counsel-yank-pop)))
+
+(use-package flycheck
+  :defer 2
+  :config (global-flycheck-mode))
+
+(use-package ivy
+  :defer 1
+  :bind (("C-c C-r" . ivy-resume)
+         ("C-x C-b" . ivy-switch-buffer)
+         :map ivy-minibuffer-map
+         ("C-j" . ivy-call))
+  :diminish ivy-mode
+  :commands ivy-mode
+  :config
+  (ivy-mode 1))
+
+(use-package magit
+  :defer
+  :if (executable-find "git")
+  :bind (("C-x g" . magit-status)
+         ("C-x G" . magit-dispatch-popup))
+  :init
+  (setq magit-completing-read-function 'ivy-completing-read))
+
+(use-package projectile
+  :commands projectile-mode
+  :bind-keymap ("C-c p" . projectile-command-map)
+  :defer 5
+  :config
+  (projectile-global-mode))
+    '';
+    myEmacs = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
+      (runCommand "default.el" {} ''
+mkdir -p $out/share/emacs/site-lisp
+cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
+'')
+      company
+      counsel
+      flycheck
+      ivy
+      magit
+      projectile
+      use-package
+    ]));
+  };
+}
+</screen>
+
+<para>
+  This provides a fairly full Emacs start file. It will load in
+  addition to the user's presonal config. You can always disable it by
+  passing <command>-q</command> to the Emacs command.
+</para>
+
+</section>
+
+</section>
+
 </chapter>
-- 
GitLab


From 1e23b49f4652915a274781569abb21a07884e858 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 21 May 2017 12:40:07 +0200
Subject: [PATCH 0023/1490] darwin-stdenv: allow clang-unwrapped.man

---
 pkgs/stdenv/darwin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 8a517fddad8..d733749e5f2 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -306,7 +306,7 @@ in rec {
       xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
       bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
       gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
-      gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
+      gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.man patch pcre.out binutils-raw.out
       binutils-raw.dev binutils gettext
     ]) ++ (with pkgs.darwin; [
       dyld Libsystem CF cctools libiconv locale
-- 
GitLab


From 2ff56a1b8fbeb4f2965f83936b9f8873d5f68647 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@zamg.ac.at>
Date: Mon, 22 May 2017 13:08:20 +0000
Subject: [PATCH 0024/1490] grib-api: Add grib-api to pythonPackages

This provides a default method for using the grib-api python bindings.
---
 pkgs/development/libraries/grib-api/default.nix | 4 ++++
 pkgs/top-level/python-packages.nix              | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index ca2fb728262..80e05b8d743 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec{
                   pythonPackages.python
                 ];
 
+  propagatedBuildInputs = stdenv.lib.optionals enablePython [
+                  pythonPackages.numpy
+                ];
+
   cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
                  "-DENABLE_PNG=ON"
                  "-DENABLE_FORTRAN=ON"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e7305f9ec9a..4ac05d47ee0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12176,6 +12176,14 @@ in {
     };
   };
 
+  grib-api = if (isPy27) then
+      (pkgs.grib-api.overrideAttrs (oldattrs: {
+    name = "${python.libPrefix}-" + oldattrs.name;
+  })).override {
+    enablePython = true;
+    pythonPackages = self;
+  } else throw "grib-api not supported for interpreter ${python.executable}";
+
   gspread = buildPythonPackage rec {
     version = "0.2.3";
     name = "gspread-${version}";
-- 
GitLab


From abdaf5a29077ce822ef945966495c18e25dc733b Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@zamg.ac.at>
Date: Mon, 22 May 2017 13:51:48 +0000
Subject: [PATCH 0025/1490] eccodes: Provide python bindings

---
 pkgs/top-level/python-packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e7305f9ec9a..776d4988194 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6379,6 +6379,14 @@ in {
     };
   };
 
+  eccodes = if (isPy27) then
+      (pkgs.eccodes.overrideAttrs (oldattrs: {
+    name = "${python.libPrefix}-" + oldattrs.name;
+  })).override {
+    enablePython = true;
+    pythonPackages = self;
+  } else throw "eccodes not supported for interpreter ${python.executable}";
+
   EditorConfig = buildPythonPackage rec {
     name = "EditorConfig-${version}";
     version = "0.12.0";
-- 
GitLab


From b6534c694d3849649388df7bb6fb0a7dab9d96e1 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Mon, 22 May 2017 09:48:29 -0500
Subject: [PATCH 0026/1490] ocamlPackages.core_bench: init at 113.33.03

---
 .../ocaml-modules/janestreet/core_bench.nix   | 20 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  3 +++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/core_bench.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix
new file mode 100644
index 00000000000..83e6100f059
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix
@@ -0,0 +1,20 @@
+{ stdenv
+, buildOcamlJane
+, core
+, core_extended
+, textutils
+}:
+
+buildOcamlJane rec {
+  name = "core_bench";
+  hash = "1d1ainpakgsf5rg8dvar12ksgilqcc4465jr8gf7fz5mmn0mlifj";
+  propagatedBuildInputs =
+    [ core core_extended textutils ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/janestreet/core_bench;
+    description = "Micro-benchmarking library for OCaml";
+    license = licenses.asl20;
+    maintainers = [ maintainers.pmahoney ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3a185bc0a10..13ece3dec43 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -728,6 +728,9 @@ let
       then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}
       else bin_prot_p4;
 
+    core_bench =
+      callPackage ../development/ocaml-modules/janestreet/core_bench.nix {};
+
     core_kernel =
       if lib.versionOlder "4.03" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core_kernel-113_33_01.nix {}
-- 
GitLab


From 2ae46bc163512b3eecb60d70866d4ff19dac82bc Mon Sep 17 00:00:00 2001
From: Lukasz Czyzykowski <lukasz.czyzykowski@gmail.com>
Date: Mon, 22 May 2017 20:06:52 +0200
Subject: [PATCH 0027/1490] ghc: 8.0.2 without link warnings

Fixes NixOS/nixpkgs#25139 by backporting patch applied in ghc trunk:
https://phabricator.haskell.org/D2823
---
 pkgs/development/compilers/ghc/8.0.2.nix      |  4 +++-
 .../compilers/ghc/no-cpp-warnings.patch       | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/ghc/no-cpp-warnings.patch

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 605458e7185..7463eb91e7a 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "1c8qc4fhkycynk4g1f9hvk53dj6a1vvqi6bklqznns6hw59m8qhi";
   };
 
-  patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
+  patches = []
+    ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
+    ++ stdenv.lib.optional stdenv.isDarwin ./no-cpp-warnings.patch;
 
   buildInputs = [ ghc perl hscolour sphinx ];
 
diff --git a/pkgs/development/compilers/ghc/no-cpp-warnings.patch b/pkgs/development/compilers/ghc/no-cpp-warnings.patch
new file mode 100644
index 00000000000..90224df19f6
--- /dev/null
+++ b/pkgs/development/compilers/ghc/no-cpp-warnings.patch
@@ -0,0 +1,23 @@
+--- b/includes/rts/storage/ClosureMacros.h        2017-05-21 12:54:09.000000000 +0200
++++ a/includes/rts/storage/ClosureMacros.h        2017-05-21 12:55:57.000000000 +0200
+@@ -499,8 +499,17 @@
+
+    -------------------------------------------------------------------------- */
+
+-#define ZERO_SLOP_FOR_LDV_PROF     (defined(PROFILING))
+-#define ZERO_SLOP_FOR_SANITY_CHECK (defined(DEBUG) && !defined(THREADED_RTS))
++#if defined(PROFILING)
++#define ZERO_SLOP_FOR_LDV_PROF 1
++#else
++#define ZERO_SLOP_FOR_LDV_PROF 0
++#endif
++
++#if defined(DEBUG) && !defined(THREADED_RTS)
++#define ZERO_SLOP_FOR_SANITY_CHECK 1
++#else
++#define ZERO_SLOP_FOR_SANITY_CHECK 0
++#endif
+
+ #if ZERO_SLOP_FOR_LDV_PROF || ZERO_SLOP_FOR_SANITY_CHECK
+ #define OVERWRITING_CLOSURE(c) overwritingClosure(c)
+
-- 
GitLab


From 7b80f4c3442fbb0520c8596bd06f911bdfe09465 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sat, 25 Feb 2017 15:32:06 +0100
Subject: [PATCH 0028/1490] nixos/cloudinit: add cloudinit test

An iso containing metadatas is created and attached as a cdrom to the
qemu VM used for this test.

The cloudinit service is enabled. The test case ensures the root
authorized_keys file is populated and the cloudinit write_file module is
working well.
---
 nixos/release.nix          |  1 +
 nixos/tests/cloud-init.nix | 47 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 nixos/tests/cloud-init.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index aaf23d7ffb7..0090000770e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -222,6 +222,7 @@ in rec {
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
   tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
   tests.cjdns = callTest tests/cjdns.nix {};
+  tests.cloud-init = callTest tests/cloud-init.nix {};
   tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
   tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};
   tests.containers-bridge = callTest tests/containers-bridge.nix {};
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix
new file mode 100644
index 00000000000..c0add7eff36
--- /dev/null
+++ b/nixos/tests/cloud-init.nix
@@ -0,0 +1,47 @@
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+with import ../lib/qemu-flags.nix;
+with pkgs.lib;
+
+let
+  metadataDrive = pkgs.stdenv.mkDerivation {
+    name = "metadata";
+    buildCommand = ''
+      mkdir -p $out/iso
+
+      cat << EOF > $out/iso/user-data
+      #cloud-config
+      write_files:
+      -   content: |
+                cloudinit
+          path: /tmp/cloudinit-write-file
+      EOF
+
+      cat << EOF > $out/iso/meta-data
+      instance-id: iid-local01
+      local-hostname: "test"
+      public-keys:
+          - "should be a key!"
+      EOF
+      ${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso
+      '';
+  };
+in makeTest {
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lewo ];
+  };
+  machine =
+    { config, pkgs, ... }:
+    {
+      virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ];
+      services.cloud-init.enable = true;
+    };
+  testScript = ''
+     $machine->start;
+     $machine->waitForUnit("cloud-init.service");
+     $machine->succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'");
+
+     $machine->waitUntilSucceeds("cat /root/.ssh/authorized_keys | grep -q 'should be a key!'");
+  '';
+}
-- 
GitLab


From 3b24b11021e7d7741ce7e70926e26478d489e31e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 24 May 2017 03:37:48 +0000
Subject: [PATCH 0029/1490] cyrus_sasl: fix version

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

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 05eb575547d..07f323699b1 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "cyrus-sasl-${version}${optionalString (kerberos == null) "-without-kerberos"}";
-  version = "2.5.10";
+  version = "2.1.26";
 
   src = fetchurl {
     url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz";
-- 
GitLab


From bd500816f75d326720c096d78db3932e3fadd9ab Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Wed, 24 May 2017 13:43:56 +0200
Subject: [PATCH 0030/1490] diffutils: 3.5 -> 3.6

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

diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 587c89554aa..787750c8ecf 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz, coreutils ? null }:
 
 stdenv.mkDerivation rec {
-  name = "diffutils-3.5";
+  name = "diffutils-3.6";
 
   src = fetchurl {
     url = "mirror://gnu/diffutils/${name}.tar.xz";
-    sha256 = "0csmqfz8ks23kdjsq0v2ll1acqiz8lva06dj19mwmymrsp69ilys";
+    sha256 = "1mivg0fy3a6fcn535ln8nkgfj6vxh5hsxxs5h6692wxmsjyyh8fn";
   };
 
   outputs = [ "out" "info" ];
-- 
GitLab


From 5479f742e66e90b298353a8df858840d374e1515 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 25 May 2017 00:43:21 +0200
Subject: [PATCH 0031/1490] libtasn1: apply patch to fix CVE-2017-6891

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

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 3b74406d7bf..dbd203b97cf 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8";
   };
 
+  patches = [
+    (fetchurl {
+      name = "CVE-2017-6891.patch";
+      url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=5520704d075802df25ce4ffccc010ba1641bd484";
+      sha256 = "000r6wb87zkx8yhzkf1c3h7p5akwhjw51cv8f1yjnplrqqrr7h2k";
+    })
+  ];
+
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
-- 
GitLab


From 4e3afed6dc13d2a268ec4bd43d9960910e8571d5 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Thu, 25 May 2017 11:39:39 +0900
Subject: [PATCH 0032/1490] fonttools: 3.0 -> 3.13.0

---
 pkgs/top-level/python-packages.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0824c36528..39af8357d40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11418,21 +11418,28 @@ in {
   };
 
   fonttools = buildPythonPackage (rec {
-    version = "3.0";
-    name = "fonttools-${version}";
+    pname = "fonttools";
+    version = "3.13.0";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/FontTools/fonttools-${version}.tar.gz";
-      sha256 = "0f4iblpbf3y3ghajiccvdwk2f46cim6dsj6fq1kkrbqfv05dr4nz";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "5ec278ff231d0c88afe8266e911ee0f8e66c8501c53f5f144a1a0abbc936c6b8";
+      extension = "zip";
     };
 
     buildInputs = with self; [
       numpy
     ];
 
+    checkInputs = with self; [
+      pytest
+      pytestrunner
+    ];
+
     meta = {
-      homepage = "https://github.com/behdad/fonttools";
-      description = "Font file processing tools";
+      homepage = "https://github.com/fonttools/fonttools";
+      description = "A library to manipulate font files from Python";
     };
   });
 
-- 
GitLab


From e7fa6220d622bf352a06a4328da8679fbfffced3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 25 May 2017 19:05:46 +0300
Subject: [PATCH 0033/1490] polkit: add patches from Fedora

This fixes few leaks and adds ITS description files which are needed for some
reverse dependencies.
---
 pkgs/development/libraries/polkit/default.nix | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index c1f8725f6f7..804bca5f8a5 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey_17
-, gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412
-, useSystemd ? stdenv.isLinux, systemd }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam
+, intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl
+, docbook_xml_dtd_412, gtk_doc
+, useSystemd ? stdenv.isLinux, systemd
+}:
 
 let
 
@@ -22,11 +24,28 @@ stdenv.mkDerivation rec {
     sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
+      sha256 = "1cxnhj0y30g7ldqq1y6zwsbdwcx7h97d3mpd3h5jy7dhg3h9ym91";
+    })
+    (fetchpatch {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
+      sha256 = "1h1rkd4avqyyr8q6836zzr3w10jf521gcqnvhrhzwdpgp1ay4si7";
+    })
+    (fetchpatch {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
+      sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh";
+    })
+  ];
+
   outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
 
+  nativeBuildInputs =
+    [ gtk_doc pkgconfig autoreconfHook ]
+    ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
   buildInputs =
-    [ pkgconfig glib expat pam intltool spidermonkey_17 gobjectIntrospection ]
-    ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages
+    [ glib expat pam intltool spidermonkey_17 gobjectIntrospection ]
     ++ stdenv.lib.optional useSystemd systemd;
 
   # Ugly hack to overwrite hardcoded directories
-- 
GitLab


From ae8aae1ee80e4dd10435159f35b9511a12df95eb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 26 May 2017 08:41:58 +0200
Subject: [PATCH 0034/1490] python.pkgs.urllib3: disable tests

because there are transient failures too often.
---
 pkgs/top-level/python-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eccf1047cc4..156ef27e297 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6299,6 +6299,8 @@ in {
       nosetests -v --cover-min-percentage 1
     '';
 
+    doCheck = false;
+
     buildInputs = with self; [ coverage tornado mock nose psutil pysocks ];
 
     meta = {
-- 
GitLab


From ddf7c6ef061bc2d900cf0323c992f03bef2af0c2 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Fri, 26 May 2017 04:52:11 -0500
Subject: [PATCH 0035/1490] lilypond-with-fonts: fix quoting

---
 pkgs/misc/lilypond/with-fonts.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index 861d8cf14de..2218b75a2e0 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
       install -m755 -Dt $out/bin ${lilypond}/bin/*
 
       for p in $out/bin/*; do
-        substituteInPlace $p --replace "exec -a ${lilypond}" "exec -a $out"
+        substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out"
       done
   '';
 }
-- 
GitLab


From b7ccf27229d9479e5cea2f2d2c2b06477d9e3049 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 26 May 2017 13:43:25 +0000
Subject: [PATCH 0036/1490] rename webkitgtk24x -> webkitgtk24x-gtk3;
 webkitgtk2 -> webkitgtk24x-gtk2

---
 .../editors/eclipse/build-eclipse.nix         |  6 ++---
 pkgs/applications/editors/eclipse/default.nix |  4 ++--
 pkgs/applications/editors/emacs/default.nix   |  6 ++---
 .../networking/browsers/dwb/default.nix       |  4 ++--
 .../mailreaders/astroid/default.nix           |  4 ++--
 .../mailreaders/claws-mail/default.nix        |  4 ++--
 pkgs/applications/video/miro/default.nix      |  4 ++--
 pkgs/desktops/gnome-3/3.22/default.nix        |  6 ++---
 .../haskell-modules/configuration-nix.nix     |  4 ++--
 .../haskell-modules/hackage-packages.nix      | 24 +++++++++----------
 .../libraries/wxwidgets/3.0/default.nix       |  6 ++---
 pkgs/tools/networking/mu/default.nix          |  4 ++--
 pkgs/top-level/all-packages.nix               | 18 +++++++-------
 pkgs/top-level/python-packages.nix            |  2 +-
 14 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 60bece1fafc..6a5bc3e7b0f 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -1,5 +1,5 @@
 { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
-, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk2
+, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2
 , makeWrapper, ... }:
 
 { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11
     libXrender libXtst makeWrapper zlib
-  ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2;
+  ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2;
 
   buildCommand = ''
     # Unpack tarball.
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
     makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
       --prefix PATH : ${jdk}/bin \
-      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \
+      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2)} \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
       --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
 
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 8ef855e48c8..d6d8c7ed873 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXext, libXrender, zlib
 , glib, gtk2, libXtst, jdk, gsettings_desktop_schemas
-, webkitgtk2 ? null  # for internal web browser
+, webkitgtk24x-gtk2 ? null  # for internal web browser
 , buildEnv, writeText, runCommand
 , callPackage
 }:
@@ -12,7 +12,7 @@ rec {
 
   buildEclipse = import ./build-eclipse.nix {
     inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
-            jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk2
+            jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2
             makeWrapper;
   };
 
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 216c04afd72..c51227bbc6f 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -5,7 +5,7 @@
 , withX ? !stdenv.isDarwin
 , withGTK2 ? false, gtk2 ? null
 , withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null
-, withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null
+, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib_networking ? null
 , withCsrc ? true
 , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
 }:
@@ -16,7 +16,7 @@ assert withGTK2 -> withX || stdenv.isDarwin;
 assert withGTK3 -> withX || stdenv.isDarwin;
 assert withGTK2 -> !withGTK3 && gtk2 != null;
 assert withGTK3 -> !withGTK2 && gtk3 != null;
-assert withXwidgets -> withGTK3 && webkitgtk24x != null;
+assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null;
 
 let
   toolkit =
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional (withX && withGTK2) gtk2
     ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ]
     ++ lib.optional (stdenv.isDarwin && withX) cairo
-    ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x glib_networking ];
+    ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ];
 
   propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
 
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index 60935b9605f..bd5f757738d 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk2, gtk2, gnutls
+{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls
 , json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }:
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup
-    webkitgtk2 gtk2 gnutls json_c m4 ];
+    webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ];
 
   # There are Xlib and gtk warnings therefore I have set Wno-error
   makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"'';
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 2f2ce79bcb1..a7a66cf550b 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x
+{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x-gtk3
 , libsass, notmuch, boost, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
 
-  buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas
+  buildInputs = [ gnome3.gtkmm gmime webkitgtk24x-gtk3 libsass gnome3.libpeas
                   notmuch boost gnome3.gsettings_desktop_schemas
                   gnome3.adwaita-icon-theme ];
 
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index af1829b8622..8d80da2cdfb 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, wrapGAppsHook
 , curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme
 , libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
-, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2
+, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk24x-gtk2
 , glib_networking, gsettings_desktop_schemas, libSM, libytnef
 
 # Build options
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     ++ optional enableNetworkManager networkmanager
     ++ optional enableLdap openldap
     ++ optional enablePluginPdf poppler
-    ++ optional enablePluginFancy webkitgtk2;
+    ++ optional enablePluginFancy webkitgtk24x-gtk2;
 
   configureFlags =
     optional (!enableLdap) "--disable-ldap"
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 0efa4aba276..5ca530cfe9d 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig
-, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
+, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk24x-gtk2, libsoup
 , taglib, sqlite
 , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
 , gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg
@@ -70,7 +70,7 @@ in buildPythonApplication rec {
   '';
 
   buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [
-    pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup
+    pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk24x-gtk2 libsoup
     taglib gsettings_desktop_schemas sqlite
   ];
 
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index d9b26d6aee3..526083ffc0f 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -76,7 +76,7 @@ let
   dconf-editor = callPackage ./core/dconf-editor { };
 
   # empathy = callPackage ./core/empathy {
-  #   webkitgtk = webkitgtk24x;
+  #   webkitgtk = webkitgtk24x-gtk3;
   #   clutter-gst = pkgs.clutter-gst;
   # };
 
@@ -257,7 +257,7 @@ let
 
   bijiben = callPackage ./apps/bijiben {
     # https://bugzilla.gnome.org/show_bug.cgi?id=728293
-    webkitgtk = pkgs.webkitgtk24x;
+    webkitgtk = pkgs.webkitgtk24x-gtk3;
   };
 
   cheese = callPackage ./apps/cheese { };
@@ -363,7 +363,7 @@ let
 
   geary = callPackage ./misc/geary {
     # https://bugzilla.gnome.org/show_bug.cgi?id=728002
-    webkitgtk = pkgs.webkitgtk24x;
+    webkitgtk = pkgs.webkitgtk24x-gtk3;
   };
 
   gfbgraph = callPackage ./misc/gfbgraph { };
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 15dca1c0bc5..14496f68e5b 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -129,8 +129,8 @@ self: super: builtins.intersectAttrs super {
   gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
 
   # Need WebkitGTK, not just webkit.
-  webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };
-  websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
+  webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; };
+  websnap = super.websnap.override { webkit = pkgs.webkitgtk24x-gtk3; };
 
   hs-mesos = overrideCabal super.hs-mesos (drv: {
     # Pass _only_ mesos; the correct protobuf is propagated.
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ff0890b4bff..4596236b6ff 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -73910,7 +73910,7 @@ self: {
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, text, transformers, webkitgtk24x
+     , haskell-gi-base, text, transformers, webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
@@ -73921,13 +73921,13 @@ self: {
          base bytestring containers haskell-gi haskell-gi-base text
          transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk24x ];
+       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x;};
+     }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "gi-javascriptcore_4_0_12" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
@@ -74136,7 +74136,7 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
-     , text, transformers, webkitgtk24x
+     , text, transformers, webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "gi-webkit";
@@ -74148,13 +74148,13 @@ self: {
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
          haskell-gi haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk24x ];
+       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x;};
+     }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "gi-webkit2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -197854,7 +197854,7 @@ self: {
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib
      , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers
-     , webkitgtk24x
+     , webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "webkitgtk3";
@@ -197864,26 +197864,26 @@ self: {
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk24x ];
+       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x;};
+     }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "webkitgtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3 }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
        version = "0.14.2.1";
        sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
-       libraryPkgconfigDepends = [ webkitgtk24x ];
+       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x;};
+     }) {inherit (pkgs) webkitgtk24x-gtk3;};
 
   "webpage" = callPackage
     ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix
index 5b1e0fc067c..ef32575c8e3 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -2,13 +2,13 @@
 , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile
 , withMesa ? true, mesa_glu ? null, mesa_noglu ? null
 , compat24 ? false, compat26 ? true, unicode ? true
-, withWebKit ? false, webkitgtk2 ? null
+, withWebKit ? false, webkitgtk24x-gtk2 ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
 }:
 
 
 assert withMesa -> mesa_glu != null && mesa_noglu != null;
-assert withWebKit -> webkitgtk2 != null;
+assert withWebKit -> webkitgtk24x-gtk2 != null;
 
 with stdenv.lib;
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
       gst-plugins-base GConf ]
     ++ optional withMesa mesa_glu
-    ++ optional withWebKit webkitgtk2
+    ++ optional withWebKit webkitgtk24x-gtk2
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 33db7b1caba..595337906d0 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe
 , xapian, glib, gmime, texinfo , emacs, guile
-, gtk3, webkitgtk24x, libsoup, icu
+, gtk3, webkitgtk24x-gtk3, libsoup, icu
 , withMug ? false }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   # pmccabe should be a checkInput instead, but configure looks for it
   buildInputs = [
     sqlite xapian glib gmime texinfo emacs guile libsoup icu
-  ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
+  ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ];
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   checkInputs = [ pmccabe ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f033de3b8f..8cba9f40360 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10342,7 +10342,7 @@ with pkgs;
 
   webkitgtk = webkitgtk214x;
 
-  webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
+  webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu;
     gst-plugins-base = gst_all_1.gst-plugins-base;
     inherit (darwin) libobjc;
@@ -10353,7 +10353,7 @@ with pkgs;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
-  webkitgtk2 = webkitgtk24x.override {
+  webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override {
     withGtk2 = true;
     enableIntrospection = false;
   };
@@ -13550,7 +13550,7 @@ with pkgs;
 
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
-  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk2 = null; });
+  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk24x-gtk2 = null; });
 
   ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
 
@@ -14151,7 +14151,7 @@ with pkgs;
     inherit (gnome3) dconf;
     gconf = gnome2.GConf;
     goffice = goffice_0_8;
-    webkit = webkitgtk2;
+    webkit = webkitgtk24x-gtk2;
     guile = guile_1_8;
     slibGuile = slibGuile.override { scheme = guile_1_8; };
     glib = glib;
@@ -14534,7 +14534,7 @@ with pkgs;
   jbrout = callPackage ../applications/graphics/jbrout { };
 
   jumanji = callPackage ../applications/networking/browsers/jumanji {
-    webkitgtk = webkitgtk24x;
+    webkitgtk = webkitgtk24x-gtk3;
     gtk = gtk3;
   };
 
@@ -16126,7 +16126,7 @@ with pkgs;
   uwimap = callPackage ../tools/networking/uwimap { };
 
   uzbl = callPackage ../applications/networking/browsers/uzbl {
-    webkit = webkitgtk2;
+    webkit = webkitgtk24x-gtk2;
   };
 
   utox = callPackage ../applications/networking/instant-messengers/utox { };
@@ -16584,7 +16584,7 @@ with pkgs;
     gconf = gnome2.GConf;
     inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper;
     python = python27;
-    webkitgtk = webkitgtk2;
+    webkitgtk = webkitgtk24x-gtk2;
   };
 
   xournal = callPackage ../applications/graphics/xournal {
@@ -18612,12 +18612,12 @@ with pkgs;
   });
 
   vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 {
-    webkit = webkitgtk2;
+    webkit = webkitgtk24x-gtk2;
   };
   vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
 
   vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
-    webkit = webkitgtk2;
+    webkit = webkitgtk24x-gtk2;
   };
   vimb = wrapFirefox vimb-unwrapped { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 83baa3a9312..5dfbc73bf14 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21080,7 +21080,7 @@ in {
 
     buildInputs = [
       pkgs.pkgconfig pkgs.gtk2 self.pygtk pkgs.libxml2
-      pkgs.libxslt pkgs.libsoup pkgs.webkitgtk2 pkgs.icu
+      pkgs.libxslt pkgs.libsoup pkgs.webkitgtk24x-gtk2 pkgs.icu
     ];
 
     meta = {
-- 
GitLab


From f71b83ad7e61137f552ee96be8f6ca7bdc29d357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 May 2017 09:54:20 +0200
Subject: [PATCH 0037/1490] libdrm: 2.4.79 -> 2.4.81

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index de219bee382..4071b607d22 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.79";
+  name = "libdrm-2.4.81";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197";
+    sha256 = "8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From b4bb39642e80205355593468d8514c7e6a27d96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 19 May 2017 17:18:07 +0200
Subject: [PATCH 0038/1490] libdrm: support valgrind suppression via a lighter
 version

Fixes #25917.  It's all only about build-time dependency bloat and
consequent rebuild propagation.
---
 pkgs/development/libraries/libdrm/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix               | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 4071b607d22..a8cf2864807 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
+{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
 
 stdenv.mkDerivation rec {
   name = "libdrm-2.4.81";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libpthreadstubs libpciaccess ];
+  buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
     # libdrm as of 2.4.70 does not actually do anything with udev.
 
   patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   preConfigure = stdenv.lib.optionalString stdenv.isDarwin
     "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
-  configureFlags = [ "--disable-valgrind" ]
+  configureFlags = [ ]
     ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
     ++ stdenv.lib.optional stdenv.isDarwin "-C";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eab38dc9d5..798752121f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7154,7 +7154,8 @@ with pkgs;
   valgrind = callPackage ../development/tools/analysis/valgrind {
     inherit (darwin) xnu bootstrap_cmds cctools;
     llvm = llvm_39;
-   };
+  };
+  valgrind-light = self.valgrind.override { gdb = null; };
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
-- 
GitLab


From 27aaea0cd265b6b9fe5679a902fe7aa0b6b758f1 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 26 May 2017 09:23:47 -0300
Subject: [PATCH 0039/1490] qt5ct: 0.30 -> 0.32

---
 pkgs/tools/misc/qt5ct/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index 4377b386d85..dd62fe461c6 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -1,17 +1,18 @@
-{stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper}:
+{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
-  version = "0.30";
+  version = "0.32";
 
   src = fetchurl {
     url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2";
-    sha256 = "1k0ywd440qvf84chadjb4fnkn8dkfl56cc3a6wqg6a59drslvng6";
+    sha256 = "0gzmqx6j8g8vgdg5sazfw31h825jdsjbkj8lk167msvahxgrf0fm";
   };
 
-  buildInputs = [ qtbase qtsvg ];
   nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ];
 
+  buildInputs = [ qtbase qtsvg ];
+
   preConfigure = ''
     qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins"
   '';
-- 
GitLab


From 2ff488c267a873ba583d0bafbb27b166eea53893 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 27 May 2017 17:22:11 +0200
Subject: [PATCH 0040/1490] python.pkgs.django_hijack

Get rid of overriding inside the fixed-point combinator. Overriding
versions inside the set causes trouble when combining packages.
---
 pkgs/top-level/python-packages.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0cc9820f4c1..39eb8785397 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10193,6 +10193,9 @@ in {
     };
   };
 
+  # This package likely needs an older version of Django.
+  # Override the package set and set e.g. `django = super.django_1_9`.
+  # See the Nixpkgs manual for examples on how to override the package set.
   django_hijack = buildPythonPackage rec {
     name = "django-hijack-${version}";
     version = "2.0.7";
@@ -10202,12 +10205,7 @@ in {
       sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04";
     };
 
-    # TODO improve the that multi-override necessity (the fixpoint based python
-    # packages work can be the solution)
-    propagatedBuildInputs = with self; [ django_1_9 (django_compat.override {
-      django = django_1_9;
-      django_nose = django_nose.override { propagatedBuildInputs = [django_1_9 nose]; };
-    }) ];
+    propagatedBuildInputs = with self; [ django django_compat ];
 
     meta = {
       description = "Allows superusers to hijack (=login as) and work on behalf of another user";
-- 
GitLab


From 19c298e97328ee78e639682ec195ce3e820d8387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 27 May 2017 17:31:25 +0200
Subject: [PATCH 0041/1490] tinc: Mention in docs that the host name may not be
 used verbatim. (#26157)

* tinc: Mention in docs that the host name may not be used verbatim.

Source:

  https://github.com/gsliepen/tinc/blob/5c344f297682cf11793407fca4547968aee22d95/src/net_setup.c#L341

* tinc: also replaces non-alphanumeric characters.
---
 nixos/modules/services/networking/tinc.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 6cb40185274..79a0aa953fe 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -35,7 +35,8 @@ in
               description = ''
                 The name of the node which is used as an identifier when communicating
                 with the remote nodes in the mesh. If null then the hostname of the system
-                is used.
+                is used to derive a name (note that tinc may replace non-alphanumeric characters in
+                hostnames by underscores).
               '';
             };
 
-- 
GitLab


From 6de69a2425446035af7b589809de5fd2f3e637dd Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Sat, 27 May 2017 17:42:48 +0200
Subject: [PATCH 0042/1490] simpleproxy: init at 3.5

---
 pkgs/tools/networking/simpleproxy/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/networking/simpleproxy/default.nix

diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix
new file mode 100644
index 00000000000..476e7dc229d
--- /dev/null
+++ b/pkgs/tools/networking/simpleproxy/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "simpleproxy-${version}";
+  version = "3.5";
+  rev = "v.${version}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "vzaliva";
+    repo = "simpleproxy";
+    sha256 = "1my9g4vp19dikx3fsbii4ichid1bs9b9in46bkg05gbljhj340f6";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/vzaliva/simpleproxy;
+    description = "A simple TCP proxy";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.montag451 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23a4bc11245..72bbb30fc6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4056,6 +4056,8 @@ with pkgs;
   silver-searcher = callPackage ../tools/text/silver-searcher { };
   ag = self.silver-searcher;
 
+  simpleproxy = callPackage ../tools/networking/simpleproxy { };
+
   simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
 
   sipsak = callPackage ../tools/networking/sipsak { };
-- 
GitLab


From 476086929af70ed022c79fdc5cced15e502ee2b8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 26 May 2017 08:41:58 +0200
Subject: [PATCH 0043/1490] python.pkgs.urllib3: disable tests

because there are transient failures too often.
---
 pkgs/top-level/python-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39eb8785397..3732556bfad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6295,6 +6295,8 @@ in {
       nosetests -v --cover-min-percentage 1
     '';
 
+    doCheck = false;
+
     buildInputs = with self; [ coverage tornado mock nose psutil pysocks ];
 
     meta = {
-- 
GitLab


From d55c21d89d8a43ecf36ee0871a9509a6b50a1027 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sat, 27 May 2017 13:00:26 -0400
Subject: [PATCH 0044/1490] vscode: 1.12.1 -> 1.12.2

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 81aca06267b..47fb24ca2cc 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.12.1";
+  version = "1.12.2";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0i4zqxbq7bm2afzyny3a53sq1fghlz5an1z8fkqh5i3029s635h9";
-    "x86_64-linux" = "0kwmfiyb70if4svamnivbc9w65c14j3lrn5vysqkc4b8hlk4r75i";
-    "x86_64-darwin" = "1dgs4k4m885qzammhj0x9k6pd8rayxn61iq3fiazp0w8v5bhl4l5";
+    "i686-linux" = "0221s8vx32haqr31wkkm637gya3vljbkim59i7a2hhwxh2gcs2fk";
+    "x86_64-linux" = "0p6ck2lc9lln96lib5r5yfbrd04rgsbzhvf1lx2kykn428ddxi9s";
+    "x86_64-darwin" = "1s7hyr245v4z2g357m7ajnh8y1cqixricpkx329xls4292qb7rh4";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
-- 
GitLab


From 63b3212471e1e6f4f65064c2b60167097edbdd64 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sat, 27 May 2017 13:04:08 -0400
Subject: [PATCH 0045/1490] gitkraken: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 1404bd97599..23a3ab7fa5e 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "1in8caxsc8fld1sl6d9nzch86s9x0770qi6amh573zmb80yyd743";
+    sha256 = "1msdwqp20pwaxv1a6maqb7wmaq00m8jpdga7fmbjcnpvkcdz49l7";
   };
 
   libPath = makeLibraryPath [
-- 
GitLab


From 5e659e94a6061c9acd983ad0b5c26206b83f5735 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 25 May 2017 15:07:00 -0500
Subject: [PATCH 0046/1490] lldb-4: Patch to fix libedit usage on Linux

Idea from:
https://bugs.llvm.org//show_bug.cgi?id=28898#c7

Fixes ability to use arrow keys.
---
 .../compilers/llvm/4/lldb-libedit.patch       | 30 +++++++++++++++++++
 pkgs/development/compilers/llvm/4/lldb.nix    |  7 ++---
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/4/lldb-libedit.patch

diff --git a/pkgs/development/compilers/llvm/4/lldb-libedit.patch b/pkgs/development/compilers/llvm/4/lldb-libedit.patch
new file mode 100644
index 00000000000..73459ce6c86
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4/lldb-libedit.patch
@@ -0,0 +1,30 @@
+From 94764369222a8e6c65420a6981d7f179a18a5417 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Thu, 25 May 2017 15:03:42 -0500
+Subject: [PATCH] EditLine.h: libedit supports wide chars on NixOS
+
+---
+ include/lldb/Host/Editline.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/include/lldb/Host/Editline.h b/include/lldb/Host/Editline.h
+index faed373bc..b248cdee1 100644
+--- a/include/lldb/Host/Editline.h
++++ b/include/lldb/Host/Editline.h
+@@ -43,12 +43,9 @@
+ // will only be
+ // used in cases where this is true.  This is a compile time dependecy, for now
+ // selected per target Platform
+-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
++// (libedit on NixOS is always wide-char capable)
+ #define LLDB_EDITLINE_USE_WCHAR 1
+ #include <codecvt>
+-#else
+-#define LLDB_EDITLINE_USE_WCHAR 0
+-#endif
+ 
+ #include "lldb/Host/ConnectionFileDescriptor.h"
+ #include "lldb/lldb-private.h"
+-- 
+2.13.0
+
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index 6e6fdf012dd..953755ab6ee 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation {
 
   src = fetch "lldb" "0g83hbw1r4gd0z8hlph9i34xs6dlcc69vz3h2bqwkhb2qq2qzg9d";
 
-  patchPhase = ''
+  patches = [ ./lldb-libedit.patch ];
+  postPatch = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
     sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
       cmake/modules/LLDBStandalone.cmake
@@ -35,10 +36,6 @@ stdenv.mkDerivation {
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
 
-  cmakeFlags = [
-    "-DLLDB_DISABLE_LIBEDIT=ON"
-  ];
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0916c26ed6aa7bda09399c8fc8fd444204ccfa59 Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Sat, 27 May 2017 16:17:35 -0400
Subject: [PATCH 0047/1490] symlinkJoin: eliminate lndir spam

By default lndir outputs the name of each subdirectory as it descends into it; this commit gives it the -silent flag to disable this behavior
---
 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 1529869aa33..4debd963639 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -71,7 +71,7 @@ rec {
       ''
         mkdir -p $out
         for i in $paths; do
-          ${lndir}/bin/lndir $i $out
+          ${lndir}/bin/lndir -silent $i $out
         done
         ${postBuild}
       '';
-- 
GitLab


From ff1253200bbcdaa37b0990cba971bd93f8009f93 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 24 May 2017 00:58:08 +0200
Subject: [PATCH 0048/1490] darwin-ICU: init at 531.48

---
 .../apple-source-releases/ICU/default.nix     | 22 +++++++++++++++++++
 .../darwin/apple-source-releases/default.nix  |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix

diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
new file mode 100644
index 00000000000..a9d06fc9dbc
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, cctools, appleDerivation }:
+
+appleDerivation {
+  buildInputs = [ cctools ];
+
+  postPatch = ''
+    substituteInPlace makefile \
+      --replace /usr/bin/ "" \
+      --replace '$(ISYSROOT)' "" \
+      --replace 'shell xcodebuild -version -sdk' 'shell true' \
+      --replace 'shell xcrun -sdk $(SDKPATH) -find' 'shell echo' \
+      --replace '-install_name $(libdir)' "-install_name $out/lib/" \
+      --replace /usr/local/bin/ /bin/ \
+      --replace /usr/lib/ /lib/ \
+  '';
+
+  makeFlags = [ "DSTROOT=$(out)" ];
+
+  postInstall = ''
+    mv $out/usr/local/include $out/include
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 29a0658d438..c8410a9cbbd 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -47,6 +47,7 @@ let
     };
     "osx-10.10.5" = {
       adv_cmds      = "158";
+      ICU           = "531.48";
       Security      = "57031.40.6";
 
       IOAudioFamily                        = "203.3";
@@ -197,6 +198,7 @@ let
     dtrace          = applePackage "dtrace"            "osx-10.11.6"     "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {};
     dyld            = applePackage "dyld"              "osx-10.11.6"     "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {};
     eap8021x        = applePackage "eap8021x"          "osx-10.11.6"     "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {};
+    ICU             = applePackage "ICU"               "osx-10.10.5"     "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {};
     IOKit           = applePackage "IOKit"             "osx-10.11.6"     "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; };
     launchd         = applePackage "launchd"           "osx-10.9.5"      "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
     libauto         = applePackage "libauto"           "osx-10.9.5"      "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {};
-- 
GitLab


From 857648dd31281c166aaada04145dd3301da74350 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 24 May 2017 01:06:01 +0200
Subject: [PATCH 0049/1490] darwin-libplatform: init at 125

---
 .../darwin/apple-source-releases/default.nix           |  2 ++
 .../apple-source-releases/libplatform/default.nix      | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix

diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index c8410a9cbbd..b77ca8cea32 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -30,6 +30,7 @@ let
       # is the right one, even though it isn't. The version I have here doesn't appear to be linked
       # to any OS releases, but Apple also doesn't mention mDNSResponder from 10.11 to 10.11.6, and
       # neither of those versions are publicly available.
+      libplatform   = "125";
       mDNSResponder = "625.41.2";
 
       libutil       = "43";
@@ -215,6 +216,7 @@ let
     Libinfo         = applePackage "Libinfo"           "osx-10.11.6"     "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {};
     Libm            = applePackage "Libm"              "osx-10.7.4"      "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
     Libnotify       = applePackage "Libnotify"         "osx-10.11.6"     "0zbcyxlcfhf91jxczhd5bq9qfgvg494gwwp3l7q5ayb2qdihzr8b" {};
+    libplatform     = applePackage "libplatform"       "osx-10.11.6"     "1v4ik6vlklwsi0xb1g5kmhy29j9xk5m2y8xb9zbi1k4ng8x39czk" {};
     libpthread      = applePackage "libpthread"        "osx-10.11.6"     "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {};
     libresolv       = applePackage "libresolv"         "osx-10.11.6"     "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {};
     Libsystem       = applePackage "Libsystem"         "osx-10.11.6"     "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
new file mode 100644
index 00000000000..65accc870d7
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
@@ -0,0 +1,10 @@
+{ stdenv, appleDerivation }:
+
+appleDerivation {
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir $out
+    cp -r include $out/include
+  '';
+}
-- 
GitLab


From bf58495177670f76582a8a2afb8888af3815232f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 24 May 2017 01:13:20 +0200
Subject: [PATCH 0050/1490] darwin-dispatch: 339.92.1 -> 442.1.4

---
 pkgs/os-specific/darwin/apple-source-releases/default.nix    | 4 ++--
 .../darwin/apple-source-releases/libdispatch/default.nix     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index b77ca8cea32..2182528e74d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -49,6 +49,7 @@ let
     "osx-10.10.5" = {
       adv_cmds      = "158";
       ICU           = "531.48";
+      libdispatch   = "442.1.4";
       Security      = "57031.40.6";
 
       IOAudioFamily                        = "203.3";
@@ -72,7 +73,6 @@ let
       launchd            = "842.92.1";
       libauto            = "185.5";
       Libc               = "997.90.3"; # We use this, but not from here
-      libdispatch        = "339.92.1";
       Libsystem          = "1197.1.1";
       Security           = "55471.14.18";
       security_dotmac_tp = "55107.1";
@@ -211,7 +211,7 @@ let
     };
     Libc_old        = applePackage "Libc/825_40_1.nix" "osx-10.8.5"      "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {};
     libclosure      = applePackage "libclosure"        "osx-10.11.6"     "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {};
-    libdispatch     = applePackage "libdispatch"       "osx-10.9.5"      "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {};
+    libdispatch     = applePackage "libdispatch"       "osx-10.10.5"     "0jsfbzp87lwk9snlby0hd4zvj7j894p5q3cw0wdx9ny1mcp3kdcj" {};
     libiconv        = applePackage "libiconv"          "osx-10.11.6"     "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {};
     Libinfo         = applePackage "Libinfo"           "osx-10.11.6"     "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {};
     Libm            = applePackage "Libm"              "osx-10.7.4"      "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index fe65e290717..c80e3757569 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
@@ -6,8 +6,11 @@ appleDerivation {
   installPhase = ''
     mkdir -p $out/include/dispatch $out/include/os
 
-    cp -r dispatch/*.h $out/include/dispatch
+    # Move these headers so CF can find <os/voucher_private.h>
+    mv private/voucher*.h  $out/include/os
     cp -r private/*.h  $out/include/dispatch
+
+    cp -r dispatch/*.h $out/include/dispatch
     cp -r os/object*.h  $out/include/os
   '';
 }
-- 
GitLab


From 815f25f31b82a5ca43cc3e4728320debfd1fef13 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 24 May 2017 01:26:43 +0200
Subject: [PATCH 0051/1490] darwin-CF: 855.17 -> 1153.18

---
 .../CF/add-cf-initialize.patch                 | 18 ------------------
 .../apple-source-releases/CF/default.nix       |  7 +++----
 .../apple-source-releases/CF/remove-xpc.patch  | 17 +++++++++++++++++
 .../darwin/apple-source-releases/default.nix   |  4 ++--
 4 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch

diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch
deleted file mode 100644
index 46c230cfd1d..00000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CF-855.17/CFRuntime.c	2014-11-26 21:29:48.000000000 -0800
-+++ CF-855.17/CFRuntime.c.new	2014-11-26 21:30:01.000000000 -0800
-@@ -756,6 +756,7 @@
- extern void __CFErrorInitialize(void);
- extern void __CFTreeInitialize(void);
- extern void __CFURLInitialize(void);
-+extern void __CFPreferencesDomainInitialize(void);
- #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
- extern void __CFMachPortInitialize(void);
- #endif
-@@ -1015,6 +1016,7 @@
-         __CFErrorInitialize();
-         __CFTreeInitialize();
-         __CFURLInitialize();
-+        __CFPreferencesDomainInitialize();
-         
- #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
-         __CFBundleInitialize();
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
index 3993a360156..e44966aa84d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, appleDerivation, icu, dyld, libdispatch, launchd, libclosure }:
+{ stdenv, appleDerivation, ICU, dyld, libdispatch, libplatform, launchd, libclosure }:
 
 # this project uses blocks, a clang-only extension
 assert stdenv.cc.isClang;
 
 appleDerivation {
-  buildInputs = [ dyld icu libdispatch launchd libclosure ];
+  buildInputs = [ dyld ICU libdispatch libplatform launchd libclosure ];
 
-  patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ];
+  patches = [ ./add-cfmachport.patch ./cf-bridging.patch ./remove-xpc.patch ];
 
   __propagatedImpureHostDeps = [ "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" ];
 
@@ -19,7 +19,6 @@ appleDerivation {
       --replace "/bin/" "" \
       --replace "INSTALLNAME=/System" "INSTALLNAME=$out" \
       --replace "install_name_tool -id /System" "install_name_tool -id $out" \
-      --replace "-licucore.A" "-licui18n -licuuc" \
       --replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \
       --replace 'chmod -RH' 'chmod -R'
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
new file mode 100644
index 00000000000..a7b9fe48643
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
@@ -0,0 +1,17 @@
+diff --git a/CFBundlePriv.h b/CFBundlePriv.h
+index d4feb5f..e7b52e8 100644
+--- a/CFBundlePriv.h
++++ b/CFBundlePriv.h
+@@ -254,12 +254,6 @@ Boolean _CFBundleGetStringsFilesShared(CFBundleRef bundle);
+ CF_EXPORT
+ CFURLRef _CFBundleCopyFrameworkURLForExecutablePath(CFStringRef executablePath);
+ 
+-#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)
+-#include <xpc/xpc.h>
+-CF_EXPORT
+-void _CFBundleSetupXPCBootstrap(xpc_object_t bootstrap) CF_AVAILABLE(10_10, 8_0);
+-#endif
+-
+ /* Functions deprecated as SPI */
+ 
+ CF_EXPORT
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 2182528e74d..a8509d1f009 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -48,6 +48,7 @@ let
     };
     "osx-10.10.5" = {
       adv_cmds      = "158";
+      CF            = "1153.18";
       ICU           = "531.48";
       libdispatch   = "442.1.4";
       Security      = "57031.40.6";
@@ -69,7 +70,6 @@ let
       IOKitUser                            = "1050.20.2";
     };
     "osx-10.9.5" = {
-      CF                 = "855.17";
       launchd            = "842.92.1";
       libauto            = "185.5";
       Libc               = "997.90.3"; # We use this, but not from here
@@ -191,7 +191,7 @@ let
     bootstrap_cmds  = applePackage "bootstrap_cmds"    "dev-tools-7.0"   "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {};
     bsdmake         = applePackage "bsdmake"           "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {};
     CarbonHeaders   = applePackage "CarbonHeaders"     "osx-10.6.2"      "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {};
-    CF              = applePackage "CF"                "osx-10.9.5"      "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {};
+    CF              = applePackage "CF"                "osx-10.10.5"     "07f5psjxi7wyd13ci4x83ya5hy6p69sjfqcpp2mmxdlhd8yzkf74" {};
     CommonCrypto    = applePackage "CommonCrypto"      "osx-10.11.6"     "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {};
     configd         = applePackage "configd"           "osx-10.8.5"      "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {};
     copyfile        = applePackage "copyfile"          "osx-10.11.6"     "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {};
-- 
GitLab


From 077840e5283719b135d267d9a64ca99543886577 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 24 May 2017 01:36:50 +0200
Subject: [PATCH 0052/1490] darwin-stdenv: use darwin.ICU instread of icu

---
 pkgs/stdenv/darwin/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 37587e3800d..051242ff544 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -165,14 +165,14 @@ in rec {
 
   persistent1 = prevStage: self: super: with prevStage; {
     inherit
-      zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python
+      zlib patchutils m4 scons flex perl bison unifdef unzip openssl python
       libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
       openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
       findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
 
     darwin = super.darwin // {
       inherit (darwin)
-        dyld Libsystem xnu configd libdispatch libclosure launchd;
+        dyld Libsystem xnu configd ICU libdispatch libclosure launchd;
     };
   };
 
@@ -185,8 +185,8 @@ in rec {
 
     allowedRequisites =
       [ bootstrapTools ] ++
-      (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++
-      (with pkgs.darwin; [ dyld Libsystem CF locale ]);
+      (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
+      (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
 
     overrides = persistent1 prevStage;
   };
@@ -221,8 +221,8 @@ in rec {
 
     allowedRequisites =
       [ bootstrapTools ] ++
-      (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++
-      (with pkgs.darwin; [ dyld Libsystem locale ]);
+      (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
+      (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
 
     overrides = persistent2 prevStage;
   };
@@ -256,7 +256,7 @@ in rec {
   persistent4 = prevStage: self: super: with prevStage; {
     inherit
       gnumake gzip gnused bzip2 gawk ed xz patch bash
-      libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
+      libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
       coreutils findutils diffutils patchutils;
 
     llvmPackages = super.llvmPackages // {
@@ -264,7 +264,7 @@ in rec {
     };
 
     darwin = super.darwin // {
-      inherit (darwin) dyld Libsystem cctools libiconv;
+      inherit (darwin) dyld ICU Libsystem cctools libiconv;
     };
   } // lib.optionalAttrs (super.targetPlatform == localSystem) {
     # Need to get rid of these when cross-compiling.
@@ -310,13 +310,13 @@ in rec {
     };
 
     allowedRequisites = (with pkgs; [
-      xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
+      xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out
       bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
       gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
       gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
       binutils-raw.dev binutils gettext
     ]) ++ (with pkgs.darwin; [
-      dyld Libsystem CF cctools libiconv locale
+      dyld Libsystem CF cctools ICU libiconv locale
     ]);
 
     overrides = self: super:
-- 
GitLab


From 91caa85804a54a00dd38befb7b34778253ae61aa Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 24 May 2017 21:11:03 +0200
Subject: [PATCH 0053/1490] darwin-Libsystem: include libplatform headers

---
 .../darwin/apple-source-releases/Libsystem/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index ea5aac60ab9..e3583b3bf84 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -1,6 +1,6 @@
 { stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo,
   dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile,
-  removefile, libresolv, Libnotify, libpthread, mDNSResponder, launchd, libutil, version }:
+  removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
 
 appleDerivation rec {
   phases = [ "unpackPhase" "installPhase" ];
@@ -19,7 +19,7 @@ appleDerivation rec {
 
     for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \
                ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \
-               ${Libnotify} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do
+               ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do
       (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
     done
 
-- 
GitLab


From a50315d7365ebb54fb59c2e409ae49ae608012bd Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 27 May 2017 23:20:32 +0200
Subject: [PATCH 0054/1490] tinycc: 0.9.27pre-20170225 -> 0.9.27pre-20170527

Contains fixes for the x86_64 codegen [1]

[1]: https://lists.nongnu.org/archive/html/tinycc-devel/2017-05/msg00102.html
---
 pkgs/development/compilers/tinycc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index dfbbaa4d431..fcad6045dbf 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,10 +2,10 @@
 with stdenv.lib;
 
 let
-  date = "20170225";
+  date = "20170527";
   version = "0.9.27pre-${date}";
-  rev = "bb93064d7857d887b674999c9b4152b44a628f9a";
-  sha256 = "12wcahj1x4qy9ia931i23lvwkqjmyhaks3wipnzvbnlnc2b03kpr";
+  rev = "53c5fc2246270e0242903de0152a9a5d40f3d679";
+  sha256 = "0z5ayz0kdn5xqm84k730hmd7r9cq0zxxf45g5phgqppdfajrmswz";
 in
 
 stdenv.mkDerivation rec {
-- 
GitLab


From 1f89ba117c0a0bb84178499aebb7868dc85e35e1 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 27 May 2017 22:39:16 -0400
Subject: [PATCH 0055/1490] ibus-m17n: fix homepage URL.

The URL was erroneous.
---
 pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index 2d25e6bf430..c53f766cb7d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     isIbusEngine = true;
     description  = "m17n engine for ibus";
-    homepage     = https://github.com.com/ibus/ibus-m17n;
+    homepage     = https://github.com/ibus/ibus-m17n;
     license      = licenses.gpl2;
     platforms    = platforms.linux;
     maintainers  = with maintainers; [ ericsagnes ];
-- 
GitLab


From 636ce2dfdbb145e7b966d1b4f9cb9ce4b91d96db Mon Sep 17 00:00:00 2001
From: Johannes Barthelmes <jbarthelmes95@gmail.com>
Date: Fri, 26 May 2017 03:41:43 +0200
Subject: [PATCH 0056/1490] factorio: 0.15.1 -> 0.15.16

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

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index f0de56b0953..861a44fea8c 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de
 
 with stdenv.lib;
 let
-  version = if releaseType != "demo" then "0.15.1" else "0.14.23";
+  version = if releaseType != "demo" then "0.15.16" else "0.14.23";
 
   arch = if stdenv.system == "x86_64-linux" then {
     inUrl = "linux64";
@@ -27,8 +27,8 @@ let
     url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
     name = "factorio_${releaseType}_${arch.inTar}-${version}.${extension}";
     x64 = {
-      headless =           fetchurl { inherit name url; sha256 = "1z84a9yzlld6fv53viwvswp52hlc9fkxzhb2pil7sidzkws3g49l"; };
-      alpha    = authenticatedFetch { inherit name url; sha256 = "11bxasghrhqb2yg1842v1608x3mjdjv3015jgifpv1xmcqak44jp"; };
+      headless =           fetchurl { inherit name url; sha256 = "0ig0nrvqllb9294qn2ci5j5s31ycsjn23bp6hc633xqkgfmklmic"; };
+      alpha    = authenticatedFetch { inherit name url; sha256 = "0bf0z6fi0cpbq487hz4sz8ljapchzhld01sj767wsldakjfkm9g9"; };
       demo     =           fetchurl { inherit name url; sha256 = "10a2lwmspqviwgymn3zhjgpiynsa6dplgnikdirma5sl2hhcfb6s"; };
     };
     i386 = {
-- 
GitLab


From b1f56b8b0c87ea01e1cf5f423124b83170d26272 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 28 May 2017 09:34:43 +0300
Subject: [PATCH 0057/1490] wirelessInterfaces: Add a missing parameter

---
 nixos/modules/tasks/network-interfaces.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index e9a3dca6418..8ce7b2d2cf3 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1110,7 +1110,7 @@ in
             '';
 
             # Udev script to execute for a new WLAN interface. The script configures the new WLAN interface.
-            newInterfaceScript = new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" ''
+            newInterfaceScript = device: new: pkgs.writeScript "udev-run-script-wlan-interfaces-${new._iName}.sh" ''
               #!${pkgs.stdenv.shell}
               # Configure the new interface
               ${pkgs.iw}/bin/iw dev ${new._iName} set type ${new.type}
@@ -1132,7 +1132,7 @@ in
             # It is important to have that rule first as overwriting the NAME attribute also prevents the
             # next rules from matching.
             ${flip (concatMapStringsSep "\n") (wlanListDeviceFirst device wlanDeviceInterfaces."${device}") (interface:
-            ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript interface}"'')}
+            ''ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{INTERFACE}=="${interface._iName}", ${systemdAttrs interface._iName}, RUN+="${newInterfaceScript device interface}"'')}
 
             # Add the required, new WLAN interfaces to the default WLAN interface with the
             # persistent, default name as assigned by udev.
-- 
GitLab


From b27a2667db0b2b2b2546f1c2d5bdcc78e13132d3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 28 May 2017 08:34:46 +0200
Subject: [PATCH 0058/1490] python.pkgs.hypothesis fixup

---
 pkgs/development/python-modules/hypothesis.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
index 0927c703fbf..b9f95d1a031 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
 
   # https://github.com/DRMacIver/hypothesis/issues/300
   checkPhase = ''
+    rm tox.ini # This file changes how py.test runs and breaks it
     py.test tests/cover
   '';
 
-- 
GitLab


From d0f2361bc1ffdff631fc7ebb9c2ec1b08b135898 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 28 May 2017 10:08:10 +0200
Subject: [PATCH 0059/1490] python.pkgs.simplejson: 3.8.1 -> 3.10.0

---
 .../python-modules/simplejson/default.nix     | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +----------------
 2 files changed, 29 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/simplejson/default.nix

diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
new file mode 100644
index 00000000000..983d1765521
--- /dev/null
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "simplejson";
+  version = "3.10.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2";
+  };
+
+  meta = {
+    description = "A simple, fast, extensible JSON encoder/decoder for Python";
+    longDescription = ''
+      simplejson is compatible with Python 2.4 and later with no
+      external dependencies.  It covers the full JSON specification
+      for both encoding and decoding, with unicode support.  By
+      default, encoding is done in an encoding neutral fashion (plain
+      ASCII with \uXXXX escapes for unicode characters).
+    '';
+    homepage = http://code.google.com/p/simplejson/;
+    license = lib.licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3732556bfad..3f5b20a62d6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22775,30 +22775,7 @@ in {
     };
   };
 
-  simplejson = buildPythonPackage (rec {
-    name = "simplejson-3.8.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/simplejson/${name}.tar.gz";
-      sha256 = "14r4l4rcsyf87p2j4ycsbb017n4vzxfmv285rq2gny4w47rwi2j2";
-    };
-
-    meta = {
-      description = "A simple, fast, extensible JSON encoder/decoder for Python";
-
-      longDescription = ''
-        simplejson is compatible with Python 2.4 and later with no
-        external dependencies.  It covers the full JSON specification
-        for both encoding and decoding, with unicode support.  By
-        default, encoding is done in an encoding neutral fashion (plain
-        ASCII with \uXXXX escapes for unicode characters).
-      '';
-
-      homepage = http://code.google.com/p/simplejson/;
-
-      license = licenses.mit;
-    };
-  });
+  simplejson = callPackage ../development/python-modules/simplejson { };
 
   simpleldap = buildPythonPackage rec {
     version = "0.8";
-- 
GitLab


From 1f407a46d60dd7e001ec662edf3be4ccf8cccc38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 May 2017 11:25:23 +0200
Subject: [PATCH 0060/1490] mesa: feature update 17.0.6 -> 17.1.1

Main changes: https://www.mesa3d.org/relnotes/17.1.0.html
- two options got renamed
- "ilo" driver was removed upstream
- python is no longer needed for build

I tested nouveau for a bit.
---
 pkgs/development/libraries/mesa/default.nix   | 13 ++++++-------
 .../libraries/mesa/symlink-drivers.patch      | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index b6ca7a0a476..a8561d22bf5 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, intltool, autoreconfHook, substituteAll
 , file, expat, libdrm, xorg, wayland, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva
-, libelf, libvdpau, python2
+, libelf, libvdpau
 , grsecEnabled ? false
 , enableRadv ? false
 # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
@@ -36,7 +36,7 @@ let
     then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
     else if stdenv.isAarch64
     then ["nouveau" "vc4" ]
-    else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
+    else ["i915" "r300" "r600" "radeonsi" "nouveau"];
   defaultDriDrivers =
     if (stdenv.isArm || stdenv.isAarch64)
     then ["nouveau"]
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.0.6";
+  version = "17.1.1";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "17d60jjzg4ddm95gk2cqx0xz6b9anmmz6ax4majwr3gis2yg7v49";
+    sha256 = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef";
   };
 
   prePatch = "patchShebangs .";
@@ -103,7 +103,7 @@ stdenv.mkDerivation {
     "--localstatedir=/var"
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${driverLink}/lib/dri"
-    "--with-egl-platforms=x11,wayland,drm"
+    "--with-platforms=x11,wayland,drm"
   ]
   ++ (optional (galliumDrivers != [])
       ("--with-gallium-drivers=" +
@@ -126,7 +126,7 @@ stdenv.mkDerivation {
     "--enable-glx"
     "--enable-glx-tls"
     "--enable-gallium-osmesa" # used by wine
-    "--enable-gallium-llvm"
+    "--enable-llvm"
     "--enable-egl"
     "--enable-xa" # used in vmware driver
     "--enable-gbm"
@@ -152,7 +152,6 @@ stdenv.mkDerivation {
     libX11 libXext libxcb libXt libXfixes libxshmfence
     libffi wayland libvdpau libelf libXvMC
     libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
-    (python2.withPackages (ps: [ ps.Mako ]))
   ];
 
 
diff --git a/pkgs/development/libraries/mesa/symlink-drivers.patch b/pkgs/development/libraries/mesa/symlink-drivers.patch
index 68c0f1da26b..af2ec9fdb09 100644
--- a/pkgs/development/libraries/mesa/symlink-drivers.patch
+++ b/pkgs/development/libraries/mesa/symlink-drivers.patch
@@ -11,11 +11,12 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am mesa-12.0.
  install-data-hook:
  	for i in $(TARGET_DRIVERS); do                                  \
 -		ln -f $(DESTDIR)$(dridir)/gallium_dri.so                \
-+		ln -srf $(DESTDIR)$(dridir)/gallium_dri.so               \
++		ln -srf $(DESTDIR)$(dridir)/gallium_dri.so              \
  		      $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
  	done;                                                           \
--	$(RM) $(DESTDIR)$(dridir)/gallium_dri.*
-+	$(RM) $(DESTDIR)$(dridir)/gallium_dri.la
+-	$(RM) $(DESTDIR)$(dridir)/gallium_dri.*;                        \
++	$(RM) $(DESTDIR)$(dridir)/gallium_dri.la                        \
+ 	$(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true
  
  uninstall-hook:
  	for i in $(TARGET_DRIVERS); do                                  \
@@ -60,8 +61,9 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am mesa-12.
  		ln -sf $${l}						\
  		       $${dest_dir}/$${k};				\
  	done;								\
--	$(RM) $${dest_dir}/libvdpau_gallium.*
-+	$(RM) $${dest_dir}/libvdpau_gallium.la
+-	$(RM) $${dest_dir}/libvdpau_gallium.*;				\
++	$(RM) $${dest_dir}/libvdpau_gallium.la				\
+ 	$(RM) -d $${dest_dir} &>/dev/null || true
  
  uninstall-hook:
  	for i in $(TARGET_DRIVERS); do					\
@@ -73,7 +75,7 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0
  		k=libXvMC$${i}.$(LIB_EXT);				\
  		l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0;			\
 -		ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0	\
-+		ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0	\
++		ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
  		      $${dest_dir}/$${l};				\
  		ln -sf $${l}						\
  		       $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR);	\
@@ -81,8 +83,9 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0
  		ln -sf $${l}						\
  		       $${dest_dir}/$${k};				\
  	done;								\
--	$(RM) $${dest_dir}/libXvMCgallium.*
-+	$(RM) $${dest_dir}/libXvMCgallium.la
+-	$(RM) $${dest_dir}/libXvMCgallium.*;				\
++	$(RM) $${dest_dir}/libXvMCgallium.la				\
+ 	$(RM) -d $${dest_dir} &>/dev/null || true
  
  uninstall-hook:
  	for i in $(TARGET_DRIVERS); do					\
-- 
GitLab


From 3a3aab58fceac5d783d843b68526798a8f465619 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 28 May 2017 23:29:29 +1000
Subject: [PATCH 0061/1490] mod_auth_mellon: 0.12.0 -> 0.13.1

---
 pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index 67648f9d4f2..a99f081b24e 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "mod_auth_mellon-${version}";
-  version = "0.12.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "UNINETT";
     repo = "mod_auth_mellon";
     rev = "v${version}";
-    sha256 = "1p6v6vgrfvgvc5y2ygqyyxi0klpm3nxaw3fg35zmpmw663w8skqn";
+    sha256 = "16b43y5a5p8g1287x04rv923230cy8dfs2j18cx6208n4bv4dvnk";
   };
 
   patches = [
-- 
GitLab


From ac8a58b5b44859f805e9613ec6cd55c3904ecbc0 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 28 May 2017 01:07:47 +0100
Subject: [PATCH 0062/1490] python.pkgs.django_compat: get tests working &
 enable them

also add self as maintainer
---
 .../python-modules/django-compat/default.nix  | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
index 22f78533142..59103191285 100644
--- a/pkgs/development/python-modules/django-compat/default.nix
+++ b/pkgs/development/python-modules/django-compat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchFromGitHub, python,
   django, django_nose, six
 }:
 buildPythonPackage rec {
@@ -6,19 +6,38 @@ buildPythonPackage rec {
   name = "${pname}-${version}";
   version = "1.0.14";
 
-  src = fetchurl {
-    url = "mirror://pypi/d/django-compat/${name}.tar.gz";
-    sha256 = "18y5bxxmafcd4np42mzbalva5lpssq0b8ki7zckbzvdv2mnv43xj";
+  # the pypi packages don't include everything required for the tests
+  src = fetchFromGitHub {
+    owner = "arteria";
+    repo = "django-compat";
+    rev = "v${version}";
+    sha256 = "11g6ra6djkchqk44v8k7biaxd1v69qyyyask5l92vmrvb0qiwvm8";
   };
 
-  doCheck = false;
+  checkPhase = ''
+    runHook preCheck
 
-  buildInputs = [ django_nose ];
+    # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the
+    # source directory
+    mkdir -p testbase/compat
+    pushd testbase
+    # note we're not copying the direct contents of compat/ (notably __init__.py) so python won't recognize this as a
+    # package, but the tests need to be in a specific path for the test templates to get picked up.
+    cp -r ../compat/tests compat/
+    cp ../runtests.py .
+    ${python.interpreter} runtests.py compat/tests
+    popd
+
+    runHook postCheck
+  '';
+
+  checkInputs = [ django_nose ];
   propagatedBuildInputs = [ django six ];
 
   meta = with stdenv.lib; {
     description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11";
     homepage = https://github.com/arteria/django-compat;
     license = licenses.mit;
+    maintainers = with maintainers; [ ris ];
   };
 }
-- 
GitLab


From fa44b72d91625bcf5aee5438b10abdd0eb4e5acb Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 28 May 2017 12:24:02 +0100
Subject: [PATCH 0063/1490] python.pkgs.django_hijack: 2.0.7 -> 2.1.4

also fix & enable tests, add self as maintainer
---
 .../python-modules/django-hijack/default.nix  | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +---------
 2 files changed, 41 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/django-hijack/default.nix

diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
new file mode 100644
index 00000000000..8eb98924491
--- /dev/null
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python,
+  django, django_compat, django_nose
+}:
+buildPythonPackage rec {
+  name = "django-hijack-${version}";
+  version = "2.1.4";
+
+  # the pypi packages don't include everything required for the tests
+  src = fetchFromGitHub {
+    owner = "arteria";
+    repo = "django-hijack";
+    rev = "v${version}";
+    sha256 = "1wbm6l8mzpkj4wsj4fyfamzpzi3day2v1cva5j89v4dn4403jq21";
+  };
+
+  checkInputs = [ django_nose ];
+  propagatedBuildInputs = [ django django_compat ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the
+    # source directory
+    mkdir testbase
+    pushd testbase
+    cp ../runtests.py .
+    ${python.interpreter} runtests.py hijack
+    popd
+
+    runHook postCheck
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Allows superusers to hijack (=login as) and work on behalf of another user";
+    homepage = https://github.com/arteria/django-hijack;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ris ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3732556bfad..83f2e9cfcae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10195,26 +10195,10 @@ in {
     };
   };
 
-  # This package likely needs an older version of Django.
+  # This package may need an older version of Django.
   # Override the package set and set e.g. `django = super.django_1_9`.
   # See the Nixpkgs manual for examples on how to override the package set.
-  django_hijack = buildPythonPackage rec {
-    name = "django-hijack-${version}";
-    version = "2.0.7";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-hijack/${name}.tar.gz";
-      sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04";
-    };
-
-    propagatedBuildInputs = with self; [ django django_compat ];
-
-    meta = {
-      description = "Allows superusers to hijack (=login as) and work on behalf of another user";
-      homepage = https://github.com/arteria/django-hijack;
-      license = licenses.mit;
-    };
-  };
+  django_hijack = callPackage ../development/python-modules/django-hijack { };
 
   django_nose = buildPythonPackage rec {
     name = "django-nose-${version}";
-- 
GitLab


From a3bc7ec0f09759c4eb69948bacc1b471936ba826 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 28 May 2017 23:59:59 +1000
Subject: [PATCH 0064/1490] pick: 1.4.0 -> 1.6.1

---
 pkgs/tools/misc/pick/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix
index a407a85d1a2..075949f47e1 100644
--- a/pkgs/tools/misc/pick/default.nix
+++ b/pkgs/tools/misc/pick/default.nix
@@ -2,19 +2,23 @@
 
 stdenv.mkDerivation rec {
   name = "pick-${version}";
-  version = "1.4.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "thoughtbot";
     repo = "pick";
     rev = "v${version}";
-    sha256 = "113if0jh7svwrwrxhrsbi7h1whfr5707v2ny4dc9kk2sjbv6b9pg";
+    sha256 = "0iw3yqwg8j0pg56xx52xwn7n95vxlqbqh71zrc934v4mq971qlhd";
   };
 
   buildInputs = [ ncurses ];
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  postPatch = ''
+    sed -i -e 's/\[curses]/\[ncurses]/g' configure.ac
+  '';
+
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Fuzzy text selection utility";
-- 
GitLab


From cf456b9a8aa735570f1ff82525fcf054688a3cc0 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 28 May 2017 15:13:44 +0100
Subject: [PATCH 0065/1490] xonotic: fix audio

This fixes #26117.

Also allow easy switching to debug/profiling builds.
---
 pkgs/games/xonotic/default.nix | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 4c9cf1d010c..b6009ee72fd 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -27,11 +27,16 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "Xonotic/source/darkplaces";
 
+  # "debug", "release", "profile"
+  target = "release";
+
+  dontStrip = target != "release";
+
   buildPhase = ''
     DP_FS_BASEDIR="$out/share/xonotic"
-    make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release
-    make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release
-    make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release
+    make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-${target}
+    make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-${target}
+    make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-${target}
   '';
   enableParallelBuilding = true;
 
@@ -52,8 +57,16 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
   postFixup = ''
     patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-dedicated
-    patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-sdl
-    patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-glx
+    patchelf \
+        --add-needed ${curl.out}/lib/libcurl.so \
+        --add-needed ${libvorbis}/lib/libvorbisfile.so \
+        --add-needed ${libvorbis}/lib/libvorbis.so \
+        $out/bin/xonotic-glx
+    patchelf \
+        --add-needed ${curl.out}/lib/libcurl.so \
+        --add-needed ${libvorbis}/lib/libvorbisfile.so \
+        --add-needed ${libvorbis}/lib/libvorbis.so \
+        $out/bin/xonotic-sdl
   '';
 
   meta = {
-- 
GitLab


From 157b5bd1f0ce284bc258c5442e98f56ff65829da Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 28 May 2017 00:59:35 +0200
Subject: [PATCH 0066/1490] cppcheck: 1.78 -> 1.79

ChangeLog: https://sourceforge.net/p/cppcheck/news/2017/05/cppcheck-179/
---
 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 a394105faf4..ce9ca76a43b 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.78";
+  version = "1.79";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1cc60y2vjq4g88183jkan91ybzqy0n6p5ncs8z5rh6rjsvvrc9p4";
+    sha256 = "0vgh4zx191d7mcmiilkhcbd9jkspfkppl7l4y5451walvs9vd19b";
   };
 
   buildInputs = [ pcre ];
-- 
GitLab


From cce8dbf8d3f48182125b7112f2e8e57ccacc50fc Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Sun, 28 May 2017 18:16:00 +0200
Subject: [PATCH 0067/1490] git-annex-remote-rclone: 0.4 -> 0.5

---
 .../git-and-tools/git-annex-remote-rclone/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
index d1996b72154..d38529e92e6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "git-annex-remote-rclone-${version}";
-  version = "0.4";
+  version = "0.5";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "DanielDent";
     repo = "git-annex-remote-rclone";
-    sha256 = "1myk307hqm8dlxhkmwr347rdd28niv5h0gyrxm30y77zlly30ddk";
+    sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 6ecb92a3c346a0bd29fcea2b2d04ddde6417e4e9 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Sun, 28 May 2017 18:33:22 +0200
Subject: [PATCH 0068/1490] cfssl: init at 20170527

---
 pkgs/tools/security/cfssl/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/security/cfssl/default.nix

diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
new file mode 100644
index 00000000000..91a5fa4bdd2
--- /dev/null
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }:
+
+buildGoPackage rec {
+  name = "cfssl-${version}";
+  version = "20170527";
+
+  goPackagePath = "github.com/cloudflare/cfssl";
+
+  src = fetchFromGitHub {
+    owner = "cloudflare";
+    repo = "cfssl";
+    rev = "114dc9691ec7bf3dac49d5953eccf7d91a0e0904";
+    sha256 = "1ijq43mrzrf1gkgj5ssxq7sgy6sd4rl706dzqkq9krqv5f6kwhj1";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://cfssl.org/;
+    description = "Cloudflare's PKI and TLS toolkit";
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ mbrgm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cd3199a1d5..b08a42198e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1386,6 +1386,8 @@ with pkgs;
 
   c14 = callPackage ../applications/networking/c14 { };
 
+  cfssl = callPackage ../tools/security/cfssl { };
+
   checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
 
   clamav = callPackage ../tools/security/clamav { };
-- 
GitLab


From aee5fa2f4817c04e2169010ec7c52f9210eaa89c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 28 May 2017 20:00:07 +0200
Subject: [PATCH 0069/1490] moreutils: 0.59 -> 0.61

---
 pkgs/tools/misc/moreutils/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index a232028976d..51ac3249fed 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
+{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "moreutils-${version}";
-  version = "0.59";
+  version = "0.61";
 
-  src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz";
-    sha256 = "1d6ik3j4lwp90vb93p7yv60k6vk2chz448d1z9xrmxvv371i33m4";
+  src = fetchgit {
+    url = "git://git.joeyh.name/moreutils";
+    rev = "refs/tags/${version}";
+    sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr";
   };
 
   preBuild = ''
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young";
     homepage = https://joeyh.name/code/moreutils/;
-    maintainers = with maintainers; [ koral ];
+    maintainers = with maintainers; [ koral pSub ];
     platforms = platforms.all;
   };
 }
-- 
GitLab


From c06a10e05fedcd49c4b2f88a435e9aad64395d0a Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 28 May 2017 15:21:57 -0300
Subject: [PATCH 0070/1490] locate: fix creation of the parent directory of of
 locate database

---
 nixos/modules/misc/locate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 6d9bc915ba0..654cce95ab2 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -131,7 +131,7 @@ in {
         path = mkIf (!isMLocate) [ pkgs.su ];
         script =
           ''
-            install -m ${if isMLocate then "0750" else "0755"} -o root -g ${if isMLocate then "mlocate" else "root"} -d $(dirname ${cfg.output})
+            mkdir -m 0755 -p ${dirOf cfg.output}
             exec ${cfg.locate}/bin/updatedb \
               ${optionalString (cfg.localuser != null) ''--localuser=${cfg.localuser}''} \
               --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
-- 
GitLab


From 6ef6484dd645a7d1d6b1d3d993988ba5833a5701 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 28 May 2017 15:22:46 -0300
Subject: [PATCH 0071/1490] locate: does not use localuser for mlocate

---
 nixos/modules/misc/locate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 654cce95ab2..0fe91435ce8 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -133,7 +133,7 @@ in {
           ''
             mkdir -m 0755 -p ${dirOf cfg.output}
             exec ${cfg.locate}/bin/updatedb \
-              ${optionalString (cfg.localuser != null) ''--localuser=${cfg.localuser}''} \
+              ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \
               --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
           '';
         environment = {
-- 
GitLab


From 2262f892302a86ca413f6be9f0630d008f908784 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 28 May 2017 20:06:19 +0200
Subject: [PATCH 0072/1490] tor-browser-bundle-bin: additional download urls

To better support users that are unable to access the official Tor
distribution site, e.g., https://github.com/NixOS/nixpkgs/issues/26184
---
 .../browsers/tor-browser-bundle-bin/default.nix       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 4443c848066..2c9661c36fa 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -87,12 +87,18 @@ let
 
   srcs = {
     "x86_64-linux" = fetchurl {
-      url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
+      urls = [
+        "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
+        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
+      ];
       sha256 = "0jn98arczlgjigpmql1qg5b7izabv4zy4mji6vvcg3b8g1ma108r";
     };
 
     "i686-linux" = fetchurl {
-      url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
+      urls = [
+        "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
+        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
+      ];
       sha256 = "0micxgkbys0py4bj6csbc8xz4gq0x5v2zirgi38krnm5x5riqj3w";
     };
   };
@@ -105,6 +111,7 @@ stdenv.mkDerivation rec {
   src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
 
   preferLocalBuild = true;
+  allowSubstitutes = false;
 
   desktopItem = makeDesktopItem {
     name = "torbrowser";
-- 
GitLab


From 82b0b57580a2ce08b194771e7373187b51485335 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 28 May 2017 20:34:19 +0200
Subject: [PATCH 0073/1490] clang: fix libclang library id on darwin

---
 pkgs/development/compilers/llvm/4/clang/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 4fa180a2701..bc286eaf05e 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+, fixDarwinDylibNames
+}:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -14,7 +16,8 @@ let
     '';
 
     nativeBuildInputs = [ cmake python python.pkgs.sphinx ];
-    buildInputs = [ libedit libxml2 llvm ];
+    buildInputs = [ libedit libxml2 llvm ]
+      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
-- 
GitLab


From a6a21d7209a03bbb4ad413297f27c9326f87231c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 25 May 2017 18:54:34 +0200
Subject: [PATCH 0074/1490] rtags: remove workaround for libclang

---
 pkgs/development/tools/rtags/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 6ab227dedcd..4f396e26bf9 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -22,12 +22,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = lib.optionalString stdenv.isDarwin ''
-    for f in $out/bin/{rc,rdm,rp}; do
-      install_name_tool -change @rpath/libclang.dylib ${llvmPackages.clang.cc}/lib/libclang.dylib ''${f}
-    done
-  '';
-
   meta = {
     description = "C/C++ client-server indexer based on clang";
     homepage = https://github.com/andersbakken/rtags;
-- 
GitLab


From 132b503aacb7dcc181d12804dee110f68f9f3730 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Sun, 28 May 2017 14:19:40 -0400
Subject: [PATCH 0075/1490] GHCJS packages: avoid inode explosion

As noted in #25595, a change introduced in 4b77d425aa597 causes an
explosion of inodes due to the constructions of many, many `ghcEnv`
symlink forests. This commit undoes that change.

To discuss reworking the support for GHCJS plugins, please see: #26192

Fixes #25595
---
 pkgs/development/haskell-modules/generic-builder.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 653e5cd245c..7d21996fe1c 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -197,13 +197,11 @@ stdenv.mkDerivation ({
     ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
   '' + postPatch;
 
-  # for ghcjs, we want to put ghcEnv on PATH so compiler plugins will be available.
-  # TODO(cstrahan): would the same be of benefit to native ghc?
   setupCompilerEnvironmentPhase = ''
     runHook preSetupCompilerEnvironment
 
     echo "Build with ${ghc}."
-    export PATH="${if ghc.isGhcjs or false then ghcEnv else ghc}/bin:$PATH"
+    export PATH="${ghc}/bin:$PATH"
     ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
     packageConfDir="$TMPDIR/package.conf.d"
-- 
GitLab


From 663d369211d9a62233d69b159ff43fb051b7f532 Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Fri, 26 May 2017 15:55:15 -0700
Subject: [PATCH 0076/1490] pythonPackages.ntlm-auth: init at 1.0.3

---
 .../python-modules/ntlm-auth/default.nix      | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/ntlm-auth/default.nix

diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix
new file mode 100644
index 00000000000..03890f712af
--- /dev/null
+++ b/pkgs/development/python-modules/ntlm-auth/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pytest
+, unittest2
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "ntlm-auth";
+  version = "1.0.3";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jborean93";
+    repo = "ntlm-auth";
+    rev = "v${version}";
+    sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz";
+  };
+
+  checkInputs = [ mock pytest unittest2 ];
+  propagatedBuildInputs = [ six ];
+
+  # Functional tests require networking
+  checkPhase = ''
+    py.test --ignore=tests/functional/test_iis.py
+  '';
+
+  meta = with lib; {
+    description = "Calculates NTLM Authentication codes";
+    homepage = https://github.com/jborean93/ntlm-auth;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ elasticdog ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 83baa3a9312..18a0d7ac718 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -234,6 +234,8 @@ in {
 
   nltk = callPackage ../development/python-modules/nltk.nix { };
 
+  ntlm-auth = callPackage ../development/python-modules/ntlm-auth { };
+
   pitz = callPackage ../applications/misc/pitz { };
 
   plantuml = callPackage ../tools/misc/plantuml { };
-- 
GitLab


From 65587984e4576b07ffa31faa076fe016077579bb Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Fri, 26 May 2017 15:55:51 -0700
Subject: [PATCH 0077/1490] pythonPackages.requests_ntlm: init at 1.0.0

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

diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix
new file mode 100644
index 00000000000..c475ff85ff3
--- /dev/null
+++ b/pkgs/development/python-modules/requests_ntlm/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, ntlm-auth
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "requests_ntlm";
+  version = "1.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hb689p2jyb867c2wlq5mjkqxgc0jq6lxv3rmhw8rq9qangk3jjk";
+  };
+
+  propagatedBuildInputs = [ ntlm-auth requests ];
+
+  # Tests require networking
+  doCheck = false;
+
+  meta = with lib; {
+    description = "HTTP NTLM authentication support for python-requests";
+    homepage = https://github.com/requests/requests-ntlm;
+    license = licenses.isc;
+    maintainers = with maintainers; [ elasticdog ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 18a0d7ac718..451eafaf5df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21373,6 +21373,8 @@ in {
     };
   };
 
+  requests_ntlm = callPackage ../development/python-modules/requests_ntlm { };
+
   requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { };
 
   requests_toolbelt = buildPythonPackage rec {
-- 
GitLab


From c5b1a9da4bdf600eb9c33e1565536b7f0ea0f72f Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Fri, 26 May 2017 15:56:48 -0700
Subject: [PATCH 0078/1490] pythonPackages.pywinrm: 0.1.1 -> 0.2.2

---
 .../python-modules/pywinrm/default.nix        | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-----------
 2 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/pywinrm/default.nix

diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix
new file mode 100644
index 00000000000..b2b5ba20801
--- /dev/null
+++ b/pkgs/development/python-modules/pywinrm/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, mock
+, pytest
+, requests
+, requests_ntlm
+, six
+, xmltodict
+}:
+
+buildPythonPackage rec {
+  pname = "pywinrm";
+  version = "0.2.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06xc0mbqf718vmsp0fq0rb64nql66l5w2x23bmqnzl6nzc0gfc1h";
+  };
+
+  checkInputs = [ mock pytest ];
+  propagatedBuildInputs = [ requests requests_ntlm six xmltodict ];
+
+  meta = with lib; {
+    description = "Python library for Windows Remote Management";
+    homepage = "http://github.com/diyan/pywinrm/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ elasticdog ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 451eafaf5df..37466daace2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21092,25 +21092,7 @@ in {
     };
   };
 
-  pywinrm = buildPythonPackage rec {
-    version = "0.1.1";
-    name = "pywinrm-${version}";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/diyan/pywinrm/archive/v${version}.tar.gz";
-      sha256 = "1pc0987f6q5sxcgm50a1k1xz2pk45ny9xxnyapaf60662rcavvfb";
-    };
-
-    propagatedBuildInputs = with self; [ isodate kerberos xmltodict ];
-
-    meta = {
-      homepage = "http://github.com/diyan/pywinrm/";
-      description = "Python library for Windows Remote Management";
-      license = licenses.mit;
-      # error: libgssapi_krb5.so: cannot open shared object file: No such file or directory
-      broken = true; #
-    };
-  };
+  pywinrm = callPackage ../development/python-modules/pywinrm { };
 
   PyXAPI = stdenv.mkDerivation rec {
     name = "PyXAPI-0.1";
-- 
GitLab


From 815ad7c549b423ebd324027d886d5e67b56f295e Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@gmail.com>
Date: Sun, 28 May 2017 15:59:36 -0300
Subject: [PATCH 0079/1490] Galaxis: init at 1.9 (#26185)

* Galaxis: init at 1.9

* galaxis: nitpicks
---
 pkgs/games/galaxis/default.nix  | 47 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/games/galaxis/default.nix

diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix
new file mode 100644
index 00000000000..c0799e8fdf4
--- /dev/null
+++ b/pkgs/games/galaxis/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, ncurses, xmlto }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "galaxis-${version}";
+  version = "1.9";
+
+  src = fetchurl{
+    url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz";
+    sha256 = "1dsypk5brfbc399pg4fk9myyh5yyln0ljl1aiqkypws8h4nsdphl";
+  };
+
+  buildInputs = [ ncurses xmlto ];
+
+  patchPhase = ''
+    sed -i\
+     -e 's|^install: galaxis\.6 uninstall|install: galaxis.6|'\
+     -e 's|usr/||g' -e 's|ROOT|DESTDIR|g'\
+     -e 's|install -m 755 -o 0 -g 0|install -m 755|' Makefile
+  '';
+
+  dontConfigure = true;
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  meta = {
+    description = "Rescue lifeboats lost in interstellar space";
+    longDescription = ''
+      Lifeboats from a crippled interstellar liner are adrift in a starfield. To
+      find them, you can place probes that look in all eight compass directions
+      and tell you how many lifeboats they see. If you drop a probe directly on
+      a lifeboat it will be revealed immediately. Your objective: find the
+      lifeboats as quickly as possible, before the stranded passengers run out
+      of oxygen!
+
+      This is a UNIX-hosted, curses-based clone of the nifty little Macintosh
+      freeware game Galaxis. It doesn't have the super-simple, point-and-click
+      interface of the original, but compensates by automating away some of the
+      game's simpler deductions.
+    '';
+    homepage = http://catb.org/~esr/galaxis/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.AndersonTorres ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b08a42198e1..1ca4e8b2034 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16936,6 +16936,8 @@ with pkgs;
     wxGTK = wxGTK28.override { unicode = false; };
   };
 
+  galaxis = callPackage ../games/galaxis { };
+
   gambatte = callPackage ../games/gambatte { };
 
   garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
-- 
GitLab


From 56a4aaf4dfec8c189eca907f2815d29b77dcc6d5 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 28 May 2017 17:38:23 -0300
Subject: [PATCH 0080/1490] cmdliner: 0.9.8 -> 1.0.0

---
 .../ocaml-modules/cmdliner/default.nix        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index 8be36a2a408..9448610a378 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -1,31 +1,34 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }:
 
 let
   pname = "cmdliner";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
+assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
 
 stdenv.mkDerivation rec {
-
   name = "ocaml-${pname}-${version}";
-  version = "0.9.8";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
+    sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x";
   };
 
   unpackCmd = "tar xjf $src";
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
+
+  nativeBuildInputs = [ ocamlbuild opam topkg ];
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ result ];
 
   createFindlibDestdir = true;
 
-  configurePhase = "ocaml pkg/git.ml";
-  buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
-  installPhase   = ''
-    opam-installer --script --prefix=$out ${pname}.install > install.sh
-    sh install.sh
+  buildPhase = ''
+    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
+  '';
+
+  installPhase = ''
+    opam-installer --script --prefix=$out | sh
     ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
   '';
 
@@ -33,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = http://erratique.ch/software/cmdliner;
     description = "An OCaml module for the declarative definition of command line interfaces";
     license = licenses.bsd3;
-    maintainers = [ maintainers.vbgl ];
     platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.vbgl ];
   };
 }
-- 
GitLab


From 97b3def8cf2caf0d35edfae2b7f157541ea346f2 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 28 May 2017 17:39:21 -0300
Subject: [PATCH 0081/1490] ocp-indent: 1.5.2 -> 1.6.0

---
 pkgs/development/tools/ocaml/ocp-indent/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index d146dd5e973..500002bed44 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -3,18 +3,21 @@
 let inherit (stdenv.lib) getVersion versionAtLeast; in
 
 assert versionAtLeast (getVersion ocaml) "3.12.1";
+assert versionAtLeast (getVersion cmdliner) "1.0.0";
 assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
 
-  name = "ocp-indent-1.5.2";
+  name = "ocp-indent-${version}";
+  version = "1.6.0";
 
   src = fetchzip {
-    url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz";
-    sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
+    url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz";
+    sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f";
   };
 
-  buildInputs = [ ocaml findlib ocpBuild opam cmdliner ];
+  nativeBuildInputs = [ ocpBuild opam ];
+  buildInputs = [ ocaml findlib cmdliner ];
 
   createFindlibDestdir = true;
 
-- 
GitLab


From 4a0c7d1b2d415a419285ee6ff42077678aedad62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Mon, 29 May 2017 00:25:29 +0200
Subject: [PATCH 0082/1490] dkimproxy: init at 1.4.1 (#26147)

* dkimproxy: init at 1.4.1

* dkimproxy: simplify by using mkDerivation

* dkimproxy: set ekleog as maintainer

* dkimproxy: style fix

* dkimproxy: also work without the right PERL5LIB environment variable
---
 lib/maintainers.nix                     |  1 +
 pkgs/servers/mail/dkimproxy/default.nix | 36 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/servers/mail/dkimproxy/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a3e397f2173..ad1ba299a53 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -161,6 +161,7 @@
   ehegnes = "Eric Hegnes <eric.hegnes@gmail.com>";
   ehmry = "Emery Hemingway <emery@vfemail.net>";
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
+  ekleog = "Leo Gaspard <leo@gaspard.io>";
   elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
   eleanor = "Dejan Lukan <dejan@proteansec.com>";
   elitak = "Eric Litak <elitak@gmail.com>";
diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix
new file mode 100644
index 00000000000..9abf95fb6d6
--- /dev/null
+++ b/pkgs/servers/mail/dkimproxy/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, perl, fetchurl, Error, MailDKIM, MIMEtools, NetServer }:
+
+let
+  pkg = "dkimproxy";
+  version = "1.4.1";
+in
+stdenv.mkDerivation rec {
+  name = "${pkg}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/dkimproxy/${name}.tar.gz";
+    sha256 = "1gc5c7lg2qrlck7b0lvjfqr824ch6jkrzkpsn0gjvlzg7hfmld75";
+  };
+
+  # Idea taken from pkgs/development/perl-modules/generic/builder.sh
+  preFixup = ''
+    perlFlags=
+    for i in $(IFS=:; echo $PERL5LIB); do
+      perlFlags="$perlFlags -I$i"
+    done
+    for f in $(ls $out/bin); do
+      sed -i $out/bin/$f -e "s|#\!\(.*/perl.*\)$|#\! \1 $perlFlags|"
+    done
+  '';
+
+  buildInputs = [ perl ];
+  propagatedBuildInputs = [ Error MailDKIM MIMEtools NetServer ];
+
+  meta = with stdenv.lib; {
+    description = "SMTP-proxy that signs and/or verifies emails";
+    homepage = http://dkimproxy.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.ekleog ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ca4e8b2034..530d081477f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10876,6 +10876,10 @@ with pkgs;
 
   diod = callPackage ../servers/diod { lua = lua5_1; };
 
+  dkimproxy = callPackage ../servers/mail/dkimproxy {
+    inherit (perlPackages) Error MailDKIM MIMEtools NetServer;
+  };
+
   dnschain = callPackage ../servers/dnschain { };
 
   dovecot = callPackage ../servers/mail/dovecot { };
-- 
GitLab


From 6e95e2a1613389dd0c5ec24fc046942834670ade Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 28 May 2017 06:41:09 -0400
Subject: [PATCH 0083/1490] cernlib: init at 2006

---
 .../libraries/physics/cernlib/default.nix     |  63 ++++++
 .../libraries/physics/cernlib/patch           | 186 ++++++++++++++++++
 .../libraries/physics/cernlib/setup-hook.sh   |   3 +
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 254 insertions(+)
 create mode 100644 pkgs/development/libraries/physics/cernlib/default.nix
 create mode 100644 pkgs/development/libraries/physics/cernlib/patch
 create mode 100644 pkgs/development/libraries/physics/cernlib/setup-hook.sh

diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
new file mode 100644
index 00000000000..dad138c8433
--- /dev/null
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }:
+
+stdenv.mkDerivation rec {
+  version = "2006";
+  name = "cernlib-${version}";
+
+  src = fetchurl {
+    url = "http://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz";
+    sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky";
+  };
+
+  buildInputs = with xorg; [ gfortran motif libX11 libXft libXt ];
+  nativeBuildInputs = [ gnumake imake makedepend ];
+  sourceRoot = ".";
+
+  patches = [ ./patch ];
+
+  postPatch = ''
+    substituteInPlace 2006/src/config/site.def \
+      --replace "# define MakeCmd gmake" "# define MakeCmd make"
+  '';
+
+  configurePhase = ''
+    export CERN=`pwd`
+    export CERN_LEVEL=${version}
+    export CERN_ROOT=$CERN/$CERN_LEVEL
+    export CVSCOSRC=`pwd`/$CERN_LEVEL/src
+    export PATH=$PATH:$CERN_ROOT/bin
+  '';
+
+  buildPhase = ''
+    cd $CERN_ROOT
+    mkdir -p build bin lib
+
+    cd $CERN_ROOT/build
+    $CVSCOSRC/config/imake_boot
+    make bin/kuipc
+    make scripts/Makefile
+    pushd scripts
+    make install.bin
+    popd
+    make
+  '';
+
+  installPhase = ''
+    mkdir "$out"
+    cp -r "$CERN_ROOT/bin" "$out"
+    cp -r "$CERN_ROOT/lib" "$out"
+    mkdir "$out/$CERN_LEVEL"
+    ln -s "$out/bin" "$out/$CERN_LEVEL/bin"
+    ln -s "$out/lib" "$out/$CERN_LEVEL/lib"
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    homepage = http://cernlib.web.cern.ch;
+    description = "Legacy collection of libraries and modules for data analysis in high energy physics";
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/development/libraries/physics/cernlib/patch b/pkgs/development/libraries/physics/cernlib/patch
new file mode 100644
index 00000000000..2d75b6bf0f8
--- /dev/null
+++ b/pkgs/development/libraries/physics/cernlib/patch
@@ -0,0 +1,186 @@
+diff --git a/2006/src/config/Imake.tmpl b/2006/src/config/Imake.tmpl
+index 054fb04..a3b3828 100644
+--- a/2006/src/config/Imake.tmpl
++++ b/2006/src/config/Imake.tmpl
+@@ -455,7 +455,7 @@ XCOMM the platform-specific parameters - edit site.def to change
+ #define NoRConst NO /* YES if const for structs of funcs is bad */
+ #endif
+ #ifndef InstPgmFlags
+-#define InstPgmFlags -s
++#define InstPgmFlags
+ #endif
+ #ifndef InstBinFlags
+ #define InstBinFlags -m 0755
+diff --git a/2006/src/config/biglib.rules b/2006/src/config/biglib.rules
+index c90e58a..9173bdc 100644
+--- a/2006/src/config/biglib.rules
++++ b/2006/src/config/biglib.rules
+@@ -368,7 +368,7 @@ define build-object-list						@@\
+ @ (set -e;\							@@\
+ 	 case '${MFLAGS}' in *[i]*) set +e;; esac; \		@@\
+ 	 subdirs=Quote(dirs);\					@@\
+-	 list=`/bin/pwd`/$@;\					@@\
++	 list=`pwd`/$@;\					@@\
+ 	 for dir in $$subdirs; do \				@@\
+ 	  (set -e;cd $$dir;SedCmd -e "\=^[^/]=s=^.=$$dir/&=" $@ >> $$list);\@@\
+ 	 done) || (rm $@; exit 1)				@@\
+diff --git a/2006/src/config/imake_boot b/2006/src/config/imake_boot
+index b52d0d3..69cf1b3 100755
+--- a/2006/src/config/imake_boot
++++ b/2006/src/config/imake_boot
+@@ -10,8 +10,8 @@ if [ "$CVSCOSRC" = "" ] ; then
+ fi
+ if [ -f Imakefile ] ; then
+ 	imake -DUseInstalled -I$CVSCOSRC/config \
+-		-DTOPDIR=`/bin/pwd` -DCURDIR= -fImakefile
++		-DTOPDIR=`pwd` -DCURDIR= -fImakefile
+ else
+ 	imake -DUseInstalled -I$CVSCOSRC/config \
+-		-DTOPDIR=`/bin/pwd` -DCURDIR= -f$CVSCOSRC/Imakefile
++		-DTOPDIR=`pwd` -DCURDIR= -f$CVSCOSRC/Imakefile
+ fi
+diff --git a/2006/src/config/linux-lp64.cf b/2006/src/config/linux-lp64.cf
+index e071b2f..3cc5c3b 100644
+--- a/2006/src/config/linux-lp64.cf
++++ b/2006/src/config/linux-lp64.cf
+@@ -173,7 +173,7 @@
+ #define FortranCmd		g77
+ #define XargsCmd		xargs
+ #define FortranSaveFlags	/* */ /* Everything static !? */
+-#define DefaultFCOptions	-fno-automatic -fno-second-underscore -fugly-complex
++#define DefaultFCOptions	-fno-automatic -fno-second-underscore
+ #define CernlibSystem	        -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_QMLXIA64
+ 
+ # endif
+diff --git a/2006/src/config/linux.cf b/2006/src/config/linux.cf
+index cc0bee5..a8dd954 100644
+--- a/2006/src/config/linux.cf
++++ b/2006/src/config/linux.cf
+@@ -258,7 +258,7 @@ endif									@@\
+ #define FortranCmd		g77
+ #define XargsCmd		xargs
+ #define FortranSaveFlags	/* */ /* Everything static !? */
+-#define DefaultFCOptions	-fno-automatic -fno-second-underscore -fugly-complex
++#define DefaultFCOptions	-fno-automatic -fno-second-underscore
+ #define CernlibSystem	        -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC
+ 
+ # endif
+diff --git a/2006/src/packlib/kuip/code_kuip/kkern.c b/2006/src/packlib/kuip/code_kuip/kkern.c
+index 3a5579f..5f3c352 100644
+--- a/2006/src/packlib/kuip/code_kuip/kkern.c
++++ b/2006/src/packlib/kuip/code_kuip/kkern.c
+@@ -543,24 +543,6 @@ char *str0dup( const char *str )
+ 
+ 
+ /*
+- * like strdup() but string is n characters long and not terminated
+- */
+-char *strndup( const char *str,
+-              size_t len )
+-{
+-  size_t bytes = len + 1;
+-  char *p;
+-
+-  if( bytes < ALLOC_MIN_BYTES )
+-    bytes = ALLOC_MIN_BYTES;
+-
+-  p = strncpy( malloc( bytes ), str, len );
+-  p[len] = '\0';
+-  return p;
+-}
+-
+-
+-/*
+  * strdup() of character representation of integer n
+  */
+ char *stridup( int n )
+diff --git a/2006/src/packlib/kuip/code_kuip/kmenu.c b/2006/src/packlib/kuip/code_kuip/kmenu.c
+index f135b07..23007a8 100644
+--- a/2006/src/packlib/kuip/code_kuip/kmenu.c
++++ b/2006/src/packlib/kuip/code_kuip/kmenu.c
+@@ -1404,7 +1404,7 @@ void interactive_find( char *expr, int keym )
+          printf ("See also:\n    ");
+          for (i = 0; i < nval; i++) {
+              if (i == ncmd) continue;
+-             printf (flis_name[i]);
++             printf ("%s", flis_name[i]);
+              if (i < nval-1)
+                 printf (", ");
+              else
+diff --git a/2006/src/packlib/kuip/kuip/kstring.h b/2006/src/packlib/kuip/kuip/kstring.h
+index 7811f15..12a1344 100644
+--- a/2006/src/packlib/kuip/kuip/kstring.h
++++ b/2006/src/packlib/kuip/kuip/kstring.h
+@@ -21,7 +21,6 @@ extern "C" {
+  */
+ 
+ #ifndef WIN32
+-extern void* memmove( void* dst, const void* src, size_t n );
+ #endif
+ 
+ /* GF. make conform to kkern.c#if !defined(__convexc__)*/
+@@ -46,7 +45,6 @@ extern char* str4dup( const char* str1, const char* str2, const char* str3,
+                      const char* str4 );
+ extern char* str5dup( const char* str1, const char* str2, const char* str3,
+                      const char* str4, const char* str5 );
+-extern char* strndup( const char* buf, size_t n );
+ extern char* stridup( int i );
+ 
+ extern char* mstrcat( char* ptr, const char* str );
+diff --git a/2006/src/pawlib/paw/cpaw/bugrep.c b/2006/src/pawlib/paw/cpaw/bugrep.c
+index d503a45..d26e30f 100644
+--- a/2006/src/pawlib/paw/cpaw/bugrep.c
++++ b/2006/src/pawlib/paw/cpaw/bugrep.c
+@@ -432,51 +432,7 @@ br_add_config( char * tmp_file )
+ 
+ static int
+ br_mail_file( char *addr, char *subj, char *file )
+-#if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_MACOSX))
+-{
+-        FILE            *mfp, *fp;
+-        char            line[1024], my_addr[L_cuserid];
+-        time_t          clock;
+-        struct tm       *ts;
+-
+-        fp = fopen( file, "r" );
+-        if ( fp == NULL ) {
+-                printf( "BUGREPORT: cannot (re)open temporary file\n" );
+-                return MAIL_ERROR;
+-        }
+-
+-        cuserid( my_addr );
+-
+-        sprintf( line, "/usr/lib/sendmail -t" );
+-        mfp = popen( line, "w" );
+-
+-        if ( mfp == NULL ) {
+-                printf( "BUGREPORT: cannot run sendmail\n" );
+-                return MAIL_ERROR;
+-        }
+-
+-
+-        clock = time( (time_t *) 0 );
+-        ts = localtime( &clock );
+-        strftime( line, sizeof( line ),
+-                "%a, %d %h %y %H:%M:%S", ts );
+-        fprintf ( mfp, "To: %s\n", addr );
+-        fprintf ( mfp, "Bcc: %s\n", my_addr );
+-        fprintf ( mfp, "Date: %s\n", line );
+-        fprintf ( mfp, "Subject: %s\n", subj );
+-        fprintf ( mfp, "\n" );
+-
+-        while( fgets( line, sizeof( line ), fp ) != NULL ) {
+-                fputs( line, mfp );
+-        }
+-        fclose( fp );
+-
+-        pclose( mfp );
+-
+-        return MAIL_OK;
+-}
+-#endif
+-#if defined(CERNLIB_MACOSX)
++#if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_WINNT))
+ {
+         FILE            *mfp, *fp;
+         char            line[1024], *my_addr;
diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/pkgs/development/libraries/physics/cernlib/setup-hook.sh
new file mode 100644
index 00000000000..d8375932776
--- /dev/null
+++ b/pkgs/development/libraries/physics/cernlib/setup-hook.sh
@@ -0,0 +1,3 @@
+export CERN_LEVEL=@version@
+export CERN=@out@
+export CERN_ROOT=$CERN/$CERN_LEVEL
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cd3199a1d5..62e5c24a11d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18107,6 +18107,8 @@ with pkgs;
     motif = null; # motif or lesstif
   };
 
+  cernlib = callPackage ../development/libraries/physics/cernlib { };
+
   g4py = callPackage ../development/libraries/physics/geant4/g4py { };
 
   hepmc = callPackage ../development/libraries/physics/hepmc { };
-- 
GitLab


From 7bbb9824ac0cb002a35114417f5175e5434424da Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 29 May 2017 02:00:50 +0100
Subject: [PATCH 0084/1490] python.pkgs.hypothesis: add pytest_xdist as a
 checkInputs dependency

without this py.test doesn't recognize the -n flag and fails
---
 pkgs/development/python-modules/hypothesis.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
index b9f95d1a031..cb0db6dc2e0 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, python
 , pythonOlder, pythonAtLeast, enum34
-, doCheck ? true, pytest, flake8, flaky
+, doCheck ? true, pytest, pytest_xdist, flake8, flaky
 }:
 buildPythonPackage rec {
   # http://hypothesis.readthedocs.org/en/latest/packaging.html
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     sha256 = "1s911pd3y9hvk0hq2fr6i68dqv1ciagryhgp13wgyfqh8hz8j6zv";
   };
 
-  checkInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];
+  checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ];
   propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
 
   inherit doCheck;
-- 
GitLab


From 2c228f62cd5675fcd63107e948eaa72f827af756 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 29 May 2017 02:02:40 +0100
Subject: [PATCH 0085/1490] python.pkgs.pylibmc: use fetchPypi for src

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

diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix
index ff53e3d304f..7f57f17efeb 100644
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -1,11 +1,11 @@
-{ buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }:
+{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib }:
 buildPythonPackage rec {
   version = "1.5.2";
   pname = "pylibmc";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
   };
 
-- 
GitLab


From d2ef1a24b86c1ff69c218c8d83b48af0977ca3af Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 29 May 2017 02:05:56 +0100
Subject: [PATCH 0086/1490] python.pkgs.ldap: use fetchPypi for src

---
 pkgs/development/python-modules/ldap.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index e2625e2bfbf..3e715bbe419 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, fetchurl
+{ buildPythonPackage, isPy3k, fetchPypi
 , openldap, cyrus_sasl, openssl }:
 
 buildPythonPackage rec {
@@ -7,8 +7,8 @@ buildPythonPackage rec {
   name = "${pname}-${version}";
   disabled = isPy3k;
 
-  src = fetchurl {
-    url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779";
   };
 
-- 
GitLab


From 21e3b2ff551c8dbf16a010fc377c5f60283034e4 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 29 May 2017 02:07:53 +0100
Subject: [PATCH 0087/1490] python.pkgs.pylint: add pytestrunner to buildInputs

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

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 2922faafa7f..130aef60f97 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildPythonPackage, python, astroid, isort,
-  pytest,  mccabe, configparser, backports_functools_lru_cache }:
+  pytest, pytestrunner,  mccabe, configparser, backports_functools_lru_cache }:
 
   buildPythonPackage rec {
     name = "${pname}-${version}";
@@ -11,7 +11,7 @@
       sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a";
     };
 
-    buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ];
+    buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];
 
     propagatedBuildInputs = [ astroid isort ];
 
-- 
GitLab


From 78b62836f5cd02626ffaff7f05071e19368f2ea8 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Mon, 29 May 2017 02:14:02 -0500
Subject: [PATCH 0088/1490] lynx: Fix SSL, widec support (#26134)

* lynx: Fix SSL support by letting it use pkgconfig

lynx wants both the "include" and "lib/lib*.so" paths
to be children of the path given to "--with-ssl",
which is not provided by any of the current openssl outputs.

To fix lynx so it supports SSL (and https URLs),
let it use pkgconfig to figure out where openssl's bits are.

* lynx: Always enable widec support.
---
 .../networking/browsers/lynx/default.nix             | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index fb4b33ef71a..42f45419198 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, gzip
+{ stdenv, fetchurl, ncurses, gzip, pkgconfig
 , sslSupport ? true, openssl ? null
 }:
 
@@ -13,14 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a";
   };
 
-  configureFlags = []
-    ++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl.dev}" ];
+  configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
 
-  buildInputs = [ ncurses gzip ];
-
-  crossAttrs = {
-    configureFlags = configureFlags ++ [ "--enable-widec" ];
-  };
+  nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig;
+  buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;
 
   meta = with stdenv.lib; {
     homepage = http://lynx.isc.org/;
-- 
GitLab


From 46de05a3dd6975e5db4cf06eca49e579557a03d6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Mon, 29 May 2017 09:23:15 +0200
Subject: [PATCH 0089/1490] dmenu: 4.6 -> 4.7

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

diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 1dc9fe5e202..8ef4f3ae897 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-4.6";
+  name = "dmenu-4.7";
 
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "1cwnvamqqlgczvd5dv5rsgqbhv8kp0ddjnhmavb3q732i8028yja";
+    sha256 = "1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7";
   };
 
   buildInputs = [ libX11 libXinerama zlib libXft ];
-- 
GitLab


From f6ef5614a0f23d23c9494811bb1ac3b35d2a07c6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Mon, 29 May 2017 09:28:28 +0200
Subject: [PATCH 0090/1490] radicale: 1.1.1 -> 1.1.2, fixes CVE-2017-8342

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

diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index e49e399194d..f36d19bfb20 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "radicale-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";
-    sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2";
+    sha256 = "1g20p3998f46ywda7swv0py63wjbrhvk0nrafajlbb6wgzxjmqpb";
   };
 
   propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [
-- 
GitLab


From 1c6abe0230087a9072812023d42ea32e8126bf87 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 28 May 2017 23:06:55 -0300
Subject: [PATCH 0091/1490] merlin: 2.5.3 -> 2.5.4

- Update to version 2.5.4.
- Remove dependency on menhir, which seems not needed.
---
 pkgs/development/tools/ocaml/merlin/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 7af1b5ccd7a..6f0d71d76b1 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, yojson, menhir, lib
+{ stdenv, fetchzip, ocaml, findlib, yojson, lib
 , withEmacsMode ? false, emacs }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
@@ -8,10 +8,10 @@ let
   then
     "2.3.1"
   else
-    "2.5.3";
+    "2.5.4";
   hashes = {
     "2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
-    "2.5.3" = "0qljklgcrpqdxzvcqj7b4785zcz322pjvw9cddbmzla33hagglha";
+    "2.5.4" = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh";
   };
 in
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     sha256 = hashes."${version}";
   };
 
-  buildInputs = [ ocaml findlib yojson menhir ]
+  buildInputs = [ ocaml findlib yojson ]
     ++ stdenv.lib.optional withEmacsMode emacs;
 
   preConfigure = "mkdir -p $out/bin";
-- 
GitLab


From 804c3ab48a598620199a1fdf7b7cabf29c36e6fb Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Mon, 29 May 2017 09:51:41 +0200
Subject: [PATCH 0092/1490] python-ldap: Fix src url broken by pname refactor

---
 pkgs/development/python-modules/ldap.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index e2625e2bfbf..dacf714d766 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
+    url = "mirror://pypi/p/python-ldap/${name}.tar.gz";
     sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779";
   };
 
-- 
GitLab


From 05a82a9fd0030288b1daea6eb374acdf58926f88 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Mon, 29 May 2017 09:34:34 +0200
Subject: [PATCH 0093/1490] homebank: 5.1.4 -> 5.1.5

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

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index ac2f71c872d..65a7c9730e9 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , hicolor_icon_theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.1.4";
+  name = "homebank-5.1.5";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "07zxb9n7d281nfv29gi09fsp7y73fx4w2s48hgdn9s4vij25zwqa";
+    sha256 = "03rkl4bvi1cmb8rqyvmhxhg63bdmb3nzqa3firfimsbphm3x6gsw";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
-- 
GitLab


From 9b605ca04118d2ab1604f40906d925540cf392b0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Mon, 29 May 2017 09:52:33 +0200
Subject: [PATCH 0094/1490] fsql: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix
index 117574c3daa..ffd3b3f5153 100644
--- a/pkgs/tools/misc/fsql/default.nix
+++ b/pkgs/tools/misc/fsql/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "fsql-${version}";
-  version = "0.1.0";
+  version = "0.1.1";
 
   goPackagePath = "github.com/kshvmdn/fsql";
 
   src = fetchgit {
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     url = "https://github.com/kshvmdn/fsql";
-    sha256 = "1wkf9rr6x4b5bvxj9zwfw9hd870c831j7mc6fvd448id653wh122";
+    sha256 = "1zvblhfd15l86dcx0p12yrc2rrmfdpzyd107508pb72r2ar638vh";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From dc955ad2d7a392757ed845caa332fda565211b6e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Mon, 29 May 2017 09:58:10 +0200
Subject: [PATCH 0095/1490] halibut: 1.1 -> 1.2

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

diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix
index 487af940077..84cd2cf921a 100644
--- a/pkgs/tools/typesetting/halibut/default.nix
+++ b/pkgs/tools/typesetting/halibut/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl}:
 
 stdenv.mkDerivation rec {
-  name = "halibut-1.1";
+  name = "halibut-1.2";
 
   src = fetchurl {
-    url = "http://www.chiark.greenend.org.uk/~sgtatham/halibut/${name}.tar.gz";
-    sha256 = "18409ir55rsa5gkizw2hsr86wgv176jms2dc52px62gd246rar5r";
+    url = "http://www.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz";
+    sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s";
   };
 
   buildInputs = [ perl ];
-- 
GitLab


From dd5d63d428b3adfe4ee76ef2b411b71e31ae13ff Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Mon, 29 May 2017 11:32:07 +0200
Subject: [PATCH 0096/1490] python-ldap: fixup tests for 2.4.38 update

---
 pkgs/development/python-modules/ldap.nix | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index 3e715bbe419..0e1d8e73a84 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, isPy3k, fetchPypi
+{ lib, writeText, buildPythonPackage, isPy3k, fetchPypi
 , openldap, cyrus_sasl, openssl }:
 
 buildPythonPackage rec {
@@ -12,6 +12,28 @@ buildPythonPackage rec {
     sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779";
   };
 
+  # Needed by tests to setup a mockup ldap server.
+  BIN = "${openldap}/bin";
+  SBIN = "${openldap}/bin";
+  SLAPD = "${openldap}/libexec/slapd";
+  SCHEMA = "${openldap}/etc/schema";
+
+  patches = lib.singleton (writeText "avoid-syslog.diff" ''
+    diff a/Lib/slapdtest.py b/Lib/slapdtest.py
+    --- a/Lib/slapdtest.py
+    +++ b/Lib/slapdtest.py
+    @@ -60,7 +60,8 @@ def combined_logger(
+                 pass
+         # for writing to syslog
+         new_logger = logging.getLogger(log_name)
+    -    if sys_log_format:
+    +    # /dev/log does not exist in nix build environment.
+    +    if False:
+             my_syslog_formatter = logging.Formatter(
+                 fmt=' '.join((log_name, sys_log_format)))
+             my_syslog_handler = logging.handlers.SysLogHandler(
+  '');
+
   NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl";
   propagatedBuildInputs = [openldap cyrus_sasl openssl];
 }
-- 
GitLab


From 5831eb9afca276616cc89b2c2c17ee5f1c4b2729 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Mon, 29 May 2017 11:32:58 +0200
Subject: [PATCH 0097/1490] colm: 0.13.0.4 -> 0.13.0.5

---
 pkgs/development/compilers/colm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index 767023053c6..ee9224b380c 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, makeWrapper, gcc }:
+{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }:
 
 stdenv.mkDerivation rec {
   name = "colm-${version}";
-  version = "0.13.0.4";
+  version = "0.13.0.5";
 
   src = fetchurl {
     url = "http://www.colm.net/files/colm/${name}.tar.gz";
-    sha256 = "04xcb7w82x9i4ygxqla9n39y646n3jw626khdp5297z1dkxx1czx";
+    sha256 = "1320bx96ycd1xwww137cixrb983838wnrgkfsym8x5bnf5kj9rik";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper asciidoc ];
 
   doCheck = true;
 
-- 
GitLab


From 58e5078487fcebbdfb77567fe348d0f8c3a39278 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Mon, 29 May 2017 11:38:36 +0200
Subject: [PATCH 0098/1490] ragelDev: 7.0.0.9 -> 7.0.0.10

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

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 0fe243e8aaf..5140719c62b 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -42,7 +42,7 @@ in
   };
 
   ragelDev = generic {
-    version = "7.0.0.9";
-    sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr";
+    version = "7.0.0.10";
+    sha256 = "1v4ddzxal4gf8l8nkn32qabba6nbpd2mg8sphgmdn8kaqv52nmj0";
   };
 }
-- 
GitLab


From d0be062d10871acb71dde761f43680201fc23f16 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Mon, 29 May 2017 12:19:00 +0200
Subject: [PATCH 0099/1490] perlPackagrs.NTLM: init at 1.09

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4874d5d01a2..5bab2ab8927 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10157,6 +10157,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NTLM = buildPerlPackage rec {
+    name = "NTLM-1.09";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NB/NBEBOUT/${name}.tar.gz";
+      sha256 = "c823e30cda76bc15636e584302c960e2b5eeef9517c2448f7454498893151f85";
+    };
+    propagatedBuildInputs = [ DigestHMAC ];
+    meta = {
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.pSub ];
+    };
+  };
+
   ObjectAccessor = buildPerlPackage {
     name = "Object-Accessor-0.48";
     src = fetchurl {
-- 
GitLab


From c63339567bb2097b2b851f0a00e73e964b270d7e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Mon, 29 May 2017 12:19:29 +0200
Subject: [PATCH 0100/1490] imapsync: 1.684 -> 1.727

---
 pkgs/tools/networking/imapsync/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix
index d01e0ededb3..c05928fa34b 100644
--- a/pkgs/tools/networking/imapsync/default.nix
+++ b/pkgs/tools/networking/imapsync/default.nix
@@ -1,10 +1,10 @@
 {stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "imapsync-1.684";
+  name = "imapsync-1.727";
   src = fetchurl {
-    url = "https://fedorahosted.org/released/imapsync/${name}.tgz";
-    sha256 = "1ilqdaabh6xiwpjfdg2mrhygvjlxj6jdkmqjqadq5z29172hji5b";
+    url = "https://releases.pagure.org/imapsync/${name}.tgz";
+    sha256 = "1axacjw2wyaphczfw3kfmi5cl83fyr8nb207nks40fxkbs8q5dlr";
   };
 
   patchPhase = ''
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
   buildInputs = with perlPackages; [ perl openssl MailIMAPClient TermReadKey
     IOSocketSSL DigestHMAC URI FileCopyRecursive IOTee UnicodeString
     DataUniqid JSONWebToken TestMockGuard LWP CryptOpenSSLRSA
-    LWPProtocolHttps
+    LWPProtocolHttps Readonly TestPod TestMockObject ParseRecDescent
+    IOSocketInet6 NTLM
   ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 13f2f8673b184599e7a65df422c968730554820f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 29 May 2017 12:20:05 +0200
Subject: [PATCH 0101/1490] OVMF: fix build

$fd for the output was overwritten during the build
---
 pkgs/applications/virtualization/OVMF/default.nix | 7 +++++--
 pkgs/games/wesnoth/dev.nix                        | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 4f7ea37ca18..121875a69de 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -23,6 +23,9 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
   hardeningDisable = [ "stackprotector" "pic" "fortify" ];
 
   unpackPhase = ''
+    # $fd is overwritten during the build
+    export OUTPUT_FD=$fd
+
     for file in \
       "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg};
     do
@@ -51,8 +54,8 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
     '';
 
   postFixup = ''
-    mkdir -p $fd/FV
-    mv $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV
+    mkdir -vp $OUTPUT_FD/FV
+    mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV
   '';
 
   dontPatchELF = true;
diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix
index 0b335812ff0..315f9ea7a5e 100644
--- a/pkgs/games/wesnoth/dev.nix
+++ b/pkgs/games/wesnoth/dev.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.13.6";
+  version = "1.13.8";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "0z4k2r4ss46ik9fx5clffpd7vfr0l4l6d0j1war676dwz0z1j2m1";
+    sha256 = "0snm4n7l21cr4443rk93wnaqdzr91pihn452w66344zqwf33xgfr";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-- 
GitLab


From 9e56cddf136837d30820783228299b600d98e8b6 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Mon, 29 May 2017 12:17:15 +0100
Subject: [PATCH 0102/1490] emacsWithPackages: support installing larger
 packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I was getting the following error building tide from Melpa:

    nix-build  -E '(import <nixpkgs> {}).emacs25WithPackages (p: [p.melpaPackages.tide])'

    File tide-20170509.1134.tar is large (10.2M), really open? (y or n) Error reading from stdin
    builder for ‘/nix/store/gs9ik7yf8iilsikkfing74i70m0diax3-emacs-tide-20170509.1134.drv’ failed with exit code 255
    cannot build derivation ‘/nix/store/m3p080aani4rw82llp8nqk93cw2nvirk-emacs-with-packages-25.2.drv’: 1 dependencies couldn't be built

Solution was to disable the large file warning threshold when
installing packages.
---
 pkgs/build-support/emacs/elpa2nix.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/build-support/emacs/elpa2nix.el
index 7eef81b9e7a..64587c0fad1 100644
--- a/pkgs/build-support/emacs/elpa2nix.el
+++ b/pkgs/build-support/emacs/elpa2nix.el
@@ -28,3 +28,6 @@ The file can either be a tar file or an Emacs Lisp file."
         (insert-file-contents file))
       (when is-tar (tar-mode))
       (elpa2nix-install-from-buffer))))
+
+;; Allow installing package tarfiles larger than 10MB
+(setq large-file-warning-threshold nil)
-- 
GitLab


From 1e95e114e5eefdb0f792f9f7a620c9472e6d7da3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 25 May 2017 19:33:13 +0200
Subject: [PATCH 0103/1490] nixos/xsession: use graphical systemd user target

While systemd suggests using the pre-defined graphical-session user
target, I found that this interface is difficult to use. Additionally,
no other major distribution, even in their unstable versions, currently
use this mechanism.

The window or desktop manager is supposed to run in a systemd user service
which activates graphical-session.target and the user services that are
binding to this target. The issue is that we can't elegantly pass the
xsession environment to the window manager session, in particular
whereas the PassEnvironment option does work for DISPLAY, it for some
mysterious reason won't for PATH.

This commit implements a new graphical user target that works just like
default.target. Services which should be run in a graphical session just
need to declare wantedBy graphical.target. The graphical target will be
activated in the xsession before executing the window or display manager.

Fixes #17858.
---
 nixos/modules/config/pulseaudio.nix                 |  7 +++++--
 nixos/modules/programs/ssh.nix                      |  5 ++---
 nixos/modules/services/monitoring/arbtt.nix         |  3 ++-
 nixos/modules/services/x11/compton.nix              |  4 ++--
 .../services/x11/display-managers/default.nix       | 13 +++++++++++++
 nixos/modules/services/x11/redshift.nix             |  9 ++-------
 nixos/modules/services/x11/unclutter-xfixes.nix     |  3 ++-
 nixos/modules/services/x11/unclutter.nix            |  8 +++-----
 nixos/modules/services/x11/urxvtd.nix               |  5 ++---
 nixos/modules/services/x11/xbanish.nix              |  3 ++-
 10 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index bf66994b502..bd80c811348 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -240,11 +240,14 @@ in {
       };
       systemd.user = {
         services.pulseaudio = {
+          restartIfChanged = true;
           serviceConfig = {
             RestartSec = "500ms";
+            PassEnvironment = "DISPLAY";
           };
-          environment = { DISPLAY = ":${toString config.services.xserver.display}"; };
-          restartIfChanged = true;
+        };
+        sockets.pulseaudio = {
+          wantedBy = [ "sockets.target" ];
         };
       };
     })
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index a00fc0dfd19..4faef2c609b 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -199,9 +199,8 @@ in
     environment.etc."ssh/ssh_known_hosts".text = knownHostsText;
 
     # FIXME: this should really be socket-activated for über-awesomeness.
-    systemd.user.services.ssh-agent =
-      { enable = cfg.startAgent;
-        description = "SSH Agent";
+    systemd.user.services.ssh-agent = mkIf cfg.startAgent
+      { description = "SSH Agent";
         wantedBy = [ "default.target" ];
         serviceConfig =
           { ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent";
diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix
index a8d5e3b7fa0..b41a3c7b501 100644
--- a/nixos/modules/services/monitoring/arbtt.nix
+++ b/nixos/modules/services/monitoring/arbtt.nix
@@ -48,7 +48,8 @@ in {
   config = mkIf cfg.enable {
     systemd.user.services.arbtt = {
       description = "arbtt statistics capture service";
-      wantedBy = [ "default.target" ];
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
 
       serviceConfig = {
         Type = "simple";
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index d75d24830f8..56bc66b7179 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -208,13 +208,13 @@ in {
   config = mkIf cfg.enable {
     systemd.user.services.compton = {
       description = "Compton composite manager";
-      wantedBy = [ "default.target" ];
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/compton --config ${configFile}";
         RestartSec = 3;
         Restart = "always";
       };
-      environment.DISPLAY = ":0";
     };
 
     environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index cf6efb7dae7..58773685ec1 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -122,6 +122,9 @@ let
           source ~/.xprofile
       fi
 
+      # Start systemd user services for graphical sessions
+      ${config.systemd.package}/bin/systemctl --user start graphical-session.target
+
       # Allow the user to setup a custom session type.
       if test -x ~/.xsession; then
           exec ~/.xsession
@@ -164,6 +167,9 @@ let
       ''}
 
       test -n "$waitPID" && wait "$waitPID"
+
+      ${config.systemd.package}/bin/systemctl --user stop graphical-session.target
+
       exit 0
     '';
 
@@ -325,6 +331,13 @@ in
 
   config = {
     services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X";
+
+    systemd.user.targets.graphical-session = {
+      unitConfig = {
+        RefuseManualStart = false;
+        StopWhenUnneeded = false;
+      };
+    };
   };
 
   imports = [
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index eb5dfdf9584..992709ed000 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -95,7 +95,8 @@ in {
   config = mkIf cfg.enable {
     systemd.user.services.redshift = {
       description = "Redshift colour temperature adjuster";
-      wantedBy = [ "default.target" ];
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
       serviceConfig = {
         ExecStart = ''
           ${cfg.package}/bin/redshift \
@@ -107,12 +108,6 @@ in {
         RestartSec = 3;
         Restart = "always";
       };
-      environment = {
-        DISPLAY = ":${toString (
-          let display = config.services.xserver.display;
-          in if display != null then display else 0
-        )}";
-      };
     };
   };
 
diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix
index b94dfb1a26a..71262431b68 100644
--- a/nixos/modules/services/x11/unclutter-xfixes.nix
+++ b/nixos/modules/services/x11/unclutter-xfixes.nix
@@ -43,7 +43,8 @@ in {
   config = mkIf cfg.enable {
     systemd.user.services.unclutter-xfixes = {
       description = "unclutter-xfixes";
-      wantedBy = [ "graphical.target" ];
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
       serviceConfig.ExecStart = ''
         ${cfg.package}/bin/unclutter \
           --timeout ${toString cfg.timeout} \
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index a22e5ac2c95..5f16a680050 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -56,19 +56,17 @@ in {
   config = mkIf cfg.enable {
     systemd.user.services.unclutter = {
       description = "unclutter";
-      wantedBy = [ "default.target" ];
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
       serviceConfig.ExecStart = ''
         ${cfg.package}/bin/unclutter \
           -idle ${toString cfg.timeout} \
-          -display :${toString (
-             let display = config.services.xserver.display;
-             in if display != null then display else 0
-          )} \
           -jitter ${toString (cfg.threeshold - 1)} \
           ${optionalString cfg.keystroke "-keystroke"} \
           ${concatMapStrings (x: " -"+x) cfg.extraOptions} \
           -not ${concatStringsSep " " cfg.excluded} \
       '';
+      serviceConfig.PassEnvironment = "DISPLAY";
       serviceConfig.RestartSec = 3;
       serviceConfig.Restart = "always";
     };
diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index 57ad93f2017..f2ce089ce19 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -21,9 +21,8 @@ in {
     systemd.user = {
       sockets.urxvtd = {
         description = "socket for urxvtd, the urxvt terminal daemon";
-        after = [ "graphical.target" ];
-        wants = [ "graphical.target" ];
-        wantedBy = [ "sockets.target" ];
+        wantedBy = [ "graphical-session.target" ];
+        partOf = [ "graphical-session.target" ];
         socketConfig = {
           ListenStream = "%t/urxvtd-socket";
         };
diff --git a/nixos/modules/services/x11/xbanish.nix b/nixos/modules/services/x11/xbanish.nix
index e1e3cbc8e44..b95fac68f16 100644
--- a/nixos/modules/services/x11/xbanish.nix
+++ b/nixos/modules/services/x11/xbanish.nix
@@ -20,7 +20,8 @@ in {
   config = mkIf cfg.enable {
     systemd.user.services.xbanish = {
       description = "xbanish hides the mouse pointer";
-      wantedBy = [ "default.target" ];
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
       serviceConfig.ExecStart = ''
         ${pkgs.xbanish}/bin/xbanish ${cfg.arguments}
       '';
-- 
GitLab


From 04158d9aba1d8b98e49770702922b63ba075728b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 25 May 2017 21:14:39 +0200
Subject: [PATCH 0104/1490] gnupg agent module: init

Creates a systemd user service and updates the tty on new logins so
that gpg-agent may find the current tty even if the SSH agent mode
is used.
---
 nixos/modules/module-list.nix    |  1 +
 nixos/modules/programs/gnupg.nix | 75 ++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 nixos/modules/programs/gnupg.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5e1ff91acab..7afcb9051bd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -80,6 +80,7 @@
   ./programs/environment.nix
   ./programs/fish.nix
   ./programs/freetds.nix
+  ./programs/gnupg.nix
   ./programs/gphoto2.nix
   ./programs/info.nix
   ./programs/java.nix
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
new file mode 100644
index 00000000000..c5277f40d26
--- /dev/null
+++ b/nixos/modules/programs/gnupg.nix
@@ -0,0 +1,75 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.gnupg;
+
+in
+
+{
+
+  options.programs.gnupg = {
+    agent.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enables GnuPG agent with socket-activation for every user session.
+      '';
+    };
+
+    agent.enableSSHSupport = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Enable SSH agent support in GnuPG agent. Also sets SSH_AUTH_SOCK
+        environment variable correctly. This will disable socket-activation
+        and thus always start a GnuPG agent per user session.
+      '';
+    };
+  };
+
+  config = mkIf cfg.agent.enable {
+    systemd.user.services.gpg-agent = {
+      serviceConfig = {
+        ExecStart = [
+          ""
+          ("${pkgs.gnupg}/bin/gpg-agent --supervised "
+            + optionalString cfg.agent.enableSSHSupport "--enable-ssh-support")
+        ];
+      };
+    };
+
+    systemd.user.sockets.gpg-agent = {
+      wantedBy = [ "sockets.target" ];
+    };
+
+    systemd.user.sockets.gpg-agent-ssh = mkIf cfg.agent.enableSSHSupport {
+      wantedBy = [ "sockets.target" ];
+    };
+
+    systemd.packages = [ pkgs.gnupg ];
+
+    environment.extraInit = ''
+      # Bind gpg-agent to this TTY if gpg commands are used.
+      export GPG_TTY=$(tty)
+
+    '' + (optionalString cfg.agent.enableSSHSupport ''
+      # SSH agent protocol doesn't support changing TTYs, so bind the agent
+      # to every new TTY.
+      ${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null
+
+      if [ -z "$SSH_AUTH_SOCK" ]; then
+        export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)
+      fi
+    '');
+
+    assertions = [
+      { assertion = cfg.agent.enableSSHSupport && !config.programs.ssh.startAgent;
+        message = "You can't use ssh-agent and GnuPG agent with SSH support enabled at the same time!";
+      }
+    ];
+  };
+
+}
-- 
GitLab


From a78af5196c1b8229ac2311e38d41809249b47932 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 29 May 2017 09:32:42 -0400
Subject: [PATCH 0105/1490] linux: 4.12-rc2 -> 4.12-rc3

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index f783828f031..8c8da674f4d 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12-rc2";
-  modDirVersion = "4.12.0-rc2";
+  version = "4.12-rc3";
+  modDirVersion = "4.12.0-rc3";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "18p68ig9irblbxbg68jz766158bxr81824q91mnf372i5z9irj9w";
+    sha256 = "0jwhsmw4igf5iwf4qndqbjzayag2wj2riypzl0v3yrh5zkhfl4dm";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 2c39927c7aa0b80165e88c2300bce822110e6552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 29 May 2017 14:33:04 +0100
Subject: [PATCH 0106/1490] pythonPackages.alembic: 0.8.3 -> 0.9.2

---
 .../python-modules/alembic/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +-------------
 2 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/alembic/default.nix

diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
new file mode 100644
index 00000000000..0538e7cf416
--- /dev/null
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pytest, pytestcov, mock, coverage
+, Mako, sqlalchemy, python-editor, dateutil
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "alembic";
+  version = "0.9.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0iw6wysm83hycvrycymf9b4mkji47536kl3x7grynfcbyjcvbdm2";
+  };
+
+  buildInputs = [ pytest pytestcov mock coverage ];
+  propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil ];
+
+  meta = with stdenv.lib; {
+    homepage = http://bitbucket.org/zzzeek/alembic;
+    description = "A database migration tool for SQLAlchemy";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f5b20a62d6..107fd715b94 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -640,23 +640,7 @@ in {
   };
 
 
-  alembic = buildPythonPackage rec {
-    name = "alembic-0.8.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/alembic/${name}.tar.gz";
-      sha256 = "1sgwvwylzd5h14130mwr0cbyy0fil0a1bq0d0ki97wqvkic3db7f";
-    };
-
-    buildInputs = with self; [ pytest pytestcov mock coverage ];
-    propagatedBuildInputs = with self; [ Mako sqlalchemy python-editor ];
-
-    meta = {
-      homepage = http://bitbucket.org/zzzeek/alembic;
-      description = "A database migration tool for SQLAlchemy";
-      license = licenses.mit;
-    };
-  };
+  alembic = callPackage ../development/python-modules/alembic {};
 
   ansicolors = buildPythonPackage rec {
     name    = "ansicolors-${version}";
-- 
GitLab


From a49c2366efad78d296375b7c17065cacee3c3975 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 29 May 2017 17:24:27 +0200
Subject: [PATCH 0107/1490] nixos/firewall: clean up rpfilter rules properly

The rpfilter rules wouldn't be removed if it was previously enabled
but disabled in a new generation.
---
 nixos/modules/services/networking/firewall.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 243cd04c96c..68a814b2305 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -114,14 +114,15 @@ let
     # The "nixos-fw" chain does the actual work.
     ip46tables -N nixos-fw
 
-    # Perform a reverse-path test to refuse spoofers
-    # For now, we just drop, as the raw table doesn't have a log-refuse yet
+    # Clean up rpfilter rules
+    ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true
+    ip46tables -t raw -F nixos-fw-rpfilter 2> /dev/null || true
+    ip46tables -t raw -X nixos-fw-rpfilter 2> /dev/null || true
+
     ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) ''
-      # Clean up rpfilter rules
-      ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true
-      ip46tables -t raw -F nixos-fw-rpfilter 2> /dev/null || true
+      # Perform a reverse-path test to refuse spoofers
+      # For now, we just drop, as the raw table doesn't have a log-refuse yet
       ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true
-
       ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN
 
       # Allows this host to act as a DHCPv4 server
-- 
GitLab


From 1d56c2fa434b2cf875aab4eabcfd69fa89fe25eb Mon Sep 17 00:00:00 2001
From: timor <timor.dd@googlemail.com>
Date: Mon, 29 May 2017 17:56:52 +0200
Subject: [PATCH 0108/1490] NetworkManager: fix openconnect for console tools

This patch allows `nmcli` and `nmtui to work correctly with
openconnect.  This is dony by hard-coding the openconnect binary location.

see #25915
---
 .../networking/network-manager/default.nix    |  5 +++-
 .../openconnect_helper_path.patch             | 29 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/network-manager/openconnect_helper_path.patch

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 58e5e9343a7..585ffe1d3b1 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -3,7 +3,7 @@
 , libgcrypt, dnsmasq, bluez5, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
 , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
-, python3Packages, docbook_xsl, fetchpatch }:
+, python3Packages, docbook_xsl, fetchpatch, openconnect }:
 
 stdenv.mkDerivation rec {
   name    = "network-manager-${version}";
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
       --replace /bin/sed ${gnused}/bin/sed
     substituteInPlace data/NetworkManager.service.in \
       --replace /bin/kill ${coreutils}/bin/kill
+    substituteInPlace clients/common/nm-vpn-helpers.c \
+      --subst-var-by openconnect ${openconnect}
     # to enable link-local connections
     configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
   '';
@@ -76,6 +78,7 @@ stdenv.mkDerivation rec {
       name = "null-dereference.patch";
       url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch";
     })
+    ./openconnect_helper_path.patch
   ];
 
   buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
diff --git a/pkgs/tools/networking/network-manager/openconnect_helper_path.patch b/pkgs/tools/networking/network-manager/openconnect_helper_path.patch
new file mode 100644
index 00000000000..597fb753e26
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/openconnect_helper_path.patch
@@ -0,0 +1,29 @@
+diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
+index 15611c45c..4a7444d3a 100644
+--- a/clients/common/nm-vpn-helpers.c
++++ b/clients/common/nm-vpn-helpers.c
+@@ -203,23 +203,8 @@ nm_vpn_openconnect_authenticate_helper (const char *host,
+ 	gboolean ret;
+ 	char **strv = NULL, **iter;
+ 	char *argv[4];
+-	const char *path;
+-	const char *const DEFAULT_PATHS[] = {
+-		"/sbin/",
+-		"/usr/sbin/",
+-		"/usr/local/sbin/",
+-		"/bin/",
+-		"/usr/bin/",
+-		"/usr/local/bin/",
+-		NULL,
+-	};
+-
+-	path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS,
+-	                                      G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error);
+-	if (!path)
+-		return FALSE;
+ 
+-	argv[0] = (char *) path;
++	argv[0] = "@openconnect@/bin/openconnect";
+ 	argv[1] = "--authenticate";
+ 	argv[2] = (char *) host;
+ 	argv[3] = NULL;
-- 
GitLab


From c14bf4f2b19d64e2cc4ed70fa2bc4f08b4328745 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 29 May 2017 18:31:08 +0100
Subject: [PATCH 0109/1490] irrlicht: link to X11 libs explicitly

This allows applications that require irrlicht to depend on the X
libraries implicitly rather than explicitly.
---
 pkgs/development/libraries/irrlicht/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 71bb871a45d..bc3e1a20abb 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
-    make sharedlib NDEBUG=1
+    make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm"
   '';
 
   preInstall = ''
-- 
GitLab


From 3d2cfabad6b79dd1a3c6ddd75cdc2959d16b476e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 29 May 2017 21:25:30 +0200
Subject: [PATCH 0110/1490] hdf5: add comment about multiple outputs

---
 pkgs/tools/misc/hdf5/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 176f8aa1f51..192da26b452 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -12,6 +12,9 @@
 # (--enable-unsupported could be used to force the build)
 assert !cpp || mpi == null;
 
+# No point splitting version 1.8.18 into multiple outputs.
+# The library /lib/libhdf5.so has a reference to gcc-wrapper
+
 let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
-- 
GitLab


From 97eddf0907edfbb2e80258b1104034dbff90bd53 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 24 May 2017 17:37:05 +0200
Subject: [PATCH 0111/1490] vimer: init at 0.2.0

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

diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix
new file mode 100644
index 00000000000..231ee9ac157
--- /dev/null
+++ b/pkgs/tools/misc/vimer/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.0";
+  name = "vimer-${version}";
+
+  src = fetchFromGitHub {
+    owner = "susam";
+    repo = "vimer";
+    rev = version;
+    sha256 = "01qhr3i7wasbaxvms39c81infpry2vk0nzh7r5m5b9p713p0phsi";
+  };
+
+  installPhase = ''
+    mkdir $out/bin/ -p
+    cp vimer $out/bin/
+    chmod +x $out/bin/vimer
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/susam/vimer";
+    description = ''
+      A convenience wrapper for gvim/mvim --remote(-tab)-silent to open files
+      in an existing instance of GVim or MacVim.
+    '';
+    license = licenses.mit;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = platforms.linux;
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2007e8262cd..11e0e16fe47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4489,6 +4489,8 @@ with pkgs;
 
   vim-vint = callPackage ../development/tools/vim-vint { };
 
+  vimer = callPackage ../tools/misc/vimer { };
+
   vit = callPackage ../applications/misc/vit { };
 
   vnc2flv = callPackage ../tools/video/vnc2flv {};
-- 
GitLab


From a61e58b12106e043970b699e58d4d743e1f27e61 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Fri, 26 May 2017 23:36:19 +1000
Subject: [PATCH 0112/1490] pythonPackages.argcomplete: init at 1.8.2

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

diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
new file mode 100644
index 00000000000..cd0cc47d9e7
--- /dev/null
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage, fetchPypi, lib,
+  coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt
+}:
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "argcomplete";
+  version = "1.8.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0sslhl1klvh92c8hjsz3y3mmnpcqspcgi49g5cik2rpbfkhcsb3s";
+  };
+
+  doCheck = false; # bash-completion test fails with "compgen: command not found".
+
+  # re-enable if we are able to make testing work
+  # buildInputs = [ coverage flake8 ];
+
+  propagatedBuildInputs = [ dicttoxml pexpect prettytable requests_toolbelt ];
+
+  meta = with lib; {
+    description = "Bash tab completion for argparse";
+    homepage = "https://argcomplete.readthedocs.io";
+    maintainers = [ maintainers.womfoo ];
+    license = [ licenses.asl20 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f40f60c6294..c3cc72a05a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1159,6 +1159,8 @@ in {
     };
   };
 
+  argcomplete = callPackage ../development/python-modules/argcomplete { };
+
   area53 = buildPythonPackage (rec {
     name = "Area53-0.94";
 
-- 
GitLab


From 4126cc18be480ffc1599488d40c4fb4b3cfe32ae Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Fri, 26 May 2017 23:36:47 +1000
Subject: [PATCH 0113/1490] cloudmonkey: init at 5.3.3

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

diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix
new file mode 100644
index 00000000000..b133bc094f9
--- /dev/null
+++ b/pkgs/tools/virtualization/cloudmonkey/default.nix
@@ -0,0 +1,27 @@
+{ python2Packages, lib }:
+
+with python2Packages;
+
+buildPythonApplication rec {
+
+  name = "${pname}-${version}";
+  pname = "cloudmonkey";
+  version = "5.3.3";
+
+  propagatedBuildInputs = [ argcomplete pygments ];
+
+  doCheck = false; # upstream has no tests defined
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "064yk3lwl272nyn20xxrh0qxzh3r1rl9015qqf2i4snqdzwd5cf7";
+  };
+
+  meta = with lib; {
+    description = "CLI for Apache CloudStack.";
+    homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI";
+    license = [ licenses.asl20 ];
+    maintainers = [ maintainers.womfoo ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16b52fa6f67..9c0b155b80c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -814,6 +814,8 @@ with pkgs;
 
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
+  cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
+
   clib = callPackage ../tools/package-management/clib { };
 
   colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {};
-- 
GitLab


From 75a94a5a28b33f6bad29f17c2986f3c173929cd7 Mon Sep 17 00:00:00 2001
From: Robin Stumm <serverkorken@gmail.com>
Date: Mon, 29 May 2017 20:24:31 +0200
Subject: [PATCH 0114/1490] mcrcon: init at 0.0.5

---
 lib/maintainers.nix                      |  1 +
 pkgs/tools/networking/mcrcon/default.nix | 33 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/networking/mcrcon/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ad1ba299a53..db40b36fd6a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -132,6 +132,7 @@
   deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>";
   demin-dmitriy = "Dmitriy Demin <demindf@gmail.com>";
   DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
+  dermetfan = "Robin Stumm <serverkorken@gmail.com>";
   DerTim1 = "Tim Digel <tim.digel@active-group.de>";
   desiderius = "Didier J. Devroye <didier@devroye.name>";
   devhell = "devhell <\"^\"@regexmail.net>";
diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix
new file mode 100644
index 00000000000..eda93c82cce
--- /dev/null
+++ b/pkgs/tools/networking/mcrcon/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "mcrcon-${version}";
+  version = "0.0.5";
+
+  src = fetchFromGitHub {
+    owner = "Tiiffi";
+    repo = "mcrcon";
+    rev = "v${version}";
+    sha256 = "1pwr1cjldjy8bxqpp7w03nvdpw8l4vqfnk6w6b3mf0qpap1k700z";
+  };
+
+  buildPhase = ''
+    $CC mcrcon.c -o mcrcon
+  '';
+
+  installPhase = ''
+    install -Dm 755 mcrcon $out/bin/mcrcon
+  '';
+
+  meta = {
+    homepage = https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/;
+    description = "Minecraft console client with Bukkit coloring support.";
+    longDescription = ''
+      Mcrcon is a powerful Minecraft RCON terminal client with Bukkit coloring support.
+      It is well suited for remote administration and to be used as part of automated server maintenance scripts.
+      It does not trigger "IO: Broken pipe" or "IO: Connection reset" spam bugs on the server side.
+    '';
+    maintainers = with stdenv.lib.maintainers; [ dermetfan ];
+    license = with stdenv.lib.licenses; [ zlib libpng ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11e0e16fe47..6d7f5adae99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1689,6 +1689,8 @@ with pkgs;
 
   eid-viewer = callPackage ../tools/security/eid-viewer { };
 
+  mcrcon = callPackage ../tools/networking/mcrcon {};
+
   ### DEVELOPMENT / EMSCRIPTEN
 
   buildEmscriptenPackage = callPackage ../development/em-modules/generic { };
-- 
GitLab


From a9f66fa4cf446abfd4f3d86d7c88a7b94a8708a4 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Mon, 29 May 2017 21:39:40 +0100
Subject: [PATCH 0115/1490] csound: add optional libraries

Adds extra bells and whistles:

 - jack
 - ladspa
 - fluidsynth
 - fltk (for the virtual keyboard)
 - curl
 - gettext

The most important one is jack but I added other dependencies which
seemed sensible and were mentioned by the configure script.
---
 pkgs/applications/audio/csound/default.nix | 29 ++++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 4f58ae48390..2395fe6ccea 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, cmake, libsndfile, flex, bison, boost
+{ stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext
 , alsaLib ? null
 , libpulseaudio ? null
-, tcltk ? null
+, libjack2 ? null
 , liblo ? null
-
-# maybe csound can be compiled with support for those, see configure output
-# , ladspa ? null
-# , fluidsynth ? null
-# , jack ? null
-# , gmm ? null
-# , wiiuse ? null
+, ladspa-sdk ? null
+, fluidsynth ? null
+# , gmm ? null  # opcodes don't build with gmm 5.1
+, eigen ? null
+, curl ? null
+, tcltk ? null
+, fltk ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -27,8 +27,15 @@ stdenv.mkDerivation rec {
     sha256 = "03xnva17sw35ga3n96x1zdfgw913dga1hccly85wzfn0kxz4rld9";
   };
 
-  nativeBuildInputs = [ cmake flex bison ];
-  buildInputs = [ libsndfile alsaLib libpulseaudio tcltk boost liblo ];
+  cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
+    ++ stdenv.lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h";
+
+  nativeBuildInputs = [ cmake flex bison gettext ];
+  buildInputs = [ libsndfile libsamplerate boost ]
+    ++ builtins.filter (optional: optional != null) [
+      alsaLib libpulseaudio libjack2
+      liblo ladspa-sdk fluidsynth eigen
+      curl tcltk fltk ];
 
   meta = with stdenv.lib; {
     description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
-- 
GitLab


From 9007ebd627ff3af3905248ef51086f286b5da501 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Mon, 29 May 2017 21:36:36 +0100
Subject: [PATCH 0116/1490] csound: 6.08.1 -> 6.09.0

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

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 2395fe6ccea..dc0c8eabcac 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -13,8 +13,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "csound-6.08.1";
-  version = "6.08.1";
+  name = "csound-${version}";
+  version = "6.09.0";
 
   enableParallelBuilding = true;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "csound";
     repo = "csound";
     rev = version;
-    sha256 = "03xnva17sw35ga3n96x1zdfgw913dga1hccly85wzfn0kxz4rld9";
+    sha256 = "1vfb0mab89psfwidadjrn5mbzq3bhjbyrrmyp98yp0xm6a8cssih";
   };
 
   cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
-- 
GitLab


From a49eb2f3b8fa9adb2b6d80fe279f4f6b6cd10740 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Mon, 29 May 2017 23:53:49 +0200
Subject: [PATCH 0117/1490] restic: 0.5.0 -> 0.6.0

---
 pkgs/tools/backup/restic/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index b816aac99a1..92821290667 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "restic-${version}";
-  version = "0.5.0";
+  version = "0.6.0";
 
   goPackagePath = "github.com/restic/restic";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "0dj6zg4b00pwgs6nj7w5s0jxm6cfavd9kdcq0z4spypwdf211cgl";
+    sha256 = "0kjk8fyfmbnh2jayfjq4ggkc99rh02jkv8gvqcpyqnw3dxznwrk2";
   };
 
   buildPhase = ''
@@ -28,5 +28,6 @@ buildGoPackage rec {
     description = "A backup program that is fast, efficient and secure";
     platforms = platforms.linux;
     license = licenses.bsd2;
+    maintainers = [ maintainers.mbrgm ];
   };
 }
-- 
GitLab


From 87b4a91fc4145e04ca028c08754bd144b8d1d02d Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 29 May 2017 18:09:52 -0400
Subject: [PATCH 0118/1490] lib: Move fixed-point combinators out of trivial

Trivia != prelude. This is a better organized and less likely to
scare off new contributors.
---
 lib/default.nix      |  8 +++--
 lib/fixed-points.nix | 78 ++++++++++++++++++++++++++++++++++++++++++++
 lib/trivial.nix      | 78 --------------------------------------------
 3 files changed, 83 insertions(+), 81 deletions(-)
 create mode 100644 lib/fixed-points.nix

diff --git a/lib/default.nix b/lib/default.nix
index e692637abf1..3893e349db3 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -5,8 +5,9 @@
  */
 let
 
-  # trivial, often used functions
+  # often used, or depending on very little
   trivial = import ./trivial.nix;
+  fixedPoints = import ./fixed-points.nix;
 
   # datatypes
   attrsets = import ./attrsets.nix;
@@ -42,7 +43,7 @@ let
   filesystem = import ./filesystem.nix;
 
 in
-  { inherit trivial
+  { inherit trivial fixedPoints
             attrsets lists strings stringsWithDeps
             customisation maintainers meta sources
             modules options types
@@ -55,6 +56,7 @@ in
   }
   # !!! don't include everything at top-level; perhaps only the most
   # commonly used functions.
-  // trivial // lists // strings // stringsWithDeps // attrsets // sources
+  // trivial // fixedPoints
+  // lists // strings // stringsWithDeps // attrsets // sources
   // options // types // meta // debug // misc // modules
   // customisation
diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
new file mode 100644
index 00000000000..a11b5a6f4bd
--- /dev/null
+++ b/lib/fixed-points.nix
@@ -0,0 +1,78 @@
+rec {
+  # Compute the fixed point of the given function `f`, which is usually an
+  # attribute set that expects its final, non-recursive representation as an
+  # argument:
+  #
+  #     f = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
+  #
+  # Nix evaluates this recursion until all references to `self` have been
+  # resolved. At that point, the final result is returned and `f x = x` holds:
+  #
+  #     nix-repl> fix f
+  #     { bar = "bar"; foo = "foo"; foobar = "foobar"; }
+  #
+  #  Type: fix :: (a -> a) -> a
+  #
+  # See https://en.wikipedia.org/wiki/Fixed-point_combinator for further
+  # details.
+  fix = f: let x = f x; in x;
+
+  # A variant of `fix` that records the original recursive attribute set in the
+  # result. This is useful in combination with the `extends` function to
+  # implement deep overriding. See pkgs/development/haskell-modules/default.nix
+  # for a concrete example.
+  fix' = f: let x = f x // { __unfix__ = f; }; in x;
+
+  # Modify the contents of an explicitly recursive attribute set in a way that
+  # honors `self`-references. This is accomplished with a function
+  #
+  #     g = self: super: { foo = super.foo + " + "; }
+  #
+  # that has access to the unmodified input (`super`) as well as the final
+  # non-recursive representation of the attribute set (`self`). `extends`
+  # differs from the native `//` operator insofar as that it's applied *before*
+  # references to `self` are resolved:
+  #
+  #     nix-repl> fix (extends g f)
+  #     { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; }
+  #
+  # The name of the function is inspired by object-oriented inheritance, i.e.
+  # think of it as an infix operator `g extends f` that mimics the syntax from
+  # Java. It may seem counter-intuitive to have the "base class" as the second
+  # argument, but it's nice this way if several uses of `extends` are cascaded.
+  extends = f: rattrs: self: let super = rattrs self; in super // f self super;
+
+  # Compose two extending functions of the type expected by 'extends'
+  # into one where changes made in the first are available in the
+  # 'super' of the second
+  composeExtensions =
+    f: g: self: super:
+      let fApplied = f self super;
+          super' = super // fApplied;
+      in fApplied // g self super';
+
+  # Create an overridable, recursive attribute set. For example:
+  #
+  #     nix-repl> obj = makeExtensible (self: { })
+  #
+  #     nix-repl> obj
+  #     { __unfix__ = «lambda»; extend = «lambda»; }
+  #
+  #     nix-repl> obj = obj.extend (self: super: { foo = "foo"; })
+  #
+  #     nix-repl> obj
+  #     { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; }
+  #
+  #     nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; })
+  #
+  #     nix-repl> obj
+  #     { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; }
+  makeExtensible = makeExtensibleWithCustomName "extend";
+
+  # Same as `makeExtensible` but the name of the extending attribute is
+  # customized.
+  makeExtensibleWithCustomName = extenderName: rattrs:
+    fix' rattrs // {
+      ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
+   };
+}
diff --git a/lib/trivial.nix b/lib/trivial.nix
index ffbf96aa9bc..9ee0549fc0f 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -43,84 +43,6 @@ rec {
   */
   mergeAttrs = x: y: x // y;
 
-
-  # Compute the fixed point of the given function `f`, which is usually an
-  # attribute set that expects its final, non-recursive representation as an
-  # argument:
-  #
-  #     f = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
-  #
-  # Nix evaluates this recursion until all references to `self` have been
-  # resolved. At that point, the final result is returned and `f x = x` holds:
-  #
-  #     nix-repl> fix f
-  #     { bar = "bar"; foo = "foo"; foobar = "foobar"; }
-  #
-  #  Type: fix :: (a -> a) -> a
-  #
-  # See https://en.wikipedia.org/wiki/Fixed-point_combinator for further
-  # details.
-  fix = f: let x = f x; in x;
-
-  # A variant of `fix` that records the original recursive attribute set in the
-  # result. This is useful in combination with the `extends` function to
-  # implement deep overriding. See pkgs/development/haskell-modules/default.nix
-  # for a concrete example.
-  fix' = f: let x = f x // { __unfix__ = f; }; in x;
-
-  # Modify the contents of an explicitly recursive attribute set in a way that
-  # honors `self`-references. This is accomplished with a function
-  #
-  #     g = self: super: { foo = super.foo + " + "; }
-  #
-  # that has access to the unmodified input (`super`) as well as the final
-  # non-recursive representation of the attribute set (`self`). `extends`
-  # differs from the native `//` operator insofar as that it's applied *before*
-  # references to `self` are resolved:
-  #
-  #     nix-repl> fix (extends g f)
-  #     { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; }
-  #
-  # The name of the function is inspired by object-oriented inheritance, i.e.
-  # think of it as an infix operator `g extends f` that mimics the syntax from
-  # Java. It may seem counter-intuitive to have the "base class" as the second
-  # argument, but it's nice this way if several uses of `extends` are cascaded.
-  extends = f: rattrs: self: let super = rattrs self; in super // f self super;
-
-  # Compose two extending functions of the type expected by 'extends'
-  # into one where changes made in the first are available in the
-  # 'super' of the second
-  composeExtensions =
-    f: g: self: super:
-      let fApplied = f self super;
-          super' = super // fApplied;
-      in fApplied // g self super';
-
-  # Create an overridable, recursive attribute set. For example:
-  #
-  #     nix-repl> obj = makeExtensible (self: { })
-  #
-  #     nix-repl> obj
-  #     { __unfix__ = «lambda»; extend = «lambda»; }
-  #
-  #     nix-repl> obj = obj.extend (self: super: { foo = "foo"; })
-  #
-  #     nix-repl> obj
-  #     { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; }
-  #
-  #     nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; })
-  #
-  #     nix-repl> obj
-  #     { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; }
-  makeExtensible = makeExtensibleWithCustomName "extend";
-
-  # Same as `makeExtensible` but the name of the extending attribute is
-  # customized.
-  makeExtensibleWithCustomName = extenderName: rattrs:
-    fix' rattrs // {
-      ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
-   };
-
   # Flip the order of the arguments of a binary function.
   flip = f: a: b: f b a;
 
-- 
GitLab


From 20e756a0936fb75ce8f9d9ef0b7a511198bf7eea Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 23 May 2017 18:04:15 -0400
Subject: [PATCH 0119/1490] lib: Consolidate platform configurations (used for
 crossSystem)

This is good for maintenance and education.
---
 doc/cross-compilation.xml                     |  52 +++++--
 lib/systems/default.nix                       |   1 +
 lib/systems/examples.nix                      | 130 ++++++++++++++++++
 lib/systems/platforms.nix                     |   9 +-
 .../linux/make-bootstrap-tools-cross.nix      |  94 ++-----------
 pkgs/top-level/release-cross.nix              |  89 +-----------
 6 files changed, 201 insertions(+), 174 deletions(-)
 create mode 100644 lib/systems/examples.nix

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index de1b9b80d30..e99e90bac9c 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -85,7 +85,8 @@
       This field is obsolete and will soon disappear—please do not use it.
     </para></note>
     <para>
-      The exact scheme these fields is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
+      The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
+      You can see examples of ones used in practice in <literal>lib.systems.examples</literal>; note how they are not all very consistent.
       For now, here are few fields can count on them containing:
     </para>
     <variablelist>
@@ -118,8 +119,27 @@
             This is a nix representation of a parsed LLVM target triple with white-listed components.
             This can be specified directly, or actually parsed from the <varname>config</varname>.
             [Technically, only one need be specified and the others can be inferred, though the precision of inference may not be very good.]
-            See <literal>lib.systems.parse</literal> for the exact representation, along with some <literal>is*</literal>predicates.
-            These predicates are superior to the ones in <varname>stdenv</varname> as they aren't tied to the build platform (host, as previously discussed, would be a saner default).
+            See <literal>lib.systems.parse</literal> for the exact representation.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>libc</varname></term>
+        <listitem>
+          <para>
+            This is a string identifying the standard C library used.
+            Valid identifiers include "glibc" for GNU libc, "libsystem" for Darwin's Libsystem, and "uclibc" for µClibc.
+            It should probably be refactored to use the module system, like <varname>parse</varname>.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>is*</varname></term>
+        <listitem>
+          <para>
+            These predicates are defined in <literal>lib.systems.inspect</literal>, and slapped on every platform.
+            They are superior to the ones in <varname>stdenv</varname> as they force the user to be explicit about which platform they are inspecting.
+            Please use these instead of those.
           </para>
         </listitem>
       </varlistentry>
@@ -128,7 +148,7 @@
         <listitem>
           <para>
             This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set).
-            See <literal>lib.systems.platforms</literal> for examples—there's hopefully one in there that will work verbatim for each platform one is working.
+            See <literal>lib.systems.platforms</literal> for examples—there's hopefully one in there that will work verbatim for each platform that is working.
             Please help us triage these flags and give them better homes!
           </para>
         </listitem>
@@ -184,11 +204,27 @@
     More information needs to moved from the old wiki, especially <link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this section.
   </para></note>
   <para>
-    Many sources (manual, wiki, etc) probably mention passing <varname>system</varname>, <varname>platform</varname>, and, optionally, <varname>crossSystem</varname> to nixpkgs:
-    <literal>import &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..; }</literal>.
-    <varname>system</varname> and <varname>platform</varname> together determine the system on which packages are built, and <varname>crossSystem</varname> specifies the platform on which packages are ultimately intended to run, if it is different.
-    This still works, but with more recent changes, one can alternatively pass <varname>localSystem</varname>, containing <varname>system</varname> and <varname>platform</varname>, for symmetry.
+    Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in which case there is no cross compiling and everything is built by and for that system,
+    or also with <varname>crossSystem</varname>, in which case packages run on the latter, but all building happens on the former.
+    Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section.
+    As mentioned above, <literal>lib.systems.examples</literal> has some platforms which are used as arguments for these parameters in practice.
+    You can use them programmatically, or on the command line like <command>nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz'</command>.
   </para>
+  <para>
+    While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields.
+    As discussed in the previous section, only one of <varname>system</varname>, <varname>config</varname>, and <varname>parsed</varname> is needed to infer the other two.
+    Additionally, <varname>libc</varname> will be inferred from <varname>parse</varname>.
+    Finally, <literal>localSystem.system</literal> is also <emphasis>impurely</emphasis> inferred based on the platform evaluation occurs.
+    This means it is often not necessary to pass <varname>localSystem</varname> at all, as in the command-line example in the previous paragraph.
+  </para>
+  <note>
+    <para>
+      Many sources (manual, wiki, etc) probably mention passing <varname>system</varname>, <varname>platform</varname>, along with the optional <varname>crossSystem</varname> to nixpkgs:
+      <literal>import &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..; }</literal>.
+      Passing those two instead of <varname>localSystem</varname> is still supported for compatibility, but is discouraged.
+      Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience.
+    </para>
+  </note>
   <para>
     One would think that <varname>localSystem</varname> and <varname>crossSystem</varname> overlap horribly with the three <varname>*Platforms</varname> (<varname>buildPlatform</varname>, <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see <varname>stage.nix</varname> or the manual).
     Actually, those identifiers are purposefully not used here to draw a subtle but important distinction:
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index c37b6be2523..c22c9956196 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -5,6 +5,7 @@ rec {
   parse = import ./parse.nix;
   inspect = import ./inspect.nix;
   platforms = import ./platforms.nix;
+  examples = import ./examples.nix;
 
   # Elaborate a `localSystem` or `crossSystem` so that it contains everything
   # necessary.
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
new file mode 100644
index 00000000000..da9b95a6454
--- /dev/null
+++ b/lib/systems/examples.nix
@@ -0,0 +1,130 @@
+# These can be passed to nixpkgs as either the `localSystem` or
+# `crossSystem`. They are put here for user convenience, but also used by cross
+# tests and linux cross stdenv building, so handle with care!
+
+let platforms = import ./platforms.nix; in
+
+rec {
+  #
+  # Linux
+  #
+
+  sheevaplug = rec {
+    config = "armv5te-unknown-linux-gnueabi";
+    bigEndian = false;
+    arch = "armv5te";
+    float = "soft";
+    withTLS = true;
+    libc = "glibc";
+    platform = platforms.sheevaplug;
+    openssl.system = "linux-generic32";
+    inherit (platform) gcc;
+  };
+
+  raspberryPi = rec {
+    config = "armv6l-unknown-linux-gnueabihf";
+    bigEndian = false;
+    arch = "armv6l";
+    float = "hard";
+    fpu = "vfp";
+    withTLS = true;
+    libc = "glibc";
+    platform = platforms.raspberrypi;
+    openssl.system = "linux-generic32";
+    inherit (platform) gcc;
+  };
+
+  armv7l-hf-multiplatform = rec {
+    config = "arm-unknown-linux-gnueabihf";
+    bigEndian = false;
+    arch = "armv7-a";
+    float = "hard";
+    fpu = "vfpv3-d16";
+    withTLS = true;
+    libc = "glibc";
+    platform = platforms.armv7l-hf-multiplatform;
+    openssl.system = "linux-generic32";
+    inherit (platform) gcc;
+  };
+
+  aarch64-multiplatform = rec {
+    config = "aarch64-unknown-linux-gnu";
+    bigEndian = false;
+    arch = "aarch64";
+    withTLS = true;
+    libc = "glibc";
+    platform = platforms.aarch64-multiplatform;
+    inherit (platform) gcc;
+  };
+
+  scaleway-c1 = armv7l-hf-multiplatform // rec {
+    platform = platforms.scaleway-c1;
+    inherit (platform) gcc;
+    inherit (gcc) fpu;
+  };
+
+  pogoplug4 = rec {
+    arch = "armv5tel";
+    config = "armv5tel-softfloat-linux-gnueabi";
+    float = "soft";
+
+    platform = platforms.pogoplug4;
+
+    inherit (platform) gcc;
+    libc = "glibc";
+
+    withTLS = true;
+    openssl.system = "linux-generic32";
+  };
+
+  fuloongminipc = rec {
+    config = "mips64el-unknown-linux-gnu";
+    bigEndian = false;
+    arch = "mips";
+    float = "hard";
+    withTLS = true;
+    libc = "glibc";
+    platform = platforms.fuloong2f_n32;
+    openssl.system = "linux-generic32";
+    inherit (platform) gcc;
+  };
+
+  #
+  # Darwin
+  #
+
+  iphone64 = {
+    config = "aarch64-apple-darwin14";
+    arch = "arm64";
+    libc = "libsystem";
+    platform = {};
+  };
+
+  iphone32 = {
+    config = "arm-apple-darwin10";
+    arch = "armv7-a";
+    libc = "libsystem";
+    platform = {};
+  };
+
+  #
+  # Windows
+  #
+
+  # 32 bit mingw-w64
+  mingw32 = {
+    config = "i686-pc-mingw32";
+    arch = "x86"; # Irrelevant
+    libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
+    platform = {};
+  };
+
+  # 64 bit mingw-w64
+  mingwW64 = {
+    # That's the triplet they use in the mingw-w64 docs.
+    config = "x86_64-pc-mingw32";
+    arch = "x86_64"; # Irrelevant
+    libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
+    platform = {};
+  };
+}
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 0bea38ab419..ae4fc355c71 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -255,6 +255,10 @@ rec {
       arch = "armv6";
       fpu = "vfp";
       float = "hard";
+      # TODO(@Ericson2314) what is this and is it a good idea? It was
+      # used in some cross compilation examples but not others.
+      #
+      # abi = "aapcs-linux";
     };
   };
 
@@ -460,7 +464,10 @@ rec {
     '';
     kernelTarget = "vmlinux";
     uboot = null;
-    gcc.arch = "loongson2f";
+    gcc = {
+      arch = "loongson2f";
+      abi = "n32";
+    };
   };
 
   beaglebone = armv7l-hf-multiplatform // {
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 50fd563e7c2..0378891b27a 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -6,91 +6,19 @@ let
   lib = import ../../../lib;
   pkgsFun = import ../../..;
 
-  sheevaplugCrossSystem = {
-    crossSystem = rec {
-      config = "arm-linux-gnueabi";
-      bigEndian = false;
-      arch = "armv5te";
-      float = "soft";
-      withTLS = true;
-      libc = "glibc";
-      platform = lib.systems.platforms.sheevaplug;
-      openssl.system = "linux-generic32";
-      inherit (platform) gcc;
-    };
-  };
-
-  raspberrypiCrossSystem = {
-    crossSystem = rec {
-      config = "arm-linux-gnueabihf";
-      bigEndian = false;
-      arch = "armv6";
-      float = "hard";
-      fpu = "vfp";
-      withTLS = true;
-      libc = "glibc";
-      platform = lib.systems.platforms.raspberrypi;
-      openssl.system = "linux-generic32";
-      inherit (platform) gcc;
-    };
-  };
-
-  armv7l-hf-multiplatform-crossSystem = {
-    crossSystem = rec {
-      config = "arm-linux-gnueabihf";
-      bigEndian = false;
-      arch = "armv7-a";
-      float = "hard";
-      fpu = "vfpv3-d16";
-      withTLS = true;
-      libc = "glibc";
-      platform = lib.systems.platforms.armv7l-hf-multiplatform;
-      openssl.system = "linux-generic32";
-      inherit (platform) gcc;
-    };
-  };
-
-  aarch64-multiplatform-crossSystem = {
-    crossSystem = rec {
-      config = "aarch64-linux-gnu";
-      bigEndian = false;
-      arch = "aarch64";
-      withTLS = true;
-      libc = "glibc";
-      platform = lib.systems.platforms.aarch64-multiplatform;
-      inherit (platform) gcc;
-    };
-  };
-
-  scaleway-c1-crossSystem.crossSystem = armv7l-hf-multiplatform-crossSystem.crossSystem // rec {
-    platform = lib.systems.platforms.scaleway-c1;
-    inherit (platform) gcc;
-    inherit (gcc) fpu;
-  };
-
-  pogoplug4-crossSystem.crossSystem = {
-    arch = "armv5tel";
-    config = "armv5tel-softfloat-linux-gnueabi";
-    float = "soft";
-
-    platform = lib.systems.platforms.pogoplug4;
-
-    inherit (lib.systems.platforms.pogoplug4) gcc;
-    libc = "glibc";
-
-    withTLS = true;
-    openssl.system = "linux-generic32";
-  };
+  inherit (lib.systems.examples)
+    sheevaplug raspberryPi armv7l-hf-multiplatform
+    aarch64-multiplatform scaleway-c1 pogoplug4;
 
   selectedCrossSystem =
-    if toolsArch == "armv5tel" then sheevaplugCrossSystem else
-    if toolsArch == "scaleway" then scaleway-c1-crossSystem else
-    if toolsArch == "pogoplug4" then pogoplug4-crossSystem else
-    if toolsArch == "armv6l" then raspberrypiCrossSystem else
-    if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else
-    if toolsArch == "aarch64" then aarch64-multiplatform-crossSystem else null;
-
-  pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);
+    if toolsArch == "armv5tel" then sheevaplug else
+    if toolsArch == "scaleway" then scaleway-c1 else
+    if toolsArch == "pogoplug4" then pogoplug4 else
+    if toolsArch == "armv6l" then raspberryPi else
+    if toolsArch == "armv7l" then armv7l-hf-multiplatform else
+    if toolsArch == "aarch64" then aarch64-multiplatform else null;
+
+  pkgs = pkgsFun ({ inherit system; crossSystem = selectedCrossSystem; });
 
   glibc = pkgs.libcCross;
   bash = pkgs.bash;
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index c81d65ad0e0..94c1e6c7ad2 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -89,101 +89,26 @@ in
     guile = nativePlatforms;
   };
 
-  darwinToAarch64 = let
-    crossSystem = {
-      config = "aarch64-apple-darwin14";
-      arch = "arm64";
-      libc = "libSystem";
-    };
-  in mapTestOnCross crossSystem darwinCommon;
+  crossIphone64 = mapTestOnCross lib.systems.examples.iphone64 darwinCommon;
 
-  darwinToArm = let
-    crossSystem = {
-      config = "arm-apple-darwin10";
-      arch = "armv7-a";
-      libc = "libSystem";
-    };
-  in mapTestOnCross crossSystem darwinCommon;
+  crossIphone32 = mapTestOnCross lib.systems.examples.iphone32 darwinCommon;
 
   /* Test some cross builds to the Sheevaplug */
-  crossSheevaplugLinux = let
-    crossSystem = {
-      config = "armv5tel-unknown-linux-gnueabi";
-      bigEndian = false;
-      arch = "arm";
-      float = "soft";
-      withTLS = true;
-      platform = lib.systems.platforms.sheevaplug;
-      libc = "glibc";
-      openssl.system = "linux-generic32";
-    };
-  in mapTestOnCross crossSystem (linuxCommon // {
+  crossSheevaplugLinux = mapTestOnCross lib.systems.examples.sheevaplug (linuxCommon // {
     ubootSheevaplug = nativePlatforms;
   });
 
-
   /* Test some cross builds on 32 bit mingw-w64 */
-  crossMingw32 = let
-    crossSystem = {
-      config = "i686-pc-mingw32";
-      arch = "x86"; # Irrelevant
-      libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
-      platform = {};
-    };
-  in mapTestOnCross crossSystem windowsCommon;
-
+  crossMingw32 = mapTestOnCross lib.systems.examples.mingw32 windowsCommon;
 
   /* Test some cross builds on 64 bit mingw-w64 */
-  crossMingwW64 = let
-    crossSystem = {
-      # That's the triplet they use in the mingw-w64 docs.
-      config = "x86_64-pc-mingw32";
-      arch = "x86_64"; # Irrelevant
-      libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
-      platform = {};
-    };
-  in mapTestOnCross crossSystem windowsCommon;
-
+  crossMingwW64 = mapTestOnCross lib.systems.examples.mingwW64 windowsCommon;
 
   /* Linux on the fuloong */
-  fuloongminipc = let
-    crossSystem = {
-      config = "mips64el-unknown-linux-gnu";
-      bigEndian = false;
-      arch = "mips";
-      float = "hard";
-      withTLS = true;
-      libc = "glibc";
-      platform = lib.systems.platforms.fuloong2f_n32;
-      openssl.system = "linux-generic32";
-      gcc = {
-        arch = "loongson2f";
-        abi = "n32";
-      };
-    };
-  in mapTestOnCross crossSystem linuxCommon;
-
+  fuloongminipc = mapTestOnCross lib.systems.examples.fuloongminipc linuxCommon;
 
   /* Linux on Raspberrypi */
-  rpi = let
-    crossSystem = {
-      config = "armv6l-unknown-linux-gnueabi";
-      bigEndian = false;
-      arch = "arm";
-      float = "hard";
-      fpu = "vfp";
-      withTLS = true;
-      libc = "glibc";
-      platform = lib.systems.platforms.raspberrypi;
-      openssl.system = "linux-generic32";
-      gcc = {
-        arch = "armv6";
-        fpu = "vfp";
-        float = "softfp";
-        abi = "aapcs-linux";
-      };
-    };
-  in mapTestOnCross crossSystem (linuxCommon // {
+  rpi = mapTestOnCross lib.systems.examples.raspberryPi (linuxCommon // {
     vim = nativePlatforms;
     unzip = nativePlatforms;
     ddrescue = nativePlatforms;
-- 
GitLab


From 2b0a8427e6995eefddf09919ad48a7887e999965 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 30 May 2017 01:20:37 +0200
Subject: [PATCH 0120/1490] lib/string: make `isStorePath` total (#26216)

fix #9278
---
 lib/strings.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index d48624257cf..1cc633c729d 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -438,8 +438,13 @@ rec {
        => true
        isStorePath pkgs.python
        => true
+       isStorePath [] || isStorePath 42 || isStorePath {} || …
+       => false
   */
-  isStorePath = x: builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == builtins.storeDir;
+  isStorePath = x:
+       builtins.isString x
+    && builtins.substring 0 1 (toString x) == "/"
+    && dirOf (builtins.toPath x) == builtins.storeDir;
 
   /* Convert string to int
      Obviously, it is a bit hacky to use fromJSON that way.
-- 
GitLab


From c66ff8ec3ce37a01659294efc36c4ab5e3036462 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 29 May 2017 20:12:06 -0400
Subject: [PATCH 0121/1490] cross tests and stdenv: armv5te*l* of sheevaplug
 explicit

The "l" suffix presumably indicates it is little-endian, which it
is.
---
 lib/systems/examples.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index da9b95a6454..3ffaf393435 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -10,9 +10,9 @@ rec {
   #
 
   sheevaplug = rec {
-    config = "armv5te-unknown-linux-gnueabi";
+    config = "armv5tel-unknown-linux-gnueabi";
     bigEndian = false;
-    arch = "armv5te";
+    arch = "armv5tel";
     float = "soft";
     withTLS = true;
     libc = "glibc";
-- 
GitLab


From eb2994a0d5541d591cd4fc2435b978b00b19bc46 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@gmail.com>
Date: Tue, 30 May 2017 02:14:46 +0200
Subject: [PATCH 0122/1490] pandas: Fix build on darwin

Since the commands "locale", "pbpaste" and "pbcopy" are not in nixpkgs,
as they are impure darwin dependencies, we currently cannot get the
clipboard and locale functionality to work properly. We disable the
tests "test_locale" and "test_clipboard" on darwin, so we get a mostly
working pandas. Additionally to disabling the test via py.test, we also
need to provide fake pbpaste/pbcopy commands, so py.test won't fail
during the collection phase.

This closes #25417 and closes #11623.
---
 .../python-modules/pandas/default.nix         | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 103907c26d1..0d3a2d2dd5c 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -19,7 +19,6 @@
 , openpyxl
 , tables
 , xlwt
-, darwin ? {}
 , libcxx ? null
 }:
 
@@ -53,7 +52,7 @@ in buildPythonPackage rec {
     openpyxl
     tables
     xlwt
-  ] ++ optional isDarwin darwin.locale; # provides the locale command
+  ];
 
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
@@ -63,16 +62,22 @@ in buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace "['pandas/src/klib', 'pandas/src']" \
                 "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
-
-  # disable clipboard tests since pbcopy/pbpaste are not open source
-    substituteInPlace pandas/io/tests/test_clipboard.py \
-      --replace pandas.util.clipboard no_such_module \
-      --replace OSError ImportError
   '';
 
   checkPhase = ''
     runHook preCheck
-    py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network
+  ''
+  # TODO: Get locale and clipboard support working on darwin.
+  #       Until then we disable the tests.
+  + optionalString isDarwin ''
+    # Fake the impure dependencies pbpaste and pbcopy
+    echo "#!/bin/sh" > pbcopy
+    echo "#!/bin/sh" > pbpaste
+    chmod a+x pbcopy pbpaste
+    export PATH=$(pwd):$PATH
+  '' + ''
+    py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network \
+      ${if isDarwin then "-k 'not test_locale and not test_clipboard'" else ""}
     runHook postCheck
   '';
 
@@ -83,7 +88,7 @@ in buildPythonPackage rec {
     homepage = "http://pandas.pydata.org/";
     description = "Python Data Analysis Library";
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ raskin fridh ];
+    maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
-- 
GitLab


From 79830172b5cad4d44123f58f822a64ca5a264cfd Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Mon, 29 May 2017 20:44:27 -0400
Subject: [PATCH 0123/1490] txaio: 2.7.1 fixes

- uses fetchpypi
- fixes broken test
- tested nixos python 27/34
---
 .../python-modules/txaio/default.nix          | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 36291518605..68cb28dc850 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -1,23 +1,27 @@
-{ stdenv, buildPythonPackage, fetchurl,
-  pytest, mock, six, twisted
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted }:
+
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "txaio";
   version = "2.7.1";
 
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1lmllmjjsqzl3w4faq2qhlgkaqn1yn1m7d99k822ib7qgz18bsly";
+  };
+
   buildInputs = [ pytest mock ];
+
   propagatedBuildInputs = [ six twisted ];
 
+  patchPhase = ''
+    sed -i '152d' test/test_logging.py
+  '';
+
   checkPhase = ''
     py.test -k "not test_sdist"
   '';
 
-  src = fetchurl {
-    url = "mirror://pypi/t/${pname}/${name}.tar.gz";
-    sha256 = "9eea85c27ff8ac28049a29b55383f5c162351f855860e5081ff4632d65a5b4d2";
-  };
-
   meta = with stdenv.lib; {
     description = "Utilities to support code that runs unmodified on Twisted and asyncio.";
     homepage    = "https://github.com/crossbario/txaio";
-- 
GitLab


From 47e86655950d868f514bb06dd6c1111578fc74e5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 30 May 2017 06:35:33 +0200
Subject: [PATCH 0124/1490] geogebra: 5-0-355-0 -> 5-0-361-0

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

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index bc766b96bca..2712388ffe7 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-355-0";
+  version = "5-0-361-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "0gm6jqlc3kgnbwnqlz6i9rahdy802jq7xc9gw1q5ynk63smm3ngk";
+    sha256 = "14kidnk8bidklv474zqipv3f77qnfmc697pl407v0rja481c649a";
   };
 
   srcIcon = fetchurl {
-- 
GitLab


From a987943fdf023bf001dda04fe5a51f817a5743e0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 30 May 2017 06:35:05 +0000
Subject: [PATCH 0125/1490] ditaa: more general platform

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

diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix
index 86ff9ec8fae..56c1c976362 100644
--- a/pkgs/tools/graphics/ditaa/default.nix
+++ b/pkgs/tools/graphics/ditaa/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Convert ascii art diagrams into proper bitmap graphics";
     homepage = http://ditaa.sourceforge.net/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }
-- 
GitLab


From 4f6422b76cab823554e481f40c8fb831a0808e98 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 30 May 2017 06:54:56 +0000
Subject: [PATCH 0126/1490] unison: more general platform

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

diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index 2daa846990a..ed48bce7b2e 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (rec {
     description = "Bidirectional file synchronizer";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; unix;
   };
 
 })
-- 
GitLab


From dfebb66f657240e5448a98d9efc90d4c66825274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 30 May 2017 08:47:09 +0100
Subject: [PATCH 0127/1490] systemd: v232 -> v233

Changelog: https://github.com/systemd/systemd/blob/v233/NEWS

Upgrade was pretty smooth. One notably change is the new hybrid cgroup
mode: https://github.com/systemd/systemd/blob/v233/NEWS#L5 It should
provide better compatibility with docker.
---
 pkgs/os-specific/linux/systemd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d1042723a71..3092aba506b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -9,14 +9,14 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  version = "232";
+  version = "233";
   name = "systemd-${version}";
 
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "systemd";
-    rev = "66e778e851440fde7f20cff0c24d23538144be8d";
-    sha256 = "1valz8v2q4cj0ipz2b6mh5p0rjxpy3m88gg9xa2rcc4gcmscndzk";
+    rev = "a5af87e469ed3bd806d1ac34716d4f17ce9d3464";
+    sha256 = "14slhk9p1f4ngxhhsmk8i1irl6jiffs1ln84ddcqc8iy22cyqvs3";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];
-- 
GitLab


From 1fdf42d4612b6872a2625b3ba2f8750263281312 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Mon, 29 May 2017 19:24:34 +0200
Subject: [PATCH 0128/1490] pythonPackages.tensorflow: Don't change the rpath
 to point to gcc4.9

When using cuda, the rpath was set to include GCC lib version 4.9.
I am not sure what this was attempting to do, but an effect was to
prevent certain python libraries to find the correct (newer) version
of the std lib.

Also avoid mentions of any specifc version in the
propagatedBuildInputs
---
 pkgs/development/python-modules/tensorflow/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 8946877eb14..388d27e0686 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -5,7 +5,6 @@
 , cudaSupport ? false
 , cudatoolkit ? null
 , cudnn ? null
-, gcc49 ? null
 , linuxPackages ? null
 , numpy
 , six
@@ -13,13 +12,11 @@
 , swig
 , werkzeug
 , mock
-, gcc
 , zlib
 }:
 
 assert cudaSupport -> cudatoolkit != null
                    && cudnn != null
-                   && gcc49 != null
                    && linuxPackages != null;
 
 # unsupported combination
@@ -98,7 +95,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = with stdenv.lib;
     [ numpy six protobuf3_2 swig werkzeug mock ]
-    ++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ];
+    ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ];
 
   # Note that we need to run *after* the fixup phase because the
   # libraries are loaded at runtime. If we run in preFixup then
@@ -106,10 +103,10 @@ buildPythonPackage rec {
   postFixup = let
     rpath = stdenv.lib.makeLibraryPath
       (if cudaSupport then
-        [ gcc49.cc.lib zlib cudatoolkit cudnn
+        [ stdenv.cc.cc.lib zlib cudatoolkit cudnn
           linuxPackages.nvidia_x11 ]
       else
-        [ gcc.cc.lib zlib ]
+        [ stdenv.cc.cc.lib zlib ]
       );
   in
   ''
-- 
GitLab


From 4730b8ba05d2f9a71168f6196a0ccb5a1641ce38 Mon Sep 17 00:00:00 2001
From: Mikhail Volkhov <volhovm.cs@gmail.com>
Date: Tue, 30 May 2017 13:05:01 +0300
Subject: [PATCH 0129/1490] scudcloud: 1.54 -> 1.58

---
 .../instant-messengers/scudcloud/default.nix     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index d9a3dfc690d..9d2de536dbf 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchgit, python3Packages }:
+{ stdenv, fetchurl, python3Packages }:
 
-python3Packages.buildPythonPackage {
-  name = "scudcloud-1.44";
+let version = "1.58";
+in python3Packages.buildPythonPackage {
+  name = "scudcloud-${version}";
 
-  # Branch 254-port-to-qt5
-  # https://github.com/raelgc/scudcloud/commit/65c304416dfdd5f456fa6f7301432a953d5e12d0
-  src = fetchgit {
-      url = https://github.com/raelgc/scudcloud/;
-      rev = "65c304416dfdd5f456fa6f7301432a953d5e12d0";
-      sha256 = "0h1055y88kldqw31ayqfx9zsksgxsyqd8h0hwnhj80yn3jcx0rp6";
+  src = fetchurl {
+    url = "https://github.com/raelgc/scudcloud/archive/v${version}.tar.gz";
+    sha256 = "1j84qdc2j3dvl1nhrjqm0blc8ww723p9a6hqprkkp8alw77myq1l";
   };
 
   propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ];
-- 
GitLab


From e6b65c04fa9752eeeb41241638852af901389406 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Tue, 30 May 2017 01:19:07 +0200
Subject: [PATCH 0130/1490] pythonPackages.future: 0.15.2 -> 0.16.0

Also moved the expression from python-packages.nix to ./pkgs/development/python-modules/future/default.nix due to discussion in #26220
Used fetchPypi insted of fetchurl.
---
 .../python-modules/future/default.nix         | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 32 +--------------
 2 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/development/python-modules/future/default.nix

diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix
new file mode 100644
index 00000000000..c368913caae
--- /dev/null
+++ b/pkgs/development/python-modules/future/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy26
+, importlib
+, argparse
+}:
+
+buildPythonPackage rec {
+  pname = "future";
+  version = "0.16.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
+  };
+
+  propagatedBuildInputs = lib.optionals isPy26 [ importlib argparse ];
+  doCheck = false;
+
+  meta = {
+    description = "Clean single-source support for Python 3 and 2";
+    longDescription = ''
+      python-future is the missing compatibility layer between Python 2 and
+      Python 3. It allows you to use a single, clean Python 3.x-compatible
+      codebase to support both Python 2 and Python 3 with minimal overhead.
+
+      It provides future and past packages with backports and forward ports
+      of features from Python 3 and 2. It also comes with futurize and
+      pasteurize, customized 2to3-based scripts that helps you to convert
+      either Py2 or Py3 code easily to support both Python 2 and 3 in a
+      single clean Py3-style codebase, module by module.
+    '';
+    homepage = https://python-future.org;
+    downloadPage = https://github.com/PythonCharmers/python-future/releases;
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ prikhi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 107fd715b94..d155575bc18 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11556,37 +11556,7 @@ in {
     };
   };
 
-  future = buildPythonPackage rec {
-    version = "0.15.2";
-    name = "future-${version}";
-
-    src = pkgs.fetchurl {
-      url = "http://github.com/PythonCharmers/python-future/archive/v${version}.tar.gz";
-      sha256 = "0vm61j5br6jiry6pgcxnwvxhki8ksnirp7k9mcbmxmgib3r60xd3";
-    };
-
-    propagatedBuildInputs = with self; optionals isPy26 [ importlib argparse ];
-    doCheck = false;
-
-    meta = {
-      description = "Clean single-source support for Python 3 and 2";
-      longDescription = ''
-        python-future is the missing compatibility layer between Python 2 and
-        Python 3. It allows you to use a single, clean Python 3.x-compatible
-        codebase to support both Python 2 and Python 3 with minimal overhead.
-
-        It provides future and past packages with backports and forward ports
-        of features from Python 3 and 2. It also comes with futurize and
-        pasteurize, customized 2to3-based scripts that helps you to convert
-        either Py2 or Py3 code easily to support both Python 2 and 3 in a
-        single clean Py3-style codebase, module by module.
-      '';
-      homepage = https://python-future.org;
-      downloadPage = https://github.com/PythonCharmers/python-future/releases;
-      license = licenses.mit;
-      maintainers = with maintainers; [ prikhi ];
-    };
-  };
+  future = callPackage ../development/python-modules/future { };
 
   futures = buildPythonPackage rec {
     name = "futures-${version}";
-- 
GitLab


From 31d5363228989a62cb81fb97f14e33e5051c6ac9 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Tue, 30 May 2017 13:10:45 +0200
Subject: [PATCH 0131/1490] ctop: init at 2017-05-28

---
 pkgs/tools/system/ctop/default.nix |  25 ++++++
 pkgs/tools/system/ctop/deps.nix    | 120 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |   2 +
 3 files changed, 147 insertions(+)
 create mode 100644 pkgs/tools/system/ctop/default.nix
 create mode 100644 pkgs/tools/system/ctop/deps.nix

diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix
new file mode 100644
index 00000000000..a0bda0c4335
--- /dev/null
+++ b/pkgs/tools/system/ctop/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "ctop-unstable-${version}";
+  version = "2017-05-28";
+  rev = "b4e1fbf29073625ec803025158636bdbcf2357f4";
+
+  goPackagePath = "github.com/bcicen/ctop";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "bcicen";
+    repo = "ctop";
+    sha256 = "162pc7gds66cgznqlq9gywr0qij5pymn7xszlq9rn4w2fm64qgg3";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Concise commandline monitoring for containers";
+    homepage = "http://ctop.sh/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ apeyroux ];
+  };
+}
diff --git a/pkgs/tools/system/ctop/deps.nix b/pkgs/tools/system/ctop/deps.nix
new file mode 100644
index 00000000000..4fb75cdcd3d
--- /dev/null
+++ b/pkgs/tools/system/ctop/deps.nix
@@ -0,0 +1,120 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
+[
+  {
+    goPackagePath = "github.com/docker/docker";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/docker";
+      rev = "599f207b45e74648a8a6a7ac87d77e40930504e9";
+      sha256 = "1n0r9ahcx5h2f97ap5fy5hgnpamzzrgihknx7wgvvpm4hrzxm31r";
+    };
+  }
+  {
+    goPackagePath = "github.com/docker/go-units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-units";
+      rev = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52";
+      sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii";
+    };
+  }
+  {
+    goPackagePath = "github.com/fsouza/go-dockerclient";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsouza/go-dockerclient";
+      rev = "c933ed18bef34ec2955de03de8ef9a3bb996e3df";
+      sha256 = "1qci2m5ifmz3lcmc4y6k9baz9z1i77xnrrcq6zi9mpclhhfr0qzd";
+    };
+  }
+  {
+    goPackagePath = "github.com/gizak/termui";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gizak/termui";
+      rev = "ea10e6ccee219e572ffad0ac1909f1a17f6db7d6";
+      sha256 = "1nxihx4vwxwgq3vnccc8a1v34raqvvsl0p10v1nlvs61rjvs9g32";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-cleanhttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-cleanhttp";
+      rev = "3573b8b52aa7b37b9358d966a898feb387f62437";
+      sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr";
+    };
+  }
+  {
+    goPackagePath = "github.com/jgautheron/codename-generator";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jgautheron/codename-generator";
+      rev = "16d037c7cc3c9b552fe4af9828b7338d752dbaf9";
+      sha256 = "0v6fji5swnrdjlp3bahv65chnbhxzl25j3hwwnyvvbb4iwa9a376";
+    };
+  }
+  {
+    goPackagePath = "github.com/maruel/panicparse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/maruel/panicparse";
+      rev = "ae43f192cef2add653fe1481a3070ed00a4a6981";
+      sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
+      sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-wordwrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-wordwrap";
+      rev = "ad45545899c7b13c020ea92b2072220eefad42b8";
+      sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9";
+    };
+  }
+  {
+    goPackagePath = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev = "7994c181db7761ca3c67a217068cf31826113f5f";
+      sha256 = "0ssc54wamn3h8z68kv4fdgvk3kjii95psi2kk0slsilmg5v6jzhj";
+    };
+  }
+  {
+    goPackagePath = "github.com/nu7hatch/gouuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nu7hatch/gouuid";
+      rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3";
+      sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj";
+    };
+  }
+  {
+    goPackagePath = "github.com/op/go-logging";
+    fetch = {
+      type = "git";
+      url = "https://github.com/op/go-logging";
+      rev = "970db520ece77730c7e4724c61121037378659d9";
+      sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "3da985ce5951d99de868be4385f21ea6c2b22f24";
+      sha256 = "0mhqa53pyj9gxg4m0c9s0f4r5jp0rihlni1nrpkd1d921xxzh714";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e52201f745..e1b90bcefb8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13440,6 +13440,8 @@ with pkgs;
     liblapack = liblapackWithoutAtlas;
   };
 
+  ctop = callPackage ../tools/system/ctop { };
+
   cuneiform = callPackage ../tools/graphics/cuneiform {};
 
   cutecom = callPackage ../tools/misc/cutecom { };
-- 
GitLab


From 94be2db902109537ac1e3e1e17221141d3c4f799 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Tue, 30 May 2017 13:24:51 +0200
Subject: [PATCH 0132/1490] libfilezilla: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index d6c0c538a8f..b0f1046aa59 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "06ivj40bk5b76a36zwhnwqvg564hgccncnn5nb5cqc7kf4bkkchq";
+    sha256 = "1qrvddjqz5jv6920gcfqsrsjksi2845hn96g0z3vpcsm6nifhqn1";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From b73fd0c5627cb5bb387669957726c857e58f5fe2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Tue, 30 May 2017 13:36:07 +0200
Subject: [PATCH 0133/1490] global: 6.5.6 -> 6.5.7

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

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 62d96b2158f..f55130ae104 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "global-${version}";
-  version = "6.5.6";
+  version = "6.5.7";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "018m536k5y6lks1a6gqn3bsp7r8zk017znqj9kva1nm8d7x9lbqj";
+    sha256 = "0cnd7a7d1pl46yk15q6mnr9i9w3xi8pxgchw4ia9njgr4jjqzh6r";
   };
 
   nativeBuildInputs = [ libtool makeWrapper ];
-- 
GitLab


From a1c15989aa8363a80f32123ea0030ecef68576a9 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Tue, 30 May 2017 12:39:20 +0100
Subject: [PATCH 0134/1490] python.pkgs.flask_migrate: 1.7.0 -> 2.0.3

fixes build against new dependencies after some test tinkering, seems
we can remove the python3-patching as there exists a "python" symlink now
---
 .../python-modules/flask-migrate/default.nix  | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +---------------
 2 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/flask-migrate/default.nix

diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
new file mode 100644
index 00000000000..26fbed4ca5e
--- /dev/null
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic
+}:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  pname = "Flask-Migrate";
+  version = "2.0.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "107x78lkqsnbg92dld3dkagg07jvchp3ib3y0sivc4ipz6n1y7rk";
+  };
+
+  checkInputs = optional isPy3k glibcLocales;
+  propagatedBuildInputs = [ flask flask_sqlalchemy flask_script alembic ];
+
+  # tests invoke the flask cli which uses click and therefore has py3k encoding troubles
+  preCheck = optionalString isPy3k ''
+    export LANG="en_US.UTF-8"
+  '';
+
+  meta = {
+    description = "SQLAlchemy database migrations for Flask applications using Alembic";
+    license = licenses.mit;
+    homepage = https://github.com/miguelgrinberg/Flask-Migrate;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aae6e2f743c..e9f2f0f19d2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11020,30 +11020,7 @@ in {
 
   flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { };
 
-  flask_migrate = buildPythonPackage rec {
-    name = "Flask-Migrate-${version}";
-    version = "1.7.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flask-Migrate/Flask-Migrate-1.7.0.tar.gz";
-      sha256 = "16d7vnaj9xmxvb3qbcmhahm3ldfdhzzi6y221h62x4v1v1jayx7v";
-    };
-
-    # When tests run with python3*, tests should run commands as "python3 <args>",
-    # not "python <args>"
-    patchPhase = ''
-      substituteInPlace tests/test_migrate.py --replace "python" "${python.executable}"
-      substituteInPlace tests/test_multidb_migrate.py --replace "python" "${python.executable}"
-    '';
-
-    propagatedBuildInputs = with self ; [ flask flask_sqlalchemy flask_script alembic ];
-
-    meta = {
-      description = "SQLAlchemy database migrations for Flask applications using Alembic";
-      license = licenses.mit;
-      homepage = https://github.com/miguelgrinberg/Flask-Migrate;
-    };
-  };
+  flask_migrate = callPackage ../development/python-modules/flask-migrate { };
 
   flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { };
 
-- 
GitLab


From a996fe849f669e5d1cafed18f299ed6ed4abec84 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 30 May 2017 16:39:27 +0300
Subject: [PATCH 0135/1490] fstrim: Add service

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/misc/fstrim.nix        | 45 +++++++++++++++++++
 pkgs/os-specific/linux/util-linux/default.nix |  8 ++--
 3 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 nixos/modules/services/misc/fstrim.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7afcb9051bd..cae081aa73f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -283,6 +283,7 @@
   ./services/misc/etcd.nix
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
+  ./services/misc/fstrim.nix
   ./services/misc/gammu-smsd.nix
   ./services/misc/geoip-updater.nix
   #./services/misc/gitit.nix
diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix
new file mode 100644
index 00000000000..e89366cbafe
--- /dev/null
+++ b/nixos/modules/services/misc/fstrim.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.fstrim;
+
+in {
+
+  options = {
+
+    services.fstrim = {
+      enable = mkEnableOption "periodic SSD TRIM of mounted partitions in background";
+
+      interval = mkOption {
+        type = types.string;
+        default = "weekly";
+        description = ''
+          How often we run fstrim. For most desktop and server systems
+          a sufficient trimming frequency is once a week.
+
+          The format is described in
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>7</manvolnum></citerefentry>.
+        '';
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.packages = [ pkgs.utillinux ];
+
+    systemd.timers.fstrim = {
+      timerConfig = {
+        OnCalendar = cfg.interval;
+      };
+      wantedBy = [ "timers.target" ];
+    };
+
+  };
+
+}
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 9126a1cdec3..5d7f701b39e 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
     preConfigure = "export scanf_cv_type_modifier=ms";
   };
 
+  preConfigure = lib.optionalString (systemd != null) ''
+    configureFlags+="--with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/"
+  '';
+
   # !!! It would be better to obtain the path to the mount helpers
   # (/sbin/mount.*) through an environment variable, but that's
   # somewhat risky because we have to consider that mount can setuid
@@ -40,10 +44,6 @@ stdenv.mkDerivation rec {
     --disable-use-tty-group
     --enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin
     ${if ncurses == null then "--without-ncurses" else ""}
-    ${if systemd == null then "" else ''
-      --with-systemd
-      --with-systemdsystemunitdir=$out/lib/systemd/system/
-    ''}
   '';
 
   makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
-- 
GitLab


From 479ddf0f139648a716c9110957e3cf3485f82558 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Tue, 30 May 2017 15:50:10 +0200
Subject: [PATCH 0136/1490] networkmanager_dmenu: unstable-2017-04-13 ->
 unstable-2017-05-28

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

diff --git a/pkgs/tools/networking/networkmanager_dmenu/default.nix b/pkgs/tools/networking/networkmanager_dmenu/default.nix
index f9b84be6015..79fad953a2c 100644
--- a/pkgs/tools/networking/networkmanager_dmenu/default.nix
+++ b/pkgs/tools/networking/networkmanager_dmenu/default.nix
@@ -4,13 +4,13 @@
 let inherit (python3Packages) python pygobject3;
 in stdenv.mkDerivation rec {
   name = "networkmanager_dmenu-unstable-${version}";
-  version = "2017-04-13";
+  version = "2017-05-28";
 
   src = fetchFromGitHub {
     owner = "firecat53";
     repo = "networkmanager-dmenu";
-    rev = "fbc0704702b32c2efb30ba6b5c0ad6f054a71a18";
-    sha256 = "1584zrhla1njvkrbvb1rq66q06gs510f0l1ls3z7x7jmn322y6yr";
+    rev = "eeb8e6922dee887890884f129b51bb21b0047d30";
+    sha256 = "00n82sjjqk76sfxi92f5vnzpngk66cqwyzqdanbszpl019ajr5h6";
   };
 
   buildInputs = [ glib python pygobject3 gobjectIntrospection networkmanager python3Packages.wrapPython ];
-- 
GitLab


From 9f3c2bc8390b9e4f6f2b4cb37f08bb74fca83e27 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 31 May 2017 00:25:50 +1000
Subject: [PATCH 0137/1490] gpxsee: 4.3 -> 4.8

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 5b977d13796..42fc1e46e33 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
-  version = "4.3";
+  version = "4.8";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "15f686frxlrmdvh5cc837kx62g0ihqj4vb87i8433g7l5vqkv3lf";
+    sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
   };
 
   nativeBuildInputs = [ qmakeHook qttools makeQtWrapper ];
-- 
GitLab


From 1e51fdc2cd77f3f68fe12406de002dd21bdcae01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 30 May 2017 16:48:20 +0200
Subject: [PATCH 0138/1490] i2pd: disable AVX instructions

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 49c88d817a4..f43fac8215a 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ boost zlib openssl ];
-  makeFlags = "USE_AESNI=no";
+  makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ];
 
   installPhase = ''
     install -D i2pd $out/bin/i2pd
-- 
GitLab


From 53835c93cb4bc1c6228ee04d6788398a8ab36ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 30 May 2017 16:48:35 +0200
Subject: [PATCH 0139/1490] i2pd: homepage update

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index f43fac8215a..2f32c3b3a2d 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://track.privacysolutions.no/projects/i2pd";
+    homepage = "https://i2pd.website";
     description = "Minimal I2P router written in C++";
     license = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo ];
-- 
GitLab


From 728ddbd95fa71c30ddb84cad72dc02b34873b330 Mon Sep 17 00:00:00 2001
From: Aaron Bull Schaefer <aaron@elasticdog.com>
Date: Tue, 30 May 2017 08:21:32 -0700
Subject: [PATCH 0140/1490] vagrant: 1.9.1 -> 1.9.5

---
 pkgs/development/tools/vagrant/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 659c831bbe3..557d1fde79d 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -2,7 +2,7 @@
 , libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }:
 
 let
-  version = "1.9.1";
+  version = "1.9.5";
   rake = buildRubyGem {
     inherit ruby;
     gemName = "rake";
@@ -13,16 +13,16 @@ let
   url = if stdenv.isLinux
     then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb"
     else if stdenv.isDarwin
-      then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}.dmg"
+      then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.dmg"
       else "system ${stdenv.system} not supported";
 
   sha256 = {
-    "x86_64-linux"  = "0l1if9c4s4wkbi8k00pl7x00lil21izrd8wb9nv2b5q4gqidc1nh";
-    "i686-linux"    = "1789wjwcpgw3mljl49c8v5kycisay684gyalkkvd06928423y9zb";
-    "x86_64-darwin" = "1xrfq1a0xyifkhhjnpm6wsnms9w8c9q5rd2qqn4sm5npl7viy68p";
+    "x86_64-linux"  = "16ijzaacfbqrgh561bf51747d2rv8kydgs14dfdr572qi0f88baw";
+    "i686-linux"    = "0lvkb4k0a34a8hzlsi0apf056rhyprh5w0gn16d0n2ijnaf9j2yk";
+    "x86_64-darwin" = "070mrczsx1j0jl9sx6963l3hrk9anqa13r008wk1d22d25xj25mc";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
-  arch = builtins.replaceStrings ["-linux"] [""] stdenv.system;
+  arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system;
 
 in stdenv.mkDerivation rec {
   name = "vagrant-${version}";
-- 
GitLab


From 3c83ce30142426807dd7fdef02e2e404f6ad5d9e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 30 May 2017 17:47:00 +0200
Subject: [PATCH 0141/1490] pythonPackages.pytest-localserver: 0.3.5 -> 0.3.7
 (#26238)

* pythonPackages.pytest-localserver: 0.3.5 -> 0.3.7

* pythonPackages.pytest-localserver: Change to use python packaging tools

* pythonPackages.pytest-localserver: Move to own file
---
 .../pytest-localserver/default.nix            | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +------------
 2 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytest-localserver/default.nix

diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
new file mode 100644
index 00000000000..fdd1986c04f
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -0,0 +1,33 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, requests
+, pytest
+, six
+, werkzeug
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-localserver";
+  name = "${pname}-${version}";
+  version = "0.3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1c11hn61n06ms0wmw6536vs5k4k9hlndxsb3p170nva56a9dfa6q";
+  };
+
+  propagatedBuildInputs = [ werkzeug ];
+  buildInputs = [ pytest six requests ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = {
+    description = "Plugin for the pytest testing framework to test server connections locally";
+    homepage = https://pypi.python.org/pypi/pytest-localserver;
+    license = lib.licenses.mit;
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e9f2f0f19d2..1f10fac5041 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5281,28 +5281,7 @@ in {
 
   pytest_xdist = callPackage ../development/python-modules/pytest-xdist { };
 
-  pytest-localserver = buildPythonPackage rec {
-    name = "pytest-localserver-${version}";
-    version = "0.3.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest-localserver/${name}.tar.gz";
-      sha256 = "0dvqspjr6va55zwmnnc2mmpqc7mm65kxig9ya44x1z8aadzxpa4p";
-    };
-
-    propagatedBuildInputs = with self; [ werkzeug ];
-    buildInputs = with self; [ pytest six requests ];
-
-    checkPhase = ''
-      py.test
-    '';
-
-    meta = {
-      description = "Plugin for the pytest testing framework to test server connections locally";
-      homepage = https://pypi.python.org/pypi/pytest-localserver;
-      license = licenses.mit;
-    };
-  };
+  pytest-localserver = callPackage ../development/python-modules/pytest-localserver { };
 
   pytest-subtesthack = buildPythonPackage rec {
     name = "pytest-subtesthack-${version}";
-- 
GitLab


From 13181204841f151a07d1e75155d24daa641fa0de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 30 May 2017 18:11:37 +0200
Subject: [PATCH 0142/1490] Fix indentation

---
 .../development/interpreters/perl/default.nix | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 3fe04e6bde2..e4aa7db3e28 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -93,23 +93,23 @@ let
 
     passthru.libPrefix = "lib/perl5/site_perl";
 
-  # TODO: it seems like absolute paths to some coreutils is required.
-  postInstall =
-    ''
-      # Remove dependency between "out" and "man" outputs.
-      rm "$out"/lib/perl5/*/*/.packlist
-
-      # Remove dependencies on glibc and gcc
-      sed "/ *libpth =>/c    libpth => ' '," \
-        -i "$out"/lib/perl5/*/*/Config.pm
-      # TODO: removing those paths would be cleaner than overwriting with nonsense.
-      substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
-        --replace "${libcInc}" /no-such-path \
-        --replace "${
-            if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path"
-          }" /no-such-path \
-        --replace "$man" /no-such-path
-    ''; # */
+    # TODO: it seems like absolute paths to some coreutils is required.
+    postInstall =
+      ''
+        # Remove dependency between "out" and "man" outputs.
+        rm "$out"/lib/perl5/*/*/.packlist
+
+        # Remove dependencies on glibc and gcc
+        sed "/ *libpth =>/c    libpth => ' '," \
+          -i "$out"/lib/perl5/*/*/Config.pm
+        # TODO: removing those paths would be cleaner than overwriting with nonsense.
+        substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
+          --replace "${libcInc}" /no-such-path \
+          --replace "${
+              if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path"
+            }" /no-such-path \
+          --replace "$man" /no-such-path
+      ''; # */
 
     meta = {
       homepage = https://www.perl.org/;
-- 
GitLab


From 77edba1fc4c6e54db54834025fbdf306df563deb Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Tue, 30 May 2017 18:28:41 +0200
Subject: [PATCH 0143/1490] pythonPackages.scrapy: fix 1.4.0 update

---
 pkgs/development/python-modules/scrapy/permissions-fix.patch | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/scrapy/permissions-fix.patch b/pkgs/development/python-modules/scrapy/permissions-fix.patch
index 5ea5269c799..53038cf74e5 100644
--- a/pkgs/development/python-modules/scrapy/permissions-fix.patch
+++ b/pkgs/development/python-modules/scrapy/permissions-fix.patch
@@ -21,8 +21,3 @@ index 5941066..89f8edb 100644
  
      def run(self, args, opts):
          if len(args) not in (1, 2):
-@@ -118,4 +117,3 @@ class Command(ScrapyCommand):
-         _templates_base_dir = self.settings['TEMPLATES_DIR'] or \
-             join(scrapy.__path__[0], 'templates')
-         return join(_templates_base_dir, 'project')
--    
-- 
GitLab


From 218c486c1c454f1ef7f2791fa1f1944d28b921e2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 30 May 2017 17:08:47 +0000
Subject: [PATCH 0144/1490] fstar: fix build on darwin

---
 pkgs/development/compilers/fstar/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 00714875ffc..51777f748e3 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
   ];
 
   preBuild = ''
-    substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true"
+    substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true" \
+      --replace Darwin xyz
     substituteInPlace src/VS/.nuget/NuGet.targets --replace "mono" "true"
 
     # Fails with bad interpreter otherwise
-- 
GitLab


From ea7e54be18510532458292c25263dfac53975db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 30 May 2017 19:24:32 +0200
Subject: [PATCH 0145/1490] libuv: 1.11.0 -> 1.12.0

The changelog seems safe; I tried some reverse dependencies, too.
---
 pkgs/development/libraries/libuv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 941ab6710c2..fdf5191bf72 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,19 +2,19 @@
 , ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.11.0";
+  version = "1.12.0";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "02sm7f3l0shpfz25b77q2jjvlypc1mmz4zpzfgfmiplhgxxaa6la";
+    sha256 = "0m025i0sfm4iv3aiic88x4y4bbhhdb204pmd9r383fsl458fck2p";
   };
 
   postPatch = let
     toDisable = [
-      "getnameinfo_basic" # probably network-dependent
+      "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent
       "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
       "getaddrinfo_fail" "getaddrinfo_fail_sync"
     ]
-- 
GitLab


From ed6ecacf6430e4331b2b56a4324c2e6d349bd30b Mon Sep 17 00:00:00 2001
From: Jacob Mitchell <jacob.mitchell@iohk.io>
Date: Tue, 30 May 2017 11:27:32 -0700
Subject: [PATCH 0146/1490] haskell-modules: refactor package set

This change is effectively a no-op to nixpkgs. However, it gives users
the flexibility to create and maintain their own package sets per
project, while benefiting from nix's Haskell configurations.

I would make immediate use of this change in stack2nix, a project that
generates nix expressions for all the dependencies of a given Haskell
project. @domenkozar is familiar with the motivations and helped
refine this change
---
 pkgs/development/haskell-modules/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8090732ddee..8e7d19e089f 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -2,6 +2,7 @@
 , compilerConfig ? (self: super: {})
 , packageSetConfig ? (self: super: {})
 , overrides ? (self: super: {})
+, initialPackages ? import ./hackage-packages.nix
 }:
 
 let
@@ -10,7 +11,7 @@ let
   inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet;
 
   haskellPackages = makePackageSet {
-    package-set = import ./hackage-packages.nix;
+    package-set = initialPackages;
     inherit ghc;
   };
 
-- 
GitLab


From 4642e8d1cf750780aa7aa7be0674491cd4b3a522 Mon Sep 17 00:00:00 2001
From: Angelo Bulfone <mbulfone@gmail.com>
Date: Tue, 30 May 2017 11:30:41 -0700
Subject: [PATCH 0147/1490] i3blocks: add optional dependencies for scripts

---
 .../window-managers/i3/blocks-gaps.nix        | 29 ++++++++++++-
 .../window-managers/i3/blocks.nix             | 42 ++++++++++++++++++-
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
index d32e82f100e..83fe3ef163a 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -1,5 +1,16 @@
-{ fetchFromGitHub, stdenv }:
+{ fetchFromGitHub, stdenv, perl, makeWrapper
+, iproute, acpi, sysstat, alsaUtils
+, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
+              "load_average" "memory" "volume" "wifi" ]
+}:
 
+with stdenv.lib;
+
+let
+  perlscripts = [ "battery" "cpu_usage" "openvpn" "temperature" ];
+  contains_any = l1: l2: 0 < length( intersectLists l1 l2 );
+
+in
 stdenv.mkDerivation rec {
   name = "i3blocks-gaps-${version}";
   version = "1.4";
@@ -14,6 +25,22 @@ stdenv.mkDerivation rec {
   makeFlags = "all";
   installFlags = "PREFIX=\${out} VERSION=${version}";
 
+  buildInputs = optional (contains_any scripts perlscripts) perl;
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/libexec/i3blocks/bandwidth \
+      --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)}
+    wrapProgram $out/libexec/i3blocks/battery \
+      --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
+    wrapProgram $out/libexec/i3blocks/cpu_usage \
+      --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
+    wrapProgram $out/libexec/i3blocks/iface \
+      --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)}
+    wrapProgram $out/libexec/i3blocks/volume \
+      --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
+  '';
+
   meta = with stdenv.lib; {
     description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps";
     homepage = https://github.com/Airblader/i3blocks-gaps;
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index 60f13ce440c..88bf7762dd8 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -1,5 +1,19 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, perl, makeWrapper
+, iproute, acpi, sysstat, xset, playerctl
+, cmus, openvpn, lm_sensors, alsaUtils
+, scripts ? [ "bandwidth" "battery" "cpu_usage" "disk" "iface"
+              "keyindicator" "load_average" "mediaplayer" "memory"
+	            "openvpn" "temperature" "volume" "wifi" ]
+}:
 
+with stdenv.lib;
+
+let
+  perlscripts = [ "battery" "cpu_usage" "keyindicator"
+                  "mediaplayer" "openvpn" "temperature" ];
+  contains_any = l1: l2: 0 < length( intersectLists l1 l2 );
+
+in
 stdenv.mkDerivation rec {
   name = "i3blocks-${version}";
   version = "1.4";
@@ -12,7 +26,31 @@ stdenv.mkDerivation rec {
   buildFlags = "SYSCONFDIR=/etc all";
   installFlags = "PREFIX=\${out} VERSION=${version}";
 
-  meta = with stdenv.lib; {
+  buildInputs = optional (contains_any scripts perlscripts) perl;
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/libexec/i3blocks/bandwidth \
+      --prefix PATH : ${makeBinPath (optional (elem "bandwidth" scripts) iproute)}
+    wrapProgram $out/libexec/i3blocks/battery \
+      --prefix PATH : ${makeBinPath (optional (elem "battery" scripts) acpi)}
+    wrapProgram $out/libexec/i3blocks/cpu_usage \
+      --prefix PATH : ${makeBinPath (optional (elem "cpu_usage" scripts) sysstat)}
+    wrapProgram $out/libexec/i3blocks/iface \
+      --prefix PATH : ${makeBinPath (optional (elem "iface" scripts) iproute)}
+    wrapProgram $out/libexec/i3blocks/keyindicator \
+      --prefix PATH : ${makeBinPath (optional (elem "keyindicator" scripts) xset)}
+    wrapProgram $out/libexec/i3blocks/mediaplayer \
+      --prefix PATH : ${makeBinPath (optionals (elem "mediaplayer" scripts) [playerctl cmus])}
+    wrapProgram $out/libexec/i3blocks/openvpn \
+      --prefix PATH : ${makeBinPath (optional (elem "openvpn" scripts) openvpn)}
+    wrapProgram $out/libexec/i3blocks/temperature \
+      --prefix PATH : ${makeBinPath (optional (elem "temperature" scripts) lm_sensors)}
+    wrapProgram $out/libexec/i3blocks/volume \
+      --prefix PATH : ${makeBinPath (optional (elem "volume" scripts) alsaUtils)}
+  '';
+
+  meta = {
     description = "A flexible scheduler for your i3bar blocks";
     homepage = https://github.com/vivien/i3blocks;
     license = licenses.gpl3;
-- 
GitLab


From 1dac99b7c96cd130847ca95adee146c3087154fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Wed, 10 May 2017 11:20:47 +0200
Subject: [PATCH 0148/1490] ocamlPackages.janeStreet package set: init at 0.9.0

This contains a collection of Jane Street packages at version 0.9.0.
Packages not already present in ocamlPackages are also made available
without the janeStreet prefix.
---
 .../ocaml-modules/janestreet/default.nix      | 603 ++++++++++++++++++
 .../ocaml-modules/janestreet/janePackage.nix  |  28 +
 pkgs/top-level/ocaml-packages.nix             |  11 +
 3 files changed, 642 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/default.nix
 create mode 100644 pkgs/development/ocaml-modules/janestreet/janePackage.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
new file mode 100644
index 00000000000..7adee596b4f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -0,0 +1,603 @@
+{ lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime,
+  ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith,
+  openssl }:
+
+rec {
+
+  # Jane Street packages, up to ppx_core
+
+  base = janePackage {
+    name = "base";
+    hash = "0niwgd20n32p3jhgw96jlcp2lm1j58pvq07kd6hkzvdchjqgajlf";
+    meta.description = "Full standard library replacement for OCaml";
+  };
+
+  sexplib = janePackage {
+    name = "sexplib";
+    hash = "1cj0sv7zwy6njckiszym57zjwdkay78r9fncblsacqijzsdjl6dd";
+    propagatedBuildInputs = [ base ];
+    meta.description = "Automated S-expression conversion";
+  };
+
+  ocaml-compiler-libs = janePackage {
+    name = "ocaml-compiler-libs";
+    hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l";
+    meta.description = "OCaml compiler libraries repackaged";
+  };
+
+  ppx_ast = janePackage {
+    name = "ppx_ast";
+    hash = "0p9v4q3cjz8wwdrh6bjidani2npzvhdy8isnqwigqkl6n326dba9";
+    propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
+    meta.description = "OCaml AST used by Jane Street ppx rewriters";
+  };
+
+  ppx_traverse_builtins = janePackage {
+    name = "ppx_traverse_builtins";
+    hash = "10ajvz02ka6qimlfrq7py4ljhk8awqkga6240kn8j046b4xfyxzi";
+    meta.description = "Builtins for Ppx_traverse";
+  };
+
+  stdio = janePackage {
+    name = "stdio";
+    hash = "1c08jg930j7yxn0sjvlm3fs2fvwaf15sn9513yf1rb7y1lxrgwc4";
+    propagatedBuildInputs = [ base ];
+    meta.description = "Standard IO library for OCaml";
+  };
+
+  ppx_core = janePackage {
+    name = "ppx_core";
+    hash = "15400zxxkqdimmjpdjcs36gcbxbrhylmaczlzwd6x65v1h9aydz3";
+    propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ];
+    meta.description = "Jane Street's standard library for ppx rewriters";
+  };
+
+  # Jane Street packages, up to ppx_base
+
+  ppx_optcomp = janePackage {
+    name = "ppx_optcomp";
+    hash = "1wfj6fnh92s81yncq7yyhmax7j6zpjj1sg1f3qa1f9c5kf4kkzrd";
+    propagatedBuildInputs = [ ppx_core ];
+    meta.description = "Optional compilation for OCaml";
+  };
+
+  ppx_driver = janePackage {
+    name = "ppx_driver";
+    hash = "1w3khwnvy18nkh673zrbhcs6051hs7z5z5dib7npkvpxndw22hwj";
+    buildInputs = [ ocamlbuild ];
+    propagatedBuildInputs = [ ppx_optcomp ];
+    meta.description = "Feature-full driver for OCaml AST transformers";
+  };
+
+  ppx_metaquot = janePackage {
+    name = "ppx_metaquot";
+    hash = "15qfd3s4x2pz006nx5316laxd3gqqi472x432qg4rfx4yh3vn31k";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "Metaquotations for ppx_ast";
+  };
+
+  ppx_type_conv = janePackage {
+    name = "ppx_type_conv";
+    hash = "0a0gxjvjiql9vg37k0akn8xr5724nv3xb7v37xpidv7ld927ks7p";
+    propagatedBuildInputs = [ ppx_metaquot ppx_deriving ];
+    meta.description = "Support Library for type-driven code generators";
+  };
+
+  ppx_sexp_conv = janePackage {
+    name = "ppx_sexp_conv";
+    hash = "03cg2sym0wvpd5l7q4w9bclp589z5byygwsmnnq9h1ih56cmd55l";
+    propagatedBuildInputs = [ ppx_type_conv sexplib ];
+    meta.description = "Generation of S-expression conversion functions from type definitions";
+  };
+
+  ppx_compare = janePackage {
+    name = "ppx_compare";
+    hash = "0wrszpvn1nms5sb5rb29p7z1wmqyd15gfzdj4ax8f843p5ywx3w9";
+    propagatedBuildInputs = [ ppx_type_conv ];
+    meta.description = "Generation of comparison functions from types";
+  };
+
+  ppx_enumerate = janePackage {
+    name = "ppx_enumerate";
+    hash = "1dfy86j2z12p5n9yrwaakx1ngphs5246vxy279kz6i6j34cwxm46";
+    propagatedBuildInputs = [ ppx_type_conv ];
+    meta.description = "Generate a list containing all values of a finite type";
+  };
+
+  ppx_hash = janePackage {
+    name = "ppx_hash";
+    hash = "1w1riy2sqd9i611sc5f5z2rqqgjl2gvvkzi5xibpv309nacnl01d";
+    propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
+    meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+  };
+
+  ppx_js_style = janePackage {
+    name = "ppx_js_style";
+    hash = "09k02b1l2r7svf9l3ls69h8xydsyiang2ziigxnny2i7gy7b0w59";
+    propagatedBuildInputs = [ ppx_metaquot octavius ];
+    meta.description = "Code style checker for Jane Street Packages";
+  };
+
+  ppx_base = janePackage {
+    name = "ppx_base";
+    hash = "0qikfzbkd2wyxfrvizz6rgi6vg4ykvxkivacj4gr178dbgfl5if3";
+    propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ];
+    meta.description = "Base set of ppx rewriters";
+  };
+
+  # Jane Street packages, up to ppx_bin_prot
+
+  fieldslib = janePackage {
+    name = "fieldslib";
+    hash = "1wxh59888l1bfz9ipnbcas58gwg744icaixzdbsg4v8f7wymc501";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "OCaml record fields as first class values";
+  };
+
+  variantslib = janePackage {
+    name = "variantslib";
+    hash = "0kj53n62193j58q9vip8lfhhyf6w9d25wyvxzc163hx5m68yw0fz";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "OCaml variants as first class values";
+  };
+
+  ppx_traverse = janePackage {
+    name = "ppx_traverse";
+    hash = "1sdqgwyq0w71i03vhc5jq4jk6rsbgwhvain48fnrllpkb5kj2la2";
+    propagatedBuildInputs = [ ppx_type_conv ];
+    meta.description = "Automatic generation of open recursion classes";
+  };
+
+  ppx_custom_printf = janePackage {
+    name = "ppx_custom_printf";
+    hash = "0cjy2c2c5g3qxqvwx1yb6p7kbmmpnpb1hll55f7a44x215lg8x19";
+    propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ];
+    meta.description = "Printf-style format-strings for user-defined string conversion";
+  };
+
+  ppx_fields_conv = janePackage {
+    name = "ppx_fields_conv";
+    hash = "0qp8zgmk58iskzrkf4g06i471kg6lrh3wqpy9klrb8pp9mg0xr9z";
+    propagatedBuildInputs = [ fieldslib ppx_type_conv ];
+    meta.description = "Generation of accessor and iteration functions for OCaml records";
+  };
+
+  ppx_variants_conv = janePackage {
+    name = "ppx_variants_conv";
+    hash = "1xayhyglgbdjqvb9123kjbwjcv0a3n3302nb0j7g8gmja8w5y834";
+    propagatedBuildInputs = [ ppx_type_conv variantslib ];
+    meta.description = "Generation of accessor and iteration functions for OCaml variant types";
+  };
+
+  bin_prot = janePackage {
+    name = "bin_prot";
+    hash = "0cy6lhksx4jypkrnj3ha31p97ghslki0bx5rpnzc2v28mfp6pzh1";
+    propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
+    meta.description = "Binary protocol generator";
+  };
+
+  ppx_here = janePackage {
+    name = "ppx_here";
+    hash = "0pjscw5ydxgy4fcxakgsazpp09ka057w5n2fp2dpkv2k5gil6rzh";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "Expands [%here] into its location";
+  };
+
+  ppx_bin_prot = janePackage {
+    name = "ppx_bin_prot";
+    hash = "0qw9zqrc5yngzrzpk9awnlnd68xrb7wz5lq807c80ibxk0xvnqn3";
+    propagatedBuildInputs = [ ppx_here bin_prot ];
+    meta.description = "Generation of bin_prot readers and writers from types";
+  };
+
+  # Jane Street packages, up to ppx_jane
+
+  ppx_assert = janePackage {
+    name = "ppx_assert";
+    hash = "1s5c75wkc46nlcwmgic5h7f439s26ssrzrcil501c5kpib2hlv6z";
+    propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ];
+    meta.description = "Assert-like extension nodes that raise useful errors on failure";
+  };
+
+  ppx_inline_test = janePackage {
+    name = "ppx_inline_test";
+    hash = "01xml88ahrzqnc7g1ib184jbqxpdfx4gn2wdvi09dpi4i0jahy33";
+    propagatedBuildInputs = [ ppx_metaquot ];
+    meta.description = "Syntax extension for writing in-line tests in OCaml code";
+  };
+
+  typerep = janePackage {
+    name = "typerep";
+    hash = "0hlc0xiznli1k6azv2mhm1s4xghhxqqd957np7828bfp7r8n2jy3";
+    propagatedBuildInputs = [ base ];
+    meta.description = "Runtime types for OCaml";
+  };
+
+  ppx_bench = janePackage {
+    name = "ppx_bench";
+    hash = "1qk4y6c2mpw7bqjppi2nam74vs2sc89wzq162j92wsqxyqsv4p93";
+    propagatedBuildInputs = [ ppx_inline_test ];
+    meta.description = "Syntax extension for writing in-line benchmarks in OCaml code";
+  };
+
+  ppx_expect = janePackage {
+    name = "ppx_expect";
+    hash = "1bik53k51wcqv088f0h10n3ms9h51yvg6ha3g1s903i2bxr3xs6b";
+    propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ];
+    meta.description = "Cram like framework for OCaml";
+  };
+
+  ppx_fail = janePackage {
+    name = "ppx_fail";
+    hash = "0qz0vlazasjyg7cv3iwpzxlvsah3zmn9dzd029xxqr1bji067s32";
+    propagatedBuildInputs = [ ppx_here ppx_metaquot ];
+    meta.description = "Add location to calls to failwiths";
+  };
+
+  ppx_let = janePackage {
+    name = "ppx_let";
+    hash = "1b914a5nynwxjvfx42v61yigvjhnd548m4yqjfchf38dmqi1f4nr";
+    propagatedBuildInputs = [ ppx_driver ];
+    meta.description = "Monadic let-bindings";
+  };
+
+  ppx_optional = janePackage {
+    name = "ppx_optional";
+    hash = "1vknsarxba0zcp5k2jb31wfpvqrv3bpanxbahfl5s2fwspsfdc82";
+    propagatedBuildInputs = [ ppx_metaquot ];
+    meta.description = "Pattern matching on flat options";
+  };
+
+  ppx_pipebang = janePackage {
+    name = "ppx_pipebang";
+    hash = "1wyfyyjvyi94ds1p90l60wdr85q2v3fq1qdf3gnv9zjfy6sb0g9h";
+    propagatedBuildInputs = [ ppx_metaquot ];
+    meta.description = "A ppx rewriter that inlines reverse application operators |> and |!";
+  };
+
+  ppx_sexp_message = janePackage {
+    name = "ppx_sexp_message";
+    hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv";
+    propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
+    meta.declarations = "A ppx rewriter for easy construction of s-expressions";
+  };
+
+  ppx_sexp_value = janePackage {
+    name = "ppx_sexp_value";
+    hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah";
+    propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
+    meta.declarations = "A ppx rewriter that simplifies building s-expressions from OCaml values";
+  };
+
+  ppx_typerep_conv = janePackage {
+    name = "ppx_typerep_conv";
+    hash = "0bzgfpbqijwxm8x9jq1zb4xi5sbzymk17lw5rylri3hf84p60aq1";
+    propagatedBuildInputs = [ ppx_type_conv typerep ];
+    meta.description = "Generation of runtime types from type declarations";
+  };
+
+  ppx_jane = janePackage {
+    name = "ppx_jane";
+    hash = "16m5iw0qyp452nqj83kd0g0x3rw40lrz7392hwpd4di1wi6v2qzc";
+    propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ];
+    meta.description = "Standard Jane Street ppx rewriters";
+  };
+
+  # Jane Street packages, up to core
+
+  configurator = janePackage {
+    name = "configurator";
+    hash = "1ll90pnprc5nah621ckvqi1gwagvglzx2mzjpkppddw1kr320w80";
+    propagatedBuildInputs = [ ppx_base ];
+    meta.description = "Helper library for gathering system configuration";
+  };
+
+  jane-street-headers = janePackage {
+    name = "jane-street-headers";
+    hash = "0cdab6sblsidjbwvyvmspykyhqh44rpsjzi2djbfd5m4vh2h14gy";
+    meta.description = "Jane Street header files";
+  };
+
+  core_kernel = janePackage {
+    name = "core_kernel";
+    hash = "05iwvggx9m81x7ijgv9gcv5znf5rmsmb76dg909bm9gkr3hbh7wh";
+    propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ];
+    meta.description = "Jane Street's standard library overlay (kernel)";
+  };
+
+  spawn = janePackage {
+    name = "spawn";
+    hash = "1w53b8ni06ajj62yaqjy0pkbm952l0m5fzr088yk15078qaxsnb5";
+    meta.description = "Spawning sub-processes";
+  };
+
+  core = janePackage {
+    name = "core";
+    hash = "0x05ky8l75k2dnpsa02vmqcr7p7q0vvc6279psq3iybrwcvab9yi";
+    propagatedBuildInputs = [ core_kernel spawn ];
+    meta.description = "Jane Street's standard library overlay";
+  };
+
+  # Jane Street packages, up to core_extended
+
+  re2 = janePackage {
+    name = "re2";
+    hash = "1qmhl3yd6y0lq401rz72b1bsbpglb0wighpxn3x8y1ixq415p4xi";
+    propagatedBuildInputs = [ core_kernel ];
+    meta = {
+      description = "OCaml bindings for RE2";
+      platforms = lib.platforms.linux;
+    };
+  };
+
+  textutils = janePackage {
+    name = "textutils";
+    hash = "1y6j2qw7rc8d80343lfv1dygnfrhn2qllz57mx28pl5kan743f6d";
+    propagatedBuildInputs = [ core ];
+    meta.description = "Text output utilities";
+  };
+
+  core_extended = janePackage {
+    name = "core_extended";
+    hash = "05cnzzj0kigz9c9gsmd6mfar82wmkbqm9qzrydb80sy2fz5b30rk";
+    propagatedBuildInputs = [ core re2 textutils ];
+    postPatch = ''
+      patchShebangs src/discover.sh
+    '';
+    meta = {
+      description = "Jane Street Capital's standard library overlay";
+      inherit (re2.meta) platforms;
+    };
+  };
+
+  # Jane Street async packages
+
+  async_kernel = janePackage {
+    name = "async_kernel";
+    hash = "1zwxhzy7f9900rcjls2fql9cpfmwrcah3fazzdz4h2i51f41w62x";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Jane Street Capital's asynchronous execution library (core)";
+  };
+
+  async_rpc_kernel = janePackage {
+    name = "async_rpc_kernel";
+    hash = "1xk3s6s3xkj182p10kig2cqy8md6znif3v661h9cd02n8s57c40b";
+    propagatedBuildInputs = [ core_kernel async_kernel ];
+    meta.description = "Platform-independent core of Async RPC library";
+  };
+
+  async_unix = janePackage {
+    name = "async_unix";
+    hash = "0yd4z28j5vdj2zxqi0fkgh2ic1s9h740is2dk0raga0zr5a1z03d";
+    propagatedBuildInputs = [ core async_kernel ];
+    meta.description = "Jane Street Capital's asynchronous execution library (unix)";
+  };
+
+  async_extra = janePackage {
+    name = "async_extra";
+    hash = "0rpy5lc5dh5mir7flq1jrppd8imby8wyw191yg4nmklg28xp5sx0";
+    propagatedBuildInputs = [ async_rpc_kernel async_unix ];
+    meta.description = "Jane Street's asynchronous execution library (extra)";
+  };
+
+  async = janePackage {
+    name = "async";
+    hash = "10ykzym19srgdiikj0s74dndx5nk15hjq1r2hc61iz48f6caxkb1";
+    propagatedBuildInputs = [ async_extra ];
+    meta.description = "Jane Street Capital's asynchronous execution library";
+  };
+
+  async_find = janePackage {
+    name = "async_find";
+    hash = "11dmhdzgf5kn4m0cm6zr28wpwhi2kr4lak9nmgxbrxsq28bcncxq";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Directory traversal with Async";
+  };
+
+  async_interactive = janePackage {
+    name = "async_interactive";
+    hash = "1mmqqp6bi2wg7bmgf0sw34jn3iyl5kbm200dax8yqq6rfprcs49j";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Utilities for building simple command-line based user interfaces";
+  };
+
+  async_parallel = janePackage {
+    name = "async_parallel";
+    hash = "0mdprhr1pv4g65g10gr3gaifrzknsdgarwfdbjlvhzfs86075kyn";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Distributed computing library";
+  };
+
+  async_shell = janePackage {
+    name = "async_shell";
+    hash = "02clpz3xv3i5avzifwalylb9gfxzpgnr8bnlfsjixxfk2m7kvsj2";
+    propagatedBuildInputs = [ core_extended async ];
+    meta = {
+      description = "Shell helpers for Async";
+      inherit (core_extended.meta) platforms;
+    };
+  };
+
+  async_ssl = janePackage {
+    name = "async_ssl";
+    hash = "01w3bg38q61lc3hfh8jsr0sy1ylyv0m6g6h9yvsk8ngj6qk70nss";
+    propagatedBuildInputs = [ async ctypes openssl ];
+    meta.description = "Async wrappers for SSL";
+  };
+
+  # Jane Street packages, up to expect_test_helpers
+
+  sexp_pretty = janePackage {
+    name = "sexp_pretty";
+    hash = "1bx8va468j5b813m0vsh1jzgb6h2qnnjfmjlf2hb82sarv8lllfx";
+    propagatedBuildInputs = [ ppx_base re ];
+    meta.description = "S-expression pretty-printer";
+  };
+
+  expect_test_helpers_kernel = janePackage {
+    name = "expect_test_helpers_kernel";
+    hash = "1ycqir8sqgq5nialnrfg29nqn0cqg6jjpgv24drdycdhqf5r2zg6";
+    propagatedBuildInputs = [ core_kernel sexp_pretty ];
+    meta.description = "Helpers for writing expectation tests";
+  };
+
+  expect_test_helpers = janePackage {
+    name = "expect_test_helpers";
+    hash = "0rsh6rwbqfcrqisk8jp7srlnicsadbzrs02ri6zyx0p3lmznw5r2";
+    propagatedBuildInputs = [ async expect_test_helpers_kernel ];
+    meta.description = "Async helpers for writing expectation tests";
+  };
+
+  # Miscellaneous Jane Street packages
+
+  bignum = janePackage {
+    name = "bignum";
+    hash = "0g80mzsi7vc1kq4mzha8y9nl95h6cd041vix3wjrqgkdvb1qd4f3";
+    propagatedBuildInputs = [ core_kernel zarith ];
+    meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
+  };
+
+  cinaps = janePackage {
+    name = "cinaps";
+    hash = "02fpjiwrygkpx2q4jfldhbqh0mqxmf955wizr8k4vmsq4wsis0p5";
+    propagatedBuildInputs = [ re ];
+    meta.description = "Trivial Metaprogramming tool using the OCaml toplevel";
+  };
+
+  command_rpc = janePackage {
+    name = "command_rpc";
+    hash = "0w58z9jkz5qzbvf33wrzhfshzdvnrphj6dq8dmi52ykhfvxm7824";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout";
+  };
+
+  core_bench = janePackage {
+    name = "core_bench";
+    hash = "1m2q7217nmcsck29i59djkm0h6z3aj0i01niijzr5f6ilbnmyd3h";
+    propagatedBuildInputs = [ core_extended ];
+    meta = {
+      description = "Micro-benchmarking library for OCaml";
+      inherit (core_extended.meta) platforms;
+    };
+  };
+
+  core_profiler = janePackage {
+    name = "core_profiler";
+    hash = "1ir2v3wdfbf5xzqcma16asc73mkx2q6dzq5y1bx6q1rpa7iznx44";
+    propagatedBuildInputs = [ core_extended ];
+    meta = {
+      description = "Profiling library";
+      inherit (core_extended.meta) platforms;
+    };
+  };
+
+  csvfields = janePackage {
+    name = "csvfields";
+    hash = "0lbvs1kwl22ryxhw6s089f6683hj2920bn518mvr22rnv7qijy0v";
+    propagatedBuildInputs = [ core ];
+    meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
+  };
+
+  ecaml = janePackage {
+    name = "ecaml";
+    hash = "1a2534bzbwgpm71aj3sm71sm0lkcjdfjj1mk91p1pg9kxn8c5x4i";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Writing Emacs plugin in OCaml";
+  };
+
+  email_message = janePackage {
+    name = "email_message";
+    hash = "0cpaf6wn5g883bxdz029bksvrfzih99m7hzbb30fhqglmpmmkniz";
+    propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ];
+    meta = {
+      description = "E-mail message parser";
+      inherit (core_extended.meta) platforms;
+    };
+  };
+
+  incremental_kernel = janePackage {
+    name = "incremental_kernel";
+    hash = "0zq48wbgqcflh84n10iygi8aa3f0zzmgc7r0jwvsyg7i8zccgvf5";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Library for incremental computations depending only on core_kernel";
+  };
+
+  incremental = janePackage {
+    name = "incremental";
+    hash = "05sx8ia46v4dlvzcn7xgjcwxvbd0wmvv9r2bpvniapjnwr1nvcfh";
+    propagatedBuildInputs = [ core incremental_kernel ];
+    meta.description = "Library for incremental computations";
+  };
+
+  incr_map = janePackage {
+    name = "incr_map";
+    hash = "0358qg9irxbbhn18laqww3mn43mdwvlbr0h2mvg3vdbb2c5jp4fv";
+    propagatedBuildInputs = [ incremental_kernel ];
+    meta.description = "Helpers for incremental operations on map like data structures";
+  };
+
+  ocaml_plugin = janePackage {
+    name = "ocaml_plugin";
+    hash = "0q33swnlx9p1gcn1aj95501kapb7cnbzbsavid69csczwmzcxr14";
+    buildInputs = [ ocamlbuild ];
+    propagatedBuildInputs = [ async ];
+    meta.description = "Automatically build and dynlink ocaml source files";
+  };
+
+  parsexp = janePackage {
+    name = "parsexp";
+    hash = "0brrifvnfqbfk873v6y5b2jixs2d73hpispj9r440kca5cfsv23b";
+    propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ];
+    meta.description = "S-expression parsing library";
+  };
+
+  parsexp_io = janePackage {
+    name = "parsexp_io";
+    hash = "0gcmh4dg48xgszladq92yhk1hf492zf0smz462xrwknzlfdkz6a5";
+    propagatedBuildInputs = [ parsexp ];
+    meta.description = "S-expression parsing library (IO functions)";
+  };
+
+  patience_diff = janePackage {
+    name = "patience_diff";
+    hash = "0vpx9xj1ich5qmj3m26vlmix3nsdj7pd1xzhqwbc7ad2kqwy3grg";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Tool and library implementing patience diff";
+  };
+
+  posixat = janePackage {
+    name = "posixat";
+    hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl";
+    propagatedBuildInputs = [ ppx_sexp_conv ];
+    meta.description = "Binding to the posix *at functions";
+  };
+
+  rpc_parallel = janePackage {
+    name = "rpc_parallel";
+    hash = "0s72msl2p27bz0knjlpgy5qwp0w4z76cq801ps0sab35f8jjfs38";
+    propagatedBuildInputs = [ async ];
+    meta.description = "Type-safe library for building parallel applications";
+  };
+
+  shexp = janePackage {
+    name = "shexp";
+    hash = "1fkz4l9z4i0fz2kccd5blm2j9x2x4z6y1cn29wjmc3spqfxbq37y";
+    propagatedBuildInputs = [ posixat spawn ];
+    meta.description = "Process library and s-expression based shell";
+  };
+
+  topological_sort = janePackage {
+    name = "topological_sort";
+    hash = "1d64fyq0clsgham9p1f5rk01z8pxalglp92xmqw2iznyw0vxhvsy";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Topological sort algorithm";
+  };
+
+  typerep_extended = janePackage {
+    name = "typerep_extended";
+    hash = "15gq8mrvlipd616rffr3f0wqw5d0ijnnizix610g2d5viirh0j9p";
+    propagatedBuildInputs = [ core_kernel ];
+    meta.description = "Runtime types for OCaml (Extended)";
+  };
+
+}
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
new file mode 100644
index 00000000000..6d6a4d71442
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib }:
+
+{ name, version ? "0.9.0", buildInputs ? [], hash, meta, ...}@args:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "${name}-${version} is not available for OCaml ${ocaml.version}" else
+
+stdenv.mkDerivation (args // {
+  name = "ocaml${ocaml.version}-${name}-${version}";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "janestreet";
+    repo = name;
+    rev = "v${version}";
+    sha256 = hash;
+  };
+
+  buildInputs = [ ocaml jbuilder findlib ] ++ buildInputs;
+
+  inherit (jbuilder) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+    homepage = "https://github.com/janestreet/${name}";
+  } // meta;
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3a185bc0a10..af0c31dc608 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -5,6 +5,7 @@ let
     let
       packageSet = self:
         with self; let inherit (self) callPackage; in
+     let ocamlPackages =
   {
     callPackage = newScope self;
 
@@ -582,6 +583,15 @@ let
     };
 
     # Jane Street
+
+    janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
+
+    janeStreet = import ../development/ocaml-modules/janestreet {
+      inherit lib janePackage ocamlbuild ctypes cryptokit magic-mime;
+      inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith;
+      openssl = pkgs.openssl;
+    };
+
     js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {};
 
     buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {};
@@ -835,6 +845,7 @@ let
     };
 
   };
+    in (ocamlPackages.janeStreet // ocamlPackages);
     in lib.fix' (lib.extends overrides packageSet);
 in rec
 {
-- 
GitLab


From 1cff0701ef8c2674c5c30462c7d6068345886700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Thu, 11 May 2017 11:02:57 +0200
Subject: [PATCH 0149/1490] ocamlPackages: remove duplicated definitions

---
 .../ocaml-modules/base/default.nix            | 24 -------------------
 .../janestreet/ocaml-compiler-libs.nix        | 21 ----------------
 .../ocaml-modules/janestreet/ppx_ast.nix      | 24 -------------------
 .../janestreet/ppx_traverse_builtins.nix      | 21 ----------------
 .../ocaml-modules/stdio/default.nix           | 22 -----------------
 pkgs/top-level/ocaml-packages.nix             | 10 --------
 6 files changed, 122 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/base/default.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
 delete mode 100644 pkgs/development/ocaml-modules/stdio/default.nix

diff --git a/pkgs/development/ocaml-modules/base/default.nix b/pkgs/development/ocaml-modules/base/default.nix
deleted file mode 100644
index f7627567f9c..00000000000
--- a/pkgs/development/ocaml-modules/base/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
-
-if !stdenv.lib.versionAtLeast ocaml.version "4.03"
-then throw "base is not available for OCaml ${ocaml.version}" else
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-base-0.9.0";
-
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/base-v0.9.0.tar.gz;
-    sha256 = "0pdpa3hflbqn978ppvv5y08cjya0k8xpf1h0kcak6bdrmnmiwlyx";
-  };
-
-  buildInputs = [ ocaml jbuilder findlib ];
-
-  inherit (jbuilder) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-    homepage = https://github.com/janestreet/base;
-    description = "Full standard library replacement for OCaml";
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
deleted file mode 100644
index 7d7e44ab9cc..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
-
-stdenv.mkDerivation {
-	name = "ocaml${ocaml.version}-ocaml-compiler-libs-0.9.0"; 
-	src = fetchurl {
-		url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ocaml-compiler-libs-v0.9.0.tar.gz;
-		sha256 = "0ipi56vg227924ahi9vv926jn16br9zfipm6a3xd4xrl5pxkvzaz";
-	};
-
-	buildInputs = [ ocaml jbuilder findlib ];
-
-	inherit (jbuilder) installPhase;
-
-	meta = {
-		description = "OCaml compiler libraries repackaged";
-		homepage = https://github.com/janestreet/ocaml-compiler-libs;
-		license = stdenv.lib.licenses.asl20;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
deleted file mode 100644
index 33f1766cb4a..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib
-, ocaml-compiler-libs, ocaml-migrate-parsetree
-}:
-
-stdenv.mkDerivation {
-	name = "ocaml${ocaml.version}-ppx_ast-0.9.0";
-	src = fetchurl {
-		url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_ast-v0.9.0.tar.gz;
-		sha256 = "1hirfmxr8hkf3p39k1pqidabxxhd541d6ddfaqpgxbl51bw9ddmz";
-	};
-
-	buildInputs = [ ocaml jbuilder findlib ];
-	propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
-
-	inherit (jbuilder) installPhase;
-
-	meta = {
-		description = "OCaml AST used by Jane Street ppx rewriters";
-		homepage = https://github.com/janestreet/ppx_ast;
-		license = stdenv.lib.licenses.asl20;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-		inherit (ocaml.meta) platforms;
-	};
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
deleted file mode 100644
index d84983ed634..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
-
-stdenv.mkDerivation {
-	name = "ocaml${ocaml.version}-ppx_traverse_builtins-0.9.0";
-	src = fetchurl {
-		url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_traverse_builtins-v0.9.0.tar.gz;
-		sha256 = "0zmf9kybll0xn8dsj10v260l0zwjyykimqml9rl7xqyjyl1rmnx6";
-	};
-
-	buildInputs = [ ocaml jbuilder findlib ];
-
-	inherit (jbuilder) installPhase;
-
-	meta = {
-		description = "Builtins for Ppx_traverse";
-		homepage = https://github.com/janestreet/ppx_traverse_builtins;
-		license = stdenv.lib.licenses.asl20;
-		inherit (ocaml.meta) platforms;
-		maintainers = [ stdenv.lib.maintainers.vbgl ];
-	};
-}
diff --git a/pkgs/development/ocaml-modules/stdio/default.nix b/pkgs/development/ocaml-modules/stdio/default.nix
deleted file mode 100644
index 87382330022..00000000000
--- a/pkgs/development/ocaml-modules/stdio/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib, base }:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-stdio-0.9.0";
-
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/stdio-v0.9.0.tar.gz;
-    sha256 = "008b5y03223107gfv8qawdfyjvf5g97l472i5p5v8mp512wr7kj5";
-  };
-
-  buildInputs = [ ocaml jbuilder findlib ];
-  propagatedBuildInputs = [ base ];
-
-  inherit (jbuilder) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    description = "Standard IO library for OCaml";
-    homepage = https://github.com/janestreet/stdio;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index af0c31dc608..b2012923adf 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -48,8 +48,6 @@ let
 
     atdgen = callPackage ../development/ocaml-modules/atdgen { };
 
-    base = callPackage ../development/ocaml-modules/base { };
-
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
     bap = callPackage ../development/ocaml-modules/bap { };
@@ -526,8 +524,6 @@ let
 
     sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
 
-    stdio = callPackage ../development/ocaml-modules/stdio { };
-
     stog = callPackage ../applications/misc/stog { };
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
@@ -596,10 +592,6 @@ let
 
     buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {};
 
-    ocaml-compiler-libs = callPackage ../development/ocaml-modules/janestreet/ocaml-compiler-libs.nix {};
-
-    ppx_ast = callPackage ../development/ocaml-modules/janestreet/ppx_ast.nix {};
-
     ppx_core =
       if lib.versionOlder "4.03" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}
@@ -707,8 +699,6 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
 
-    ppx_traverse_builtins = callPackage ../development/ocaml-modules/janestreet/ppx_traverse_builtins.nix {};
-
 
     # Core sublibs
     typerep =
-- 
GitLab


From 1562201643a77c95b4c34cfdda72239974595435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 15 May 2017 15:16:17 +0200
Subject: [PATCH 0150/1490] ocamlPackages.janeStreet.{base,sexplib}: 0.9.0 ->
 0.9.1

---
 .../ocaml-modules/janestreet/default.nix       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 7adee596b4f..98a303e2a67 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -6,19 +6,21 @@ rec {
 
   # Jane Street packages, up to ppx_core
 
-  base = janePackage {
-    name = "base";
-    hash = "0niwgd20n32p3jhgw96jlcp2lm1j58pvq07kd6hkzvdchjqgajlf";
-    meta.description = "Full standard library replacement for OCaml";
-  };
-
   sexplib = janePackage {
     name = "sexplib";
-    hash = "1cj0sv7zwy6njckiszym57zjwdkay78r9fncblsacqijzsdjl6dd";
-    propagatedBuildInputs = [ base ];
+    version = "0.9.1";
+    hash = "087md38l73lp24j2lmwi053jjav00k11r06s6whmff1xlhj70wdj";
     meta.description = "Automated S-expression conversion";
   };
 
+  base = janePackage {
+    name = "base";
+    version = "0.9.1";
+    hash = "09gj30zyv23gv3gkf2pb3d3ywmkgd74dq8sfaps5xarr3grvndhm";
+    propagatedBuildInputs = [ sexplib ];
+    meta.description = "Full standard library replacement for OCaml";
+  };
+
   ocaml-compiler-libs = janePackage {
     name = "ocaml-compiler-libs";
     hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l";
-- 
GitLab


From 5fd9b442f4d9ca2a164e99d3c48420edad033b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Mon, 22 May 2017 13:37:01 +0200
Subject: [PATCH 0151/1490] ocamlPackages_4_03 (Jane Street packages):
 113_33_xx -> 0.9.x

---
 .../janestreet/async_kernel-113_33_00.nix     |  21 ---
 .../janestreet/async_unix-113_33_00.nix       |  21 ---
 .../janestreet/core-113_33_02.nix             |  21 ---
 .../janestreet/core_kernel-113_33_01.nix      |  25 ----
 .../janestreet/ppx_bench-113_33_00.nix        |  21 ---
 .../janestreet/ppx_bin_prot-113_33_00.nix     |  21 ---
 .../janestreet/ppx_compare-113_33_00.nix      |  21 ---
 .../janestreet/ppx_core-113_33_01.nix         |  20 ---
 .../ppx_custom_printf-113_33_00.nix           |  21 ---
 .../janestreet/ppx_enumerate-113_33_00.nix    |  21 ---
 .../janestreet/ppx_expect-113_33_01.nix       |  22 ----
 .../janestreet/ppx_fail-113_33_00.nix         |  21 ---
 .../janestreet/ppx_fields_conv-113_33_00.nix  |  21 ---
 .../janestreet/ppx_inline_test-113_33_00.nix  |  21 ---
 .../janestreet/ppx_jane-113_33_00.nix         |  24 ----
 .../janestreet/ppx_let-113_33_00.nix          |  21 ---
 .../janestreet/ppx_optcomp-113_33_01.nix      |  34 -----
 .../janestreet/ppx_pipebang-113_33_00.nix     |  21 ---
 .../janestreet/ppx_sexp_conv-113_33_01.nix    |  21 ---
 .../janestreet/ppx_sexp_message-113_33_00.nix |  21 ---
 .../janestreet/ppx_sexp_value-113_33_00.nix   |  21 ---
 .../janestreet/ppx_type_conv-113_33_02.nix    |  21 ---
 .../janestreet/ppx_typerep_conv-113_33_00.nix |  21 ---
 .../ppx_variants_conv-113_33_00.nix           |  21 ---
 .../janestreet/sexplib-113_33_00.nix          |  18 ---
 pkgs/top-level/ocaml-packages.nix             | 122 ++++++++++++------
 26 files changed, 80 insertions(+), 584 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
 delete mode 100644 pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
deleted file mode 100644
index 2110b1d6b50..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, core_kernel, ppx_jane
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-async_kernel-113.33.00";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_kernel-113.33.00.tar.gz;
-    sha256 = "1kkkqpdd3mq9jh3b3l1yk37841973lh6g3pfv8fcjzif4n7myf15";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
-  propagatedBuildInputs = [ core_kernel ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
deleted file mode 100644
index 595e1198de5..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, async_kernel, core, ppx_jane
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-async_unix-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_unix-113.33.00+4.03.tar.gz;
-    sha256 = "12b0ffq9yhv3f49kk2k7z7hrn2j4xlka7knm99hczl6gmjni7nqv";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
-  propagatedBuildInputs = [ async_kernel core ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
deleted file mode 100644
index 48bafd5c3c5..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_jane, core_kernel
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-core-113.33.02+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core-113.33.02+4.03.tar.gz;
-    sha256 = "1gvd5saa0sdgyv9w09imqlkw0c21v2ixic8fxx14jxrwck0zn4bc";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
-  propagatedBuildInputs = [ core_kernel ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
deleted file mode 100644
index d6da9caed7d..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ppx_jane
-, bin_prot, fieldslib, typerep, variantslib
-, ppx_assert, ppx_bench, ppx_expect, ppx_inline_test
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-core_kernel-113.33.01+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core_kernel-113.33.01+4.03.tar.gz;
-    sha256 = "0ra2frspqjqk1wbb58lrb0anrgsyhja00zsybka85qy71lblamfs";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
-  propagatedBuildInputs = [
-    bin_prot fieldslib typerep variantslib
-    ppx_assert ppx_bench ppx_expect ppx_inline_test
-  ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
deleted file mode 100644
index 3414324a5c8..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_inline_test
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_bench-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bench-113.33.00+4.03.tar.gz;
-    sha256 = "00iv0p3cni4r7iimwm04bjg2hzvlvdb0b1kynjw2xav64xc29q01";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_inline_test ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
deleted file mode 100644
index 43517a82d3b..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, bin_prot, ppx_deriving, ppx_tools, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_bin_prot-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bin_prot-113.33.00+4.03.tar.gz;
-    sha256 = "1xw1yjgnd5ny1cq0n6rbsdaywyzq2n0jwg4gjsxv14dhv0alav36";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ bin_prot ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
deleted file mode 100644
index 79457040202..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_compare-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_compare-113.33.00+4.03.tar.gz;
-    sha256 = "07drgg6c857lsvxdjscdcb1ncdr5p3183spw32sbfcrbnr12nzys";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_type_conv ppx_deriving ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
deleted file mode 100644
index 71bc62937d4..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_core-133.33.01+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_core-113.33.01+4.03.tar.gz;
-    sha256 = "0ibww4lx87lmn164mxczl3sa7ldwc7g1zi4m9c4vllsv004iyffl";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
deleted file mode 100644
index d75c7f81128..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_sexp_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_custom_printf-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_custom_printf-113.33.00+4.03.tar.gz;
-    sha256 = "1hw8q4x0hzyg3brlqpdm0bc7z6lnj6qymzw123cf51q9dq0386jb";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_sexp_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
deleted file mode 100644
index 77fde21e8d7..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_enumerate-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_enumerate-113.33.00+4.03.tar.gz;
-    sha256 = "0b0kvdw6kids4yrzqq2h82gmnx1zfiahr82rrdbwiwkk4g0pxl93";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
deleted file mode 100644
index 32133dfb689..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_driver, ppx_assert, ppx_custom_printf, ppx_inline_test
-, ppx_fields_conv, ppx_variants_conv, re, sexplib, fieldslib
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_expect-113.33.01+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_expect-113.33.01+4.03.tar.gz;
-    sha256 = "1r358vx3wnkzq8kwgi49400l1fx2bnl6gds4hl7s67lxsqxki2z7";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_assert ppx_custom_printf ppx_fields_conv ppx_variants_conv re ];
-  propagatedBuildInputs = [ ppx_driver ppx_inline_test fieldslib sexplib ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
deleted file mode 100644
index ba098b9294f..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_here
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_fail-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fail-113.33.00+4.03.tar.gz;
-    sha256 = "1fy1aqsylf6yk527w13rm2b20il9vy026c5ww65pj3ks5zykfvx9";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_here ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
deleted file mode 100644
index 70d6ec61b0e..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, fieldslib, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_fields_conv-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fields_conv-113.33.00+4.03.tar.gz;
-    sha256 = "1wfi8pc0y7wjiscvawhfgbcfx7ypmikmyyagwhzw7jhnldljwrkg";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ fieldslib ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
deleted file mode 100644
index 7b9414353a9..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_driver
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_inline_test-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_inline_test-113.33.00+4.03.tar.gz;
-    sha256 = "1sw71wnwznia1spicilj4bzspgdk1dhp0j4hp57a9xmsscg44i4k";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_driver ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
deleted file mode 100644
index 0a5b19051fc..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_assert, ppx_bench, ppx_bin_prot, ppx_custom_printf, ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_let, ppx_pipebang, ppx_sexp_message, ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_jane-113.33.00";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_jane-113.33.00.tar.gz;
-    sha256 = "15lbrc9jj83k208gv7knz7mk9xh9mdb657jdjb1006gdsskfmra6";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_assert ppx_bench ppx_bin_prot
-    ppx_custom_printf ppx_enumerate ppx_expect ppx_fail ppx_fields_conv
-    ppx_let ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv
-    ppx_variants_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
deleted file mode 100644
index b5f0bd4c932..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_driver
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_let-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_let-113.33.00+4.03.tar.gz;
-    sha256 = "012yzayknm9qv8ap9rbwf4fwnmx935mfy7c75ifagbnfl4lh7dmp";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_driver ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
deleted file mode 100644
index 05e7f40eb68..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, oasis
-, ppx_core, ppx_tools
-}:
-
-let
-  param = {
-    "4.03" = {
-      version = "113.33.00+4.03";
-      sha256 = "1fkz6n40l4ck8bcr548d2yp08zc9fjv42zldlh0cj3ammhiz3gap";
-    };
-    "4.04" = {
-      version = "113.33.01+4.03";
-      sha256 = "1caw5dfgh5rw8mcgar0hdn485j1rqlnkbfb8wd0wdl5zhkg8jk3d";
-    };
-  }."${ocaml.meta.branch}";
-in
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_optcomp-${param.version}";
-  src = fetchzip {
-    url = "http://github.com/janestreet/ppx_optcomp/archive/${param.version}.tar.gz";
-    inherit (param) sha256;
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam oasis ppx_tools ];
-  propagatedBuildInputs = [ ppx_core ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
deleted file mode 100644
index 5aa589e250c..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_driver
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_pipebang-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_pipebang-113.33.00+4.03.tar.gz;
-    sha256 = "1rjrpbncy8vzwnmc5n0qs4dd40dmg4h75dvd7h7lm8cpxalifivc";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_driver ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
deleted file mode 100644
index d8c9166585e..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, sexplib, ppx_deriving, ppx_tools, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_sexp_conv-133.33.01+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_conv-113.33.01+4.03.tar.gz;
-    sha256 = "176pydk5fs8m2md9v8v5b16gra90s4v0ssqq38ghfsbv1faca8d6";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ sexplib ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
deleted file mode 100644
index ddf66364b30..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_sexp_conv, ppx_here
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_sexp_message-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_message-113.33.00+4.03.tar.gz;
-    sha256 = "01vrm8dk413gh19i2y6ffpsmscjhayp3asn5hcbcflxsvlaf4klx";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
deleted file mode 100644
index 21b67b9cce7..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_here, ppx_sexp_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_sexp_value-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_value-113.33.00+4.03.tar.gz;
-    sha256 = "0pn2v1m479lbdgprv4w9czyv5nim0hz6ailmy1xxlxlhazwbqzwm";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
deleted file mode 100644
index 49cfc19321d..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_core, ppx_deriving, ppx_driver
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_type_conv-133.33.02+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_type_conv-113.33.02+4.03.tar.gz;
-    sha256 = "0y7hsh152gcj89i6cr3b9kxgdnb2sx8vhaq2bdvbcc9zrirwq4d2";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_deriving ];
-  propagatedBuildInputs = [ ppx_core ppx_driver ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
deleted file mode 100644
index 69a4ad7e69a..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, typerep, ppx_tools, ppx_type_conv, ppx_deriving
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_typerep_conv-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_typerep_conv-113.33.00+4.03.tar.gz;
-    sha256 = "0k03wp07jvv3zpsm8n5hvskd5iagjvpcpxj9rpj012nia5iqfaj6";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-  propagatedBuildInputs = [ ppx_type_conv typerep ppx_deriving ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
deleted file mode 100644
index fb8a994790c..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, variantslib, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-ppx_variants_conv-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_variants_conv-113.33.00+4.03.tar.gz;
-    sha256 = "0il0nkdwwsc1ymshj4q9nzw5ixm12ls0jj7z3q16k48bg3z5ibc0";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-  propagatedBuildInputs = [ variantslib ppx_deriving ppx_type_conv ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
deleted file mode 100644
index 4f86f080738..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }:
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-sexplib-113.33.00+4.03";
-  src = fetchurl {
-    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/sexplib-113.33.00+4.03.tar.gz;
-    sha256 = "1dirdrags3z8m80z1vczfnpdfzgcvm2wyy7g61fxdr8h3jgixpl3";
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
-
-  inherit (topkg) installPhase;
-
-  meta = {
-    license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b2012923adf..83c7d610c72 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -31,11 +31,17 @@ let
 
     async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { };
 
-    async_find = callPackage ../development/ocaml-modules/async_find { };
+    async_find =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_find
+      else callPackage ../development/ocaml-modules/async_find { };
 
     async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { };
 
-    async_shell = callPackage ../development/ocaml-modules/async_shell { };
+    async_shell =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_shell
+      else callPackage ../development/ocaml-modules/async_shell { };
 
     async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
 
@@ -594,196 +600,228 @@ let
 
     ppx_core =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}
+      then janeStreet.ppx_core
       else callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {};
 
     ppx_optcomp =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix {
-        oasis = ocaml_oasis; }
+      then janeStreet.ppx_optcomp
       else callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {};
 
-    ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
+    ppx_driver =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.ppx_driver
+      else callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
 
     ppx_type_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix { }
+      then janeStreet.ppx_type_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {};
 
     ppx_compare =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix {}
+      then janeStreet.ppx_compare
       else callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {};
 
-    ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
+    ppx_here =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.ppx_here
+      else callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
 
     ppx_sexp_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix { }
+      then janeStreet.ppx_sexp_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {};
 
-    ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
+    ppx_assert =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.ppx_assert
+      else callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
 
     ppx_inline_test =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix {}
+      then janeStreet.ppx_inline_test
       else callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {};
 
     ppx_bench =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix {}
+      then janeStreet.ppx_bench
       else callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {};
 
     ppx_bin_prot =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix {}
+      then janeStreet.ppx_bin_prot
       else callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {};
 
     ppx_custom_printf =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix {}
+      then janeStreet.ppx_custom_printf
       else callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {};
 
     ppx_enumerate =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix {}
+      then janeStreet.ppx_enumerate
       else callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {};
 
     ppx_fail =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix {}
+      then janeStreet.ppx_fail
       else callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {};
 
     ppx_fields_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix {}
+      then janeStreet.ppx_fields_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {};
 
     ppx_let =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_let-113_33_00.nix {}
+      then janeStreet.ppx_let
       else callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {};
 
     ppx_pipebang =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix {}
+      then janeStreet.ppx_pipebang
       else callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {};
 
     ppx_sexp_message =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix {}
+      then janeStreet.ppx_sexp_message
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {};
 
     ppx_sexp_value =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix {}
+      then janeStreet.ppx_sexp_value
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {};
 
     ppx_typerep_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix {}
+      then janeStreet.ppx_typerep_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {};
 
     ppx_variants_conv =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix {}
+      then janeStreet.ppx_variants_conv
       else callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {};
 
     ppx_expect =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix {}
+      then janeStreet.ppx_expect
       else callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
 
     ppx_jane =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {}
+      then janeStreet.ppx_jane
       else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
 
 
     # Core sublibs
     typerep =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.typerep
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/typerep.nix {}
       else typerep_p4;
 
     fieldslib =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.fieldslib
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}
       else fieldslib_p4;
 
     sexplib =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/sexplib-113_33_00.nix {}
+      then janeStreet.sexplib
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}
       else sexplib_p4;
 
     variantslib =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.variantslib
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {}
       else variantslib_p4;
 
     bin_prot =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.bin_prot
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}
       else bin_prot_p4;
 
     core_kernel =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/core_kernel-113_33_01.nix {}
+      then janeStreet.core_kernel
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}
       else core_kernel_p4;
 
     core =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/core-113_33_02.nix {}
+      then janeStreet.core
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core.nix {}
       else core_p4;
 
     re2 =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.re2
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/re2.nix {}
       else re2_p4;
 
     textutils =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.textutils
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/textutils.nix {}
       else textutils_p4;
 
     core_extended =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.core_extended
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}
       else core_extended_p4;
 
     async_kernel =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/async_kernel-113_33_00.nix {}
+      then janeStreet.async_kernel
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
       else async_kernel_p4;
 
-    async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
+    async_rpc_kernel =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_rpc_kernel
+      else callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
 
     async_unix =
       if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/janestreet/async_unix-113_33_00.nix {}
+      then janeStreet.async_unix
       else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
       else async_unix_p4;
 
     async_extra =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_extra
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {}
       else async_extra_p4;
 
     async =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async.nix {}
       else async_p4;
 
-    async_ssl = callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
+    async_ssl =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.async_ssl
+      else callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
 
     # Apps / from all-packages
 
-- 
GitLab


From f8fd5531a3147a8e6229aca98ed9b202dae9eeca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Sun, 28 May 2017 22:16:45 +0200
Subject: [PATCH 0152/1490] patdiff: init at 0.9.0

---
 pkgs/tools/misc/patdiff/default.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix     |  4 ++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/tools/misc/patdiff/default.nix

diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix
new file mode 100644
index 00000000000..6e3c635f87a
--- /dev/null
+++ b/pkgs/tools/misc/patdiff/default.nix
@@ -0,0 +1,13 @@
+{ ocamlPackages }:
+
+with ocamlPackages;
+
+janePackage {
+  name = "patdiff";
+  hash = "15b6nkmd2z07j4nnmkb2g6qn3daw2xmmz3lgswkj03v29ffib014";
+  buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ];
+  meta = {
+    description = "File Diff using the Patience Diff algorithm";
+    inherit (core_extended.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a4864faa6d..20d04741120 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1057,6 +1057,10 @@ with pkgs;
 
   nfdump = callPackage ../tools/networking/nfdump { };
 
+  patdiff = callPackage ../tools/misc/patdiff {
+    ocamlPackages = ocamlPackages_4_03;
+  };
+
   playerctl = callPackage ../tools/audio/playerctl { };
 
   socklog = callPackage ../tools/system/socklog { };
-- 
GitLab


From 50b0e5bfa1ab09a366d575fea1915a3f4002eb68 Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Mon, 29 May 2017 20:22:50 -0400
Subject: [PATCH 0153/1490] treq: 17.3.1

- enables and fixes tests
- makes docs properly
- used fetchpypi
- tested nixos python 27/34
---
 .../python-modules/treq/default.nix           | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index ede5f2520c1..b22ee2675a7 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -1,23 +1,17 @@
-{ stdenv, fetchurl, buildPythonPackage, service-identity, requests,
-  six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx,
-  openssl, pyopenssl }:
+{ stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six,
+  mock, twisted, incremental, pep8, sphinx, openssl, pyopenssl, tox }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "treq";
   version = "17.3.1";
 
-  src = fetchurl {
-    url = "mirror://pypi/t/${pname}/${name}.tar.gz";
-    sha256 = "313af6dedecfdde2750968dc17653b6147cf2340b3479d70031cf741f5be0cf6";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1xhcpvsl3xqw0dq9sixk80iwyiv17djigp3815sy5pfgvvggcfii";
   };
 
   buildInputs = [
-    pep8
-    mock
-  ];
-
-  propagatedBuildInputs = [
     service-identity
     requests
     twisted
@@ -26,20 +20,28 @@ buildPythonPackage rec {
     six
     openssl
     pyopenssl
+    tox
   ];
 
-  checkPhase = ''
-    ${pep8}/bin/pep8 --ignore=E902 treq
-    trial treq
-  '';
+  checkInputs = [
+    pep8
+    mock
+  ];
 
-  doCheck = false;
-  # Failure: twisted.web._newclient.RequestTransmissionFailed: [<twisted.python.failure.Failure OpenSSL.SSL.Error: [('SSL routines', 'ssl3_get_server_certificate', 'certificate verify failed')]>]
+  postPatch = ''
+    rm -fv src/treq/test/test_treq_integration.py
+  '';
 
   postBuild = ''
-    ${coreutils}/bin/mkdir -pv treq
-    ${coreutils}/bin/echo "${version}" | ${coreutils}/bin/tee treq/_version
-    cd docs && ${gnumake}/bin/make html && cd ..
+    # build documentation and install in $out
+    tox -e docs
+    mkdir -pv $out/docs
+    cp -rv docs/* $out/docs/
+  '';
+
+  checkPhase = ''
+    ${pep8}/bin/pep8 --ignore=E902 treq
+    trial treq
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From bc7b895aa57c52e30eb392ff2527dc850b72c87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 30 May 2017 20:56:34 +0200
Subject: [PATCH 0154/1490] nvidia module: allow .persistenced == null

Fixes #26250.  This is fallout from PR #22304.
It's null for 304 and 173 legacy drivers.
---
 nixos/modules/hardware/video/nvidia.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 161ed9457af..f2d71aa34e4 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -56,7 +56,8 @@ in
     hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs;
     hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686;
 
-    environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings nvidia_x11.persistenced ];
+    environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
+      ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
 
     boot.extraModulePackages = [ nvidia_x11.bin ];
 
-- 
GitLab


From 91a56e1be0f0f84b7bbcac39b4636011911f3ed6 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 30 May 2017 18:12:57 +0200
Subject: [PATCH 0155/1490] pythonPackages.hidapi: 0.7.99.post15 ->
 0.7.99.post20

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f10fac5041..b59afd7b6ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29627,12 +29627,12 @@ EOF
   };
 
   hidapi = buildPythonPackage rec{
-    version = "0.7.99.post15";
+    version = "0.7.99.post20";
     name = "hidapi-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/h/hidapi/${name}.tar.gz";
-      sha256 = "09wlr1d7mx80974bsq62j4pk80234jgl7ip4br0y43q6999dpcr0";
+      sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z";
     };
 
     propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ];
-- 
GitLab


From 26fbe2634545608f39e0db96476c0c9973928cfd Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 30 May 2017 19:07:33 +0200
Subject: [PATCH 0156/1490] pythonPackages.libagent: init at 0.9.1

---
 pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b59afd7b6ef..c4d3edad665 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29735,6 +29735,28 @@ EOF
     };
   };
 
+  libagent = buildPythonPackage rec {
+    name = "libagent-${version}";
+    version = "0.9.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/l/libagent/${name}.tar.gz";
+      sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc";
+    };
+
+    buildInputs = with self; [
+      ed25519 ecdsa semver keepkey
+      trezor mnemonic ledgerblue
+    ];
+
+    meta = {
+      description = "Using hardware wallets as SSH/GPG agent";
+      homepage = "https://github.com/romanz/trezor-agent";
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
   x11_hash = buildPythonPackage rec{
     version = "1.4";
     name = "x11_hash-${version}";
-- 
GitLab


From fe98f01da352fe09b6df11797941d4c6439d7e05 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 30 May 2017 19:08:04 +0200
Subject: [PATCH 0157/1490] pythonPackages.trezor_agent: 0.7.0 -> 0.9.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4d3edad665..3f427c604cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29717,15 +29717,18 @@ EOF
   };
 
   trezor_agent = buildPythonPackage rec{
-    version = "0.7.0";
+    version = "0.9.0";
     name = "trezor_agent-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/t/trezor_agent/${name}.tar.gz";
-      sha256 = "1x1gwih6w8kxhpgmcp0v1k7mpmfsqiikkjca291sd0v2if24x7q1";
+      sha256 = "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz";
     };
 
-    propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ];
+    propagatedBuildInputs = with self; [
+      trezor libagent ecdsa ed25519
+      mnemonic keepkey semver
+    ];
 
     meta = {
       description = "Using Trezor as hardware SSH agent";
-- 
GitLab


From b2a8b7df59225edadb64e5376a4517ef44b34400 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 30 May 2017 19:21:34 +0200
Subject: [PATCH 0158/1490] pythonPackages.keepkey: fix impossible constraint

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f427c604cf..163c83dfa7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29674,6 +29674,11 @@ EOF
     # There are no actual tests: "ImportError: No module named tests"
     doCheck = false;
 
+    # remove impossible dependency constraint
+    postPatch = ''
+      sed -i -e 's/hidapi==/hidapi>=/' setup.py
+    '';
+
     meta = {
       description = "KeepKey Python client";
       homepage = https://github.com/keepkey/python-keepkey;
-- 
GitLab


From 0db82856898d3828a3eb0370dd4ba0428146828b Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 30 May 2017 20:02:07 +0200
Subject: [PATCH 0159/1490] pythonPackages.ecpy: init at 0.8.1

---
 pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 163c83dfa7a..8fbabd6e5b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29765,6 +29765,26 @@ EOF
     };
   };
 
+  ecpy = buildPythonPackage rec {
+    name = "ECPy-${version}";
+    version = "0.8.1";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/e/ecpy/${name}.tar.gz";
+      sha256 = "0ab60sx4bbsmccwmdvz1023r0cbzi4phar4ipzn5npdj5gw1ny4l";
+    };
+
+    buildInputs = with self; [
+      hidapi pycrypto pillow protobuf future
+    ];
+
+    meta = {
+      description = "Pure Pyhton Elliptic Curve Library";
+      homepage = "https://github.com/ubinity/ECPy";
+      license = licenses.apache;
+    };
+  };
+
   x11_hash = buildPythonPackage rec{
     version = "1.4";
     name = "x11_hash-${version}";
-- 
GitLab


From 3f9b6ddbf52386259b09d1697c1637b635463e96 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 30 May 2017 20:02:33 +0200
Subject: [PATCH 0160/1490] pythonPackages.ledgerblue: init at 0.1.13

---
 pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8fbabd6e5b2..0e0394d2efc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29765,6 +29765,27 @@ EOF
     };
   };
 
+  ledgerblue = buildPythonPackage rec {
+    name = "ledgerblue-${version}";
+    version = "0.1.13";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/l/ledgerblue/${name}.tar.gz";
+      sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
+    };
+
+    buildInputs = with self; [
+      hidapi pycrypto pillow protobuf future ecpy
+    ];
+
+    meta = {
+      description = "Python library to communicate with Ledger Blue/Nano S";
+      homepage = "https://github.com/LedgerHQ/blue-loader-python";
+      license = licenses.apache2;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
   ecpy = buildPythonPackage rec {
     name = "ECPy-${version}";
     version = "0.8.1";
-- 
GitLab


From e73f9953af03f9cbc3878108ea44197fecb9d488 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 30 May 2017 21:35:32 +0200
Subject: [PATCH 0161/1490] move libraries to pkgs/development/python-modules

---
 pkgs/development/python-modules/ecpy.nix      |  21 +++
 pkgs/development/python-modules/ed25519.nix   |  18 ++
 pkgs/development/python-modules/hidapi.nix    |  30 ++++
 pkgs/development/python-modules/keepkey.nix   |  31 ++++
 .../development/python-modules/ledgerblue.nix |  22 +++
 pkgs/development/python-modules/libagent.nix  |  25 +++
 pkgs/development/python-modules/semver.nix    |  18 ++
 pkgs/development/python-modules/trezor.nix    |   9 +-
 pkgs/top-level/python-packages.nix            | 154 +-----------------
 9 files changed, 177 insertions(+), 151 deletions(-)
 create mode 100644 pkgs/development/python-modules/ecpy.nix
 create mode 100644 pkgs/development/python-modules/ed25519.nix
 create mode 100644 pkgs/development/python-modules/hidapi.nix
 create mode 100644 pkgs/development/python-modules/keepkey.nix
 create mode 100644 pkgs/development/python-modules/ledgerblue.nix
 create mode 100644 pkgs/development/python-modules/libagent.nix
 create mode 100644 pkgs/development/python-modules/semver.nix

diff --git a/pkgs/development/python-modules/ecpy.nix b/pkgs/development/python-modules/ecpy.nix
new file mode 100644
index 00000000000..56e815d17b3
--- /dev/null
+++ b/pkgs/development/python-modules/ecpy.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, buildPythonPackage, hidapi
+, pycrypto, pillow, protobuf, future, ecpy
+}:
+
+buildPythonPackage rec {
+  name = "ECPy-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/e/ecpy/${name}.tar.gz";
+    sha256 = "0ab60sx4bbsmccwmdvz1023r0cbzi4phar4ipzn5npdj5gw1ny4l";
+  };
+
+  buildInputs = [ hidapi pycrypto pillow protobuf future ];
+
+  meta = with stdenv.lib; {
+    description = "Pure Pyhton Elliptic Curve Library";
+    homepage = "https://github.com/ubinity/ECPy";
+    license = licenses.apache;
+  };
+}
diff --git a/pkgs/development/python-modules/ed25519.nix b/pkgs/development/python-modules/ed25519.nix
new file mode 100644
index 00000000000..dfbf6e3f2c3
--- /dev/null
+++ b/pkgs/development/python-modules/ed25519.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "ed25519-${version}";
+  version = "1.4";
+
+  src = fetchurl {
+    url = "mirror://pypi/e/ed25519/${name}.tar.gz";
+    sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Ed25519 public-key signatures";
+    homepage = "https://github.com/warner/python-ed25519";
+    license = licenses.mit;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/development/python-modules/hidapi.nix b/pkgs/development/python-modules/hidapi.nix
new file mode 100644
index 00000000000..93603ed576d
--- /dev/null
+++ b/pkgs/development/python-modules/hidapi.nix
@@ -0,0 +1,30 @@
+{ stdenv, pkgs, libusb, udev
+, fetchurl, buildPythonPackage, cython }:
+
+buildPythonPackage rec {
+  version = "0.7.99.post20";
+  name = "hidapi-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/h/hidapi/${name}.tar.gz";
+    sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z";
+  };
+
+  propagatedBuildInputs = [ pkgs.libusb1 pkgs.udev cython ];
+
+  # Fix the USB backend library lookup
+  postPatch = ''
+    libusb=${pkgs.libusb1.dev}/include/libusb-1.0
+    test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
+    sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
+    homepage = https://github.com/trezor/cython-hidapi;
+    # license can actually be either bsd3 or gpl3
+    # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/development/python-modules/keepkey.nix b/pkgs/development/python-modules/keepkey.nix
new file mode 100644
index 00000000000..5869bd40a63
--- /dev/null
+++ b/pkgs/development/python-modules/keepkey.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, buildPythonPackage, ecdsa
+, mnemonic, protobuf3_0, hidapi }:
+
+buildPythonPackage rec{
+  version = "0.7.3";
+  name = "keepkey-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/k/keepkey/${name}.tar.gz";
+    sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
+  };
+
+  propagatedBuildInputs = [ protobuf3_0 hidapi ];
+
+  buildInputs = [ ecdsa mnemonic ];
+
+  # There are no actual tests: "ImportError: No module named tests"
+  doCheck = false;
+
+  # remove impossible dependency constraint
+  postPatch = ''
+    sed -i -e 's/hidapi==/hidapi>=/' setup.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "KeepKey Python client";
+    homepage = https://github.com/keepkey/python-keepkey;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/development/python-modules/ledgerblue.nix b/pkgs/development/python-modules/ledgerblue.nix
new file mode 100644
index 00000000000..fff2ed965d0
--- /dev/null
+++ b/pkgs/development/python-modules/ledgerblue.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, buildPythonPackage, hidapi
+, pycrypto, pillow, protobuf, future, ecpy
+}:
+
+buildPythonPackage rec {
+  name = "ledgerblue-${version}";
+  version = "0.1.13";
+
+  src = fetchurl {
+    url = "mirror://pypi/l/ledgerblue/${name}.tar.gz";
+    sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
+  };
+
+  buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
+
+  meta = with stdenv.lib; {
+    description = "Python library to communicate with Ledger Blue/Nano S";
+    homepage = "https://github.com/LedgerHQ/blue-loader-python";
+    license = licenses.apache2;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/development/python-modules/libagent.nix b/pkgs/development/python-modules/libagent.nix
new file mode 100644
index 00000000000..34ff2377702
--- /dev/null
+++ b/pkgs/development/python-modules/libagent.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, buildPythonPackage, ed25519, ecdsa
+, semver, keepkey, trezor, mnemonic, ledgerblue
+}:
+
+buildPythonPackage rec {
+  name = "libagent-${version}";
+  version = "0.9.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/l/libagent/${name}.tar.gz";
+    sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc";
+  };
+
+  buildInputs = [
+    ed25519 ecdsa semver keepkey
+    trezor mnemonic ledgerblue
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Using hardware wallets as SSH/GPG agent";
+    homepage = "https://github.com/romanz/trezor-agent";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/development/python-modules/semver.nix b/pkgs/development/python-modules/semver.nix
new file mode 100644
index 00000000000..e9dcbd373c5
--- /dev/null
+++ b/pkgs/development/python-modules/semver.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "semver-${version}";
+  version = "2.2.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/semver/${name}.tar.gz";
+    sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python package to work with Semantic Versioning (http://semver.org/)";
+    homepage = "https://github.com/k-bx/python-semver";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/development/python-modules/trezor.nix b/pkgs/development/python-modules/trezor.nix
index 70160dcb0f9..87ee7160017 100644
--- a/pkgs/development/python-modules/trezor.nix
+++ b/pkgs/development/python-modules/trezor.nix
@@ -1,4 +1,5 @@
-{ lib, fetchurl, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
+{ stdenv, fetchurl, buildPythonPackage
+, protobuf3_0, hidapi, ecdsa, mnemonic }:
 
 buildPythonPackage rec {
   pname = "trezor";
@@ -17,10 +18,10 @@ buildPythonPackage rec {
   # There are no actual tests: "ImportError: No module named tests"
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet";
     homepage = https://github.com/trezor/python-trezor;
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ np ];
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ np ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e0394d2efc..bd17887328c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29626,100 +29626,23 @@ EOF
     };
   };
 
-  hidapi = buildPythonPackage rec{
-    version = "0.7.99.post20";
-    name = "hidapi-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/hidapi/${name}.tar.gz";
-      sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z";
-    };
-
-    propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ];
-
-    # Fix the USB backend library lookup
-    postPatch = ''
-      libusb=${pkgs.libusb1.dev}/include/libusb-1.0
-      test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
-      sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
-    '';
-
-    meta = {
-      description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
-      homepage = https://github.com/trezor/cython-hidapi;
-      # license can actually be either bsd3 or gpl3
-      # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ np ];
-    };
-  };
+  hidapi = callPackage ../development/python-modules/hidapi.nix { };
 
   mnemonic = callPackage ../development/python-modules/mnemonic.nix { };
 
   trezor = callPackage ../development/python-modules/trezor.nix { };
 
-  keepkey = buildPythonPackage rec{
-    version = "0.7.3";
-    name = "keepkey-${version}";
+  keepkey = callPackage ../development/python-modules/keepkey.nix { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/keepkey/${name}.tar.gz";
-      sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
-    };
+  semver = callPackage ../development/python-modules/semver.nix { };
 
-    propagatedBuildInputs = with self; [ protobuf3_0 hidapi ];
+  ed25519 = callPackage ../development/python-modules/ed25519.nix { };
 
-    buildInputs = with self; [ ecdsa mnemonic ];
+  libagent = callPackage ../development/python-modules/libagent.nix { };
 
-    # There are no actual tests: "ImportError: No module named tests"
-    doCheck = false;
+  ledgerblue = callPackage ../development/python-modules/ledgerblue.nix { };
 
-    # remove impossible dependency constraint
-    postPatch = ''
-      sed -i -e 's/hidapi==/hidapi>=/' setup.py
-    '';
-
-    meta = {
-      description = "KeepKey Python client";
-      homepage = https://github.com/keepkey/python-keepkey;
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ np ];
-    };
-  };
-
-  semver = buildPythonPackage rec {
-    name = "semver-${version}";
-    version = "2.2.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/semver/${name}.tar.gz";
-      sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
-    };
-
-    meta = {
-      description = "Python package to work with Semantic Versioning (http://semver.org/)";
-      homepage = "https://github.com/k-bx/python-semver";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ np ];
-    };
-  };
-
-  ed25519 = buildPythonPackage rec {
-    name = "ed25519-${version}";
-    version = "1.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/ed25519/${name}.tar.gz";
-      sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
-    };
-
-    meta = {
-      description = "Ed25519 public-key signatures";
-      homepage = "https://github.com/warner/python-ed25519";
-      license = licenses.mit;
-      maintainers = with maintainers; [ np ];
-    };
-  };
+  ecpy = callPackage ../development/python-modules/ecpy.nix { };
 
   trezor_agent = buildPythonPackage rec{
     version = "0.9.0";
@@ -29743,69 +29666,6 @@ EOF
     };
   };
 
-  libagent = buildPythonPackage rec {
-    name = "libagent-${version}";
-    version = "0.9.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/libagent/${name}.tar.gz";
-      sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc";
-    };
-
-    buildInputs = with self; [
-      ed25519 ecdsa semver keepkey
-      trezor mnemonic ledgerblue
-    ];
-
-    meta = {
-      description = "Using hardware wallets as SSH/GPG agent";
-      homepage = "https://github.com/romanz/trezor-agent";
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ np ];
-    };
-  };
-
-  ledgerblue = buildPythonPackage rec {
-    name = "ledgerblue-${version}";
-    version = "0.1.13";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/ledgerblue/${name}.tar.gz";
-      sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
-    };
-
-    buildInputs = with self; [
-      hidapi pycrypto pillow protobuf future ecpy
-    ];
-
-    meta = {
-      description = "Python library to communicate with Ledger Blue/Nano S";
-      homepage = "https://github.com/LedgerHQ/blue-loader-python";
-      license = licenses.apache2;
-      maintainers = with maintainers; [ np ];
-    };
-  };
-
-  ecpy = buildPythonPackage rec {
-    name = "ECPy-${version}";
-    version = "0.8.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/ecpy/${name}.tar.gz";
-      sha256 = "0ab60sx4bbsmccwmdvz1023r0cbzi4phar4ipzn5npdj5gw1ny4l";
-    };
-
-    buildInputs = with self; [
-      hidapi pycrypto pillow protobuf future
-    ];
-
-    meta = {
-      description = "Pure Pyhton Elliptic Curve Library";
-      homepage = "https://github.com/ubinity/ECPy";
-      license = licenses.apache;
-    };
-  };
-
   x11_hash = buildPythonPackage rec{
     version = "1.4";
     name = "x11_hash-${version}";
-- 
GitLab


From 3fa1be6f491d9f3ce359234aa1e479e6d91a598f Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 30 May 2017 21:48:32 +0200
Subject: [PATCH 0162/1490] Add `isStorePath` tests (#26223)

---
 lib/tests/misc.nix | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 334e1a70733..f55f3d71272 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -1,7 +1,6 @@
 # to run these tests:
 # nix-instantiate --eval --strict nixpkgs/lib/tests/misc.nix
 # if the resulting list is empty, all tests passed
-let inherit (builtins) add; in
 with import ../default.nix;
 
 runTests {
@@ -88,6 +87,37 @@ runTests {
     expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
   };
 
+  testIsStorePath =  {
+    expr =
+      let goodPath =
+            "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11";
+      in {
+        storePath = isStorePath goodPath;
+        storePathAppendix = isStorePath
+          "${goodPath}/bin/python";
+        nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
+        asPath = isStorePath (builtins.toPath goodPath);
+        otherPath = isStorePath "/something/else";
+        otherVals = {
+          attrset = isStorePath {};
+          list = isStorePath [];
+          int = isStorePath 42;
+        };
+      };
+    expected = {
+      storePath = true;
+      storePathAppendix = false;
+      nonAbsolute = false;
+      asPath = true;
+      otherPath = false;
+      otherVals = {
+        attrset = false;
+        list = false;
+        int = false;
+      };
+    };
+  };
+
 # LISTS
 
   testFilter = {
@@ -266,14 +296,14 @@ runTests {
           res4 = let x = defaultOverridableDelayableArgs id { a = 7; };
                 in (x.merge) ( x: { b = 10; });
           res5 = let x = defaultOverridableDelayableArgs id { a = 7; };
-                in (x.merge) ( x: { a = add x.a 3; });
-          res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; };
+                in (x.merge) ( x: { a = builtins.add x.a 3; });
+          res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; };
                      y = x.merge {};
                 in (y.merge) { a = 10; };
 
           resRem7 = res6.replace (a: removeAttrs a ["a"]);
 
-          resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; };
+          resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; };
                             x2 = x.merge { a = 20; }; # now we have 27
                         in (x2.replace) { a = 10; }; # and override the value by 10
 
-- 
GitLab


From 786388b85b512fc2d9b6e3b45e91c71405490861 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 30 May 2017 15:49:16 -0400
Subject: [PATCH 0163/1490] elpa-packages: 2017-05-30

---
 .../editors/emacs-modes/elpa-generated.nix     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 41a347000f8..44e9a83e872 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1550,10 +1550,10 @@
       }) {};
     rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "rainbow-mode";
-        version = "0.12";
+        version = "0.13";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rainbow-mode-0.12.el";
-          sha256 = "10a7qs7fvw4qi4vxj9n56j26gjk61bl79dgz4md1d26slb2j1c04";
+          url = "https://elpa.gnu.org/packages/rainbow-mode-0.13.el";
+          sha256 = "1d3aamx6qgqqpqijwsr02ggwrh67gfink1bir0692alfkm3zdddl";
         };
         packageRequires = [];
         meta = {
@@ -1564,10 +1564,10 @@
     realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }:
     elpaBuild {
         pname = "realgud";
-        version = "1.4.3";
+        version = "1.4.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/realgud-1.4.3.tar";
-          sha256 = "07yfah8kmr60rhrj8y8gs7l85hsbylv26crw3qbqh67ka4ykpj01";
+          url = "https://elpa.gnu.org/packages/realgud-1.4.4.tar";
+          sha256 = "1nc8km339ip90h1j55ahfga03v7x7rh4iycmw6yrxyzir68vwn7c";
         };
         packageRequires = [
           cl-lib
@@ -1730,10 +1730,10 @@
     soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "soap-client";
-        version = "3.1.1";
+        version = "3.1.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/soap-client-3.1.1.tar";
-          sha256 = "0is2923g882farf73dix6ncq3m26yn5j5qr8wz6s0xad04zdbdhk";
+          url = "https://elpa.gnu.org/packages/soap-client-3.1.2.tar";
+          sha256 = "0crfpp2ksqvzf2j3q44qq6z8zh1r10q9kw12cxbmjiih89q01b68";
         };
         packageRequires = [ cl-lib ];
         meta = {
-- 
GitLab


From 60cc275ace8053e00fecad8bf0f0382c2074a8b6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 30 May 2017 15:50:41 -0400
Subject: [PATCH 0164/1490] melpa-stable-packages: 2017-05-30

---
 .../emacs-modes/melpa-stable-generated.nix    | 257 +++++++++++++-----
 1 file changed, 191 insertions(+), 66 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 78d55a9ec47..9491122a7ad 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -587,6 +587,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
+    melpaBuild {
+        pname = "ac-rtags";
+        version = "2.10";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
+          sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641";
+          name = "ac-rtags";
+        };
+        packageRequires = [ auto-complete rtags ];
+        meta = {
+          homepage = "https://melpa.org/#/ac-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
     ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
     melpaBuild {
         pname = "ac-slime";
@@ -4006,12 +4027,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "2.4";
+        version = "2.5";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
-          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
+          rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
+          sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -5112,22 +5133,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "company-rtags";
-        version = "2.9";
+        version = "2.10";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
-          sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
           sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f";
           name = "company-rtags";
         };
-        packageRequires = [];
+        packageRequires = [ company emacs rtags ];
         meta = {
           homepage = "https://melpa.org/#/company-rtags";
           license = lib.licenses.free;
@@ -7555,12 +7576,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "0.7.7";
+        version = "0.9.7";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "99833cf30cfd702e5f04f7c4cd80217f17a56d70";
-          sha256 = "0a4g4zwwxl6gbql14fsnk1ax718vbdfjgczx5kwv3bl45ga928pc";
+          rev = "708bea9516812c6641ef8fc6f42dc087036addd8";
+          sha256 = "0yz0q3qvv9qxvwvjqd9zjqrrg6qxag092ni16vpni1mihw5803b8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -10912,12 +10933,12 @@
     exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "0.8.1";
+        version = "1.0";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "a928743ea35b21efb574fb9c77ea65c5084cccd1";
-          sha256 = "0pv3r2b5lr1dxq5pr9y0gra08aklja7vd6q5r0gbp8ac71xbrg2g";
+          rev = "47952c09e74fc0da3135e7ba0d4fef0eb88f98dc";
+          sha256 = "14mf388iygirlv7j5db2x5avn70b54mm34kd3y851n6i6yzgz7jw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -12050,22 +12071,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
     melpaBuild {
         pname = "flycheck-rtags";
-        version = "2.9";
+        version = "2.10";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
-          sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
           sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4";
           name = "flycheck-rtags";
         };
-        packageRequires = [];
+        packageRequires = [ emacs flycheck rtags ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-rtags";
           license = lib.licenses.free;
@@ -12683,12 +12704,12 @@
     flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flyspell-popup";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "flyspell-popup";
-          rev = "a3890c9272c0cfa1e2cde6526f7d6280ad4af00c";
-          sha256 = "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic";
+          rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde";
+          sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup";
@@ -15679,12 +15700,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.7.0";
+        version = "2.7.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "bdc6711656954562ed721545ac22ee3a507110a3";
-          sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
+          rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582";
+          sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15994,12 +16015,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.7.0";
+        version = "2.7.1";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "bdc6711656954562ed721545ac22ee3a507110a3";
-          sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
+          rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582";
+          sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -16957,6 +16978,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
+    melpaBuild {
+        pname = "helm-rtags";
+        version = "2.10";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
+          sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n";
+          name = "helm-rtags";
+        };
+        packageRequires = [ helm rtags ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-rubygems-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-rubygems-org";
@@ -19161,6 +19203,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
+    melpaBuild {
+        pname = "ivy-rtags";
+        version = "2.10";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
+          sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq";
+          name = "ivy-rtags";
+        };
+        packageRequires = [ ivy rtags ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
     melpaBuild {
         pname = "ivy-youtube";
@@ -21609,22 +21672,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "2.1";
+        version = "2.2";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "c6eb56eff31f7961c9a00a5d18eaf939c2c40b7d";
-          sha256 = "098lf4n4rpx00sm07sy8dwp683a4sb7x0p15mrfp268apir3kkxb";
+          rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9";
+          sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
           sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
           name = "markdown-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/markdown-mode";
           license = lib.licenses.free;
@@ -21955,12 +22018,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.7.9";
+        version = "0.7.10";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "b12faec5b6698852be441efdf86ac0ff30b03f07";
-          sha256 = "0y9d0cvv5rdhcbsik3vilp6j1mgmnlwjpcvbhibgw4mfzaxcqz4k";
+          rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76";
+          sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22794,12 +22857,12 @@
     msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "msvc";
-        version = "1.3.0";
+        version = "1.3.1";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "msvc";
-          rev = "71c38323187c98b32250b89088768599bb216ddb";
-          sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg";
+          rev = "ffc7974f1cafb5e03bae2765afc6a984ffcb0f7e";
+          sha256 = "155bgayysdyr5a9wpx78azpipd11s3k8ijgw4mpvbmkk5j7fi6a8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -24771,6 +24834,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mac-iCal";
+        version = "7.9.3.5";
+        src = fetchgit {
+          url = "git://orgmode.org/org-mode.git";
+          rev = "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1";
+          sha256 = "0rvsn085r1sgvv0gwvjlfgn7371bjd254hdzamc97m122pqr7cxr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
+          sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
+          name = "org-mac-iCal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/org-mac-iCal";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
@@ -29480,12 +29563,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.9";
+        version = "2.10";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
-          sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+          rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+          sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -29925,8 +30008,8 @@
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "970d88eeff82df635ee12336ab1eb185585f30c6";
-          sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90";
+          rev = "52091426ee319b4ec53799696bae75571f7ecbf6";
+          sha256 = "15vr1yz23h0kb7h3d6gh3ljax762666lkz53chqgm54bszgfwjcm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -30546,6 +30629,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shr-tag-pre-highlight";
+        version = "1";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "shr-tag-pre-highlight.el";
+          rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889";
+          sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
+          sha256 = "1v8fqx8bd5504r2mflq6x8xs3k0py3bgsnadz3bjs68yhaxacj3v";
+          name = "shr-tag-pre-highlight";
+        };
+        packageRequires = [ emacs language-detection ];
+        meta = {
+          homepage = "https://melpa.org/#/shr-tag-pre-highlight";
+          license = lib.licenses.free;
+        };
+      }) {};
     shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shrink-whitespace";
@@ -30588,6 +30692,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shx";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "riscy";
+          repo = "shx-for-emacs";
+          rev = "bcdbc7142a0542639f47abb48fe17aa6c92f8406";
+          sha256 = "0wrxwjlkix5qgi3fvkaj9m43hyif9ba2bdyzc0hkig7ng0b99cjd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
+          sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k";
+          name = "shx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/shx";
+          license = lib.licenses.free;
+        };
+      }) {};
     sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sift";
@@ -31515,12 +31640,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "1.3.2";
+        version = "1.3.3";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "c2c0b9249204b8f9a405a63abf20d07ac8e8ef79";
-          sha256 = "0frg52kdfygzz9r1w1d39dmlgksfy07p54xyrcpwfzkg0hh7b80y";
+          rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350";
+          sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -33442,12 +33567,12 @@
     tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tracking";
-        version = "2.4";
+        version = "2.5";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
-          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
+          rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
+          sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -34078,12 +34203,12 @@
     utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "utop";
-        version = "1.19.3";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "ee81ce49bab31757837bed35a182d29cbd54dfcb";
-          sha256 = "1p2vjxw0y6py5hly6vjl4gxm171n9pr4rkimxd0rg3dl1npvn99z";
+          rev = "d658bd8f63ed6b23144fdba2ee3f2a6d77979c4f";
+          sha256 = "1x96zxkvfq8mshgi654vvklrr7dqvq9can89n4jrrb82pcn06k5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -34726,22 +34851,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "14.1";
+        version = "15";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "44de4e0198051b52110d50d860db26ed770219f3";
-          sha256 = "0pbim6aw0w9z5bb0hl98bda1a19pjmfki6jr1mxcfi5yismk2863";
+          rev = "aef2a32f6e5e2fdb7f38a650b009a737c67959e2";
+          sha256 = "14x91pngh9i7r66inssc4jaqvzv2kb3bnbks5x2bhsidvls7s28r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/web-mode";
           license = lib.licenses.free;
@@ -34939,12 +35064,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "2.0.1";
+        version = "3.0.1";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512";
-          sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci";
+          rev = "3ff303b50495d492cfac70cc9f7321971928bdb1";
+          sha256 = "1q0rg13lq31fqnkpkss61pfyx7ib7i4r1jbcavpjyr5gqcb08fzm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -35442,12 +35567,12 @@
     writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
     melpaBuild {
         pname = "writeroom-mode";
-        version = "3.6.1";
+        version = "3.7";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "writeroom-mode";
-          rev = "f853350da848d0814f822587ae310e52d895f523";
-          sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz";
+          rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a";
+          sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
@@ -35906,8 +36031,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "9db0e1522847";
-          sha256 = "17f0n7la3p72n8qmdlfq1i9plr3cqc0gsd758lz103a8rbp9aj1d";
+          rev = "c940797c19ad";
+          sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
-- 
GitLab


From fdb3617888a95f8e23c20907b74f113c62c06df4 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 30 May 2017 15:56:11 -0400
Subject: [PATCH 0165/1490] melpa-packages: 2017-05-30

---
 .../editors/emacs-modes/melpa-generated.nix   | 810 ++++++++++--------
 1 file changed, 457 insertions(+), 353 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 7f022e4dbb0..bf943bf125e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -801,8 +801,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
-          sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1007,12 +1007,12 @@
     ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-link";
-        version = "20170319.553";
+        version = "20170528.1158";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-link";
-          rev = "0b6e06e0b5222a57e5e6f1d9af6436eb12102e3e";
-          sha256 = "1h8j1dl9xyybm0pj3j2j6fcq7bryby2h1s64r6ijcsgrqgimq66i";
+          rev = "99787dc79ed9ec14a2b87257d6c8ce5b8ec0a0b0";
+          sha256 = "103pb0c5g25fsnbjcjgj04aq4damxwhm2fg86fgxihrch8a7bhcn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1178,8 +1178,8 @@
         src = fetchFromGitHub {
           owner = "nickmccurdy";
           repo = "add-hooks";
-          rev = "9b1bdb91c59ea9c2cc0aba48262c49069273d856";
-          sha256 = "1jzgyfcr6m64q79qibnbqa41sbpivslwk2hygbk9yp46l5vgj1hc";
+          rev = "f7a94ef1762ad8eb58d24c0857751863ea93cd5b";
+          sha256 = "1j524wvl9l9hzahq8by9bnh745kg2z7l808ad9b0y0wx5kf17xlz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1487,12 +1487,12 @@
     alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alda-mode";
-        version = "20170524.846";
+        version = "20170529.1224";
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "07dabfe6132ba7622012eb457abe0a75c48d6414";
-          sha256 = "1lwpfbqz6cq0bandjz8v42l21f47g4z83m7cyrmr0n75wzb99kc8";
+          rev = "69f9f1aec6a52350a67ed1db87b6f6c99400622f";
+          sha256 = "1fkpq787z1k914kyln280mk06x58niks5hp9if620qpqvmqaih3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -4382,12 +4382,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170505.1010";
+        version = "20170525.1746";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "89ee73d88183b4f60f973ff0a47a571a5de46d1d";
-          sha256 = "046db0np55fdnyr7bwhl2h1cqjh1ryd09fvkwn02cv2kb7knkfig";
+          rev = "ac27813fdc7ce32eca1c16a439b46eb3a6835ac1";
+          sha256 = "1alhmgj40hhkgdpc7j34iswl9d5afmxjw74p189gm782mzl9y4c6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4798,12 +4798,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "20170521.1251";
+        version = "20170526.743";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "784f3bcbe2a8e9b1148e12ff35200de3e320ea0e";
-          sha256 = "1as0l3pyl7r2lkigzr923lrb6wyr5gia1z2klfclkydk6v2rix6d";
+          rev = "01920ffea5965d0ac5bc7196b73d4e0dcfe86c60";
+          sha256 = "04fdcxb0rvrrrglwcd6f83fk445bziycrzdcvh3gcpq09x5ryinx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -5115,8 +5115,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "4aa7d9a68a1a4a9f3e4b7a22fca3d8a2e45a8354";
-          sha256 = "17s5zdmprjbzxy68ah0f7k1j7cxncdyy9qlx5707zrqxqbnwlfrn";
+          rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3";
+          sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5632,12 +5632,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20170508.733";
+        version = "20170528.2317";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "b5326c5bd68f2dbeef87adae6657eb24f068dbc5";
-          sha256 = "1mxzsm1zkb99hpn7hav0yph3s04cbkhyj7dps49rphfp8s0ks90f";
+          rev = "4b76f0a86c84b0e4032cdee787c3ee55372e6c31";
+          sha256 = "1rr52dwwxq26v0h7apgr6nqpvfahrzm3j6p3zpbyp3lhb4sc2rjw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -7135,12 +7135,12 @@
     centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "centered-window-mode";
-        version = "20170522.2358";
+        version = "20170528.25";
         src = fetchFromGitHub {
           owner = "anler";
           repo = "centered-window-mode";
-          rev = "eba5ad249f50e62dd881040e8a0119fb8f5a1129";
-          sha256 = "01xa2qjv4mdi4ipnd26cngdgs2nxazm8ikjwnghdy0izp4mxik8w";
+          rev = "c46af782ada0d4062d7de5cbbdc7c7471fdd0d15";
+          sha256 = "1xbfmanimq0ql61lzxx74jf4kj1g9imzgwiy1498mhbdbw295fg0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode";
@@ -7195,22 +7195,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ceylon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ceylon-mode";
-        version = "20170514.604";
+        version = "20170527.334";
         src = fetchFromGitHub {
           owner = "lucaswerkmeister";
           repo = "ceylon-mode";
-          rev = "e9b4a34dfe4fdeb4812d98e24b4b37a86d61717f";
-          sha256 = "0kwbv9qzl7ci4nfi229m9j0gklx9rsrb70a9ip9fcqfc4cc8sw8q";
+          rev = "2a53cef43915576f68deb9646e38d432334d7ee0";
+          sha256 = "01qfivq3rr1rrsh45xjmw2wbljw14jbsm72a0c1fnbj9v75q2xlh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
           sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4";
           name = "ceylon-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/ceylon-mode";
           license = lib.licenses.free;
@@ -7223,8 +7223,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "c2e7e2e97b594a8eb8bd7fbb48c825951fead8e0";
-          sha256 = "0kd3m47bcsz0vg92fqjryvy567aaaiipnyzm05klv7jb3v4hqn57";
+          rev = "1caec0c64d8fcf3b1e57192d1a6dff58e0a9ff87";
+          sha256 = "0w3l9awi76m4d4jscy3s50xfk56z4ym1qrihf9yansdqjzlzsi8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7263,7 +7263,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12203";
+          rev = "12213";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -8055,12 +8055,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20170509.1443";
+        version = "20170528.731";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "1e90e5a89d07bd1584e990c35f5a9d564334a1ae";
-          sha256 = "13pv21bk4khq97a7km7gpj8rmwkmcb1y1nk72w35b9kipxv76vg2";
+          rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
+          sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -8142,8 +8142,8 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "303849";
-          sha256 = "1m3h5kln4v2hcwc4ahzk356415iizcg8cmika8221qvqci4wj7bm";
+          rev = "304204";
+          sha256 = "1yvk57q2q4hg04lkvrnx79vgkw6j7hzlx3kvrq0xw93nr351adqv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -8352,8 +8352,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "d7888fd722e5bd69bf89ecc687bb19b7f65c60b6";
-          sha256 = "0pb7642y5nqgpg805y66cd0m1d26zynx6ixz43ff9iy4n1c7s9n5";
+          rev = "8904b7a9e21ea6319f8c37cf83a7200896bfae9c";
+          sha256 = "1bklsndfhg76a6y3vwbdcakmbrr2hnywjjfk2qaa3mbyxvmlqii3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8528,12 +8528,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170407.312";
+        version = "20170527.1442";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "2d67af4230657fb06f0df4453b9d21031b32c1db";
-          sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w";
+          rev = "6e966d57578bd1d30f2986b7aa8e222baa59a11c";
+          sha256 = "0l97zfa6vzb90w6592mydxvbppg126nyvd13m6w5b37bdm1ykj7v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8553,8 +8553,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "2d67af4230657fb06f0df4453b9d21031b32c1db";
-          sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w";
+          rev = "6e966d57578bd1d30f2986b7aa8e222baa59a11c";
+          sha256 = "0l97zfa6vzb90w6592mydxvbppg126nyvd13m6w5b37bdm1ykj7v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8784,8 +8784,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "bc2cfd7c98d6a238710504172f78321d099d0eaa";
-          sha256 = "06769g9ivldnm7qx36zlrckcy2gfc11wky26h1rdhdxfxy9jg0k2";
+          rev = "3ed14cb3ac03e7df53b9f9f987d5180e74dc2b64";
+          sha256 = "1c8ilgx713lkg2hlla5bgp6lm3g12l6viy0ddflcghh3ql744x4f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9259,12 +9259,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170524.2244";
+        version = "20170528.1653";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "a0667cc4943513d52f8e268e6003f02f2bf05227";
-          sha256 = "0fzxjx0x4hlwpv0y3hpi1sqj07r5zbm8gr76cw8g9rff1h46wic4";
+          rev = "2e229477acab33f4df54e3106ab3dc379df10f35";
+          sha256 = "00zhdmqfk50gilcan067ymc9n4wjw1ab3xyvv6v6q3s365wyh120";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9710,8 +9710,8 @@
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "561a7e9243669c1edf406472f85a2836ebfcec4c";
-          sha256 = "1gk7in9arz4dnkyysxl0wbigf7ssnr3qr4jzjca2c731n8sc566b";
+          rev = "eddb16e5ed9bd2945c57054b2c0054dee600b985";
+          sha256 = "18l442b2gnbgzn6x1qfdcfqn4ilh646fw694qam9g996vd0ncajb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -10311,8 +10311,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
-          sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10831,12 +10831,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170518.1425";
+        version = "20170526.203";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "859eb7844ac608fa48186ee124b2ca4ea7e98c6c";
-          sha256 = "0wg0ivfb354l8h3nj0178wzbkriik51cp8wvjn4c1q40w5lhdfbr";
+          rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+          sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10982,8 +10982,8 @@
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "cov";
-          rev = "74e8f32433eab6b31357642ad5a7ed79a3dfbd05";
-          sha256 = "100fk11fjj8wx8lm4ln4p4b6brxfgnkxq387v6ikyigr6lascmsw";
+          rev = "158d6bacb0986a27aa90a5b6dce81ae820b62cef";
+          sha256 = "1n510afmaprwlv6hck2kc9myvj9wsrspqyjzj5vql1y9c6w1xhsc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov";
@@ -11630,8 +11630,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "f021b2766d57d44d3f8d4b1c99ef5620f889bb79";
-          sha256 = "1z61km49c1a2hpfvr5i3c5xh3gfs4yrsnrf0mg5gvzd5ldf37jld";
+          rev = "290fb3c5101cf2957596cd21dfc8c04f6c441ca2";
+          sha256 = "0wxk1ylqn5zamjs6ksin4a2j3afgv3bygngb3sfvf6x061wyvzzr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11897,8 +11897,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "601f25ae776b0ee0dab70cd26a694e910f95465f";
-          sha256 = "0njfaqmfs0v1dw27r77c3z38nqk5jga4vpdwhavrfybxsxb2gqrl";
+          rev = "1b7a91a2c2aea7d3a25e8f0bf3689b106d673201";
+          sha256 = "0msv987niax3sid3krj791p780lm9kb2v83gd4f8g5y29if930dm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12229,12 +12229,12 @@
     darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20170401.1521";
+        version = "20170528.2201";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555";
-          sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc";
+          rev = "e5e2433fccb225b347c84c3bba5e3ed9769c2922";
+          sha256 = "0l3clqy9zrd8xbaacx7ck8kw1x6rl1b9vd5ss57wnqpsdz25nggi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12250,12 +12250,12 @@
     dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dart-mode";
-        version = "20170519.1742";
+        version = "20170525.1236";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "dart-mode";
-          rev = "1c9da5a7fdbdb703f7dffc9da81abef010e897e4";
-          sha256 = "1fs6am7sshxgc78sslmg93z030q0kpc45r84p49l6l824maaxgnw";
+          rev = "9b11e8fb63549ee3700fb53e92e4ce2cb302c971";
+          sha256 = "1cp0qmnhnp57vihn343jz14kxm1rwn5b004q9yjlbv1am389rr12";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
@@ -12834,12 +12834,12 @@
     demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "demangle-mode";
-        version = "20170311.1148";
+        version = "20170526.1508";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "demangle-mode";
-          rev = "19716fbc60851192aae6b4d4aaad5dcc1c88627a";
-          sha256 = "0wmaf4278479zs2vic837ss1p99n7fhygcpcmy80i28fbfyskr6p";
+          rev = "d3fce31974b1c9f659da427f3c69c2e6168df508";
+          sha256 = "0k4pacjjgxagsa8kgzvynvmvczhbb73waq3l6gld7v3h38js163a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -14738,12 +14738,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170519.759";
+        version = "20170528.1204";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "eeb9247249e86a75a32dec7ccd865e9ee734613a";
-          sha256 = "029hr90hv7cvmbdmx7i5mdzsqplfid15ipmxshn8fk914hn1wpa2";
+          rev = "71ca3f2910f2d857cea50f84a8cd27894aef848f";
+          sha256 = "1f4c3nf0psn6si13a7044z06mhj416hzqjgiyypxcwqx9mgbryhn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -15173,7 +15173,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1796143";
+          rev = "1796835";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15651,12 +15651,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170524.208";
+        version = "20170529.2039";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "89cdb14784e9e5c68f6cf26b6328befb338fedab";
-          sha256 = "03xm7p9md8g7yqyrnmiawkgllbivf20kaiq2pj4kfq8cq1wikwim";
+          rev = "1aee9432aa99286410611c59c6317c3f97a66481";
+          sha256 = "0l05hg1fwjxknvv2rcz145disyxy9yr98lfd0nd1rhjgwhwyv2wh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -17304,12 +17304,12 @@
     elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "elisp-refs";
-        version = "20161205.444";
+        version = "20170528.1223";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refs.el";
-          rev = "54b6221a06a32075d1d0c991f75f53c6c792830e";
-          sha256 = "1xzm86l37fjiknqbsdv14n70mgaw0105i55fbl4rf0p9q4nircmv";
+          rev = "8f2da5ba5b728a8f278813c95d0fda3364cca40c";
+          sha256 = "0i0xjy4x3i349jbpbqhfz57frk8cdakwi78fw1mlycx4qinlx2n0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -17409,12 +17409,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20170322.1347";
+        version = "20170527.1917";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "3d36c16bbe1cebc285341452a60da578afbb2804";
-          sha256 = "1aywgkf5505hx7qd0r4b8k89xmskkrz9imlmhp6xnwj31qs7ix63";
+          rev = "2edb123372624222e3510b5ce9b59c5e20a55a3e";
+          sha256 = "1yc3xbfx3ly6r5hicn4qm4rp27x6j4nm41cc0m7cshl7fdf83wzi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17668,12 +17668,12 @@
     elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elquery";
-        version = "20170522.1934";
+        version = "20170527.1930";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "elquery";
-          rev = "b0bfc066c072c18797183f1d65b085f7b409fb5c";
-          sha256 = "1dkr4xhhx2wvzsyl58f834025n4b9jw4n70nm87ypb1xkds7vm84";
+          rev = "d4309cfebb275495f071fc3449261bf6b23b0afe";
+          sha256 = "12qv4fg9dbgl6c05r501va9dcw16ml0yxkmvs32cr7wfffhxjy4w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery";
@@ -18506,12 +18506,12 @@
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20170401.954";
+        version = "20170528.147";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "4f365dc562c8c5642719faf85b7536278c561d2e";
-          sha256 = "0j3ydg2n6dq77qpyhyqdkbxhfhzmml5b5h8cghsx0i5267grssph";
+          rev = "033e3b2fa171d73b932ecf27df237be2fd6e1c36";
+          sha256 = "0x8ydqzacrps0kl3j50ajp8fwxg8vnggvjpjbnrglkpwwn2j1kzr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18728,12 +18728,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170522.2359";
+        version = "20170530.354";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "b40cd66ac44d597fdb70fe539f42112f445fd49c";
-          sha256 = "19wxprvr85qvq48w67njfflgyvb4snsh573zdmcb1fdq3pmqxdn9";
+          rev = "cccdd2f7caa9b5357f8021098e63384b4cae381c";
+          sha256 = "0fhzlawd2nq14a0b8yx6lnmmklh2s9y5i23nwz8zmwmxxivffn3z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19260,12 +19260,12 @@
     ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }:
     melpaBuild {
         pname = "ereader";
-        version = "20170508.2149";
+        version = "20170529.1408";
         src = fetchFromGitHub {
           owner = "bddean";
           repo = "emacs-ereader";
-          rev = "258807f77b203963dbc855c5e34da3d7f2751abc";
-          sha256 = "0wnl7vfxgvz4qp3lpx48wl1mni1alkawm460nvivsr02dgmriwaa";
+          rev = "ef3cd7b9ced044bbd9a3e7cce0c78a970a483288";
+          sha256 = "0n0n7600zwa9z8srafq0gp6d17lkr4pkrsql50rl2qa1fr44zi7z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader";
@@ -19369,8 +19369,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "0ab4a336d0935c47b26cceb202ab63344c03b8a2";
-          sha256 = "1vjrz6c3a7zbadbh6a5kd2w5fc1fk94l26hvzgxil02021f5sys9";
+          rev = "b182febe36aa63eb8290f24ba4b7932673a9a9bc";
+          sha256 = "0p45lcfm4qxzfrcw2pw53m19swgx1m1805v7vdgdkcm63qbdjalj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -20326,12 +20326,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170521.1211";
+        version = "20170528.1105";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "6770774609373af2fc9e480f3a906a1d1c5becb0";
-          sha256 = "05ldm0cvw79c4pypw1rzhjvykh4c1z8acg7hf3y9hqx5662f5qkn";
+          rev = "00ab2876f2849c3be9f5d7475e4538a0ffecf872";
+          sha256 = "06idkqrbh96vp6nb2835g4cgxdcxhp3nm7am46r5ylvgmflw9jf6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20683,12 +20683,12 @@
     evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-goggles";
-        version = "20170508.1509";
+        version = "20170529.2251";
         src = fetchFromGitHub {
           owner = "edkolev";
           repo = "evil-goggles";
-          rev = "cb295a7f6882f7b885886aca8bb88ce119973f40";
-          sha256 = "0w04plip3kf1kzky4528550jvlwbp965p41697fr7kwsc7ipymx4";
+          rev = "d2dfe823d5b1b70e4ed47518db98b238ff67b81a";
+          sha256 = "08hffzamrg3d8fqq94z7p9pywkzckhv6a58x7s1x7z8qvg2irlkz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -20914,12 +20914,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20170523.1902";
+        version = "20170526.1158";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "ad72fa5743e8d9e638c6836deba122b2daaaac0d";
-          sha256 = "165vp7a3v0fin9py7i7jdyp7x3jvdmik3vvxsgczgyqgrkqlvcml";
+          rev = "506f92dc610906fc279e50c598efe2068161edaa";
+          sha256 = "0ng2l70zllkvjsq2ybgdcdzyg0brplaznxr2y3qmbk72vgs3wxra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -21061,12 +21061,12 @@
     evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "evil-org";
-        version = "20170514.755";
+        version = "20170528.1654";
         src = fetchFromGitHub {
           owner = "Somelauw";
           repo = "evil-org-mode";
-          rev = "25d159750fe90b9b42e2edf6390752e18b80e021";
-          sha256 = "028bnvbmbxj47nhf8a2whf64jr1kzni8mszabsb11i6y7gs6w344";
+          rev = "7cd1903419b9681993210723fc854bd43ca080e5";
+          sha256 = "14jfvk7y102ba7ky8qanhpg46i6if3narshixlbnsb2jd26dyvh6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21774,12 +21774,12 @@
     exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170524.2329";
+        version = "20170528.2210";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "02e108cb8942d44b0ce241baf87f54f8a61a3b32";
-          sha256 = "01cr6nhmma2yxpdvfzb7ms6sswhvppziy0aj5fz50pvqrlf3xjv1";
+          rev = "9f71ca70942724e7a0c0ec2723963961ed0980c8";
+          sha256 = "13dpqm1b58ivlb17nbsb0rxg5bm52r64y4x0k0pajqfyig2krsrd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -23545,12 +23545,12 @@
     flycheck-credo = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-credo";
-        version = "20161121.2201";
+        version = "20170526.845";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "flycheck-credo";
-          rev = "f773422c356c1c3b39fcece3cb7cc1257c7df517";
-          sha256 = "0cq6lap4gndm801lj1q1wajpb03vz40hsdimr1n02p2k2dkrz8p3";
+          rev = "e88f11ead53805c361ec7706e44c3dfee1daa19f";
+          sha256 = "04i7fbqpkjpsfa8vjpkdhg1sj5isczxwncdp4vr9x3vll3svblm7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88dfffe034135cc46d661f8173e8b14e0fb7f240/recipes/flycheck-credo";
@@ -24368,8 +24368,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
-          sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -25351,12 +25351,12 @@
     flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "flyspell-popup";
-        version = "20150926.803";
+        version = "20170529.115";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "flyspell-popup";
-          rev = "f31d89ec60364ee24f89c90e9acc110bd86ea67f";
-          sha256 = "1rdpggnw9mz3qr4kp5gh9nvwncivj446vdhpc04d4jgrl568bhqb";
+          rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde";
+          sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup";
@@ -25811,12 +25811,12 @@
     forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forth-mode";
-        version = "20170516.2235";
+        version = "20170527.1230";
         src = fetchFromGitHub {
           owner = "larsbrinkhoff";
           repo = "forth-mode";
-          rev = "37da49757293baeca1180bb689aea181a4da81c2";
-          sha256 = "1bqgyygdj5v78gsh3g7085719a45fblw3i9wkbljdrjmjpq006gw";
+          rev = "522256d98d1a909983bcfd3ae20c65226d5929b6";
+          sha256 = "110ycl8zkimy2818rhp3hk3mn2y25m695shdsy6dwxnrv90agss6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
@@ -26171,12 +26171,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170523.1755";
+        version = "20170529.2340";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "913857661425f8662ea4b6b734e39beb8743ef37";
-          sha256 = "04q3jrqb3ivmbi3cq037fd81gpgc7nrhi13fhp83q7vl0piif621";
+          rev = "75444875c86fdf33b1604b26100cf5399d6aec86";
+          sha256 = "0a8nb947xab72pcahjz11jilnzasldi0ywcaxwviv6z6k92j8k62";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26203,8 +26203,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "72e6699279ac7ce2499405d64d524530789c8f58";
-          sha256 = "0pdvqi7z9fkpg11dd376344d1p0wpz1yag5604dys32y90fpqs0w";
+          rev = "5b1198e20cc5b7e748835040bd5331b4618c419f";
+          sha256 = "0gyy77zm8mfx4krrdzdpivmzrfx3kp89sw7wipqpx6g4a4ji6pgz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26329,8 +26329,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "1e757116f2f1462fe429b8a058b351af12cf37eb";
-          sha256 = "123d5q6c4gpgb2bmng1d7jzbhbac0l7vfln1hk46x42gd23p2r7c";
+          rev = "6a06fd8ce22d945edf6eb777d6b82f8859c5189f";
+          sha256 = "1jglv0f1lw5wf7xc9hmbgdbfn465qymp53wmy93k43k0zhg9nzpi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26489,12 +26489,12 @@
     fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fzf";
-        version = "20161226.936";
+        version = "20170527.2120";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "fzf.el";
-          rev = "779254fe1ec7a0c9110af36fd039cece3040a312";
-          sha256 = "1p0k71vz9v8vx5h85ph1krb9v0jyhmq73h91ws9zcxpf1bdgy050";
+          rev = "8d75f98cf904c3ab62e8cc54f2b8701c215620d7";
+          sha256 = "1rr0d937j078xyhlx5i305l5wavd3fcmvfqmdnbfwah8mfnp4kip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -26676,12 +26676,12 @@
     general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "general";
-        version = "20170328.954";
+        version = "20170528.336";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "fa0e6e2d2a9c06671fd44b5d938ea24387654525";
-          sha256 = "0wnh24jnnf0kl291l36hykx86nrn74kqwxlwzd2llydbhk07sq8s";
+          rev = "a8470934373b2bdd67f38e46e1dd4fb963cee31b";
+          sha256 = "17hg6iw3dz1ssxvz1zm8c90927a2sf22yv31g2y7n98jnpq622bs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26844,12 +26844,12 @@
     ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ghc";
-        version = "20160808.813";
+        version = "20170526.44";
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "e2490a1cf076ed0340f01e68e7962d65305f94f5";
-          sha256 = "19bb7xrciqlrhjwdllq08wmsnkhvgnfc3q1kifgflxxs9c40fvxk";
+          rev = "8bfd542ad210debd00a0be9f15b21c90043b15d4";
+          sha256 = "04vjp5m25yyxhdzwc50g0qcggzhg1rs4kyj7d0ax0blfnqzggf2c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27163,8 +27163,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "cb891c3678c8ce2cc6919f5043d712a9439719a3";
-          sha256 = "0n0i8880lc3pl7f05640xhjamvchdlif8l4gdcip7nvan1l1mbyp";
+          rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
+          sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28610,8 +28610,8 @@
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "cb00e5669539f047b2f4c53a421a01b0c8e172c6";
-          sha256 = "1wav8y5yps407znh0wspvcripbp2xjigqhzhgbv0adqsm9nyn70p";
+          rev = "a5f4a247366d8fc436941822e14fc3eac7727015";
+          sha256 = "0fixw5j4ypzaj5jni7d1pak8g0wv3c9h267x3nkyjdwwwqrxkwi0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -28673,8 +28673,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "c212f99186958f25d3d20994144ea11df923da79";
-          sha256 = "1lhld1y3zxcj30fwjydiza4kfjpd2z1nc88kk7jkgzz670yk8qi4";
+          rev = "142b0e64babdb0066d2ffebfedb3c886fe75c680";
+          sha256 = "0vccg70zf0c7xx6acffrdvhvvih95fcgxq9dw4bsax46p2pffc6q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -28923,8 +28923,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "8bff8355d10c46dcac74d3d64b2d38740f9e3dcd";
-          sha256 = "1rjq72rsxwkk4ak657rh3f0lkqlpwxc5md55i77yi0l28rh3gsiq";
+          rev = "67b13b52bd135469ede5b0caa4b1f79e19d228d0";
+          sha256 = "15mpcp8pyg22d9a81nxv7zbwiqipvz7xfllkrrwn9ggb0vp3bj2q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29049,8 +29049,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "be04a75f5b074a57978d006378db8f020fc5a891";
-          sha256 = "0cn7rzm611cygl40p2g0n7ynl0cyp4f6dy8b29v051wrds5qg3z2";
+          rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2";
+          sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29430,12 +29430,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170522.2244";
+        version = "20170529.46";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "be04a75f5b074a57978d006378db8f020fc5a891";
-          sha256 = "0cn7rzm611cygl40p2g0n7ynl0cyp4f6dy8b29v051wrds5qg3z2";
+          rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2";
+          sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29766,12 +29766,12 @@
     hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hack-time-mode";
-        version = "20170520.307";
+        version = "20170527.910";
         src = fetchFromGitLab {
           owner = "marcowahl";
           repo = "hack-time-mode";
-          rev = "8640a3b8eff72b869cf56941ba1b3104b01d25fc";
-          sha256 = "04cp8sls5ci3nz5478gfyg8bzh7d5sn08z2rg93jfrax81dkvfx6";
+          rev = "73d6fcf8b39283526e5d4e3919193611e25a0898";
+          sha256 = "1w0idf28fhyn0qmjk1zgh80gzcrkgx5bc8mb0xamc20i53wpr4xl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
@@ -30144,12 +30144,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170519.1555";
+        version = "20170526.2107";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "5b9a3e3688ff9f53eef190407568e851549b8c98";
-          sha256 = "0yal4nsys37j55vrmdqjzzjcvzgmm2ri2dhyimp44dwq5c3ngyqv";
+          rev = "b0a5743f349e5e5b812291b5b06095aee1456656";
+          sha256 = "0ms4jf9zj2svyyh0rqbdbkx4rjll4rla7x5lzyiki7z27pf3c7df";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30413,12 +30413,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170524.2011";
+        version = "20170527.2302";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "da5a3396f82d6d0c32b4900beaf57893787a95f2";
-          sha256 = "1m82wmq997l94yaglclkmh87dln0i9x2wy3m2cp72plkpa39awdp";
+          rev = "3396747e847a355b9cfbf7df1e851c507bd96381";
+          sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31001,12 +31001,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170525.14";
+        version = "20170526.36";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "da5a3396f82d6d0c32b4900beaf57893787a95f2";
-          sha256 = "1m82wmq997l94yaglclkmh87dln0i9x2wy3m2cp72plkpa39awdp";
+          rev = "3396747e847a355b9cfbf7df1e851c507bd96381";
+          sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -32789,8 +32789,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
-          sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -34456,12 +34456,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170520.812";
+        version = "20170525.748";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "8da51cf3cfd2ca87e8f767ad2fd28653c8ca260a";
-          sha256 = "00685wld620bc149b6vz7kp9igb7va3m4ms5ml89gj9y40i70544";
+          rev = "6dacb781f48bc818286d8a63bcb23a93991ed292";
+          sha256 = "0vgmms7z5rfhjjh2gszyaqdnfhx585mlmn8mp54rrz9zbnqy5qnd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35960,12 +35960,12 @@
     iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "iflipb";
-        version = "20170205.200";
+        version = "20170527.839";
         src = fetchFromGitHub {
           owner = "jrosdahl";
           repo = "iflipb";
-          rev = "8eb478535aa4847b94ea4ce29d9476a6b652be2b";
-          sha256 = "0plvjg1nkq37mpdbli2fyqhvabzi18mq5kjrgxk9d6s6ki2m26kq";
+          rev = "e19229473be70e55c56a26ccc26c4e11e8be6389";
+          sha256 = "1ybnxl6zgzhxrwsqf54hz235xhz3rmxy7w459salb7rr2s1fqvlz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
@@ -37361,10 +37361,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20170518.1419";
+        version = "20170529.1907";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "19pnnf3z2c0m3qma7xi27z0fnpxqdrkrwvwnnd0bv2n3k63rsj8f";
+          sha256 = "1lg8gciy9i44y80v9g2h5q8mg6dhi6abx2ssg6jws3nci0y5c0bl";
           name = "isearch+.el";
         };
         recipeFile = fetchurl {
@@ -37593,8 +37593,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "859eb7844ac608fa48186ee124b2ca4ea7e98c6c";
-          sha256 = "0wg0ivfb354l8h3nj0178wzbkriik51cp8wvjn4c1q40w5lhdfbr";
+          rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+          sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37698,8 +37698,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "859eb7844ac608fa48186ee124b2ca4ea7e98c6c";
-          sha256 = "0wg0ivfb354l8h3nj0178wzbkriik51cp8wvjn4c1q40w5lhdfbr";
+          rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+          sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37782,8 +37782,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
-          sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38347,8 +38347,8 @@
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "5b0bcf6db09d6f6d4ec68c1f3d748d91f189b5ea";
-          sha256 = "1vq4x1kvwbynb7kb6mq03939dqg3jjj6jkhkl8jjc6lk3rz7fj29";
+          rev = "e572d4889604c0b4e1d9180b8a68f9c0f99b99d2";
+          sha256 = "1vhwza7xak2im2xp7qzs8b6bmnf9yw2di86rav8wh5xapqr8x7mn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38866,12 +38866,12 @@
     js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
     melpaBuild {
         pname = "js2-refactor";
-        version = "20170522.455";
+        version = "20170525.544";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "c2849d8e5c132126ca7cc8aa547c484513c19579";
-          sha256 = "0aycbr4s6p8b22vmmpbmj0v63m74a64dka82vpg1iqf4x1xczb3p";
+          rev = "6ee315825b6f0424f15a8520733dc145c85ccd83";
+          sha256 = "14ykvbj5f9w5pk8l73k8niwr62slfx956px35zn51563sjs55gnd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -39408,12 +39408,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170524.303";
+        version = "20170529.1516";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "16fde8b16e1ce0c42b9c9937bfa278b2233544ac";
-          sha256 = "1cs6zfi4h6f38vbrswz3kj17m56dw4dg7hbqbvahqwzzxknrmbl0";
+          rev = "4b3dab02562eeadfb67ea07bc9f2c9d7b6be2d44";
+          sha256 = "1gqfpg2agf2ln8ca3qp14rwmh1blxrfwm1aai2n7bv2maz3b1lz9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39916,8 +39916,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "b47d519a9a160489e85fe7ac9a44e926aca35a64";
-          sha256 = "0b0f1614d2wsscngrzpyyqhi2dcnmlzybi4wqri060mh24xgizgf";
+          rev = "b7906e7456383c39555cd988f410043dbcca47a1";
+          sha256 = "1ifzx2z48l1g1livnmhngnaf875fgnnmv1p79j2w10xjwkasvff4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40686,12 +40686,12 @@
     ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170423.1748";
+        version = "20170529.647";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "348ba97b960d045bccbd9cb5a63697704c401315";
-          sha256 = "0qcjdvzis6ws8z0laixakik26djjmcv021dbz00pjrwkcwfs5nwi";
+          rev = "7a987a57317272e9ffc1f7e8bb82045a2f4566f8";
+          sha256 = "0jazqm4cb4sai9qbb0pwnpql0x6s2w6mfwk32kzm7fn9iplih8rl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -40942,8 +40942,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "9cf7d7558d5a492587cfd0720e270f3f95efe379";
-          sha256 = "1vh275mv950l4sapdk2kppr6934b8prjv486zvd6hy40898g4wlk";
+          rev = "c6422663ab03a3d8e9bee6413890d0fe93bc9556";
+          sha256 = "0lx5lxlql9pxgjqidb2k850i36qgx97jx15b24vv2s2l9f1skrw2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41592,12 +41592,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170524.2216";
+        version = "20170528.2030";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "6f4a6be975e4c1fb14ad3c15bcb2c851b03fcad0";
-          sha256 = "04wgikflpbl98lyw51f48lkaswv7i8r32yzlwygy6524zs96n8yi";
+          rev = "5a04d426b33566027fdf5fd3090dfd315fda7314";
+          sha256 = "073cqwy2iw9ynrdbb8r9n4rnkk9j8zba91872sx2gyp47xkq6pjk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -41696,12 +41696,12 @@
     load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "load-relative";
-        version = "20170524.2323";
+        version = "20170526.310";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-load-relative";
-          rev = "d6b4b9f3797214213ec152c073f923677959a26d";
-          sha256 = "0rcy1abw479i9jjv52z09l58vsphd1yx9gxi52abdfybf85sz1mw";
+          rev = "738896e3da491b35399178ed2c6bc92cc728d119";
+          sha256 = "1rpy5mfncncl6gqgg53d3g25g1700g4b9bivd4c0cfcv5dbxhp73";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative";
@@ -42470,12 +42470,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170522.1835";
+        version = "20170528.740";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "cb891c3678c8ce2cc6919f5043d712a9439719a3";
-          sha256 = "0n0i8880lc3pl7f05640xhjamvchdlif8l4gdcip7nvan1l1mbyp";
+          rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
+          sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42670,8 +42670,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "cb891c3678c8ce2cc6919f5043d712a9439719a3";
-          sha256 = "0n0i8880lc3pl7f05640xhjamvchdlif8l4gdcip7nvan1l1mbyp";
+          rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
+          sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43275,12 +43275,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170525.435";
+        version = "20170526.1213";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "cf0438d9a9f59344d7c43265160dc69f3e2ca5ed";
-          sha256 = "00jp16sclpf2yi4asab1rm09skb1szrjga0wb91g9vq1qn01sr3s";
+          rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9";
+          sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -43846,12 +43846,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170522.908";
+        version = "20170525.2333";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "b12faec5b6698852be441efdf86ac0ff30b03f07";
-          sha256 = "0y9d0cvv5rdhcbsik3vilp6j1mgmnlwjpcvbhibgw4mfzaxcqz4k";
+          rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76";
+          sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -45195,12 +45195,12 @@
     monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-alt-theme";
-        version = "20170325.1430";
+        version = "20170529.1607";
         src = fetchFromGitHub {
           owner = "dawidof";
           repo = "emacs-monokai-theme";
-          rev = "584aaf88b83a40bbbfeb6a7c89c5feecebf5a52b";
-          sha256 = "1709f2gf8gdz5ppb0k3gxcg4z0r7kgcm2hpymji9gnag87nnx1m6";
+          rev = "09370802ddf6010a9a83b6c38cfc055e31433a73";
+          sha256 = "1dn8z2lj8kvgs0vxiiqm0wz73sgqykkbi32d6f7qa6i4ishyw341";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme";
@@ -45695,12 +45695,12 @@
     msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "msvc";
-        version = "20161221.558";
+        version = "20170528.2256";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "msvc";
-          rev = "71c38323187c98b32250b89088768599bb216ddb";
-          sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg";
+          rev = "ffc7974f1cafb5e03bae2765afc6a984ffcb0f7e";
+          sha256 = "155bgayysdyr5a9wpx78azpipd11s3k8ijgw4mpvbmkk5j7fi6a8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -46903,12 +46903,12 @@
     neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neon-mode";
-        version = "20170524.452";
+        version = "20170529.637";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "neon-mode";
-          rev = "2a48a3b62a1082be2a68458b229be6d4f590be74";
-          sha256 = "1mr2j39mp7vkjxvx0r2cggs73apbzr9ingwg2gwa47i3jbxnr8l0";
+          rev = "69edc4b051604143db8e044606bbcc0904a3829c";
+          sha256 = "09753w4psyzh583264nswk9313d9yh5s4aad3jc9qq5mg6ycb6iy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@@ -47243,8 +47243,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "a7e55151a8d45d987ca42ba318c44ed3ccdeecca";
-          sha256 = "0qnnc8wbh55j2mpnywvj22ajcqfcdfismxbgkix45hq4nm5lkb1j";
+          rev = "6e01ecd112dce8d8bbe46c839f982892a3ffb589";
+          sha256 = "1gxsp2xf8lcqwk0f842g9cimc6k12cpf0m4rs0qv3v3mqqic985n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47551,11 +47551,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170513.451";
+        version = "20170530.454";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "523d2b50fcaae90cbe09975c1f1bc652ff521ec6";
-          sha256 = "16srxq78phsd4bq4xqhz6jv70i4870b6r9rcgl5r332pmpx9anjk";
+          rev = "51cf6dbab220ca0f7c9f7472280adf02189ba437";
+          sha256 = "1ixdrg3ak0x8rnkckz392s91dhssrsh9hcg30606fhjd9nk811a5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47734,6 +47734,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nubox";
+        version = "20170528.109";
+        src = fetchFromGitHub {
+          owner = "martijnat";
+          repo = "nubox";
+          rev = "2ef0281511aa29347d79575449c3f44f91fd0f97";
+          sha256 = "0idd2sg68x02ishcziigkr5izvdrda5ra3imqgb1ilgfh6kgfqjw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox";
+          sha256 = "0snzfsd765i363ykdhqkn65lqy97c79d20lalszrwcl2snm96n1f";
+          name = "nubox";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/nubox";
+          license = lib.licenses.free;
+        };
+      }) {};
     number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "number";
@@ -49611,12 +49632,12 @@
     org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-caldav";
-        version = "20170520.1550";
+        version = "20170529.1205";
         src = fetchFromGitHub {
           owner = "dengste";
           repo = "org-caldav";
-          rev = "c492f4434a6c93c97d9b0baae2f18c038a1e99ca";
-          sha256 = "1p7bjy4r0nqp3nnwhb23xsh8kbyp7g2kw8mcfn6y7abiwr7gmvcc";
+          rev = "4a618a03ef4a0c95d4f8ffe1c92e986c12a53416";
+          sha256 = "0sgwq7zwgr2khhyvf0a1b5fl616h8x05bd2bmm6437ih3fcx8mjy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav";
@@ -50052,12 +50073,12 @@
     org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }:
     melpaBuild {
         pname = "org-evil";
-        version = "20161029.222";
+        version = "20170529.741";
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
           repo = "org-evil";
-          rev = "5349f4f50d8b16ac4d38ef70a2a7562632e193cc";
-          sha256 = "112rr4cwldwnwhg0qdq6khfl41azxp0c4j5l4il06560s6h7dmjq";
+          rev = "6c98be7488fb0dc7cea8f88af6e432edb43e0e32";
+          sha256 = "0jlaspk11l0g8mqbwqiarn7ada1zgnxg9i68xgrjzhxmv1nw9mq5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
@@ -50219,12 +50240,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "20170416.2152";
+        version = "20170527.2154";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "2ec35547088c090ae1ad71bbc943953f619611e6";
-          sha256 = "1zfam31pjm8sg3j038vvd1jf3qi9jq3452vriqmzczbjfg3b7l7y";
+          rev = "4d8bda9b5207175ecd3ae647ebec42b3546efd49";
+          sha256 = "0877klmy48ad0rpy7azd4xbm9d07wrhr3g96sixx35wgp216kvlm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -50300,6 +50321,46 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mac-iCal";
+        version = "20140107.519";
+        src = fetchgit {
+          url = "git://orgmode.org/org-mode.git";
+          rev = "496b2a9855fe514b186890a1f883411ee566d294";
+          sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
+          sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
+          name = "org-mac-iCal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/org-mac-iCal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mac-link";
+        version = "20170105.1723";
+        src = fetchgit {
+          url = "git://orgmode.org/org-mode.git";
+          rev = "496b2a9855fe514b186890a1f883411ee566d294";
+          sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
+          sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
+          name = "org-mac-link";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/org-mac-link";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
@@ -50480,11 +50541,11 @@
     org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-parser";
-        version = "20170516.2055";
+        version = "20170528.1324";
         src = fetchhg {
           url = "https://bitbucket.com/zck/org-parser.el";
-          rev = "e46ab80dabac";
-          sha256 = "1vw6vr4h82sk6fgfyfs7lw3jdcsz987hwxzgs023m3v6rx6bkk5c";
+          rev = "c4870192ea24";
+          sha256 = "04s39zfa1gwn6zclgdhz3b9fbgyqlbysh6hsn7iqkwfzkpmc2n9c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -50733,15 +50794,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
+    org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170523.1821";
+        version = "20170526.1519";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "be4d43571e2d467795dae994b06d6c25ea6a4358";
-          sha256 = "0kjs56w3fw59y4mvbishkxw5k9bg9fhgq7h0nph3qq2wbnxvqqlh";
+          rev = "d61770adfbc39dd8544db3a96724089d5bd6ded3";
+          sha256 = "16anl4ls66xm7vbcziwisg41jwzcd4cphxvrxv83vw52w24gqf1r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50757,6 +50818,7 @@
           hydra
           ivy
           key-chord
+          pdf-tools
           s
         ];
         meta = {
@@ -51905,8 +51967,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "05bcb4eed383dc011f01c1d37afaa5869914e8c6";
-          sha256 = "1sry1x3y2sb4ly7nvg78zdc67xf032f1w4640zdkaa50ywg0gkfb";
+          rev = "feaa96ff995237270f0ed0af861f59b544e484c9";
+          sha256 = "05idkkvnjrsfbrg0dhcvagsgbybvlqyiqnng5z6abqwbsp344hv2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -53991,6 +54053,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pfuture";
+        version = "20170529.813";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "pfuture";
+          rev = "f6728c808ba96b19718ff4e15ac5173bf848b21d";
+          sha256 = "10v5rc1kcv3rd6mqksqc8bcc6w0w20fcz77fvgq0hxl88ng6vi4q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
+          sha256 = "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s";
+          name = "pfuture";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pfuture";
+          license = lib.licenses.free;
+        };
+      }) {};
     pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pg";
@@ -54897,12 +54980,12 @@
     plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plan9-theme";
-        version = "20170520.1827";
+        version = "20170529.2212";
         src = fetchFromGitHub {
           owner = "john2x";
           repo = "plan9-theme.el";
-          rev = "111886d6eae152e102ad0ff6a859aad0b2026ec7";
-          sha256 = "190hk15j96fb5ab82j0r0p63skyj3k2ndzrnidzddh1bknyv6nqd";
+          rev = "cdc50195f6579e6c3e6e8060142ce25b609f7949";
+          sha256 = "17grr5rvazh448qzrksxrgp0yclp32s2rxs4h5pygky7knb5vf3v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme";
@@ -56750,12 +56833,12 @@
     protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protobuf-mode";
-        version = "20160805.1045";
+        version = "20170526.950";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "0b07d7eb9e15d897bfd3f3d569e0a66b2bb48d18";
-          sha256 = "05ll1g420qg8414k9pxsgv7m0si5ksr2cva2455z9x8mbs53jyha";
+          rev = "1e86ef4e9f0b9c9e8bd8d62a61e141f139366920";
+          sha256 = "1cf87jxq8r56nxp4h9ig3q489lj7bb35wkasrw2yi48q9j445bw8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57012,12 +57095,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170421.2255";
+        version = "20170528.904";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "e704bc790a96f5f3703b2c56e5a1b15bc4446937";
-          sha256 = "07dcrpkyf3b2kpdgfxir3mvm1c5rs2zdbgv9ajkn9y0b9zvp0cm8";
+          rev = "c5a0fc884d0f33c3140585c9c7699ce0bc969f63";
+          sha256 = "0s9nza9v1qpjip5zig3374bn5jqw8fsn57ayqymbnp70nxdwcw6n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -57518,8 +57601,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "f515f28601e6ac2409d098affb913ed758d87a16";
-          sha256 = "10xhvpnlcmr61h3j549ipy9ifxl3acvkcfcvrfyqyf2s5sak6sx8";
+          rev = "6f2b4ccf5542be7243db1b679c6f52e2e4acf504";
+          sha256 = "0966c47nja1mav4qixj9xr0529pxqqrh7j4vb9jk8l3hdky99vw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -59965,12 +60048,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "20170522.1050";
+        version = "20170527.806";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "b55c4b380732d5186830dc03da0ab1c3a6ca105e";
-          sha256 = "1fccb6p0w64vjmbgizysgnck1w2l6ym3xlrngzj1zc34rkbprbi4";
+          rev = "6069dafb4a71b8d8b6c8787d2b68f4745e0c9cae";
+          sha256 = "09xdpzp2yviqnxc7m2l1zy4rkyp1m8sdwyvsbbdqiiwa8pjg9gvf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -60364,12 +60447,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170523.711";
+        version = "20170527.450";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
-          sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -60430,8 +60513,8 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58887";
-          sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
+          rev = "58969";
+          sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
@@ -60511,8 +60594,8 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58887";
-          sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
+          rev = "58969";
+          sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric";
@@ -60948,12 +61031,12 @@
     salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
     melpaBuild {
         pname = "salt-mode";
-        version = "20170515.1320";
+        version = "20170526.1702";
         src = fetchFromGitHub {
           owner = "glynnforrest";
           repo = "salt-mode";
-          rev = "e6944cb4caf6c95509ac9774c634067635767f97";
-          sha256 = "1fpypvgyf5vsqqz73v43ivi57jrxvd7pnr20w1lzp41gx15npk3q";
+          rev = "6f5776ab411aa62668e774c5cf2aaff22cae5401";
+          sha256 = "05fla50f9dmp3wb4wr8wx5j2mhfarsq50sbr0yi29kabyn3va9ig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -61137,12 +61220,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170517.631";
+        version = "20170530.355";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "b85b4fd6802af62971d4f6ccef7811670af8c7fa";
-          sha256 = "0d43737qs7v1nbr7xyj29v0yp5j257filbkvvbaszlhps4wgxk34";
+          rev = "736da7f466aad2b64c846ece258082c6aac647ae";
+          sha256 = "0idj4p3d36yp0irp1yfbihq8mf17jc7facz5qy6kx7zj0wdx4fjw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -61162,8 +61245,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "6ba775b4d5f1ffee8aca0e4f453ceeb52f834897";
-          sha256 = "0cq6mign7q7dmsmj5bfyvgnca6szx70wv3bfxsxwicf35sx2rvx8";
+          rev = "d1e295137589b5285e26c962d648f53c081bb972";
+          sha256 = "17y7db32836gj97k85hk8acvd0xvrdck3hb9j1qxmdzf16lmagfi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -61200,12 +61283,12 @@
     scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scala-mode";
-        version = "20170323.502";
+        version = "20170530.356";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "970d88eeff82df635ee12336ab1eb185585f30c6";
-          sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90";
+          rev = "52091426ee319b4ec53799696bae75571f7ecbf6";
+          sha256 = "15vr1yz23h0kb7h3d6gh3ljax762666lkz53chqgm54bszgfwjcm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -62743,12 +62826,12 @@
     shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
     melpaBuild {
         pname = "shr-tag-pre-highlight";
-        version = "20170520.1021";
+        version = "20170525.902";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "shr-tag-pre-highlight.el";
-          rev = "02ea683e2ae9f59a20f74cc59e98b3ff2301ac71";
-          sha256 = "1j0ampyjfns20a2dk8zhvbwbn8d9az1ma9c9app9pfzvhmffw621";
+          rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889";
+          sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
@@ -62803,6 +62886,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shx";
+        version = "20170529.2012";
+        src = fetchFromGitHub {
+          owner = "riscy";
+          repo = "shx-for-emacs";
+          rev = "bcdbc7142a0542639f47abb48fe17aa6c92f8406";
+          sha256 = "0wrxwjlkix5qgi3fvkaj9m43hyif9ba2bdyzc0hkig7ng0b99cjd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
+          sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k";
+          name = "shx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/shx";
+          license = lib.licenses.free;
+        };
+      }) {};
     sibilant-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sibilant-mode";
@@ -64971,12 +65075,12 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20170524.26";
+        version = "20170530.434";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "f59fac1f8aa8820beefffc3a05d2e3c1e32c0d8d";
-          sha256 = "0xll4cjbdk37l4kb6z7lc1hz2m4gxzxfnw3drfgl9cxac0501hcd";
+          rev = "d86fc0353cbf1a95df261e40ec5b7292b0d557f3";
+          sha256 = "1pj1rdfm2dxri6v2c1m8slpabdmbgqqr0cp23s5w4s39g0mmphvg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -64992,12 +65096,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170517.1502";
+        version = "20170530.114";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "c2c0b9249204b8f9a405a63abf20d07ac8e8ef79";
-          sha256 = "0frg52kdfygzz9r1w1d39dmlgksfy07p54xyrcpwfzkg0hh7b80y";
+          rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350";
+          sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -66573,12 +66677,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "20170326.321";
+        version = "20170525.1254";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "2f8e52d9d34535899292799778fc1242342b64d9";
-          sha256 = "18vpr0k3pd4cvmxaxhvl8abz78fpni8vk3mws89grjbb3fc4b17i";
+          rev = "13611ca0e4dfb8e6e4a314142368bfa7f0de5b9b";
+          sha256 = "0svlf2kgdbhwaygydvwvhinafiwv3qrgyn5wkfpcnz1km30g92hf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -66676,12 +66780,12 @@
     suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "suomalainen-kalenteri";
-        version = "20151129.304";
+        version = "20170528.801";
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "suomalainen-kalenteri";
-          rev = "f5907236ce4da372325fce8b3ce429defa5b0f5a";
-          sha256 = "1f16ds671mp8jwkkhvpbdqkk3jji96q9ipjlr8ij9vglp2arvslg";
+          rev = "d380321ce7b7a5650847a7866bd98226af51d4b4";
+          sha256 = "1fcyh26zd7rpp0519kswgr9ps67flwwypw2ic3nwgjdhxb41kmzs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri";
@@ -66951,8 +67055,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "859eb7844ac608fa48186ee124b2ca4ea7e98c6c";
-          sha256 = "0wg0ivfb354l8h3nj0178wzbkriik51cp8wvjn4c1q40w5lhdfbr";
+          rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+          sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67094,12 +67198,12 @@
     symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symbol-overlay";
-        version = "20170513.2";
+        version = "20170528.119";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "0ec27ba84bc8d3f467f351e8d03248d36cbeeaae";
-          sha256 = "0mmy3q25jzlfn5lpwmp39pbkij9qsqx9p2lmya5h455pppggrqrq";
+          rev = "fcd6ffe97aeb3e9190610f29f1d69895771edcb6";
+          sha256 = "10iidqq7gz3cmkp8sxg0jwyn0hn6hrlnbvll62hdrb91cxa0hgnf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -67888,12 +67992,12 @@
     telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "telephone-line";
-        version = "20170523.1416";
+        version = "20170528.1027";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "778d435ad2182ad7ffd344721ad7b4c720739a36";
-          sha256 = "03snpsmbf54hi04bjhixpsmhcqlij3s4kfx82hgnl62mlhb0bjdv";
+          rev = "80b09f3357161705fce9ccee9ca23056e91ee2cf";
+          sha256 = "08wc37qw22rsmyzxqiz6d8mwq13j6r4i38lb4gk7kxjpqxwzblxc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -68165,8 +68269,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "21fd14f052252095a4a6238fb4d8916cb34d73ed";
-          sha256 = "06bvha88wipc66z3v723ypzcwd5a9pfx4hzz5f5z2ws8ycx5sjxv";
+          rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb";
+          sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -68186,8 +68290,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "21fd14f052252095a4a6238fb4d8916cb34d73ed";
-          sha256 = "06bvha88wipc66z3v723ypzcwd5a9pfx4hzz5f5z2ws8ycx5sjxv";
+          rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb";
+          sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -68329,12 +68433,12 @@
     test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "test-simple";
-        version = "20170524.2323";
+        version = "20170527.832";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-test-simple";
-          rev = "e7c948e1cf22b8f85f0dd289a88a44d624b965c1";
-          sha256 = "03d1bx42mcasli73c0iidch4188brim6ysysq3sl67n0ancpk3fz";
+          rev = "b3b69f52207d3a8111421ad7ab9ed82abbe85316";
+          sha256 = "0n400nmz3iyp50sdd4gz0bmfn1sfq5p6a69yv4zd09ypa9gkndws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple";
@@ -68683,8 +68787,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "e41e47c2b4b2407bac525d203b281c63fb253978";
-          sha256 = "083926465cncjx93ykkdhp8z9gwf6wl5rmhh6dm85xc2d5j4an9z";
+          rev = "72ca60debae1d9fb35d9f0085118873669006d7f";
+          sha256 = "1hgqs1z2m2g3avid98bhgipsqp2478bpf1vby3c3f2xmymag0l74";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -69497,12 +69601,12 @@
     traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
     melpaBuild {
         pname = "traad";
-        version = "20170302.613";
+        version = "20170528.2302";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-traad";
-          rev = "6d797f124fd4e037df7727d7696328a95748b9af";
-          sha256 = "1r3s7qjlf943h3wqc5plw0la0p54xmxzdj3iwaz9lymfxx6n3h72";
+          rev = "4b84b8b4cf43e1167b3d7fcc51eb7a16b62c26f1";
+          sha256 = "0mpx2wlw7fhqmgvya3vq7yfjqpab10wjbgpxyyd2ki15nwc4c0xd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -69528,8 +69632,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "1e90e5a89d07bd1584e990c35f5a9d564334a1ae";
-          sha256 = "13pv21bk4khq97a7km7gpj8rmwkmcb1y1nk72w35b9kipxv76vg2";
+          rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
+          sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -70194,12 +70298,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170424.2231";
+        version = "20170530.530";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "e0b4a6cb31750314e827bbc57de9a35558b34fd9";
-          sha256 = "0z9s1aacalc17inc6rxxmyp8ffwy4as0va96rwfmhq3lmhcbbclf";
+          rev = "4235b47a389bf04a95fa54e59695f60599dc918b";
+          sha256 = "1mkl8y1khzsggg08jmjj73f1gvvjy3z34i1vfrhik05qx1n9z3jz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -70400,12 +70504,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170506.941";
+        version = "20170530.246";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "148a173441e7371a01382446d683bfb251f00cc7";
-          sha256 = "05bp1szqrbqh4hvd4gmhk9hfmki0xhib7z762bd4jabh6k68kap7";
+          rev = "30efb05b1135992eaa88c5755814b35291e1f343";
+          sha256 = "1j0hzbm5zhz3qrz264xmj60f4227yrly2namr5ys115pbvhhh4hc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -70998,8 +71102,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "4aa7d9a68a1a4a9f3e4b7a22fca3d8a2e45a8354";
-          sha256 = "17s5zdmprjbzxy68ah0f7k1j7cxncdyy9qlx5707zrqxqbnwlfrn";
+          rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3";
+          sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -71040,8 +71144,8 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "ea49d8e947e1cd5deeec813e78eba92ff5c6ff3b";
-          sha256 = "17x6bbflqicwk489mkwsqqkb97nriqbgv5shp8p87p7ykkpiw21d";
+          rev = "ab45d0499f541884d009654d99c5014508c7c5bd";
+          sha256 = "0zp67asbn0kic4clc0r6hmmplq38rdvqfs561sw7zilh5wrnj5dy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -71393,12 +71497,12 @@
     vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "vdiff";
-        version = "20170523.516";
+        version = "20170525.1231";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "4a6f27b83ef0240c56587354277ba685d9834bc9";
-          sha256 = "0ab5li8qb3jfy952vjhyqqwvmrpz40i961w61p7vlmpkw206mrm8";
+          rev = "66ae1ac324d9ec7ef87abee38f260734f036cf3d";
+          sha256 = "0d8zam8p6qyzjr99n0jpmjav429qkjgg59gidmhgf0cbx2pyvy8s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -72500,12 +72604,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170510.1127";
+        version = "20170529.1030";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "2ed2b26348326e3bf814fff6f3bca8440b4b7416";
-          sha256 = "18j0j5wq3ria0bllf6nfw97j4am1h2x51gxfn42hgdp027jdfn3j";
+          rev = "aef2a32f6e5e2fdb7f38a650b009a737c67959e2";
+          sha256 = "14x91pngh9i7r66inssc4jaqvzv2kb3bnbks5x2bhsidvls7s28r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -72857,12 +72961,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20170521.549";
+        version = "20170530.526";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "32dad608abdb72c5d2df1e8bc3f3d350943d5c4e";
-          sha256 = "0rpabggs9kbfy3lgqn29b2dc41fgq3i8vfbcxrnjqmy3i7amk8y1";
+          rev = "3144b4c1fc774b63fc2350a0171e8ef01ab63298";
+          sha256 = "1fyg4b5ngf4k30x9rb5n62w2y9awc1lasrszxp9bg6ydmigncans";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -72962,12 +73066,12 @@
     whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "whizzml-mode";
-        version = "20170524.1937";
+        version = "20170525.818";
         src = fetchFromGitHub {
           owner = "whizzml";
           repo = "whizzml-mode";
-          rev = "662c60173cdb396fcb2386d7d7c774d26f16cd9f";
-          sha256 = "1nyl1whhi3zrzb5b4vkmqdaggnxrqmzmw1amf7hbw0mvx5mpy9pa";
+          rev = "92986cbb260642c129b049950036b2b6698a8bd9";
+          sha256 = "01mxjyan8bbjxl055f8zbsydsn01iszk3qi3668aa6i1m3vsz60h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@@ -73816,12 +73920,12 @@
     writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
     melpaBuild {
         pname = "writeroom-mode";
-        version = "20170502.1252";
+        version = "20170528.639";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "writeroom-mode";
-          rev = "9ccb0512b0dc5da103d857ab4c9b187f3c800f8f";
-          sha256 = "0izs7h0wkzkq6071v1ic5gbxq5d4l63fs39cr2iz565qkrmda8v1";
+          rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a";
+          sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
@@ -74068,12 +74172,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170524.157";
+        version = "20170527.1910";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "fe22efb182bec2e0a0a34731bcd4d53bc7bd24d2";
-          sha256 = "005jbzp5kll2dx4k905fqz9p3a9q7626n6jgrgky1z3axb4w2s4a";
+          rev = "85748f769689d923ff7f88227c78ccd3315b8336";
+          sha256 = "07miaf7fgfl54pdjj7y6lymmk9yz1qyyvvdv4i1h1fshv07c57qd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -74089,12 +74193,12 @@
     xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-get-thing";
-        version = "20170303.1530";
+        version = "20170527.1806";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-get-thing-or-selection";
-          rev = "1eef698b7be06fa49347798089ca1e2ed8484da5";
-          sha256 = "0cysykwnwpy43mnx9fjiqk1r004ac6c7h92zhki8858bcgjnwzzk";
+          rev = "5adaf02b8a7464ffb81ae185edb48902a4c3a4d4";
+          sha256 = "16cxk55haln36m57pszxbbyx2h0dzdxagsj2zvm6i2nn0jhyy4v7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -74467,12 +74571,12 @@
     xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "xref-js2";
-        version = "20160803.116";
+        version = "20170530.126";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "xref-js2";
-          rev = "031def02271fdbe2e0ab30515c7291a239fea4e6";
-          sha256 = "1i3gsv7npf6lg7hakky6yxn96aqjdlridj74l0vhj55j2w7ia6f8";
+          rev = "d5f93605405989529c2f66b542def6c32429b927";
+          sha256 = "1vzsw257xkqwlgfj8d5hnrirjhxzzs9d8ms40ihb2zwsxn70im53";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2";
@@ -74828,8 +74932,8 @@
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "yankpad";
-          rev = "9a8789c6b20547545204e44f3c753fa84f9007c7";
-          sha256 = "0g6jandrhm570szgm4dbak8m8md9s91vsn67napyppaclp5iwff0";
+          rev = "1742630496f1994fe0746f8079582da5a168232d";
+          sha256 = "09qjpkk9q4xw395afnzf3rmwaahsrzhx0793p77rrpxckg64hrgz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
@@ -75010,11 +75114,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170522.1944";
+        version = "20170528.1711";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "9db0e1522847";
-          sha256 = "17f0n7la3p72n8qmdlfq1i9plr3cqc0gsd758lz103a8rbp9aj1d";
+          rev = "c940797c19ad";
+          sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
-- 
GitLab


From de52d2450eeb781302c1d9f1004d4da74940aff7 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Tue, 30 May 2017 22:05:39 +0200
Subject: [PATCH 0166/1490] Cleanup PostgreSQL for state version 17.09 (#25753)

* postgresql service: make 9.6 the default version for 17.09

* postgresql service: change default superuser for 17.09

Change the default superuser from `root` to `postgres` for state
version 17.09

* postgresql service: change default data directory for 17.09

The new directory includes the schema version of the database.
This makes upgrades easier and is more consistent with other distros.

* updated nixos release notes
---
 nixos/doc/manual/release-notes/rl-1709.xml    | 11 ++++++++++
 .../modules/services/databases/postgresql.nix | 20 ++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index d0f0216686a..6948c22cc88 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -78,6 +78,17 @@ rmdir /var/lib/ipfs/.ipfs
 </programlisting>
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>postgres</literal> default version was changed from 9.5 to 9.6.
+    </para>
+    <para>
+      The <literal>postgres</literal> superuser name has changed from <literal>root</literal> to <literal>postgres</literal> to more closely follow what other Linux distributions are doing.
+    </para>
+    <para>
+      The <literal>postgres</literal> default <literal>dataDir</literal> has changed from <literal>/var/db/postgres</literal> to <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is 9.6 for example.
+    </para>
+  </listitem>
 </itemizedlist>
 
 
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 24ef4637ec9..d06e03a5297 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -38,6 +38,10 @@ let
 
   pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4";
 
+  # NixOS traditionally used `root` as superuser, most other distros use `postgres`. From 17.09
+  # we also try to follow this standard
+  superuser = (if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root");
+
 in
 
 {
@@ -74,7 +78,7 @@ in
 
       dataDir = mkOption {
         type = types.path;
-        default = "/var/db/postgresql";
+        example = "/var/lib/postgresql/9.6";
         description = ''
           Data directory for PostgreSQL.
         '';
@@ -160,7 +164,13 @@ in
       # Note: when changing the default, make it conditional on
       # ‘system.stateVersion’ to maintain compatibility with existing
       # systems!
-      mkDefault (if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 else pkgs.postgresql94);
+      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96
+            else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95
+            else pkgs.postgresql94);
+
+    services.postgresql.dataDir =
+      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
+                 else "/var/db/postgresql");
 
     services.postgresql.authentication = mkAfter
       ''
@@ -205,7 +215,7 @@ in
           ''
             # Initialise the database.
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
-              initdb -U root
+              initdb -U ${superuser}
               # See postStart!
               touch "${cfg.dataDir}/.first_startup"
             fi
@@ -237,14 +247,14 @@ in
         # Wait for PostgreSQL to be ready to accept connections.
         postStart =
           ''
-            while ! psql --port=${toString cfg.port} postgres -c "" 2> /dev/null; do
+            while ! ${pkgs.sudo}/bin/sudo -u ${superuser} psql --port=${toString cfg.port} -d postgres -c "" 2> /dev/null; do
                 if ! kill -0 "$MAINPID"; then exit 1; fi
                 sleep 0.1
             done
 
             if test -e "${cfg.dataDir}/.first_startup"; then
               ${optionalString (cfg.initialScript != null) ''
-                psql -f "${cfg.initialScript}" --port=${toString cfg.port} postgres
+                ${pkgs.sudo}/bin/sudo -u ${superuser} psql -f "${cfg.initialScript}" --port=${toString cfg.port} -d postgres
               ''}
               rm -f "${cfg.dataDir}/.first_startup"
             fi
-- 
GitLab


From 53748b7e178aa380bcbbfa41ec6cdcd6a4eda852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 30 May 2017 22:17:31 +0200
Subject: [PATCH 0167/1490] Upgrade to python-consul-0.7.0.

Fixes https://github.com/cablehead/python-consul/issues/152
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f10fac5041..b1f5e7223fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4076,11 +4076,11 @@ in {
 
 
   consul = buildPythonPackage (rec {
-    name = "python-consul-0.6.0";
+    name = "python-consul-0.7.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/python-consul/${name}.tar.gz";
-      sha256 = "0vfyr499sbc4nnhhijp2lznyj507nnak95bvv9w8y78ngxggskbh";
+      sha256 = "18gs5myk9wkkq5zvj0n0s68ngj3mrbdcifshxfj1j0bgb1km0wpm";
     };
 
     buildInputs = with self; [ requests six pytest ];
-- 
GitLab


From b67d01a0e9d89757561bd9e4181fba8e861fed38 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Wed, 24 May 2017 23:30:33 +0200
Subject: [PATCH 0168/1490] nodejs: init at 8.0.0

---
 pkgs/development/web/nodejs/v8.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  9 +++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/v8.nix

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
new file mode 100644
index 00000000000..bee323176d8
--- /dev/null
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser
+, pkgconfig, runCommand, which, libtool, fetchpatch
+, callPackage
+, darwin ? null
+, enableNpm ? true
+}@args:
+
+let
+  nodejs = import ./nodejs.nix args;
+  baseName = if enableNpm then "nodejs" else "nodejs-slim";
+in
+  stdenv.mkDerivation (nodejs // rec {
+    version = "8.0.0";
+    name = "${baseName}-${version}";
+    src = fetchurl {
+      url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
+      sha256 = "072g2zv58aa5zxs8fs9bdsi3mqklf2yj9mf58yjg5frbcfikm395";
+    };
+
+    patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
+  })
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20d04741120..e9475c0c6cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2794,6 +2794,15 @@ with pkgs;
     enableNpm = false;
   };
 
+  nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {
+    libtool = darwin.cctools;
+  };
+
+  nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix {
+    libtool = darwin.cctools;
+    enableNpm = false;
+  };
+
   nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix {
     nodejs = pkgs.nodejs-6_x;
   };
-- 
GitLab


From 6a27b46deef753202bf11cdbd0e823733e2418d1 Mon Sep 17 00:00:00 2001
From: Diego Pontoriero <diego.pontoriero@coreos.com>
Date: Tue, 30 May 2017 13:54:07 -0700
Subject: [PATCH 0169/1490] terraform: 0.9.4 -> 0.9.6.

---
 .../networking/cluster/terraform/default.nix         | 12 ++++--------
 pkgs/top-level/all-packages.nix                      |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index c89f871b1c5..0173a898575 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -48,13 +48,9 @@ in {
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
-  terraform_0_9_4 = generic {
-    version   = "0.9.4";
-    sha256    = "07vcmjyl0y48hm5lqqzdd51hmrxapvywzbdkg5f3rcqd7dn9c2xs";
-    postPatch = ''
-      rm builtin/providers/dns/data_dns_cname_record_set_test.go
-      rm builtin/providers/vsphere/resource_vsphere_file_test.go
-    '';
-    doCheck   = true;
+  terraform_0_9_6 = generic {
+    version = "0.9.6";
+    sha256 = "1f6z1zkklzpqgc7akgdz1g306ccmhni5lmg7i6g762n3qai60bnv";
+    doCheck = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20d04741120..87c4d93af68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18571,10 +18571,10 @@ with pkgs;
   inherit (callPackage ../applications/networking/cluster/terraform {})
     terraform_0_8_5
     terraform_0_8_8
-    terraform_0_9_4;
+    terraform_0_9_6;
 
   terraform_0_8 = terraform_0_8_8;
-  terraform_0_9 = terraform_0_9_4;
+  terraform_0_9 = terraform_0_9_6;
   terraform = terraform_0_9;
 
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
-- 
GitLab


From 3c0114d4728aff4158730ccaf89cc1d9115c83ee Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 30 May 2017 23:23:50 +0200
Subject: [PATCH 0170/1490] sudo: 1.8.20 -> 1.8.20p1, fixes CVE-2017-1000367

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

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 50782f17670..785ba93f137 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.20";
+  name = "sudo-1.8.20p1";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "1q70f2wqbpgq828xmfzidbhyll5p08qbj7f3p2sw2v4whpdbi5wy";
+    sha256 = "07fvh8qy0l1h93lccc625f48d8yp0pkp5rjjykq13pb07ar0x64y";
   };
 
   configureFlags = [
-- 
GitLab


From 8d689482b9b6fc44a73351f4f045a37598e0da17 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 30 May 2017 18:57:46 -0400
Subject: [PATCH 0171/1490] ammonite: 0.9.3 -> 0.9.5

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 9f791db5047..4f253c06186 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "0.9.3";
+  version = "0.9.5";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "1s62idj8lg2g5kz325kqjmyks7ghhl5nzc4snji25qkgxirpibpl";
+    sha256 = "1ni829qpdm5wflc1n827b9ywpv836r2068rmj9yd2nyh8b6q2him";
   };
 
   propagatedBuildInputs = [ jre ] ;
-- 
GitLab


From b5a36300501026cedede2087eaeddfbfa909e2f9 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 30 May 2017 05:19:27 +1000
Subject: [PATCH 0172/1490] eventstat: 0.03.03 -> 03.03.04

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

diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index de27d7b0d83..cd11a79c8f8 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "eventstat-${version}";
-  version = "0.03.03";
+  version = "0.03.04";
   src = fetchzip {
     url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
-    sha256 = "02pg46f3x7v1c1vvqzfjqq0wjb2bzmfkd6a8xp06cg9zvidn6jpb";
+    sha256 = "1sqf1mfafrw6402qx457gh8yxgsw80311qi0lp4cjl9dfz7vl2x1";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];
-- 
GitLab


From 2c53d5dea05b214ea291aeb0a3c065a926770d67 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 30 May 2017 05:19:46 +1000
Subject: [PATCH 0173/1490] fnotifystat: 0.01.16 -> 0.01.17

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

diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index 35638e7dabd..2c90ff94d4a 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/pkgs/os-specific/linux/fnotifystat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "fnotifystat-${version}";
-  version = "0.01.16";
+  version = "0.01.17";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
-    sha256 = "1k9nc7a4r7c2l7vrlcrfxj9rsdb04amiqcsnxm5kpshncry38nl5";
+    sha256 = "0ncfbrpyb3ak49nrdr4cb3w082n9s181lizfqx51zi9rdgkj1vm3";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
-- 
GitLab


From 87a800d494f679d795131c153063539d19d88260 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 30 May 2017 05:20:08 +1000
Subject: [PATCH 0174/1490] forkstat: 0.01.16 -> 0.01.17

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

diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index f8d0eab835b..6a987dc9f5b 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "forkstat-${version}";
-  version = "0.01.16";
+  version = "0.01.17";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz";
-    sha256 = "0g65basrs569y42zhgjq9sdyz62km8xy55yfilmyxa43ckb3xmlw";
+    sha256 = "0plm2409mmp6n2fjj6bb3z7af2cnh5lg3czlylhgaki9zd0cyb7w";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
-- 
GitLab


From 153e900b394fb6c79cf411ddadb681a0a4ba86cf Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 30 May 2017 05:20:26 +1000
Subject: [PATCH 0175/1490] smemstat: 0.01.16 -> 0.01.17

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

diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index 9a244c6ed8f..04f5bf53f93 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/pkgs/os-specific/linux/smemstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "smemstat-${version}";
-  version = "0.01.16";
+  version = "0.01.17";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz";
-    sha256 = "14n3s6ibm9bq58drvpiasqn11ci6mrwswfpcbpbsimx6fh2j4bi3";
+    sha256 = "093ifrz688cm0kmzz1c6himhbdr75ig1mcaapmqy8jadc1gaw2im";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];
-- 
GitLab


From 45bb3fcbbe48304ac6603649ce45dbdb98175cdd Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sun, 12 Mar 2017 03:28:56 +1100
Subject: [PATCH 0176/1490] iasl: 20130117 -> 20170303

---
 pkgs/development/compilers/iasl/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 934fbeeb6f9..5e0970ea12f 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, bison, flex}:
 
-stdenv.mkDerivation {
-  name = "iasl-20130117";
+stdenv.mkDerivation rec {
+  name = "iasl-${version}";
+  version = "20170303";
 
   src = fetchurl {
-    url = http://www.acpica.org/download/acpica-unix-20130117.tar.gz;
-    sha256 = "1zils7l7gnkbbl8916dlhvij1g625ryb7769zhzffn3flshfdivh";
+    url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
+    sha256 = "1dc933rr11gv1nlaf5j8ih1chdakbjbjkn34jgbm330zppmck4y0";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";
-- 
GitLab


From 39a121303f9d8c63cddcefe5ef8618f11098d5b7 Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Tue, 30 May 2017 18:45:54 +0200
Subject: [PATCH 0177/1490] services.graphite: chmod -R entire dataDir

---
 nixos/modules/services/monitoring/graphite.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 6b24ac2c7c6..332a04634d0 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -488,9 +488,7 @@ in {
             # create index
             ${pkgs.python27Packages.graphite_web}/bin/build-index.sh
 
-            chown graphite:graphite ${cfg.dataDir}
-            chown graphite:graphite ${cfg.dataDir}/whisper
-            chown -R graphite:graphite ${cfg.dataDir}/log
+            chown -R graphite:graphite ${cfg.dataDir}
 
             touch ${dataDir}/db-created
           fi
-- 
GitLab


From 6a2932717585f58867fce4376434eaf54cf604b8 Mon Sep 17 00:00:00 2001
From: Stefhen Hovland <stefhen.hovland+github@gmail.com>
Date: Tue, 30 May 2017 19:28:23 -0400
Subject: [PATCH 0178/1490] pachyderm: 1.3.0 -> 1.4.6 (#26248)

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

diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index a0df23e6f62..c276c2e752f 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "pachyderm-${version}";
-  version = "1.3.0";
+  version = "1.4.6";
   rev = "v${version}";
 
   goPackagePath = "github.com/pachyderm/pachyderm";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "pachyderm";
     repo = "pachyderm";
-    sha256 = "0y25xh6h7p8hg0bzrjlschmz62r6dwh5mrvbnni1hb1pm0w9jb6g";
+    sha256 = "1fivihn9s04lmzdiwg0f05qm708fb14xy81pbc31wxdyjw28m8ns";
   };
 
   meta = with lib; {
-- 
GitLab


From 47d038c21d9ba99230d0c2f36a8174e24128258e Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Wed, 17 May 2017 14:46:16 +0200
Subject: [PATCH 0179/1490] elasticsearch: add 5.x package, service

---
 .../modules/services/search/elasticsearch.nix | 76 ++++++++++++++-----
 pkgs/servers/search/elasticsearch/5.x.nix     | 44 +++++++++++
 .../elasticsearch/es-classpath-5.x.patch      | 34 +++++++++
 .../search/elasticsearch/es-home-5.x.patch    | 31 ++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 5 files changed, 168 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/servers/search/elasticsearch/5.x.nix
 create mode 100644 pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
 create mode 100644 pkgs/servers/search/elasticsearch/es-home-5.x.patch

diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 574f74d547a..c76c86b0cad 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -5,13 +5,22 @@ with lib;
 let
   cfg = config.services.elasticsearch;
 
+  es5 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "5" >= 0;
+
   esConfig = ''
     network.host: ${cfg.listenAddress}
-    network.port: ${toString cfg.port}
-    network.tcp.port: ${toString cfg.tcp_port}
-    # TODO: find a way to enable security manager
-    security.manager.enabled: false
     cluster.name: ${cfg.cluster_name}
+
+    ${if es5 then ''
+      http.port: ${toString cfg.port}
+      transport.tcp.port: ${toString cfg.tcp_port}
+    '' else ''
+      network.port: ${toString cfg.port}
+      network.tcp.port: ${toString cfg.tcp_port}
+      # TODO: find a way to enable security manager
+      security.manager.enabled: false
+    ''}
+
     ${cfg.extraConf}
   '';
 
@@ -19,13 +28,18 @@ let
     name = "elasticsearch-config";
     paths = [
       (pkgs.writeTextDir "elasticsearch.yml" esConfig)
-      (pkgs.writeTextDir "logging.yml" cfg.logging)
+      (if es5 then (pkgs.writeTextDir "log4j2.properties" cfg.logging)
+              else (pkgs.writeTextDir "logging.yml" cfg.logging))
     ];
+    # Elasticsearch 5.x won't start when the scripts directory does not exist
+    postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/scripts" else "";
   };
 
   esPlugins = pkgs.buildEnv {
     name = "elasticsearch-plugins";
     paths = cfg.plugins;
+    # Elasticsearch 5.x won't start when the plugins directory does not exist
+    postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/plugins" else "";
   };
 
 in {
@@ -85,18 +99,30 @@ in {
 
     logging = mkOption {
       description = "Elasticsearch logging configuration.";
-      default = ''
-        rootLogger: INFO, console
-        logger:
-          action: INFO
-          com.amazonaws: WARN
-        appender:
-          console:
-            type: console
-            layout:
-              type: consolePattern
-              conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
-      '';
+      default =
+        if es5 then ''
+          logger.action.name = org.elasticsearch.action
+          logger.action.level = info
+
+          appender.console.type = Console
+          appender.console.name = console
+          appender.console.layout.type = PatternLayout
+          appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n
+
+          rootLogger.level = info
+          rootLogger.appenderRef.console.ref = console
+        '' else ''
+          rootLogger: INFO, console
+          logger:
+            action: INFO
+            com.amazonaws: WARN
+          appender:
+            console:
+              type: console
+              layout:
+                type: consolePattern
+                conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+        '';
       type = types.str;
     };
 
@@ -112,6 +138,12 @@ in {
       description = "Extra command line options for the elasticsearch launcher.";
       default = [];
       type = types.listOf types.str;
+    };
+
+    extraJavaOptions = mkOption {
+      description = "Extra command line options for Java.";
+      default = [];
+      type = types.listOf types.str;
       example = [ "-Djava.net.preferIPv4Stack=true" ];
     };
 
@@ -133,13 +165,21 @@ in {
       path = [ pkgs.inetutils ];
       environment = {
         ES_HOME = cfg.dataDir;
+        ES_JAVA_OPTS = toString ([ "-Des.path.conf=${configDir}" ] ++ cfg.extraJavaOptions);
       };
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}";
+        ExecStart = "${cfg.package}/bin/elasticsearch ${toString cfg.extraCmdLineOptions}";
         User = "elasticsearch";
         PermissionsStartOnly = true;
+        LimitNOFILE = "1024000";
       };
       preStart = ''
+        # Only set vm.max_map_count if lower than ES required minimum
+        # This avoids conflict if configured via boot.kernel.sysctl
+        if [ `${pkgs.procps}/bin/sysctl -n vm.max_map_count` -lt 262144 ]; then
+          ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144
+        fi
+
         mkdir -m 0700 -p ${cfg.dataDir}
 
         # Install plugins
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
new file mode 100644
index 00000000000..030c4730f38
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "5.4.0";
+  name = "elasticsearch-${version}";
+
+  src = fetchurl {
+    url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
+    sha256 = "1ml2dvwxxhj3azj13wa8xd08kpapal2477lpcaxzw5gnzizgyx5z";
+  };
+
+  patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
+
+  buildInputs = [ makeWrapper jre ] ++
+    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R bin config lib modules plugins $out
+
+    chmod -x $out/bin/*.*
+
+    wrapProgram $out/bin/elasticsearch \
+      --prefix ES_CLASSPATH : "$out/lib/*" \
+      ${if (!stdenv.isDarwin)
+        then ''--prefix PATH : "${utillinux}/bin/"''
+        else ''--prefix PATH : "${getopt}/bin"''} \
+      --set JAVA_HOME "${jre}" \
+      --set ES_JVM_OPTIONS "$out/config/jvm.options"
+
+    wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}"
+  '';
+
+  meta = {
+    description = "Open Source, Distributed, RESTful Search Engine";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = [
+      maintainers.apeschar
+    ];
+  };
+}
diff --git a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
new file mode 100644
index 00000000000..6898ffcf1d7
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
@@ -0,0 +1,34 @@
+diff -rupN a/bin/elasticsearch b/bin/elasticsearch
+--- a/bin/elasticsearch	2017-05-17 10:53:49.444487071 +0200
++++ b/bin/elasticsearch	2017-05-17 10:55:52.755081523 +0200
+@@ -129,12 +129,7 @@ ES_JAVA_OPTS="$(parse_jvm_options "$ES_J
+ # If an include wasn't specified in the environment, then search for one...
+ if [ "x$ES_INCLUDE" = "x" ]; then
+     # Locations (in order) to use when searching for an include file.
+-    for include in /usr/share/elasticsearch/elasticsearch.in.sh \
+-                   /usr/local/share/elasticsearch/elasticsearch.in.sh \
+-                   /opt/elasticsearch/elasticsearch.in.sh \
+-                   ~/.elasticsearch.in.sh \
+-                   "$ES_HOME/bin/elasticsearch.in.sh" \
+-                   "`dirname "$0"`"/elasticsearch.in.sh; do
++    for include in "`dirname "$0"`"/elasticsearch.in.sh; do
+         if [ -r "$include" ]; then
+             . "$include"
+             break
+diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
+--- a/bin/elasticsearch.in.sh	2017-04-28 19:41:47.000000000 +0200
++++ b/bin/elasticsearch.in.sh	2017-05-17 10:56:49.303519788 +0200
+@@ -1,13 +1 @@
+ #!/bin/bash
+-
+-# check in case a user was using this mechanism
+-if [ "x$ES_CLASSPATH" != "x" ]; then
+-    cat >&2 << EOF
+-Error: Don't modify the classpath with ES_CLASSPATH. Best is to add
+-additional elements via the plugin mechanism, or if code must really be
+-added to the main classpath, add jars to lib/ (unsupported).
+-EOF
+-    exit 1
+-fi
+-
+-ES_CLASSPATH="$ES_HOME/lib/*"
diff --git a/pkgs/servers/search/elasticsearch/es-home-5.x.patch b/pkgs/servers/search/elasticsearch/es-home-5.x.patch
new file mode 100644
index 00000000000..cee0137312f
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/es-home-5.x.patch
@@ -0,0 +1,31 @@
+diff -rupN a/bin/elasticsearch b/bin/elasticsearch
+--- a/bin/elasticsearch	2017-05-17 10:53:42.214686741 +0200
++++ b/bin/elasticsearch	2017-05-17 10:53:49.444487071 +0200
+@@ -105,7 +105,11 @@ while [ -h "$SCRIPT" ] ; do
+ done
+ 
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++
++if [ -z "$ES_HOME" ]; then
++    echo "You must set the ES_HOME var" >&2
++    exit 1
++fi
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin
+--- a/bin/elasticsearch-plugin	2017-05-17 10:53:42.214686741 +0200
++++ b/bin/elasticsearch-plugin	2017-05-17 10:53:49.445487044 +0200
+@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do
+ done
+ 
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++if [ -z "$ES_HOME" ]; then
++    echo "You must set the ES_HOME var" >&2
++    exit 1
++fi
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20d04741120..885313e6aff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1731,6 +1731,7 @@ with pkgs;
 
   elasticsearch = callPackage ../servers/search/elasticsearch { };
   elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
+  elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };
 
   elasticsearchPlugins = recurseIntoAttrs (
     callPackage ../servers/search/elasticsearch/plugins.nix { }
-- 
GitLab


From 0dd5e832f044fbee0c9eacf23af925dafef028a5 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Tue, 30 May 2017 17:16:16 -0700
Subject: [PATCH 0180/1490] kati: init at 2017-05-23 (#26168)

---
 .../tools/build-managers/kati/default.nix     | 26 +++++++++++++++++++
 .../tools/build-managers/kati/version.patch   | 19 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/kati/default.nix
 create mode 100644 pkgs/development/tools/build-managers/kati/version.patch

diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix
new file mode 100644
index 00000000000..7b5dc2b7937
--- /dev/null
+++ b/pkgs/development/tools/build-managers/kati/default.nix
@@ -0,0 +1,26 @@
+{ fetchgit, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "kati-unstable-${version}";
+  version = "2017-05-23";
+  rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/google/kati.git";
+    sha256 = "1das1fvycra546lmh72cr5qpgblhbzqqy7gfywiijjgx160l75vq";
+  };
+
+  patches = [ ./version.patch ];
+
+  installPhase = ''
+    install -D ckati $out/bin/ckati
+  '';
+
+  meta = {
+    description = "An experimental GNU make clone";
+    homepage = "https://github.com/google/kati";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/kati/version.patch b/pkgs/development/tools/build-managers/kati/version.patch
new file mode 100644
index 00000000000..1821ac6bbb7
--- /dev/null
+++ b/pkgs/development/tools/build-managers/kati/version.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.ckati b/Makefile.ckati
+index e4067bb..15518f3 100644
+--- a/Makefile.ckati
++++ b/Makefile.ckati
+@@ -102,14 +102,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o
+ 	$(KATI_LD) $^ -o $@ $(KATI_LIBS)
+ 
+ # Rule to generate version.cc
+-KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel)
+-ifneq ($(KATI_GIT_DIR),)
+-KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index
+-KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD)
+-else
+ KATI_VERSION_DEPS :=
+ KATI_VERSION := unknown
+-endif
+ $(KATI_INTERMEDIATES_PATH)/version.cc: $(KATI_VERSION_DEPS)
+ 	@mkdir -p $(dir $@)
+ 	echo '// +build ignore' > $@
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 885313e6aff..29c6da0962a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6862,6 +6862,8 @@ with pkgs;
 
   jenkins-job-builder = pythonPackages.jenkins-job-builder;
 
+  kati = callPackage ../development/tools/build-managers/kati { };
+
   kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends {
     gperf = gperf_3_0;
   };
-- 
GitLab


From 26b69109be4eb6c57eba174e0b26dc1f94657037 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Wed, 31 May 2017 10:30:24 +0900
Subject: [PATCH 0181/1490] move fonttools to its own directory

---
 .../python-modules/fonttools/default.nix      | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +--------------
 2 files changed, 33 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/fonttools/default.nix

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
new file mode 100644
index 00000000000..b9ef3ba94b6
--- /dev/null
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -0,0 +1,32 @@
+{ buildPythonPackage
+, fetchPypi
+, numpy
+, pytest
+, pytestrunner
+}:
+
+buildPythonPackage rec {
+  pname = "fonttools";
+  version = "3.13.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5ec278ff231d0c88afe8266e911ee0f8e66c8501c53f5f144a1a0abbc936c6b8";
+    extension = "zip";
+  };
+
+  buildInputs = [
+    numpy
+  ];
+
+  checkInputs = [
+    pytest
+    pytestrunner
+  ];
+
+  meta = {
+    homepage = "https://github.com/fonttools/fonttools";
+    description = "A library to manipulate font files from Python";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39af8357d40..729e2fab45b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11417,31 +11417,7 @@ in {
     inherit python;
   };
 
-  fonttools = buildPythonPackage (rec {
-    pname = "fonttools";
-    version = "3.13.0";
-    name = "${pname}-${version}";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "5ec278ff231d0c88afe8266e911ee0f8e66c8501c53f5f144a1a0abbc936c6b8";
-      extension = "zip";
-    };
-
-    buildInputs = with self; [
-      numpy
-    ];
-
-    checkInputs = with self; [
-      pytest
-      pytestrunner
-    ];
-
-    meta = {
-      homepage = "https://github.com/fonttools/fonttools";
-      description = "A library to manipulate font files from Python";
-    };
-  });
+  fonttools = callPackage ../development/python-modules/fonttools { };
 
   foolscap = buildPythonPackage (rec {
     name = "foolscap-${version}";
-- 
GitLab


From 0697dd8b8105714a3acecc431954072492a66383 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 31 May 2017 05:53:29 +0200
Subject: [PATCH 0182/1490] pythonPackages.rarfile: use free libarchive by
 default.

`unrar` is a non-free package, so it should only be used on request.
rarfile can use the rar-mode of `libarchive` instead, which should work well
enough for most cases.
---
 .../python-modules/rarfile/default.nix        | 20 ++++++++++++++++---
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index 183e5a2f1d9..c2c8c926432 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -1,4 +1,10 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, unrar, glibcLocales }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, libarchive, glibcLocales
+# unrar is non-free software
+, useUnrar ? false, unrar
+}:
+
+assert useUnrar -> unrar != null;
+assert !useUnrar -> libarchive != null;
 
 buildPythonPackage rec {
   pname = "rarfile";
@@ -15,8 +21,16 @@ buildPythonPackage rec {
 
   prePatch = ''
     substituteInPlace rarfile.py \
-      --replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\""
-  '';
+  '' + (if useUnrar then
+        ''--replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\""
+        ''
+       else
+        ''--replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\""
+        '')
+     + ''
+   '';
+  # the tests only work with the standard unrar package
+  doCheck = useUnrar;
   LC_ALL = "en_US.UTF-8";
   checkPhase = ''
     py.test test -k "not test_printdir"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 107fd715b94..0c6318b7905 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2603,7 +2603,7 @@ in {
 
   };
 
-  rarfile = callPackage ../development/python-modules/rarfile {};
+  rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; };
 
   proboscis = buildPythonPackage rec {
     name = "proboscis-1.2.6.0";
-- 
GitLab


From 9f680d30f4a8bac670932255caa4d39e7fb39f09 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 31 May 2017 00:47:25 -0400
Subject: [PATCH 0183/1490] lib and doc: Use "libSystem" as identifier for that
 libc in platforms

---
 doc/cross-compilation.xml | 2 +-
 lib/systems/examples.nix  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index e99e90bac9c..7ff35437611 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -128,7 +128,7 @@
         <listitem>
           <para>
             This is a string identifying the standard C library used.
-            Valid identifiers include "glibc" for GNU libc, "libsystem" for Darwin's Libsystem, and "uclibc" for µClibc.
+            Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc.
             It should probably be refactored to use the module system, like <varname>parse</varname>.
           </para>
         </listitem>
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 3ffaf393435..e394f43831c 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -96,14 +96,14 @@ rec {
   iphone64 = {
     config = "aarch64-apple-darwin14";
     arch = "arm64";
-    libc = "libsystem";
+    libc = "libSystem";
     platform = {};
   };
 
   iphone32 = {
     config = "arm-apple-darwin10";
     arch = "armv7-a";
-    libc = "libsystem";
+    libc = "libSystem";
     platform = {};
   };
 
-- 
GitLab


From 62dbc738c570a3583e714cd48b389b4f4a130872 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <freddyrietdijk@fridh.nl>
Date: Wed, 31 May 2017 08:33:02 +0200
Subject: [PATCH 0184/1490] Revert "fix electrum dependencies"

---
 pkgs/development/python-modules/ecpy.nix      | 21 ----
 pkgs/development/python-modules/ed25519.nix   | 18 ----
 pkgs/development/python-modules/hidapi.nix    | 30 ------
 pkgs/development/python-modules/keepkey.nix   | 31 ------
 .../development/python-modules/ledgerblue.nix | 22 -----
 pkgs/development/python-modules/libagent.nix  | 25 -----
 pkgs/development/python-modules/semver.nix    | 18 ----
 pkgs/development/python-modules/trezor.nix    |  9 +-
 pkgs/top-level/python-packages.nix            | 95 ++++++++++++++++---
 9 files changed, 86 insertions(+), 183 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ecpy.nix
 delete mode 100644 pkgs/development/python-modules/ed25519.nix
 delete mode 100644 pkgs/development/python-modules/hidapi.nix
 delete mode 100644 pkgs/development/python-modules/keepkey.nix
 delete mode 100644 pkgs/development/python-modules/ledgerblue.nix
 delete mode 100644 pkgs/development/python-modules/libagent.nix
 delete mode 100644 pkgs/development/python-modules/semver.nix

diff --git a/pkgs/development/python-modules/ecpy.nix b/pkgs/development/python-modules/ecpy.nix
deleted file mode 100644
index 56e815d17b3..00000000000
--- a/pkgs/development/python-modules/ecpy.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, hidapi
-, pycrypto, pillow, protobuf, future, ecpy
-}:
-
-buildPythonPackage rec {
-  name = "ECPy-${version}";
-  version = "0.8.1";
-
-  src = fetchurl {
-    url = "mirror://pypi/e/ecpy/${name}.tar.gz";
-    sha256 = "0ab60sx4bbsmccwmdvz1023r0cbzi4phar4ipzn5npdj5gw1ny4l";
-  };
-
-  buildInputs = [ hidapi pycrypto pillow protobuf future ];
-
-  meta = with stdenv.lib; {
-    description = "Pure Pyhton Elliptic Curve Library";
-    homepage = "https://github.com/ubinity/ECPy";
-    license = licenses.apache;
-  };
-}
diff --git a/pkgs/development/python-modules/ed25519.nix b/pkgs/development/python-modules/ed25519.nix
deleted file mode 100644
index dfbf6e3f2c3..00000000000
--- a/pkgs/development/python-modules/ed25519.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage }:
-
-buildPythonPackage rec {
-  name = "ed25519-${version}";
-  version = "1.4";
-
-  src = fetchurl {
-    url = "mirror://pypi/e/ed25519/${name}.tar.gz";
-    sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Ed25519 public-key signatures";
-    homepage = "https://github.com/warner/python-ed25519";
-    license = licenses.mit;
-    maintainers = with maintainers; [ np ];
-  };
-}
diff --git a/pkgs/development/python-modules/hidapi.nix b/pkgs/development/python-modules/hidapi.nix
deleted file mode 100644
index 93603ed576d..00000000000
--- a/pkgs/development/python-modules/hidapi.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, pkgs, libusb, udev
-, fetchurl, buildPythonPackage, cython }:
-
-buildPythonPackage rec {
-  version = "0.7.99.post20";
-  name = "hidapi-${version}";
-
-  src = fetchurl {
-    url = "mirror://pypi/h/hidapi/${name}.tar.gz";
-    sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z";
-  };
-
-  propagatedBuildInputs = [ pkgs.libusb1 pkgs.udev cython ];
-
-  # Fix the USB backend library lookup
-  postPatch = ''
-    libusb=${pkgs.libusb1.dev}/include/libusb-1.0
-    test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
-    sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
-    homepage = https://github.com/trezor/cython-hidapi;
-    # license can actually be either bsd3 or gpl3
-    # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ np ];
-  };
-}
diff --git a/pkgs/development/python-modules/keepkey.nix b/pkgs/development/python-modules/keepkey.nix
deleted file mode 100644
index 5869bd40a63..00000000000
--- a/pkgs/development/python-modules/keepkey.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, ecdsa
-, mnemonic, protobuf3_0, hidapi }:
-
-buildPythonPackage rec{
-  version = "0.7.3";
-  name = "keepkey-${version}";
-
-  src = fetchurl {
-    url = "mirror://pypi/k/keepkey/${name}.tar.gz";
-    sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
-  };
-
-  propagatedBuildInputs = [ protobuf3_0 hidapi ];
-
-  buildInputs = [ ecdsa mnemonic ];
-
-  # There are no actual tests: "ImportError: No module named tests"
-  doCheck = false;
-
-  # remove impossible dependency constraint
-  postPatch = ''
-    sed -i -e 's/hidapi==/hidapi>=/' setup.py
-  '';
-
-  meta = with stdenv.lib; {
-    description = "KeepKey Python client";
-    homepage = https://github.com/keepkey/python-keepkey;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ np ];
-  };
-}
diff --git a/pkgs/development/python-modules/ledgerblue.nix b/pkgs/development/python-modules/ledgerblue.nix
deleted file mode 100644
index fff2ed965d0..00000000000
--- a/pkgs/development/python-modules/ledgerblue.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, hidapi
-, pycrypto, pillow, protobuf, future, ecpy
-}:
-
-buildPythonPackage rec {
-  name = "ledgerblue-${version}";
-  version = "0.1.13";
-
-  src = fetchurl {
-    url = "mirror://pypi/l/ledgerblue/${name}.tar.gz";
-    sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
-  };
-
-  buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
-
-  meta = with stdenv.lib; {
-    description = "Python library to communicate with Ledger Blue/Nano S";
-    homepage = "https://github.com/LedgerHQ/blue-loader-python";
-    license = licenses.apache2;
-    maintainers = with maintainers; [ np ];
-  };
-}
diff --git a/pkgs/development/python-modules/libagent.nix b/pkgs/development/python-modules/libagent.nix
deleted file mode 100644
index 34ff2377702..00000000000
--- a/pkgs/development/python-modules/libagent.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage, ed25519, ecdsa
-, semver, keepkey, trezor, mnemonic, ledgerblue
-}:
-
-buildPythonPackage rec {
-  name = "libagent-${version}";
-  version = "0.9.1";
-
-  src = fetchurl {
-    url = "mirror://pypi/l/libagent/${name}.tar.gz";
-    sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc";
-  };
-
-  buildInputs = [
-    ed25519 ecdsa semver keepkey
-    trezor mnemonic ledgerblue
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Using hardware wallets as SSH/GPG agent";
-    homepage = "https://github.com/romanz/trezor-agent";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ np ];
-  };
-}
diff --git a/pkgs/development/python-modules/semver.nix b/pkgs/development/python-modules/semver.nix
deleted file mode 100644
index e9dcbd373c5..00000000000
--- a/pkgs/development/python-modules/semver.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, buildPythonPackage }:
-
-buildPythonPackage rec {
-  name = "semver-${version}";
-  version = "2.2.1";
-
-  src = fetchurl {
-    url = "mirror://pypi/s/semver/${name}.tar.gz";
-    sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Python package to work with Semantic Versioning (http://semver.org/)";
-    homepage = "https://github.com/k-bx/python-semver";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ np ];
-  };
-}
diff --git a/pkgs/development/python-modules/trezor.nix b/pkgs/development/python-modules/trezor.nix
index 87ee7160017..70160dcb0f9 100644
--- a/pkgs/development/python-modules/trezor.nix
+++ b/pkgs/development/python-modules/trezor.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage
-, protobuf3_0, hidapi, ecdsa, mnemonic }:
+{ lib, fetchurl, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
 
 buildPythonPackage rec {
   pname = "trezor";
@@ -18,10 +17,10 @@ buildPythonPackage rec {
   # There are no actual tests: "ImportError: No module named tests"
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet";
     homepage = https://github.com/trezor/python-trezor;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ np ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ np ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd17887328c..1f10fac5041 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29626,37 +29626,106 @@ EOF
     };
   };
 
-  hidapi = callPackage ../development/python-modules/hidapi.nix { };
+  hidapi = buildPythonPackage rec{
+    version = "0.7.99.post15";
+    name = "hidapi-${version}";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/h/hidapi/${name}.tar.gz";
+      sha256 = "09wlr1d7mx80974bsq62j4pk80234jgl7ip4br0y43q6999dpcr0";
+    };
+
+    propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ];
+
+    # Fix the USB backend library lookup
+    postPatch = ''
+      libusb=${pkgs.libusb1.dev}/include/libusb-1.0
+      test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
+      sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
+    '';
+
+    meta = {
+      description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
+      homepage = https://github.com/trezor/cython-hidapi;
+      # license can actually be either bsd3 or gpl3
+      # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
 
   mnemonic = callPackage ../development/python-modules/mnemonic.nix { };
 
   trezor = callPackage ../development/python-modules/trezor.nix { };
 
-  keepkey = callPackage ../development/python-modules/keepkey.nix { };
+  keepkey = buildPythonPackage rec{
+    version = "0.7.3";
+    name = "keepkey-${version}";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/k/keepkey/${name}.tar.gz";
+      sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
+    };
+
+    propagatedBuildInputs = with self; [ protobuf3_0 hidapi ];
+
+    buildInputs = with self; [ ecdsa mnemonic ];
+
+    # There are no actual tests: "ImportError: No module named tests"
+    doCheck = false;
+
+    meta = {
+      description = "KeepKey Python client";
+      homepage = https://github.com/keepkey/python-keepkey;
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
+  semver = buildPythonPackage rec {
+    name = "semver-${version}";
+    version = "2.2.1";
 
-  semver = callPackage ../development/python-modules/semver.nix { };
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/semver/${name}.tar.gz";
+      sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+    };
 
-  ed25519 = callPackage ../development/python-modules/ed25519.nix { };
+    meta = {
+      description = "Python package to work with Semantic Versioning (http://semver.org/)";
+      homepage = "https://github.com/k-bx/python-semver";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
 
-  libagent = callPackage ../development/python-modules/libagent.nix { };
+  ed25519 = buildPythonPackage rec {
+    name = "ed25519-${version}";
+    version = "1.4";
 
-  ledgerblue = callPackage ../development/python-modules/ledgerblue.nix { };
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/e/ed25519/${name}.tar.gz";
+      sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
+    };
 
-  ecpy = callPackage ../development/python-modules/ecpy.nix { };
+    meta = {
+      description = "Ed25519 public-key signatures";
+      homepage = "https://github.com/warner/python-ed25519";
+      license = licenses.mit;
+      maintainers = with maintainers; [ np ];
+    };
+  };
 
   trezor_agent = buildPythonPackage rec{
-    version = "0.9.0";
+    version = "0.7.0";
     name = "trezor_agent-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/t/trezor_agent/${name}.tar.gz";
-      sha256 = "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz";
+      sha256 = "1x1gwih6w8kxhpgmcp0v1k7mpmfsqiikkjca291sd0v2if24x7q1";
     };
 
-    propagatedBuildInputs = with self; [
-      trezor libagent ecdsa ed25519
-      mnemonic keepkey semver
-    ];
+    propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ];
 
     meta = {
       description = "Using Trezor as hardware SSH agent";
-- 
GitLab


From af58f8de55d836ddd266bc99be10251ae3703c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 31 May 2017 10:02:56 +0200
Subject: [PATCH 0185/1490] nvidia_x11_legacy304: 304.134 -> 304.135

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c117f8f29fa..3157273c5d3 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -31,10 +31,10 @@ in
   };
 
   legacy_304 = generic {
-    version = "304.134";
-    sha256_32bit = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4";
-    sha256_64bit = "0pydw7nr4d2dply38kwvjbghsbilbp2q0mas4nfq5ad050d2c550";
-    settingsSha256 = "0q92xw4fr9p5nbhj1plynm50d32881861daxfwrisywszqijhmlf";
+    version = "304.135";
+    sha256_32bit = "14qdl39wird04sqba94dcb77i63igmxxav62ndr4qyyavn8s3c2w";
+    sha256_64bit = "125mianhvq591np7y5jjrv9vmpbvixnkicr49ni48mcr0yjnjqkh";
+    settingsSha256 = "1y7swikdngq4nlwzkrq20yfah9zr31n1a5i6nw37awnp8xjilhzm";
     persistencedSha256 = null;
     useGLVND = false;
     useProfiles = false;
-- 
GitLab


From 9357927a4d13e578c4006e4dfdef7531eb1d15c0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 31 May 2017 10:05:18 +0200
Subject: [PATCH 0186/1490] mutt: 1.8.2 -> 1.8.3

From the Release-Mail:

    This is a bug-fix release.  Of note to Gmail users is a potential
    crash fix when copy/moving messages to its Trash folder.
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 4800fa938a0..d4e1bf39f1a 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -20,11 +20,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "0dgjjryp1ggbc6ivy9cfz5jl3gnbahb6d6hcwn7c7wk5npqpn18x";
+    sha256 = "0hpd896mw630sd6ps60hpka8cg691nvr627n8kmabv7zcxnp90cv";
   };
 
   patchPhase = optionalString (openssl != null) ''
-- 
GitLab


From 0c4b91505ed6f5ec6475468cb07c3ef8018eed34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 31 May 2017 10:45:44 +0200
Subject: [PATCH 0187/1490] nvidia_x11_legacy304: apply patches from Debian

The drivers would build but probably wouldn't work without them.
See #26250.
---
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index a21e6ecfc31..4c983227d6a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -42,6 +42,25 @@ let
         }
       else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
+    prePatch = let
+      debPatches = fetchurl {
+        url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
+            + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz";
+        sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr";
+      };
+      prefix = "debian/module/debian/patches";
+      applyPatches = pnames: if pnames == [] then null else
+        ''
+          tar xf '${debPatches}'
+          sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch
+          patches="$patches ${concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}"
+        '';
+    in
+      # TODO: perhaps other branches also need patching?
+      if (versionOlder version "340") then applyPatches
+        [ "fix-typos" "drm-driver-legacy" "deprecated-cpu-events" "disable-mtrr" ]
+      else null;
+
     # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10
     patches = if libsOnly
               then null
-- 
GitLab


From b116a1c65c344e868924e327324ae3ac1e0626cd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 31 May 2017 13:53:19 +0200
Subject: [PATCH 0188/1490] quilt: update to version 0.65

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

diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
index 1fd70730265..69479700c7f 100644
--- a/pkgs/development/tools/quilt/default.nix
+++ b/pkgs/development/tools/quilt/default.nix
@@ -3,11 +3,11 @@
 with pkgs;
 
 stdenv.mkDerivation rec {
-  name = "quilt-0.63";
+  name = "quilt-0.65";
 
   src = fetchurl {
     url = "mirror://savannah/quilt/${name}.tar.gz";
-    sha256 = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52";
+    sha256 = "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn";
   };
 
   buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ];
-- 
GitLab


From 1c0b50c91821dcf62176e1931bd06e15db2eec99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 31 May 2017 13:58:06 +0200
Subject: [PATCH 0189/1490] quilt: take dependencies as explicit function
 arguments

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

diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
index 69479700c7f..fe6aeb3fa6e 100644
--- a/pkgs/development/tools/quilt/default.nix
+++ b/pkgs/development/tools/quilt/default.nix
@@ -1,8 +1,7 @@
-{ stdenv, fetchurl, pkgs}:
-
-with pkgs;
+{ stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }:
 
 stdenv.mkDerivation rec {
+
   name = "quilt-0.65";
 
   src = fetchurl {
@@ -31,4 +30,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.all;
   };
+
 }
-- 
GitLab


From e25ab373db8382f33ae2095c47acd1402a4e4be5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 31 May 2017 14:12:06 +0200
Subject: [PATCH 0190/1490] wiggle: initial version 1.0

Wiggle is a tool for applying patches with conflicts.
---
 pkgs/development/tools/wiggle/default.nix | 43 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/tools/wiggle/default.nix

diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix
new file mode 100644
index 00000000000..5a97eb09e4b
--- /dev/null
+++ b/pkgs/development/tools/wiggle/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, ncurses, groff }:
+
+stdenv.mkDerivation {
+
+  name = "wiggle-1.0";
+
+  src = fetchurl {
+    url = "https://github.com/neilbrown/wiggle/archive/v1.0.tar.gz";
+    sha256 = "0552dkdvl001b2jasj0jwb69s7zy6wbc8gcysqj69b4qgl9c54cs";
+  };
+
+  buildInputs = [ ncurses groff ];
+
+  configurePhase = ''
+    makeFlagsArray=( CFLAGS="-I. -O3"
+                     INSTALL="install"
+                     BINDIR="$out/bin"
+                     MANDIR="$out/share/man"
+                   )
+    patchShebangs .
+  '';
+
+  meta = {
+    homepage = http://blog.neil.brown.name/category/wiggle/;
+    description = "Tool for applying patches with conflicts";
+
+    longDescription = ''
+       Wiggle applies patches to a file in a similar manner to the patch(1)
+       program. The distinctive difference is, however, that wiggle will
+       attempt to apply a patch even if the "before" part of the patch doesn't
+       match the target file perfectly. This is achieved by breaking the file
+       and patch into words and finding the best alignment of words in the file
+       with words in the patch. Once this alignment has been found, any
+       differences (word-wise) in the patch are applied to the file as best as
+       possible. Also, wiggle will (in some cases) detect changes that have
+       already been applied, and will ignore them.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13ab7bc814a..aecb500995f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3800,6 +3800,8 @@ with pkgs;
 
   quilt = callPackage ../development/tools/quilt { };
 
+  wiggle = callPackage ../development/tools/wiggle { };
+
   radamsa = callPackage ../tools/security/radamsa { };
 
   radarr = callPackage ../servers/radarr { };
-- 
GitLab


From d09e3535f5263add321ef0607be8a75d76b2376c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 31 May 2017 15:59:28 +0300
Subject: [PATCH 0191/1490] nvidia module: link proper output as OpenGL drivers

---
 nixos/modules/hardware/video/nvidia.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index f2d71aa34e4..80abec95c03 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -28,7 +28,7 @@ let
   nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
 
   nvidiaPackage = nvidia: pkgs:
-    if !nvidia.useGLVND then nvidia
+    if !nvidia.useGLVND then nvidia.out
     else pkgs.buildEnv {
       name = "nvidia-libs";
       paths = [ pkgs.libglvnd nvidia.out ];
-- 
GitLab


From 0146f18390d8619db97178771297fb04136cdb7b Mon Sep 17 00:00:00 2001
From: lufia <lufia@lufia.org>
Date: Wed, 31 May 2017 22:43:22 +0900
Subject: [PATCH 0192/1490] google-app-engine-go-sdk: fix error on macOS

---
 .../tools/google-app-engine-go-sdk/default.nix       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index b95906d2002..eebc416e282 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchzip, python27, python27Packages }:
+{ stdenv, fetchzip, python27, python27Packages, makeWrapper }:
 
 assert stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin";
 
+with python27Packages;
+
 stdenv.mkDerivation rec {
   name = "google-app-engine-go-sdk-${version}";
   version = "1.9.53";
@@ -17,9 +19,7 @@ stdenv.mkDerivation rec {
         sha256 = "18hgl4wz3rhaklkwaxl8gm70h7l8k225f86da682kafawrr8zhv4";
       };
 
-  buildInputs = with python27Packages; [
-    (python27.withPackages(ps: [ cffi cryptography pyopenssl ]))
-  ];
+  buildInputs = [python27 makeWrapper];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/
@@ -27,7 +27,9 @@ stdenv.mkDerivation rec {
 
     # create wrappers with correct env
     for i in goapp appcfg.py; do
-      ln -s "$out/share/go_appengine/$i" "$out/bin/$i"
+      makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \
+        --prefix PATH : "${python27}/bin" \
+        --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})"
     done
   '';
 
-- 
GitLab


From 7b41780a0e4defe29e2bf9a17511b521db01c67d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 31 May 2017 16:52:03 +0300
Subject: [PATCH 0193/1490] linuxPackages.nvidia_x11: move patches to specific
 versions

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 28 ++++++++++++-
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 42 +++----------------
 2 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 3157273c5d3..307c661ddf4 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -1,4 +1,4 @@
-{ callPackage }:
+{ lib, callPackage, fetchurl, fetchpatch }:
 
 let
   generic = args: callPackage (import ./generic.nix args) { };
@@ -28,6 +28,17 @@ in
     settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598";
     persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i";
     useGLVND = false;
+
+    patches = [
+      (fetchpatch {
+        name = "kernel-4.10.patch";
+        url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
+        sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
+      })
+      # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
+      # with datestamps removed
+      ./fs52243.patch
+    ];
   };
 
   legacy_304 = generic {
@@ -38,6 +49,21 @@ in
     persistencedSha256 = null;
     useGLVND = false;
     useProfiles = false;
+
+    prePatch = let
+      debPatches = fetchurl {
+        url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
+            + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz";
+        sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr";
+      };
+      prefix = "debian/module/debian/patches";
+      applyPatches = pnames: if pnames == [] then null else
+        ''
+          tar xf '${debPatches}'
+          sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch
+          patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}"
+        '';
+    in applyPatches [ "fix-typos" "drm-driver-legacy" "deprecated-cpu-events" "disable-mtrr" ];
   };
 
   legacy_173 = callPackage ./legacy173.nix { };
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 4c983227d6a..0d19079fe66 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -6,6 +6,9 @@
 , useGLVND ? true
 , useProfiles ? true
 , preferGtk2 ? false
+
+, prePatch ? ""
+, patches ? []
 }:
 
 { stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch
@@ -42,43 +45,8 @@ let
         }
       else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
-    prePatch = let
-      debPatches = fetchurl {
-        url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
-            + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz";
-        sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr";
-      };
-      prefix = "debian/module/debian/patches";
-      applyPatches = pnames: if pnames == [] then null else
-        ''
-          tar xf '${debPatches}'
-          sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch
-          patches="$patches ${concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}"
-        '';
-    in
-      # TODO: perhaps other branches also need patching?
-      if (versionOlder version "340") then applyPatches
-        [ "fix-typos" "drm-driver-legacy" "deprecated-cpu-events" "disable-mtrr" ]
-      else null;
-
-    # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10
-    patches = if libsOnly
-              then null
-              else if versionOlder version "340"
-              then null
-              else if versionOlder version "375"
-              then [
-                     (fetchpatch {
-                        name = "kernel-4.10.patch";
-                        url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
-                        sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
-                     })
-                         # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
-                         # with datestamps removed
-                     ./fs52243.patch
-                   ]
-              else null;
-
+    patches = if libsOnly then null else patches;
+    inherit prePatch;
     inherit version useGLVND useProfiles;
     inherit (stdenv) system;
 
-- 
GitLab


From 047a5a18df7a61ba66bdf171cbcb37cb9bc01845 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 31 May 2017 16:42:51 +0200
Subject: [PATCH 0194/1490] pgpdump: 0.31 -> 0.32

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

diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index 1e33c18753a..dfe4579aa58 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/pkgs/tools/security/pgpdump/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pgpdump-${version}";
-  version = "0.31";
+  version = "0.32";
 
   src = fetchFromGitHub {
     owner = "kazu-yamamoto";
     repo = "pgpdump";
     rev = "v${version}";
-    sha256 = "05ywdgxzq3976dsy95vgdx3nnhd9i9vypzyrkabpmnxphfnjfrb4";
+    sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0cbcb95e1437ecd92592094aeb3f4fc516780c2a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 31 May 2017 17:17:44 +0800
Subject: [PATCH 0195/1490] bundler: 1.14.6 -> 1.15.0

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

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 9251c4d2a41..fc6a4bab75c 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.14.6";
-  sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl";
+  version = "1.15.0";
+  sha256 = "1k84zjr49ri7dj0mbjm7wkqdmknwdid817y2kyhn42mh4vxa68id";
   dontPatchShebangs = true;
 
   postFixup = ''
-- 
GitLab


From ff52233bcaf4d2f4a06b10d8e9cf087f4661f636 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Wed, 31 May 2017 18:37:47 +0300
Subject: [PATCH 0196/1490] qtile: Fix using qtile together with desktop

Funny bug, which prevent qtile to co-exists with desktop manager
(or program pretending to be DE)
---
 nixos/modules/services/x11/window-managers/qtile.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix
index 37f84f0903c..ad3b65150b0 100644
--- a/nixos/modules/services/x11/window-managers/qtile.nix
+++ b/nixos/modules/services/x11/window-managers/qtile.nix
@@ -15,7 +15,7 @@ in
     services.xserver.windowManager.session = [{
       name = "qtile";
       start = ''
-        ${pkgs.qtile}/bin/qtile
+        ${pkgs.qtile}/bin/qtile &
         waitPID=$!
       '';
     }];
-- 
GitLab


From a5f12abfd3c61cad8dc28ad65db2cc28db39db12 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Wed, 31 May 2017 19:30:23 +0200
Subject: [PATCH 0197/1490] insync: 1.3.13.36129 -> 1.3.16.36155

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

diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 86cc9bded10..7beb489178b 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "insync-${version}";
-  version = "1.3.13.36129";
+  version = "1.3.16.36155";
   src = fetchurl {
     url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
-    sha256 = "18d8ww529nvhwcl5k31qmkzb83k9753ics0dw64w202r8vwbm3cd";
+    sha256 = "1gf1qg7mkbcgqhwxkiljmd1w2zvarq6vhxhips3w06bqdyg12210";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From b3fb9178e8ade242543d99ea91b623270a7ccf8a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 31 May 2017 20:16:13 +0200
Subject: [PATCH 0198/1490] llvm-packages: add option to enable manpages

---
 .../compilers/llvm/4/clang/default.nix           | 16 +++++++++++-----
 pkgs/development/compilers/llvm/4/llvm.nix       | 14 ++++++++++----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index bc286eaf05e..004893873f5 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
 , fixDarwinDylibNames
+, enableManpages ? true
 }:
 
 let
@@ -15,21 +16,24 @@ let
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
-    nativeBuildInputs = [ cmake python python.pkgs.sphinx ];
+    nativeBuildInputs = [ cmake python ]
+      ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
+
     buildInputs = [ libedit libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
+    ] ++ stdenv.lib.optionals enableManpages [
       "-DCLANG_INCLUDE_DOCS=ON"
       "-DLLVM_ENABLE_SPHINX=ON"
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ] ++
+    ]
     # Maybe with compiler-rt this won't be needed?
-    (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
-    (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
+    ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}"
+    ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include";
 
     patches = [ ./purity.patch ];
 
@@ -45,7 +49,7 @@ let
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
     '';
 
-    outputs = [ "out" "man" "python" ];
+    outputs = [ "out" ] ++ stdenv.lib.optional enableManpages "man" ++ [ "python" ];
 
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
@@ -62,6 +66,8 @@ let
       mv $out/share/clang/*.py $python/share/clang
 
       rm $out/bin/c-index-test
+    ''
+    + stdenv.lib.optionalString enableManpages ''
 
       # Manually install clang manpage
       cp docs/man/*.1 $out/share/man/man1/
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 1a78d672bfe..7d55bc5b410 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -16,6 +16,7 @@
 , compiler-rt_src
 , libcxxabi
 , debugVersion ? false
+, enableManpages ? true
 , enableSharedLibraries ? true
 , darwin
 }:
@@ -38,9 +39,13 @@ in stdenv.mkDerivation rec {
     mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
-  outputs = [ "out" "man" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
+  outputs = [ "out" ]
+    ++ stdenv.lib.optional enableManpages "man"
+    ++ stdenv.lib.optional enableSharedLibraries "lib";
+
+  nativeBuildInputs = [ perl groff cmake python ]
+    ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-  nativeBuildInputs = [ perl groff cmake python python.pkgs.sphinx ];
   buildInputs = [ libxml2 libffi ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
 
@@ -81,6 +86,7 @@ in stdenv.mkDerivation rec {
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
     "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
+  ] ++ stdenv.lib.optionals enableManpages [
     "-DLLVM_BUILD_DOCS=ON"
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"
@@ -109,10 +115,10 @@ in stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
   '';
 
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString enableManpages ''
     moveToOutput "share/man" "$man"
   ''
-  + stdenv.lib.optionalString (enableSharedLibraries) ''
+  + stdenv.lib.optionalString enableSharedLibraries ''
     moveToOutput "lib/libLLVM-*" "$lib"
     moveToOutput "lib/libLLVM.${shlib}" "$lib"
     substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
-- 
GitLab


From 87ed14b9413c7e81057e6bee08fa9d3301e3d501 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Wed, 31 May 2017 14:19:28 -0400
Subject: [PATCH 0199/1490] rtags: 2.8-p1 -> 2.10

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

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 4f396e26bf9..da55afbd1fb 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "rtags-${version}";
-  version = "2.8-p1";
+  version = "2.10";
 
   buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]
     ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
@@ -13,11 +13,10 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchgit {
-    # rev = "refs/tags/v${version}"; # TODO Renable if sha1 below is tagged as release
-    rev = "f85bd60f00d51748ea159b00fda7b5bfa78ef571";
+    rev = "refs/tags/v${version}";
     fetchSubmodules = true;
     url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "0g9sgc763c5d695hjffhis19sbaqk8z4884szljf7kbrjxl17y78";
+    sha256 = "0z32yncn3x1pm2l6r349kfwi6mi83vll820kka87agcla64pl1f2";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 0925f79d561b077c40c53e3fb213df461bdf2b06 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 30 May 2017 06:55:03 +0200
Subject: [PATCH 0200/1490] programs.zsh.syntaxHighlighting: refactor to use
 attr sets rather than recursive lists for patterns

The idea has been described here: https://github.com/NixOS/nixpkgs/pull/25323#issuecomment-298677369
---
 .../programs/zsh/zsh-syntax-highlighting.nix  | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 39176b28784..1dded038795 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -39,12 +39,12 @@ in
 
         patterns = mkOption {
           default = [];
-          type = types.listOf(types.listOf(types.string));
+          type = types.attrsOf types.string;
 
           example = literalExample ''
-            [
-              ["rm -rf *" "fg=white,bold,bg=red"]
-            ]
+            {
+              "rm -rf *" = "fg=white,bold,bg=red";
+            }
           '';
 
           description = ''
@@ -67,14 +67,17 @@ in
           "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})"
         }
 
-        ${optionalString (length(cfg.patterns) > 0)
-          (assert(elem "pattern" cfg.highlighters); (foldl (
-            a: b:
-              assert(length(b) == 2); ''
-                ${a}
-                ZSH_HIGHLIGHT_PATTERNS+=('${elemAt b 0}' '${elemAt b 1}')
-              ''
-          ) "") cfg.patterns)
+        ${let
+            n = attrNames cfg.patterns;
+          in
+            optionalString (length(n) > 0)
+              (assert(elem "pattern" cfg.highlighters); (foldl (
+                a: b:
+                  ''
+                    ${a}
+                    ZSH_HIGHLIGHT_PATTERNS+=('${b}' '${attrByPath [b] "" cfg.patterns}')
+                  ''
+              ) "") n)
         }
       '';
     };
-- 
GitLab


From c4e4071ed115aca6ad8e7a15429638b2c497e790 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 30 May 2017 14:40:25 +0200
Subject: [PATCH 0201/1490] programs.zsh.syntax-highlighting: simplify enable
 option by using `mkEnableOption`

---
 nixos/modules/programs/zsh/zsh-syntax-highlighting.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 1dded038795..3bd7ab81896 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -8,13 +8,7 @@ in
   {
     options = {
       programs.zsh.syntaxHighlighting = {
-        enable = mkOption {
-          default = false;
-          type = types.bool;
-          description = ''
-            Enable zsh-syntax-highlighting.
-          '';
-        };
+        enable = mkEnableOption "zsh-syntax-highlighting";
 
         highlighters = mkOption {
           default = [ "main" ];
-- 
GitLab


From 32e12ff4ed94797960a842410ca96dc2c29bc97b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 31 May 2017 16:16:24 -0300
Subject: [PATCH 0202/1490] cmdliner_1_0: init at 1.0.0

Version 1.0 breaks API and some packages does currently not compile
with it. So it is added as a new package.
---
 .../ocaml-modules/cmdliner/1.0.nix            | 42 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/cmdliner/1.0.nix

diff --git a/pkgs/development/ocaml-modules/cmdliner/1.0.nix b/pkgs/development/ocaml-modules/cmdliner/1.0.nix
new file mode 100644
index 00000000000..9448610a378
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cmdliner/1.0.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }:
+
+let
+  pname = "cmdliner";
+in
+
+assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
+
+stdenv.mkDerivation rec {
+  name = "ocaml-${pname}-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
+    sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  nativeBuildInputs = [ ocamlbuild opam topkg ];
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ result ];
+
+  createFindlibDestdir = true;
+
+  buildPhase = ''
+    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
+  '';
+
+  installPhase = ''
+    opam-installer --script --prefix=$out | sh
+    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://erratique.ch/software/cmdliner;
+    description = "An OCaml module for the declarative definition of command line interfaces";
+    license = licenses.bsd3;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 83c7d610c72..bf0ea759abd 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -130,6 +130,8 @@ let
 
     cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
 
+    cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { };
+
     cohttp = callPackage ../development/ocaml-modules/cohttp {
       lwt = ocaml_lwt;
     };
-- 
GitLab


From 61b8fddf5251e418eda3e93d63a0a608e56cc848 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 31 May 2017 16:22:35 -0300
Subject: [PATCH 0203/1490] cmdliner: 1.0.0 -> 0.9.8

Downgrade to version 0.9.8 because the new version 1.0.0 breaks API and
some pacakges do not yet compile with it.
---
 .../ocaml-modules/cmdliner/default.nix        | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix
index 9448610a378..e8824f31807 100644
--- a/pkgs/development/ocaml-modules/cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/default.nix
@@ -1,33 +1,30 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
 
 let
   pname = "cmdliner";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
+assert stdenv.lib.versionAtLeast ocaml.version "3.12";
 
 stdenv.mkDerivation rec {
+
   name = "ocaml-${pname}-${version}";
-  version = "1.0.0";
+  version = "0.9.8";
 
   src = fetchurl {
     url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-    sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x";
+    sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx";
   };
 
   unpackCmd = "tar xjf $src";
-
-  nativeBuildInputs = [ ocamlbuild opam topkg ];
+  nativeBuildInputs = [ ocamlbuild opam ];
   buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ result ];
 
   createFindlibDestdir = true;
 
-  buildPhase = ''
-    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
-  '';
-
-  installPhase = ''
+  configurePhase = "ocaml pkg/git.ml";
+  buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
+  installPhase   = ''
     opam-installer --script --prefix=$out | sh
     ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
   '';
-- 
GitLab


From 7b4acc6626c631645b29e1486e81c5683fa82c7c Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 22:00:29 +0200
Subject: [PATCH 0204/1490] pythonPackages.hidapi: 0.7.99.post15 ->
 0.7.99.post20

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

diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
new file mode 100644
index 00000000000..697bc1cd0e3
--- /dev/null
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, libusb1, udev, fetchPypi, buildPythonPackage, cython }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "hidapi";
+  version = "0.7.99.post20";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z";
+  };
+
+  propagatedBuildInputs = [ libusb1 udev cython ];
+
+  # Fix the USB backend library lookup
+  postPatch = ''
+    libusb=${libusb1.dev}/include/libusb-1.0
+    test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
+    sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
+    homepage = https://github.com/trezor/cython-hidapi;
+    # license can actually be either bsd3 or gpl3
+    # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c146ea70b2c..4f6060af235 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29626,32 +29626,8 @@ EOF
     };
   };
 
-  hidapi = buildPythonPackage rec{
-    version = "0.7.99.post15";
-    name = "hidapi-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/hidapi/${name}.tar.gz";
-      sha256 = "09wlr1d7mx80974bsq62j4pk80234jgl7ip4br0y43q6999dpcr0";
-    };
-
-    propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ];
-
-    # Fix the USB backend library lookup
-    postPatch = ''
-      libusb=${pkgs.libusb1.dev}/include/libusb-1.0
-      test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
-      sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
-    '';
-
-    meta = {
-      description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
-      homepage = https://github.com/trezor/cython-hidapi;
-      # license can actually be either bsd3 or gpl3
-      # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ np ];
-    };
+  hidapi = callPackage ../development/python-modules/hidapi {
+    inherit (pkgs) udev libusb1;
   };
 
   mnemonic = callPackage ../development/python-modules/mnemonic.nix { };
-- 
GitLab


From 98058ef4447158761f5fb501f6f78de69e22aaa8 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 31 May 2017 17:13:28 -0300
Subject: [PATCH 0205/1490] ocp-indent: depends on cmdliner minimum version
 1.0.0

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

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bf0ea759abd..4c8bf5ce14d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -388,7 +388,7 @@ let
 
     ocpBuild = callPackage ../development/tools/ocaml/ocp-build { };
 
-    ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { };
+    ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; };
 
     ocp-index = callPackage ../development/tools/ocaml/ocp-index { };
 
-- 
GitLab


From 682b0ec0e1013ebd0703c56994aa57610ce31580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 31 May 2017 23:09:29 +0100
Subject: [PATCH 0206/1490] google-app-engine-go-sdk: remove platform assert

---
 pkgs/development/tools/google-app-engine-go-sdk/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index eebc416e282..27ad4c996ce 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchzip, python27, python27Packages, makeWrapper }:
 
-assert stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin";
-
 with python27Packages;
 
 stdenv.mkDerivation rec {
@@ -38,7 +36,7 @@ stdenv.mkDerivation rec {
     version = version;
     homepage = "https://cloud.google.com/appengine/docs/go/";
     license = licenses.asl20;
-    platforms = with platforms; linux ++ darwin;
+    platforms = ["x86_64-linux" "x86_64-darwin"];
     maintainers = with maintainers; [ lufia ];
   };
 }
-- 
GitLab


From 9e61a82ab388be7b46a780ac999109cc9cc69478 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 22:23:21 +0200
Subject: [PATCH 0207/1490] pythonPackages.ecpy: init at 0.8.1

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

diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
new file mode 100644
index 00000000000..57549792d21
--- /dev/null
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, hidapi
+, pycrypto, pillow, protobuf, future, ecpy
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "ECPy";
+  version = "0.8.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ab60sx4bbsmccwmdvz1023r0cbzi4phar4ipzn5npdj5gw1ny4l";
+  };
+
+  buildInputs = [ hidapi pycrypto pillow protobuf future ];
+
+  meta = with stdenv.lib; {
+    description = "Pure Pyhton Elliptic Curve Library";
+    homepage = "https://github.com/ubinity/ECPy";
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f6060af235..25309c4d7a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29632,6 +29632,8 @@ EOF
 
   mnemonic = callPackage ../development/python-modules/mnemonic.nix { };
 
+  ecpy = callPackage ../development/python-modules/ecpy { };
+
   trezor = callPackage ../development/python-modules/trezor.nix { };
 
   keepkey = buildPythonPackage rec{
-- 
GitLab


From 859267f627aefa12a9180e1c821fa4fbed7ed188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 31 May 2017 22:34:06 +0100
Subject: [PATCH 0208/1490] systemd-resolved: fix case when dnsmasq is used as
 local resolver

fixes #25706
---
 nixos/modules/config/networking.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index ae30a710bf6..d503f5a8b20 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -222,13 +222,11 @@ in
             '' + cfg.extraResolvconfConf + ''
             '';
 
-      } // (optionalAttrs config.services.resolved.enable (
-        if dnsmasqResolve then {
-          "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
-        } else {
-          "resolv.conf".source = "/run/systemd/resolve/resolv.conf";
-        }
-      ));
+      } // optionalAttrs config.services.resolved.enable {
+        "resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+      } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
+        "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+      };
 
       networking.proxy.envVars =
         optionalAttrs (cfg.proxy.default != null) {
-- 
GitLab


From d842a382c3ea6c2794308720d25ec4e8cdbdffa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 31 May 2017 22:52:27 +0100
Subject: [PATCH 0209/1490] dino: unstable-2017-05-11 -> unstable-2017-05-31

---
 .../networking/instant-messengers/dino/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index cdb9c142da6..94adef2dda8 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2017-05-11";
+  name = "dino-unstable-2017-05-31";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "b09a056a13de131a4f2f072ffa2f795a0bb2abe7";
-    sha256 = "1dis1kgaqb1925anmxlcy9n722zzyn5wvq8lmczi6h2h3j7wnnmz";
+    rev = "2480c1ec26a8e0ccef3ea76e3c29566221405ffb";
+    sha256 = "0wdjj38gbr2j6yklna3pd8nsfpdfp1j936dy8s49pzayw4pxs2g2";
     fetchSubmodules = true;
   };
 
-- 
GitLab


From bef0b67a84ea847cc0c07143bc7cbf7a06ea7b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 31 May 2017 23:45:50 +0100
Subject: [PATCH 0210/1490] pythonPackages.treq: fix build

---
 .../python-modules/treq/default.nix           | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index b22ee2675a7..7bb028b233d 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six,
-  mock, twisted, incremental, pep8, sphinx, openssl, pyopenssl, tox }:
+{ stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six
+, mock, twisted, incremental, pep8 }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -11,17 +11,7 @@ buildPythonPackage rec {
     sha256 = "1xhcpvsl3xqw0dq9sixk80iwyiv17djigp3815sy5pfgvvggcfii";
   };
 
-  buildInputs = [
-    service-identity
-    requests
-    twisted
-    incremental
-    sphinx
-    six
-    openssl
-    pyopenssl
-    tox
-  ];
+  propagatedBuildInputs = [ twisted requests six incremental service-identity ];
 
   checkInputs = [
     pep8
@@ -32,15 +22,16 @@ buildPythonPackage rec {
     rm -fv src/treq/test/test_treq_integration.py
   '';
 
-  postBuild = ''
-    # build documentation and install in $out
-    tox -e docs
-    mkdir -pv $out/docs
-    cp -rv docs/* $out/docs/
-  '';
+  # XXX tox tries to install coverage despite it is installed
+  #postBuild = ''
+  #  # build documentation and install in $out
+  #  tox -e docs
+  #  mkdir -pv $out/docs
+  #  cp -rv docs/* $out/docs/
+  #'';
 
   checkPhase = ''
-    ${pep8}/bin/pep8 --ignore=E902 treq
+    pep8 --ignore=E902 treq
     trial treq
   '';
 
-- 
GitLab


From 6c0e6eeb58f6047a8c13754568e631f8e5a8e451 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 22:25:39 +0200
Subject: [PATCH 0211/1490] pythonPackages.ledgerblue: init at 0.1.13

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

diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
new file mode 100644
index 00000000000..9ed18190a8e
--- /dev/null
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchPypi, buildPythonPackage, hidapi
+, pycrypto, pillow, protobuf, future, ecpy
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "ledgerblue";
+  version = "0.1.13";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
+  };
+
+  buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
+
+  meta = with stdenv.lib; {
+    description = "Python library to communicate with Ledger Blue/Nano S";
+    homepage = "https://github.com/LedgerHQ/blue-loader-python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25309c4d7a1..f832beea674 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29632,6 +29632,8 @@ EOF
 
   mnemonic = callPackage ../development/python-modules/mnemonic.nix { };
 
+  ledgerblue = callPackage ../development/python-modules/ledgerblue { };
+
   ecpy = callPackage ../development/python-modules/ecpy { };
 
   trezor = callPackage ../development/python-modules/trezor.nix { };
-- 
GitLab


From b236fa54aa87f87145ac291e7e5a380a23e2e6a0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 22:35:41 +0200
Subject: [PATCH 0212/1490] pythonPackages.keepkey: fix impossible constraint

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

diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
new file mode 100644
index 00000000000..0d7f7661e7d
--- /dev/null
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchPypi, buildPythonPackage, ecdsa
+, mnemonic, protobuf3_0, hidapi }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "keepkey";
+  version = "0.7.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
+  };
+
+  propagatedBuildInputs = [ protobuf3_0 hidapi ];
+
+  buildInputs = [ ecdsa mnemonic ];
+
+  # There are no actual tests: "ImportError: No module named tests"
+  doCheck = false;
+
+  # Remove impossible dependency constraint
+  postPatch = "sed -i -e 's|hidapi==|hidapi>=|' setup.py";
+
+  meta = with stdenv.lib; {
+    description = "KeepKey Python client";
+    homepage = https://github.com/keepkey/python-keepkey;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f832beea674..ab3a8a28a97 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29632,36 +29632,14 @@ EOF
 
   mnemonic = callPackage ../development/python-modules/mnemonic.nix { };
 
+  keepkey = callPackage ../development/python-modules/keepkey { };
+
   ledgerblue = callPackage ../development/python-modules/ledgerblue { };
 
   ecpy = callPackage ../development/python-modules/ecpy { };
 
   trezor = callPackage ../development/python-modules/trezor.nix { };
 
-  keepkey = buildPythonPackage rec{
-    version = "0.7.3";
-    name = "keepkey-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/keepkey/${name}.tar.gz";
-      sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
-    };
-
-    propagatedBuildInputs = with self; [ protobuf3_0 hidapi ];
-
-    buildInputs = with self; [ ecdsa mnemonic ];
-
-    # There are no actual tests: "ImportError: No module named tests"
-    doCheck = false;
-
-    meta = {
-      description = "KeepKey Python client";
-      homepage = https://github.com/keepkey/python-keepkey;
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ np ];
-    };
-  };
-
   semver = buildPythonPackage rec {
     name = "semver-${version}";
     version = "2.2.1";
-- 
GitLab


From 93ff334d6d2f6d65b17dfd44f3eb9b66c2383abc Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 22:40:14 +0200
Subject: [PATCH 0213/1490] pythonPackages.trezor: move expression to
 trezor/default.nix

---
 .../python-modules/{trezor.nix => trezor/default.nix}     | 8 ++++----
 pkgs/top-level/python-packages.nix                        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/python-modules/{trezor.nix => trezor/default.nix} (80%)

diff --git a/pkgs/development/python-modules/trezor.nix b/pkgs/development/python-modules/trezor/default.nix
similarity index 80%
rename from pkgs/development/python-modules/trezor.nix
rename to pkgs/development/python-modules/trezor/default.nix
index 70160dcb0f9..6fc6622cf3f 100644
--- a/pkgs/development/python-modules/trezor.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -1,12 +1,12 @@
-{ lib, fetchurl, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
+{ lib, fetchPypi, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
 
 buildPythonPackage rec {
+  name = "${pname}-${version}";
   pname = "trezor";
   version = "0.7.13";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/t/${pname}/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "d05f388bb56b6f61cc727999cc725078575238a0b6172450322bc55c437fefe5";
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab3a8a28a97..e77ce42c80c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29638,7 +29638,7 @@ EOF
 
   ecpy = callPackage ../development/python-modules/ecpy { };
 
-  trezor = callPackage ../development/python-modules/trezor.nix { };
+  trezor = callPackage ../development/python-modules/trezor { };
 
   semver = buildPythonPackage rec {
     name = "semver-${version}";
-- 
GitLab


From 6217233531ef824f0fa34a55108a1e4dcc84741c Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 22:42:35 +0200
Subject: [PATCH 0214/1490] pythonPackages.libagent: init at 0.9.1

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

diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
new file mode 100644
index 00000000000..5192abf8200
--- /dev/null
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa
+, semver, keepkey, trezor, mnemonic, ledgerblue
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "libagent";
+  version = "0.9.1";
+
+  src = fetchPypi{
+    inherit pname version;
+    sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc";
+  };
+
+  buildInputs = [
+    ed25519 ecdsa semver keepkey
+    trezor mnemonic ledgerblue
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Using hardware wallets as SSH/GPG agent";
+    homepage = "https://github.com/romanz/trezor-agent";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e77ce42c80c..b9b4ba659cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29634,6 +29634,8 @@ EOF
 
   keepkey = callPackage ../development/python-modules/keepkey { };
 
+  libagent = callPackage ../development/python-modules/libagent { };
+
   ledgerblue = callPackage ../development/python-modules/ledgerblue { };
 
   ecpy = callPackage ../development/python-modules/ecpy { };
-- 
GitLab


From e693d5f9863a6ebe29ebce3fea79433465f1256a Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 22:47:06 +0200
Subject: [PATCH 0215/1490] pythonPackages.trezor_agent: 0.7.0 -> 0.9.0

---
 pkgs/top-level/python-packages.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9b4ba659cc..37a04872e9c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29677,15 +29677,19 @@ EOF
   };
 
   trezor_agent = buildPythonPackage rec{
-    version = "0.7.0";
-    name = "trezor_agent-${version}";
+    name = "${pname}-${version}";
+    pname = "trezor_agent";
+    version = "0.9.0";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/trezor_agent/${name}.tar.gz";
-      sha256 = "1x1gwih6w8kxhpgmcp0v1k7mpmfsqiikkjca291sd0v2if24x7q1";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz";
     };
 
-    propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ];
+    propagatedBuildInputs = with self; [
+      trezor libagent ecdsa ed25519
+      mnemonic keepkey semver
+    ];
 
     meta = {
       description = "Using Trezor as hardware SSH agent";
-- 
GitLab


From f93dfd52594bf53889456f7797dd199bca2292ad Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 22:57:42 +0200
Subject: [PATCH 0216/1490] pythonPackages.semver: move to
 pkgs/development/python-modules

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

diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
new file mode 100644
index 00000000000..285da546071
--- /dev/null
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "semver";
+  version = "2.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python package to work with Semantic Versioning (http://semver.org/)";
+    homepage = "https://github.com/k-bx/python-semver";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37a04872e9c..f0450ca3e48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29640,28 +29640,7 @@ EOF
 
   ecpy = callPackage ../development/python-modules/ecpy { };
 
-  trezor = callPackage ../development/python-modules/trezor { };
-
-  semver = buildPythonPackage rec {
-    name = "semver-${version}";
-    version = "2.2.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/semver/${name}.tar.gz";
-      sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
-    };
-
-    meta = {
-      description = "Python package to work with Semantic Versioning (http://semver.org/)";
-      homepage = "https://github.com/k-bx/python-semver";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ np ];
-    };
-  };
-
-  ed25519 = buildPythonPackage rec {
-    name = "ed25519-${version}";
-    version = "1.4";
+  semver = callPackage ../development/python-modules/semver { };
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/e/ed25519/${name}.tar.gz";
-- 
GitLab


From 3463dd1c7bf50adbe8f45f28ced706c7f165edd1 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 22:59:52 +0200
Subject: [PATCH 0217/1490] pythonPackages.ed25519: move to
 pkgs/development/python-modules

---
 .../python-modules/ed25519/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 13 ++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/ed25519/default.nix

diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix
new file mode 100644
index 00000000000..1cdf85385e8
--- /dev/null
+++ b/pkgs/development/python-modules/ed25519/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "ed25519";
+  version = "1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Ed25519 public-key signatures";
+    homepage = "https://github.com/warner/python-ed25519";
+    license = licenses.mit;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0450ca3e48..d6be2efa423 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29642,18 +29642,9 @@ EOF
 
   semver = callPackage ../development/python-modules/semver { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/ed25519/${name}.tar.gz";
-      sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
-    };
+  ed25519 = callPackage ../development/python-modules/ed25519 { };
 
-    meta = {
-      description = "Ed25519 public-key signatures";
-      homepage = "https://github.com/warner/python-ed25519";
-      license = licenses.mit;
-      maintainers = with maintainers; [ np ];
-    };
-  };
+  trezor = callPackage ../development/python-modules/trezor { };
 
   trezor_agent = buildPythonPackage rec{
     name = "${pname}-${version}";
-- 
GitLab


From b3c91274811aad00d3efed81bf27c740fdf86785 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 31 May 2017 23:01:05 +0200
Subject: [PATCH 0218/1490] pythonPackages.mnemonic: move expression to
 mnemonic/default.nix

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

diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix
new file mode 100644
index 00000000000..9f71fdb8e74
--- /dev/null
+++ b/pkgs/development/python-modules/mnemonic/default.nix
@@ -0,0 +1,21 @@
+{ lib, fetchurl, buildPythonPackage, pbkdf2 }:
+
+buildPythonPackage rec {
+  pname = "mnemonic";
+  version = "0.17";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/m/${pname}/${name}.tar.gz";
+    sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn";
+  };
+
+  propagatedBuildInputs = [ pbkdf2 ];
+
+  meta = {
+    description = "Implementation of Bitcoin BIP-0039";
+    homepage = https://github.com/trezor/python-mnemonic;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d6be2efa423..6876be1fd8c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29630,7 +29630,7 @@ EOF
     inherit (pkgs) udev libusb1;
   };
 
-  mnemonic = callPackage ../development/python-modules/mnemonic.nix { };
+  mnemonic = callPackage ../development/python-modules/mnemonic { };
 
   keepkey = callPackage ../development/python-modules/keepkey { };
 
-- 
GitLab


From d7f6367471f69f3bf14e1c846bd031bf918783f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 31 May 2017 23:57:15 +0100
Subject: [PATCH 0219/1490] daemontools: fix build

---
 pkgs/tools/admin/daemontools/default.nix      | 22 ++++++++++---------
 .../fix-nix-usernamespace-build.patch         | 10 +++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch

diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix
index 5594368b04f..7e8c1bccc3e 100644
--- a/pkgs/tools/admin/daemontools/default.nix
+++ b/pkgs/tools/admin/daemontools/default.nix
@@ -2,40 +2,42 @@
 
 stdenv.mkDerivation rec {
   name = "daemontools-0.76";
-  
+
   src = fetchurl {
     url = "https://cr.yp.to/daemontools/${name}.tar.gz";
     sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5";
   };
-  
+
+  patches = [ ./fix-nix-usernamespace-build.patch ];
+
   configurePhase = ''
     cd ${name}
-    
+
     sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
-    
+
     substituteInPlace src/Makefile \
       --replace '/bin/sh' '${bash}/bin/bash -oxtrace'
-    
+
     sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests
-    
+
     cat ${glibc.dev}/include/errno.h
   '';
-  
+
   buildPhase = ''
     package/compile
   '';
-  
+
   installPhase = ''
     for cmd in $(cat package/commands); do
       install -Dm755 "command/$cmd" "$out/bin/$cmd"
     done
   '';
-  
+
   meta = {
     license = stdenv.lib.licenses.publicDomain;
     homepage = https://cr.yp.to/daemontools.html;
     description = "A collection of tools for managing UNIX services.";
-    
+
     maintainers = with stdenv.lib.maintainers; [ kevincox ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch b/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
new file mode 100644
index 00000000000..9b784e7ca11
--- /dev/null
+++ b/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
@@ -0,0 +1,10 @@
+--- admin.org/daemontools-0.76/src/chkshsgr.c	2001-07-12 17:49:49.000000000 +0100
++++ admin/daemontools-0.76/src/chkshsgr.c	2017-05-31 23:54:56.662174028 +0100
+@@ -4,6 +4,7 @@
+ 
+ int main()
+ {
++  return 0;
+   short x[4];
+ 
+   x[0] = x[1] = 0;
-- 
GitLab


From 120275fd6e6c83f73ce6465abc895462a38eb82b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 1 Jun 2017 01:59:58 +0300
Subject: [PATCH 0220/1490] pythonPackages.nbxmpp: 0.5.3 -> 0.5.5

Fix annoying bug with messages being resent on reconnection.
---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c146ea70b2c..696f8ad7c86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14967,12 +14967,12 @@ in {
   };
 
   nbxmpp = buildPythonPackage rec {
-    name = "nbxmpp-0.5.3";
+    name = "nbxmpp-${version}";
+    version = "0.5.5";
 
     src = pkgs.fetchurl {
-      name = "${name}.tar.gz";
-      url = "https://python-nbxmpp.gajim.org/downloads/8";
-      sha256 = "0dcr786dyips1fdvgsn8yvpgcz5j7217fi05c29cfypdl8jnp6mp";
+      url = "mirror://pypi/n/nbxmpp/${name}.tar.gz";
+      sha256 = "1gnzrzrdl4nii1sc5x8p5iw2ya5sl70j3nn34abqsny51p2pzmv6";
     };
 
     meta = {
-- 
GitLab


From a0a6187a186532da89fa4306db37d9c8fd381c0a Mon Sep 17 00:00:00 2001
From: risicle <github@humanleg.org.uk>
Date: Thu, 1 Jun 2017 00:25:07 +0100
Subject: [PATCH 0221/1490] pythonPackages.txaio: disable test_chained_callback
 test as it is removed upstream (#26288)

because it breaks under python3.6
---
 pkgs/development/python-modules/txaio/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 68cb28dc850..98060536638 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -18,8 +18,10 @@ buildPythonPackage rec {
     sed -i '152d' test/test_logging.py
   '';
 
+  # test_chained_callback has been removed just post-2.7.1 because the functionality was decided against and the test
+  # breaks on python 3.6 https://github.com/crossbario/txaio/pull/104
   checkPhase = ''
-    py.test -k "not test_sdist"
+    py.test -k "not (test_sdist or test_chained_callback)"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 371b136ba8bd1bb92098044e2111c3410283aae5 Mon Sep 17 00:00:00 2001
From: risicle <github@humanleg.org.uk>
Date: Thu, 1 Jun 2017 00:30:29 +0100
Subject: [PATCH 0222/1490] pythonPackages.ldap: only set environment variables
 for tests during check phase (#26285)

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

diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index 0e1d8e73a84..ff4d1445f77 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -13,10 +13,12 @@ buildPythonPackage rec {
   };
 
   # Needed by tests to setup a mockup ldap server.
-  BIN = "${openldap}/bin";
-  SBIN = "${openldap}/bin";
-  SLAPD = "${openldap}/libexec/slapd";
-  SCHEMA = "${openldap}/etc/schema";
+  preCheck = ''
+    export BIN="${openldap}/bin"
+    export SBIN="${openldap}/bin"
+    export SLAPD="${openldap}/libexec/slapd"
+    export SCHEMA="${openldap}/etc/schema"
+  '';
 
   patches = lib.singleton (writeText "avoid-syslog.diff" ''
     diff a/Lib/slapdtest.py b/Lib/slapdtest.py
-- 
GitLab


From 634f5f0d0f680b820484baa04ff94c23786df97b Mon Sep 17 00:00:00 2001
From: Stefhen Hovland <stefhen.hovland+github@gmail.com>
Date: Wed, 31 May 2017 19:46:15 -0400
Subject: [PATCH 0223/1490] json-server: init at 0.10.1 (#26266)

json-server: init a 0.10.1
---
 .../node-packages/composition-v4.nix          |     4 +-
 .../node-packages/composition-v6.nix          |     2 +-
 pkgs/development/node-packages/node-env.nix   |   160 +-
 .../node-packages/node-packages-v4.nix        |   491 +-
 .../node-packages/node-packages-v6.json       |     1 +
 .../node-packages/node-packages-v6.nix        | 16427 ++++++++--------
 6 files changed, 8759 insertions(+), 8326 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index 8c4a5390f55..b78bbda5d5e 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index ea30c5b04c4..02a2fc1f3de 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 356e78f027b..bd1de3e9f93 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -57,6 +57,60 @@ let
 
   # Recursively composes the dependencies of a package
   composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+    let
+      fixImpureDependencies = writeTextFile {
+        name = "fixDependencies.js";
+        text = ''
+          var fs = require('fs');
+          var url = require('url');
+
+          /*
+           * Replaces an impure version specification by *
+           */
+          function replaceImpureVersionSpec(versionSpec) {
+              var parsedUrl = url.parse(versionSpec);
+
+              if(versionSpec == "latest" || versionSpec == "unstable" ||
+                  versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
+                  return '*';
+              else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" ||
+                  parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:")
+                  return '*';
+              else
+                  return versionSpec;
+          }
+
+          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+          /* Replace dependencies */
+          if(packageObj.dependencies !== undefined) {
+              for(var dependency in packageObj.dependencies) {
+                  var versionSpec = packageObj.dependencies[dependency];
+                  packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
+              }
+          }
+
+          /* Replace development dependencies */
+          if(packageObj.devDependencies !== undefined) {
+              for(var dependency in packageObj.devDependencies) {
+                  var versionSpec = packageObj.devDependencies[dependency];
+                  packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
+              }
+          }
+
+          /* Replace optional dependencies */
+          if(packageObj.optionalDependencies !== undefined) {
+              for(var dependency in packageObj.optionalDependencies) {
+                  var versionSpec = packageObj.optionalDependencies[dependency];
+                  packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
+              }
+          }
+
+          /* Write the fixed JSON file */
+          fs.writeFileSync("package.json", JSON.stringify(packageObj));
+        '';
+      };
+    in
     ''
       DIR=$(pwd)
       cd $TMPDIR
@@ -96,97 +150,17 @@ let
       # Unset the stripped name to not confuse the next unpack step
       unset strippedName
 
-      # Include the dependencies of the package
+      # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
+      # The following JavaScript replaces these by * to prevent that
       cd "$DIR/${packageName}"
+      node ${fixImpureDependencies}
+
+      # Include the dependencies of the package
       ${includeDependencies { inherit dependencies; }}
       cd ..
       ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
-  pinpointDependencies = {dependencies, production}:
-    let
-      pinpointDependenciesFromPackageJSON = writeTextFile {
-        name = "pinpointDependencies.js";
-        text = ''
-          var fs = require('fs');
-          var path = require('path');
-          
-          function resolveDependencyVersion(location, name) {
-              if(location == process.env['NIX_STORE']) {
-                  return null;
-              } else {
-                  var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
-                  
-                  if(fs.existsSync(dependencyPackageJSON)) {
-                      var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
-                      
-                      if(dependencyPackageObj.name == name) {
-                          return dependencyPackageObj.version;
-                      }
-                  } else {
-                      return resolveDependencyVersion(path.resolve(location, ".."), name);
-                  }
-              }
-          }
-          
-          function replaceDependencies(dependencies) {
-              if(typeof dependencies == "object" && dependencies !== null) {
-                  for(var dependency in dependencies) {
-                      var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
-                      
-                      if(resolvedVersion === null) {
-                          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
-                      } else {
-                          dependencies[dependency] = resolvedVersion;
-                      }
-                  }
-              }
-          }
-          
-          /* Read the package.json configuration */
-          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-          
-          /* Pinpoint all dependencies */
-          replaceDependencies(packageObj.dependencies);
-          if(process.argv[2] == "development") {
-              replaceDependencies(packageObj.devDependencies);
-          }
-          replaceDependencies(packageObj.optionalDependencies);
-          
-          /* Write the fixed package.json file */
-          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
-        '';
-      };
-    in
-    ''
-      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
-      
-      ${stdenv.lib.optionalString (dependencies != [])
-        ''
-          if [ -d node_modules ]
-          then
-              cd node_modules
-              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
-              cd ..
-          fi
-        ''}
-    '';
-  
-  # Recursively traverses all dependencies of a package and pinpoints all
-  # dependencies in the package.json file to the versions that are actually
-  # being used.
-  
-  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
-    ''
-      if [ -d "${packageName}" ]
-      then
-          cd "${packageName}"
-          ${pinpointDependencies { inherit dependencies production; }}
-          cd ..
-          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-      fi
-    '';
-
   # Extract the Node.js source code which is used to compile packages with
   # native bindings
   nodeSources = runCommand "node-sources" {} ''
@@ -209,9 +183,7 @@ let
       buildPhase = args.buildPhase or "true";
 
       compositionScript = composePackage args;
-      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-      
-      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
+      passAsFile = [ "compositionScript" ];
 
       installPhase = args.installPhase or ''
         # Create and enter a root node_modules/ folder
@@ -220,10 +192,6 @@ let
 
         # Compose the package and all its dependencies
         source $compositionScriptPath
-        
-        # Pinpoint the versions of all dependencies to the ones that are actually being used
-        echo "pinpointing versions of dependencies..."
-        source $pinpointDependenciesScriptPath
 
         # Patch the shebangs of the bundled modules to prevent them from
         # calling executables outside the Nix store as much as possible
@@ -286,18 +254,12 @@ let
         buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
 
         includeScript = includeDependencies { inherit dependencies; };
-        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-        
-        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+        passAsFile = [ "includeScript" ];
 
         buildCommand = ''
           mkdir -p $out/lib
           cd $out/lib
           source $includeScriptPath
-          
-          # Pinpoint the versions of all dependencies to the ones that are actually being used
-          echo "pinpointing versions of dependencies..."
-          source $pinpointDependenciesScriptPath
 
           # Create fake package.json to make the npm commands work properly
           cat > package.json <<EOF
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 50104eaa26e..4d6c57c65c3 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -67,13 +67,13 @@ let
         sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
-    "minimatch-3.0.3" = {
+    "minimatch-3.0.4" = {
       name = "minimatch";
       packageName = "minimatch";
-      version = "3.0.3";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz";
-        sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774";
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
       };
     };
     "once-1.4.0" = {
@@ -454,13 +454,13 @@ let
         sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde";
       };
     };
-    "time-stamp-1.0.1" = {
+    "time-stamp-1.1.0" = {
       name = "time-stamp";
       packageName = "time-stamp";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.1.tgz";
-        sha1 = "9f4bd23559c9365966f3302dbba2b07c6b99b151";
+        url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz";
+        sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3";
       };
     };
     "glogg-1.0.0" = {
@@ -679,13 +679,13 @@ let
         sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
       };
     };
-    "string_decoder-1.0.0" = {
+    "string_decoder-1.0.1" = {
       name = "string_decoder";
       packageName = "string_decoder";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz";
-        sha1 = "f06f41157b664d86069f84bdbdc9b0d8ab281667";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz";
+        sha1 = "62e200f039955a6810d8df0a33ffc0f013662d98";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -697,6 +697,15 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
+    "safe-buffer-5.0.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
+      };
+    };
     "clone-1.0.2" = {
       name = "clone";
       packageName = "clone";
@@ -904,13 +913,13 @@ let
         sha1 = "c1c4b9bee3e09725ddb106b75c1e301fe2f18b26";
       };
     };
-    "kind-of-3.2.0" = {
+    "kind-of-3.2.2" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "3.2.0";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.0.tgz";
-        sha1 = "b58abe4d5c044ad33726a8c1525b48cf891bff07";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz";
+        sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
       };
     };
     "normalize-path-2.1.1" = {
@@ -1093,13 +1102,13 @@ let
         sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4";
       };
     };
-    "is-dotfile-1.0.2" = {
+    "is-dotfile-1.0.3" = {
       name = "is-dotfile";
       packageName = "is-dotfile";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz";
-        sha1 = "2c132383f39199f8edc268ca01b9b007d205cc4d";
+        url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz";
+        sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1";
       };
     };
     "glob-parent-2.0.0" = {
@@ -1642,13 +1651,13 @@ let
         sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171";
       };
     };
-    "glob-7.1.1" = {
+    "glob-7.1.2" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.1";
+      version = "7.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
-        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
+        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
       };
     };
     "graceful-fs-4.1.11" = {
@@ -1660,13 +1669,13 @@ let
         sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
       };
     };
-    "npmlog-4.0.2" = {
+    "npmlog-4.1.0" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
-        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz";
+        sha1 = "dc59bee85f64f00ed424efb2af0783df25d1c0b5";
       };
     };
     "osenv-0.1.4" = {
@@ -1813,13 +1822,13 @@ let
         sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
       };
     };
-    "wide-align-1.1.0" = {
+    "wide-align-1.1.2" = {
       name = "wide-align";
       packageName = "wide-align";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz";
-        sha1 = "40edde802a71fea1f070da3e62dcda2e7add96ad";
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
+        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
       };
     };
     "code-point-at-1.1.0" = {
@@ -2002,15 +2011,6 @@ let
         sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
       };
     };
-    "safe-buffer-5.0.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
-      };
-    };
     "stringstream-0.0.5" = {
       name = "stringstream";
       packageName = "stringstream";
@@ -2326,22 +2326,22 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "debug-2.6.6" = {
+    "debug-2.6.8" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.6";
+      version = "2.6.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz";
-        sha1 = "a9fa6fbe9ca43cf1e79f73b75c0189cbb7d6db5a";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
+        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
       };
     };
-    "express-4.15.2" = {
+    "express-4.15.3" = {
       name = "express";
       packageName = "express";
-      version = "4.15.2";
+      version = "4.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.15.2.tgz";
-        sha1 = "af107fc148504457f2dca9a6f2571d7129b97b35";
+        url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz";
+        sha1 = "bab65d0f03aa80c358408972fc700f916944b662";
       };
     };
     "rc-1.2.1" = {
@@ -2353,13 +2353,13 @@ let
         sha1 = "2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95";
       };
     };
-    "serve-favicon-2.4.2" = {
+    "serve-favicon-2.4.3" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
-      version = "2.4.2";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.2.tgz";
-        sha1 = "aed1d8de67d5b83192cf31fdf53d2ea29464363e";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.3.tgz";
+        sha1 = "5986b17b0502642b641c21f818b1acce32025d23";
       };
     };
     "strong-data-uri-1.0.4" = {
@@ -2893,13 +2893,13 @@ let
         sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
       };
     };
-    "ms-0.7.3" = {
+    "ms-2.0.0" = {
       name = "ms";
       packageName = "ms";
-      version = "0.7.3";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz";
-        sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff";
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
     "accepts-1.3.3" = {
@@ -2956,13 +2956,13 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "debug-2.6.1" = {
+    "debug-2.6.7" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.1";
+      version = "2.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
-        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz";
+        sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e";
       };
     };
     "depd-1.1.0" = {
@@ -3001,13 +3001,13 @@ let
         sha1 = "6f631aef336d6c46362b51764044ce216be3c051";
       };
     };
-    "finalhandler-1.0.2" = {
+    "finalhandler-1.0.3" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.2.tgz";
-        sha1 = "d0e36f9dbc557f2de14423df6261889e9d60c93a";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz";
+        sha1 = "ef47e77950e999780e86022a560e3217e0d0cc89";
       };
     };
     "fresh-0.5.0" = {
@@ -3082,22 +3082,22 @@ let
         sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e";
       };
     };
-    "send-0.15.1" = {
+    "send-0.15.3" = {
       name = "send";
       packageName = "send";
-      version = "0.15.1";
+      version = "0.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.1.tgz";
-        sha1 = "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f";
+        url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz";
+        sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309";
       };
     };
-    "serve-static-1.12.1" = {
+    "serve-static-1.12.3" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.12.1";
+      version = "1.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz";
-        sha1 = "7443a965e3ced647aceb5639fa06bf4d1bbe0039";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz";
+        sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2";
       };
     };
     "setprototypeof-1.0.3" = {
@@ -3154,24 +3154,6 @@ let
         sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9";
       };
     };
-    "ms-0.7.2" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
-        sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
-      };
-    };
-    "debug-2.6.4" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz";
-        sha1 = "7586a9b3c39741c0282ae33445c4e8ac74734fe0";
-      };
-    };
     "unpipe-1.0.0" = {
       name = "unpipe";
       packageName = "unpipe";
@@ -3244,13 +3226,13 @@ let
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     };
-    "deep-extend-0.4.1" = {
+    "deep-extend-0.4.2" = {
       name = "deep-extend";
       packageName = "deep-extend";
-      version = "0.4.1";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz";
-        sha1 = "efe4113d08085f4e6f9687759810f807469e2253";
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
+        sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
       };
     };
     "strip-json-comments-2.0.1" = {
@@ -3262,15 +3244,6 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
-    "ms-1.0.0" = {
-      name = "ms";
-      packageName = "ms";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz";
-        sha1 = "59adcd22edc543f7b5381862d31387b1f4bc9473";
-      };
-    };
     "truncate-1.0.5" = {
       name = "truncate";
       packageName = "truncate";
@@ -3289,13 +3262,13 @@ let
         sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
       };
     };
-    "node-pre-gyp-0.6.34" = {
+    "node-pre-gyp-0.6.35" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.34";
+      version = "0.6.35";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz";
-        sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.35.tgz";
+        sha1 = "1c161fc9fbf1f3ffecd751959f0fdbd12a56c4ab";
       };
     };
     "nopt-4.0.1" = {
@@ -3541,13 +3514,13 @@ let
         sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
       };
     };
-    "fstream-npm-1.2.0" = {
+    "fstream-npm-1.2.1" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz";
-        sha1 = "d2c3c89101346982d64e57091c38487bda916fce";
+        url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
+        sha1 = "08c4a452f789dcbac4c89a4563c902b2c862fd5b";
       };
     };
     "iferr-0.1.5" = {
@@ -3559,13 +3532,13 @@ let
         sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
       };
     };
-    "init-package-json-1.9.6" = {
+    "init-package-json-1.10.1" = {
       name = "init-package-json";
       packageName = "init-package-json";
-      version = "1.9.6";
+      version = "1.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.6.tgz";
-        sha1 = "789fc2b74466a4952b9ea77c0575bc78ebd60a61";
+        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.10.1.tgz";
+        sha1 = "cd873a167796befb99612b28762a0b6393fd8f6a";
       };
     };
     "lazy-property-1.0.0" = {
@@ -3712,6 +3685,15 @@ let
         sha1 = "52465d50c2d20294a57125b996baedbf56c5004b";
       };
     };
+    "npmlog-4.0.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
+        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
+      };
+    };
     "opener-1.4.3" = {
       name = "opener";
       packageName = "opener";
@@ -3946,13 +3928,13 @@ let
         sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747";
       };
     };
-    "jsonparse-1.3.0" = {
+    "jsonparse-1.3.1" = {
       name = "jsonparse";
       packageName = "jsonparse";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz";
-        sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8";
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz";
+        sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
       };
     };
     "through-2.3.8" = {
@@ -4198,22 +4180,22 @@ let
         sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
       };
     };
-    "boxen-1.0.0" = {
+    "boxen-1.1.0" = {
       name = "boxen";
       packageName = "boxen";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.0.0.tgz";
-        sha1 = "b2694baf1f605f708ff0177c12193b22f29aaaab";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz";
+        sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102";
       };
     };
-    "configstore-3.0.0" = {
+    "configstore-3.1.0" = {
       name = "configstore";
       packageName = "configstore";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-3.0.0.tgz";
-        sha1 = "e1b8669c1803ccc50b545e92f8e6e79aa80e0196";
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz";
+        sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1";
       };
     };
     "is-npm-1.0.0" = {
@@ -4261,13 +4243,13 @@ let
         sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
       };
     };
-    "ansi-align-1.1.0" = {
+    "ansi-align-2.0.0" = {
       name = "ansi-align";
       packageName = "ansi-align";
-      version = "1.1.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
-        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";
+        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
       };
     };
     "camelcase-4.1.0" = {
@@ -4414,6 +4396,15 @@ let
         sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1";
       };
     };
+    "make-dir-1.0.0" = {
+      name = "make-dir";
+      packageName = "make-dir";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz";
+        sha1 = "97a011751e91dd87cfadef58832ebb04936de978";
+      };
+    };
     "unique-string-1.0.0" = {
       name = "unique-string";
       packageName = "unique-string";
@@ -4423,6 +4414,15 @@ let
         sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
       };
     };
+    "write-file-atomic-2.1.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
+        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
+      };
+    };
     "is-obj-1.0.1" = {
       name = "is-obj";
       packageName = "is-obj";
@@ -5089,13 +5089,13 @@ let
         sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
       };
     };
-    "stack-trace-0.0.9" = {
+    "stack-trace-0.0.10" = {
       name = "stack-trace";
       packageName = "stack-trace";
-      version = "0.0.9";
+      version = "0.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
-        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
+        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
       };
     };
     "jsonfile-2.4.0" = {
@@ -5113,10 +5113,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.5";
+    version = "1.12.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz";
-      sha1 = "809f4585419112bbfe46a073ad7543af18c27346";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz";
+      sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -5145,7 +5145,7 @@ in
                 ];
               })
               sources."inherits-2.0.3"
-              (sources."minimatch-3.0.3" // {
+              (sources."minimatch-3.0.4" // {
                 dependencies = [
                   (sources."brace-expansion-1.1.7" // {
                     dependencies = [
@@ -5217,7 +5217,7 @@ in
           sources."dateformat-2.0.0"
           (sources."fancy-log-1.3.0" // {
             dependencies = [
-              sources."time-stamp-1.0.1"
+              sources."time-stamp-1.1.0"
             ];
           })
           (sources."gulplog-1.0.0" // {
@@ -5286,7 +5286,11 @@ in
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-1.0.0"
+                  (sources."string_decoder-1.0.1" // {
+                    dependencies = [
+                      sources."safe-buffer-5.0.1"
+                    ];
+                  })
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -5355,7 +5359,7 @@ in
                   sources."extglob-0.3.2"
                   sources."filename-regex-2.0.1"
                   sources."is-extglob-1.0.0"
-                  (sources."kind-of-3.2.0" // {
+                  (sources."kind-of-3.2.2" // {
                     dependencies = [
                       sources."is-buffer-1.1.5"
                     ];
@@ -5382,7 +5386,7 @@ in
                           sources."glob-parent-2.0.0"
                         ];
                       })
-                      sources."is-dotfile-1.0.2"
+                      sources."is-dotfile-1.0.3"
                     ];
                   })
                   (sources."regex-cache-0.4.3" // {
@@ -5628,7 +5632,7 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      (sources."glob-7.1.1" // {
+      (sources."glob-7.1.2" // {
         dependencies = [
           sources."fs.realpath-1.0.0"
           (sources."inflight-1.0.6" // {
@@ -5646,7 +5650,7 @@ in
         ];
       })
       sources."graceful-fs-4.1.11"
-      (sources."minimatch-3.0.3" // {
+      (sources."minimatch-3.0.4" // {
         dependencies = [
           (sources."brace-expansion-1.1.7" // {
             dependencies = [
@@ -5666,7 +5670,7 @@ in
           sources."abbrev-1.1.0"
         ];
       })
-      (sources."npmlog-4.0.2" // {
+      (sources."npmlog-4.1.0" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
@@ -5678,7 +5682,11 @@ in
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-1.0.0"
+                  (sources."string_decoder-1.0.1" // {
+                    dependencies = [
+                      sources."safe-buffer-5.0.1"
+                    ];
+                  })
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -5706,7 +5714,7 @@ in
                   sources."ansi-regex-2.1.1"
                 ];
               })
-              sources."wide-align-1.1.0"
+              sources."wide-align-1.1.2"
             ];
           })
           sources."set-blocking-2.0.0"
@@ -6018,12 +6026,12 @@ in
           })
         ];
       })
-      (sources."debug-2.6.6" // {
+      (sources."debug-2.6.8" // {
         dependencies = [
-          sources."ms-0.7.3"
+          sources."ms-2.0.0"
         ];
       })
-      (sources."express-4.15.2" // {
+      (sources."express-4.15.3" // {
         dependencies = [
           (sources."accepts-1.3.3" // {
             dependencies = [
@@ -6040,22 +6048,17 @@ in
           sources."content-type-1.0.2"
           sources."cookie-0.3.1"
           sources."cookie-signature-1.0.6"
-          (sources."debug-2.6.1" // {
+          (sources."debug-2.6.7" // {
             dependencies = [
-              sources."ms-0.7.2"
+              sources."ms-2.0.0"
             ];
           })
           sources."depd-1.1.0"
           sources."encodeurl-1.0.1"
           sources."escape-html-1.0.3"
           sources."etag-1.8.0"
-          (sources."finalhandler-1.0.2" // {
+          (sources."finalhandler-1.0.3" // {
             dependencies = [
-              (sources."debug-2.6.4" // {
-                dependencies = [
-                  sources."ms-0.7.3"
-                ];
-              })
               sources."unpipe-1.0.0"
             ];
           })
@@ -6077,7 +6080,7 @@ in
           })
           sources."qs-6.4.0"
           sources."range-parser-1.2.0"
-          (sources."send-0.15.1" // {
+          (sources."send-0.15.3" // {
             dependencies = [
               sources."destroy-1.0.4"
               (sources."http-errors-1.6.1" // {
@@ -6086,10 +6089,10 @@ in
                 ];
               })
               sources."mime-1.3.4"
-              sources."ms-0.7.2"
+              sources."ms-2.0.0"
             ];
           })
-          sources."serve-static-1.12.1"
+          sources."serve-static-1.12.3"
           sources."setprototypeof-1.0.3"
           sources."statuses-1.3.1"
           (sources."type-is-1.6.15" // {
@@ -6114,7 +6117,7 @@ in
             ];
           })
           sources."inherits-2.0.3"
-          (sources."minimatch-3.0.3" // {
+          (sources."minimatch-3.0.4" // {
             dependencies = [
               (sources."brace-expansion-1.1.7" // {
                 dependencies = [
@@ -6134,19 +6137,20 @@ in
       sources."path-is-absolute-1.0.1"
       (sources."rc-1.2.1" // {
         dependencies = [
-          sources."deep-extend-0.4.1"
+          sources."deep-extend-0.4.2"
           sources."ini-1.3.4"
           sources."minimist-1.2.0"
           sources."strip-json-comments-2.0.1"
         ];
       })
       sources."semver-4.3.6"
-      (sources."serve-favicon-2.4.2" // {
+      (sources."serve-favicon-2.4.3" // {
         dependencies = [
           sources."etag-1.8.0"
           sources."fresh-0.5.0"
-          sources."ms-1.0.0"
+          sources."ms-2.0.0"
           sources."parseurl-1.3.1"
+          sources."safe-buffer-5.0.1"
         ];
       })
       (sources."strong-data-uri-1.0.4" // {
@@ -6157,7 +6161,7 @@ in
       (sources."v8-debug-1.0.1" // {
         dependencies = [
           sources."nan-2.6.2"
-          (sources."node-pre-gyp-0.6.34" // {
+          (sources."node-pre-gyp-0.6.35" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -6175,7 +6179,7 @@ in
                   })
                 ];
               })
-              (sources."npmlog-4.0.2" // {
+              (sources."npmlog-4.1.0" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.4" // {
                     dependencies = [
@@ -6187,7 +6191,11 @@ in
                           sources."isarray-1.0.0"
                           sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-1.0.0"
+                          (sources."string_decoder-1.0.1" // {
+                            dependencies = [
+                              sources."safe-buffer-5.0.1"
+                            ];
+                          })
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -6215,7 +6223,7 @@ in
                           sources."ansi-regex-2.1.1"
                         ];
                       })
-                      sources."wide-align-1.1.0"
+                      sources."wide-align-1.1.2"
                     ];
                   })
                   sources."set-blocking-2.0.0"
@@ -6311,7 +6319,7 @@ in
               })
               (sources."rimraf-2.6.1" // {
                 dependencies = [
-                  (sources."glob-7.1.1" // {
+                  (sources."glob-7.1.2" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
                       (sources."inflight-1.0.6" // {
@@ -6320,7 +6328,7 @@ in
                         ];
                       })
                       sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.3" // {
+                      (sources."minimatch-3.0.4" // {
                         dependencies = [
                           (sources."brace-expansion-1.1.7" // {
                             dependencies = [
@@ -6362,7 +6370,7 @@ in
                   (sources."fstream-ignore-1.0.5" // {
                     dependencies = [
                       sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.3" // {
+                      (sources."minimatch-3.0.4" // {
                         dependencies = [
                           (sources."brace-expansion-1.1.7" // {
                             dependencies = [
@@ -6386,7 +6394,11 @@ in
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-1.0.0"
+                      (sources."string_decoder-1.0.1" // {
+                        dependencies = [
+                          sources."safe-buffer-5.0.1"
+                        ];
+                      })
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -6400,7 +6412,7 @@ in
       (sources."v8-profiler-5.7.0" // {
         dependencies = [
           sources."nan-2.6.2"
-          (sources."node-pre-gyp-0.6.34" // {
+          (sources."node-pre-gyp-0.6.35" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -6418,7 +6430,7 @@ in
                   })
                 ];
               })
-              (sources."npmlog-4.0.2" // {
+              (sources."npmlog-4.1.0" // {
                 dependencies = [
                   (sources."are-we-there-yet-1.1.4" // {
                     dependencies = [
@@ -6430,7 +6442,11 @@ in
                           sources."isarray-1.0.0"
                           sources."inherits-2.0.3"
                           sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-1.0.0"
+                          (sources."string_decoder-1.0.1" // {
+                            dependencies = [
+                              sources."safe-buffer-5.0.1"
+                            ];
+                          })
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -6458,7 +6474,7 @@ in
                           sources."ansi-regex-2.1.1"
                         ];
                       })
-                      sources."wide-align-1.1.0"
+                      sources."wide-align-1.1.2"
                     ];
                   })
                   sources."set-blocking-2.0.0"
@@ -6554,7 +6570,7 @@ in
               })
               (sources."rimraf-2.6.1" // {
                 dependencies = [
-                  (sources."glob-7.1.1" // {
+                  (sources."glob-7.1.2" // {
                     dependencies = [
                       sources."fs.realpath-1.0.0"
                       (sources."inflight-1.0.6" // {
@@ -6563,7 +6579,7 @@ in
                         ];
                       })
                       sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.3" // {
+                      (sources."minimatch-3.0.4" // {
                         dependencies = [
                           (sources."brace-expansion-1.1.7" // {
                             dependencies = [
@@ -6605,7 +6621,7 @@ in
                   (sources."fstream-ignore-1.0.5" // {
                     dependencies = [
                       sources."inherits-2.0.3"
-                      (sources."minimatch-3.0.3" // {
+                      (sources."minimatch-3.0.4" // {
                         dependencies = [
                           (sources."brace-expansion-1.1.7" // {
                             dependencies = [
@@ -6629,7 +6645,11 @@ in
                       sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
                       sources."process-nextick-args-1.0.7"
-                      sources."string_decoder-1.0.0"
+                      (sources."string_decoder-1.0.1" // {
+                        dependencies = [
+                          sources."safe-buffer-5.0.1"
+                        ];
+                      })
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -6704,10 +6724,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.34";
+    version = "0.6.35";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz";
-      sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.35.tgz";
+      sha1 = "1c161fc9fbf1f3ffecd751959f0fdbd12a56c4ab";
     };
     dependencies = [
       (sources."mkdirp-0.5.1" // {
@@ -6726,7 +6746,7 @@ in
           })
         ];
       })
-      (sources."npmlog-4.0.2" // {
+      (sources."npmlog-4.1.0" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
@@ -6738,7 +6758,11 @@ in
                   sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
                   sources."process-nextick-args-1.0.7"
-                  sources."string_decoder-1.0.0"
+                  (sources."string_decoder-1.0.1" // {
+                    dependencies = [
+                      sources."safe-buffer-5.0.1"
+                    ];
+                  })
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -6766,7 +6790,7 @@ in
                   sources."ansi-regex-2.1.1"
                 ];
               })
-              sources."wide-align-1.1.0"
+              sources."wide-align-1.1.2"
             ];
           })
           sources."set-blocking-2.0.0"
@@ -6774,7 +6798,7 @@ in
       })
       (sources."rc-1.2.1" // {
         dependencies = [
-          sources."deep-extend-0.4.1"
+          sources."deep-extend-0.4.2"
           sources."ini-1.3.4"
           sources."minimist-1.2.0"
           sources."strip-json-comments-2.0.1"
@@ -6870,7 +6894,7 @@ in
       })
       (sources."rimraf-2.6.1" // {
         dependencies = [
-          (sources."glob-7.1.1" // {
+          (sources."glob-7.1.2" // {
             dependencies = [
               sources."fs.realpath-1.0.0"
               (sources."inflight-1.0.6" // {
@@ -6879,7 +6903,7 @@ in
                 ];
               })
               sources."inherits-2.0.3"
-              (sources."minimatch-3.0.3" // {
+              (sources."minimatch-3.0.4" // {
                 dependencies = [
                   (sources."brace-expansion-1.1.7" // {
                     dependencies = [
@@ -6913,9 +6937,9 @@ in
       })
       (sources."tar-pack-3.4.0" // {
         dependencies = [
-          (sources."debug-2.6.6" // {
+          (sources."debug-2.6.8" // {
             dependencies = [
-              sources."ms-0.7.3"
+              sources."ms-2.0.0"
             ];
           })
           (sources."fstream-1.0.11" // {
@@ -6927,7 +6951,7 @@ in
           (sources."fstream-ignore-1.0.5" // {
             dependencies = [
               sources."inherits-2.0.3"
-              (sources."minimatch-3.0.3" // {
+              (sources."minimatch-3.0.4" // {
                 dependencies = [
                   (sources."brace-expansion-1.1.7" // {
                     dependencies = [
@@ -6951,7 +6975,11 @@ in
               sources."isarray-1.0.0"
               sources."inherits-2.0.3"
               sources."process-nextick-args-1.0.7"
-              sources."string_decoder-1.0.0"
+              (sources."string_decoder-1.0.1" // {
+                dependencies = [
+                  sources."safe-buffer-5.0.1"
+                ];
+              })
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -6970,15 +6998,15 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.5.0";
+    version = "4.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz";
-      sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475";
+      url = "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz";
+      sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
         dependencies = [
-          sources."jsonparse-1.3.0"
+          sources."jsonparse-1.3.1"
           sources."through-2.3.8"
         ];
       })
@@ -7016,11 +7044,11 @@ in
       sources."fs-vacuum-1.2.10"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fstream-1.0.11"
-      (sources."fstream-npm-1.2.0" // {
+      (sources."fstream-npm-1.2.1" // {
         dependencies = [
           (sources."fstream-ignore-1.0.5" // {
             dependencies = [
-              (sources."minimatch-3.0.3" // {
+              (sources."minimatch-3.0.4" // {
                 dependencies = [
                   (sources."brace-expansion-1.1.7" // {
                     dependencies = [
@@ -7034,10 +7062,10 @@ in
           })
         ];
       })
-      (sources."glob-7.1.1" // {
+      (sources."glob-7.1.2" // {
         dependencies = [
           sources."fs.realpath-1.0.0"
-          (sources."minimatch-3.0.3" // {
+          (sources."minimatch-3.0.4" // {
             dependencies = [
               (sources."brace-expansion-1.1.7" // {
                 dependencies = [
@@ -7057,7 +7085,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
-      (sources."init-package-json-1.9.6" // {
+      (sources."init-package-json-1.10.1" // {
         dependencies = [
           sources."promzard-0.3.0"
         ];
@@ -7126,7 +7154,7 @@ in
       })
       (sources."node-gyp-3.6.1" // {
         dependencies = [
-          (sources."minimatch-3.0.3" // {
+          (sources."minimatch-3.0.4" // {
             dependencies = [
               (sources."brace-expansion-1.1.7" // {
                 dependencies = [
@@ -7185,7 +7213,7 @@ in
                   })
                 ];
               })
-              sources."wide-align-1.1.0"
+              sources."wide-align-1.1.2"
             ];
           })
           sources."set-blocking-2.0.0"
@@ -7227,7 +7255,11 @@ in
           sources."core-util-is-1.0.2"
           sources."isarray-1.0.0"
           sources."process-nextick-args-1.0.7"
-          sources."string_decoder-1.0.0"
+          (sources."string_decoder-1.0.1" // {
+            dependencies = [
+              sources."safe-buffer-5.0.1"
+            ];
+          })
           sources."util-deprecate-1.0.2"
         ];
       })
@@ -7362,22 +7394,9 @@ in
       sources."unpipe-1.0.0"
       (sources."update-notifier-2.1.0" // {
         dependencies = [
-          (sources."boxen-1.0.0" // {
+          (sources."boxen-1.1.0" // {
             dependencies = [
-              (sources."ansi-align-1.1.0" // {
-                dependencies = [
-                  (sources."string-width-1.0.2" // {
-                    dependencies = [
-                      sources."code-point-at-1.1.0"
-                      (sources."is-fullwidth-code-point-1.0.0" // {
-                        dependencies = [
-                          sources."number-is-nan-1.0.1"
-                        ];
-                      })
-                    ];
-                  })
-                ];
-              })
+              sources."ansi-align-2.0.0"
               sources."camelcase-4.1.0"
               sources."cli-boxes-1.0.0"
               (sources."string-width-2.0.0" // {
@@ -7432,18 +7451,24 @@ in
               sources."supports-color-2.0.0"
             ];
           })
-          (sources."configstore-3.0.0" // {
+          (sources."configstore-3.1.0" // {
             dependencies = [
               (sources."dot-prop-4.1.1" // {
                 dependencies = [
                   sources."is-obj-1.0.1"
                 ];
               })
+              (sources."make-dir-1.0.0" // {
+                dependencies = [
+                  sources."pify-2.3.0"
+                ];
+              })
               (sources."unique-string-1.0.0" // {
                 dependencies = [
                   sources."crypto-random-string-1.0.0"
                 ];
               })
+              sources."write-file-atomic-2.1.0"
             ];
           })
           sources."is-npm-1.0.0"
@@ -7478,7 +7503,7 @@ in
                     dependencies = [
                       (sources."rc-1.2.1" // {
                         dependencies = [
-                          sources."deep-extend-0.4.1"
+                          sources."deep-extend-0.4.2"
                           sources."minimist-1.2.0"
                           sources."strip-json-comments-2.0.1"
                         ];
@@ -7490,7 +7515,7 @@ in
                     dependencies = [
                       (sources."rc-1.2.1" // {
                         dependencies = [
-                          sources."deep-extend-0.4.1"
+                          sources."deep-extend-0.4.2"
                           sources."minimist-1.2.0"
                           sources."strip-json-comments-2.0.1"
                         ];
@@ -7550,10 +7575,10 @@ in
   titanium = nodeEnv.buildNodePackage {
     name = "titanium";
     packageName = "titanium";
-    version = "5.0.13";
+    version = "5.0.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.13.tgz";
-      sha1 = "a7bfb383643fd93126cf6ac454dcc81e48be6d6d";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.14.tgz";
+      sha1 = "140bd332624acae65113a3ffec10b8cbb940ad0b";
     };
     dependencies = [
       sources."adm-zip-0.4.7"
@@ -7614,7 +7639,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.2.0" // {
+                              (sources."kind-of-3.2.2" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.5"
                                 ];
@@ -7630,7 +7655,7 @@ in
                         dependencies = [
                           (sources."align-text-0.1.4" // {
                             dependencies = [
-                              (sources."kind-of-3.2.0" // {
+                              (sources."kind-of-3.2.2" // {
                                 dependencies = [
                                   sources."is-buffer-1.1.5"
                                 ];
@@ -7783,7 +7808,7 @@ in
           sources."eyes-0.1.8"
           sources."isstream-0.1.2"
           sources."pkginfo-0.3.1"
-          sources."stack-trace-0.0.9"
+          sources."stack-trace-0.0.10"
         ];
       })
       (sources."fs-extra-2.1.2" // {
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 96859962f0f..98d722f67d4 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -28,6 +28,7 @@
 , "jshint"
 , "json"
 , "jsontool"
+, "json-server"
 , "js-yaml"
 , "karma"
 , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 05a9f45e520..3e65dd53a07 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,34 +1,88 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "colors-0.6.0-1" = {
-      name = "colors";
-      packageName = "colors";
-      version = "0.6.0-1";
+    "async-2.4.1" = {
+      name = "async";
+      packageName = "async";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz";
-        sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a";
+        url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz";
+        sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7";
       };
     };
-    "ejs-2.3.4" = {
-      name = "ejs";
-      packageName = "ejs";
-      version = "2.3.4";
+    "babel-core-6.24.1" = {
+      name = "babel-core";
+      packageName = "babel-core";
+      version = "6.24.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-2.3.4.tgz";
-        sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98";
+        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz";
+        sha1 = "8c428564dce1e1f41fb337ec34f4c3b022b5ad83";
       };
     };
-    "pkginfo-0.2.2" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.2.2";
+    "babel-plugin-minify-constant-folding-0.1.1" = {
+      name = "babel-plugin-minify-constant-folding";
+      packageName = "babel-plugin-minify-constant-folding";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz";
-        sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e";
+        url = "https://registry.npmjs.org/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.1.1.tgz";
+        sha1 = "905fd18b19f1eccbdea251f6f4935edfaee14ab8";
+      };
+    };
+    "babel-plugin-minify-dead-code-elimination-0.1.6" = {
+      name = "babel-plugin-minify-dead-code-elimination";
+      packageName = "babel-plugin-minify-dead-code-elimination";
+      version = "0.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.1.6.tgz";
+        sha1 = "c5471346fb0a1046863fd765c784cba97d7b22e3";
+      };
+    };
+    "babel-plugin-minify-numeric-literals-0.1.1" = {
+      name = "babel-plugin-minify-numeric-literals";
+      packageName = "babel-plugin-minify-numeric-literals";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.1.1.tgz";
+        sha1 = "d4b8b0c925f874714ee33ee4b26678583d7ce7fb";
+      };
+    };
+    "babel-traverse-6.24.1" = {
+      name = "babel-traverse";
+      packageName = "babel-traverse";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz";
+        sha1 = "ab36673fd356f9a0948659e7b338d5feadb31695";
+      };
+    };
+    "babel-types-6.24.1" = {
+      name = "babel-types";
+      packageName = "babel-types";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz";
+        sha1 = "a136879dc15b3606bda0d90c1fc74304c2ff0975";
+      };
+    };
+    "babylon-6.17.1" = {
+      name = "babylon";
+      packageName = "babylon";
+      version = "6.17.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz";
+        sha1 = "17f14fddf361b695981fe679385e4f1c01ebd86f";
+      };
+    };
+    "colors-0.6.0-1" = {
+      name = "colors";
+      packageName = "colors";
+      version = "0.6.0-1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-0.6.0-1.tgz";
+        sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a";
       };
     };
     "commander-0.6.1" = {
@@ -40,22 +94,31 @@ let
         sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
       };
     };
-    "wrench-1.3.9" = {
-      name = "wrench";
-      packageName = "wrench";
-      version = "1.3.9";
+    "deasync-0.1.9" = {
+      name = "deasync";
+      packageName = "deasync";
+      version = "0.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz";
-        sha1 = "6f13ec35145317eb292ca5f6531391b244111411";
+        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.9.tgz";
+        sha1 = "f58dd49fa63110c74bea8405a90a828be26d3a24";
       };
     };
-    "xmldom-0.1.19" = {
-      name = "xmldom";
-      packageName = "xmldom";
-      version = "0.1.19";
+    "ejs-2.3.4" = {
+      name = "ejs";
+      packageName = "ejs";
+      version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
-        sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
+        url = "https://registry.npmjs.org/ejs/-/ejs-2.3.4.tgz";
+        sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98";
+      };
+    };
+    "global-paths-0.1.2" = {
+      name = "global-paths";
+      packageName = "global-paths";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz";
+        sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299";
       };
     };
     "jsonlint-1.5.1" = {
@@ -67,13 +130,31 @@ let
         sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6";
       };
     };
-    "uglify-js-2.6.1" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.6.1";
+    "moment-2.17.1" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.17.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
+        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
+      };
+    };
+    "node.extend-1.0.10" = {
+      name = "node.extend";
+      packageName = "node.extend";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.10.tgz";
+        sha1 = "3269bddf81c54535f408abc784c32b0d2bd55f6f";
+      };
+    };
+    "pkginfo-0.2.2" = {
+      name = "pkginfo";
+      packageName = "pkginfo";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
-        sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
+        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz";
+        sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e";
       };
     };
     "resolve-1.3.3" = {
@@ -85,15 +166,6 @@ let
         sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5";
       };
     };
-    "global-paths-0.1.2" = {
-      name = "global-paths";
-      packageName = "global-paths";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz";
-        sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299";
-      };
-    };
     "source-map-0.1.9" = {
       name = "source-map";
       packageName = "source-map";
@@ -103,6 +175,15 @@ let
         sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599";
       };
     };
+    "wrench-1.3.9" = {
+      name = "wrench";
+      packageName = "wrench";
+      version = "1.3.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz";
+        sha1 = "6f13ec35145317eb292ca5f6531391b244111411";
+      };
+    };
     "xml2tss-0.0.5" = {
       name = "xml2tss";
       packageName = "xml2tss";
@@ -112,2126 +193,2315 @@ let
         sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e";
       };
     };
-    "moment-2.17.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.17.1";
+    "xmldom-0.1.19" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
-        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
+        sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
       };
     };
-    "node.extend-1.0.10" = {
-      name = "node.extend";
-      packageName = "node.extend";
-      version = "1.0.10";
+    "lodash-4.17.4" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.10.tgz";
-        sha1 = "3269bddf81c54535f408abc784c32b0d2bd55f6f";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
+        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
       };
     };
-    "nomnom-1.8.1" = {
-      name = "nomnom";
-      packageName = "nomnom";
-      version = "1.8.1";
+    "babel-code-frame-6.22.0" = {
+      name = "babel-code-frame";
+      packageName = "babel-code-frame";
+      version = "6.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz";
-        sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7";
+        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz";
+        sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
       };
     };
-    "JSV-4.0.2" = {
-      name = "JSV";
-      packageName = "JSV";
-      version = "4.0.2";
+    "babel-generator-6.24.1" = {
+      name = "babel-generator";
+      packageName = "babel-generator";
+      version = "6.24.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz";
-        sha1 = "d077f6825571f82132f9dffaed587b4029feff57";
+        url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz";
+        sha1 = "e715f486c58ded25649d888944d52aa07c5d9497";
       };
     };
-    "underscore-1.6.0" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.6.0";
+    "babel-helpers-6.24.1" = {
+      name = "babel-helpers";
+      packageName = "babel-helpers";
+      version = "6.24.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
-        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
+        url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz";
+        sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
       };
     };
-    "chalk-0.4.0" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "0.4.0";
+    "babel-messages-6.23.0" = {
+      name = "babel-messages";
+      packageName = "babel-messages";
+      version = "6.23.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
-        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
+        url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz";
+        sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
       };
     };
-    "has-color-0.1.7" = {
-      name = "has-color";
-      packageName = "has-color";
-      version = "0.1.7";
+    "babel-template-6.24.1" = {
+      name = "babel-template";
+      packageName = "babel-template";
+      version = "6.24.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
-        sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
+        url = "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz";
+        sha1 = "04ae514f1f93b3a2537f2a0f60a5a45fb8308333";
       };
     };
-    "ansi-styles-1.0.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "1.0.0";
+    "babel-runtime-6.23.0" = {
+      name = "babel-runtime";
+      packageName = "babel-runtime";
+      version = "6.23.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
-        sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz";
+        sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b";
       };
     };
-    "strip-ansi-0.1.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "0.1.1";
+    "babel-register-6.24.1" = {
+      name = "babel-register";
+      packageName = "babel-register";
+      version = "6.24.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
-        sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
+        url = "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz";
+        sha1 = "7e10e13a2f71065bdfad5a1787ba45bca6ded75f";
       };
     };
-    "async-0.2.10" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.10";
+    "convert-source-map-1.5.0" = {
+      name = "convert-source-map";
+      packageName = "convert-source-map";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
-        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz";
+        sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5";
       };
     };
-    "source-map-0.5.6" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.5.6";
+    "debug-2.6.8" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
-        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz";
+        sha1 = "e731531ca2ede27d188222427da17821d68ff4fc";
       };
     };
-    "uglify-to-browserify-1.0.2" = {
-      name = "uglify-to-browserify";
-      packageName = "uglify-to-browserify";
-      version = "1.0.2";
+    "json5-0.5.1" = {
+      name = "json5";
+      packageName = "json5";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
-        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
-    "yargs-3.10.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.10.0";
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
-        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha1 = "5166e286457f03306064be5497e8dbb0c3d32083";
       };
     };
-    "camelcase-1.2.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "1.2.1";
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
-        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
-    "cliui-2.1.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "2.1.0";
+    "private-0.1.7" = {
+      name = "private";
+      packageName = "private";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
-        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
+        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
+    "slash-1.0.0" = {
+      name = "slash";
+      packageName = "slash";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+        url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
+        sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
       };
     };
-    "window-size-0.1.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.1.0";
+    "source-map-0.5.6" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
-        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
+        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
-    "center-align-0.1.3" = {
-      name = "center-align";
-      packageName = "center-align";
-      version = "0.1.3";
+    "chalk-1.1.3" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
-        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
       };
     };
-    "right-align-0.1.3" = {
-      name = "right-align";
-      packageName = "right-align";
-      version = "0.1.3";
+    "esutils-2.0.2" = {
+      name = "esutils";
+      packageName = "esutils";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
-        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
+        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
       };
     };
-    "wordwrap-0.0.2" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "0.0.2";
+    "js-tokens-3.0.1" = {
+      name = "js-tokens";
+      packageName = "js-tokens";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
-        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz";
+        sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7";
       };
     };
-    "align-text-0.1.4" = {
-      name = "align-text";
-      packageName = "align-text";
-      version = "0.1.4";
+    "ansi-styles-2.2.1" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
-        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
       };
     };
-    "lazy-cache-1.0.4" = {
-      name = "lazy-cache";
-      packageName = "lazy-cache";
-      version = "1.0.4";
+    "escape-string-regexp-1.0.5" = {
+      name = "escape-string-regexp";
+      packageName = "escape-string-regexp";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
-        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "kind-of-3.2.0" = {
-      name = "kind-of";
-      packageName = "kind-of";
-      version = "3.2.0";
+    "has-ansi-2.0.0" = {
+      name = "has-ansi";
+      packageName = "has-ansi";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.0.tgz";
-        sha1 = "b58abe4d5c044ad33726a8c1525b48cf891bff07";
+        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
       };
     };
-    "longest-1.0.1" = {
-      name = "longest";
-      packageName = "longest";
-      version = "1.0.1";
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
-        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
-    "repeat-string-1.6.1" = {
-      name = "repeat-string";
-      packageName = "repeat-string";
-      version = "1.6.1";
+    "supports-color-2.0.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
-        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
-    "is-buffer-1.1.5" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "1.1.5";
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
-        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
       };
     };
-    "path-parse-1.0.5" = {
-      name = "path-parse";
-      packageName = "path-parse";
-      version = "1.0.5";
+    "detect-indent-4.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz";
-        sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
+        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
       };
     };
-    "array-unique-0.2.1" = {
-      name = "array-unique";
-      packageName = "array-unique";
-      version = "0.2.1";
+    "jsesc-1.3.0" = {
+      name = "jsesc";
+      packageName = "jsesc";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz";
-        sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53";
+        url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz";
+        sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
       };
     };
-    "global-modules-0.2.3" = {
-      name = "global-modules";
-      packageName = "global-modules";
-      version = "0.2.3";
+    "trim-right-1.0.1" = {
+      name = "trim-right";
+      packageName = "trim-right";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz";
-        sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d";
+        url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz";
+        sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
       };
     };
-    "is-windows-0.1.1" = {
-      name = "is-windows";
-      packageName = "is-windows";
-      version = "0.1.1";
+    "repeating-2.0.1" = {
+      name = "repeating";
+      packageName = "repeating";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-windows/-/is-windows-0.1.1.tgz";
-        sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe";
+        url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
+        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
-    "global-prefix-0.1.5" = {
-      name = "global-prefix";
-      packageName = "global-prefix";
-      version = "0.1.5";
+    "is-finite-1.0.2" = {
+      name = "is-finite";
+      packageName = "is-finite";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz";
-        sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f";
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
       };
     };
-    "is-windows-0.2.0" = {
-      name = "is-windows";
-      packageName = "is-windows";
-      version = "0.2.0";
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz";
-        sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c";
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
       };
     };
-    "homedir-polyfill-1.0.1" = {
-      name = "homedir-polyfill";
-      packageName = "homedir-polyfill";
-      version = "1.0.1";
+    "core-js-2.4.1" = {
+      name = "core-js";
+      packageName = "core-js";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
-        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz";
+        sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e";
       };
     };
-    "ini-1.3.4" = {
-      name = "ini";
-      packageName = "ini";
-      version = "1.3.4";
+    "regenerator-runtime-0.10.5" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.10.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
-        sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
+        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
       };
     };
-    "which-1.2.14" = {
-      name = "which";
-      packageName = "which";
-      version = "1.2.14";
+    "home-or-tmp-2.0.0" = {
+      name = "home-or-tmp";
+      packageName = "home-or-tmp";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
-        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
+        url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz";
+        sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
       };
     };
-    "parse-passwd-1.0.0" = {
-      name = "parse-passwd";
-      packageName = "parse-passwd";
-      version = "1.0.0";
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
-        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "isexe-2.0.0" = {
-      name = "isexe";
-      packageName = "isexe";
-      version = "2.0.0";
+    "source-map-support-0.4.15" = {
+      name = "source-map-support";
+      packageName = "source-map-support";
+      version = "0.4.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
-        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz";
+        sha1 = "03202df65c06d2bd8c7ec2362a193056fef8d3b1";
       };
     };
-    "amdefine-1.0.1" = {
-      name = "amdefine";
-      packageName = "amdefine";
-      version = "1.0.1";
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
-        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
       };
     };
-    "xml2js-0.2.8" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.2.8";
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
-        sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
       };
     };
-    "sax-0.5.8" = {
-      name = "sax";
-      packageName = "sax";
-      version = "0.5.8";
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
-        sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "is-0.3.0" = {
-      name = "is";
-      packageName = "is";
-      version = "0.3.0";
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz";
-        sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7";
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
-    "adal-node-0.1.21" = {
-      name = "adal-node";
-      packageName = "adal-node";
-      version = "0.1.21";
+    "brace-expansion-1.1.7" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.21.tgz";
-        sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8";
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz";
+        sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59";
       };
     };
-    "async-1.4.2" = {
-      name = "async";
-      packageName = "async";
-      version = "1.4.2";
+    "balanced-match-0.4.2" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz";
-        sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz";
+        sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838";
       };
     };
-    "azure-common-0.9.18" = {
-      name = "azure-common";
-      packageName = "azure-common";
-      version = "0.9.18";
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz";
-        sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd";
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "azure-arm-authorization-2.0.0" = {
-      name = "azure-arm-authorization";
-      packageName = "azure-arm-authorization";
-      version = "2.0.0";
+    "babel-helper-evaluate-path-0.1.0" = {
+      name = "babel-helper-evaluate-path";
+      packageName = "babel-helper-evaluate-path";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz";
-        sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
+        url = "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.1.0.tgz";
+        sha1 = "95d98c4ea36150483db2e7d3ec9e1954a72629cb";
       };
     };
-    "azure-arm-cdn-1.0.3" = {
-      name = "azure-arm-cdn";
-      packageName = "azure-arm-cdn";
-      version = "1.0.3";
+    "babel-helper-mark-eval-scopes-0.1.1" = {
+      name = "babel-helper-mark-eval-scopes";
+      packageName = "babel-helper-mark-eval-scopes";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz";
-        sha1 = "39db281679dcdd33cb6ce032383b192430476412";
+        url = "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.1.1.tgz";
+        sha1 = "4554345edf9f2549427bd2098e530253f8af2992";
       };
     };
-    "azure-arm-commerce-0.2.0" = {
-      name = "azure-arm-commerce";
-      packageName = "azure-arm-commerce";
-      version = "0.2.0";
+    "babel-helper-remove-or-void-0.1.1" = {
+      name = "babel-helper-remove-or-void";
+      packageName = "babel-helper-remove-or-void";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz";
-        sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
+        url = "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.1.1.tgz";
+        sha1 = "9d7e1856dc6fafcb41b283a416730dc1844f66d7";
       };
     };
-    "azure-arm-compute-0.20.0" = {
-      name = "azure-arm-compute";
-      packageName = "azure-arm-compute";
-      version = "0.20.0";
+    "lodash.some-4.6.0" = {
+      name = "lodash.some";
+      packageName = "lodash.some";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz";
-        sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32";
+        url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz";
+        sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d";
       };
     };
-    "azure-arm-datalake-analytics-1.0.1-preview" = {
-      name = "azure-arm-datalake-analytics";
-      packageName = "azure-arm-datalake-analytics";
-      version = "1.0.1-preview";
+    "globals-9.17.0" = {
+      name = "globals";
+      packageName = "globals";
+      version = "9.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.1-preview.tgz";
-        sha1 = "75461904000427e12ce11d634d74c052c86de994";
+        url = "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz";
+        sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286";
       };
     };
-    "azure-arm-datalake-store-1.0.1-preview" = {
-      name = "azure-arm-datalake-store";
-      packageName = "azure-arm-datalake-store";
-      version = "1.0.1-preview";
+    "invariant-2.2.2" = {
+      name = "invariant";
+      packageName = "invariant";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.1-preview.tgz";
-        sha1 = "bd07cbeb5eb355a00b7bed69e198a1a968115dd5";
+        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz";
+        sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360";
       };
     };
-    "azure-arm-hdinsight-0.2.2" = {
-      name = "azure-arm-hdinsight";
-      packageName = "azure-arm-hdinsight";
-      version = "0.2.2";
+    "loose-envify-1.3.1" = {
+      name = "loose-envify";
+      packageName = "loose-envify";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz";
-        sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d";
+        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz";
+        sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
       };
     };
-    "azure-arm-hdinsight-jobs-0.1.0" = {
-      name = "azure-arm-hdinsight-jobs";
-      packageName = "azure-arm-hdinsight-jobs";
-      version = "0.1.0";
+    "to-fast-properties-1.0.3" = {
+      name = "to-fast-properties";
+      packageName = "to-fast-properties";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-hdinsight-jobs/-/azure-arm-hdinsight-jobs-0.1.0.tgz";
-        sha1 = "252938f18d4341adf9942261656e791490c3c220";
+        url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz";
+        sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47";
       };
     };
-    "azure-arm-insights-0.11.3" = {
-      name = "azure-arm-insights";
-      packageName = "azure-arm-insights";
-      version = "0.11.3";
+    "bindings-1.2.1" = {
+      name = "bindings";
+      packageName = "bindings";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-insights/-/azure-arm-insights-0.11.3.tgz";
-        sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f";
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
       };
     };
-    "azure-arm-iothub-0.1.4" = {
-      name = "azure-arm-iothub";
-      packageName = "azure-arm-iothub";
-      version = "0.1.4";
+    "nan-2.6.2" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz";
-        sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d";
+        url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
+        sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
       };
     };
-    "azure-arm-servermanagement-0.1.2" = {
-      name = "azure-arm-servermanagement";
-      packageName = "azure-arm-servermanagement";
-      version = "0.1.2";
+    "array-unique-0.2.1" = {
+      name = "array-unique";
+      packageName = "array-unique";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-0.1.2.tgz";
-        sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47";
+        url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz";
+        sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53";
       };
     };
-    "azure-arm-network-0.18.0" = {
-      name = "azure-arm-network";
-      packageName = "azure-arm-network";
-      version = "0.18.0";
+    "global-modules-0.2.3" = {
+      name = "global-modules";
+      packageName = "global-modules";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.18.0.tgz";
-        sha1 = "0ebfe1adbdfdc535d6c95e3713a5c54b5144932f";
+        url = "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz";
+        sha1 = "ea5a3bed42c6d6ce995a4f8a1269b5dae223828d";
       };
     };
-    "azure-arm-powerbiembedded-0.1.0" = {
-      name = "azure-arm-powerbiembedded";
-      packageName = "azure-arm-powerbiembedded";
-      version = "0.1.0";
+    "is-windows-0.1.1" = {
+      name = "is-windows";
+      packageName = "is-windows";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.0.tgz";
-        sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970";
+        url = "https://registry.npmjs.org/is-windows/-/is-windows-0.1.1.tgz";
+        sha1 = "be310715431cfabccc54ab3951210fa0b6d01abe";
       };
     };
-    "azure-arm-trafficmanager-0.12.0" = {
-      name = "azure-arm-trafficmanager";
-      packageName = "azure-arm-trafficmanager";
-      version = "0.12.0";
+    "global-prefix-0.1.5" = {
+      name = "global-prefix";
+      packageName = "global-prefix";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz";
-        sha1 = "609e585c0253960a91deaf773dae1ce184ce414b";
+        url = "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz";
+        sha1 = "8d3bc6b8da3ca8112a160d8d496ff0462bfef78f";
       };
     };
-    "azure-arm-dns-0.11.1" = {
-      name = "azure-arm-dns";
-      packageName = "azure-arm-dns";
-      version = "0.11.1";
+    "is-windows-0.2.0" = {
+      name = "is-windows";
+      packageName = "is-windows";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz";
-        sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2";
+        url = "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz";
+        sha1 = "de1aa6d63ea29dd248737b69f1ff8b8002d2108c";
       };
     };
-    "azure-arm-website-0.11.4" = {
-      name = "azure-arm-website";
-      packageName = "azure-arm-website";
-      version = "0.11.4";
+    "homedir-polyfill-1.0.1" = {
+      name = "homedir-polyfill";
+      packageName = "homedir-polyfill";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.4.tgz";
-        sha1 = "6972dd9844a0d12376d74014b541c49247caa37d";
+        url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz";
+        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
       };
     };
-    "azure-arm-rediscache-0.2.3" = {
-      name = "azure-arm-rediscache";
-      packageName = "azure-arm-rediscache";
-      version = "0.2.3";
+    "ini-1.3.4" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz";
-        sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06";
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
+        sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
       };
     };
-    "azure-arm-devtestlabs-0.1.0" = {
-      name = "azure-arm-devtestlabs";
-      packageName = "azure-arm-devtestlabs";
-      version = "0.1.0";
+    "which-1.2.14" = {
+      name = "which";
+      packageName = "which";
+      version = "1.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-0.1.0.tgz";
-        sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40";
-      };
+        url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz";
+        sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5";
+      };
     };
-    "azure-graph-1.1.1" = {
-      name = "azure-graph";
-      packageName = "azure-graph";
-      version = "1.1.1";
+    "parse-passwd-1.0.0" = {
+      name = "parse-passwd";
+      packageName = "parse-passwd";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz";
-        sha1 = "5277e750d223aec0fd2559e49149777fe1371708";
+        url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
+        sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     };
-    "azure-gallery-2.0.0-pre.18" = {
-      name = "azure-gallery";
-      packageName = "azure-gallery";
-      version = "2.0.0-pre.18";
+    "isexe-2.0.0" = {
+      name = "isexe";
+      packageName = "isexe";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz";
-        sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6";
+        url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+        sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
       };
     };
-    "azure-keyvault-0.11.0" = {
-      name = "azure-keyvault";
-      packageName = "azure-keyvault";
-      version = "0.11.0";
+    "nomnom-1.8.1" = {
+      name = "nomnom";
+      packageName = "nomnom";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz";
-        sha1 = "379e6c2ed4155de86caff63243923c7330d34802";
+        url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz";
+        sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7";
       };
     };
-    "azure-asm-compute-0.18.0" = {
-      name = "azure-asm-compute";
-      packageName = "azure-asm-compute";
-      version = "0.18.0";
+    "JSV-4.0.2" = {
+      name = "JSV";
+      packageName = "JSV";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz";
-        sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685";
+        url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz";
+        sha1 = "d077f6825571f82132f9dffaed587b4029feff57";
       };
     };
-    "azure-asm-hdinsight-0.10.2" = {
-      name = "azure-asm-hdinsight";
-      packageName = "azure-asm-hdinsight";
-      version = "0.10.2";
+    "underscore-1.6.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-hdinsight/-/azure-asm-hdinsight-0.10.2.tgz";
-        sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+        sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
       };
     };
-    "azure-asm-trafficmanager-0.10.3" = {
-      name = "azure-asm-trafficmanager";
-      packageName = "azure-asm-trafficmanager";
-      version = "0.10.3";
+    "chalk-0.4.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz";
-        sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447";
+        url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";
+        sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f";
       };
     };
-    "azure-asm-mgmt-0.10.1" = {
-      name = "azure-asm-mgmt";
-      packageName = "azure-asm-mgmt";
-      version = "0.10.1";
+    "has-color-0.1.7" = {
+      name = "has-color";
+      packageName = "has-color";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-mgmt/-/azure-asm-mgmt-0.10.1.tgz";
-        sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751";
+        url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";
+        sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f";
       };
     };
-    "azure-monitoring-0.10.2" = {
-      name = "azure-monitoring";
-      packageName = "azure-monitoring";
-      version = "0.10.2";
+    "ansi-styles-1.0.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz";
-        sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";
+        sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178";
       };
     };
-    "azure-asm-network-0.13.0" = {
-      name = "azure-asm-network";
-      packageName = "azure-asm-network";
-      version = "0.13.0";
+    "strip-ansi-0.1.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz";
-        sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";
+        sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991";
       };
     };
-    "azure-arm-resource-1.6.1-preview" = {
-      name = "azure-arm-resource";
-      packageName = "azure-arm-resource";
-      version = "1.6.1-preview";
+    "is-0.3.0" = {
+      name = "is";
+      packageName = "is";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
-        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
+        url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz";
+        sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7";
       };
     };
-    "azure-arm-storage-0.15.0-preview" = {
-      name = "azure-arm-storage";
-      packageName = "azure-arm-storage";
-      version = "0.15.0-preview";
+    "path-parse-1.0.5" = {
+      name = "path-parse";
+      packageName = "path-parse";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz";
-        sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e";
+        url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz";
+        sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
       };
     };
-    "azure-asm-sb-0.10.1" = {
-      name = "azure-asm-sb";
-      packageName = "azure-asm-sb";
-      version = "0.10.1";
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-sb/-/azure-asm-sb-0.10.1.tgz";
-        sha1 = "92487b24166041119714f66760ec1f36e8dc7222";
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
       };
     };
-    "azure-asm-sql-0.10.1" = {
-      name = "azure-asm-sql";
-      packageName = "azure-asm-sql";
-      version = "0.10.1";
+    "xml2js-0.2.8" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-sql/-/azure-asm-sql-0.10.1.tgz";
-        sha1 = "47728df19a6d4f1cc935235c69fa9cf048cc8f42";
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
+        sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
       };
     };
-    "azure-asm-storage-0.12.0" = {
-      name = "azure-asm-storage";
-      packageName = "azure-asm-storage";
-      version = "0.12.0";
+    "sax-0.5.8" = {
+      name = "sax";
+      packageName = "sax";
+      version = "0.5.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-storage/-/azure-asm-storage-0.12.0.tgz";
-        sha1 = "f5edf48d41d18a80eb14af6a72c1d6924214fdd3";
+        url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
+        sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
       };
     };
-    "azure-asm-subscription-0.10.1" = {
-      name = "azure-asm-subscription";
-      packageName = "azure-asm-subscription";
-      version = "0.10.1";
+    "adal-node-0.1.21" = {
+      name = "adal-node";
+      packageName = "adal-node";
+      version = "0.1.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz";
-        sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c";
+        url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.21.tgz";
+        sha1 = "11c58e427b7e83d9ef2d77c9c3a2a60fbb0b6cc8";
       };
     };
-    "azure-asm-website-0.10.4" = {
-      name = "azure-asm-website";
-      packageName = "azure-asm-website";
-      version = "0.10.4";
+    "async-1.4.2" = {
+      name = "async";
+      packageName = "async";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.4.tgz";
-        sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650";
+        url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz";
+        sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
       };
     };
-    "azure-storage-2.1.0" = {
-      name = "azure-storage";
-      packageName = "azure-storage";
-      version = "2.1.0";
+    "azure-common-0.9.18" = {
+      name = "azure-common";
+      packageName = "azure-common";
+      version = "0.9.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz";
-        sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01";
+        url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz";
+        sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd";
       };
     };
-    "azure-arm-batch-0.3.0" = {
-      name = "azure-arm-batch";
-      packageName = "azure-arm-batch";
-      version = "0.3.0";
+    "azure-arm-authorization-2.0.0" = {
+      name = "azure-arm-authorization";
+      packageName = "azure-arm-authorization";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz";
-        sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7";
+        url = "https://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz";
+        sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-batch-0.5.2" = {
-      name = "azure-batch";
-      packageName = "azure-batch";
-      version = "0.5.2";
+    "azure-arm-cdn-1.0.3" = {
+      name = "azure-arm-cdn";
+      packageName = "azure-arm-cdn";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz";
-        sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz";
+        sha1 = "39db281679dcdd33cb6ce032383b192430476412";
       };
     };
-    "azure-servicefabric-0.1.5" = {
-      name = "azure-servicefabric";
-      packageName = "azure-servicefabric";
-      version = "0.1.5";
+    "azure-arm-commerce-0.2.0" = {
+      name = "azure-arm-commerce";
+      packageName = "azure-arm-commerce";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz";
-        sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6";
+        url = "https://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.2.0.tgz";
+        sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "applicationinsights-0.16.0" = {
-      name = "applicationinsights";
-      packageName = "applicationinsights";
-      version = "0.16.0";
+    "azure-arm-compute-0.20.0" = {
+      name = "azure-arm-compute";
+      packageName = "azure-arm-compute";
+      version = "0.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
-        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz";
+        sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32";
       };
     };
-    "caller-id-0.1.0" = {
-      name = "caller-id";
-      packageName = "caller-id";
-      version = "0.1.0";
+    "azure-arm-datalake-analytics-1.0.2-preview" = {
+      name = "azure-arm-datalake-analytics";
+      packageName = "azure-arm-datalake-analytics";
+      version = "1.0.2-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz";
-        sha1 = "59bdac0893d12c3871408279231f97458364f07b";
+        url = "https://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-1.0.2-preview.tgz";
+        sha1 = "b34f868e98a972ec80e4408d209dc06c000dfb63";
       };
     };
-    "colors-1.1.2" = {
-      name = "colors";
-      packageName = "colors";
-      version = "1.1.2";
+    "azure-arm-datalake-store-1.0.2-preview" = {
+      name = "azure-arm-datalake-store";
+      packageName = "azure-arm-datalake-store";
+      version = "1.0.2-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
-        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
+        url = "https://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-1.0.2-preview.tgz";
+        sha1 = "c8b7c113016c92703a84dc28d29ba518e8c64763";
       };
     };
-    "commander-1.0.4" = {
-      name = "commander";
-      packageName = "commander";
-      version = "1.0.4";
+    "azure-arm-hdinsight-0.2.2" = {
+      name = "azure-arm-hdinsight";
+      packageName = "azure-arm-hdinsight";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz";
-        sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3";
+        url = "https://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.2.2.tgz";
+        sha1 = "3daeade6d26f6b115d8598320541ad2dcaa9516d";
       };
     };
-    "date-utils-1.2.21" = {
-      name = "date-utils";
-      packageName = "date-utils";
-      version = "1.2.21";
+    "azure-arm-hdinsight-jobs-0.1.0" = {
+      name = "azure-arm-hdinsight-jobs";
+      packageName = "azure-arm-hdinsight-jobs";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz";
-        sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
+        url = "https://registry.npmjs.org/azure-arm-hdinsight-jobs/-/azure-arm-hdinsight-jobs-0.1.0.tgz";
+        sha1 = "252938f18d4341adf9942261656e791490c3c220";
       };
     };
-    "easy-table-0.0.1" = {
-      name = "easy-table";
-      packageName = "easy-table";
-      version = "0.0.1";
+    "azure-arm-insights-0.11.3" = {
+      name = "azure-arm-insights";
+      packageName = "azure-arm-insights";
+      version = "0.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/easy-table/-/easy-table-0.0.1.tgz";
-        sha1 = "dbd809177a1dd7afc06b4849d1ca7eff13e299eb";
+        url = "https://registry.npmjs.org/azure-arm-insights/-/azure-arm-insights-0.11.3.tgz";
+        sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f";
       };
     };
-    "event-stream-3.1.5" = {
-      name = "event-stream";
-      packageName = "event-stream";
-      version = "3.1.5";
+    "azure-arm-iothub-0.1.4" = {
+      name = "azure-arm-iothub";
+      packageName = "azure-arm-iothub";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz";
-        sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c";
+        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz";
+        sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d";
       };
     };
-    "eyes-0.1.8" = {
-      name = "eyes";
-      packageName = "eyes";
-      version = "0.1.8";
+    "azure-arm-servermanagement-0.1.2" = {
+      name = "azure-arm-servermanagement";
+      packageName = "azure-arm-servermanagement";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
-        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+        url = "https://registry.npmjs.org/azure-arm-servermanagement/-/azure-arm-servermanagement-0.1.2.tgz";
+        sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47";
       };
     };
-    "github-0.1.6" = {
-      name = "github";
-      packageName = "github";
-      version = "0.1.6";
+    "azure-arm-network-0.18.0" = {
+      name = "azure-arm-network";
+      packageName = "azure-arm-network";
+      version = "0.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/github/-/github-0.1.6.tgz";
-        sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922";
+        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.18.0.tgz";
+        sha1 = "0ebfe1adbdfdc535d6c95e3713a5c54b5144932f";
       };
     };
-    "fast-json-patch-0.5.6" = {
-      name = "fast-json-patch";
-      packageName = "fast-json-patch";
-      version = "0.5.6";
+    "azure-arm-powerbiembedded-0.1.0" = {
+      name = "azure-arm-powerbiembedded";
+      packageName = "azure-arm-powerbiembedded";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
-        sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402";
+        url = "https://registry.npmjs.org/azure-arm-powerbiembedded/-/azure-arm-powerbiembedded-0.1.0.tgz";
+        sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970";
       };
     };
-    "js2xmlparser-1.0.0" = {
-      name = "js2xmlparser";
-      packageName = "js2xmlparser";
-      version = "1.0.0";
+    "azure-arm-trafficmanager-0.12.0" = {
+      name = "azure-arm-trafficmanager";
+      packageName = "azure-arm-trafficmanager";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz";
-        sha1 = "5a170f2e8d6476ce45405e04823242513782fe30";
+        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz";
+        sha1 = "609e585c0253960a91deaf773dae1ce184ce414b";
       };
     };
-    "jsonlint-1.6.2" = {
-      name = "jsonlint";
-      packageName = "jsonlint";
-      version = "1.6.2";
+    "azure-arm-dns-0.11.1" = {
+      name = "azure-arm-dns";
+      packageName = "azure-arm-dns";
+      version = "0.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz";
-        sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830";
+        url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz";
+        sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2";
       };
     };
-    "jsonminify-0.4.1" = {
-      name = "jsonminify";
-      packageName = "jsonminify";
-      version = "0.4.1";
+    "azure-arm-website-0.11.4" = {
+      name = "azure-arm-website";
+      packageName = "azure-arm-website";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz";
-        sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c";
+        url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.4.tgz";
+        sha1 = "6972dd9844a0d12376d74014b541c49247caa37d";
       };
     };
-    "jsrsasign-4.8.2" = {
-      name = "jsrsasign";
-      packageName = "jsrsasign";
-      version = "4.8.2";
+    "azure-arm-rediscache-0.2.3" = {
+      name = "azure-arm-rediscache";
+      packageName = "azure-arm-rediscache";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz";
-        sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
+        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz";
+        sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06";
       };
     };
-    "jwt-decode-2.2.0" = {
-      name = "jwt-decode";
-      packageName = "jwt-decode";
-      version = "2.2.0";
+    "azure-arm-devtestlabs-0.1.0" = {
+      name = "azure-arm-devtestlabs";
+      packageName = "azure-arm-devtestlabs";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz";
-        sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79";
+        url = "https://registry.npmjs.org/azure-arm-devtestlabs/-/azure-arm-devtestlabs-0.1.0.tgz";
+        sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40";
       };
     };
-    "kuduscript-1.0.13" = {
-      name = "kuduscript";
-      packageName = "kuduscript";
-      version = "1.0.13";
+    "azure-graph-1.1.1" = {
+      name = "azure-graph";
+      packageName = "azure-graph";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.13.tgz";
-        sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e";
+        url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz";
+        sha1 = "5277e750d223aec0fd2559e49149777fe1371708";
       };
     };
-    "moment-2.18.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.18.1";
+    "azure-gallery-2.0.0-pre.18" = {
+      name = "azure-gallery";
+      packageName = "azure-gallery";
+      version = "2.0.0-pre.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
-        sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
+        url = "https://registry.npmjs.org/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz";
+        sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6";
       };
     };
-    "ms-rest-1.15.7" = {
-      name = "ms-rest";
-      packageName = "ms-rest";
-      version = "1.15.7";
+    "azure-keyvault-0.11.0" = {
+      name = "azure-keyvault";
+      packageName = "azure-keyvault";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz";
-        sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
+        url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.11.0.tgz";
+        sha1 = "379e6c2ed4155de86caff63243923c7330d34802";
       };
     };
-    "ms-rest-azure-1.15.7" = {
-      name = "ms-rest-azure";
-      packageName = "ms-rest-azure";
-      version = "1.15.7";
+    "azure-asm-compute-0.18.0" = {
+      name = "azure-asm-compute";
+      packageName = "azure-asm-compute";
+      version = "0.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz";
-        sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
+        url = "https://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.18.0.tgz";
+        sha1 = "109c31e17c697f4a00a01533fb230bf3ae448685";
       };
     };
-    "node-forge-0.6.23" = {
-      name = "node-forge";
-      packageName = "node-forge";
-      version = "0.6.23";
+    "azure-asm-hdinsight-0.10.2" = {
+      name = "azure-asm-hdinsight";
+      packageName = "azure-asm-hdinsight";
+      version = "0.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz";
-        sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
+        url = "https://registry.npmjs.org/azure-asm-hdinsight/-/azure-asm-hdinsight-0.10.2.tgz";
+        sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0";
       };
     };
-    "omelette-0.3.2" = {
-      name = "omelette";
-      packageName = "omelette";
-      version = "0.3.2";
+    "azure-asm-trafficmanager-0.10.3" = {
+      name = "azure-asm-trafficmanager";
+      packageName = "azure-asm-trafficmanager";
+      version = "0.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz";
-        sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26";
+        url = "https://registry.npmjs.org/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz";
+        sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447";
       };
     };
-    "openssl-wrapper-0.2.1" = {
-      name = "openssl-wrapper";
-      packageName = "openssl-wrapper";
-      version = "0.2.1";
+    "azure-asm-mgmt-0.10.1" = {
+      name = "azure-asm-mgmt";
+      packageName = "azure-asm-mgmt";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz";
-        sha1 = "ff2d6552c83bb14437edc0371784704c75289473";
+        url = "https://registry.npmjs.org/azure-asm-mgmt/-/azure-asm-mgmt-0.10.1.tgz";
+        sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751";
       };
     };
-    "progress-1.1.8" = {
-      name = "progress";
-      packageName = "progress";
-      version = "1.1.8";
+    "azure-monitoring-0.10.2" = {
+      name = "azure-monitoring";
+      packageName = "azure-monitoring";
+      version = "0.10.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
-        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
+        url = "https://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz";
+        sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57";
       };
     };
-    "prompt-0.2.14" = {
-      name = "prompt";
-      packageName = "prompt";
-      version = "0.2.14";
+    "azure-asm-network-0.13.0" = {
+      name = "azure-asm-network";
+      packageName = "azure-asm-network";
+      version = "0.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
-        sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc";
+        url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz";
+        sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54";
       };
     };
-    "readable-stream-1.0.34" = {
-      name = "readable-stream";
-      packageName = "readable-stream";
-      version = "1.0.34";
+    "azure-arm-resource-1.6.1-preview" = {
+      name = "azure-arm-resource";
+      packageName = "azure-arm-resource";
+      version = "1.6.1-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
-        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
+        url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.6.1-preview.tgz";
+        sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
-    "request-2.74.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.74.0";
+    "azure-arm-storage-0.15.0-preview" = {
+      name = "azure-arm-storage";
+      packageName = "azure-arm-storage";
+      version = "0.15.0-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz";
-        sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab";
+        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz";
+        sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e";
       };
     };
-    "ssh-key-to-pem-0.11.0" = {
-      name = "ssh-key-to-pem";
-      packageName = "ssh-key-to-pem";
-      version = "0.11.0";
+    "azure-asm-sb-0.10.1" = {
+      name = "azure-asm-sb";
+      packageName = "azure-asm-sb";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz";
-        sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4";
+        url = "https://registry.npmjs.org/azure-asm-sb/-/azure-asm-sb-0.10.1.tgz";
+        sha1 = "92487b24166041119714f66760ec1f36e8dc7222";
       };
     };
-    "streamline-0.10.17" = {
-      name = "streamline";
-      packageName = "streamline";
-      version = "0.10.17";
+    "azure-asm-sql-0.10.1" = {
+      name = "azure-asm-sql";
+      packageName = "azure-asm-sql";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/streamline/-/streamline-0.10.17.tgz";
-        sha1 = "fa2170da74194dbd0b54f756523f0d0d370426af";
+        url = "https://registry.npmjs.org/azure-asm-sql/-/azure-asm-sql-0.10.1.tgz";
+        sha1 = "47728df19a6d4f1cc935235c69fa9cf048cc8f42";
       };
     };
-    "streamline-streams-0.1.5" = {
-      name = "streamline-streams";
-      packageName = "streamline-streams";
-      version = "0.1.5";
+    "azure-asm-storage-0.12.0" = {
+      name = "azure-asm-storage";
+      packageName = "azure-asm-storage";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz";
-        sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54";
+        url = "https://registry.npmjs.org/azure-asm-storage/-/azure-asm-storage-0.12.0.tgz";
+        sha1 = "f5edf48d41d18a80eb14af6a72c1d6924214fdd3";
       };
     };
-    "sync-request-3.0.0" = {
-      name = "sync-request";
-      packageName = "sync-request";
-      version = "3.0.0";
+    "azure-asm-subscription-0.10.1" = {
+      name = "azure-asm-subscription";
+      packageName = "azure-asm-subscription";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sync-request/-/sync-request-3.0.0.tgz";
-        sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c";
+        url = "https://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz";
+        sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c";
       };
     };
-    "through-2.3.4" = {
-      name = "through";
-      packageName = "through";
-      version = "2.3.4";
+    "azure-asm-website-0.10.4" = {
+      name = "azure-asm-website";
+      packageName = "azure-asm-website";
+      version = "0.10.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through/-/through-2.3.4.tgz";
-        sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
+        url = "https://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.4.tgz";
+        sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650";
       };
     };
-    "tunnel-0.0.2" = {
-      name = "tunnel";
-      packageName = "tunnel";
-      version = "0.0.2";
+    "azure-storage-2.1.0" = {
+      name = "azure-storage";
+      packageName = "azure-storage";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz";
-        sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334";
+        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.1.0.tgz";
+        sha1 = "7fc81246cd64b54cabced70b5138d7cc4571ea01";
       };
     };
-    "underscore-1.4.4" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.4.4";
+    "azure-arm-batch-0.3.0" = {
+      name = "azure-arm-batch";
+      packageName = "azure-arm-batch";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
-        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+        url = "https://registry.npmjs.org/azure-arm-batch/-/azure-arm-batch-0.3.0.tgz";
+        sha1 = "78b000b10a16b97dcf273729b4dba919efbfdaf7";
       };
     };
-    "user-home-2.0.0" = {
-      name = "user-home";
-      packageName = "user-home";
-      version = "2.0.0";
+    "azure-batch-0.5.2" = {
+      name = "azure-batch";
+      packageName = "azure-batch";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz";
-        sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
+        url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz";
+        sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb";
       };
     };
-    "uuid-3.0.1" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.1";
+    "azure-servicefabric-0.1.5" = {
+      name = "azure-servicefabric";
+      packageName = "azure-servicefabric";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
-        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz";
+        sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6";
       };
     };
-    "validator-5.2.0" = {
-      name = "validator";
-      packageName = "validator";
-      version = "5.2.0";
+    "applicationinsights-0.16.0" = {
+      name = "applicationinsights";
+      packageName = "applicationinsights";
+      version = "0.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
-        sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689";
+        url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-0.16.0.tgz";
+        sha1 = "e02dafb10cf573c19b429793c87797d6404f0ee3";
       };
     };
-    "winston-2.1.1" = {
-      name = "winston";
-      packageName = "winston";
-      version = "2.1.1";
+    "caller-id-0.1.0" = {
+      name = "caller-id";
+      packageName = "caller-id";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz";
-        sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
+        url = "https://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz";
+        sha1 = "59bdac0893d12c3871408279231f97458364f07b";
       };
     };
-    "xml2js-0.1.14" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.1.14";
+    "colors-1.1.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz";
-        sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
+        url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
       };
     };
-    "xmlbuilder-0.4.3" = {
-      name = "xmlbuilder";
-      packageName = "xmlbuilder";
-      version = "0.4.3";
+    "commander-1.0.4" = {
+      name = "commander";
+      packageName = "commander";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
-        sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58";
+        url = "https://registry.npmjs.org/commander/-/commander-1.0.4.tgz";
+        sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3";
       };
     };
-    "read-1.0.7" = {
-      name = "read";
-      packageName = "read";
-      version = "1.0.7";
+    "date-utils-1.2.21" = {
+      name = "date-utils";
+      packageName = "date-utils";
+      version = "1.2.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz";
-        sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
+        url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz";
+        sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
       };
     };
-    "jws-3.1.4" = {
-      name = "jws";
-      packageName = "jws";
-      version = "3.1.4";
+    "easy-table-0.0.1" = {
+      name = "easy-table";
+      packageName = "easy-table";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz";
-        sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2";
+        url = "https://registry.npmjs.org/easy-table/-/easy-table-0.0.1.tgz";
+        sha1 = "dbd809177a1dd7afc06b4849d1ca7eff13e299eb";
       };
     };
-    "node-uuid-1.4.7" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.7";
+    "event-stream-3.1.5" = {
+      name = "event-stream";
+      packageName = "event-stream";
+      version = "3.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
-        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
+        url = "https://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz";
+        sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c";
       };
     };
-    "xmldom-0.1.27" = {
-      name = "xmldom";
-      packageName = "xmldom";
-      version = "0.1.27";
+    "eyes-0.1.8" = {
+      name = "eyes";
+      packageName = "eyes";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz";
-        sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
+        url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
       };
     };
-    "xpath.js-1.0.7" = {
-      name = "xpath.js";
-      packageName = "xpath.js";
-      version = "1.0.7";
+    "github-0.1.6" = {
+      name = "github";
+      packageName = "github";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz";
-        sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4";
+        url = "https://registry.npmjs.org/github/-/github-0.1.6.tgz";
+        sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922";
       };
     };
-    "base64url-2.0.0" = {
-      name = "base64url";
-      packageName = "base64url";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz";
-        sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
-      };
-    };
-    "jwa-1.1.5" = {
-      name = "jwa";
-      packageName = "jwa";
-      version = "1.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz";
-        sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
-      };
-    };
-    "safe-buffer-5.0.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.0.1";
+    "fast-json-patch-0.5.6" = {
+      name = "fast-json-patch";
+      packageName = "fast-json-patch";
+      version = "0.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
+        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
+        sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402";
       };
     };
-    "buffer-equal-constant-time-1.0.1" = {
-      name = "buffer-equal-constant-time";
-      packageName = "buffer-equal-constant-time";
-      version = "1.0.1";
+    "js2xmlparser-1.0.0" = {
+      name = "js2xmlparser";
+      packageName = "js2xmlparser";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
-        sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
+        url = "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz";
+        sha1 = "5a170f2e8d6476ce45405e04823242513782fe30";
       };
     };
-    "ecdsa-sig-formatter-1.0.9" = {
-      name = "ecdsa-sig-formatter";
-      packageName = "ecdsa-sig-formatter";
-      version = "1.0.9";
+    "jsonlint-1.6.2" = {
+      name = "jsonlint";
+      packageName = "jsonlint";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz";
-        sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1";
+        url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz";
+        sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830";
       };
     };
-    "xml2js-0.2.7" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.2.7";
+    "jsonminify-0.4.1" = {
+      name = "jsonminify";
+      packageName = "jsonminify";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz";
-        sha1 = "1838518bb01741cae0878bab4915e494c32306af";
+        url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz";
+        sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c";
       };
     };
-    "dateformat-1.0.2-1.2.3" = {
-      name = "dateformat";
-      packageName = "dateformat";
-      version = "1.0.2-1.2.3";
+    "jsrsasign-4.8.2" = {
+      name = "jsrsasign";
+      packageName = "jsrsasign";
+      version = "4.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
-        sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
+        url = "https://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz";
+        sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
       };
     };
-    "validator-3.22.2" = {
-      name = "validator";
-      packageName = "validator";
-      version = "3.22.2";
+    "jwt-decode-2.2.0" = {
+      name = "jwt-decode";
+      packageName = "jwt-decode";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-3.22.2.tgz";
-        sha1 = "6f297ae67f7f82acc76d0afdb49f18d9a09c18c0";
+        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz";
+        sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79";
       };
     };
-    "envconf-0.0.4" = {
-      name = "envconf";
-      packageName = "envconf";
-      version = "0.0.4";
+    "kuduscript-1.0.13" = {
+      name = "kuduscript";
+      packageName = "kuduscript";
+      version = "1.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz";
-        sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b";
+        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.13.tgz";
+        sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e";
       };
     };
-    "duplexer-0.1.1" = {
-      name = "duplexer";
-      packageName = "duplexer";
-      version = "0.1.1";
+    "moment-2.18.1" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.18.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
-        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+        url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
+        sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f";
       };
     };
-    "sax-0.5.2" = {
-      name = "sax";
-      packageName = "sax";
-      version = "0.5.2";
+    "ms-rest-1.15.7" = {
+      name = "ms-rest";
+      packageName = "ms-rest";
+      version = "1.15.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz";
-        sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz";
+        sha1 = "400515e05b1924889cb61a1ec6054290a68e1207";
       };
     };
-    "moment-2.6.0" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.6.0";
+    "ms-rest-azure-1.15.7" = {
+      name = "ms-rest-azure";
+      packageName = "ms-rest-azure";
+      version = "1.15.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz";
-        sha1 = "0765b72b841dd213fa91914c0f6765122719f061";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz";
+        sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde";
       };
     };
-    "moment-2.14.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.14.1";
+    "node-forge-0.6.23" = {
+      name = "node-forge";
+      packageName = "node-forge";
+      version = "0.6.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz";
-        sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c";
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz";
+        sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
-    "browserify-mime-1.2.9" = {
-      name = "browserify-mime";
-      packageName = "browserify-mime";
-      version = "1.2.9";
+    "omelette-0.3.2" = {
+      name = "omelette";
+      packageName = "omelette";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz";
-        sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f";
+        url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz";
+        sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26";
       };
     };
-    "extend-1.2.1" = {
-      name = "extend";
-      packageName = "extend";
-      version = "1.2.1";
+    "openssl-wrapper-0.2.1" = {
+      name = "openssl-wrapper";
+      packageName = "openssl-wrapper";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
-        sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
+        url = "https://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz";
+        sha1 = "ff2d6552c83bb14437edc0371784704c75289473";
       };
     };
-    "json-edm-parser-0.1.2" = {
-      name = "json-edm-parser";
-      packageName = "json-edm-parser";
-      version = "0.1.2";
+    "progress-1.1.8" = {
+      name = "progress";
+      packageName = "progress";
+      version = "1.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz";
-        sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4";
+        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
+        sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
       };
     };
-    "md5.js-1.3.4" = {
-      name = "md5.js";
-      packageName = "md5.js";
-      version = "1.3.4";
+    "prompt-0.2.14" = {
+      name = "prompt";
+      packageName = "prompt";
+      version = "0.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz";
-        sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
+        url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
+        sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc";
       };
     };
-    "readable-stream-2.0.6" = {
+    "readable-stream-1.0.34" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.0.6";
+      version = "1.0.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
-        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz";
+        sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
       };
     };
-    "jsonparse-1.2.0" = {
-      name = "jsonparse";
-      packageName = "jsonparse";
-      version = "1.2.0";
+    "request-2.74.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.74.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz";
-        sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
+        url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz";
+        sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab";
       };
     };
-    "hash-base-3.0.3" = {
-      name = "hash-base";
-      packageName = "hash-base";
-      version = "3.0.3";
+    "ssh-key-to-pem-0.11.0" = {
+      name = "ssh-key-to-pem";
+      packageName = "ssh-key-to-pem";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.3.tgz";
-        sha1 = "87ec48734bfe354275535150b14821566b083807";
+        url = "https://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz";
+        sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4";
       };
     };
-    "inherits-2.0.3" = {
-      name = "inherits";
-      packageName = "inherits";
-      version = "2.0.3";
+    "streamline-0.10.17" = {
+      name = "streamline";
+      packageName = "streamline";
+      version = "0.10.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+        url = "https://registry.npmjs.org/streamline/-/streamline-0.10.17.tgz";
+        sha1 = "fa2170da74194dbd0b54f756523f0d0d370426af";
       };
     };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
+    "streamline-streams-0.1.5" = {
+      name = "streamline-streams";
+      packageName = "streamline-streams";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+        url = "https://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz";
+        sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54";
       };
     };
-    "isarray-1.0.0" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "1.0.0";
+    "sync-request-3.0.0" = {
+      name = "sync-request";
+      packageName = "sync-request";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+        url = "https://registry.npmjs.org/sync-request/-/sync-request-3.0.0.tgz";
+        sha1 = "8030046939b00096e625c0dd6b3905bc7b85709c";
       };
     };
-    "process-nextick-args-1.0.7" = {
-      name = "process-nextick-args";
-      packageName = "process-nextick-args";
-      version = "1.0.7";
+    "through-2.3.4" = {
+      name = "through";
+      packageName = "through";
+      version = "2.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
-        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
+        url = "https://registry.npmjs.org/through/-/through-2.3.4.tgz";
+        sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
       };
     };
-    "string_decoder-0.10.31" = {
-      name = "string_decoder";
-      packageName = "string_decoder";
-      version = "0.10.31";
+    "tunnel-0.0.2" = {
+      name = "tunnel";
+      packageName = "tunnel";
+      version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+        url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz";
+        sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334";
       };
     };
-    "util-deprecate-1.0.2" = {
-      name = "util-deprecate";
-      packageName = "util-deprecate";
-      version = "1.0.2";
+    "underscore-1.4.4" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
       };
     };
-    "stack-trace-0.0.9" = {
-      name = "stack-trace";
-      packageName = "stack-trace";
-      version = "0.0.9";
+    "user-home-2.0.0" = {
+      name = "user-home";
+      packageName = "user-home";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
-        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
+        url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz";
+        sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
-    "keypress-0.1.0" = {
-      name = "keypress";
-      packageName = "keypress";
-      version = "0.1.0";
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
-        sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
       };
     };
-    "from-0.1.7" = {
-      name = "from";
-      packageName = "from";
-      version = "0.1.7";
+    "validator-5.2.0" = {
+      name = "validator";
+      packageName = "validator";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz";
-        sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe";
+        url = "https://registry.npmjs.org/validator/-/validator-5.2.0.tgz";
+        sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689";
       };
     };
-    "map-stream-0.1.0" = {
-      name = "map-stream";
-      packageName = "map-stream";
-      version = "0.1.0";
+    "winston-2.1.1" = {
+      name = "winston";
+      packageName = "winston";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
-        sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
+        url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz";
+        sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
-    "pause-stream-0.0.11" = {
-      name = "pause-stream";
-      packageName = "pause-stream";
-      version = "0.0.11";
+    "wordwrap-0.0.2" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
-        sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
       };
     };
-    "split-0.2.10" = {
-      name = "split";
-      packageName = "split";
-      version = "0.2.10";
+    "xml2js-0.1.14" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.1.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz";
-        sha1 = "67097c601d697ce1368f418f06cd201cf0521a57";
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz";
+        sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
       };
     };
-    "stream-combiner-0.0.4" = {
-      name = "stream-combiner";
-      packageName = "stream-combiner";
-      version = "0.0.4";
+    "xmlbuilder-0.4.3" = {
+      name = "xmlbuilder";
+      packageName = "xmlbuilder";
+      version = "0.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
-        sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
+        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
+        sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58";
       };
     };
-    "commander-1.1.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "1.1.1";
+    "read-1.0.7" = {
+      name = "read";
+      packageName = "read";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
-        sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041";
+        url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz";
+        sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
       };
     };
-    "streamline-0.4.11" = {
-      name = "streamline";
-      packageName = "streamline";
-      version = "0.4.11";
+    "jws-3.1.4" = {
+      name = "jws";
+      packageName = "jws";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz";
-        sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
+        url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz";
+        sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2";
       };
     };
-    "async-0.2.7" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.7";
+    "node-uuid-1.4.7" = {
+      name = "node-uuid";
+      packageName = "node-uuid";
+      version = "1.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz";
-        sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
+        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
       };
     };
-    "debug-0.7.4" = {
-      name = "debug";
-      packageName = "debug";
-      version = "0.7.4";
+    "xmldom-0.1.27" = {
+      name = "xmldom";
+      packageName = "xmldom";
+      version = "0.1.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
-        sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+        url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz";
+        sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
       };
     };
-    "q-0.9.7" = {
-      name = "q";
-      packageName = "q";
-      version = "0.9.7";
+    "xpath.js-1.0.7" = {
+      name = "xpath.js";
+      packageName = "xpath.js";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz";
-        sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75";
+        url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz";
+        sha1 = "7e94627f541276cbc6a6b02b5d35e9418565b3e4";
       };
     };
-    "pkginfo-0.4.0" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.4.0";
+    "base64url-2.0.0" = {
+      name = "base64url";
+      packageName = "base64url";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz";
-        sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65";
+        url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz";
+        sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
       };
     };
-    "revalidator-0.1.8" = {
-      name = "revalidator";
-      packageName = "revalidator";
-      version = "0.1.8";
+    "jwa-1.1.5" = {
+      name = "jwa";
+      packageName = "jwa";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
-        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz";
+        sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
       };
     };
-    "utile-0.2.1" = {
-      name = "utile";
-      packageName = "utile";
-      version = "0.2.1";
+    "safe-buffer-5.0.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
-        sha1 = "930c88e99098d6220834c356cbd9a770522d90d7";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
       };
     };
-    "winston-0.8.3" = {
-      name = "winston";
-      packageName = "winston";
-      version = "0.8.3";
+    "buffer-equal-constant-time-1.0.1" = {
+      name = "buffer-equal-constant-time";
+      packageName = "buffer-equal-constant-time";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
-        sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
+        url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
+        sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
       };
     };
-    "deep-equal-1.0.1" = {
-      name = "deep-equal";
-      packageName = "deep-equal";
-      version = "1.0.1";
+    "ecdsa-sig-formatter-1.0.9" = {
+      name = "ecdsa-sig-formatter";
+      packageName = "ecdsa-sig-formatter";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz";
-        sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz";
+        sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1";
       };
     };
-    "i-0.3.5" = {
-      name = "i";
-      packageName = "i";
-      version = "0.3.5";
+    "xml2js-0.2.7" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz";
-        sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5";
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz";
+        sha1 = "1838518bb01741cae0878bab4915e494c32306af";
       };
     };
-    "mkdirp-0.5.1" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.1";
+    "dateformat-1.0.2-1.2.3" = {
+      name = "dateformat";
+      packageName = "dateformat";
+      version = "1.0.2-1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
+        sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
       };
     };
-    "ncp-0.4.2" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "0.4.2";
+    "validator-3.22.2" = {
+      name = "validator";
+      packageName = "validator";
+      version = "3.22.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
-        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
+        url = "https://registry.npmjs.org/validator/-/validator-3.22.2.tgz";
+        sha1 = "6f297ae67f7f82acc76d0afdb49f18d9a09c18c0";
       };
     };
-    "rimraf-2.6.1" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.6.1";
+    "envconf-0.0.4" = {
+      name = "envconf";
+      packageName = "envconf";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz";
-        sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d";
+        url = "https://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz";
+        sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b";
       };
     };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
+    "duplexer-0.1.1" = {
+      name = "duplexer";
+      packageName = "duplexer";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+        url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
       };
     };
-    "glob-7.1.1" = {
-      name = "glob";
-      packageName = "glob";
-      version = "7.1.1";
+    "sax-0.5.2" = {
+      name = "sax";
+      packageName = "sax";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
-        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
+        url = "https://registry.npmjs.org/sax/-/sax-0.5.2.tgz";
+        sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea";
       };
     };
-    "fs.realpath-1.0.0" = {
-      name = "fs.realpath";
-      packageName = "fs.realpath";
-      version = "1.0.0";
+    "moment-2.6.0" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
-        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+        url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz";
+        sha1 = "0765b72b841dd213fa91914c0f6765122719f061";
       };
     };
-    "inflight-1.0.6" = {
-      name = "inflight";
-      packageName = "inflight";
-      version = "1.0.6";
+    "moment-2.14.1" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
-        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+        url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz";
+        sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c";
       };
     };
-    "minimatch-3.0.3" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.3";
+    "browserify-mime-1.2.9" = {
+      name = "browserify-mime";
+      packageName = "browserify-mime";
+      version = "1.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz";
-        sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774";
+        url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz";
+        sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f";
       };
     };
-    "once-1.4.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.4.0";
+    "extend-1.2.1" = {
+      name = "extend";
+      packageName = "extend";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
-        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+        url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+        sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
       };
     };
-    "path-is-absolute-1.0.1" = {
-      name = "path-is-absolute";
-      packageName = "path-is-absolute";
-      version = "1.0.1";
+    "json-edm-parser-0.1.2" = {
+      name = "json-edm-parser";
+      packageName = "json-edm-parser";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
-        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+        url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz";
+        sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4";
       };
     };
-    "wrappy-1.0.2" = {
-      name = "wrappy";
-      packageName = "wrappy";
-      version = "1.0.2";
+    "md5.js-1.3.4" = {
+      name = "md5.js";
+      packageName = "md5.js";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
-        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+        url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz";
+        sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
       };
     };
-    "brace-expansion-1.1.7" = {
-      name = "brace-expansion";
-      packageName = "brace-expansion";
-      version = "1.1.7";
+    "readable-stream-2.0.6" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz";
-        sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
+        sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
       };
     };
-    "balanced-match-0.4.2" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "0.4.2";
+    "jsonparse-1.2.0" = {
+      name = "jsonparse";
+      packageName = "jsonparse";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz";
-        sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838";
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz";
+        sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
       };
     };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
+    "hash-base-3.0.4" = {
+      name = "hash-base";
+      packageName = "hash-base";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz";
+        sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
       };
     };
-    "colors-0.6.2" = {
-      name = "colors";
-      packageName = "colors";
-      version = "0.6.2";
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
-        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
-    "cycle-1.0.3" = {
-      name = "cycle";
-      packageName = "cycle";
-      version = "1.0.3";
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
-        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
     };
-    "isstream-0.1.2" = {
-      name = "isstream";
-      packageName = "isstream";
-      version = "0.1.2";
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
-        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
       };
     };
-    "pkginfo-0.3.1" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.3.1";
+    "process-nextick-args-1.0.7" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
-        sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz";
+        sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
       };
     };
-    "isarray-0.0.1" = {
-      name = "isarray";
-      packageName = "isarray";
-      version = "0.0.1";
+    "string_decoder-0.10.31" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "0.10.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
-        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
       };
     };
-    "aws-sign2-0.6.0" = {
-      name = "aws-sign2";
-      packageName = "aws-sign2";
-      version = "0.6.0";
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
-        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "aws4-1.6.0" = {
-      name = "aws4";
-      packageName = "aws4";
-      version = "1.6.0";
+    "stack-trace-0.0.10" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
-        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz";
+        sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
       };
     };
-    "bl-1.1.2" = {
-      name = "bl";
-      packageName = "bl";
-      version = "1.1.2";
+    "keypress-0.1.0" = {
+      name = "keypress";
+      packageName = "keypress";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz";
-        sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398";
+        url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+        sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
       };
     };
-    "caseless-0.11.0" = {
-      name = "caseless";
-      packageName = "caseless";
-      version = "0.11.0";
+    "from-0.1.7" = {
+      name = "from";
+      packageName = "from";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
-        sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
+        url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz";
+        sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe";
       };
     };
-    "combined-stream-1.0.5" = {
-      name = "combined-stream";
-      packageName = "combined-stream";
-      version = "1.0.5";
+    "map-stream-0.1.0" = {
+      name = "map-stream";
+      packageName = "map-stream";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
-        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
+        url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
+        sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
       };
     };
-    "extend-3.0.1" = {
-      name = "extend";
-      packageName = "extend";
-      version = "3.0.1";
+    "pause-stream-0.0.11" = {
+      name = "pause-stream";
+      packageName = "pause-stream";
+      version = "0.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz";
-        sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
+        url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
+        sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
       };
     };
-    "forever-agent-0.6.1" = {
-      name = "forever-agent";
-      packageName = "forever-agent";
-      version = "0.6.1";
+    "split-0.2.10" = {
+      name = "split";
+      packageName = "split";
+      version = "0.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
-        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+        url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz";
+        sha1 = "67097c601d697ce1368f418f06cd201cf0521a57";
       };
     };
-    "form-data-1.0.1" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "1.0.1";
+    "stream-combiner-0.0.4" = {
+      name = "stream-combiner";
+      packageName = "stream-combiner";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz";
-        sha1 = "ae315db9a4907fa065502304a66d7733475ee37c";
+        url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
+        sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
       };
     };
-    "har-validator-2.0.6" = {
-      name = "har-validator";
-      packageName = "har-validator";
-      version = "2.0.6";
+    "commander-1.1.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
-        sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
+        url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
+        sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041";
       };
     };
-    "hawk-3.1.3" = {
-      name = "hawk";
-      packageName = "hawk";
-      version = "3.1.3";
+    "streamline-0.4.11" = {
+      name = "streamline";
+      packageName = "streamline";
+      version = "0.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
-        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+        url = "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz";
+        sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "http-signature-1.1.1" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "1.1.1";
+    "async-0.2.7" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
-        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
+        url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz";
+        sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
       };
     };
-    "is-typedarray-1.0.0" = {
-      name = "is-typedarray";
-      packageName = "is-typedarray";
-      version = "1.0.0";
+    "debug-0.7.4" = {
+      name = "debug";
+      packageName = "debug";
+      version = "0.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
-        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+        url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+        sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
       };
     };
-    "json-stringify-safe-5.0.1" = {
-      name = "json-stringify-safe";
-      packageName = "json-stringify-safe";
-      version = "5.0.1";
+    "q-0.9.7" = {
+      name = "q";
+      packageName = "q";
+      version = "0.9.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+        url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz";
+        sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75";
       };
     };
-    "mime-types-2.1.15" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.15";
+    "pkginfo-0.4.0" = {
+      name = "pkginfo";
+      packageName = "pkginfo";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
-        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
+        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz";
+        sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65";
       };
     };
-    "oauth-sign-0.8.2" = {
-      name = "oauth-sign";
-      packageName = "oauth-sign";
-      version = "0.8.2";
+    "revalidator-0.1.8" = {
+      name = "revalidator";
+      packageName = "revalidator";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
-        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
+        url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
+        sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
       };
     };
-    "qs-6.2.3" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.2.3";
+    "utile-0.2.1" = {
+      name = "utile";
+      packageName = "utile";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz";
-        sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe";
+        url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
+        sha1 = "930c88e99098d6220834c356cbd9a770522d90d7";
       };
     };
-    "stringstream-0.0.5" = {
-      name = "stringstream";
-      packageName = "stringstream";
-      version = "0.0.5";
+    "winston-0.8.3" = {
+      name = "winston";
+      packageName = "winston";
+      version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
+        url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
+        sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
       };
     };
-    "tough-cookie-2.3.2" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.3.2";
+    "async-0.2.10" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz";
-        sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
+        url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "tunnel-agent-0.4.3" = {
-      name = "tunnel-agent";
-      packageName = "tunnel-agent";
-      version = "0.4.3";
+    "deep-equal-1.0.1" = {
+      name = "deep-equal";
+      packageName = "deep-equal";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
-        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
+        url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz";
+        sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
       };
     };
-    "delayed-stream-1.0.0" = {
-      name = "delayed-stream";
-      packageName = "delayed-stream";
-      version = "1.0.0";
+    "i-0.3.5" = {
+      name = "i";
+      packageName = "i";
+      version = "0.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+        url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz";
+        sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5";
       };
     };
-    "async-2.4.0" = {
-      name = "async";
-      packageName = "async";
-      version = "2.4.0";
+    "ncp-0.4.2" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.4.0.tgz";
-        sha1 = "4990200f18ea5b837c2cc4f8c031a6985c385611";
+        url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
+        sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
       };
     };
-    "lodash-4.17.4" = {
-      name = "lodash";
-      packageName = "lodash";
-      version = "4.17.4";
+    "rimraf-2.6.1" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz";
-        sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae";
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz";
+        sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d";
       };
     };
-    "chalk-1.1.3" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "1.1.3";
+    "glob-7.1.2" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
+        sha1 = "c19c9df9a028702d678612384a6552404c636d15";
       };
     };
-    "commander-2.9.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.9.0";
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
-        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "is-my-json-valid-2.16.0" = {
-      name = "is-my-json-valid";
-      packageName = "is-my-json-valid";
-      version = "2.16.0";
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz";
-        sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693";
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
       };
     };
-    "pinkie-promise-2.0.1" = {
-      name = "pinkie-promise";
-      packageName = "pinkie-promise";
-      version = "2.0.1";
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
-        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
-    "ansi-styles-2.2.1" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "2.2.1";
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
-        sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "escape-string-regexp-1.0.5" = {
-      name = "escape-string-regexp";
-      packageName = "escape-string-regexp";
-      version = "1.0.5";
+    "colors-0.6.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-        sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+        url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
       };
     };
-    "has-ansi-2.0.0" = {
-      name = "has-ansi";
-      packageName = "has-ansi";
-      version = "2.0.0";
+    "cycle-1.0.3" = {
+      name = "cycle";
+      packageName = "cycle";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
-        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+        url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
       };
     };
-    "strip-ansi-3.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "3.0.1";
+    "isstream-0.1.2" = {
+      name = "isstream";
+      packageName = "isstream";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+        url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
       };
     };
-    "supports-color-2.0.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "2.0.0";
+    "pkginfo-0.3.1" = {
+      name = "pkginfo";
+      packageName = "pkginfo";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
-        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
+        sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
       };
     };
-    "ansi-regex-2.1.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "2.1.1";
+    "isarray-0.0.1" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+        url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
       };
     };
-    "graceful-readlink-1.0.1" = {
-      name = "graceful-readlink";
-      packageName = "graceful-readlink";
-      version = "1.0.1";
+    "aws-sign2-0.6.0" = {
+      name = "aws-sign2";
+      packageName = "aws-sign2";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
-        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+        url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+        sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "generate-function-2.0.0" = {
-      name = "generate-function";
-      packageName = "generate-function";
-      version = "2.0.0";
+    "aws4-1.6.0" = {
+      name = "aws4";
+      packageName = "aws4";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
-        sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
+        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
       };
     };
-    "generate-object-property-1.2.0" = {
-      name = "generate-object-property";
-      packageName = "generate-object-property";
-      version = "1.2.0";
+    "bl-1.1.2" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
-        sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
+        url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz";
+        sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398";
       };
     };
-    "jsonpointer-4.0.1" = {
-      name = "jsonpointer";
-      packageName = "jsonpointer";
-      version = "4.0.1";
+    "caseless-0.11.0" = {
+      name = "caseless";
+      packageName = "caseless";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
-        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
+        url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+        sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
       };
     };
-    "xtend-4.0.1" = {
-      name = "xtend";
-      packageName = "xtend";
-      version = "4.0.1";
+    "combined-stream-1.0.5" = {
+      name = "combined-stream";
+      packageName = "combined-stream";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
-        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+        url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
       };
     };
-    "is-property-1.0.2" = {
-      name = "is-property";
-      packageName = "is-property";
-      version = "1.0.2";
+    "extend-3.0.1" = {
+      name = "extend";
+      packageName = "extend";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
-        sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+        url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz";
+        sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
       };
     };
-    "pinkie-2.0.4" = {
-      name = "pinkie";
-      packageName = "pinkie";
-      version = "2.0.4";
+    "forever-agent-0.6.1" = {
+      name = "forever-agent";
+      packageName = "forever-agent";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
-        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+        url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
       };
     };
-    "hoek-2.16.3" = {
-      name = "hoek";
-      packageName = "hoek";
-      version = "2.16.3";
+    "form-data-1.0.1" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
-        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
+        url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz";
+        sha1 = "ae315db9a4907fa065502304a66d7733475ee37c";
       };
     };
-    "boom-2.10.1" = {
-      name = "boom";
-      packageName = "boom";
-      version = "2.10.1";
+    "har-validator-2.0.6" = {
+      name = "har-validator";
+      packageName = "har-validator";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
-        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
+        url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
+        sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
       };
     };
-    "cryptiles-2.0.5" = {
-      name = "cryptiles";
-      packageName = "cryptiles";
-      version = "2.0.5";
+    "hawk-3.1.3" = {
+      name = "hawk";
+      packageName = "hawk";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
-        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+        url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+        sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
       };
     };
-    "sntp-1.0.9" = {
-      name = "sntp";
-      packageName = "sntp";
-      version = "1.0.9";
+    "http-signature-1.1.1" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
-        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+        sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
       };
     };
-    "assert-plus-0.2.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.2.0";
+    "is-typedarray-1.0.0" = {
+      name = "is-typedarray";
+      packageName = "is-typedarray";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
-        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+        url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+        sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
       };
     };
-    "jsprim-1.4.0" = {
-      name = "jsprim";
-      packageName = "jsprim";
-      version = "1.4.0";
+    "json-stringify-safe-5.0.1" = {
+      name = "json-stringify-safe";
+      packageName = "json-stringify-safe";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
-        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
+        url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
     };
-    "sshpk-1.13.0" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.13.0";
+    "mime-types-2.1.15" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz";
-        sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz";
+        sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed";
       };
     };
-    "assert-plus-1.0.0" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "1.0.0";
-      src = fetchurl {
+    "oauth-sign-0.8.2" = {
+      name = "oauth-sign";
+      packageName = "oauth-sign";
+      version = "0.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
+        sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
+      };
+    };
+    "qs-6.2.3" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz";
+        sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe";
+      };
+    };
+    "stringstream-0.0.5" = {
+      name = "stringstream";
+      packageName = "stringstream";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
+      };
+    };
+    "tough-cookie-2.3.2" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz";
+        sha1 = "f081f76e4c85720e6c37a5faced737150d84072a";
+      };
+    };
+    "tunnel-agent-0.4.3" = {
+      name = "tunnel-agent";
+      packageName = "tunnel-agent";
+      version = "0.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz";
+        sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
+      };
+    };
+    "delayed-stream-1.0.0" = {
+      name = "delayed-stream";
+      packageName = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+    };
+    "commander-2.9.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+      };
+    };
+    "is-my-json-valid-2.16.0" = {
+      name = "is-my-json-valid";
+      packageName = "is-my-json-valid";
+      version = "2.16.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz";
+        sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693";
+      };
+    };
+    "pinkie-promise-2.0.1" = {
+      name = "pinkie-promise";
+      packageName = "pinkie-promise";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+        sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+      };
+    };
+    "graceful-readlink-1.0.1" = {
+      name = "graceful-readlink";
+      packageName = "graceful-readlink";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+      };
+    };
+    "generate-function-2.0.0" = {
+      name = "generate-function";
+      packageName = "generate-function";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+        sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+      };
+    };
+    "generate-object-property-1.2.0" = {
+      name = "generate-object-property";
+      packageName = "generate-object-property";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+        sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
+      };
+    };
+    "jsonpointer-4.0.1" = {
+      name = "jsonpointer";
+      packageName = "jsonpointer";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz";
+        sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9";
+      };
+    };
+    "xtend-4.0.1" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+      };
+    };
+    "is-property-1.0.2" = {
+      name = "is-property";
+      packageName = "is-property";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+        sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+      };
+    };
+    "pinkie-2.0.4" = {
+      name = "pinkie";
+      packageName = "pinkie";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+        sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+      };
+    };
+    "hoek-2.16.3" = {
+      name = "hoek";
+      packageName = "hoek";
+      version = "2.16.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
+      };
+    };
+    "boom-2.10.1" = {
+      name = "boom";
+      packageName = "boom";
+      version = "2.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
+      };
+    };
+    "cryptiles-2.0.5" = {
+      name = "cryptiles";
+      packageName = "cryptiles";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+      };
+    };
+    "sntp-1.0.9" = {
+      name = "sntp";
+      packageName = "sntp";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+      };
+    };
+    "assert-plus-0.2.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+        sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+      };
+    };
+    "jsprim-1.4.0" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz";
+        sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
+      };
+    };
+    "sshpk-1.13.0" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz";
+        sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c";
+      };
+    };
+    "assert-plus-1.0.0" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "1.0.0";
+      src = fetchurl {
         url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
         sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
       };
@@ -2452,13 +2722,13 @@ let
         sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
       };
     };
-    "string_decoder-1.0.0" = {
+    "string_decoder-1.0.1" = {
       name = "string_decoder";
       packageName = "string_decoder";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz";
-        sha1 = "f06f41157b664d86069f84bdbdc9b0d8ab281667";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz";
+        sha1 = "62e200f039955a6810d8df0a33ffc0f013662d98";
       };
     };
     "http-basic-2.5.1" = {
@@ -2488,15 +2758,6 @@ let
         sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
       };
     };
-    "os-homedir-1.0.2" = {
-      name = "os-homedir";
-      packageName = "os-homedir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
-        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
-      };
-    };
     "async-1.0.0" = {
       name = "async";
       packageName = "async";
@@ -2632,13 +2893,13 @@ let
         sha1 = "04e6926f662895354f3dd015203633b857297e2c";
       };
     };
-    "deep-extend-0.4.1" = {
+    "deep-extend-0.4.2" = {
       name = "deep-extend";
       packageName = "deep-extend";
-      version = "0.4.1";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz";
-        sha1 = "efe4113d08085f4e6f9687759810f807469e2253";
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
+        sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
       };
     };
     "ext-name-3.0.0" = {
@@ -2677,13 +2938,13 @@ let
         sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a";
       };
     };
-    "ext-list-2.2.0" = {
+    "ext-list-2.2.1" = {
       name = "ext-list";
       packageName = "ext-list";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.0.tgz";
-        sha1 = "a3e6fdeab978bca7a320c7e786f537083fc30055";
+        url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.1.tgz";
+        sha1 = "ba045fac10c92300b4e0606269e4988ddc572b1e";
       };
     };
     "meow-3.7.0" = {
@@ -2704,139 +2965,31 @@ let
         sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
       };
     };
-    "got-2.9.2" = {
-      name = "got";
-      packageName = "got";
-      version = "2.9.2";
+    "mime-db-1.28.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.28.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-2.9.2.tgz";
-        sha1 = "2e1ee58ea1e8d201e25ae580b96e63c15fefd4ee";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.28.0.tgz";
+        sha1 = "fedd349be06d2865b7fc57d837c6de4f17d7ac3c";
       };
     };
-    "duplexify-3.5.0" = {
-      name = "duplexify";
-      packageName = "duplexify";
-      version = "3.5.0";
+    "camelcase-keys-2.1.0" = {
+      name = "camelcase-keys";
+      packageName = "camelcase-keys";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz";
-        sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604";
+        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz";
+        sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
       };
     };
-    "infinity-agent-2.0.3" = {
-      name = "infinity-agent";
-      packageName = "infinity-agent";
-      version = "2.0.3";
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz";
-        sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216";
-      };
-    };
-    "is-stream-1.1.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
-        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
-      };
-    };
-    "lowercase-keys-1.0.0" = {
-      name = "lowercase-keys";
-      packageName = "lowercase-keys";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
-        sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
-      };
-    };
-    "nested-error-stacks-1.0.2" = {
-      name = "nested-error-stacks";
-      packageName = "nested-error-stacks";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz";
-        sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf";
-      };
-    };
-    "object-assign-2.1.1" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz";
-        sha1 = "43c36e5d569ff8e4816c4efa8be02d26967c18aa";
-      };
-    };
-    "prepend-http-1.0.4" = {
-      name = "prepend-http";
-      packageName = "prepend-http";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
-        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
-      };
-    };
-    "read-all-stream-2.2.0" = {
-      name = "read-all-stream";
-      packageName = "read-all-stream";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-2.2.0.tgz";
-        sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0";
-      };
-    };
-    "statuses-1.3.1" = {
-      name = "statuses";
-      packageName = "statuses";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz";
-        sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
-      };
-    };
-    "timed-out-2.0.0" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz";
-        sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a";
-      };
-    };
-    "end-of-stream-1.0.0" = {
-      name = "end-of-stream";
-      packageName = "end-of-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
-        sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
-      };
-    };
-    "stream-shift-1.0.0" = {
-      name = "stream-shift";
-      packageName = "stream-shift";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz";
-        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
-      };
-    };
-    "once-1.3.3" = {
-      name = "once";
-      packageName = "once";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
-        sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
-      };
-    };
-    "camelcase-keys-2.1.0" = {
-      name = "camelcase-keys";
-      packageName = "camelcase-keys";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz";
-        sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
       };
     };
     "loud-rejection-1.6.0" = {
@@ -3136,33 +3289,6 @@ let
         sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2";
       };
     };
-    "repeating-2.0.1" = {
-      name = "repeating";
-      packageName = "repeating";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
-        sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
-      };
-    };
-    "is-finite-1.0.2" = {
-      name = "is-finite";
-      packageName = "is-finite";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
-      };
-    };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
-      };
-    };
     "get-stdin-4.0.1" = {
       name = "get-stdin";
       packageName = "get-stdin";
@@ -3226,33 +3352,6 @@ let
         sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1";
       };
     };
-    "debug-2.6.6" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz";
-        sha1 = "a9fa6fbe9ca43cf1e79f73b75c0189cbb7d6db5a";
-      };
-    };
-    "ms-0.7.3" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz";
-        sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff";
-      };
-    };
-    "os-tmpdir-1.0.2" = {
-      name = "os-tmpdir";
-      packageName = "os-tmpdir";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
-        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
-      };
-    };
     "rimraf-2.2.8" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -3541,13 +3640,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.7.0" = {
+    "stream-http-2.7.1" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.7.0";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.0.tgz";
-        sha1 = "cec1f4e3b494bc4a81b451808970f8b20b4ed5f6";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.1.tgz";
+        sha1 = "546a51741ad5a6b07e9e31b0b10441a917df528a";
       };
     };
     "subarg-1.0.0" = {
@@ -3622,13 +3721,13 @@ let
         sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
       };
     };
-    "jsonparse-1.3.0" = {
+    "jsonparse-1.3.1" = {
       name = "jsonparse";
       packageName = "jsonparse";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.0.tgz";
-        sha1 = "85fc245b1d9259acc6941960b905adf64e7de0e8";
+        url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz";
+        sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
       };
     };
     "through-2.3.8" = {
@@ -3757,22 +3856,22 @@ let
         sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
       };
     };
-    "create-hash-1.1.2" = {
+    "create-hash-1.1.3" = {
       name = "create-hash";
       packageName = "create-hash";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz";
-        sha1 = "51210062d7bb7479f6c65bb41a92208b1d61abad";
+        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz";
+        sha1 = "606042ac8b9262750f483caddab0f5819172d8fd";
       };
     };
-    "create-hmac-1.1.4" = {
+    "create-hmac-1.1.6" = {
       name = "create-hmac";
       packageName = "create-hmac";
-      version = "1.1.4";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz";
-        sha1 = "d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170";
+        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz";
+        sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06";
       };
     };
     "diffie-hellman-5.0.2" = {
@@ -3784,13 +3883,13 @@ let
         sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
       };
     };
-    "pbkdf2-3.0.9" = {
+    "pbkdf2-3.0.12" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.9";
+      version = "3.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz";
-        sha1 = "f2c4b25a600058b3c3773c086c37dbbee1ffe693";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz";
+        sha1 = "be36785c5067ea48d806ff923288c5f750b6b8a2";
       };
     };
     "public-encrypt-4.0.0" = {
@@ -3955,13 +4054,13 @@ let
         sha1 = "48ba240b45a9280e94748990ba597d216617fd40";
       };
     };
-    "ripemd160-1.0.1" = {
+    "ripemd160-2.0.1" = {
       name = "ripemd160";
       packageName = "ripemd160";
-      version = "1.0.1";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz";
-        sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e";
+        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz";
+        sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7";
       };
     };
     "sha.js-2.4.8" = {
@@ -3973,6 +4072,15 @@ let
         sha1 = "37068c2c476b6baf402d14a49c67f597921f634f";
       };
     };
+    "hash-base-2.0.2" = {
+      name = "hash-base";
+      packageName = "hash-base";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz";
+        sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1";
+      };
+    };
     "miller-rabin-4.0.0" = {
       name = "miller-rabin";
       packageName = "miller-rabin";
@@ -3991,6 +4099,15 @@ let
         sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771";
       };
     };
+    "is-buffer-1.1.5" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
+        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
+      };
+    };
     "lexical-scope-1.2.0" = {
       name = "lexical-scope";
       packageName = "lexical-scope";
@@ -4009,13 +4126,13 @@ let
         sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917";
       };
     };
-    "acorn-4.0.11" = {
+    "acorn-4.0.13" = {
       name = "acorn";
       packageName = "acorn";
-      version = "4.0.11";
+      version = "4.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
-        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz";
+        sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
       };
     };
     "stream-splicer-2.0.0" = {
@@ -4243,13 +4360,13 @@ let
         sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
       };
     };
-    "mime-1.3.4" = {
+    "mime-1.3.6" = {
       name = "mime";
       packageName = "mime";
-      version = "1.3.4";
+      version = "1.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
-        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+        url = "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz";
+        sha1 = "591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0";
       };
     };
     "peerflix-0.34.0" = {
@@ -4909,6 +5026,24 @@ let
         sha1 = "de1905c636af874a8fba862d9aabddd1f920461c";
       };
     };
+    "end-of-stream-1.0.0" = {
+      name = "end-of-stream";
+      packageName = "end-of-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
+        sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
+      };
+    };
+    "once-1.3.3" = {
+      name = "once";
+      packageName = "once";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
+        sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
+      };
+    };
     "deep-extend-0.2.11" = {
       name = "deep-extend";
       packageName = "deep-extend";
@@ -5044,13 +5179,13 @@ let
         sha1 = "50346e42a43b35daf2a86f414afb153629a854be";
       };
     };
-    "random-access-file-1.7.2" = {
+    "random-access-file-1.7.3" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.7.2";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.7.2.tgz";
-        sha1 = "053e2e8ec7670370a8e8b10da962e45753f22dbc";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.7.3.tgz";
+        sha1 = "e5e642cb85dfc13166bfeaa97f7ffc9f5609053d";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5737,13 +5872,13 @@ let
         sha1 = "2214ee04ae1c2ec012a52c7c185313e341a6fb38";
       };
     };
-    "cordova-lib-7.0.0" = {
+    "cordova-lib-7.0.1" = {
       name = "cordova-lib";
       packageName = "cordova-lib";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-7.0.0.tgz";
-        sha1 = "aa3f0a9be0e2cf4de797f394eff4ad31ac067d0f";
+        url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-7.0.1.tgz";
+        sha1 = "31cbb90daeb66a67a7d3091636ce729a22a4f7ff";
       };
     };
     "editor-1.0.0" = {
@@ -5989,13 +6124,13 @@ let
         sha1 = "7c30825b9450b9e6185ba27533eaf6e2067d4b42";
       };
     };
-    "cordova-create-1.1.0" = {
+    "cordova-create-1.1.1" = {
       name = "cordova-create";
       packageName = "cordova-create";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.0.tgz";
-        sha1 = "9ac3f9d418db3c09c75859324b05561d4d635e70";
+        url = "https://registry.npmjs.org/cordova-create/-/cordova-create-1.1.1.tgz";
+        sha1 = "55282493ab396d9303f72febbaf2f978fa764cd2";
       };
     };
     "cordova-fetch-1.1.0" = {
@@ -6034,6 +6169,15 @@ let
         sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe";
       };
     };
+    "glob-7.1.1" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz";
+        sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8";
+      };
+    };
     "init-package-json-1.10.1" = {
       name = "init-package-json";
       packageName = "init-package-json";
@@ -6277,13 +6421,13 @@ let
         sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3";
       };
     };
-    "express-4.15.2" = {
+    "express-4.15.3" = {
       name = "express";
       packageName = "express";
-      version = "4.15.2";
+      version = "4.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.15.2.tgz";
-        sha1 = "af107fc148504457f2dca9a6f2571d7129b97b35";
+        url = "https://registry.npmjs.org/express/-/express-4.15.3.tgz";
+        sha1 = "bab65d0f03aa80c358408972fc700f916944b662";
       };
     };
     "accepts-1.3.3" = {
@@ -6403,13 +6547,13 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "debug-2.6.1" = {
+    "debug-2.6.7" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.1";
+      version = "2.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
-        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz";
+        sha1 = "92bad1f6d05bbb6bba22cca88bcd0ec894c2861e";
       };
     };
     "depd-1.1.0" = {
@@ -6448,13 +6592,13 @@ let
         sha1 = "6f631aef336d6c46362b51764044ce216be3c051";
       };
     };
-    "finalhandler-1.0.2" = {
+    "finalhandler-1.0.3" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.2.tgz";
-        sha1 = "d0e36f9dbc557f2de14423df6261889e9d60c93a";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz";
+        sha1 = "ef47e77950e999780e86022a560e3217e0d0cc89";
       };
     };
     "fresh-0.5.0" = {
@@ -6529,22 +6673,22 @@ let
         sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
       };
     };
-    "send-0.15.1" = {
+    "send-0.15.3" = {
       name = "send";
       packageName = "send";
-      version = "0.15.1";
+      version = "0.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.1.tgz";
-        sha1 = "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f";
+        url = "https://registry.npmjs.org/send/-/send-0.15.3.tgz";
+        sha1 = "5013f9f99023df50d1bd9892c19e3defd1d53309";
       };
     };
-    "serve-static-1.12.1" = {
+    "serve-static-1.12.3" = {
       name = "serve-static";
       packageName = "serve-static";
-      version = "1.12.1";
+      version = "1.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz";
-        sha1 = "7443a965e3ced647aceb5639fa06bf4d1bbe0039";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz";
+        sha1 = "9f4ba19e2f3030c547f8af99107838ec38d5b1e2";
       };
     };
     "setprototypeof-1.0.3" = {
@@ -6556,6 +6700,15 @@ let
         sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04";
       };
     };
+    "statuses-1.3.1" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz";
+        sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
+      };
+    };
     "type-is-1.6.15" = {
       name = "type-is";
       packageName = "type-is";
@@ -6574,24 +6727,6 @@ let
         sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
       };
     };
-    "ms-0.7.2" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
-        sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
-      };
-    };
-    "debug-2.6.4" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.4.tgz";
-        sha1 = "7586a9b3c39741c0282ae33445c4e8ac74734fe0";
-      };
-    };
     "unpipe-1.0.0" = {
       name = "unpipe";
       packageName = "unpipe";
@@ -6637,11 +6772,20 @@ let
         sha1 = "5f8b8ed98aca545656bf572997387f904a722257";
       };
     };
-    "media-typer-0.3.0" = {
-      name = "media-typer";
-      packageName = "media-typer";
-      version = "0.3.0";
-      src = fetchurl {
+    "mime-1.3.4" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
+      };
+    };
+    "media-typer-0.3.0" = {
+      name = "media-typer";
+      packageName = "media-typer";
+      version = "0.3.0";
+      src = fetchurl {
         url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
@@ -7645,6 +7789,24 @@ let
         sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
       };
     };
+    "duplexify-3.5.0" = {
+      name = "duplexify";
+      packageName = "duplexify";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz";
+        sha1 = "1aa773002e1578457e9d9d4a50b0ccaaebcbd604";
+      };
+    };
+    "infinity-agent-2.0.3" = {
+      name = "infinity-agent";
+      packageName = "infinity-agent";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz";
+        sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216";
+      };
+    };
     "is-redirect-1.0.0" = {
       name = "is-redirect";
       packageName = "is-redirect";
@@ -7654,6 +7816,33 @@ let
         sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
       };
     };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
+    "lowercase-keys-1.0.0" = {
+      name = "lowercase-keys";
+      packageName = "lowercase-keys";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
+        sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
+      };
+    };
+    "nested-error-stacks-1.0.2" = {
+      name = "nested-error-stacks";
+      packageName = "nested-error-stacks";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz";
+        sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf";
+      };
+    };
     "object-assign-3.0.0" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -7663,6 +7852,15 @@ let
         sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
       };
     };
+    "prepend-http-1.0.4" = {
+      name = "prepend-http";
+      packageName = "prepend-http";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz";
+        sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
+      };
+    };
     "read-all-stream-3.1.0" = {
       name = "read-all-stream";
       packageName = "read-all-stream";
@@ -7672,6 +7870,24 @@ let
         sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
       };
     };
+    "timed-out-2.0.0" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz";
+        sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a";
+      };
+    };
+    "stream-shift-1.0.0" = {
+      name = "stream-shift";
+      packageName = "stream-shift";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz";
+        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
+      };
+    };
     "rc-1.2.1" = {
       name = "rc";
       packageName = "rc";
@@ -8105,24 +8321,6 @@ let
         sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
       };
     };
-    "bindings-1.2.1" = {
-      name = "bindings";
-      packageName = "bindings";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
-        sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
-      };
-    };
-    "nan-2.6.2" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz";
-        sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
-      };
-    };
     "jsonparse-0.0.6" = {
       name = "jsonparse";
       packageName = "jsonparse";
@@ -8558,13 +8756,13 @@ let
         sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15";
       };
     };
-    "tar-stream-1.5.2" = {
+    "tar-stream-1.5.4" = {
       name = "tar-stream";
       packageName = "tar-stream";
-      version = "1.5.2";
+      version = "1.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz";
-        sha1 = "fbc6c6e83c1a19d4cb48c7d96171fc248effc7bf";
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz";
+        sha1 = "36549cf04ed1aee9b2a30c0143252238daf94016";
       };
     };
     "through2-0.6.5" = {
@@ -8639,13 +8837,13 @@ let
         sha1 = "9500635e257945d6feede185f5d7a24773455b17";
       };
     };
-    "pull-stream-3.5.0" = {
+    "pull-stream-3.6.0" = {
       name = "pull-stream";
       packageName = "pull-stream";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz";
-        sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7";
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.0.tgz";
+        sha1 = "59d033a6815d4e3097d47c3d2b1893a9e58a2351";
       };
     };
     "typewiselite-1.0.0" = {
@@ -8765,13 +8963,13 @@ let
         sha1 = "a4ecee01e330155e9124bbbcf4761f21b38f51f5";
       };
     };
-    "pull-pushable-2.0.1" = {
+    "pull-pushable-2.1.1" = {
       name = "pull-pushable";
       packageName = "pull-pushable";
-      version = "2.0.1";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.0.1.tgz";
-        sha1 = "02bdca51a39cf585f483fbecde2fc9378076f212";
+        url = "https://registry.npmjs.org/pull-pushable/-/pull-pushable-2.1.1.tgz";
+        sha1 = "86666abbe3f5402f1f7ead03eefd69b785eca5b8";
       };
     };
     "pull-window-2.1.4" = {
@@ -8873,13 +9071,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "awscred-1.2.0" = {
-      name = "awscred";
-      packageName = "awscred";
-      version = "1.2.0";
+    "aws-sdk-2.58.0" = {
+      name = "aws-sdk";
+      packageName = "aws-sdk";
+      version = "2.58.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/awscred/-/awscred-1.2.0.tgz";
-        sha1 = "9ba714a0d2feb625b848f15c62746c07aebdc3b5";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.58.0.tgz";
+        sha1 = "7ea8c3aa59e97a87c570dbe12d0042082ac1debf";
       };
     };
     "request-2.81.0" = {
@@ -8891,6 +9089,42 @@ let
         sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0";
       };
     };
+    "crypto-browserify-1.0.9" = {
+      name = "crypto-browserify";
+      packageName = "crypto-browserify";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
+        sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0";
+      };
+    };
+    "jmespath-0.15.0" = {
+      name = "jmespath";
+      packageName = "jmespath";
+      version = "0.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz";
+        sha1 = "a3f222a9aae9f966f5d27c796510e28091764217";
+      };
+    };
+    "sax-1.2.1" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
+        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+      };
+    };
+    "url-0.10.3" = {
+      name = "url";
+      packageName = "url";
+      version = "0.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz";
+        sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
+      };
+    };
     "caseless-0.12.0" = {
       name = "caseless";
       packageName = "caseless";
@@ -8972,6 +9206,15 @@ let
         sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc";
       };
     };
+    "conf-1.1.1" = {
+      name = "conf";
+      packageName = "conf";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/conf/-/conf-1.1.1.tgz";
+        sha1 = "238d0a3090ac4916ed2d40c7e81d7a11667bc7ba";
+      };
+    };
     "got-6.7.1" = {
       name = "got";
       packageName = "got";
@@ -9008,6 +9251,15 @@ let
         sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76";
       };
     };
+    "skin-tone-1.0.0" = {
+      name = "skin-tone";
+      packageName = "skin-tone";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/skin-tone/-/skin-tone-1.0.0.tgz";
+        sha1 = "d4ba3e8e5e92760e4d1d3b603d772805c6cb256f";
+      };
+    };
     "execa-0.5.1" = {
       name = "execa";
       packageName = "execa";
@@ -9071,6 +9323,87 @@ let
         sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
       };
     };
+    "dot-prop-4.1.1" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz";
+        sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1";
+      };
+    };
+    "env-paths-1.0.0" = {
+      name = "env-paths";
+      packageName = "env-paths";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz";
+        sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0";
+      };
+    };
+    "make-dir-1.0.0" = {
+      name = "make-dir";
+      packageName = "make-dir";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz";
+        sha1 = "97a011751e91dd87cfadef58832ebb04936de978";
+      };
+    };
+    "pkg-up-2.0.0" = {
+      name = "pkg-up";
+      packageName = "pkg-up";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz";
+        sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f";
+      };
+    };
+    "find-up-2.1.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
+        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+      };
+    };
+    "locate-path-2.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
+        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+      };
+    };
+    "p-locate-2.0.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
+        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+      };
+    };
+    "path-exists-3.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
+        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+      };
+    };
+    "p-limit-1.1.0" = {
+      name = "p-limit";
+      packageName = "p-limit";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz";
+        sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc";
+      };
+    };
     "create-error-class-3.0.2" = {
       name = "create-error-class";
       packageName = "create-error-class";
@@ -9143,13 +9476,13 @@ let
         sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18";
       };
     };
-    "babel-code-frame-6.22.0" = {
-      name = "babel-code-frame";
-      packageName = "babel-code-frame";
-      version = "6.22.0";
+    "unicode-emoji-modifier-base-1.0.0" = {
+      name = "unicode-emoji-modifier-base";
+      packageName = "unicode-emoji-modifier-base";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz";
-        sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
+        url = "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz";
+        sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459";
       };
     };
     "doctrine-2.0.0" = {
@@ -9170,13 +9503,13 @@ let
         sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
       };
     };
-    "espree-3.4.2" = {
+    "espree-3.4.3" = {
       name = "espree";
       packageName = "espree";
-      version = "3.4.2";
+      version = "3.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.4.2.tgz";
-        sha1 = "38dbdedbedc95b8961a1fbf04734a8f6a9c8c592";
+        url = "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz";
+        sha1 = "2910b5ccd49ce893c2ffffaab4fd8b3a31b82374";
       };
     };
     "esquery-1.0.0" = {
@@ -9197,15 +9530,6 @@ let
         sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
       };
     };
-    "esutils-2.0.2" = {
-      name = "esutils";
-      packageName = "esutils";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
-        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
-      };
-    };
     "file-entry-cache-2.0.0" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
@@ -9215,22 +9539,13 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.17.0" = {
-      name = "globals";
-      packageName = "globals";
-      version = "9.17.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz";
-        sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286";
-      };
-    };
-    "ignore-3.3.0" = {
+    "ignore-3.3.3" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.3.0";
+      version = "3.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.0.tgz";
-        sha1 = "3812d22cbe9125f2c2b4915755a1b8abd745a001";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz";
+        sha1 = "432352e57accd87ab3110e82d3fea0e47812156d";
       };
     };
     "inquirer-0.12.0" = {
@@ -9251,13 +9566,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.8.3" = {
+    "js-yaml-3.8.4" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.8.3";
+      version = "3.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz";
-        sha1 = "33a05ec481c850c8875929166fe1beb61c728766";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz";
+        sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6";
       };
     };
     "levn-0.3.0" = {
@@ -9323,15 +9638,6 @@ let
         sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
       };
     };
-    "js-tokens-3.0.1" = {
-      name = "js-tokens";
-      packageName = "js-tokens";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz";
-        sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7";
-      };
-    };
     "es6-map-0.1.5" = {
       name = "es6-map";
       packageName = "es6-map";
@@ -9368,13 +9674,13 @@ let
         sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
       };
     };
-    "es5-ext-0.10.15" = {
+    "es5-ext-0.10.21" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.15";
+      version = "0.10.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.15.tgz";
-        sha1 = "c330a5934c1ee21284a7c081a86e5fd937c91ea6";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz";
+        sha1 = "19a725f9e51d0300bbc1e8e821109fd9daf55925";
       };
     };
     "es6-iterator-2.0.1" = {
@@ -9836,13 +10142,13 @@ let
         sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
       };
     };
-    "chokidar-1.6.1" = {
+    "chokidar-1.7.0" = {
       name = "chokidar";
       packageName = "chokidar";
-      version = "1.6.1";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz";
-        sha1 = "2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2";
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz";
+        sha1 = "798e689778151c8076b4b360e5edd28cda2bb468";
       };
     };
     "ps-tree-0.0.3" = {
@@ -9980,6 +10286,15 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
+    "kind-of-3.2.2" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz";
+        sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
+      };
+    };
     "normalize-path-2.1.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
@@ -10088,8 +10403,17 @@ let
         sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
       };
     };
-    "is-posix-bracket-0.1.1" = {
-      name = "is-posix-bracket";
+    "repeat-string-1.6.1" = {
+      name = "repeat-string";
+      packageName = "repeat-string";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+      };
+    };
+    "is-posix-bracket-0.1.1" = {
+      name = "is-posix-bracket";
       packageName = "is-posix-bracket";
       version = "0.1.1";
       src = fetchurl {
@@ -10142,13 +10466,13 @@ let
         sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4";
       };
     };
-    "is-dotfile-1.0.2" = {
+    "is-dotfile-1.0.3" = {
       name = "is-dotfile";
       packageName = "is-dotfile";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz";
-        sha1 = "2c132383f39199f8edc268ca01b9b007d205cc4d";
+        url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz";
+        sha1 = "a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1";
       };
     };
     "is-equal-shallow-0.1.3" = {
@@ -10187,22 +10511,22 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.34" = {
+    "node-pre-gyp-0.6.35" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.34";
+      version = "0.6.35";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz";
-        sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.35.tgz";
+        sha1 = "1c161fc9fbf1f3ffecd751959f0fdbd12a56c4ab";
       };
     };
-    "npmlog-4.0.2" = {
+    "npmlog-4.1.0" = {
       name = "npmlog";
       packageName = "npmlog";
-      version = "4.0.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
-        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz";
+        sha1 = "dc59bee85f64f00ed424efb2af0783df25d1c0b5";
       };
     };
     "tar-pack-3.4.0" = {
@@ -10250,13 +10574,13 @@ let
         sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab";
       };
     };
-    "wide-align-1.1.0" = {
+    "wide-align-1.1.2" = {
       name = "wide-align";
       packageName = "wide-align";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz";
-        sha1 = "40edde802a71fea1f070da3e62dcda2e7add96ad";
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz";
+        sha1 = "571e0f1b0604636ebc0dfc21b0339bbe31341710";
       };
     };
     "event-stream-0.5.3" = {
@@ -10358,13 +10682,13 @@ let
         sha1 = "21ffdc429be2b50cb361df990a40a7731288e935";
       };
     };
-    "simple-git-1.70.0" = {
+    "simple-git-1.73.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.70.0";
+      version = "1.73.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.70.0.tgz";
-        sha1 = "62cfd90bb2628a13ff4fe704c840fcef56244a71";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.73.0.tgz";
+        sha1 = "87683a729b1bee016a3182f95a2ab72317bb0230";
       };
     };
     "tabtab-git+https://github.com/mixu/node-tabtab.git" = {
@@ -10404,13 +10728,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.5" = {
+    "coffee-script-1.12.6" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.5";
+      version = "1.12.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz";
-        sha1 = "809f4585419112bbfe46a073ad7543af18c27346";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz";
+        sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf";
       };
     };
     "jade-1.11.0" = {
@@ -10449,13 +10773,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.25" = {
+    "clean-css-3.4.26" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.25";
+      version = "3.4.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz";
-        sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.26.tgz";
+        sha1 = "55323b344ff3bcee684a2eac81c93df8fa73deeb";
       };
     };
     "commander-2.6.0" = {
@@ -10494,13 +10818,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.8.22" = {
+    "uglify-js-2.8.27" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.8.22";
+      version = "2.8.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz";
-        sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.27.tgz";
+        sha1 = "47787f912b0f242e5b984343be8e35e95f694c9c";
       };
     };
     "void-elements-2.0.1" = {
@@ -10638,6 +10962,96 @@ let
         sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
       };
     };
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+      };
+    };
+    "uglify-to-browserify-1.0.2" = {
+      name = "uglify-to-browserify";
+      packageName = "uglify-to-browserify";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+      };
+    };
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    };
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    };
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    };
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    };
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    };
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    };
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    };
     "acorn-1.2.2" = {
       name = "acorn";
       packageName = "acorn";
@@ -10872,13 +11286,13 @@ let
         sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde";
       };
     };
-    "time-stamp-1.0.1" = {
+    "time-stamp-1.1.0" = {
       name = "time-stamp";
       packageName = "time-stamp";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.1.tgz";
-        sha1 = "9f4bd23559c9365966f3302dbba2b07c6b99b151";
+        url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz";
+        sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3";
       };
     };
     "glogg-1.0.0" = {
@@ -11601,13 +12015,13 @@ let
         sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
       };
     };
-    "handlebars-4.0.8" = {
+    "handlebars-4.0.10" = {
       name = "handlebars";
       packageName = "handlebars";
-      version = "4.0.8";
+      version = "4.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.8.tgz";
-        sha1 = "22b875cd3f0e6cbea30314f144e82bc7a72ff420";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz";
+        sha1 = "3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f";
       };
     };
     "supports-color-3.2.3" = {
@@ -11664,139 +12078,112 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "bluebird-3.5.0" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz";
-        sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
-      };
-    };
-    "body-parser-1.17.1" = {
+    "body-parser-1.17.2" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.17.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.1.tgz";
-        sha1 = "75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47";
-      };
-    };
-    "combine-lists-1.0.1" = {
-      name = "combine-lists";
-      packageName = "combine-lists";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz";
-        sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6";
-      };
-    };
-    "connect-3.6.1" = {
-      name = "connect";
-      packageName = "connect";
-      version = "3.6.1";
+      version = "1.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-3.6.1.tgz";
-        sha1 = "b7760693a74f0454face1d9378edb3f885b43227";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.2.tgz";
+        sha1 = "f8892abc8f9e627d42aedafbca66bf5ab99104ee";
       };
     };
-    "core-js-2.4.1" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "2.4.1";
+    "connect-pause-0.1.1" = {
+      name = "connect-pause";
+      packageName = "connect-pause";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz";
-        sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e";
+        url = "https://registry.npmjs.org/connect-pause/-/connect-pause-0.1.1.tgz";
+        sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a";
       };
     };
-    "di-0.0.1" = {
-      name = "di";
-      packageName = "di";
-      version = "0.0.1";
+    "errorhandler-1.5.0" = {
+      name = "errorhandler";
+      packageName = "errorhandler";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/di/-/di-0.0.1.tgz";
-        sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c";
+        url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.0.tgz";
+        sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4";
       };
     };
-    "dom-serialize-2.2.1" = {
-      name = "dom-serialize";
-      packageName = "dom-serialize";
-      version = "2.2.1";
+    "lodash-id-0.13.0" = {
+      name = "lodash-id";
+      packageName = "lodash-id";
+      version = "0.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz";
-        sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b";
+        url = "https://registry.npmjs.org/lodash-id/-/lodash-id-0.13.0.tgz";
+        sha1 = "1b2086c24f004f07411bdb09b775072114bcddc6";
       };
     };
-    "expand-braces-0.1.2" = {
-      name = "expand-braces";
-      packageName = "expand-braces";
-      version = "0.1.2";
+    "lowdb-0.15.5" = {
+      name = "lowdb";
+      packageName = "lowdb";
+      version = "0.15.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz";
-        sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
+        url = "https://registry.npmjs.org/lowdb/-/lowdb-0.15.5.tgz";
+        sha1 = "9ade105df8aa573692d1221622b85414fbf4fa96";
       };
     };
-    "http-proxy-1.16.2" = {
-      name = "http-proxy";
-      packageName = "http-proxy";
-      version = "1.16.2";
+    "method-override-2.3.9" = {
+      name = "method-override";
+      packageName = "method-override";
+      version = "2.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz";
-        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
+        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.9.tgz";
+        sha1 = "bd151f2ce34cf01a76ca400ab95c012b102d8f71";
       };
     };
-    "isbinaryfile-3.0.2" = {
-      name = "isbinaryfile";
-      packageName = "isbinaryfile";
-      version = "3.0.2";
+    "morgan-1.8.2" = {
+      name = "morgan";
+      packageName = "morgan";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
-        sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
+        url = "https://registry.npmjs.org/morgan/-/morgan-1.8.2.tgz";
+        sha1 = "784ac7734e4a453a9c6e6e8680a9329275c8b687";
       };
     };
-    "log4js-0.6.38" = {
-      name = "log4js";
-      packageName = "log4js";
-      version = "0.6.38";
+    "pluralize-3.1.0" = {
+      name = "pluralize";
+      packageName = "pluralize";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz";
-        sha1 = "2c494116695d6fb25480943d3fc872e662a522fd";
+        url = "https://registry.npmjs.org/pluralize/-/pluralize-3.1.0.tgz";
+        sha1 = "84213d0a12356069daa84060c559242633161368";
       };
     };
-    "qjobs-1.1.5" = {
-      name = "qjobs";
-      packageName = "qjobs";
-      version = "1.1.5";
+    "server-destroy-1.0.1" = {
+      name = "server-destroy";
+      packageName = "server-destroy";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz";
-        sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
+        url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz";
+        sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd";
       };
     };
-    "socket.io-1.7.3" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "1.7.3";
+    "shortid-2.2.8" = {
+      name = "shortid";
+      packageName = "shortid";
+      version = "2.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz";
-        sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b";
+        url = "https://registry.npmjs.org/shortid/-/shortid-2.2.8.tgz";
+        sha1 = "033b117d6a2e975804f6f0969dbe7d3d0b355131";
       };
     };
-    "tmp-0.0.31" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.0.31";
+    "update-notifier-1.0.3" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
-        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
+        sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
       };
     };
-    "useragent-2.1.13" = {
-      name = "useragent";
-      packageName = "useragent";
-      version = "2.1.13";
+    "yargs-6.6.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz";
-        sha1 = "bba43e8aa24d5ceb83c2937473e102e21df74c10";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
     "bytes-2.4.0" = {
@@ -11826,4333 +12213,4468 @@ let
         sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
-    "debug-2.6.3" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.3";
+    "steno-0.4.4" = {
+      name = "steno";
+      packageName = "steno";
+      version = "0.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz";
-        sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d";
+        url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz";
+        sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb";
       };
     };
-    "finalhandler-1.0.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "1.0.1";
+    "boxen-0.6.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.1.tgz";
-        sha1 = "bcd15d1689c0e5ed729b6f7f541a6df984117db8";
+        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
+        sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6";
       };
     };
-    "custom-event-1.0.1" = {
-      name = "custom-event";
-      packageName = "custom-event";
-      version = "1.0.1";
+    "latest-version-2.0.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz";
-        sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425";
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
+        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
       };
     };
-    "ent-2.2.0" = {
-      name = "ent";
-      packageName = "ent";
-      version = "2.2.0";
+    "lazy-req-1.1.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz";
-        sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d";
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
+        sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac";
       };
     };
-    "array-slice-0.2.3" = {
-      name = "array-slice";
-      packageName = "array-slice";
-      version = "0.2.3";
+    "ansi-align-1.1.0" = {
+      name = "ansi-align";
+      packageName = "ansi-align";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz";
-        sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5";
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
+        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
       };
     };
-    "braces-0.1.5" = {
-      name = "braces";
-      packageName = "braces";
-      version = "0.1.5";
+    "cli-boxes-1.0.0" = {
+      name = "cli-boxes";
+      packageName = "cli-boxes";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz";
-        sha1 = "c085711085291d8b75fdd74eab0f8597280711e6";
+        url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz";
+        sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
       };
     };
-    "expand-range-0.1.1" = {
-      name = "expand-range";
-      packageName = "expand-range";
-      version = "0.1.1";
+    "filled-array-1.1.0" = {
+      name = "filled-array";
+      packageName = "filled-array";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz";
-        sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044";
+        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
+        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
       };
     };
-    "is-number-0.1.1" = {
-      name = "is-number";
-      packageName = "is-number";
-      version = "0.1.1";
+    "widest-line-1.0.0" = {
+      name = "widest-line";
+      packageName = "widest-line";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz";
-        sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806";
+        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
+        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
       };
     };
-    "repeat-string-0.2.2" = {
-      name = "repeat-string";
-      packageName = "repeat-string";
-      version = "0.2.2";
+    "package-json-2.4.0" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz";
-        sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae";
+        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
+        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
       };
     };
-    "eventemitter3-1.2.0" = {
-      name = "eventemitter3";
-      packageName = "eventemitter3";
-      version = "1.2.0";
+    "got-5.7.1" = {
+      name = "got";
+      packageName = "got";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz";
-        sha1 = "1c86991d816ad1e504750e73874224ecf3bec508";
+        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
+        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
       };
     };
-    "requires-port-1.0.0" = {
-      name = "requires-port";
-      packageName = "requires-port";
-      version = "1.0.0";
+    "registry-auth-token-3.3.1" = {
+      name = "registry-auth-token";
+      packageName = "registry-auth-token";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz";
-        sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
+        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz";
+        sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006";
       };
     };
-    "debug-2.3.3" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.3.3";
+    "node-status-codes-1.0.0" = {
+      name = "node-status-codes";
+      packageName = "node-status-codes";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
-        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
+        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
+        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
-    "engine.io-1.8.3" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "1.8.3";
+    "timed-out-3.1.3" = {
+      name = "timed-out";
+      packageName = "timed-out";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz";
-        sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4";
+        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
+        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
       };
     };
-    "has-binary-0.1.7" = {
-      name = "has-binary";
-      packageName = "has-binary";
-      version = "0.1.7";
+    "unzip-response-1.0.2" = {
+      name = "unzip-response";
+      packageName = "unzip-response";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz";
-        sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
+        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
+        sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
       };
     };
-    "object-assign-4.1.0" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "4.1.0";
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
-        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
       };
     };
-    "socket.io-adapter-0.5.0" = {
-      name = "socket.io-adapter";
-      packageName = "socket.io-adapter";
-      version = "0.5.0";
+    "cliui-3.2.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
-        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
+        url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz";
+        sha1 = "120601537a916d29940f934da3b48d585a39213d";
       };
     };
-    "socket.io-client-1.7.3" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "1.7.3";
+    "get-caller-file-1.0.2" = {
+      name = "get-caller-file";
+      packageName = "get-caller-file";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz";
-        sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377";
+        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
+        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
       };
     };
-    "socket.io-parser-2.3.1" = {
-      name = "socket.io-parser";
-      packageName = "socket.io-parser";
-      version = "2.3.1";
+    "os-locale-1.4.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
-        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
+        sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
       };
     };
-    "base64id-1.0.0" = {
-      name = "base64id";
-      packageName = "base64id";
-      version = "1.0.0";
+    "require-directory-2.1.1" = {
+      name = "require-directory";
+      packageName = "require-directory";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz";
-        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
+        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
-    "engine.io-parser-1.3.2" = {
-      name = "engine.io-parser";
-      packageName = "engine.io-parser";
-      version = "1.3.2";
+    "require-main-filename-1.0.1" = {
+      name = "require-main-filename";
+      packageName = "require-main-filename";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz";
-        sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
+        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
       };
     };
-    "ws-1.1.2" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.1.2";
+    "which-module-1.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz";
-        sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f";
+        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
+        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
       };
     };
-    "after-0.8.2" = {
-      name = "after";
-      packageName = "after";
-      version = "0.8.2";
+    "y18n-3.2.1" = {
+      name = "y18n";
+      packageName = "y18n";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
-        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
+        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
+        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
       };
     };
-    "arraybuffer.slice-0.0.6" = {
-      name = "arraybuffer.slice";
-      packageName = "arraybuffer.slice";
-      version = "0.0.6";
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
-        sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
       };
     };
-    "base64-arraybuffer-0.1.5" = {
-      name = "base64-arraybuffer";
-      packageName = "base64-arraybuffer";
-      version = "0.1.5";
+    "wrap-ansi-2.1.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
-        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
       };
     };
-    "blob-0.0.4" = {
-      name = "blob";
-      packageName = "blob";
-      version = "0.0.4";
+    "lcid-1.0.0" = {
+      name = "lcid";
+      packageName = "lcid";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz";
-        sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
+        url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
+        sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
       };
     };
-    "wtf-8-1.0.0" = {
-      name = "wtf-8";
-      packageName = "wtf-8";
+    "invert-kv-1.0.0" = {
+      name = "invert-kv";
+      packageName = "invert-kv";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
-        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
+        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
+        sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
       };
     };
-    "backo2-1.0.2" = {
-      name = "backo2";
-      packageName = "backo2";
-      version = "1.0.2";
+    "bluebird-3.5.0" = {
+      name = "bluebird";
+      packageName = "bluebird";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
-        sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz";
+        sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
       };
     };
-    "component-bind-1.0.0" = {
-      name = "component-bind";
-      packageName = "component-bind";
-      version = "1.0.0";
+    "combine-lists-1.0.1" = {
+      name = "combine-lists";
+      packageName = "combine-lists";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
-        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
+        url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz";
+        sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6";
       };
     };
-    "component-emitter-1.2.1" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.2.1";
+    "connect-3.6.2" = {
+      name = "connect";
+      packageName = "connect";
+      version = "3.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
-        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
+        url = "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz";
+        sha1 = "694e8d20681bfe490282c8ab886be98f09f42fe7";
       };
     };
-    "engine.io-client-1.8.3" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "1.8.3";
+    "di-0.0.1" = {
+      name = "di";
+      packageName = "di";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz";
-        sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab";
+        url = "https://registry.npmjs.org/di/-/di-0.0.1.tgz";
+        sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c";
       };
     };
-    "object-component-0.0.3" = {
-      name = "object-component";
-      packageName = "object-component";
-      version = "0.0.3";
+    "dom-serialize-2.2.1" = {
+      name = "dom-serialize";
+      packageName = "dom-serialize";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
-        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+        url = "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz";
+        sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b";
       };
     };
-    "parseuri-0.0.5" = {
-      name = "parseuri";
-      packageName = "parseuri";
-      version = "0.0.5";
+    "expand-braces-0.1.2" = {
+      name = "expand-braces";
+      packageName = "expand-braces";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
-        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
+        url = "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz";
+        sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
       };
     };
-    "to-array-0.1.4" = {
-      name = "to-array";
-      packageName = "to-array";
-      version = "0.1.4";
+    "http-proxy-1.16.2" = {
+      name = "http-proxy";
+      packageName = "http-proxy";
+      version = "1.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
-        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz";
+        sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
       };
     };
-    "component-inherit-0.0.3" = {
-      name = "component-inherit";
-      packageName = "component-inherit";
-      version = "0.0.3";
+    "isbinaryfile-3.0.2" = {
+      name = "isbinaryfile";
+      packageName = "isbinaryfile";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
-        sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
+        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz";
+        sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621";
       };
     };
-    "has-cors-1.1.0" = {
-      name = "has-cors";
-      packageName = "has-cors";
-      version = "1.1.0";
+    "log4js-0.6.38" = {
+      name = "log4js";
+      packageName = "log4js";
+      version = "0.6.38";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
-        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+        url = "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz";
+        sha1 = "2c494116695d6fb25480943d3fc872e662a522fd";
       };
     };
-    "parsejson-0.0.3" = {
-      name = "parsejson";
-      packageName = "parsejson";
-      version = "0.0.3";
+    "qjobs-1.1.5" = {
+      name = "qjobs";
+      packageName = "qjobs";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
-        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
+        url = "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz";
+        sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
       };
     };
-    "parseqs-0.0.5" = {
-      name = "parseqs";
-      packageName = "parseqs";
-      version = "0.0.5";
+    "socket.io-1.7.3" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
-        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz";
+        sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b";
       };
     };
-    "xmlhttprequest-ssl-1.5.3" = {
-      name = "xmlhttprequest-ssl";
-      packageName = "xmlhttprequest-ssl";
-      version = "1.5.3";
+    "tmp-0.0.31" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
-        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
+        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
       };
     };
-    "yeast-0.1.2" = {
-      name = "yeast";
-      packageName = "yeast";
-      version = "0.1.2";
+    "useragent-2.1.13" = {
+      name = "useragent";
+      packageName = "useragent";
+      version = "2.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz";
-        sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz";
+        sha1 = "bba43e8aa24d5ceb83c2937473e102e21df74c10";
       };
     };
-    "better-assert-1.0.2" = {
-      name = "better-assert";
-      packageName = "better-assert";
-      version = "1.0.2";
+    "custom-event-1.0.1" = {
+      name = "custom-event";
+      packageName = "custom-event";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
-        sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
+        url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz";
+        sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425";
       };
     };
-    "callsite-1.0.0" = {
-      name = "callsite";
-      packageName = "callsite";
-      version = "1.0.0";
+    "ent-2.2.0" = {
+      name = "ent";
+      packageName = "ent";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
-        sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
+        url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz";
+        sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d";
       };
     };
-    "json3-3.3.2" = {
-      name = "json3";
-      packageName = "json3";
-      version = "3.3.2";
+    "array-slice-0.2.3" = {
+      name = "array-slice";
+      packageName = "array-slice";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
-        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
+        url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz";
+        sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5";
       };
     };
-    "lru-cache-2.2.4" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "2.2.4";
+    "braces-0.1.5" = {
+      name = "braces";
+      packageName = "braces";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
-        sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d";
+        url = "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz";
+        sha1 = "c085711085291d8b75fdd74eab0f8597280711e6";
       };
     };
-    "express-3.21.2" = {
-      name = "express";
-      packageName = "express";
-      version = "3.21.2";
+    "expand-range-0.1.1" = {
+      name = "expand-range";
+      packageName = "expand-range";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz";
-        sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
+        url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz";
+        sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044";
       };
     };
-    "passport-0.3.2" = {
-      name = "passport";
-      packageName = "passport";
-      version = "0.3.2";
+    "is-number-0.1.1" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz";
-        sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102";
+        url = "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz";
+        sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806";
       };
     };
-    "passport-google-oauth-1.0.0" = {
-      name = "passport-google-oauth";
-      packageName = "passport-google-oauth";
-      version = "1.0.0";
+    "repeat-string-0.2.2" = {
+      name = "repeat-string";
+      packageName = "repeat-string";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-1.0.0.tgz";
-        sha1 = "65f50633192ad0627a18b08960077109d84eb76d";
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz";
+        sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae";
       };
     };
-    "connect-restreamer-1.0.3" = {
-      name = "connect-restreamer";
-      packageName = "connect-restreamer";
-      version = "1.0.3";
+    "eventemitter3-1.2.0" = {
+      name = "eventemitter3";
+      packageName = "eventemitter3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.3.tgz";
-        sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz";
+        sha1 = "1c86991d816ad1e504750e73874224ecf3bec508";
       };
     };
-    "basic-auth-1.0.4" = {
-      name = "basic-auth";
-      packageName = "basic-auth";
-      version = "1.0.4";
+    "requires-port-1.0.0" = {
+      name = "requires-port";
+      packageName = "requires-port";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
-        sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
+        url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz";
+        sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
       };
     };
-    "connect-2.30.2" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.30.2";
+    "debug-2.3.3" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz";
-        sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609";
+        url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz";
+        sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
       };
     };
-    "cookie-0.1.3" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.3";
+    "engine.io-1.8.3" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz";
-        sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz";
+        sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4";
       };
     };
-    "escape-html-1.0.2" = {
-      name = "escape-html";
-      packageName = "escape-html";
-      version = "1.0.2";
+    "has-binary-0.1.7" = {
+      name = "has-binary";
+      packageName = "has-binary";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz";
-        sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c";
+        url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz";
+        sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
       };
     };
-    "etag-1.7.0" = {
-      name = "etag";
-      packageName = "etag";
-      version = "1.7.0";
+    "object-assign-4.1.0" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
-        sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz";
+        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
       };
     };
-    "fresh-0.3.0" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.3.0";
+    "socket.io-adapter-0.5.0" = {
+      name = "socket.io-adapter";
+      packageName = "socket.io-adapter";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
-        sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz";
+        sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
       };
     };
-    "merge-descriptors-1.0.0" = {
-      name = "merge-descriptors";
-      packageName = "merge-descriptors";
-      version = "1.0.0";
+    "socket.io-client-1.7.3" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
-        sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz";
+        sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377";
       };
     };
-    "send-0.13.0" = {
-      name = "send";
-      packageName = "send";
-      version = "0.13.0";
+    "socket.io-parser-2.3.1" = {
+      name = "socket.io-parser";
+      packageName = "socket.io-parser";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz";
-        sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz";
+        sha1 = "dd532025103ce429697326befd64005fcfe5b4a0";
       };
     };
-    "basic-auth-connect-1.0.0" = {
-      name = "basic-auth-connect";
-      packageName = "basic-auth-connect";
-      version = "1.0.0";
+    "ms-0.7.2" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
-        sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122";
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
+        sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
       };
     };
-    "body-parser-1.13.3" = {
-      name = "body-parser";
-      packageName = "body-parser";
-      version = "1.13.3";
+    "base64id-1.0.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz";
-        sha1 = "c08cf330c3358e151016a05746f13f029c97fa97";
+        url = "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz";
+        sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
-    "bytes-2.1.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "2.1.0";
+    "engine.io-parser-1.3.2" = {
+      name = "engine.io-parser";
+      packageName = "engine.io-parser";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz";
-        sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz";
+        sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a";
       };
     };
-    "cookie-parser-1.3.5" = {
-      name = "cookie-parser";
-      packageName = "cookie-parser";
-      version = "1.3.5";
+    "ws-1.1.2" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz";
-        sha1 = "9d755570fb5d17890771227a02314d9be7cf8356";
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz";
+        sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f";
       };
     };
-    "compression-1.5.2" = {
-      name = "compression";
-      packageName = "compression";
-      version = "1.5.2";
+    "after-0.8.2" = {
+      name = "after";
+      packageName = "after";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz";
-        sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395";
+        url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz";
+        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
       };
     };
-    "connect-timeout-1.6.2" = {
-      name = "connect-timeout";
-      packageName = "connect-timeout";
-      version = "1.6.2";
+    "arraybuffer.slice-0.0.6" = {
+      name = "arraybuffer.slice";
+      packageName = "arraybuffer.slice";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz";
-        sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e";
+        url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
+        sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
       };
     };
-    "csurf-1.8.3" = {
-      name = "csurf";
-      packageName = "csurf";
-      version = "1.8.3";
+    "base64-arraybuffer-0.1.5" = {
+      name = "base64-arraybuffer";
+      packageName = "base64-arraybuffer";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz";
-        sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a";
+        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz";
+        sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8";
       };
     };
-    "errorhandler-1.4.3" = {
-      name = "errorhandler";
-      packageName = "errorhandler";
-      version = "1.4.3";
+    "blob-0.0.4" = {
+      name = "blob";
+      packageName = "blob";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz";
-        sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f";
+        url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz";
+        sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
       };
     };
-    "express-session-1.11.3" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.11.3";
+    "wtf-8-1.0.0" = {
+      name = "wtf-8";
+      packageName = "wtf-8";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz";
-        sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af";
+        url = "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz";
+        sha1 = "392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a";
       };
     };
-    "finalhandler-0.4.0" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.4.0";
+    "backo2-1.0.2" = {
+      name = "backo2";
+      packageName = "backo2";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz";
-        sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b";
+        url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
+        sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
       };
     };
-    "http-errors-1.3.1" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.3.1";
+    "component-bind-1.0.0" = {
+      name = "component-bind";
+      packageName = "component-bind";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
-        sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
+        url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+        sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
       };
     };
-    "method-override-2.3.8" = {
-      name = "method-override";
-      packageName = "method-override";
-      version = "2.3.8";
+    "component-emitter-1.2.1" = {
+      name = "component-emitter";
+      packageName = "component-emitter";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz";
-        sha1 = "178234bf4bab869f89df9444b06fc6147b44828c";
+        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz";
+        sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
       };
     };
-    "morgan-1.6.1" = {
-      name = "morgan";
-      packageName = "morgan";
-      version = "1.6.1";
+    "engine.io-client-1.8.3" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz";
-        sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz";
+        sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab";
       };
     };
-    "multiparty-3.3.2" = {
-      name = "multiparty";
-      packageName = "multiparty";
-      version = "3.3.2";
+    "object-component-0.0.3" = {
+      name = "object-component";
+      packageName = "object-component";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
-        sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
+        url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+        sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
       };
     };
-    "pause-0.1.0" = {
-      name = "pause";
-      packageName = "pause";
-      version = "0.1.0";
+    "parseuri-0.0.5" = {
+      name = "parseuri";
+      packageName = "parseuri";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz";
-        sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74";
+        url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz";
+        sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a";
       };
     };
-    "qs-4.0.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "4.0.0";
+    "to-array-0.1.4" = {
+      name = "to-array";
+      packageName = "to-array";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
-        sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
+        url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
+        sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
       };
     };
-    "response-time-2.3.2" = {
-      name = "response-time";
-      packageName = "response-time";
-      version = "2.3.2";
+    "component-inherit-0.0.3" = {
+      name = "component-inherit";
+      packageName = "component-inherit";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz";
-        sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a";
+        url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
+        sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
       };
     };
-    "serve-favicon-2.3.2" = {
-      name = "serve-favicon";
-      packageName = "serve-favicon";
-      version = "2.3.2";
+    "has-cors-1.1.0" = {
+      name = "has-cors";
+      packageName = "has-cors";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz";
-        sha1 = "dd419e268de012ab72b319d337f2105013f9381f";
+        url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
+        sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
       };
     };
-    "serve-index-1.7.3" = {
-      name = "serve-index";
-      packageName = "serve-index";
-      version = "1.7.3";
+    "parsejson-0.0.3" = {
+      name = "parsejson";
+      packageName = "parsejson";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz";
-        sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2";
+        url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz";
+        sha1 = "ab7e3759f209ece99437973f7d0f1f64ae0e64ab";
       };
     };
-    "serve-static-1.10.3" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.10.3";
+    "parseqs-0.0.5" = {
+      name = "parseqs";
+      packageName = "parseqs";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz";
-        sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535";
+        url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz";
+        sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d";
       };
     };
-    "vhost-3.0.2" = {
-      name = "vhost";
-      packageName = "vhost";
-      version = "3.0.2";
+    "xmlhttprequest-ssl-1.5.3" = {
+      name = "xmlhttprequest-ssl";
+      packageName = "xmlhttprequest-ssl";
+      version = "1.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz";
-        sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5";
+        url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz";
+        sha1 = "185a888c04eca46c3e4070d99f7b49de3528992d";
       };
     };
-    "iconv-lite-0.4.11" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.11";
+    "yeast-0.1.2" = {
+      name = "yeast";
+      packageName = "yeast";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz";
-        sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
+        url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz";
+        sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419";
       };
     };
-    "raw-body-2.1.7" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "2.1.7";
+    "better-assert-1.0.2" = {
+      name = "better-assert";
+      packageName = "better-assert";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
-        sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
+        url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
+        sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
       };
     };
-    "iconv-lite-0.4.13" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.13";
+    "callsite-1.0.0" = {
+      name = "callsite";
+      packageName = "callsite";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
-        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
+        url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
+        sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     };
-    "csrf-3.0.6" = {
-      name = "csrf";
-      packageName = "csrf";
-      version = "3.0.6";
+    "json3-3.3.2" = {
+      name = "json3";
+      packageName = "json3";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz";
-        sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a";
+        url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+        sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
       };
     };
-    "rndm-1.2.0" = {
-      name = "rndm";
-      packageName = "rndm";
-      version = "1.2.0";
+    "lru-cache-2.2.4" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz";
-        sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
+        sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d";
       };
     };
-    "tsscmp-1.0.5" = {
-      name = "tsscmp";
-      packageName = "tsscmp";
-      version = "1.0.5";
+    "express-3.21.2" = {
+      name = "express";
+      packageName = "express";
+      version = "3.21.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz";
-        sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
+        url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz";
+        sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
       };
     };
-    "uid-safe-2.1.4" = {
-      name = "uid-safe";
-      packageName = "uid-safe";
-      version = "2.1.4";
+    "passport-0.3.2" = {
+      name = "passport";
+      packageName = "passport";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz";
-        sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81";
+        url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz";
+        sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102";
       };
     };
-    "random-bytes-1.0.0" = {
-      name = "random-bytes";
-      packageName = "random-bytes";
+    "passport-google-oauth-1.0.0" = {
+      name = "passport-google-oauth";
+      packageName = "passport-google-oauth";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz";
-        sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b";
+        url = "https://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-1.0.0.tgz";
+        sha1 = "65f50633192ad0627a18b08960077109d84eb76d";
       };
     };
-    "crc-3.3.0" = {
-      name = "crc";
-      packageName = "crc";
-      version = "3.3.0";
+    "connect-restreamer-1.0.3" = {
+      name = "connect-restreamer";
+      packageName = "connect-restreamer";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz";
-        sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba";
+        url = "https://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.3.tgz";
+        sha1 = "a73f04d88e7292d7fd2f2d7d691a0cdeeed141a9";
       };
     };
-    "uid-safe-2.0.0" = {
-      name = "uid-safe";
-      packageName = "uid-safe";
-      version = "2.0.0";
+    "basic-auth-1.0.4" = {
+      name = "basic-auth";
+      packageName = "basic-auth";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz";
-        sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137";
+        url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz";
+        sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290";
       };
     };
-    "base64-url-1.2.1" = {
-      name = "base64-url";
-      packageName = "base64-url";
-      version = "1.2.1";
+    "connect-2.30.2" = {
+      name = "connect";
+      packageName = "connect";
+      version = "2.30.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz";
-        sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
+        url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz";
+        sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609";
       };
     };
-    "stream-counter-0.2.0" = {
-      name = "stream-counter";
-      packageName = "stream-counter";
-      version = "0.2.0";
+    "cookie-0.1.3" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
-        sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de";
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz";
+        sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435";
       };
     };
-    "batch-0.5.3" = {
-      name = "batch";
-      packageName = "batch";
-      version = "0.5.3";
+    "escape-html-1.0.2" = {
+      name = "escape-html";
+      packageName = "escape-html";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz";
-        sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464";
+        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz";
+        sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c";
       };
     };
-    "send-0.13.2" = {
-      name = "send";
-      packageName = "send";
-      version = "0.13.2";
+    "etag-1.7.0" = {
+      name = "etag";
+      packageName = "etag";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz";
-        sha1 = "765e7607c8055452bba6f0b052595350986036de";
+        url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
+        sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
       };
     };
-    "statuses-1.2.1" = {
-      name = "statuses";
-      packageName = "statuses";
-      version = "1.2.1";
+    "fresh-0.3.0" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
-        sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
+        sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
       };
     };
-    "passport-strategy-1.0.0" = {
-      name = "passport-strategy";
-      packageName = "passport-strategy";
+    "merge-descriptors-1.0.0" = {
+      name = "merge-descriptors";
+      packageName = "merge-descriptors";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
-        sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4";
+        url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
+        sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
       };
     };
-    "pause-0.0.1" = {
-      name = "pause";
-      packageName = "pause";
-      version = "0.0.1";
+    "send-0.13.0" = {
+      name = "send";
+      packageName = "send";
+      version = "0.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
-        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
+        url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz";
+        sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de";
       };
     };
-    "passport-google-oauth1-1.0.0" = {
-      name = "passport-google-oauth1";
-      packageName = "passport-google-oauth1";
+    "basic-auth-connect-1.0.0" = {
+      name = "basic-auth-connect";
+      packageName = "basic-auth-connect";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz";
-        sha1 = "af74a803df51ec646f66a44d82282be6f108e0cc";
+        url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
+        sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122";
       };
     };
-    "passport-google-oauth20-1.0.0" = {
-      name = "passport-google-oauth20";
-      packageName = "passport-google-oauth20";
-      version = "1.0.0";
+    "body-parser-1.13.3" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.13.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz";
-        sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz";
+        sha1 = "c08cf330c3358e151016a05746f13f029c97fa97";
       };
     };
-    "passport-oauth1-1.1.0" = {
-      name = "passport-oauth1";
-      packageName = "passport-oauth1";
-      version = "1.1.0";
+    "bytes-2.1.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz";
-        sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
+        url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz";
+        sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4";
       };
     };
-    "oauth-0.9.15" = {
-      name = "oauth";
-      packageName = "oauth";
-      version = "0.9.15";
+    "cookie-parser-1.3.5" = {
+      name = "cookie-parser";
+      packageName = "cookie-parser";
+      version = "1.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
-        sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
+        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz";
+        sha1 = "9d755570fb5d17890771227a02314d9be7cf8356";
       };
     };
-    "passport-oauth2-1.4.0" = {
-      name = "passport-oauth2";
-      packageName = "passport-oauth2";
-      version = "1.4.0";
+    "compression-1.5.2" = {
+      name = "compression";
+      packageName = "compression";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
-        sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
+        url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz";
+        sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395";
       };
     };
-    "uid2-0.0.3" = {
-      name = "uid2";
-      packageName = "uid2";
-      version = "0.0.3";
+    "connect-timeout-1.6.2" = {
+      name = "connect-timeout";
+      packageName = "connect-timeout";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
-        sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
+        url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz";
+        sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e";
       };
     };
-    "vinyl-1.2.0" = {
-      name = "vinyl";
-      packageName = "vinyl";
-      version = "1.2.0";
+    "csurf-1.8.3" = {
+      name = "csurf";
+      packageName = "csurf";
+      version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz";
-        sha1 = "5c88036cf565e5df05558bfc911f8656df218884";
+        url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz";
+        sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a";
       };
     };
-    "vinyl-fs-2.4.4" = {
-      name = "vinyl-fs";
-      packageName = "vinyl-fs";
-      version = "2.4.4";
+    "errorhandler-1.4.3" = {
+      name = "errorhandler";
+      packageName = "errorhandler";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz";
-        sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239";
+        url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz";
+        sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f";
       };
     };
-    "glob-stream-5.3.5" = {
-      name = "glob-stream";
-      packageName = "glob-stream";
-      version = "5.3.5";
+    "express-session-1.11.3" = {
+      name = "express-session";
+      packageName = "express-session";
+      version = "1.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz";
-        sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz";
+        sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af";
       };
     };
-    "gulp-sourcemaps-1.6.0" = {
-      name = "gulp-sourcemaps";
-      packageName = "gulp-sourcemaps";
-      version = "1.6.0";
+    "finalhandler-0.4.0" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz";
-        sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz";
+        sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b";
       };
     };
-    "is-valid-glob-0.3.0" = {
-      name = "is-valid-glob";
-      packageName = "is-valid-glob";
-      version = "0.3.0";
+    "http-errors-1.3.1" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz";
-        sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
+        sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
       };
     };
-    "lazystream-1.0.0" = {
-      name = "lazystream";
-      packageName = "lazystream";
-      version = "1.0.0";
+    "morgan-1.6.1" = {
+      name = "morgan";
+      packageName = "morgan";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz";
-        sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
+        url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz";
+        sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2";
       };
     };
-    "lodash.isequal-4.5.0" = {
-      name = "lodash.isequal";
-      packageName = "lodash.isequal";
-      version = "4.5.0";
+    "multiparty-3.3.2" = {
+      name = "multiparty";
+      packageName = "multiparty";
+      version = "3.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
-        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
+        url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
+        sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
       };
     };
-    "merge-stream-1.0.1" = {
-      name = "merge-stream";
-      packageName = "merge-stream";
-      version = "1.0.1";
+    "pause-0.1.0" = {
+      name = "pause";
+      packageName = "pause";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz";
-        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
+        url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz";
+        sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74";
       };
     };
-    "strip-bom-stream-1.0.0" = {
-      name = "strip-bom-stream";
-      packageName = "strip-bom-stream";
-      version = "1.0.0";
+    "qs-4.0.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz";
-        sha1 = "e7144398577d51a6bed0fa1994fa05f43fd988ee";
+        url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
+        sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
       };
     };
-    "through2-filter-2.0.0" = {
-      name = "through2-filter";
-      packageName = "through2-filter";
-      version = "2.0.0";
+    "response-time-2.3.2" = {
+      name = "response-time";
+      packageName = "response-time";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz";
-        sha1 = "60bc55a0dacb76085db1f9dae99ab43f83d622ec";
+        url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz";
+        sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a";
       };
     };
-    "vali-date-1.0.0" = {
-      name = "vali-date";
-      packageName = "vali-date";
-      version = "1.0.0";
+    "serve-favicon-2.3.2" = {
+      name = "serve-favicon";
+      packageName = "serve-favicon";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz";
-        sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz";
+        sha1 = "dd419e268de012ab72b319d337f2105013f9381f";
       };
     };
-    "glob-parent-3.1.0" = {
-      name = "glob-parent";
-      packageName = "glob-parent";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
-        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
-      };
-    };
-    "ordered-read-streams-0.3.0" = {
-      name = "ordered-read-streams";
-      packageName = "ordered-read-streams";
-      version = "0.3.0";
+    "serve-index-1.7.3" = {
+      name = "serve-index";
+      packageName = "serve-index";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz";
-        sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b";
+        url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz";
+        sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2";
       };
     };
-    "to-absolute-glob-0.1.1" = {
-      name = "to-absolute-glob";
-      packageName = "to-absolute-glob";
-      version = "0.1.1";
+    "serve-static-1.10.3" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz";
-        sha1 = "1cdfa472a9ef50c239ee66999b662ca0eb39937f";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz";
+        sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535";
       };
     };
-    "unique-stream-2.2.1" = {
-      name = "unique-stream";
-      packageName = "unique-stream";
-      version = "2.2.1";
+    "vhost-3.0.2" = {
+      name = "vhost";
+      packageName = "vhost";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz";
-        sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369";
+        url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz";
+        sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5";
       };
     };
-    "is-glob-3.1.0" = {
-      name = "is-glob";
-      packageName = "is-glob";
-      version = "3.1.0";
+    "iconv-lite-0.4.11" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
-        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz";
+        sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
       };
     };
-    "path-dirname-1.0.2" = {
-      name = "path-dirname";
-      packageName = "path-dirname";
-      version = "1.0.2";
+    "raw-body-2.1.7" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
-        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz";
+        sha1 = "adfeace2e4fb3098058014d08c072dcc59758774";
       };
     };
-    "is-extglob-2.1.1" = {
-      name = "is-extglob";
-      packageName = "is-extglob";
-      version = "2.1.1";
+    "iconv-lite-0.4.13" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
-        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
+        sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
       };
     };
-    "extend-shallow-2.0.1" = {
-      name = "extend-shallow";
-      packageName = "extend-shallow";
-      version = "2.0.1";
+    "csrf-3.0.6" = {
+      name = "csrf";
+      packageName = "csrf";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz";
-        sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
+        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz";
+        sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a";
       };
     };
-    "convert-source-map-1.5.0" = {
-      name = "convert-source-map";
-      packageName = "convert-source-map";
-      version = "1.5.0";
+    "rndm-1.2.0" = {
+      name = "rndm";
+      packageName = "rndm";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz";
-        sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5";
+        url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz";
+        sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c";
       };
     };
-    "express-2.5.11" = {
-      name = "express";
-      packageName = "express";
-      version = "2.5.11";
+    "tsscmp-1.0.5" = {
+      name = "tsscmp";
+      packageName = "tsscmp";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz";
-        sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0";
+        url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz";
+        sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97";
       };
     };
-    "jade-0.27.0" = {
-      name = "jade";
-      packageName = "jade";
-      version = "0.27.0";
+    "uid-safe-2.1.4" = {
+      name = "uid-safe";
+      packageName = "uid-safe";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
-        sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31";
+        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz";
+        sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81";
       };
     };
-    "open-0.0.2" = {
-      name = "open";
-      packageName = "open";
-      version = "0.0.2";
+    "random-bytes-1.0.0" = {
+      name = "random-bytes";
+      packageName = "random-bytes";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz";
-        sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc";
+        url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz";
+        sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b";
       };
     };
-    "winston-0.6.2" = {
-      name = "winston";
-      packageName = "winston";
-      version = "0.6.2";
+    "crc-3.3.0" = {
+      name = "crc";
+      packageName = "crc";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
-        sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
+        url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz";
+        sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba";
       };
     };
-    "mkdirp-0.3.0" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.3.0";
+    "uid-safe-2.0.0" = {
+      name = "uid-safe";
+      packageName = "uid-safe";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
-        sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
+        url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz";
+        sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137";
       };
     };
-    "node.extend-1.0.0" = {
-      name = "node.extend";
-      packageName = "node.extend";
-      version = "1.0.0";
+    "base64-url-1.2.1" = {
+      name = "base64-url";
+      packageName = "base64-url";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
-        sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e";
+        url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz";
+        sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
       };
     };
-    "connect-1.9.2" = {
-      name = "connect";
-      packageName = "connect";
-      version = "1.9.2";
+    "stream-counter-0.2.0" = {
+      name = "stream-counter";
+      packageName = "stream-counter";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
-        sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807";
+        url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
+        sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de";
       };
     };
-    "mime-1.2.4" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.4";
+    "batch-0.5.3" = {
+      name = "batch";
+      packageName = "batch";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
-        sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7";
+        url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz";
+        sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464";
       };
     };
-    "qs-0.4.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.4.2";
+    "send-0.13.2" = {
+      name = "send";
+      packageName = "send";
+      version = "0.13.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
-        sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f";
+        url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz";
+        sha1 = "765e7607c8055452bba6f0b052595350986036de";
       };
     };
-    "formidable-1.0.17" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.0.17";
+    "statuses-1.2.1" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
-        sha1 = "ef5491490f9433b705faa77249c99029ae348559";
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
+        sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
       };
     };
-    "async-0.1.22" = {
-      name = "async";
-      packageName = "async";
-      version = "0.1.22";
+    "passport-strategy-1.0.0" = {
+      name = "passport-strategy";
+      packageName = "passport-strategy";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
-        sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+        url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
+        sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4";
       };
     };
-    "pkginfo-0.2.3" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.2.3";
+    "pause-0.0.1" = {
+      name = "pause";
+      packageName = "pause";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
-        sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
+        url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
+        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
       };
     };
-    "request-2.9.203" = {
-      name = "request";
-      packageName = "request";
-      version = "2.9.203";
+    "passport-google-oauth1-1.0.0" = {
+      name = "passport-google-oauth1";
+      packageName = "passport-google-oauth1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz";
-        sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
+        url = "https://registry.npmjs.org/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz";
+        sha1 = "af74a803df51ec646f66a44d82282be6f108e0cc";
       };
     };
-    "browser-stdout-1.3.0" = {
-      name = "browser-stdout";
-      packageName = "browser-stdout";
-      version = "1.3.0";
+    "passport-google-oauth20-1.0.0" = {
+      name = "passport-google-oauth20";
+      packageName = "passport-google-oauth20";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
-        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
+        url = "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz";
+        sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0";
       };
     };
-    "debug-2.6.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.0";
+    "passport-oauth1-1.1.0" = {
+      name = "passport-oauth1";
+      packageName = "passport-oauth1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
+        url = "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz";
+        sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
       };
     };
-    "diff-3.2.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "3.2.0";
+    "oauth-0.9.15" = {
+      name = "oauth";
+      packageName = "oauth";
+      version = "0.9.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
-        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
+        sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
       };
     };
-    "growl-1.9.2" = {
-      name = "growl";
-      packageName = "growl";
-      version = "1.9.2";
+    "passport-oauth2-1.4.0" = {
+      name = "passport-oauth2";
+      packageName = "passport-oauth2";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
-        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
+        url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.4.0.tgz";
+        sha1 = "f62f81583cbe12609be7ce6f160b9395a27b86ad";
       };
     };
-    "lodash.create-3.1.1" = {
-      name = "lodash.create";
-      packageName = "lodash.create";
-      version = "3.1.1";
+    "uid2-0.0.3" = {
+      name = "uid2";
+      packageName = "uid2";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz";
-        sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7";
+        url = "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
+        sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
       };
     };
-    "supports-color-3.1.2" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "3.1.2";
+    "vinyl-1.2.0" = {
+      name = "vinyl";
+      packageName = "vinyl";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
-        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
+        url = "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz";
+        sha1 = "5c88036cf565e5df05558bfc911f8656df218884";
       };
     };
-    "lodash._baseassign-3.2.0" = {
-      name = "lodash._baseassign";
-      packageName = "lodash._baseassign";
-      version = "3.2.0";
+    "vinyl-fs-2.4.4" = {
+      name = "vinyl-fs";
+      packageName = "vinyl-fs";
+      version = "2.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
-        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
+        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz";
+        sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239";
       };
     };
-    "lodash._basecreate-3.0.3" = {
-      name = "lodash._basecreate";
-      packageName = "lodash._basecreate";
-      version = "3.0.3";
+    "glob-stream-5.3.5" = {
+      name = "glob-stream";
+      packageName = "glob-stream";
+      version = "5.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz";
-        sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821";
+        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz";
+        sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22";
       };
     };
-    "optparse-1.0.5" = {
-      name = "optparse";
-      packageName = "optparse";
-      version = "1.0.5";
+    "gulp-sourcemaps-1.6.0" = {
+      name = "gulp-sourcemaps";
+      packageName = "gulp-sourcemaps";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz";
-        sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16";
+        url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz";
+        sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c";
       };
     };
-    "slasp-0.0.4" = {
-      name = "slasp";
-      packageName = "slasp";
-      version = "0.0.4";
+    "is-valid-glob-0.3.0" = {
+      name = "is-valid-glob";
+      packageName = "is-valid-glob";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
-        sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
+        url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz";
+        sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe";
       };
     };
-    "npm-registry-client-7.1.2" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "7.1.2";
+    "lazystream-1.0.0" = {
+      name = "lazystream";
+      packageName = "lazystream";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz";
-        sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3";
+        url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz";
+        sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
       };
     };
-    "npmconf-2.0.9" = {
-      name = "npmconf";
-      packageName = "npmconf";
-      version = "2.0.9";
+    "lodash.isequal-4.5.0" = {
+      name = "lodash.isequal";
+      packageName = "lodash.isequal";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz";
-        sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2";
+        url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz";
+        sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
       };
     };
-    "tar-1.0.3" = {
-      name = "tar";
-      packageName = "tar";
-      version = "1.0.3";
+    "merge-stream-1.0.1" = {
+      name = "merge-stream";
+      packageName = "merge-stream";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz";
-        sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44";
+        url = "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz";
+        sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
       };
     };
-    "fs.extra-1.2.1" = {
-      name = "fs.extra";
-      packageName = "fs.extra";
-      version = "1.2.1";
+    "strip-bom-stream-1.0.0" = {
+      name = "strip-bom-stream";
+      packageName = "strip-bom-stream";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz";
-        sha1 = "060bf20264f35e39ad247e5e9d2121a2a75a1733";
+        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz";
+        sha1 = "e7144398577d51a6bed0fa1994fa05f43fd988ee";
       };
     };
-    "findit-2.0.0" = {
-      name = "findit";
-      packageName = "findit";
+    "through2-filter-2.0.0" = {
+      name = "through2-filter";
+      packageName = "through2-filter";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz";
-        sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e";
+        url = "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz";
+        sha1 = "60bc55a0dacb76085db1f9dae99ab43f83d622ec";
       };
     };
-    "nijs-0.0.23" = {
-      name = "nijs";
-      packageName = "nijs";
-      version = "0.0.23";
+    "vali-date-1.0.0" = {
+      name = "vali-date";
+      packageName = "vali-date";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz";
-        sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
+        url = "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz";
+        sha1 = "1b904a59609fb328ef078138420934f6b86709a6";
       };
     };
-    "retry-0.8.0" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.8.0";
+    "glob-parent-3.1.0" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz";
-        sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+        sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
-    "npmlog-3.1.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "3.1.2";
+    "ordered-read-streams-0.3.0" = {
+      name = "ordered-read-streams";
+      packageName = "ordered-read-streams";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz";
-        sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873";
+        url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz";
+        sha1 = "7137e69b3298bb342247a1bbee3881c80e2fd78b";
       };
     };
-    "gauge-2.6.0" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "2.6.0";
+    "to-absolute-glob-0.1.1" = {
+      name = "to-absolute-glob";
+      packageName = "to-absolute-glob";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
-        sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
+        url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz";
+        sha1 = "1cdfa472a9ef50c239ee66999b662ca0eb39937f";
       };
     };
-    "uid-number-0.0.5" = {
-      name = "uid-number";
-      packageName = "uid-number";
-      version = "0.0.5";
+    "unique-stream-2.2.1" = {
+      name = "unique-stream";
+      packageName = "unique-stream";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
-        sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
+        url = "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz";
+        sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369";
       };
     };
-    "fs-extra-0.6.4" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "0.6.4";
+    "is-glob-3.1.0" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
-        sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
+        sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
       };
     };
-    "walk-2.2.1" = {
-      name = "walk";
-      packageName = "walk";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/walk/-/walk-2.2.1.tgz";
-        sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016";
+    "path-dirname-1.0.2" = {
+      name = "path-dirname";
+      packageName = "path-dirname";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
+        sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
       };
     };
-    "jsonfile-1.0.1" = {
-      name = "jsonfile";
-      packageName = "jsonfile";
-      version = "1.0.1";
+    "is-extglob-2.1.1" = {
+      name = "is-extglob";
+      packageName = "is-extglob";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
-        sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
-    "forEachAsync-2.2.1" = {
-      name = "forEachAsync";
-      packageName = "forEachAsync";
-      version = "2.2.1";
+    "extend-shallow-2.0.1" = {
+      name = "extend-shallow";
+      packageName = "extend-shallow";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz";
-        sha1 = "e3723f00903910e1eb4b1db3ad51b5c64a319fec";
+        url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz";
+        sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
       };
     };
-    "sequence-2.2.1" = {
-      name = "sequence";
-      packageName = "sequence";
-      version = "2.2.1";
+    "express-2.5.11" = {
+      name = "express";
+      packageName = "express";
+      version = "2.5.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
-        sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+        url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz";
+        sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0";
       };
     };
-    "biased-opener-0.2.8" = {
-      name = "biased-opener";
-      packageName = "biased-opener";
-      version = "0.2.8";
+    "jade-0.27.0" = {
+      name = "jade";
+      packageName = "jade";
+      version = "0.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz";
-        sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
+        url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
+        sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31";
       };
     };
-    "serve-favicon-2.4.2" = {
-      name = "serve-favicon";
-      packageName = "serve-favicon";
-      version = "2.4.2";
+    "open-0.0.2" = {
+      name = "open";
+      packageName = "open";
+      version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.2.tgz";
-        sha1 = "aed1d8de67d5b83192cf31fdf53d2ea29464363e";
+        url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz";
+        sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc";
       };
     };
-    "strong-data-uri-1.0.4" = {
-      name = "strong-data-uri";
-      packageName = "strong-data-uri";
-      version = "1.0.4";
+    "winston-0.6.2" = {
+      name = "winston";
+      packageName = "winston";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz";
-        sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0";
+        url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
+        sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
       };
     };
-    "v8-debug-1.0.1" = {
-      name = "v8-debug";
-      packageName = "v8-debug";
-      version = "1.0.1";
+    "mkdirp-0.3.0" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz";
-        sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+        sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
       };
     };
-    "v8-profiler-5.7.0" = {
-      name = "v8-profiler";
-      packageName = "v8-profiler";
-      version = "5.7.0";
+    "node.extend-1.0.0" = {
+      name = "node.extend";
+      packageName = "node.extend";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz";
-        sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d";
+        url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
+        sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e";
       };
     };
-    "yargs-3.32.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.32.0";
+    "connect-1.9.2" = {
+      name = "connect";
+      packageName = "connect";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz";
-        sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995";
+        url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
+        sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807";
       };
     };
-    "browser-launcher2-0.4.6" = {
-      name = "browser-launcher2";
-      packageName = "browser-launcher2";
-      version = "0.4.6";
+    "mime-1.2.4" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz";
-        sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074";
+        url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
+        sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7";
       };
     };
-    "x-default-browser-0.3.1" = {
-      name = "x-default-browser";
-      packageName = "x-default-browser";
-      version = "0.3.1";
+    "qs-0.4.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz";
-        sha1 = "7f6194154fd1786cf261e68b5488c47127a04977";
+        url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
+        sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f";
       };
     };
-    "headless-0.1.7" = {
-      name = "headless";
-      packageName = "headless";
-      version = "0.1.7";
+    "formidable-1.0.17" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/headless/-/headless-0.1.7.tgz";
-        sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8";
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
+        sha1 = "ef5491490f9433b705faa77249c99029ae348559";
       };
     };
-    "win-detect-browsers-1.0.2" = {
-      name = "win-detect-browsers";
-      packageName = "win-detect-browsers";
-      version = "1.0.2";
+    "async-0.1.22" = {
+      name = "async";
+      packageName = "async";
+      version = "0.1.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz";
-        sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0";
+        url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
+        sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
       };
     };
-    "uid-0.0.2" = {
-      name = "uid";
-      packageName = "uid";
-      version = "0.0.2";
+    "pkginfo-0.2.3" = {
+      name = "pkginfo";
+      packageName = "pkginfo";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz";
-        sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
+        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
+        sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
       };
     };
-    "yargs-1.3.3" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "1.3.3";
+    "request-2.9.203" = {
+      name = "request";
+      packageName = "request";
+      version = "2.9.203";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz";
-        sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a";
+        url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz";
+        sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
       };
     };
-    "default-browser-id-1.0.4" = {
-      name = "default-browser-id";
-      packageName = "default-browser-id";
-      version = "1.0.4";
+    "browser-stdout-1.3.0" = {
+      name = "browser-stdout";
+      packageName = "browser-stdout";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.4.tgz";
-        sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a";
+        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
+        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
       };
     };
-    "untildify-2.1.0" = {
-      name = "untildify";
-      packageName = "untildify";
-      version = "2.1.0";
+    "debug-2.6.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz";
-        sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
+        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
       };
     };
-    "ms-1.0.0" = {
-      name = "ms";
-      packageName = "ms";
-      version = "1.0.0";
+    "diff-3.2.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz";
-        sha1 = "59adcd22edc543f7b5381862d31387b1f4bc9473";
+        url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz";
+        sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9";
       };
     };
-    "truncate-1.0.5" = {
-      name = "truncate";
-      packageName = "truncate";
-      version = "1.0.5";
+    "growl-1.9.2" = {
+      name = "growl";
+      packageName = "growl";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz";
-        sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28";
+        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
+        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
       };
     };
-    "cliui-3.2.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "3.2.0";
+    "lodash.create-3.1.1" = {
+      name = "lodash.create";
+      packageName = "lodash.create";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz";
-        sha1 = "120601537a916d29940f934da3b48d585a39213d";
+        url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz";
+        sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7";
       };
     };
-    "os-locale-1.4.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "1.4.0";
+    "supports-color-3.1.2" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
-        sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
+        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
       };
     };
-    "window-size-0.1.4" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.1.4";
+    "lodash._baseassign-3.2.0" = {
+      name = "lodash._baseassign";
+      packageName = "lodash._baseassign";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz";
-        sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876";
+        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
+        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
       };
     };
-    "y18n-3.2.1" = {
-      name = "y18n";
-      packageName = "y18n";
-      version = "3.2.1";
+    "lodash._basecreate-3.0.3" = {
+      name = "lodash._basecreate";
+      packageName = "lodash._basecreate";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
-        sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
+        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz";
+        sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821";
       };
     };
-    "wrap-ansi-2.1.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "2.1.0";
+    "optparse-1.0.5" = {
+      name = "optparse";
+      packageName = "optparse";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+        url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz";
+        sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16";
       };
     };
-    "lcid-1.0.0" = {
-      name = "lcid";
-      packageName = "lcid";
-      version = "1.0.0";
+    "slasp-0.0.4" = {
+      name = "slasp";
+      packageName = "slasp";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
-        sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
+        url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
+        sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
       };
     };
-    "invert-kv-1.0.0" = {
-      name = "invert-kv";
-      packageName = "invert-kv";
-      version = "1.0.0";
+    "npm-registry-client-7.1.2" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "7.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
-        sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz";
+        sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3";
       };
     };
-    "es6-promise-3.3.1" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "3.3.1";
+    "npmconf-2.0.9" = {
+      name = "npmconf";
+      packageName = "npmconf";
+      version = "2.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz";
-        sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613";
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz";
+        sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2";
       };
     };
-    "ignore-by-default-1.0.1" = {
-      name = "ignore-by-default";
-      packageName = "ignore-by-default";
-      version = "1.0.1";
+    "tar-1.0.3" = {
+      name = "tar";
+      packageName = "tar";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz";
-        sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
+        url = "https://registry.npmjs.org/tar/-/tar-1.0.3.tgz";
+        sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44";
       };
     };
-    "lodash.defaults-3.1.2" = {
-      name = "lodash.defaults";
-      packageName = "lodash.defaults";
-      version = "3.1.2";
+    "fs.extra-1.2.1" = {
+      name = "fs.extra";
+      packageName = "fs.extra";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz";
-        sha1 = "c7308b18dbf8bc9372d701a73493c61192bd2e2c";
+        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.2.1.tgz";
+        sha1 = "060bf20264f35e39ad247e5e9d2121a2a75a1733";
       };
     };
-    "ps-tree-1.1.0" = {
-      name = "ps-tree";
-      packageName = "ps-tree";
-      version = "1.1.0";
+    "findit-2.0.0" = {
+      name = "findit";
+      packageName = "findit";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz";
-        sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014";
+        url = "https://registry.npmjs.org/findit/-/findit-2.0.0.tgz";
+        sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e";
       };
     };
-    "touch-1.0.0" = {
-      name = "touch";
-      packageName = "touch";
-      version = "1.0.0";
+    "nijs-0.0.23" = {
+      name = "nijs";
+      packageName = "nijs";
+      version = "0.0.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz";
-        sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de";
+        url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz";
+        sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
       };
     };
-    "undefsafe-0.0.3" = {
-      name = "undefsafe";
-      packageName = "undefsafe";
-      version = "0.0.3";
+    "retry-0.8.0" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz";
-        sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f";
+        url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz";
+        sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f";
       };
     };
-    "lodash.assign-3.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "3.2.0";
+    "npmlog-3.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz";
-        sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz";
+        sha1 = "2d46fa874337af9498a2f12bb43d8d0be4a36873";
       };
     };
-    "lodash._createassigner-3.1.1" = {
-      name = "lodash._createassigner";
-      packageName = "lodash._createassigner";
-      version = "3.1.1";
+    "gauge-2.6.0" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz";
-        sha1 = "838a5bae2fdaca63ac22dee8e19fa4e6d6970b11";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz";
+        sha1 = "d35301ad18e96902b4751dcbbe40f4218b942a46";
       };
     };
-    "lodash._bindcallback-3.0.1" = {
-      name = "lodash._bindcallback";
-      packageName = "lodash._bindcallback";
-      version = "3.0.1";
+    "uid-number-0.0.5" = {
+      name = "uid-number";
+      packageName = "uid-number";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz";
-        sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e";
+        url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
+        sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
       };
     };
-    "event-stream-3.3.4" = {
-      name = "event-stream";
-      packageName = "event-stream";
-      version = "3.3.4";
+    "fs-extra-0.6.4" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "0.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz";
-        sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
+        sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
       };
     };
-    "nopt-1.0.10" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "1.0.10";
+    "walk-2.2.1" = {
+      name = "walk";
+      packageName = "walk";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
-        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+        url = "https://registry.npmjs.org/walk/-/walk-2.2.1.tgz";
+        sha1 = "5ada1f8e49e47d4b7445d8be7a2e1e631ab43016";
       };
     };
-    "bcryptjs-2.4.0" = {
-      name = "bcryptjs";
-      packageName = "bcryptjs";
-      version = "2.4.0";
+    "jsonfile-1.0.1" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz";
-        sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678";
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
+        sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
       };
     };
-    "body-parser-1.15.2" = {
-      name = "body-parser";
-      packageName = "body-parser";
-      version = "1.15.2";
+    "forEachAsync-2.2.1" = {
+      name = "forEachAsync";
+      packageName = "forEachAsync";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz";
-        sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67";
+        url = "https://registry.npmjs.org/forEachAsync/-/forEachAsync-2.2.1.tgz";
+        sha1 = "e3723f00903910e1eb4b1db3ad51b5c64a319fec";
       };
     };
-    "cheerio-0.22.0" = {
-      name = "cheerio";
-      packageName = "cheerio";
-      version = "0.22.0";
+    "sequence-2.2.1" = {
+      name = "sequence";
+      packageName = "sequence";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz";
-        sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e";
+        url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+        sha1 = "7f5617895d44351c0a047e764467690490a16b03";
       };
     };
-    "clone-2.1.0" = {
-      name = "clone";
-      packageName = "clone";
-      version = "2.1.0";
+    "biased-opener-0.2.8" = {
+      name = "biased-opener";
+      packageName = "biased-opener";
+      version = "0.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
-        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
+        url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz";
+        sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "cookie-parser-1.4.3" = {
-      name = "cookie-parser";
-      packageName = "cookie-parser";
-      version = "1.4.3";
+    "serve-favicon-2.4.3" = {
+      name = "serve-favicon";
+      packageName = "serve-favicon";
+      version = "2.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz";
-        sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.3.tgz";
+        sha1 = "5986b17b0502642b641c21f818b1acce32025d23";
       };
     };
-    "cors-2.8.1" = {
-      name = "cors";
-      packageName = "cors";
-      version = "2.8.1";
+    "strong-data-uri-1.0.4" = {
+      name = "strong-data-uri";
+      packageName = "strong-data-uri";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz";
-        sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383";
-      };
+        url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.4.tgz";
+        sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0";
+      };
     };
-    "cron-1.2.1" = {
-      name = "cron";
-      packageName = "cron";
-      version = "1.2.1";
+    "v8-debug-1.0.1" = {
+      name = "v8-debug";
+      packageName = "v8-debug";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz";
-        sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
+        url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz";
+        sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe";
       };
     };
-    "express-4.14.0" = {
-      name = "express";
-      packageName = "express";
-      version = "4.14.0";
+    "v8-profiler-5.7.0" = {
+      name = "v8-profiler";
+      packageName = "v8-profiler";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz";
-        sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66";
+        url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz";
+        sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d";
       };
     };
-    "follow-redirects-1.2.1" = {
-      name = "follow-redirects";
-      packageName = "follow-redirects";
-      version = "1.2.1";
+    "yargs-3.32.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.32.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz";
-        sha1 = "796c716970df4fb0096165393545040f61b00f59";
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz";
+        sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995";
       };
     };
-    "fs-extra-1.0.0" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "1.0.0";
+    "browser-launcher2-0.4.6" = {
+      name = "browser-launcher2";
+      packageName = "browser-launcher2";
+      version = "0.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
-        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
+        url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz";
+        sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074";
       };
     };
-    "fs.notify-0.0.4" = {
-      name = "fs.notify";
-      packageName = "fs.notify";
-      version = "0.0.4";
+    "x-default-browser-0.3.1" = {
+      name = "x-default-browser";
+      packageName = "x-default-browser";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz";
-        sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d";
+        url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz";
+        sha1 = "7f6194154fd1786cf261e68b5488c47127a04977";
       };
     };
-    "i18next-1.10.6" = {
-      name = "i18next";
-      packageName = "i18next";
-      version = "1.10.6";
+    "headless-0.1.7" = {
+      name = "headless";
+      packageName = "headless";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/i18next/-/i18next-1.10.6.tgz";
-        sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
+        url = "https://registry.npmjs.org/headless/-/headless-0.1.7.tgz";
+        sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8";
       };
     };
-    "js-yaml-3.7.0" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "3.7.0";
+    "win-detect-browsers-1.0.2" = {
+      name = "win-detect-browsers";
+      packageName = "win-detect-browsers";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+        url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz";
+        sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0";
       };
     };
-    "jsonata-1.0.10" = {
-      name = "jsonata";
-      packageName = "jsonata";
-      version = "1.0.10";
+    "uid-0.0.2" = {
+      name = "uid";
+      packageName = "uid";
+      version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz";
-        sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96";
+        url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz";
+        sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
       };
     };
-    "mqtt-2.2.1" = {
-      name = "mqtt";
-      packageName = "mqtt";
-      version = "2.2.1";
+    "yargs-1.3.3" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz";
-        sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852";
+        url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz";
+        sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a";
       };
     };
-    "mustache-2.3.0" = {
-      name = "mustache";
-      packageName = "mustache";
-      version = "2.3.0";
+    "default-browser-id-1.0.4" = {
+      name = "default-browser-id";
+      packageName = "default-browser-id";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz";
-        sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
+        url = "https://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.4.tgz";
+        sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a";
       };
     };
-    "oauth2orize-1.7.0" = {
-      name = "oauth2orize";
-      packageName = "oauth2orize";
-      version = "1.7.0";
+    "untildify-2.1.0" = {
+      name = "untildify";
+      packageName = "untildify";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz";
-        sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc";
+        url = "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz";
+        sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
-    "passport-http-bearer-1.0.1" = {
-      name = "passport-http-bearer";
-      packageName = "passport-http-bearer";
-      version = "1.0.1";
+    "truncate-1.0.5" = {
+      name = "truncate";
+      packageName = "truncate";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz";
-        sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8";
+        url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz";
+        sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28";
       };
     };
-    "passport-oauth2-client-password-0.1.2" = {
-      name = "passport-oauth2-client-password";
-      packageName = "passport-oauth2-client-password";
-      version = "0.1.2";
+    "window-size-0.1.4" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz";
-        sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz";
+        sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876";
       };
     };
-    "sentiment-2.1.0" = {
-      name = "sentiment";
-      packageName = "sentiment";
-      version = "2.1.0";
+    "es6-promise-3.3.1" = {
+      name = "es6-promise";
+      packageName = "es6-promise";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz";
-        sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
+        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz";
+        sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613";
       };
     };
-    "uglify-js-2.7.5" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.7.5";
+    "ignore-by-default-1.0.1" = {
+      name = "ignore-by-default";
+      packageName = "ignore-by-default";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
-        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
+        url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz";
+        sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
       };
     };
-    "when-3.7.7" = {
-      name = "when";
-      packageName = "when";
-      version = "3.7.7";
+    "lodash.defaults-3.1.2" = {
+      name = "lodash.defaults";
+      packageName = "lodash.defaults";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz";
-        sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
+        url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz";
+        sha1 = "c7308b18dbf8bc9372d701a73493c61192bd2e2c";
       };
     };
-    "ws-1.1.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "1.1.1";
+    "ps-tree-1.1.0" = {
+      name = "ps-tree";
+      packageName = "ps-tree";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz";
-        sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018";
+        url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz";
+        sha1 = "b421b24140d6203f1ed3c76996b4427b08e8c014";
       };
     };
-    "node-red-node-feedparser-0.1.7" = {
-      name = "node-red-node-feedparser";
-      packageName = "node-red-node-feedparser";
-      version = "0.1.7";
+    "touch-1.0.0" = {
+      name = "touch";
+      packageName = "touch";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz";
-        sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
+        url = "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz";
+        sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de";
       };
     };
-    "node-red-node-email-0.1.22" = {
-      name = "node-red-node-email";
-      packageName = "node-red-node-email";
-      version = "0.1.22";
+    "undefsafe-0.0.3" = {
+      name = "undefsafe";
+      packageName = "undefsafe";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.22.tgz";
-        sha1 = "99c610fdba3f498ddab71da9273d6003e4e0280e";
+        url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz";
+        sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f";
       };
     };
-    "node-red-node-twitter-0.1.10" = {
-      name = "node-red-node-twitter";
-      packageName = "node-red-node-twitter";
-      version = "0.1.10";
+    "lodash.assign-3.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.10.tgz";
-        sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221";
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz";
+        sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa";
       };
     };
-    "node-red-node-rbe-0.1.8" = {
-      name = "node-red-node-rbe";
-      packageName = "node-red-node-rbe";
-      version = "0.1.8";
+    "lodash._createassigner-3.1.1" = {
+      name = "lodash._createassigner";
+      packageName = "lodash._createassigner";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.8.tgz";
-        sha1 = "96108a5720842387ea5ddd046d7e483c7ab2a5dc";
+        url = "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz";
+        sha1 = "838a5bae2fdaca63ac22dee8e19fa4e6d6970b11";
       };
     };
-    "bcrypt-1.0.2" = {
-      name = "bcrypt";
-      packageName = "bcrypt";
-      version = "1.0.2";
+    "lodash._bindcallback-3.0.1" = {
+      name = "lodash._bindcallback";
+      packageName = "lodash._bindcallback";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz";
-        sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
+        url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz";
+        sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e";
       };
     };
-    "http-errors-1.5.1" = {
-      name = "http-errors";
-      packageName = "http-errors";
-      version = "1.5.1";
+    "event-stream-3.3.4" = {
+      name = "event-stream";
+      packageName = "event-stream";
+      version = "3.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
-        sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
+        url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz";
+        sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571";
       };
     };
-    "qs-6.2.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.2.0";
+    "nopt-1.0.10" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
-        sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
+        url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
       };
     };
-    "setprototypeof-1.0.2" = {
-      name = "setprototypeof";
-      packageName = "setprototypeof";
-      version = "1.0.2";
+    "bcryptjs-2.4.0" = {
+      name = "bcryptjs";
+      packageName = "bcryptjs";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
-        sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
+        url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz";
+        sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678";
       };
     };
-    "css-select-1.2.0" = {
-      name = "css-select";
-      packageName = "css-select";
-      version = "1.2.0";
+    "body-parser-1.15.2" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
-        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz";
+        sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67";
       };
     };
-    "htmlparser2-3.9.2" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.9.2";
+    "cheerio-0.22.0" = {
+      name = "cheerio";
+      packageName = "cheerio";
+      version = "0.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz";
-        sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338";
+        url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz";
+        sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e";
       };
     };
-    "lodash.assignin-4.2.0" = {
-      name = "lodash.assignin";
-      packageName = "lodash.assignin";
-      version = "4.2.0";
+    "clone-2.1.0" = {
+      name = "clone";
+      packageName = "clone";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz";
-        sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2";
+        url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz";
+        sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6";
       };
     };
-    "lodash.bind-4.2.1" = {
-      name = "lodash.bind";
-      packageName = "lodash.bind";
-      version = "4.2.1";
+    "cookie-parser-1.4.3" = {
+      name = "cookie-parser";
+      packageName = "cookie-parser";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz";
-        sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35";
+        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz";
+        sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5";
       };
     };
-    "lodash.defaults-4.2.0" = {
-      name = "lodash.defaults";
-      packageName = "lodash.defaults";
-      version = "4.2.0";
+    "cors-2.8.1" = {
+      name = "cors";
+      packageName = "cors";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz";
-        sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
+        url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz";
+        sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383";
       };
     };
-    "lodash.filter-4.6.0" = {
-      name = "lodash.filter";
-      packageName = "lodash.filter";
-      version = "4.6.0";
+    "cron-1.2.1" = {
+      name = "cron";
+      packageName = "cron";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz";
-        sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace";
+        url = "https://registry.npmjs.org/cron/-/cron-1.2.1.tgz";
+        sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2";
       };
     };
-    "lodash.flatten-4.4.0" = {
-      name = "lodash.flatten";
-      packageName = "lodash.flatten";
-      version = "4.4.0";
+    "express-4.14.0" = {
+      name = "express";
+      packageName = "express";
+      version = "4.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz";
-        sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f";
+        url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz";
+        sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66";
       };
     };
-    "lodash.foreach-4.5.0" = {
-      name = "lodash.foreach";
-      packageName = "lodash.foreach";
-      version = "4.5.0";
+    "follow-redirects-1.2.1" = {
+      name = "follow-redirects";
+      packageName = "follow-redirects";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz";
-        sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz";
+        sha1 = "796c716970df4fb0096165393545040f61b00f59";
       };
     };
-    "lodash.map-4.6.0" = {
-      name = "lodash.map";
-      packageName = "lodash.map";
-      version = "4.6.0";
+    "fs-extra-1.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz";
-        sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3";
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz";
+        sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950";
       };
     };
-    "lodash.merge-4.6.0" = {
-      name = "lodash.merge";
-      packageName = "lodash.merge";
-      version = "4.6.0";
+    "fs.notify-0.0.4" = {
+      name = "fs.notify";
+      packageName = "fs.notify";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz";
-        sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5";
+        url = "https://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz";
+        sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d";
       };
     };
-    "lodash.reduce-4.6.0" = {
-      name = "lodash.reduce";
-      packageName = "lodash.reduce";
-      version = "4.6.0";
+    "i18next-1.10.6" = {
+      name = "i18next";
+      packageName = "i18next";
+      version = "1.10.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz";
-        sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b";
+        url = "https://registry.npmjs.org/i18next/-/i18next-1.10.6.tgz";
+        sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
-    "lodash.reject-4.6.0" = {
-      name = "lodash.reject";
-      packageName = "lodash.reject";
-      version = "4.6.0";
+    "js-yaml-3.7.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz";
-        sha1 = "80d6492dc1470864bbf583533b651f42a9f52415";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
       };
     };
-    "lodash.some-4.6.0" = {
-      name = "lodash.some";
-      packageName = "lodash.some";
-      version = "4.6.0";
+    "jsonata-1.0.10" = {
+      name = "jsonata";
+      packageName = "jsonata";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz";
-        sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d";
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz";
+        sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96";
       };
     };
-    "css-what-2.1.0" = {
-      name = "css-what";
-      packageName = "css-what";
-      version = "2.1.0";
+    "mqtt-2.2.1" = {
+      name = "mqtt";
+      packageName = "mqtt";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz";
-        sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz";
+        sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852";
       };
     };
-    "boolbase-1.0.0" = {
-      name = "boolbase";
-      packageName = "boolbase";
-      version = "1.0.0";
+    "mustache-2.3.0" = {
+      name = "mustache";
+      packageName = "mustache";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
-        sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
+        url = "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz";
+        sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0";
       };
     };
-    "nth-check-1.0.1" = {
-      name = "nth-check";
-      packageName = "nth-check";
-      version = "1.0.1";
+    "oauth2orize-1.7.0" = {
+      name = "oauth2orize";
+      packageName = "oauth2orize";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz";
-        sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz";
+        sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc";
       };
     };
-    "moment-timezone-0.5.13" = {
-      name = "moment-timezone";
-      packageName = "moment-timezone";
-      version = "0.5.13";
+    "passport-http-bearer-1.0.1" = {
+      name = "passport-http-bearer";
+      packageName = "passport-http-bearer";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz";
-        sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90";
+        url = "https://registry.npmjs.org/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz";
+        sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8";
       };
     };
-    "content-disposition-0.5.1" = {
-      name = "content-disposition";
-      packageName = "content-disposition";
-      version = "0.5.1";
+    "passport-oauth2-client-password-0.1.2" = {
+      name = "passport-oauth2-client-password";
+      packageName = "passport-oauth2-client-password";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
-        sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
+        url = "https://registry.npmjs.org/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz";
+        sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
       };
     };
-    "finalhandler-0.5.0" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "0.5.0";
+    "sentiment-2.1.0" = {
+      name = "sentiment";
+      packageName = "sentiment";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
-        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+        url = "https://registry.npmjs.org/sentiment/-/sentiment-2.1.0.tgz";
+        sha1 = "33279100c35c38519ca5e435245186c512fe0fdc";
       };
     };
-    "send-0.14.1" = {
-      name = "send";
-      packageName = "send";
-      version = "0.14.1";
+    "uglify-js-2.7.5" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
-        sha1 = "a954984325392f51532a7760760e459598c89f7a";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz";
+        sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8";
       };
     };
-    "serve-static-1.11.2" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.11.2";
+    "when-3.7.7" = {
+      name = "when";
+      packageName = "when";
+      version = "3.7.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz";
-        sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7";
+        url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz";
+        sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
       };
     };
-    "send-0.14.2" = {
-      name = "send";
-      packageName = "send";
-      version = "0.14.2";
+    "ws-1.1.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz";
-        sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef";
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz";
+        sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018";
       };
     };
-    "retry-0.6.1" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.6.1";
+    "node-red-node-feedparser-0.1.7" = {
+      name = "node-red-node-feedparser";
+      packageName = "node-red-node-feedparser";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
-        sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
+        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz";
+        sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "cookies-0.7.0" = {
-      name = "cookies";
-      packageName = "cookies";
-      version = "0.7.0";
+    "node-red-node-email-0.1.22" = {
+      name = "node-red-node-email";
+      packageName = "node-red-node-email";
+      version = "0.1.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.0.tgz";
-        sha1 = "0bc961d910c35254980fc7c9eff5da12011bbf00";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.22.tgz";
+        sha1 = "99c610fdba3f498ddab71da9273d6003e4e0280e";
       };
     };
-    "i18next-client-1.10.3" = {
-      name = "i18next-client";
-      packageName = "i18next-client";
-      version = "1.10.3";
+    "node-red-node-twitter-0.1.10" = {
+      name = "node-red-node-twitter";
+      packageName = "node-red-node-twitter";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/i18next-client/-/i18next-client-1.10.3.tgz";
-        sha1 = "76d0353557ed90d1e7a87754d5004d3f7801fde9";
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.10.tgz";
+        sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221";
       };
     };
-    "json5-0.2.0" = {
-      name = "json5";
-      packageName = "json5";
-      version = "0.2.0";
+    "node-red-node-rbe-0.1.9" = {
+      name = "node-red-node-rbe";
+      packageName = "node-red-node-rbe";
+      version = "0.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.2.0.tgz";
-        sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343";
+        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.9.tgz";
+        sha1 = "d09795ebd9b6e4056b68b4843859fb65f5dff144";
       };
     };
-    "keygrip-1.0.1" = {
-      name = "keygrip";
-      packageName = "keygrip";
-      version = "1.0.1";
+    "bcrypt-1.0.2" = {
+      name = "bcrypt";
+      packageName = "bcrypt";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
-        sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
+        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-1.0.2.tgz";
+        sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736";
       };
     };
-    "commist-1.0.0" = {
-      name = "commist";
-      packageName = "commist";
-      version = "1.0.0";
+    "http-errors-1.5.1" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz";
-        sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz";
+        sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750";
       };
     };
-    "help-me-1.1.0" = {
-      name = "help-me";
-      packageName = "help-me";
-      version = "1.1.0";
+    "qs-6.2.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz";
-        sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
+        url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz";
+        sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b";
       };
     };
-    "mqtt-packet-5.3.0" = {
-      name = "mqtt-packet";
-      packageName = "mqtt-packet";
-      version = "5.3.0";
+    "setprototypeof-1.0.2" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz";
-        sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206";
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz";
+        sha1 = "81a552141ec104b88e89ce383103ad5c66564d08";
       };
     };
-    "reinterval-1.1.0" = {
-      name = "reinterval";
-      packageName = "reinterval";
-      version = "1.1.0";
+    "css-select-1.2.0" = {
+      name = "css-select";
+      packageName = "css-select";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz";
-        sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
+        url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz";
+        sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858";
       };
     };
-    "websocket-stream-3.3.3" = {
-      name = "websocket-stream";
-      packageName = "websocket-stream";
-      version = "3.3.3";
+    "htmlparser2-3.9.2" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "3.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz";
-        sha1 = "361da5404a337e60cfbc29b4a46368762679df0b";
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz";
+        sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338";
       };
     };
-    "leven-1.0.2" = {
-      name = "leven";
-      packageName = "leven";
-      version = "1.0.2";
+    "lodash.assignin-4.2.0" = {
+      name = "lodash.assignin";
+      packageName = "lodash.assignin";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz";
-        sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3";
+        url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz";
+        sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2";
       };
     };
-    "callback-stream-1.1.0" = {
-      name = "callback-stream";
-      packageName = "callback-stream";
-      version = "1.1.0";
+    "lodash.bind-4.2.1" = {
+      name = "lodash.bind";
+      packageName = "lodash.bind";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz";
-        sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
+        url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz";
+        sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35";
       };
     };
-    "glob-stream-6.1.0" = {
-      name = "glob-stream";
-      packageName = "glob-stream";
-      version = "6.1.0";
+    "lodash.defaults-4.2.0" = {
+      name = "lodash.defaults";
+      packageName = "lodash.defaults";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz";
-        sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
+        url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz";
+        sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
       };
     };
-    "is-negated-glob-1.0.0" = {
-      name = "is-negated-glob";
-      packageName = "is-negated-glob";
-      version = "1.0.0";
+    "lodash.filter-4.6.0" = {
+      name = "lodash.filter";
+      packageName = "lodash.filter";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
-        sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2";
+        url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz";
+        sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace";
       };
     };
-    "ordered-read-streams-1.0.0" = {
-      name = "ordered-read-streams";
-      packageName = "ordered-read-streams";
-      version = "1.0.0";
+    "lodash.flatten-4.4.0" = {
+      name = "lodash.flatten";
+      packageName = "lodash.flatten";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.0.tgz";
-        sha1 = "d674a86ffcedf83d0ae06afa2918855e96d4033a";
+        url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz";
+        sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f";
       };
     };
-    "to-absolute-glob-2.0.1" = {
-      name = "to-absolute-glob";
-      packageName = "to-absolute-glob";
-      version = "2.0.1";
+    "lodash.foreach-4.5.0" = {
+      name = "lodash.foreach";
+      packageName = "lodash.foreach";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz";
-        sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b";
+        url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz";
+        sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53";
       };
     };
-    "feedparser-1.1.3" = {
-      name = "feedparser";
-      packageName = "feedparser";
-      version = "1.1.3";
+    "lodash.map-4.6.0" = {
+      name = "lodash.map";
+      packageName = "lodash.map";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz";
-        sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b";
+        url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz";
+        sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3";
       };
     };
-    "sax-0.6.1" = {
-      name = "sax";
-      packageName = "sax";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz";
-        sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9";
-      };
-    };
-    "addressparser-0.1.3" = {
-      name = "addressparser";
-      packageName = "addressparser";
-      version = "0.1.3";
+    "lodash.merge-4.6.0" = {
+      name = "lodash.merge";
+      packageName = "lodash.merge";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
-        sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874";
+        url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz";
+        sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5";
       };
     };
-    "array-indexofobject-0.0.1" = {
-      name = "array-indexofobject";
-      packageName = "array-indexofobject";
-      version = "0.0.1";
+    "lodash.reduce-4.6.0" = {
+      name = "lodash.reduce";
+      packageName = "lodash.reduce";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz";
-        sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a";
+        url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz";
+        sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b";
       };
     };
-    "nodemailer-1.11.0" = {
-      name = "nodemailer";
-      packageName = "nodemailer";
-      version = "1.11.0";
+    "lodash.reject-4.6.0" = {
+      name = "lodash.reject";
+      packageName = "lodash.reject";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz";
-        sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79";
+        url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz";
+        sha1 = "80d6492dc1470864bbf583533b651f42a9f52415";
       };
     };
-    "poplib-0.1.7" = {
-      name = "poplib";
-      packageName = "poplib";
-      version = "0.1.7";
+    "css-what-2.1.0" = {
+      name = "css-what";
+      packageName = "css-what";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz";
-        sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc";
+        url = "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz";
+        sha1 = "9467d032c38cfaefb9f2d79501253062f87fa1bd";
       };
     };
-    "mailparser-0.6.2" = {
-      name = "mailparser";
-      packageName = "mailparser";
-      version = "0.6.2";
+    "boolbase-1.0.0" = {
+      name = "boolbase";
+      packageName = "boolbase";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz";
-        sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068";
+        url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
+        sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
       };
     };
-    "imap-0.8.19" = {
-      name = "imap";
-      packageName = "imap";
-      version = "0.8.19";
+    "nth-check-1.0.1" = {
+      name = "nth-check";
+      packageName = "nth-check";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz";
-        sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5";
+        url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz";
+        sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
       };
     };
-    "libmime-1.2.0" = {
-      name = "libmime";
-      packageName = "libmime";
-      version = "1.2.0";
+    "domhandler-2.4.1" = {
+      name = "domhandler";
+      packageName = "domhandler";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz";
-        sha1 = "8d84b4f3b225b3704410236ef494906436ba742b";
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz";
+        sha1 = "892e47000a99be55bbf3774ffea0561d8879c259";
       };
     };
-    "mailcomposer-2.1.0" = {
-      name = "mailcomposer";
-      packageName = "mailcomposer";
-      version = "2.1.0";
+    "moment-timezone-0.5.13" = {
+      name = "moment-timezone";
+      packageName = "moment-timezone";
+      version = "0.5.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.1.0.tgz";
-        sha1 = "a6531822899614fee899c92226d81e2b9cbb183d";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.13.tgz";
+        sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90";
       };
     };
-    "needle-0.11.0" = {
-      name = "needle";
-      packageName = "needle";
-      version = "0.11.0";
+    "content-disposition-0.5.1" = {
+      name = "content-disposition";
+      packageName = "content-disposition";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz";
-        sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29";
+        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
+        sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
       };
     };
-    "nodemailer-direct-transport-1.1.0" = {
-      name = "nodemailer-direct-transport";
-      packageName = "nodemailer-direct-transport";
-      version = "1.1.0";
+    "finalhandler-0.5.0" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz";
-        sha1 = "a2f78708ee6f16ea0573fc82949d138ff172f624";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
+        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
       };
     };
-    "nodemailer-smtp-transport-1.1.0" = {
-      name = "nodemailer-smtp-transport";
-      packageName = "nodemailer-smtp-transport";
-      version = "1.1.0";
+    "send-0.14.1" = {
+      name = "send";
+      packageName = "send";
+      version = "0.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz";
-        sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398";
+        url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz";
+        sha1 = "a954984325392f51532a7760760e459598c89f7a";
       };
     };
-    "libbase64-0.1.0" = {
-      name = "libbase64";
-      packageName = "libbase64";
-      version = "0.1.0";
+    "serve-static-1.11.2" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz";
-        sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz";
+        sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7";
       };
     };
-    "libqp-1.1.0" = {
-      name = "libqp";
-      packageName = "libqp";
-      version = "1.1.0";
+    "send-0.14.2" = {
+      name = "send";
+      packageName = "send";
+      version = "0.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz";
-        sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8";
+        url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz";
+        sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef";
       };
     };
-    "buildmail-2.0.0" = {
-      name = "buildmail";
-      packageName = "buildmail";
-      version = "2.0.0";
+    "retry-0.6.1" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz";
-        sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece";
+        url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
+        sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
       };
     };
-    "addressparser-0.3.2" = {
-      name = "addressparser";
-      packageName = "addressparser";
-      version = "0.3.2";
+    "cookies-0.7.0" = {
+      name = "cookies";
+      packageName = "cookies";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz";
-        sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.0.tgz";
+        sha1 = "0bc961d910c35254980fc7c9eff5da12011bbf00";
       };
     };
-    "needle-0.10.0" = {
-      name = "needle";
-      packageName = "needle";
-      version = "0.10.0";
+    "i18next-client-1.10.3" = {
+      name = "i18next-client";
+      packageName = "i18next-client";
+      version = "1.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz";
-        sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4";
+        url = "https://registry.npmjs.org/i18next-client/-/i18next-client-1.10.3.tgz";
+        sha1 = "76d0353557ed90d1e7a87754d5004d3f7801fde9";
       };
     };
-    "smtp-connection-1.3.8" = {
-      name = "smtp-connection";
-      packageName = "smtp-connection";
-      version = "1.3.8";
+    "json5-0.2.0" = {
+      name = "json5";
+      packageName = "json5";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz";
-        sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536";
+        url = "https://registry.npmjs.org/json5/-/json5-0.2.0.tgz";
+        sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343";
       };
     };
-    "nodemailer-wellknown-0.1.10" = {
-      name = "nodemailer-wellknown";
-      packageName = "nodemailer-wellknown";
-      version = "0.1.10";
+    "keygrip-1.0.1" = {
+      name = "keygrip";
+      packageName = "keygrip";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz";
-        sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5";
+        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
+        sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
       };
     };
-    "mimelib-0.3.0" = {
-      name = "mimelib";
-      packageName = "mimelib";
-      version = "0.3.0";
+    "commist-1.0.0" = {
+      name = "commist";
+      packageName = "commist";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz";
-        sha1 = "4b16d4b435403daf692bc227890c7165ff3de894";
+        url = "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz";
+        sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef";
       };
     };
-    "encoding-0.1.12" = {
-      name = "encoding";
-      packageName = "encoding";
-      version = "0.1.12";
+    "help-me-1.1.0" = {
+      name = "help-me";
+      packageName = "help-me";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz";
-        sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
+        url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz";
+        sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6";
       };
     };
-    "uue-3.1.0" = {
-      name = "uue";
-      packageName = "uue";
-      version = "3.1.0";
+    "mqtt-packet-5.3.0" = {
+      name = "mqtt-packet";
+      packageName = "mqtt-packet";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz";
-        sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz";
+        sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206";
       };
     };
-    "addressparser-1.0.1" = {
-      name = "addressparser";
-      packageName = "addressparser";
-      version = "1.0.1";
+    "reinterval-1.1.0" = {
+      name = "reinterval";
+      packageName = "reinterval";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz";
-        sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746";
+        url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz";
+        sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
-    "utf7-1.0.2" = {
-      name = "utf7";
-      packageName = "utf7";
-      version = "1.0.2";
+    "websocket-stream-3.3.3" = {
+      name = "websocket-stream";
+      packageName = "websocket-stream";
+      version = "3.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz";
-        sha1 = "955f490aae653ba220b9456a0a8776c199360991";
+        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz";
+        sha1 = "361da5404a337e60cfbc29b4a46368762679df0b";
       };
     };
-    "twitter-ng-0.6.2" = {
-      name = "twitter-ng";
-      packageName = "twitter-ng";
-      version = "0.6.2";
+    "leven-1.0.2" = {
+      name = "leven";
+      packageName = "leven";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz";
-        sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
+        url = "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz";
+        sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3";
       };
     };
-    "oauth-0.9.14" = {
-      name = "oauth";
-      packageName = "oauth";
-      version = "0.9.14";
+    "callback-stream-1.1.0" = {
+      name = "callback-stream";
+      packageName = "callback-stream";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
-        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
+        url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz";
+        sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
       };
     };
-    "nan-2.5.0" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.5.0";
+    "glob-stream-6.1.0" = {
+      name = "glob-stream";
+      packageName = "glob-stream";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
-        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
+        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz";
+        sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
       };
     };
-    "node-pre-gyp-0.6.32" = {
-      name = "node-pre-gyp";
-      packageName = "node-pre-gyp";
-      version = "0.6.32";
+    "is-negated-glob-1.0.0" = {
+      name = "is-negated-glob";
+      packageName = "is-negated-glob";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
-        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+        url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
+        sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2";
       };
     };
-    "rc-1.1.7" = {
-      name = "rc";
-      packageName = "rc";
-      version = "1.1.7";
+    "ordered-read-streams-1.0.1" = {
+      name = "ordered-read-streams";
+      packageName = "ordered-read-streams";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz";
-        sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea";
+        url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz";
+        sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
       };
     };
-    "tar-pack-3.3.0" = {
-      name = "tar-pack";
-      packageName = "tar-pack";
-      version = "3.3.0";
+    "to-absolute-glob-2.0.1" = {
+      name = "to-absolute-glob";
+      packageName = "to-absolute-glob";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz";
-        sha1 = "30931816418f55afc4d21775afdd6720cee45dae";
+        url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.1.tgz";
+        sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b";
       };
     };
-    "mongoose-3.6.7" = {
-      name = "mongoose";
-      packageName = "mongoose";
-      version = "3.6.7";
+    "feedparser-1.1.3" = {
+      name = "feedparser";
+      packageName = "feedparser";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
-        sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc";
+        url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz";
+        sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b";
       };
     };
-    "mongoose-lifecycle-1.0.0" = {
-      name = "mongoose-lifecycle";
-      packageName = "mongoose-lifecycle";
-      version = "1.0.0";
+    "sax-0.6.1" = {
+      name = "sax";
+      packageName = "sax";
+      version = "0.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
-        sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
+        url = "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz";
+        sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9";
       };
     };
-    "express-3.2.0" = {
-      name = "express";
-      packageName = "express";
-      version = "3.2.0";
+    "addressparser-0.1.3" = {
+      name = "addressparser";
+      packageName = "addressparser";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz";
-        sha1 = "7b66d6c66b038038eedf452804222b3077374ae0";
+        url = "https://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
+        sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874";
       };
     };
-    "express-partials-0.0.6" = {
-      name = "express-partials";
-      packageName = "express-partials";
-      version = "0.0.6";
+    "array-indexofobject-0.0.1" = {
+      name = "array-indexofobject";
+      packageName = "array-indexofobject";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
-        sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda";
+        url = "https://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz";
+        sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a";
       };
     };
-    "connect-flash-0.1.0" = {
-      name = "connect-flash";
-      packageName = "connect-flash";
-      version = "0.1.0";
+    "nodemailer-1.11.0" = {
+      name = "nodemailer";
+      packageName = "nodemailer";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
-        sha1 = "82b381d61a12b651437df1c259c1f1c841239b88";
+        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz";
+        sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79";
       };
     };
-    "ejs-0.8.3" = {
-      name = "ejs";
-      packageName = "ejs";
-      version = "0.8.3";
+    "poplib-0.1.7" = {
+      name = "poplib";
+      packageName = "poplib";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
-        sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f";
+        url = "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz";
+        sha1 = "2f4b58b5592972350cd97f482aba68f8e05574bc";
       };
     };
-    "config-0.4.15" = {
-      name = "config";
-      packageName = "config";
-      version = "0.4.15";
+    "mailparser-0.6.2" = {
+      name = "mailparser";
+      packageName = "mailparser";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/config/-/config-0.4.15.tgz";
-        sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18";
+        url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz";
+        sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068";
       };
     };
-    "socket.io-0.9.14" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "0.9.14";
+    "imap-0.8.19" = {
+      name = "imap";
+      packageName = "imap";
+      version = "0.8.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
-        sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667";
+        url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz";
+        sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5";
       };
     };
-    "semver-1.1.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "1.1.0";
+    "libmime-1.2.0" = {
+      name = "libmime";
+      packageName = "libmime";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
-        sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e";
+        url = "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz";
+        sha1 = "8d84b4f3b225b3704410236ef494906436ba742b";
       };
     };
-    "moment-2.1.0" = {
-      name = "moment";
-      packageName = "moment";
+    "mailcomposer-2.1.0" = {
+      name = "mailcomposer";
+      packageName = "mailcomposer";
       version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
-        sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.1.0.tgz";
+        sha1 = "a6531822899614fee899c92226d81e2b9cbb183d";
       };
     };
-    "nodemailer-0.3.35" = {
-      name = "nodemailer";
-      packageName = "nodemailer";
-      version = "0.3.35";
+    "needle-0.11.0" = {
+      name = "needle";
+      packageName = "needle";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
-        sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19";
+        url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz";
+        sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29";
       };
     };
-    "net-ping-1.1.7" = {
-      name = "net-ping";
-      packageName = "net-ping";
-      version = "1.1.7";
+    "nodemailer-direct-transport-1.1.0" = {
+      name = "nodemailer-direct-transport";
+      packageName = "nodemailer-direct-transport";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
-        sha1 = "49f5bca55a30a3726d69253557f231135a637075";
+        url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz";
+        sha1 = "a2f78708ee6f16ea0573fc82949d138ff172f624";
       };
     };
-    "js-yaml-2.1.0" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "2.1.0";
+    "nodemailer-smtp-transport-1.1.0" = {
+      name = "nodemailer-smtp-transport";
+      packageName = "nodemailer-smtp-transport";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
-        sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
+        url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz";
+        sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398";
       };
     };
-    "hooks-0.2.1" = {
-      name = "hooks";
-      packageName = "hooks";
-      version = "0.2.1";
+    "libbase64-0.1.0" = {
+      name = "libbase64";
+      packageName = "libbase64";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
-        sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
+        url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz";
+        sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6";
       };
     };
-    "mongodb-1.2.14" = {
-      name = "mongodb";
-      packageName = "mongodb";
-      version = "1.2.14";
+    "libqp-1.1.0" = {
+      name = "libqp";
+      packageName = "libqp";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
-        sha1 = "269665552066437308d0942036646e6795c3a9a3";
+        url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz";
+        sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8";
       };
     };
-    "ms-0.1.0" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.1.0";
+    "buildmail-2.0.0" = {
+      name = "buildmail";
+      packageName = "buildmail";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
-        sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2";
+        url = "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz";
+        sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece";
       };
     };
-    "sliced-0.0.3" = {
-      name = "sliced";
-      packageName = "sliced";
-      version = "0.0.3";
+    "addressparser-0.3.2" = {
+      name = "addressparser";
+      packageName = "addressparser";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
-        sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50";
+        url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz";
+        sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2";
       };
     };
-    "muri-0.3.1" = {
-      name = "muri";
-      packageName = "muri";
-      version = "0.3.1";
+    "needle-0.10.0" = {
+      name = "needle";
+      packageName = "needle";
+      version = "0.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
-        sha1 = "861889c5c857f1a43700bee85d50731f61727c9a";
+        url = "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz";
+        sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4";
       };
     };
-    "mpromise-0.2.1" = {
-      name = "mpromise";
-      packageName = "mpromise";
-      version = "0.2.1";
+    "smtp-connection-1.3.8" = {
+      name = "smtp-connection";
+      packageName = "smtp-connection";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
-        sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
+        url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz";
+        sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536";
       };
     };
-    "mpath-0.1.1" = {
-      name = "mpath";
-      packageName = "mpath";
-      version = "0.1.1";
+    "nodemailer-wellknown-0.1.10" = {
+      name = "nodemailer-wellknown";
+      packageName = "nodemailer-wellknown";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
-        sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
+        url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz";
+        sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5";
       };
     };
-    "bson-0.1.8" = {
-      name = "bson";
-      packageName = "bson";
-      version = "0.1.8";
+    "mimelib-0.3.0" = {
+      name = "mimelib";
+      packageName = "mimelib";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
-        sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81";
+        url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz";
+        sha1 = "4b16d4b435403daf692bc227890c7165ff3de894";
       };
     };
-    "sliced-0.0.4" = {
-      name = "sliced";
-      packageName = "sliced";
-      version = "0.0.4";
+    "encoding-0.1.12" = {
+      name = "encoding";
+      packageName = "encoding";
+      version = "0.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
-        sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
+        url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz";
+        sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
       };
     };
-    "connect-2.7.6" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.7.6";
+    "uue-3.1.0" = {
+      name = "uue";
+      packageName = "uue";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
-        sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738";
+        url = "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz";
+        sha1 = "5d67d37030e66efebbb4b8aac46daf9b55befbf6";
       };
     };
-    "range-parser-0.0.4" = {
-      name = "range-parser";
-      packageName = "range-parser";
-      version = "0.0.4";
+    "addressparser-1.0.1" = {
+      name = "addressparser";
+      packageName = "addressparser";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
-        sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
+        url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz";
+        sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746";
       };
     };
-    "cookie-0.0.5" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.0.5";
+    "utf7-1.0.2" = {
+      name = "utf7";
+      packageName = "utf7";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
-        sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
+        url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz";
+        sha1 = "955f490aae653ba220b9456a0a8776c199360991";
       };
     };
-    "buffer-crc32-0.2.13" = {
-      name = "buffer-crc32";
-      packageName = "buffer-crc32";
-      version = "0.2.13";
+    "twitter-ng-0.6.2" = {
+      name = "twitter-ng";
+      packageName = "twitter-ng";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz";
-        sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242";
+        url = "https://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz";
+        sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
       };
     };
-    "fresh-0.1.0" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.1.0";
+    "oauth-0.9.14" = {
+      name = "oauth";
+      packageName = "oauth";
+      version = "0.9.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
-        sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
+        sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
       };
     };
-    "methods-0.0.1" = {
-      name = "methods";
-      packageName = "methods";
-      version = "0.0.1";
+    "nan-2.5.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
-        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
+        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
-    "send-0.1.0" = {
-      name = "send";
-      packageName = "send";
-      version = "0.1.0";
+    "node-pre-gyp-0.6.32" = {
+      name = "node-pre-gyp";
+      packageName = "node-pre-gyp";
+      version = "0.6.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz";
-        sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
       };
     };
-    "cookie-signature-1.0.1" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "1.0.1";
+    "rc-1.1.7" = {
+      name = "rc";
+      packageName = "rc";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
-        sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
+        url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz";
+        sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea";
       };
     };
-    "qs-0.5.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.5.1";
+    "tar-pack-3.3.0" = {
+      name = "tar-pack";
+      packageName = "tar-pack";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
-        sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
+        url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz";
+        sha1 = "30931816418f55afc4d21775afdd6720cee45dae";
       };
     };
-    "formidable-1.0.11" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.0.11";
+    "mongoose-3.6.7" = {
+      name = "mongoose";
+      packageName = "mongoose";
+      version = "3.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
-        sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
+        url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
+        sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc";
       };
     };
-    "buffer-crc32-0.1.1" = {
-      name = "buffer-crc32";
-      packageName = "buffer-crc32";
-      version = "0.1.1";
+    "mongoose-lifecycle-1.0.0" = {
+      name = "mongoose-lifecycle";
+      packageName = "mongoose-lifecycle";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
-        sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
+        url = "https://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
+        sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
       };
     };
-    "bytes-0.2.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "0.2.0";
+    "express-3.2.0" = {
+      name = "express";
+      packageName = "express";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
-        sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0";
+        url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz";
+        sha1 = "7b66d6c66b038038eedf452804222b3077374ae0";
       };
     };
-    "mime-1.2.6" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.6";
+    "express-partials-0.0.6" = {
+      name = "express-partials";
+      packageName = "express-partials";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
-        sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
+        url = "https://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
+        sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda";
       };
     };
-    "js-yaml-0.3.7" = {
-      name = "js-yaml";
-      packageName = "js-yaml";
-      version = "0.3.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
-        sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62";
-      };
-    };
-    "vows-0.8.1" = {
-      name = "vows";
-      packageName = "vows";
-      version = "0.8.1";
+    "connect-flash-0.1.0" = {
+      name = "connect-flash";
+      packageName = "connect-flash";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vows/-/vows-0.8.1.tgz";
-        sha1 = "e09e988ce594ca05a08d72abcca34e88db559131";
+        url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
+        sha1 = "82b381d61a12b651437df1c259c1f1c841239b88";
       };
     };
-    "diff-1.0.8" = {
-      name = "diff";
-      packageName = "diff";
-      version = "1.0.8";
+    "ejs-0.8.3" = {
+      name = "ejs";
+      packageName = "ejs";
+      version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
-        sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
+        url = "https://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
+        sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f";
       };
     };
-    "glob-4.0.6" = {
-      name = "glob";
-      packageName = "glob";
-      version = "4.0.6";
+    "config-0.4.15" = {
+      name = "config";
+      packageName = "config";
+      version = "0.4.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz";
-        sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
+        url = "https://registry.npmjs.org/config/-/config-0.4.15.tgz";
+        sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18";
       };
     };
-    "minimatch-1.0.0" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "1.0.0";
+    "socket.io-0.9.14" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "0.9.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz";
-        sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
+        sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667";
       };
     };
-    "socket.io-client-0.9.11" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "0.9.11";
+    "semver-1.1.0" = {
+      name = "semver";
+      packageName = "semver";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
-        sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7";
+        url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
+        sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e";
       };
     };
-    "policyfile-0.0.4" = {
-      name = "policyfile";
-      packageName = "policyfile";
-      version = "0.0.4";
+    "moment-2.1.0" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
-        sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
+        url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
+        sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
       };
     };
-    "base64id-0.1.0" = {
-      name = "base64id";
-      packageName = "base64id";
-      version = "0.1.0";
+    "nodemailer-0.3.35" = {
+      name = "nodemailer";
+      packageName = "nodemailer";
+      version = "0.3.35";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
-        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
+        sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19";
       };
     };
-    "redis-0.7.3" = {
-      name = "redis";
-      packageName = "redis";
-      version = "0.7.3";
+    "net-ping-1.1.7" = {
+      name = "net-ping";
+      packageName = "net-ping";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
-        sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a";
+        url = "https://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
+        sha1 = "49f5bca55a30a3726d69253557f231135a637075";
       };
     };
-    "uglify-js-1.2.5" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "1.2.5";
+    "js-yaml-2.1.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
-        sha1 = "b542c2c76f78efb34b200b20177634330ff702b6";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
+        sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
       };
     };
-    "ws-0.4.32" = {
-      name = "ws";
-      packageName = "ws";
-      version = "0.4.32";
+    "hooks-0.2.1" = {
+      name = "hooks";
+      packageName = "hooks";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
-        sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
+        url = "https://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
+        sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
       };
     };
-    "xmlhttprequest-1.4.2" = {
-      name = "xmlhttprequest";
-      packageName = "xmlhttprequest";
-      version = "1.4.2";
+    "mongodb-1.2.14" = {
+      name = "mongodb";
+      packageName = "mongodb";
+      version = "1.2.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
-        sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500";
+        url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
+        sha1 = "269665552066437308d0942036646e6795c3a9a3";
       };
     };
-    "active-x-obfuscator-0.0.1" = {
-      name = "active-x-obfuscator";
-      packageName = "active-x-obfuscator";
-      version = "0.0.1";
+    "ms-0.1.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
-        sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a";
+        url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
+        sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2";
       };
     };
-    "commander-2.1.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.1.0";
+    "sliced-0.0.3" = {
+      name = "sliced";
+      packageName = "sliced";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
-        sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+        url = "https://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
+        sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50";
       };
     };
-    "nan-1.0.0" = {
-      name = "nan";
-      packageName = "nan";
-      version = "1.0.0";
+    "muri-0.3.1" = {
+      name = "muri";
+      packageName = "muri";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
-        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+        url = "https://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
+        sha1 = "861889c5c857f1a43700bee85d50731f61727c9a";
       };
     };
-    "tinycolor-0.0.1" = {
-      name = "tinycolor";
-      packageName = "tinycolor";
-      version = "0.0.1";
+    "mpromise-0.2.1" = {
+      name = "mpromise";
+      packageName = "mpromise";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
-        sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+        url = "https://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
+        sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
       };
     };
-    "zeparser-0.0.5" = {
-      name = "zeparser";
-      packageName = "zeparser";
-      version = "0.0.5";
+    "mpath-0.1.1" = {
+      name = "mpath";
+      packageName = "mpath";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
-        sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
+        url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
+        sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
       };
     };
-    "mailcomposer-4.0.2" = {
-      name = "mailcomposer";
-      packageName = "mailcomposer";
-      version = "4.0.2";
+    "bson-0.1.8" = {
+      name = "bson";
+      packageName = "bson";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz";
-        sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101";
+        url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
+        sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81";
       };
     };
-    "simplesmtp-0.3.35" = {
-      name = "simplesmtp";
-      packageName = "simplesmtp";
-      version = "0.3.35";
+    "sliced-0.0.4" = {
+      name = "sliced";
+      packageName = "sliced";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz";
-        sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03";
+        url = "https://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
+        sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
       };
     };
-    "buildmail-4.0.1" = {
-      name = "buildmail";
-      packageName = "buildmail";
-      version = "4.0.1";
+    "connect-2.7.6" = {
+      name = "connect";
+      packageName = "connect";
+      version = "2.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz";
-        sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72";
+        url = "https://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
+        sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738";
       };
     };
-    "libmime-3.0.0" = {
-      name = "libmime";
-      packageName = "libmime";
-      version = "3.0.0";
+    "range-parser-0.0.4" = {
+      name = "range-parser";
+      packageName = "range-parser";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz";
-        sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
+        url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
+        sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
       };
     };
-    "nodemailer-fetch-1.6.0" = {
-      name = "nodemailer-fetch";
-      packageName = "nodemailer-fetch";
-      version = "1.6.0";
+    "cookie-0.0.5" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz";
-        sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4";
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
+        sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
       };
     };
-    "nodemailer-shared-1.1.0" = {
-      name = "nodemailer-shared";
-      packageName = "nodemailer-shared";
-      version = "1.1.0";
+    "buffer-crc32-0.2.13" = {
+      name = "buffer-crc32";
+      packageName = "buffer-crc32";
+      version = "0.2.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz";
-        sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0";
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz";
+        sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242";
       };
     };
-    "rai-0.1.12" = {
-      name = "rai";
-      packageName = "rai";
-      version = "0.1.12";
+    "fresh-0.1.0" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rai/-/rai-0.1.12.tgz";
-        sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6";
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
+        sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
       };
     };
-    "xoauth2-0.1.8" = {
-      name = "xoauth2";
-      packageName = "xoauth2";
-      version = "0.1.8";
+    "methods-0.0.1" = {
+      name = "methods";
+      packageName = "methods";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
-        sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
+        url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+        sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
       };
     };
-    "raw-socket-1.5.1" = {
-      name = "raw-socket";
-      packageName = "raw-socket";
-      version = "1.5.1";
+    "send-0.1.0" = {
+      name = "send";
+      packageName = "send";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz";
-        sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
+        url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz";
+        sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
       };
     };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
+    "cookie-signature-1.0.1" = {
+      name = "cookie-signature";
+      packageName = "cookie-signature";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
+        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
+        sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
       };
     };
-    "argparse-0.1.16" = {
-      name = "argparse";
-      packageName = "argparse";
-      version = "0.1.16";
+    "qs-0.5.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
-        sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
+        url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
+        sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
       };
     };
-    "esprima-1.0.4" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "1.0.4";
+    "formidable-1.0.11" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
-        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
+        sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
       };
     };
-    "underscore-1.7.0" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.7.0";
+    "buffer-crc32-0.1.1" = {
+      name = "buffer-crc32";
+      packageName = "buffer-crc32";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
-        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
+        sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
       };
     };
-    "underscore.string-2.4.0" = {
-      name = "underscore.string";
-      packageName = "underscore.string";
-      version = "2.4.0";
+    "bytes-0.2.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
-        sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
+        url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
+        sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0";
       };
     };
-    "call-limit-1.1.0" = {
-      name = "call-limit";
-      packageName = "call-limit";
-      version = "1.1.0";
+    "mime-1.2.6" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz";
-        sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea";
+        url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
+        sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
       };
     };
-    "fstream-npm-1.2.0" = {
-      name = "fstream-npm";
-      packageName = "fstream-npm";
-      version = "1.2.0";
+    "js-yaml-0.3.7" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "0.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz";
-        sha1 = "d2c3c89101346982d64e57091c38487bda916fce";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
+        sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62";
       };
     };
-    "lazy-property-1.0.0" = {
-      name = "lazy-property";
-      packageName = "lazy-property";
-      version = "1.0.0";
+    "vows-0.8.1" = {
+      name = "vows";
+      packageName = "vows";
+      version = "0.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz";
-        sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
+        url = "https://registry.npmjs.org/vows/-/vows-0.8.1.tgz";
+        sha1 = "e09e988ce594ca05a08d72abcca34e88db559131";
       };
     };
-    "lodash._baseuniq-4.6.0" = {
-      name = "lodash._baseuniq";
-      packageName = "lodash._baseuniq";
-      version = "4.6.0";
+    "diff-1.0.8" = {
+      name = "diff";
+      packageName = "diff";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz";
-        sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8";
+        url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
+        sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
       };
     };
-    "lodash.clonedeep-4.5.0" = {
-      name = "lodash.clonedeep";
-      packageName = "lodash.clonedeep";
-      version = "4.5.0";
+    "glob-4.0.6" = {
+      name = "glob";
+      packageName = "glob";
+      version = "4.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
-        sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
+        url = "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz";
+        sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
       };
     };
-    "lodash.union-4.6.0" = {
-      name = "lodash.union";
-      packageName = "lodash.union";
-      version = "4.6.0";
+    "minimatch-1.0.0" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz";
-        sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88";
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz";
+        sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d";
       };
     };
-    "lodash.uniq-4.5.0" = {
-      name = "lodash.uniq";
-      packageName = "lodash.uniq";
-      version = "4.5.0";
+    "socket.io-client-0.9.11" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "0.9.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
-        sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
+        sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7";
       };
     };
-    "lodash.without-4.4.0" = {
-      name = "lodash.without";
-      packageName = "lodash.without";
-      version = "4.4.0";
+    "policyfile-0.0.4" = {
+      name = "policyfile";
+      packageName = "policyfile";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz";
-        sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
+        url = "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
+        sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
       };
     };
-    "mississippi-1.3.0" = {
-      name = "mississippi";
-      packageName = "mississippi";
-      version = "1.3.0";
+    "base64id-0.1.0" = {
+      name = "base64id";
+      packageName = "base64id";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz";
-        sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
+        url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+        sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
       };
     };
-    "move-concurrently-1.0.1" = {
-      name = "move-concurrently";
-      packageName = "move-concurrently";
-      version = "1.0.1";
+    "redis-0.7.3" = {
+      name = "redis";
+      packageName = "redis";
+      version = "0.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz";
-        sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
+        url = "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
+        sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a";
       };
     };
-    "npm-install-checks-3.0.0" = {
-      name = "npm-install-checks";
-      packageName = "npm-install-checks";
-      version = "3.0.0";
+    "uglify-js-1.2.5" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz";
-        sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
+        sha1 = "b542c2c76f78efb34b200b20177634330ff702b6";
       };
     };
-    "npm-registry-client-8.1.1" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.1.1";
+    "ws-0.4.32" = {
+      name = "ws";
+      packageName = "ws";
+      version = "0.4.32";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz";
-        sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf";
+        url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
+        sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
       };
     };
-    "opener-1.4.3" = {
-      name = "opener";
-      packageName = "opener";
-      version = "1.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz";
-        sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
-      };
-    };
-    "read-cmd-shim-1.0.1" = {
-      name = "read-cmd-shim";
-      packageName = "read-cmd-shim";
-      version = "1.0.1";
+    "xmlhttprequest-1.4.2" = {
+      name = "xmlhttprequest";
+      packageName = "xmlhttprequest";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz";
-        sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b";
+        url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
+        sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500";
       };
     };
-    "read-package-tree-5.1.5" = {
-      name = "read-package-tree";
-      packageName = "read-package-tree";
-      version = "5.1.5";
+    "active-x-obfuscator-0.0.1" = {
+      name = "active-x-obfuscator";
+      packageName = "active-x-obfuscator";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz";
-        sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
+        url = "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
+        sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a";
       };
     };
-    "sorted-union-stream-2.1.3" = {
-      name = "sorted-union-stream";
-      packageName = "sorted-union-stream";
-      version = "2.1.3";
+    "commander-2.1.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz";
-        sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
+        url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+        sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
       };
     };
-    "unique-filename-1.1.0" = {
-      name = "unique-filename";
-      packageName = "unique-filename";
-      version = "1.1.0";
+    "nan-1.0.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz";
-        sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
+        url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+        sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
       };
     };
-    "update-notifier-2.1.0" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "2.1.0";
+    "tinycolor-0.0.1" = {
+      name = "tinycolor";
+      packageName = "tinycolor";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz";
-        sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
+        url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+        sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
       };
     };
-    "lodash._baseindexof-3.1.0" = {
-      name = "lodash._baseindexof";
-      packageName = "lodash._baseindexof";
-      version = "3.1.0";
+    "zeparser-0.0.5" = {
+      name = "zeparser";
+      packageName = "zeparser";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz";
-        sha1 = "fe52b53a1c6761e42618d654e4a25789ed61822c";
+        url = "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
+        sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
       };
     };
-    "lodash._cacheindexof-3.0.2" = {
-      name = "lodash._cacheindexof";
-      packageName = "lodash._cacheindexof";
-      version = "3.0.2";
+    "mailcomposer-4.0.2" = {
+      name = "mailcomposer";
+      packageName = "mailcomposer";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz";
-        sha1 = "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92";
+        url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.2.tgz";
+        sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101";
       };
     };
-    "lodash._createcache-3.1.2" = {
-      name = "lodash._createcache";
-      packageName = "lodash._createcache";
-      version = "3.1.2";
+    "simplesmtp-0.3.35" = {
+      name = "simplesmtp";
+      packageName = "simplesmtp";
+      version = "0.3.35";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz";
-        sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093";
+        url = "https://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz";
+        sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03";
       };
     };
-    "lodash._createset-4.0.3" = {
-      name = "lodash._createset";
-      packageName = "lodash._createset";
-      version = "4.0.3";
+    "buildmail-4.0.1" = {
+      name = "buildmail";
+      packageName = "buildmail";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz";
-        sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
+        url = "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz";
+        sha1 = "877f7738b78729871c9a105e3b837d2be11a7a72";
       };
     };
-    "flush-write-stream-1.0.2" = {
-      name = "flush-write-stream";
-      packageName = "flush-write-stream";
-      version = "1.0.2";
+    "libmime-3.0.0" = {
+      name = "libmime";
+      packageName = "libmime";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz";
-        sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417";
+        url = "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz";
+        sha1 = "51a1a9e7448ecbd32cda54421675bb21bc093da6";
       };
     };
-    "from2-2.3.0" = {
-      name = "from2";
-      packageName = "from2";
-      version = "2.3.0";
+    "nodemailer-fetch-1.6.0" = {
+      name = "nodemailer-fetch";
+      packageName = "nodemailer-fetch";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
-        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+        url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz";
+        sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4";
       };
     };
-    "parallel-transform-1.1.0" = {
-      name = "parallel-transform";
-      packageName = "parallel-transform";
+    "nodemailer-shared-1.1.0" = {
+      name = "nodemailer-shared";
+      packageName = "nodemailer-shared";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
-        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
+        url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz";
+        sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0";
       };
     };
-    "stream-each-1.2.0" = {
-      name = "stream-each";
-      packageName = "stream-each";
-      version = "1.2.0";
+    "rai-0.1.12" = {
+      name = "rai";
+      packageName = "rai";
+      version = "0.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz";
-        sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
+        url = "https://registry.npmjs.org/rai/-/rai-0.1.12.tgz";
+        sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6";
       };
     };
-    "cyclist-0.2.2" = {
-      name = "cyclist";
-      packageName = "cyclist";
-      version = "0.2.2";
+    "xoauth2-0.1.8" = {
+      name = "xoauth2";
+      packageName = "xoauth2";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
-        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
+        url = "https://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
+        sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
       };
     };
-    "copy-concurrently-1.0.3" = {
-      name = "copy-concurrently";
-      packageName = "copy-concurrently";
-      version = "1.0.3";
+    "raw-socket-1.5.1" = {
+      name = "raw-socket";
+      packageName = "raw-socket";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz";
-        sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250";
+        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.1.tgz";
+        sha1 = "a85466c7984c0f0c3842ee562dc61b9873977528";
       };
     };
-    "run-queue-1.0.3" = {
-      name = "run-queue";
-      packageName = "run-queue";
-      version = "1.0.3";
+    "nan-2.3.5" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz";
-        sha1 = "e848396f057d223f24386924618e25694161ec47";
+        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
+        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
       };
     };
-    "stream-iterate-1.2.0" = {
-      name = "stream-iterate";
-      packageName = "stream-iterate";
-      version = "1.2.0";
+    "argparse-0.1.16" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "0.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
-        sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
+        url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
+        sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
       };
     };
-    "unique-slug-2.0.0" = {
-      name = "unique-slug";
-      packageName = "unique-slug";
-      version = "2.0.0";
+    "esprima-1.0.4" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz";
-        sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
+        url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+        sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
       };
     };
-    "boxen-1.0.0" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "1.0.0";
+    "underscore-1.7.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.0.0.tgz";
-        sha1 = "b2694baf1f605f708ff0177c12193b22f29aaaab";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
       };
     };
-    "configstore-3.0.0" = {
-      name = "configstore";
-      packageName = "configstore";
-      version = "3.0.0";
+    "underscore.string-2.4.0" = {
+      name = "underscore.string";
+      packageName = "underscore.string";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-3.0.0.tgz";
-        sha1 = "e1b8669c1803ccc50b545e92f8e6e79aa80e0196";
+        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
+        sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "latest-version-3.1.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "3.1.0";
+    "call-limit-1.1.0" = {
+      name = "call-limit";
+      packageName = "call-limit";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz";
-        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
+        url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz";
+        sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea";
       };
     };
-    "lazy-req-2.0.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "2.0.0";
+    "fstream-npm-1.2.1" = {
+      name = "fstream-npm";
+      packageName = "fstream-npm";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
-        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
+        url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.1.tgz";
+        sha1 = "08c4a452f789dcbac4c89a4563c902b2c862fd5b";
       };
     };
-    "xdg-basedir-3.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "3.0.0";
+    "lazy-property-1.0.0" = {
+      name = "lazy-property";
+      packageName = "lazy-property";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
-        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
+        url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz";
+        sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
       };
     };
-    "ansi-align-1.1.0" = {
-      name = "ansi-align";
-      packageName = "ansi-align";
-      version = "1.1.0";
+    "lodash._baseuniq-4.6.0" = {
+      name = "lodash._baseuniq";
+      packageName = "lodash._baseuniq";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
-        sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba";
+        url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz";
+        sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8";
       };
     };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
+    "lodash.clonedeep-4.5.0" = {
+      name = "lodash.clonedeep";
+      packageName = "lodash.clonedeep";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
+        sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
       };
     };
-    "cli-boxes-1.0.0" = {
-      name = "cli-boxes";
-      packageName = "cli-boxes";
-      version = "1.0.0";
+    "lodash.union-4.6.0" = {
+      name = "lodash.union";
+      packageName = "lodash.union";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz";
-        sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143";
+        url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz";
+        sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88";
       };
     };
-    "term-size-0.1.1" = {
-      name = "term-size";
-      packageName = "term-size";
-      version = "0.1.1";
+    "lodash.uniq-4.5.0" = {
+      name = "lodash.uniq";
+      packageName = "lodash.uniq";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz";
-        sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca";
+        url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz";
+        sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
       };
     };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
+    "lodash.without-4.4.0" = {
+      name = "lodash.without";
+      packageName = "lodash.without";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
+        url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz";
+        sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
       };
     };
-    "execa-0.4.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.4.0";
+    "mississippi-1.3.0" = {
+      name = "mississippi";
+      packageName = "mississippi";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz";
-        sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3";
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz";
+        sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
       };
     };
-    "cross-spawn-async-2.2.5" = {
-      name = "cross-spawn-async";
-      packageName = "cross-spawn-async";
-      version = "2.2.5";
+    "move-concurrently-1.0.1" = {
+      name = "move-concurrently";
+      packageName = "move-concurrently";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz";
-        sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc";
+        url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz";
+        sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
       };
     };
-    "npm-run-path-1.0.0" = {
-      name = "npm-run-path";
-      packageName = "npm-run-path";
-      version = "1.0.0";
+    "npm-install-checks-3.0.0" = {
+      name = "npm-install-checks";
+      packageName = "npm-install-checks";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz";
-        sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f";
+        url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz";
+        sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "path-key-1.0.0" = {
-      name = "path-key";
-      packageName = "path-key";
-      version = "1.0.0";
+    "npm-registry-client-8.1.1" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "8.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz";
-        sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz";
+        sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf";
       };
     };
-    "dot-prop-4.1.1" = {
-      name = "dot-prop";
-      packageName = "dot-prop";
-      version = "4.1.1";
+    "npmlog-4.0.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz";
-        sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1";
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
+        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
       };
     };
-    "unique-string-1.0.0" = {
-      name = "unique-string";
-      packageName = "unique-string";
-      version = "1.0.0";
+    "opener-1.4.3" = {
+      name = "opener";
+      packageName = "opener";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz";
-        sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
+        url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz";
+        sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
-    "crypto-random-string-1.0.0" = {
-      name = "crypto-random-string";
-      packageName = "crypto-random-string";
-      version = "1.0.0";
+    "read-cmd-shim-1.0.1" = {
+      name = "read-cmd-shim";
+      packageName = "read-cmd-shim";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz";
-        sha1 = "a230f64f568310e1498009940790ec99545bca7e";
+        url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz";
+        sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b";
       };
     };
-    "package-json-4.0.1" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "4.0.1";
+    "read-package-tree-5.1.5" = {
+      name = "read-package-tree";
+      packageName = "read-package-tree";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz";
-        sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
+        url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz";
+        sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
       };
     };
-    "registry-auth-token-3.3.1" = {
-      name = "registry-auth-token";
-      packageName = "registry-auth-token";
-      version = "3.3.1";
+    "sorted-union-stream-2.1.3" = {
+      name = "sorted-union-stream";
+      packageName = "sorted-union-stream";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz";
-        sha1 = "fb0d3289ee0d9ada2cbb52af5dfe66cb070d3006";
+        url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz";
+        sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
       };
     };
-    "argparse-0.1.15" = {
-      name = "argparse";
-      packageName = "argparse";
-      version = "0.1.15";
+    "unique-filename-1.1.0" = {
+      name = "unique-filename";
+      packageName = "unique-filename";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
-        sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
+        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz";
+        sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
       };
     };
-    "npm-registry-client-0.2.27" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "0.2.27";
+    "update-notifier-2.1.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
-        sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz";
+        sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
       };
     };
-    "npmconf-0.1.1" = {
-      name = "npmconf";
-      packageName = "npmconf";
-      version = "0.1.1";
+    "lodash._baseindexof-3.1.0" = {
+      name = "lodash._baseindexof";
+      packageName = "lodash._baseindexof";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
-        sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1";
+        url = "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz";
+        sha1 = "fe52b53a1c6761e42618d654e4a25789ed61822c";
       };
     };
-    "tar-0.1.17" = {
-      name = "tar";
-      packageName = "tar";
-      version = "0.1.17";
+    "lodash._cacheindexof-3.0.2" = {
+      name = "lodash._cacheindexof";
+      packageName = "lodash._cacheindexof";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
-        sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
+        url = "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz";
+        sha1 = "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92";
       };
     };
-    "temp-0.6.0" = {
-      name = "temp";
-      packageName = "temp";
-      version = "0.6.0";
+    "lodash._createcache-3.1.2" = {
+      name = "lodash._createcache";
+      packageName = "lodash._createcache";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
-        sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07";
+        url = "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz";
+        sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093";
       };
     };
-    "fs.extra-1.3.2" = {
-      name = "fs.extra";
-      packageName = "fs.extra";
-      version = "1.3.2";
+    "lodash._createset-4.0.3" = {
+      name = "lodash._createset";
+      packageName = "lodash._createset";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
-        sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
+        url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz";
+        sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
       };
     };
-    "findit-1.2.0" = {
-      name = "findit";
-      packageName = "findit";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
-        sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8";
+    "flush-write-stream-1.0.2" = {
+      name = "flush-write-stream";
+      packageName = "flush-write-stream";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz";
+        sha1 = "c81b90d8746766f1a609a46809946c45dd8ae417";
       };
     };
-    "underscore.string-2.3.3" = {
-      name = "underscore.string";
-      packageName = "underscore.string";
-      version = "2.3.3";
+    "from2-2.3.0" = {
+      name = "from2";
+      packageName = "from2";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
-        sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
+        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
+        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
-    "graceful-fs-2.0.3" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "2.0.3";
+    "parallel-transform-1.1.0" = {
+      name = "parallel-transform";
+      packageName = "parallel-transform";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
-        sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
+        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
+        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
       };
     };
-    "semver-2.0.11" = {
-      name = "semver";
-      packageName = "semver";
-      version = "2.0.11";
+    "stream-each-1.2.0" = {
+      name = "stream-each";
+      packageName = "stream-each";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
-        sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+        url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.0.tgz";
+        sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
       };
     };
-    "chownr-0.0.2" = {
-      name = "chownr";
-      packageName = "chownr";
-      version = "0.0.2";
+    "cyclist-0.2.2" = {
+      name = "cyclist";
+      packageName = "cyclist";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz";
-        sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485";
+        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
+        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
       };
     };
-    "retry-0.6.0" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.6.0";
+    "copy-concurrently-1.0.3" = {
+      name = "copy-concurrently";
+      packageName = "copy-concurrently";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
-        sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
+        url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz";
+        sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250";
       };
     };
-    "couch-login-0.1.20" = {
-      name = "couch-login";
-      packageName = "couch-login";
-      version = "0.1.20";
+    "run-queue-1.0.3" = {
+      name = "run-queue";
+      packageName = "run-queue";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
-        sha1 = "007c70ef80089dbae6f59eeeec37480799b39595";
+        url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz";
+        sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "once-1.1.1" = {
-      name = "once";
-      packageName = "once";
-      version = "1.1.1";
+    "stream-iterate-1.2.0" = {
+      name = "stream-iterate";
+      packageName = "stream-iterate";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz";
-        sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
+        url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
+        sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
       };
     };
-    "osenv-0.0.3" = {
-      name = "osenv";
-      packageName = "osenv";
-      version = "0.0.3";
+    "unique-slug-2.0.0" = {
+      name = "unique-slug";
+      packageName = "unique-slug";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
-        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz";
+        sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
       };
     };
-    "nopt-2.2.1" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "2.2.1";
+    "boxen-1.1.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
-        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz";
+        sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102";
       };
     };
-    "fstream-0.1.31" = {
-      name = "fstream";
-      packageName = "fstream";
-      version = "0.1.31";
+    "configstore-3.1.0" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
-        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz";
+        sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1";
       };
     };
-    "rimraf-2.1.4" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "2.1.4";
+    "latest-version-3.1.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
-        sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz";
+        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
       };
     };
-    "walk-2.3.9" = {
-      name = "walk";
-      packageName = "walk";
-      version = "2.3.9";
+    "lazy-req-2.0.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
-        sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
+        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
       };
     };
-    "foreachasync-3.0.0" = {
-      name = "foreachasync";
-      packageName = "foreachasync";
+    "xdg-basedir-3.0.0" = {
+      name = "xdg-basedir";
+      packageName = "xdg-basedir";
       version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
-        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
+        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
+        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
       };
     };
-    "cint-8.2.1" = {
-      name = "cint";
-      packageName = "cint";
-      version = "8.2.1";
+    "ansi-align-2.0.0" = {
+      name = "ansi-align";
+      packageName = "ansi-align";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cint/-/cint-8.2.1.tgz";
-        sha1 = "70386b1b48e2773d0d63166a55aff94ef4456a12";
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";
+        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
       };
     };
-    "cli-table-0.3.1" = {
-      name = "cli-table";
-      packageName = "cli-table";
-      version = "0.3.1";
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
-        sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
       };
     };
-    "fast-diff-1.1.1" = {
-      name = "fast-diff";
-      packageName = "fast-diff";
-      version = "1.1.1";
+    "term-size-0.1.1" = {
+      name = "term-size";
+      packageName = "term-size";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.1.tgz";
-        sha1 = "0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b";
+        url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz";
+        sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca";
       };
     };
-    "node-alias-1.0.4" = {
-      name = "node-alias";
-      packageName = "node-alias";
-      version = "1.0.4";
+    "execa-0.4.0" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz";
-        sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
+        url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz";
+        sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3";
       };
     };
-    "npm-3.10.10" = {
-      name = "npm";
-      packageName = "npm";
-      version = "3.10.10";
+    "cross-spawn-async-2.2.5" = {
+      name = "cross-spawn-async";
+      packageName = "cross-spawn-async";
+      version = "2.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
-        sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
+        url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz";
+        sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc";
       };
     };
-    "npmi-2.0.1" = {
-      name = "npmi";
-      packageName = "npmi";
-      version = "2.0.1";
+    "npm-run-path-1.0.0" = {
+      name = "npm-run-path";
+      packageName = "npm-run-path";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmi/-/npmi-2.0.1.tgz";
-        sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea";
+        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz";
+        sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f";
       };
     };
-    "require-dir-0.3.1" = {
-      name = "require-dir";
-      packageName = "require-dir";
-      version = "0.3.1";
+    "path-key-1.0.0" = {
+      name = "path-key";
+      packageName = "path-key";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.1.tgz";
-        sha1 = "b5a8e28bae0343bb0d0cc38ab1f531e1931b264a";
+        url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz";
+        sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af";
       };
     };
-    "semver-utils-1.1.1" = {
-      name = "semver-utils";
-      packageName = "semver-utils";
-      version = "1.1.1";
+    "unique-string-1.0.0" = {
+      name = "unique-string";
+      packageName = "unique-string";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.1.tgz";
-        sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
+        url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz";
+        sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
       };
     };
-    "snyk-1.30.0" = {
-      name = "snyk";
-      packageName = "snyk";
-      version = "1.30.0";
+    "write-file-atomic-2.1.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.30.0.tgz";
-        sha1 = "a323809ea477d6aff0e325f5995cb491c0d7ca3d";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
+        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
       };
     };
-    "spawn-please-0.2.0" = {
-      name = "spawn-please";
-      packageName = "spawn-please";
-      version = "0.2.0";
+    "crypto-random-string-1.0.0" = {
+      name = "crypto-random-string";
+      packageName = "crypto-random-string";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.2.0.tgz";
-        sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
+        url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz";
+        sha1 = "a230f64f568310e1498009940790ec99545bca7e";
       };
     };
-    "update-notifier-1.0.3" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "1.0.3";
+    "package-json-4.0.1" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
-        sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
+        url = "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz";
+        sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed";
       };
     };
-    "aproba-1.0.4" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "1.0.4";
+    "argparse-0.1.15" = {
+      name = "argparse";
+      packageName = "argparse";
+      version = "0.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
-        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+        url = "https://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
+        sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
       };
     };
-    "node-gyp-3.4.0" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "3.4.0";
+    "npm-registry-client-0.2.27" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "0.2.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
-        sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
+        sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
       };
     };
-    "request-2.75.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.75.0";
+    "npmconf-0.1.1" = {
+      name = "npmconf";
+      packageName = "npmconf";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
-        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
+        sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1";
       };
     };
-    "write-file-atomic-1.2.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.2.0";
+    "tar-0.1.17" = {
+      name = "tar";
+      packageName = "tar";
+      version = "0.1.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
-        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
+        url = "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+        sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
       };
     };
-    "path-array-1.0.1" = {
-      name = "path-array";
-      packageName = "path-array";
-      version = "1.0.1";
+    "temp-0.6.0" = {
+      name = "temp";
+      packageName = "temp";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz";
-        sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271";
+        url = "https://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
+        sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07";
       };
     };
-    "array-index-1.0.0" = {
-      name = "array-index";
-      packageName = "array-index";
-      version = "1.0.0";
+    "fs.extra-1.3.2" = {
+      name = "fs.extra";
+      packageName = "fs.extra";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz";
-        sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9";
+        url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
+        sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
       };
     };
-    "form-data-2.0.0" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.0.0";
+    "findit-1.2.0" = {
+      name = "findit";
+      packageName = "findit";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
-        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
+        url = "https://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
+        sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8";
       };
     };
-    "hasbin-1.2.3" = {
-      name = "hasbin";
-      packageName = "hasbin";
-      version = "1.2.3";
+    "underscore.string-2.3.3" = {
+      name = "underscore.string";
+      packageName = "underscore.string";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz";
-        sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0";
+        url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
+        sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
       };
     };
-    "inquirer-1.0.3" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "1.0.3";
+    "graceful-fs-2.0.3" = {
+      name = "graceful-fs";
+      packageName = "graceful-fs";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz";
-        sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
+        sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
       };
     };
-    "snyk-config-1.0.1" = {
-      name = "snyk-config";
-      packageName = "snyk-config";
-      version = "1.0.1";
+    "semver-2.0.11" = {
+      name = "semver";
+      packageName = "semver";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz";
-        sha1 = "f27aec2498b24027ac719214026521591111508f";
+        url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+        sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
       };
     };
-    "snyk-module-1.8.1" = {
-      name = "snyk-module";
-      packageName = "snyk-module";
-      version = "1.8.1";
+    "chownr-0.0.2" = {
+      name = "chownr";
+      packageName = "chownr";
+      version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz";
-        sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca";
+        url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz";
+        sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485";
       };
     };
-    "snyk-policy-1.7.1" = {
-      name = "snyk-policy";
-      packageName = "snyk-policy";
-      version = "1.7.1";
+    "retry-0.6.0" = {
+      name = "retry";
+      packageName = "retry";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz";
-        sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
+        url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
+        sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
       };
     };
-    "snyk-recursive-readdir-2.0.0" = {
-      name = "snyk-recursive-readdir";
-      packageName = "snyk-recursive-readdir";
-      version = "2.0.0";
+    "couch-login-0.1.20" = {
+      name = "couch-login";
+      packageName = "couch-login";
+      version = "0.1.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz";
-        sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3";
+        url = "https://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
+        sha1 = "007c70ef80089dbae6f59eeeec37480799b39595";
       };
     };
-    "snyk-resolve-1.0.0" = {
-      name = "snyk-resolve";
-      packageName = "snyk-resolve";
-      version = "1.0.0";
+    "once-1.1.1" = {
+      name = "once";
+      packageName = "once";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz";
-        sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2";
+        url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz";
+        sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
       };
     };
-    "snyk-resolve-deps-1.7.0" = {
-      name = "snyk-resolve-deps";
-      packageName = "snyk-resolve-deps";
-      version = "1.7.0";
+    "osenv-0.0.3" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz";
-        sha1 = "13743a058437dff890baaf437c333c966a743cb6";
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
+        sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
       };
     };
-    "snyk-tree-1.0.0" = {
-      name = "snyk-tree";
-      packageName = "snyk-tree";
-      version = "1.0.0";
+    "nopt-2.2.1" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz";
-        sha1 = "0fb73176dbf32e782f19100294160448f9111cc8";
+        url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
+        sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
       };
     };
-    "snyk-try-require-1.2.0" = {
-      name = "snyk-try-require";
-      packageName = "snyk-try-require";
-      version = "1.2.0";
+    "fstream-0.1.31" = {
+      name = "fstream";
+      packageName = "fstream";
+      version = "0.1.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz";
-        sha1 = "30fc2b11c07064591ee35780c826be91312f2144";
+        url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+        sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
       };
     };
-    "tempfile-1.1.1" = {
-      name = "tempfile";
-      packageName = "tempfile";
-      version = "1.1.1";
+    "rimraf-2.1.4" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz";
-        sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
+        sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
       };
     };
-    "then-fs-2.0.0" = {
-      name = "then-fs";
-      packageName = "then-fs";
-      version = "2.0.0";
+    "walk-2.3.9" = {
+      name = "walk";
+      packageName = "walk";
+      version = "2.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz";
-        sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2";
+        url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
+        sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
       };
     };
-    "mute-stream-0.0.6" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
-        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+    "foreachasync-3.0.0" = {
+      name = "foreachasync";
+      packageName = "foreachasync";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
+        sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
       };
     };
-    "run-async-2.3.0" = {
-      name = "run-async";
-      packageName = "run-async";
-      version = "2.3.0";
+    "cint-8.2.1" = {
+      name = "cint";
+      packageName = "cint";
+      version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
-        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+        url = "https://registry.npmjs.org/cint/-/cint-8.2.1.tgz";
+        sha1 = "70386b1b48e2773d0d63166a55aff94ef4456a12";
       };
     };
-    "rx-4.1.0" = {
-      name = "rx";
-      packageName = "rx";
-      version = "4.1.0";
+    "cli-table-0.3.1" = {
+      name = "cli-table";
+      packageName = "cli-table";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
-        sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
+        url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
+        sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
       };
     };
-    "nconf-0.7.2" = {
-      name = "nconf";
-      packageName = "nconf";
-      version = "0.7.2";
+    "fast-diff-1.1.1" = {
+      name = "fast-diff";
+      packageName = "fast-diff";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz";
-        sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00";
+        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.1.tgz";
+        sha1 = "0aea0e4e605b6a2189f0e936d4b7fbaf1b7cfd9b";
       };
     };
-    "yargs-3.15.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.15.0";
+    "node-alias-1.0.4" = {
+      name = "node-alias";
+      packageName = "node-alias";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz";
-        sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181";
+        url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz";
+        sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
       };
     };
-    "minimatch-3.0.2" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "3.0.2";
+    "npm-3.10.10" = {
+      name = "npm";
+      packageName = "npm";
+      version = "3.10.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz";
-        sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a";
+        url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz";
+        sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
       };
     };
-    "clite-0.3.0" = {
-      name = "clite";
-      packageName = "clite";
-      version = "0.3.0";
+    "npmi-2.0.1" = {
+      name = "npmi";
+      packageName = "npmi";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz";
-        sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441";
+        url = "https://registry.npmjs.org/npmi/-/npmi-2.0.1.tgz";
+        sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea";
       };
     };
-    "lodash.defaultsdeep-4.6.0" = {
-      name = "lodash.defaultsdeep";
-      packageName = "lodash.defaultsdeep";
-      version = "4.6.0";
+    "require-dir-0.3.1" = {
+      name = "require-dir";
+      packageName = "require-dir";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz";
-        sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81";
+        url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.1.tgz";
+        sha1 = "b5a8e28bae0343bb0d0cc38ab1f531e1931b264a";
       };
     };
-    "lodash.mergewith-4.6.0" = {
-      name = "lodash.mergewith";
-      packageName = "lodash.mergewith";
-      version = "4.6.0";
+    "semver-utils-1.1.1" = {
+      name = "semver-utils";
+      packageName = "semver-utils";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz";
-        sha1 = "150cf0a16791f5903b8891eab154609274bdea55";
+        url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.1.tgz";
+        sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "update-notifier-0.6.3" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "0.6.3";
+    "snyk-1.32.0" = {
+      name = "snyk";
+      packageName = "snyk";
+      version = "1.32.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
-        sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.32.0.tgz";
+        sha1 = "ccf3719a6bdebaed4e94ab5f1f7eb1671f0b9774";
       };
     };
-    "yargs-4.8.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "4.8.1";
+    "spawn-please-0.2.0" = {
+      name = "spawn-please";
+      packageName = "spawn-please";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
-        sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
+        url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.2.0.tgz";
+        sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d";
       };
     };
-    "boxen-0.3.1" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "0.3.1";
+    "aproba-1.0.4" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
-        sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
+        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
       };
     };
-    "latest-version-2.0.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "2.0.0";
+    "node-gyp-3.4.0" = {
+      name = "node-gyp";
+      packageName = "node-gyp";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
-        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz";
+        sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
       };
     };
-    "filled-array-1.1.0" = {
-      name = "filled-array";
-      packageName = "filled-array";
-      version = "1.1.0";
+    "request-2.75.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.75.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
-        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
+        url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz";
+        sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93";
       };
     };
-    "package-json-2.4.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "2.4.0";
+    "write-file-atomic-1.2.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
-        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz";
+        sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab";
       };
     };
-    "got-5.7.1" = {
-      name = "got";
-      packageName = "got";
-      version = "5.7.1";
+    "path-array-1.0.1" = {
+      name = "path-array";
+      packageName = "path-array";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
-        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
+        url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz";
+        sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271";
       };
     };
-    "node-status-codes-1.0.0" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
+    "array-index-1.0.0" = {
+      name = "array-index";
+      packageName = "array-index";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
-        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
+        url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz";
+        sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9";
       };
     };
-    "timed-out-3.1.3" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "3.1.3";
+    "form-data-2.0.0" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
-        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
+        url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz";
+        sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25";
       };
     };
-    "unzip-response-1.0.2" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "1.0.2";
+    "hasbin-1.2.3" = {
+      name = "hasbin";
+      packageName = "hasbin";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
-        sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe";
+        url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz";
+        sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0";
       };
     };
-    "get-caller-file-1.0.2" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "1.0.2";
+    "inquirer-1.0.3" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz";
-        sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz";
+        sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0";
       };
     };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
+    "snyk-config-1.0.1" = {
+      name = "snyk-config";
+      packageName = "snyk-config";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz";
+        sha1 = "f27aec2498b24027ac719214026521591111508f";
       };
     };
-    "require-directory-2.1.1" = {
-      name = "require-directory";
-      packageName = "require-directory";
-      version = "2.1.1";
+    "snyk-module-1.8.1" = {
+      name = "snyk-module";
+      packageName = "snyk-module";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
-        sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz";
+        sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca";
       };
     };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
+    "snyk-policy-1.7.1" = {
+      name = "snyk-policy";
+      packageName = "snyk-policy";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.1.tgz";
+        sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
       };
     };
-    "which-module-1.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
+    "snyk-recursive-readdir-2.0.0" = {
+      name = "snyk-recursive-readdir";
+      packageName = "snyk-recursive-readdir";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz";
+        sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3";
+      };
+    };
+    "snyk-resolve-1.0.0" = {
+      name = "snyk-resolve";
+      packageName = "snyk-resolve";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
-        sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
+        url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz";
+        sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2";
+      };
+    };
+    "snyk-resolve-deps-1.7.0" = {
+      name = "snyk-resolve-deps";
+      packageName = "snyk-resolve-deps";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz";
+        sha1 = "13743a058437dff890baaf437c333c966a743cb6";
+      };
+    };
+    "snyk-tree-1.0.0" = {
+      name = "snyk-tree";
+      packageName = "snyk-tree";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz";
+        sha1 = "0fb73176dbf32e782f19100294160448f9111cc8";
+      };
+    };
+    "snyk-try-require-1.2.0" = {
+      name = "snyk-try-require";
+      packageName = "snyk-try-require";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz";
+        sha1 = "30fc2b11c07064591ee35780c826be91312f2144";
+      };
+    };
+    "tempfile-1.1.1" = {
+      name = "tempfile";
+      packageName = "tempfile";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz";
+        sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
+      };
+    };
+    "then-fs-2.0.0" = {
+      name = "then-fs";
+      packageName = "then-fs";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz";
+        sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2";
+      };
+    };
+    "mute-stream-0.0.6" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+        sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
+      };
+    };
+    "run-async-2.3.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+      };
+    };
+    "rx-4.1.0" = {
+      name = "rx";
+      packageName = "rx";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz";
+        sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782";
+      };
+    };
+    "nconf-0.7.2" = {
+      name = "nconf";
+      packageName = "nconf";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz";
+        sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00";
+      };
+    };
+    "yargs-3.15.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz";
+        sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181";
+      };
+    };
+    "minimatch-3.0.2" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz";
+        sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a";
+      };
+    };
+    "clite-0.3.0" = {
+      name = "clite";
+      packageName = "clite";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz";
+        sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441";
+      };
+    };
+    "lodash.defaultsdeep-4.6.0" = {
+      name = "lodash.defaultsdeep";
+      packageName = "lodash.defaultsdeep";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz";
+        sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81";
+      };
+    };
+    "lodash.mergewith-4.6.0" = {
+      name = "lodash.mergewith";
+      packageName = "lodash.mergewith";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz";
+        sha1 = "150cf0a16791f5903b8891eab154609274bdea55";
+      };
+    };
+    "update-notifier-0.6.3" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "0.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
+        sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08";
+      };
+    };
+    "yargs-4.8.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "4.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
+        sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
+      };
+    };
+    "boxen-0.3.1" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
+        sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
+      };
+    };
+    "lodash.assign-4.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
       };
     };
     "window-size-0.2.0" = {
@@ -16173,33 +16695,6 @@ let
         sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
       };
     };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
-    "boxen-0.6.0" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
-        sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6";
-      };
-    };
-    "lazy-req-1.1.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
-        sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac";
-      };
-    };
     "babybird-0.0.1" = {
       name = "babybird";
       packageName = "babybird";
@@ -16446,13 +16941,13 @@ let
         sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31";
       };
     };
-    "dtrace-provider-0.8.1" = {
+    "dtrace-provider-0.8.2" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.8.1";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.1.tgz";
-        sha1 = "cd4d174a233bea1bcf4a1fbfa5798f44f48cda9f";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.2.tgz";
+        sha1 = "f067c2773f15da1b61eb20dbc96aa1cabb3330bc";
       };
     };
     "mv-2.1.1" = {
@@ -16555,6 +17050,15 @@ let
         sha1 = "7531e39d4949c281a66b8c5a6e0265e8b05894da";
       };
     };
+    "ms-0.7.3" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz";
+        sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff";
+      };
+    };
     "msgpack5-3.4.1" = {
       name = "msgpack5";
       packageName = "msgpack5";
@@ -16672,15 +17176,6 @@ let
         sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5";
       };
     };
-    "server-destroy-1.0.1" = {
-      name = "server-destroy";
-      packageName = "server-destroy";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz";
-        sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd";
-      };
-    };
     "bplist-creator-0.0.6" = {
       name = "bplist-creator";
       packageName = "bplist-creator";
@@ -16690,13 +17185,13 @@ let
         sha1 = "fef069bee85975b2ddcc2264aaa7c50dc17a3c7e";
       };
     };
-    "reverse-http-1.2.0" = {
+    "reverse-http-1.3.0" = {
       name = "reverse-http";
       packageName = "reverse-http";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.2.0.tgz";
-        sha1 = "d5bd826506425a3b3eacadf1e0e2c1ac3e289728";
+        url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.3.0.tgz";
+        sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -16843,31 +17338,22 @@ let
         sha1 = "6b62c3791cf7909ea35ed46e17658bb417cb3917";
       };
     };
-    "connect-multiparty-1.2.5" = {
+    "connect-multiparty-2.0.0" = {
       name = "connect-multiparty";
       packageName = "connect-multiparty";
-      version = "1.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-1.2.5.tgz";
-        sha1 = "2fabecfdc1a8a774ba19484dce660c818a8555e7";
-      };
-    };
-    "express-3.5.3" = {
-      name = "express";
-      packageName = "express";
-      version = "3.5.3";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-3.5.3.tgz";
-        sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
+        url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.0.0.tgz";
+        sha1 = "57a7b61cc7b31b6eef4a62878d60d771b23699ab";
       };
     };
-    "torrent-stream-0.18.1" = {
-      name = "torrent-stream";
-      packageName = "torrent-stream";
-      version = "0.18.1";
+    "socket.io-1.7.4" = {
+      name = "socket.io";
+      packageName = "socket.io";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-0.18.1.tgz";
-        sha1 = "e2e8ca44d81f16fbe5646e0ebb05f5418fea9bf6";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.4.tgz";
+        sha1 = "2f7ecedc3391bf2d5c73e291fe233e6e34d4dd00";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -16879,3094 +17365,2697 @@ let
         sha1 = "c952de2240f812ebda0aa8006d7776ee2acf7d74";
       };
     };
-    "on-finished-2.1.1" = {
-      name = "on-finished";
-      packageName = "on-finished";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz";
-        sha1 = "f82ca1c9e3a4f3286b1b9938610e5b8636bd3cb2";
-      };
-    };
-    "qs-2.2.5" = {
-      name = "qs";
-      packageName = "qs";
-      version = "2.2.5";
+    "multiparty-4.1.3" = {
+      name = "multiparty";
+      packageName = "multiparty";
+      version = "4.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-2.2.5.tgz";
-        sha1 = "1088abaf9dcc0ae5ae45b709e6c6b5888b23923c";
+        url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz";
+        sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94";
       };
     };
-    "connect-2.14.5" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.14.5";
+    "fd-slicer-1.0.1" = {
+      name = "fd-slicer";
+      packageName = "fd-slicer";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.14.5.tgz";
-        sha1 = "73217513152c152ebe049c499fa09211b8c476f4";
+        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
+        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
       };
     };
-    "commander-1.3.2" = {
-      name = "commander";
-      packageName = "commander";
-      version = "1.3.2";
+    "pend-1.2.0" = {
+      name = "pend";
+      packageName = "pend";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
-        sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
+        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
+        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
       };
     };
-    "range-parser-1.0.0" = {
-      name = "range-parser";
-      packageName = "range-parser";
-      version = "1.0.0";
+    "engine.io-1.8.4" = {
+      name = "engine.io";
+      packageName = "engine.io";
+      version = "1.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
-        sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.4.tgz";
+        sha1 = "77bce12b80e5d60429337fec3b0daf691ebc9003";
       };
     };
-    "mkdirp-0.4.0" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.4.0";
+    "socket.io-client-1.7.4" = {
+      name = "socket.io-client";
+      packageName = "socket.io-client";
+      version = "1.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz";
-        sha1 = "291ac2a2d43a19c478662577b5be846fe83b5923";
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.4.tgz";
+        sha1 = "ec9f820356ed99ef6d357f0756d648717bdd4281";
       };
     };
-    "buffer-crc32-0.2.1" = {
-      name = "buffer-crc32";
-      packageName = "buffer-crc32";
-      version = "0.2.1";
+    "engine.io-client-1.8.4" = {
+      name = "engine.io-client";
+      packageName = "engine.io-client";
+      version = "1.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
-        sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.4.tgz";
+        sha1 = "9fe85dee25853ca6babe25bd2ad68710863e91c2";
       };
     };
-    "fresh-0.2.2" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.2.2";
+    "extract-zip-1.5.0" = {
+      name = "extract-zip";
+      packageName = "extract-zip";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
-        sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
+        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz";
+        sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
       };
     };
-    "methods-0.1.0" = {
-      name = "methods";
-      packageName = "methods";
-      version = "0.1.0";
+    "hasha-2.2.0" = {
+      name = "hasha";
+      packageName = "hasha";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
-        sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f";
+        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
+        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
       };
     };
-    "send-0.3.0" = {
-      name = "send";
-      packageName = "send";
-      version = "0.3.0";
+    "kew-0.7.0" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.3.0.tgz";
-        sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7";
+        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
+        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
       };
     };
-    "cookie-signature-1.0.3" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "1.0.3";
+    "request-2.67.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.67.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz";
-        sha1 = "91cd997cc51fb641595738c69cda020328f50ff9";
+        url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz";
+        sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
       };
     };
-    "debug-0.8.1" = {
-      name = "debug";
-      packageName = "debug";
-      version = "0.8.1";
+    "request-progress-2.0.1" = {
+      name = "request-progress";
+      packageName = "request-progress";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
-        sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
+        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
       };
     };
-    "cookie-parser-1.0.1" = {
-      name = "cookie-parser";
-      packageName = "cookie-parser";
-      version = "1.0.1";
+    "concat-stream-1.5.0" = {
+      name = "concat-stream";
+      packageName = "concat-stream";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
-        sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0";
+        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz";
+        sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611";
       };
     };
-    "compression-1.0.0" = {
-      name = "compression";
-      packageName = "compression";
-      version = "1.0.0";
+    "mkdirp-0.5.0" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
-        sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+        sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
       };
     };
-    "connect-timeout-1.0.0" = {
-      name = "connect-timeout";
-      packageName = "connect-timeout";
-      version = "1.0.0";
+    "yauzl-2.4.1" = {
+      name = "yauzl";
+      packageName = "yauzl";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
-        sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb";
+        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
+        sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
       };
     };
-    "csurf-1.1.0" = {
-      name = "csurf";
-      packageName = "csurf";
-      version = "1.1.0";
+    "bl-1.0.3" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz";
-        sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2";
+        url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
+        sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e";
       };
     };
-    "errorhandler-1.0.0" = {
-      name = "errorhandler";
-      packageName = "errorhandler";
-      version = "1.0.0";
+    "qs-5.2.1" = {
+      name = "qs";
+      packageName = "qs";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
-        sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a";
+        url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz";
+        sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc";
       };
     };
-    "express-session-1.0.2" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.0.2";
+    "tough-cookie-2.2.2" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
-        sha1 = "004478c742561774411ceb79733155a56b6d49eb";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz";
+        sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
       };
     };
-    "method-override-1.0.0" = {
-      name = "method-override";
-      packageName = "method-override";
+    "throttleit-1.0.0" = {
+      name = "throttleit";
+      packageName = "throttleit";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
-        sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61";
+        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
+        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     };
-    "morgan-1.0.0" = {
-      name = "morgan";
-      packageName = "morgan";
-      version = "1.0.0";
+    "ast-types-0.9.8" = {
+      name = "ast-types";
+      packageName = "ast-types";
+      version = "0.9.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
-        sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.8.tgz";
+        sha1 = "6cb6a40beba31f49f20928e28439fc14a3dab078";
       };
     };
-    "qs-0.6.6" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.6.6";
+    "babylon-7.0.0-beta.8" = {
+      name = "babylon";
+      packageName = "babylon";
+      version = "7.0.0-beta.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
-        sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+        url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.8.tgz";
+        sha1 = "2bdc5ae366041442c27e068cce6f0d7c06ea9949";
       };
     };
-    "raw-body-1.1.4" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "1.1.4";
+    "flow-parser-0.45.0" = {
+      name = "flow-parser";
+      packageName = "flow-parser";
+      version = "0.45.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz";
-        sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.45.0.tgz";
+        sha1 = "aa29d4ae27f06aa02817772bba0fcbefef7e62f0";
       };
     };
-    "response-time-1.0.0" = {
-      name = "response-time";
-      packageName = "response-time";
-      version = "1.0.0";
+    "jest-validate-19.0.0" = {
+      name = "jest-validate";
+      packageName = "jest-validate";
+      version = "19.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
-        sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9";
+        url = "https://registry.npmjs.org/jest-validate/-/jest-validate-19.0.0.tgz";
+        sha1 = "8c6318a20ecfeaba0ba5378bfbb8277abded4173";
       };
     };
-    "setimmediate-1.0.1" = {
-      name = "setimmediate";
-      packageName = "setimmediate";
-      version = "1.0.1";
+    "jest-matcher-utils-19.0.0" = {
+      name = "jest-matcher-utils";
+      packageName = "jest-matcher-utils";
+      version = "19.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
-        sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
+        url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz";
+        sha1 = "5ecd9b63565d2b001f61fbf7ec4c7f537964564d";
       };
     };
-    "serve-index-1.0.1" = {
-      name = "serve-index";
-      packageName = "serve-index";
-      version = "1.0.1";
+    "leven-2.1.0" = {
+      name = "leven";
+      packageName = "leven";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
-        sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6";
+        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
+        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
       };
     };
-    "serve-static-1.1.0" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.1.0";
+    "pretty-format-19.0.0" = {
+      name = "pretty-format";
+      packageName = "pretty-format";
+      version = "19.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz";
-        sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643";
+        url = "https://registry.npmjs.org/pretty-format/-/pretty-format-19.0.0.tgz";
+        sha1 = "56530d32acb98a3fa4851c4e2b9d37b420684c84";
       };
     };
-    "static-favicon-1.0.2" = {
-      name = "static-favicon";
-      packageName = "static-favicon";
-      version = "1.0.2";
+    "ansi-styles-3.0.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz";
-        sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f";
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.0.0.tgz";
+        sha1 = "5404e93a544c4fec7f048262977bebfe3155e0c1";
       };
     };
-    "vhost-1.0.0" = {
-      name = "vhost";
-      packageName = "vhost";
-      version = "1.0.0";
+    "color-convert-1.9.0" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
-        sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0";
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
+        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
       };
     };
-    "bytes-0.3.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "0.3.0";
+    "color-name-1.1.2" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
-        sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935";
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
+        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
       };
     };
-    "multiparty-2.2.0" = {
-      name = "multiparty";
-      packageName = "multiparty";
-      version = "2.2.0";
+    "commoner-0.10.8" = {
+      name = "commoner";
+      packageName = "commoner";
+      version = "0.10.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz";
-        sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4";
+        url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz";
+        sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5";
       };
     };
-    "cookie-0.1.0" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.1.0";
+    "jstransform-10.1.0" = {
+      name = "jstransform";
+      packageName = "jstransform";
+      version = "10.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
-        sha1 = "90eb469ddce905c866de687efc43131d8801f9d0";
+        url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz";
+        sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "bytes-0.2.1" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "0.2.1";
+    "iconv-lite-0.4.17" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz";
-        sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz";
+        sha1 = "4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d";
       };
     };
-    "negotiator-0.3.0" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.3.0";
+    "recast-0.11.23" = {
+      name = "recast";
+      packageName = "recast";
+      version = "0.11.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz";
-        sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz";
+        sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3";
       };
     };
-    "compressible-1.0.0" = {
-      name = "compressible";
-      packageName = "compressible";
-      version = "1.0.0";
+    "ast-types-0.9.6" = {
+      name = "ast-types";
+      packageName = "ast-types";
+      version = "0.9.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
-        sha1 = "f83e49c1cb61421753545125a8011d68b492427d";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz";
+        sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9";
       };
     };
-    "scmp-0.0.3" = {
-      name = "scmp";
-      packageName = "scmp";
-      version = "0.0.3";
+    "base62-0.1.1" = {
+      name = "base62";
+      packageName = "base62";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz";
-        sha1 = "3648df2d7294641e7f78673ffc29681d9bad9073";
+        url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
+        sha1 = "7b4174c2f94449753b11c2651c083da841a7b084";
       };
     };
-    "batch-0.5.0" = {
-      name = "batch";
-      packageName = "batch";
-      version = "0.5.0";
+    "esprima-fb-13001.1001.0-dev-harmony-fb" = {
+      name = "esprima-fb";
+      packageName = "esprima-fb";
+      version = "13001.1001.0-dev-harmony-fb";
       src = fetchurl {
-        url = "https://registry.npmjs.org/batch/-/batch-0.5.0.tgz";
-        sha1 = "fd2e05a7a5d696b4db9314013e285d8ff3557ec3";
+        url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
+        sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
       };
     };
-    "negotiator-0.4.2" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.4.2";
+    "source-map-0.1.31" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.1.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
-        sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37";
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
+        sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
       };
     };
-    "parseurl-1.0.1" = {
-      name = "parseurl";
-      packageName = "parseurl";
-      version = "1.0.1";
+    "aws-sdk-1.18.0" = {
+      name = "aws-sdk";
+      packageName = "aws-sdk";
+      version = "1.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz";
-        sha1 = "2e57dce6efdd37c3518701030944c22bf388b7b4";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
+        sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "debug-0.8.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "0.8.0";
+    "commander-2.0.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
-        sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
+        url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
+        sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
       };
     };
-    "bittorrent-dht-3.2.6" = {
-      name = "bittorrent-dht";
-      packageName = "bittorrent-dht";
-      version = "3.2.6";
+    "http-auth-2.0.7" = {
+      name = "http-auth";
+      packageName = "http-auth";
+      version = "2.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-3.2.6.tgz";
-        sha1 = "8d6f64f002525951536ca403ddd040c03009b7d5";
+        url = "https://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz";
+        sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3";
       };
     };
-    "bittorrent-tracker-2.12.1" = {
-      name = "bittorrent-tracker";
-      packageName = "bittorrent-tracker";
-      version = "2.12.1";
+    "express-3.4.4" = {
+      name = "express";
+      packageName = "express";
+      version = "3.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.12.1.tgz";
-        sha1 = "562f0e43c6340d003b08c5dad3d4bff0eb3fd64d";
+        url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz";
+        sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86";
       };
     };
-    "ip-0.3.3" = {
-      name = "ip";
-      packageName = "ip";
-      version = "0.3.3";
+    "everyauth-0.4.5" = {
+      name = "everyauth";
+      packageName = "everyauth";
+      version = "0.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz";
-        sha1 = "8ee8309e92f0b040d287f72efaca1a21702d3fb4";
+        url = "https://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz";
+        sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189";
       };
     };
-    "peer-wire-swarm-0.9.2" = {
-      name = "peer-wire-swarm";
-      packageName = "peer-wire-swarm";
-      version = "0.9.2";
+    "string-1.6.1" = {
+      name = "string";
+      packageName = "string";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz";
-        sha1 = "092848005607d8ca94e69f9bc9ebe52956ec3048";
+        url = "https://registry.npmjs.org/string/-/string-1.6.1.tgz";
+        sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55";
       };
     };
-    "random-access-file-0.3.2" = {
-      name = "random-access-file";
-      packageName = "random-access-file";
-      version = "0.3.2";
+    "util-0.4.9" = {
+      name = "util";
+      packageName = "util";
+      version = "0.4.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-0.3.2.tgz";
-        sha1 = "cbca246e131db7b68a1c6bb6328dd4d0997100a0";
+        url = "https://registry.npmjs.org/util/-/util-0.4.9.tgz";
+        sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3";
       };
     };
-    "is-ip-1.0.0" = {
-      name = "is-ip";
-      packageName = "is-ip";
-      version = "1.0.0";
+    "crypto-0.0.3" = {
+      name = "crypto";
+      packageName = "crypto";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz";
-        sha1 = "2bb6959f797ccd6f9fdc812758bcbc87c4c59074";
+        url = "https://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz";
+        sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0";
       };
     };
-    "k-bucket-0.5.0" = {
-      name = "k-bucket";
-      packageName = "k-bucket";
-      version = "0.5.0";
+    "xml2js-0.2.4" = {
+      name = "xml2js";
+      packageName = "xml2js";
+      version = "0.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.5.0.tgz";
-        sha1 = "31d462d86cdb2e8d245528acfe5e71382f552e1d";
+        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
+        sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d";
       };
     };
-    "simple-get-1.4.3" = {
-      name = "simple-get";
-      packageName = "simple-get";
-      version = "1.4.3";
+    "xmlbuilder-0.4.2" = {
+      name = "xmlbuilder";
+      packageName = "xmlbuilder";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz";
-        sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb";
+        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
+        sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
       };
     };
-    "ip-regex-1.0.3" = {
-      name = "ip-regex";
-      packageName = "ip-regex";
-      version = "1.0.3";
+    "coffee-script-1.6.3" = {
+      name = "coffee-script";
+      packageName = "coffee-script";
+      version = "1.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz";
-        sha1 = "dc589076f659f419c222039a33316f1c7387effd";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+        sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
       };
     };
-    "bencode-0.6.0" = {
-      name = "bencode";
-      packageName = "bencode";
-      version = "0.6.0";
+    "node-uuid-1.4.1" = {
+      name = "node-uuid";
+      packageName = "node-uuid";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz";
-        sha1 = "04d6190e1d7467c56a969e1a94d1668076eac050";
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
+        sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
       };
     };
-    "bn.js-1.3.0" = {
-      name = "bn.js";
-      packageName = "bn.js";
-      version = "1.3.0";
+    "connect-2.11.0" = {
+      name = "connect";
+      packageName = "connect";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz";
-        sha1 = "0db4cbf96f8f23b742f5bcb9d1aa7a9994a05e83";
+        url = "https://registry.npmjs.org/connect/-/connect-2.11.0.tgz";
+        sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284";
       };
     };
-    "extend.js-0.0.2" = {
-      name = "extend.js";
-      packageName = "extend.js";
-      version = "0.0.2";
+    "commander-1.3.2" = {
+      name = "commander";
+      packageName = "commander";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz";
-        sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15";
+        url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
+        sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
       };
     };
-    "portfinder-0.3.0" = {
-      name = "portfinder";
-      packageName = "portfinder";
-      version = "0.3.0";
+    "cookie-0.1.0" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/portfinder/-/portfinder-0.3.0.tgz";
-        sha1 = "f9f2c96894440c5b5113b84e0ad1013042b7c2a0";
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
+        sha1 = "90eb469ddce905c866de687efc43131d8801f9d0";
       };
     };
-    "mkdirp-0.0.7" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.0.7";
+    "buffer-crc32-0.2.1" = {
+      name = "buffer-crc32";
+      packageName = "buffer-crc32";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz";
-        sha1 = "d89b4f0e4c3e5e5ca54235931675e094fe1a5072";
+        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
+        sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
       };
     };
-    "extract-zip-1.5.0" = {
-      name = "extract-zip";
-      packageName = "extract-zip";
-      version = "1.5.0";
+    "fresh-0.2.0" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz";
-        sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
+        sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7";
       };
     };
-    "hasha-2.2.0" = {
-      name = "hasha";
-      packageName = "hasha";
-      version = "2.2.0";
+    "methods-0.1.0" = {
+      name = "methods";
+      packageName = "methods";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
-        sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
+        url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
+        sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f";
       };
     };
-    "kew-0.7.0" = {
-      name = "kew";
-      packageName = "kew";
-      version = "0.7.0";
+    "send-0.1.4" = {
+      name = "send";
+      packageName = "send";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
-        sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
+        url = "https://registry.npmjs.org/send/-/send-0.1.4.tgz";
+        sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
       };
     };
-    "request-2.67.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.67.0";
+    "qs-0.6.5" = {
+      name = "qs";
+      packageName = "qs";
+      version = "0.6.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz";
-        sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
+        url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
+        sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
       };
     };
-    "request-progress-2.0.1" = {
-      name = "request-progress";
-      packageName = "request-progress";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
-        sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
-      };
-    };
-    "concat-stream-1.5.0" = {
-      name = "concat-stream";
-      packageName = "concat-stream";
-      version = "1.5.0";
+    "bytes-0.2.1" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz";
-        sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611";
+        url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz";
+        sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31";
       };
     };
-    "mkdirp-0.5.0" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.5.0";
+    "raw-body-0.0.3" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
-        sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz";
+        sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a";
       };
     };
-    "yauzl-2.4.1" = {
-      name = "yauzl";
-      packageName = "yauzl";
-      version = "2.4.1";
+    "negotiator-0.3.0" = {
+      name = "negotiator";
+      packageName = "negotiator";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
-        sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
+        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz";
+        sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60";
       };
     };
-    "fd-slicer-1.0.1" = {
-      name = "fd-slicer";
-      packageName = "fd-slicer";
-      version = "1.0.1";
+    "multiparty-2.2.0" = {
+      name = "multiparty";
+      packageName = "multiparty";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
-        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+        url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz";
+        sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4";
       };
     };
-    "pend-1.2.0" = {
-      name = "pend";
-      packageName = "pend";
-      version = "1.2.0";
+    "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = {
+      name = "oauth";
+      packageName = "oauth";
+      version = "0.9.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
-        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
+        name = "oauth-0.9.15.tar.gz";
+        url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
+        sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
       };
     };
-    "bl-1.0.3" = {
-      name = "bl";
-      packageName = "bl";
-      version = "1.0.3";
+    "connect-2.3.9" = {
+      name = "connect";
+      packageName = "connect";
+      version = "2.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
-        sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e";
+        url = "https://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
+        sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52";
       };
     };
-    "qs-5.2.1" = {
-      name = "qs";
-      packageName = "qs";
-      version = "5.2.1";
+    "openid-2.0.6" = {
+      name = "openid";
+      packageName = "openid";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz";
-        sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc";
+        url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz";
+        sha1 = "707375e59ab9f73025899727679b20328171c9aa";
       };
     };
-    "tough-cookie-2.2.2" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.2.2";
+    "node-swt-0.1.1" = {
+      name = "node-swt";
+      packageName = "node-swt";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz";
-        sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
+        url = "https://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz";
+        sha1 = "af0903825784be553b93dbae57d99d59060585dd";
       };
     };
-    "throttleit-1.0.0" = {
-      name = "throttleit";
-      packageName = "throttleit";
-      version = "1.0.0";
+    "node-wsfederation-0.1.1" = {
+      name = "node-wsfederation";
+      packageName = "node-wsfederation";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
-        sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
+        url = "https://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz";
+        sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b";
       };
     };
-    "ast-types-0.9.8" = {
-      name = "ast-types";
-      packageName = "ast-types";
-      version = "0.9.8";
+    "debug-0.5.0" = {
+      name = "debug";
+      packageName = "debug";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.8.tgz";
-        sha1 = "6cb6a40beba31f49f20928e28439fc14a3dab078";
+        url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
+        sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e";
       };
     };
-    "babylon-7.0.0-beta.8" = {
-      name = "babylon";
-      packageName = "babylon";
-      version = "7.0.0-beta.8";
+    "crc-0.2.0" = {
+      name = "crc";
+      packageName = "crc";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.8.tgz";
-        sha1 = "2bdc5ae366041442c27e068cce6f0d7c06ea9949";
+        url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
+        sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
       };
     };
-    "flow-parser-0.45.0" = {
-      name = "flow-parser";
-      packageName = "flow-parser";
-      version = "0.45.0";
+    "cookie-0.0.4" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.45.0.tgz";
-        sha1 = "aa29d4ae27f06aa02817772bba0fcbefef7e62f0";
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
+        sha1 = "5456bd47aee2666eac976ea80a6105940483fe98";
       };
     };
-    "jest-validate-19.0.0" = {
-      name = "jest-validate";
-      packageName = "jest-validate";
-      version = "19.0.0";
+    "bytes-0.1.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-validate/-/jest-validate-19.0.0.tgz";
-        sha1 = "8c6318a20ecfeaba0ba5378bfbb8277abded4173";
+        url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
+        sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
       };
     };
-    "jest-matcher-utils-19.0.0" = {
-      name = "jest-matcher-utils";
-      packageName = "jest-matcher-utils";
-      version = "19.0.0";
+    "send-0.0.3" = {
+      name = "send";
+      packageName = "send";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz";
-        sha1 = "5ecd9b63565d2b001f61fbf7ec4c7f537964564d";
+        url = "https://registry.npmjs.org/send/-/send-0.0.3.tgz";
+        sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184";
       };
     };
-    "leven-2.1.0" = {
-      name = "leven";
-      packageName = "leven";
-      version = "2.1.0";
+    "events.node-0.4.9" = {
+      name = "events.node";
+      packageName = "events.node";
+      version = "0.4.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
-        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
+        url = "https://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
+        sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
       };
     };
-    "pretty-format-19.0.0" = {
-      name = "pretty-format";
-      packageName = "pretty-format";
-      version = "19.0.0";
+    "express-5.0.0-alpha.5" = {
+      name = "express";
+      packageName = "express";
+      version = "5.0.0-alpha.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-format/-/pretty-format-19.0.0.tgz";
-        sha1 = "56530d32acb98a3fa4851c4e2b9d37b420684c84";
+        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.5.tgz";
+        sha1 = "e37423a8d82826fb915c7dd166e2900bfa3552e6";
       };
     };
-    "ansi-styles-3.0.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "3.0.0";
+    "express-json5-0.1.0" = {
+      name = "express-json5";
+      packageName = "express-json5";
+      version = "0.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.0.0.tgz";
-        sha1 = "5404e93a544c4fec7f048262977bebfe3155e0c1";
+        url = "https://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz";
+        sha1 = "114a514bd734b319e018a1bde337923cc455b836";
       };
     };
-    "color-convert-1.9.0" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "1.9.0";
+    "es6-shim-0.21.1" = {
+      name = "es6-shim";
+      packageName = "es6-shim";
+      version = "0.21.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
-        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
+        url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz";
+        sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2";
       };
     };
-    "color-name-1.1.2" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.2";
+    "handlebars-2.0.0" = {
+      name = "handlebars";
+      packageName = "handlebars";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
-        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
+        url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
+        sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f";
       };
     };
-    "commoner-0.10.8" = {
-      name = "commoner";
-      packageName = "commoner";
-      version = "0.10.8";
+    "highlight.js-8.9.1" = {
+      name = "highlight.js";
+      packageName = "highlight.js";
+      version = "8.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz";
-        sha1 = "34fc3672cd24393e8bb47e70caa0293811f4f2c5";
+        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz";
+        sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88";
       };
     };
-    "jstransform-10.1.0" = {
-      name = "jstransform";
-      packageName = "jstransform";
-      version = "10.1.0";
+    "lunr-0.7.2" = {
+      name = "lunr";
+      packageName = "lunr";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz";
-        sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
+        url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz";
+        sha1 = "79a30e932e216cba163541ee37a3607c12cd7281";
       };
     };
-    "iconv-lite-0.4.17" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.17";
+    "render-readme-1.3.1" = {
+      name = "render-readme";
+      packageName = "render-readme";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz";
-        sha1 = "4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d";
+        url = "https://registry.npmjs.org/render-readme/-/render-readme-1.3.1.tgz";
+        sha1 = "d2a98f9a87dd64fa73c6877ac5c45b0f6341a797";
       };
     };
-    "private-0.1.7" = {
-      name = "private";
-      packageName = "private";
-      version = "0.1.7";
+    "sinopia-htpasswd-0.4.5" = {
+      name = "sinopia-htpasswd";
+      packageName = "sinopia-htpasswd";
+      version = "0.4.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
-        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
+        url = "https://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz";
+        sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9";
       };
     };
-    "recast-0.11.23" = {
-      name = "recast";
-      packageName = "recast";
-      version = "0.11.23";
+    "fs-ext-0.6.0" = {
+      name = "fs-ext";
+      packageName = "fs-ext";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz";
-        sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3";
+        url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz";
+        sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66";
       };
     };
-    "ast-types-0.9.6" = {
-      name = "ast-types";
-      packageName = "ast-types";
-      version = "0.9.6";
+    "crypt3-0.2.0" = {
+      name = "crypt3";
+      packageName = "crypt3";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz";
-        sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9";
+        url = "https://registry.npmjs.org/crypt3/-/crypt3-0.2.0.tgz";
+        sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332";
       };
     };
-    "base62-0.1.1" = {
-      name = "base62";
-      packageName = "base62";
-      version = "0.1.1";
+    "debug-2.6.1" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
-        sha1 = "7b4174c2f94449753b11c2651c083da841a7b084";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
+        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
       };
     };
-    "esprima-fb-13001.1001.0-dev-harmony-fb" = {
-      name = "esprima-fb";
-      packageName = "esprima-fb";
-      version = "13001.1001.0-dev-harmony-fb";
+    "router-1.3.1" = {
+      name = "router";
+      packageName = "router";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
-        sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
+        url = "https://registry.npmjs.org/router/-/router-1.3.1.tgz";
+        sha1 = "e59ef64fafc22194a196986834d887058d76af47";
       };
     };
-    "source-map-0.1.31" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.1.31";
+    "send-0.15.1" = {
+      name = "send";
+      packageName = "send";
+      version = "0.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
-        sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
+        url = "https://registry.npmjs.org/send/-/send-0.15.1.tgz";
+        sha1 = "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f";
       };
     };
-    "aws-sdk-1.18.0" = {
-      name = "aws-sdk";
-      packageName = "aws-sdk";
-      version = "1.18.0";
+    "serve-static-1.12.1" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
-        sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz";
+        sha1 = "7443a965e3ced647aceb5639fa06bf4d1bbe0039";
       };
     };
-    "commander-2.0.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.0.0";
+    "raw-body-1.3.4" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
-        sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz";
+        sha1 = "ccc7ddfc46b72861cdd5bb433c840b70b6f27f54";
       };
     };
-    "http-auth-2.0.7" = {
-      name = "http-auth";
-      packageName = "http-auth";
-      version = "2.0.7";
+    "bytes-1.0.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz";
-        sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3";
+        url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
       };
     };
-    "express-3.4.4" = {
-      name = "express";
-      packageName = "express";
-      version = "3.4.4";
+    "iconv-lite-0.4.8" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz";
-        sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
+        sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
-    "everyauth-0.4.5" = {
-      name = "everyauth";
-      packageName = "everyauth";
-      version = "0.4.5";
+    "uglify-js-2.3.6" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz";
-        sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
       };
     };
-    "string-1.6.1" = {
-      name = "string";
-      packageName = "string";
-      version = "1.6.1";
+    "markdown-it-4.4.0" = {
+      name = "markdown-it";
+      packageName = "markdown-it";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string/-/string-1.6.1.tgz";
-        sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55";
+        url = "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz";
+        sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
       };
     };
-    "util-0.4.9" = {
-      name = "util";
-      packageName = "util";
-      version = "0.4.9";
+    "sanitize-html-1.14.1" = {
+      name = "sanitize-html";
+      packageName = "sanitize-html";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/util/-/util-0.4.9.tgz";
-        sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3";
+        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
+        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
       };
     };
-    "crypto-0.0.3" = {
-      name = "crypto";
-      packageName = "crypto";
-      version = "0.0.3";
+    "linkify-it-1.2.4" = {
+      name = "linkify-it";
+      packageName = "linkify-it";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz";
-        sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0";
+        url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz";
+        sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a";
       };
     };
-    "xml2js-0.2.4" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.2.4";
+    "mdurl-1.0.1" = {
+      name = "mdurl";
+      packageName = "mdurl";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
-        sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d";
+        url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz";
+        sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e";
       };
     };
-    "xmlbuilder-0.4.2" = {
-      name = "xmlbuilder";
-      packageName = "xmlbuilder";
-      version = "0.4.2";
+    "uc.micro-1.0.3" = {
+      name = "uc.micro";
+      packageName = "uc.micro";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
-        sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
+        url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz";
+        sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192";
       };
     };
-    "coffee-script-1.6.3" = {
-      name = "coffee-script";
-      packageName = "coffee-script";
-      version = "1.6.3";
+    "regexp-quote-0.0.0" = {
+      name = "regexp-quote";
+      packageName = "regexp-quote";
+      version = "0.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
-        sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
+        url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz";
+        sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
       };
     };
-    "node-uuid-1.4.1" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.1";
+    "domutils-1.6.2" = {
+      name = "domutils";
+      packageName = "domutils";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
-        sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
+        url = "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz";
+        sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff";
       };
     };
-    "connect-2.11.0" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.11.0";
+    "async-2.1.5" = {
+      name = "async";
+      packageName = "async";
+      version = "2.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.11.0.tgz";
-        sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284";
+        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
+        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
       };
     };
-    "fresh-0.2.0" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.2.0";
+    "assert-plus-0.1.5" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
-        sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7";
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
       };
     };
-    "send-0.1.4" = {
-      name = "send";
-      packageName = "send";
-      version = "0.1.4";
+    "lru-cache-2.2.0" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.1.4.tgz";
-        sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
+        sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
       };
     };
-    "qs-0.6.5" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.6.5";
+    "nopt-2.0.0" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
-        sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
+        url = "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
+        sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
       };
     };
-    "raw-body-0.0.3" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "0.0.3";
+    "restify-4.0.3" = {
+      name = "restify";
+      packageName = "restify";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz";
-        sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a";
+        url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz";
+        sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc";
       };
     };
-    "oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" = {
-      name = "oauth";
-      packageName = "oauth";
-      version = "0.9.15";
+    "bunyan-1.5.1" = {
+      name = "bunyan";
+      packageName = "bunyan";
+      version = "1.5.1";
       src = fetchurl {
-        name = "oauth-0.9.15.tar.gz";
-        url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master;
-        sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz";
+        sha1 = "5f6e7d44c43b952f56b0f41309e3ab12391b4e2d";
       };
     };
-    "connect-2.3.9" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.3.9";
+    "clone-0.1.6" = {
+      name = "clone";
+      packageName = "clone";
+      version = "0.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
-        sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52";
+        url = "https://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
+        sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000";
       };
     };
-    "openid-2.0.6" = {
-      name = "openid";
-      packageName = "openid";
-      version = "2.0.6";
+    "smartdc-auth-2.3.1" = {
+      name = "smartdc-auth";
+      packageName = "smartdc-auth";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz";
-        sha1 = "707375e59ab9f73025899727679b20328171c9aa";
+        url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.3.1.tgz";
+        sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44";
       };
     };
-    "node-swt-0.1.1" = {
-      name = "node-swt";
-      packageName = "node-swt";
-      version = "0.1.1";
+    "cmdln-3.2.1" = {
+      name = "cmdln";
+      packageName = "cmdln";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz";
-        sha1 = "af0903825784be553b93dbae57d99d59060585dd";
+        url = "https://registry.npmjs.org/cmdln/-/cmdln-3.2.1.tgz";
+        sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45";
       };
     };
-    "node-wsfederation-0.1.1" = {
-      name = "node-wsfederation";
-      packageName = "node-wsfederation";
-      version = "0.1.1";
+    "dashdash-1.7.3" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz";
-        sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b";
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.7.3.tgz";
+        sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf";
       };
     };
-    "debug-0.5.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "0.5.0";
+    "vasync-1.6.2" = {
+      name = "vasync";
+      packageName = "vasync";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
-        sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e";
+        url = "https://registry.npmjs.org/vasync/-/vasync-1.6.2.tgz";
+        sha1 = "568edcf40b2b5c35b1cc048cad085de4739703fb";
       };
     };
-    "crc-0.2.0" = {
-      name = "crc";
-      packageName = "crc";
-      version = "0.2.0";
+    "backoff-2.5.0" = {
+      name = "backoff";
+      packageName = "backoff";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
-        sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
+        url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz";
+        sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
       };
     };
-    "cookie-0.0.4" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.0.4";
+    "csv-0.4.6" = {
+      name = "csv";
+      packageName = "csv";
+      version = "0.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
-        sha1 = "5456bd47aee2666eac976ea80a6105940483fe98";
+        url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz";
+        sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d";
       };
     };
-    "bytes-0.1.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "0.1.0";
+    "escape-regexp-component-1.0.2" = {
+      name = "escape-regexp-component";
+      packageName = "escape-regexp-component";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
-        sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
+        url = "https://registry.npmjs.org/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz";
+        sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
       };
     };
-    "send-0.0.3" = {
-      name = "send";
-      packageName = "send";
-      version = "0.0.3";
+    "formidable-1.1.1" = {
+      name = "formidable";
+      packageName = "formidable";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.0.3.tgz";
-        sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184";
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz";
+        sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
       };
     };
-    "events.node-0.4.9" = {
-      name = "events.node";
-      packageName = "events.node";
-      version = "0.4.9";
+    "http-signature-0.11.0" = {
+      name = "http-signature";
+      packageName = "http-signature";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
-        sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
+        sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
       };
     };
-    "express-5.0.0-alpha.5" = {
-      name = "express";
-      packageName = "express";
-      version = "5.0.0-alpha.5";
+    "keep-alive-agent-0.0.1" = {
+      name = "keep-alive-agent";
+      packageName = "keep-alive-agent";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.5.tgz";
-        sha1 = "e37423a8d82826fb915c7dd166e2900bfa3552e6";
+        url = "https://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
+        sha1 = "44847ca394ce8d6b521ae85816bd64509942b385";
       };
     };
-    "express-json5-0.1.0" = {
-      name = "express-json5";
-      packageName = "express-json5";
-      version = "0.1.0";
+    "qs-3.1.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz";
-        sha1 = "114a514bd734b319e018a1bde337923cc455b836";
+        url = "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
+        sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c";
       };
     };
-    "es6-shim-0.21.1" = {
-      name = "es6-shim";
-      packageName = "es6-shim";
-      version = "0.21.1";
+    "spdy-1.32.5" = {
+      name = "spdy";
+      packageName = "spdy";
+      version = "1.32.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz";
-        sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2";
+        url = "https://registry.npmjs.org/spdy/-/spdy-1.32.5.tgz";
+        sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb";
       };
     };
-    "handlebars-2.0.0" = {
-      name = "handlebars";
-      packageName = "handlebars";
-      version = "2.0.0";
+    "vasync-1.6.3" = {
+      name = "vasync";
+      packageName = "vasync";
+      version = "1.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
-        sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f";
+        url = "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz";
+        sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94";
       };
     };
-    "highlight.js-8.9.1" = {
-      name = "highlight.js";
-      packageName = "highlight.js";
-      version = "8.9.1";
+    "dtrace-provider-0.6.0" = {
+      name = "dtrace-provider";
+      packageName = "dtrace-provider";
+      version = "0.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz";
-        sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz";
+        sha1 = "0b078d5517937d873101452d9146737557b75e51";
       };
     };
-    "lunr-0.7.2" = {
-      name = "lunr";
-      packageName = "lunr";
-      version = "0.7.2";
+    "precond-0.2.3" = {
+      name = "precond";
+      packageName = "precond";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lunr/-/lunr-0.7.2.tgz";
-        sha1 = "79a30e932e216cba163541ee37a3607c12cd7281";
+        url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz";
+        sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac";
       };
     };
-    "render-readme-1.3.1" = {
-      name = "render-readme";
-      packageName = "render-readme";
-      version = "1.3.1";
+    "csv-generate-0.0.6" = {
+      name = "csv-generate";
+      packageName = "csv-generate";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/render-readme/-/render-readme-1.3.1.tgz";
-        sha1 = "d2a98f9a87dd64fa73c6877ac5c45b0f6341a797";
+        url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz";
+        sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
       };
     };
-    "sinopia-htpasswd-0.4.5" = {
-      name = "sinopia-htpasswd";
-      packageName = "sinopia-htpasswd";
-      version = "0.4.5";
+    "csv-parse-1.2.0" = {
+      name = "csv-parse";
+      packageName = "csv-parse";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz";
-        sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9";
+        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz";
+        sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425";
       };
     };
-    "fs-ext-0.6.0" = {
-      name = "fs-ext";
-      packageName = "fs-ext";
-      version = "0.6.0";
+    "stream-transform-0.1.2" = {
+      name = "stream-transform";
+      packageName = "stream-transform";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz";
-        sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66";
+        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz";
+        sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f";
       };
     };
-    "crypt3-0.2.0" = {
-      name = "crypt3";
-      packageName = "crypt3";
-      version = "0.2.0";
+    "csv-stringify-0.0.8" = {
+      name = "csv-stringify";
+      packageName = "csv-stringify";
+      version = "0.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crypt3/-/crypt3-0.2.0.tgz";
-        sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332";
+        url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz";
+        sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b";
       };
     };
-    "router-1.3.0" = {
-      name = "router";
-      packageName = "router";
-      version = "1.3.0";
+    "ctype-0.5.3" = {
+      name = "ctype";
+      packageName = "ctype";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/router/-/router-1.3.0.tgz";
-        sha1 = "15b24075c1de4a3d3f39808c5d7344a1564417c8";
+        url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+        sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
       };
     };
-    "raw-body-1.3.4" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "1.3.4";
+    "verror-1.6.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz";
-        sha1 = "ccc7ddfc46b72861cdd5bb433c840b70b6f27f54";
+        url = "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz";
+        sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
       };
     };
-    "bytes-1.0.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "1.0.0";
+    "extsprintf-1.2.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
-        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz";
+        sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529";
       };
     };
-    "iconv-lite-0.4.8" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.8";
+    "assert-plus-0.1.2" = {
+      name = "assert-plus";
+      packageName = "assert-plus";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
-        sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
+        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
+        sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
       };
     };
-    "uglify-js-2.3.6" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.3.6";
+    "clone-0.1.5" = {
+      name = "clone";
+      packageName = "clone";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
-        sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
+        url = "https://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
+        sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042";
       };
     };
-    "markdown-it-4.4.0" = {
-      name = "markdown-it";
-      packageName = "markdown-it";
-      version = "4.4.0";
+    "dashdash-1.10.1" = {
+      name = "dashdash";
+      packageName = "dashdash";
+      version = "1.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz";
-        sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
+        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz";
+        sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60";
       };
     };
-    "sanitize-html-1.14.1" = {
-      name = "sanitize-html";
-      packageName = "sanitize-html";
-      version = "1.14.1";
+    "once-1.3.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz";
-        sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8";
+        url = "https://registry.npmjs.org/once/-/once-1.3.0.tgz";
+        sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581";
       };
     };
-    "linkify-it-1.2.4" = {
-      name = "linkify-it";
-      packageName = "linkify-it";
-      version = "1.2.4";
+    "sshpk-agent-1.2.1" = {
+      name = "sshpk-agent";
+      packageName = "sshpk-agent";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.4.tgz";
-        sha1 = "0773526c317c8fd13bd534ee1d180ff88abf881a";
+        url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.2.1.tgz";
+        sha1 = "62e143c18530fda103320b3403e8ad42786d9718";
       };
     };
-    "mdurl-1.0.1" = {
-      name = "mdurl";
-      packageName = "mdurl";
-      version = "1.0.1";
+    "sshpk-1.7.1" = {
+      name = "sshpk";
+      packageName = "sshpk";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz";
-        sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz";
+        sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c";
       };
     };
-    "uc.micro-1.0.3" = {
-      name = "uc.micro";
-      packageName = "uc.micro";
-      version = "1.0.3";
+    "vasync-1.4.3" = {
+      name = "vasync";
+      packageName = "vasync";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz";
-        sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192";
+        url = "https://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz";
+        sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37";
       };
     };
-    "regexp-quote-0.0.0" = {
-      name = "regexp-quote";
-      packageName = "regexp-quote";
-      version = "0.0.0";
+    "jsprim-0.3.0" = {
+      name = "jsprim";
+      packageName = "jsprim";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz";
-        sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
+        url = "https://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
+        sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1";
       };
     };
-    "domutils-1.6.0" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.6.0";
+    "verror-1.1.0" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.6.0.tgz";
-        sha1 = "853de07f013287f976b7fe0461740222ea14ecbb";
+        url = "https://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
+        sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0";
       };
     };
-    "async-2.1.5" = {
-      name = "async";
-      packageName = "async";
-      version = "2.1.5";
+    "extsprintf-1.0.0" = {
+      name = "extsprintf";
+      packageName = "extsprintf";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
-        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
+        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
+        sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86";
       };
     };
-    "assert-plus-0.1.5" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.1.5";
+    "json-schema-0.2.2" = {
+      name = "json-schema";
+      packageName = "json-schema";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
-        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
+        sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
       };
     };
-    "lru-cache-2.2.0" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "2.2.0";
+    "verror-1.3.3" = {
+      name = "verror";
+      packageName = "verror";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
-        sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
+        url = "https://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
+        sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd";
       };
     };
-    "nopt-2.0.0" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "2.0.0";
+    "css-parse-1.7.0" = {
+      name = "css-parse";
+      packageName = "css-parse";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
-        sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
+        url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
+        sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
       };
     };
-    "restify-4.0.3" = {
-      name = "restify";
-      packageName = "restify";
-      version = "4.0.3";
+    "coa-1.0.2" = {
+      name = "coa";
+      packageName = "coa";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz";
-        sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc";
+        url = "https://registry.npmjs.org/coa/-/coa-1.0.2.tgz";
+        sha1 = "2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec";
       };
     };
-    "bunyan-1.5.1" = {
-      name = "bunyan";
-      packageName = "bunyan";
-      version = "1.5.1";
+    "whet.extend-0.9.9" = {
+      name = "whet.extend";
+      packageName = "whet.extend";
+      version = "0.9.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz";
-        sha1 = "5f6e7d44c43b952f56b0f41309e3ab12391b4e2d";
+        url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz";
+        sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1";
       };
     };
-    "clone-0.1.6" = {
-      name = "clone";
-      packageName = "clone";
-      version = "0.1.6";
+    "csso-2.3.2" = {
+      name = "csso";
+      packageName = "csso";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
-        sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000";
+        url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz";
+        sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85";
       };
     };
-    "smartdc-auth-2.3.1" = {
-      name = "smartdc-auth";
-      packageName = "smartdc-auth";
-      version = "2.3.1";
+    "clap-1.1.3" = {
+      name = "clap";
+      packageName = "clap";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.3.1.tgz";
-        sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44";
+        url = "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz";
+        sha1 = "b3bd36e93dd4cbfb395a3c26896352445265c05b";
       };
     };
-    "cmdln-3.2.1" = {
-      name = "cmdln";
-      packageName = "cmdln";
-      version = "3.2.1";
+    "enhanced-resolve-2.3.0" = {
+      name = "enhanced-resolve";
+      packageName = "enhanced-resolve";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cmdln/-/cmdln-3.2.1.tgz";
-        sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz";
+        sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359";
       };
     };
-    "dashdash-1.7.3" = {
-      name = "dashdash";
-      packageName = "dashdash";
-      version = "1.7.3";
+    "resolve-from-2.0.0" = {
+      name = "resolve-from";
+      packageName = "resolve-from";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.7.3.tgz";
-        sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf";
+        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz";
+        sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57";
       };
     };
-    "vasync-1.6.2" = {
-      name = "vasync";
-      packageName = "vasync";
-      version = "1.6.2";
+    "tapable-0.2.6" = {
+      name = "tapable";
+      packageName = "tapable";
+      version = "0.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vasync/-/vasync-1.6.2.tgz";
-        sha1 = "568edcf40b2b5c35b1cc048cad085de4739703fb";
+        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz";
+        sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d";
       };
     };
-    "backoff-2.5.0" = {
-      name = "backoff";
-      packageName = "backoff";
-      version = "2.5.0";
+    "memory-fs-0.3.0" = {
+      name = "memory-fs";
+      packageName = "memory-fs";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz";
-        sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
+        sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
       };
     };
-    "csv-0.4.6" = {
-      name = "csv";
-      packageName = "csv";
-      version = "0.4.6";
+    "blueimp-md5-2.7.0" = {
+      name = "blueimp-md5";
+      packageName = "blueimp-md5";
+      version = "2.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz";
-        sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d";
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.7.0.tgz";
+        sha1 = "7f518e0dd70467fefe28ecba398916092f2a02a9";
       };
     };
-    "escape-regexp-component-1.0.2" = {
-      name = "escape-regexp-component";
-      packageName = "escape-regexp-component";
-      version = "1.0.2";
+    "color-1.0.3" = {
+      name = "color";
+      packageName = "color";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz";
-        sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
+        url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz";
+        sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d";
       };
     };
-    "formidable-1.1.1" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.1.1";
+    "crossroads-0.12.2" = {
+      name = "crossroads";
+      packageName = "crossroads";
+      version = "0.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz";
-        sha1 = "96b8886f7c3c3508b932d6bd70c4d3a88f35f1a9";
+        url = "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz";
+        sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
       };
     };
-    "http-signature-0.11.0" = {
-      name = "http-signature";
-      packageName = "http-signature";
-      version = "0.11.0";
+    "diff2html-2.3.0" = {
+      name = "diff2html";
+      packageName = "diff2html";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
-        sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.0.tgz";
+        sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580";
       };
     };
-    "keep-alive-agent-0.0.1" = {
-      name = "keep-alive-agent";
-      packageName = "keep-alive-agent";
-      version = "0.0.1";
+    "express-session-1.15.3" = {
+      name = "express-session";
+      packageName = "express-session";
+      version = "1.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
-        sha1 = "44847ca394ce8d6b521ae85816bd64509942b385";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.3.tgz";
+        sha1 = "db545f0435a7b1b228ae02da8197f65141735c67";
       };
     };
-    "qs-3.1.0" = {
-      name = "qs";
-      packageName = "qs";
-      version = "3.1.0";
+    "forever-monitor-1.1.0" = {
+      name = "forever-monitor";
+      packageName = "forever-monitor";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
-        sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c";
+        url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
+        sha1 = "439ce036f999601cff551aea7f5151001a869ef9";
       };
     };
-    "spdy-1.32.5" = {
-      name = "spdy";
-      packageName = "spdy";
-      version = "1.32.5";
+    "getmac-1.2.1" = {
+      name = "getmac";
+      packageName = "getmac";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdy/-/spdy-1.32.5.tgz";
-        sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb";
+        url = "https://registry.npmjs.org/getmac/-/getmac-1.2.1.tgz";
+        sha1 = "0d095fd0627850043eac1dcfa0b120bbdc1426d1";
       };
     };
-    "vasync-1.6.3" = {
-      name = "vasync";
-      packageName = "vasync";
-      version = "1.6.3";
+    "hasher-1.2.0" = {
+      name = "hasher";
+      packageName = "hasher";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz";
-        sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94";
+        url = "https://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz";
+        sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73";
       };
     };
-    "dtrace-provider-0.6.0" = {
-      name = "dtrace-provider";
-      packageName = "dtrace-provider";
-      version = "0.6.0";
+    "ignore-3.2.7" = {
+      name = "ignore";
+      packageName = "ignore";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz";
-        sha1 = "0b078d5517937d873101452d9146737557b75e51";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz";
+        sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd";
       };
     };
-    "precond-0.2.3" = {
-      name = "precond";
-      packageName = "precond";
-      version = "0.2.3";
+    "just-detect-adblock-1.0.0" = {
+      name = "just-detect-adblock";
+      packageName = "just-detect-adblock";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz";
-        sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac";
+        url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.0.0.tgz";
+        sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c";
       };
     };
-    "csv-generate-0.0.6" = {
-      name = "csv-generate";
-      packageName = "csv-generate";
-      version = "0.0.6";
+    "keen.io-0.1.3" = {
+      name = "keen.io";
+      packageName = "keen.io";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz";
-        sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
+        url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz";
+        sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
       };
     };
-    "csv-parse-1.2.0" = {
-      name = "csv-parse";
-      packageName = "csv-parse";
-      version = "1.2.0";
+    "knockout-3.4.2" = {
+      name = "knockout";
+      packageName = "knockout";
+      version = "3.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz";
-        sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425";
+        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz";
+        sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937";
       };
     };
-    "stream-transform-0.1.2" = {
-      name = "stream-transform";
-      packageName = "stream-transform";
-      version = "0.1.2";
+    "node-cache-4.1.1" = {
+      name = "node-cache";
+      packageName = "node-cache";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz";
-        sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f";
+        url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz";
+        sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44";
       };
     };
-    "csv-stringify-0.0.8" = {
-      name = "csv-stringify";
-      packageName = "csv-stringify";
-      version = "0.0.8";
+    "npm-4.6.1" = {
+      name = "npm";
+      packageName = "npm";
+      version = "4.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz";
-        sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b";
+        url = "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz";
+        sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
       };
     };
-    "ctype-0.5.3" = {
-      name = "ctype";
-      packageName = "ctype";
-      version = "0.5.3";
+    "npm-registry-client-8.3.0" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "8.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
-        sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz";
+        sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f";
       };
     };
-    "verror-1.6.0" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.6.0";
+    "octicons-3.5.0" = {
+      name = "octicons";
+      packageName = "octicons";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz";
-        sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
+        url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz";
+        sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30";
       };
     };
-    "extsprintf-1.2.0" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.2.0";
+    "passport-local-1.0.0" = {
+      name = "passport-local";
+      packageName = "passport-local";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz";
-        sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529";
+        url = "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
+        sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "assert-plus-0.1.2" = {
-      name = "assert-plus";
-      packageName = "assert-plus";
-      version = "0.1.2";
+    "raven-1.2.1" = {
+      name = "raven";
+      packageName = "raven";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
-        sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
+        url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz";
+        sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd";
       };
     };
-    "clone-0.1.5" = {
-      name = "clone";
-      packageName = "clone";
-      version = "0.1.5";
+    "signals-1.0.0" = {
+      name = "signals";
+      packageName = "signals";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
-        sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042";
+        url = "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz";
+        sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69";
       };
     };
-    "dashdash-1.10.1" = {
-      name = "dashdash";
-      packageName = "dashdash";
-      version = "1.10.1";
+    "snapsvg-0.5.1" = {
+      name = "snapsvg";
+      packageName = "snapsvg";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz";
-        sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60";
+        url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz";
+        sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3";
       };
     };
-    "once-1.3.0" = {
-      name = "once";
-      packageName = "once";
-      version = "1.3.0";
+    "winston-2.3.1" = {
+      name = "winston";
+      packageName = "winston";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/once/-/once-1.3.0.tgz";
-        sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581";
+        url = "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz";
+        sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "sshpk-agent-1.2.1" = {
-      name = "sshpk-agent";
-      packageName = "sshpk-agent";
-      version = "1.2.1";
+    "yargs-8.0.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "8.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.2.1.tgz";
-        sha1 = "62e143c18530fda103320b3403e8ad42786d9718";
+        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.1.tgz";
+        sha1 = "420ef75e840c1457a80adcca9bc6fa3849de51aa";
       };
     };
-    "sshpk-1.7.1" = {
-      name = "sshpk";
-      packageName = "sshpk";
-      version = "1.7.1";
+    "color-string-1.5.2" = {
+      name = "color-string";
+      packageName = "color-string";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz";
-        sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz";
+        sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9";
       };
     };
-    "vasync-1.4.3" = {
-      name = "vasync";
-      packageName = "vasync";
-      version = "1.4.3";
+    "simple-swizzle-0.2.2" = {
+      name = "simple-swizzle";
+      packageName = "simple-swizzle";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz";
-        sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37";
+        url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
+        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
       };
     };
-    "jsprim-0.3.0" = {
-      name = "jsprim";
-      packageName = "jsprim";
-      version = "0.3.0";
+    "is-arrayish-0.3.1" = {
+      name = "is-arrayish";
+      packageName = "is-arrayish";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
-        sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1";
+        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz";
+        sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
       };
     };
-    "verror-1.1.0" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.1.0";
+    "hogan.js-3.0.2" = {
+      name = "hogan.js";
+      packageName = "hogan.js";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
-        sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0";
+        url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz";
+        sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "extsprintf-1.0.0" = {
-      name = "extsprintf";
-      packageName = "extsprintf";
-      version = "1.0.0";
+    "whatwg-fetch-2.0.3" = {
+      name = "whatwg-fetch";
+      packageName = "whatwg-fetch";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
-        sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86";
+        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz";
+        sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84";
       };
     };
-    "json-schema-0.2.2" = {
-      name = "json-schema";
-      packageName = "json-schema";
-      version = "0.2.2";
+    "crc-3.4.4" = {
+      name = "crc";
+      packageName = "crc";
+      version = "3.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
-        sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
+        url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz";
+        sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
       };
     };
-    "verror-1.3.3" = {
-      name = "verror";
-      packageName = "verror";
-      version = "1.3.3";
+    "broadway-0.2.10" = {
+      name = "broadway";
+      packageName = "broadway";
+      version = "0.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
-        sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd";
+        url = "https://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz";
+        sha1 = "0f58532be140426e9000e49a93e242a0d1263238";
       };
     };
-    "css-parse-1.7.0" = {
-      name = "css-parse";
-      packageName = "css-parse";
-      version = "1.7.0";
+    "minimatch-0.0.5" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "0.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
-        sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
+        sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de";
       };
     };
-    "coa-1.0.1" = {
-      name = "coa";
-      packageName = "coa";
-      version = "1.0.1";
+    "watch-0.5.1" = {
+      name = "watch";
+      packageName = "watch";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coa/-/coa-1.0.1.tgz";
-        sha1 = "7f959346cfc8719e3f7233cd6852854a7c67d8a3";
+        url = "https://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
+        sha1 = "50ea3a056358c98073e0bca59956de4afd20b213";
       };
     };
-    "whet.extend-0.9.9" = {
-      name = "whet.extend";
-      packageName = "whet.extend";
-      version = "0.9.9";
+    "utile-0.1.7" = {
+      name = "utile";
+      packageName = "utile";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz";
-        sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1";
+        url = "https://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
+        sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
       };
     };
-    "csso-2.3.2" = {
-      name = "csso";
-      packageName = "csso";
-      version = "2.3.2";
+    "cliff-0.1.8" = {
+      name = "cliff";
+      packageName = "cliff";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz";
-        sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85";
+        url = "https://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
+        sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272";
       };
     };
-    "clap-1.1.3" = {
-      name = "clap";
-      packageName = "clap";
-      version = "1.1.3";
+    "winston-0.7.2" = {
+      name = "winston";
+      packageName = "winston";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz";
-        sha1 = "b3bd36e93dd4cbfb395a3c26896352445265c05b";
+        url = "https://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
+        sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
       };
     };
-    "enhanced-resolve-2.3.0" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "2.3.0";
+    "lru-cache-1.0.6" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz";
-        sha1 = "a115c32504b6302e85a76269d7a57ccdd962e359";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
+        sha1 = "aa50f97047422ac72543bda177a9c9d018d98452";
       };
     };
-    "resolve-from-2.0.0" = {
-      name = "resolve-from";
-      packageName = "resolve-from";
-      version = "2.0.0";
+    "ncp-0.2.7" = {
+      name = "ncp";
+      packageName = "ncp";
+      version = "0.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz";
-        sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57";
+        url = "https://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
+        sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1";
       };
     };
-    "tapable-0.2.6" = {
-      name = "tapable";
-      packageName = "tapable";
-      version = "0.2.6";
+    "rimraf-1.0.9" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "1.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.6.tgz";
-        sha1 = "206be8e188860b514425375e6f1ae89bfb01fd8d";
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
+        sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1";
       };
     };
-    "memory-fs-0.3.0" = {
-      name = "memory-fs";
-      packageName = "memory-fs";
-      version = "0.3.0";
+    "extract-opts-3.3.1" = {
+      name = "extract-opts";
+      packageName = "extract-opts";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
-        sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
+        url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz";
+        sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1";
       };
     };
-    "blueimp-md5-2.7.0" = {
-      name = "blueimp-md5";
-      packageName = "blueimp-md5";
-      version = "2.7.0";
+    "eachr-3.2.0" = {
+      name = "eachr";
+      packageName = "eachr";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.7.0.tgz";
-        sha1 = "7f518e0dd70467fefe28ecba398916092f2a02a9";
+        url = "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz";
+        sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484";
       };
     };
-    "color-1.0.3" = {
-      name = "color";
-      packageName = "color";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-1.0.3.tgz";
-        sha1 = "e48e832d85f14ef694fb468811c2d5cfe729b55d";
+    "editions-1.3.3" = {
+      name = "editions";
+      packageName = "editions";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz";
+        sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b";
       };
     };
-    "crossroads-0.12.2" = {
-      name = "crossroads";
-      packageName = "crossroads";
-      version = "0.12.2";
+    "typechecker-4.4.1" = {
+      name = "typechecker";
+      packageName = "typechecker";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz";
-        sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
+        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz";
+        sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6";
       };
     };
-    "diff2html-2.3.0" = {
-      name = "diff2html";
-      packageName = "diff2html";
-      version = "2.3.0";
+    "underscore-1.5.2" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.0.tgz";
-        sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
+        sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "express-session-1.15.2" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.15.2";
+    "ssri-4.1.3" = {
+      name = "ssri";
+      packageName = "ssri";
+      version = "4.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz";
-        sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4";
+        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.3.tgz";
+        sha1 = "ec8b5585cbfc726a5f9aad829efce238de831935";
       };
     };
-    "forever-monitor-1.1.0" = {
-      name = "forever-monitor";
-      packageName = "forever-monitor";
-      version = "1.1.0";
+    "lsmod-1.0.0" = {
+      name = "lsmod";
+      packageName = "lsmod";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
-        sha1 = "439ce036f999601cff551aea7f5151001a869ef9";
+        url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz";
+        sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
       };
     };
-    "getmac-1.2.1" = {
-      name = "getmac";
-      packageName = "getmac";
-      version = "1.2.1";
+    "uuid-3.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getmac/-/getmac-1.2.1.tgz";
-        sha1 = "0d095fd0627850043eac1dcfa0b120bbdc1426d1";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
+        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
       };
     };
-    "hasher-1.2.0" = {
-      name = "hasher";
-      packageName = "hasher";
-      version = "1.2.0";
+    "stack-trace-0.0.9" = {
+      name = "stack-trace";
+      packageName = "stack-trace";
+      version = "0.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz";
-        sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73";
+        url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
       };
     };
-    "ignore-3.2.7" = {
-      name = "ignore";
-      packageName = "ignore";
-      version = "3.2.7";
+    "eve-0.5.4" = {
+      name = "eve";
+      packageName = "eve";
+      version = "0.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz";
-        sha1 = "4810ca5f1d8eca5595213a34b94f2eb4ed926bbd";
+        url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz";
+        sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa";
       };
     };
-    "just-detect-adblock-1.0.0" = {
-      name = "just-detect-adblock";
-      packageName = "just-detect-adblock";
-      version = "1.0.0";
+    "os-locale-2.0.0" = {
+      name = "os-locale";
+      packageName = "os-locale";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.0.0.tgz";
-        sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c";
+        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz";
+        sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4";
       };
     };
-    "keen.io-0.1.3" = {
-      name = "keen.io";
-      packageName = "keen.io";
-      version = "0.1.3";
+    "read-pkg-up-2.0.0" = {
+      name = "read-pkg-up";
+      packageName = "read-pkg-up";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz";
-        sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
+        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
+        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
       };
     };
-    "knockout-3.4.2" = {
-      name = "knockout";
-      packageName = "knockout";
-      version = "3.4.2";
+    "which-module-2.0.0" = {
+      name = "which-module";
+      packageName = "which-module";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz";
-        sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937";
+        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
       };
     };
-    "node-cache-4.1.1" = {
-      name = "node-cache";
-      packageName = "node-cache";
-      version = "4.1.1";
+    "yargs-parser-7.0.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz";
-        sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
+        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
       };
     };
-    "npm-4.6.1" = {
-      name = "npm";
-      packageName = "npm";
-      version = "4.6.1";
+    "read-pkg-2.0.0" = {
+      name = "read-pkg";
+      packageName = "read-pkg";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz";
-        sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
+        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
+        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
       };
     };
-    "npm-registry-client-8.3.0" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.3.0";
+    "load-json-file-2.0.0" = {
+      name = "load-json-file";
+      packageName = "load-json-file";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz";
-        sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f";
+        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
+        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
       };
     };
-    "octicons-3.5.0" = {
-      name = "octicons";
-      packageName = "octicons";
-      version = "3.5.0";
+    "path-type-2.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz";
-        sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30";
+        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
+        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
       };
     };
-    "passport-local-1.0.0" = {
-      name = "passport-local";
-      packageName = "passport-local";
-      version = "1.0.0";
+    "adm-zip-0.4.7" = {
+      name = "adm-zip";
+      packageName = "adm-zip";
+      version = "0.4.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
-        sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
+        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
+        sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
-    "raven-1.2.1" = {
-      name = "raven";
-      packageName = "raven";
-      version = "1.2.1";
+    "kew-0.1.7" = {
+      name = "kew";
+      packageName = "kew";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.2.1.tgz";
-        sha1 = "949c134db028a190b7bbf8f790aae541b7c020bd";
+        url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
+        sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
       };
     };
-    "serve-static-1.12.2" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.12.2";
+    "npmconf-0.1.16" = {
+      name = "npmconf";
+      packageName = "npmconf";
+      version = "0.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.2.tgz";
-        sha1 = "e546e2726081b81b4bcec8e90808ebcdd323afba";
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
+        sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a";
       };
     };
-    "signals-1.0.0" = {
-      name = "signals";
-      packageName = "signals";
-      version = "1.0.0";
+    "phantomjs-1.9.20" = {
+      name = "phantomjs";
+      packageName = "phantomjs";
+      version = "1.9.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz";
-        sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69";
+        url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.20.tgz";
+        sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
       };
     };
-    "snapsvg-0.5.1" = {
-      name = "snapsvg";
-      packageName = "snapsvg";
-      version = "0.5.1";
+    "follow-redirects-0.0.3" = {
+      name = "follow-redirects";
+      packageName = "follow-redirects";
+      version = "0.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.5.1.tgz";
-        sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
+        sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
-    "winston-2.3.1" = {
-      name = "winston";
-      packageName = "winston";
-      version = "2.3.1";
+    "acorn-dynamic-import-2.0.2" = {
+      name = "acorn-dynamic-import";
+      packageName = "acorn-dynamic-import";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.3.1.tgz";
-        sha1 = "0b48420d978c01804cf0230b648861598225a119";
+        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz";
+        sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4";
       };
     };
-    "yargs-8.0.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "8.0.1";
+    "enhanced-resolve-3.1.0" = {
+      name = "enhanced-resolve";
+      packageName = "enhanced-resolve";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.1.tgz";
-        sha1 = "420ef75e840c1457a80adcca9bc6fa3849de51aa";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz";
+        sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec";
       };
     };
-    "color-string-1.5.2" = {
-      name = "color-string";
-      packageName = "color-string";
-      version = "1.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz";
-        sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9";
+    "json-loader-0.5.4" = {
+      name = "json-loader";
+      packageName = "json-loader";
+      version = "0.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz";
+        sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de";
       };
     };
-    "simple-swizzle-0.2.2" = {
-      name = "simple-swizzle";
-      packageName = "simple-swizzle";
-      version = "0.2.2";
+    "loader-runner-2.3.0" = {
+      name = "loader-runner";
+      packageName = "loader-runner";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz";
-        sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a";
+        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz";
+        sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2";
       };
     };
-    "is-arrayish-0.3.1" = {
-      name = "is-arrayish";
-      packageName = "is-arrayish";
-      version = "0.3.1";
+    "loader-utils-0.2.17" = {
+      name = "loader-utils";
+      packageName = "loader-utils";
+      version = "0.2.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.1.tgz";
-        sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd";
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz";
+        sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348";
       };
     };
-    "hogan.js-3.0.2" = {
-      name = "hogan.js";
-      packageName = "hogan.js";
-      version = "3.0.2";
+    "memory-fs-0.4.1" = {
+      name = "memory-fs";
+      packageName = "memory-fs";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz";
-        sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz";
+        sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
       };
     };
-    "whatwg-fetch-2.0.3" = {
-      name = "whatwg-fetch";
-      packageName = "whatwg-fetch";
-      version = "2.0.3";
+    "node-libs-browser-2.0.0" = {
+      name = "node-libs-browser";
+      packageName = "node-libs-browser";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz";
-        sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84";
+        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz";
+        sha1 = "a3a59ec97024985b46e958379646f96c4b616646";
       };
     };
-    "crc-3.4.4" = {
-      name = "crc";
-      packageName = "crc";
-      version = "3.4.4";
+    "watchpack-1.3.1" = {
+      name = "watchpack";
+      packageName = "watchpack";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz";
-        sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz";
+        sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87";
       };
     };
-    "broadway-0.2.10" = {
-      name = "broadway";
-      packageName = "broadway";
-      version = "0.2.10";
+    "webpack-sources-0.2.3" = {
+      name = "webpack-sources";
+      packageName = "webpack-sources";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz";
-        sha1 = "0f58532be140426e9000e49a93e242a0d1263238";
+        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz";
+        sha1 = "17c62bfaf13c707f9d02c479e0dcdde8380697fb";
       };
     };
-    "minimatch-0.0.5" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "0.0.5";
+    "big.js-3.1.3" = {
+      name = "big.js";
+      packageName = "big.js";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
-        sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de";
+        url = "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz";
+        sha1 = "4cada2193652eb3ca9ec8e55c9015669c9806978";
       };
     };
-    "watch-0.5.1" = {
-      name = "watch";
-      packageName = "watch";
-      version = "0.5.1";
+    "emojis-list-2.1.0" = {
+      name = "emojis-list";
+      packageName = "emojis-list";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
-        sha1 = "50ea3a056358c98073e0bca59956de4afd20b213";
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
+        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
-    "utile-0.1.7" = {
-      name = "utile";
-      packageName = "utile";
-      version = "0.1.7";
+    "os-browserify-0.2.1" = {
+      name = "os-browserify";
+      packageName = "os-browserify";
+      version = "0.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
-        sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
+        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
+        sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
       };
     };
-    "cliff-0.1.8" = {
-      name = "cliff";
-      packageName = "cliff";
-      version = "0.1.8";
+    "timers-browserify-2.0.2" = {
+      name = "timers-browserify";
+      packageName = "timers-browserify";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
-        sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz";
+        sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
       };
     };
-    "winston-0.7.2" = {
-      name = "winston";
-      packageName = "winston";
-      version = "0.7.2";
+    "setimmediate-1.0.5" = {
+      name = "setimmediate";
+      packageName = "setimmediate";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
-        sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
+        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
+        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
       };
     };
-    "lru-cache-1.0.6" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "1.0.6";
+    "source-list-map-1.1.2" = {
+      name = "source-list-map";
+      packageName = "source-list-map";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
-        sha1 = "aa50f97047422ac72543bda177a9c9d018d98452";
+        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz";
+        sha1 = "9889019d1024cce55cdc069498337ef6186a11a1";
       };
     };
-    "ncp-0.2.7" = {
-      name = "ncp";
-      packageName = "ncp";
-      version = "0.2.7";
+    "bytes-2.5.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
-        sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1";
+        url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz";
+        sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a";
       };
     };
-    "rimraf-1.0.9" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "1.0.9";
+    "death-1.1.0" = {
+      name = "death";
+      packageName = "death";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
-        sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1";
+        url = "https://registry.npmjs.org/death/-/death-1.1.0.tgz";
+        sha1 = "01aa9c401edd92750514470b8266390c66c67318";
       };
     };
-    "extract-opts-3.3.1" = {
-      name = "extract-opts";
-      packageName = "extract-opts";
-      version = "3.3.1";
+    "detect-indent-5.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz";
-        sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1";
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
+        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
       };
     };
-    "eachr-3.2.0" = {
-      name = "eachr";
-      packageName = "eachr";
-      version = "3.2.0";
+    "gunzip-maybe-1.4.0" = {
+      name = "gunzip-maybe";
+      packageName = "gunzip-maybe";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz";
-        sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484";
+        url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.0.tgz";
+        sha1 = "7d8316c8d0571e1d08a5a79e46fff0afe8172b19";
       };
     };
-    "editions-1.3.3" = {
-      name = "editions";
-      packageName = "editions";
-      version = "1.3.3";
+    "inquirer-3.0.6" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz";
-        sha1 = "0907101bdda20fac3cbe334c27cbd0688dc99a5b";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz";
+        sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347";
       };
     };
-    "typechecker-4.4.1" = {
-      name = "typechecker";
-      packageName = "typechecker";
-      version = "4.4.1";
+    "is-ci-1.0.10" = {
+      name = "is-ci";
+      packageName = "is-ci";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz";
-        sha1 = "f97b95f51b038417212d677d45a373ee7bced7e6";
+        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz";
+        sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
       };
     };
-    "underscore-1.5.2" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.5.2";
+    "node-emoji-1.5.1" = {
+      name = "node-emoji";
+      packageName = "node-emoji";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
-        sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
+        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz";
+        sha1 = "fd918e412769bf8c448051238233840b2aff16a1";
       };
     };
-    "ssri-4.1.2" = {
-      name = "ssri";
-      packageName = "ssri";
-      version = "4.1.2";
+    "object-path-0.11.4" = {
+      name = "object-path";
+      packageName = "object-path";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.2.tgz";
-        sha1 = "3d3c69b490d0b107772a9bf81881f38ae071f24b";
+        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz";
+        sha1 = "370ae752fbf37de3ea70a861c23bba8915691949";
       };
     };
-    "lsmod-1.0.0" = {
-      name = "lsmod";
-      packageName = "lsmod";
-      version = "1.0.0";
+    "proper-lockfile-2.0.1" = {
+      name = "proper-lockfile";
+      packageName = "proper-lockfile";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz";
-        sha1 = "9a00f76dca36eb23fa05350afe1b585d4299e64b";
+        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz";
+        sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d";
       };
     };
-    "uuid-3.0.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz";
-        sha1 = "6728fc0459c450d796a99c31837569bdf672d728";
-      };
-    };
-    "send-0.15.2" = {
-      name = "send";
-      packageName = "send";
-      version = "0.15.2";
+    "request-capture-har-1.2.2" = {
+      name = "request-capture-har";
+      packageName = "request-capture-har";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.15.2.tgz";
-        sha1 = "f91fab4403bcf87e716f70ceb5db2f578bdc17d6";
+        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz";
+        sha1 = "cd692cfb2cc744fd84a3358aac6ee51528cf720d";
       };
     };
-    "eve-0.5.4" = {
-      name = "eve";
-      packageName = "eve";
-      version = "0.5.4";
+    "tar-fs-1.15.2" = {
+      name = "tar-fs";
+      packageName = "tar-fs";
+      version = "1.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eve/-/eve-0.5.4.tgz";
-        sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa";
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz";
+        sha1 = "761f5b32932c7b39461a60d537faea0d8084830c";
       };
     };
-    "os-locale-2.0.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "2.0.0";
+    "v8-compile-cache-1.1.0" = {
+      name = "v8-compile-cache";
+      packageName = "v8-compile-cache";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz";
-        sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4";
+        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz";
+        sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9";
       };
     };
-    "read-pkg-up-2.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "2.0.0";
+    "is-deflate-1.0.0" = {
+      name = "is-deflate";
+      packageName = "is-deflate";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
+        url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz";
+        sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14";
       };
     };
-    "which-module-2.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "2.0.0";
+    "is-gzip-1.0.0" = {
+      name = "is-gzip";
+      packageName = "is-gzip";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
-        sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+        url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz";
+        sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83";
       };
     };
-    "yargs-parser-7.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "7.0.0";
+    "peek-stream-1.1.2" = {
+      name = "peek-stream";
+      packageName = "peek-stream";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
-        sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9";
+        url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.2.tgz";
+        sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52";
       };
     };
-    "find-up-2.1.0" = {
-      name = "find-up";
-      packageName = "find-up";
+    "cli-cursor-2.1.0" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
       version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
-        sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
       };
     };
-    "read-pkg-2.0.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "2.0.0";
+    "external-editor-2.0.4" = {
+      name = "external-editor";
+      packageName = "external-editor";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
-        sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8";
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz";
+        sha1 = "1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972";
       };
     };
-    "locate-path-2.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
+    "figures-2.0.0" = {
+      name = "figures";
+      packageName = "figures";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
-        sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+        url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz";
+        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
       };
     };
-    "p-locate-2.0.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
+    "restore-cursor-2.0.0" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
-        sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
       };
     };
-    "path-exists-3.0.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "3.0.0";
+    "onetime-2.0.1" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
-        sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
-    "p-limit-1.1.0" = {
-      name = "p-limit";
-      packageName = "p-limit";
-      version = "1.1.0";
+    "jschardet-1.4.2" = {
+      name = "jschardet";
+      packageName = "jschardet";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz";
-        sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc";
+        url = "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz";
+        sha1 = "2aa107f142af4121d145659d44f50830961e699a";
       };
     };
-    "load-json-file-2.0.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "2.0.0";
+    "ci-info-1.0.0" = {
+      name = "ci-info";
+      packageName = "ci-info";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
-        sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
+        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz";
+        sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
       };
     };
-    "path-type-2.0.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "2.0.0";
+    "cli-list-0.1.8" = {
+      name = "cli-list";
+      packageName = "cli-list";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
-        sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73";
+        url = "https://registry.npmjs.org/cli-list/-/cli-list-0.1.8.tgz";
+        sha1 = "aee6d45c4c59bf80068bb968089fb06f1aeddc0a";
       };
     };
-    "adm-zip-0.4.7" = {
-      name = "adm-zip";
-      packageName = "adm-zip";
-      version = "0.4.7";
+    "cross-spawn-3.0.1" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
-        sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz";
+        sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982";
       };
     };
-    "kew-0.1.7" = {
-      name = "kew";
-      packageName = "kew";
-      version = "0.1.7";
+    "fullname-2.1.0" = {
+      name = "fullname";
+      packageName = "fullname";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
-        sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
+        url = "https://registry.npmjs.org/fullname/-/fullname-2.1.0.tgz";
+        sha1 = "c46bf0f7c3f24fd5b3358d00e4a41380eef87350";
       };
     };
-    "npmconf-0.1.16" = {
-      name = "npmconf";
-      packageName = "npmconf";
-      version = "0.1.16";
+    "humanize-string-1.0.1" = {
+      name = "humanize-string";
+      packageName = "humanize-string";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
-        sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a";
+        url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.1.tgz";
+        sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42";
       };
     };
-    "phantomjs-1.9.20" = {
-      name = "phantomjs";
-      packageName = "phantomjs";
-      version = "1.9.20";
+    "inquirer-0.11.4" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.20.tgz";
-        sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz";
+        sha1 = "81e3374e8361beaff2d97016206d359d0b32fa4d";
       };
     };
-    "follow-redirects-0.0.3" = {
-      name = "follow-redirects";
-      packageName = "follow-redirects";
-      version = "0.0.3";
+    "insight-0.7.0" = {
+      name = "insight";
+      packageName = "insight";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
-        sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
+        url = "https://registry.npmjs.org/insight/-/insight-0.7.0.tgz";
+        sha1 = "061f9189835bd38a97a60c2b76ea0c6b30099ff6";
       };
     };
-    "acorn-dynamic-import-2.0.2" = {
-      name = "acorn-dynamic-import";
-      packageName = "acorn-dynamic-import";
-      version = "2.0.2";
+    "npm-keyword-4.2.0" = {
+      name = "npm-keyword";
+      packageName = "npm-keyword";
+      version = "4.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz";
-        sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4";
+        url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-4.2.0.tgz";
+        sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0";
       };
     };
-    "enhanced-resolve-3.1.0" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "3.1.0";
+    "opn-3.0.3" = {
+      name = "opn";
+      packageName = "opn";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz";
-        sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec";
+        url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz";
+        sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a";
       };
     };
-    "json-loader-0.5.4" = {
-      name = "json-loader";
-      packageName = "json-loader";
-      version = "0.5.4";
+    "parse-help-0.1.1" = {
+      name = "parse-help";
+      packageName = "parse-help";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz";
-        sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de";
+        url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz";
+        sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda";
       };
     };
-    "json5-0.5.1" = {
-      name = "json5";
-      packageName = "json5";
-      version = "0.5.1";
+    "root-check-1.0.0" = {
+      name = "root-check";
+      packageName = "root-check";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
-        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+        url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz";
+        sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697";
       };
     };
-    "loader-runner-2.3.0" = {
-      name = "loader-runner";
-      packageName = "loader-runner";
-      version = "2.3.0";
+    "sort-on-1.3.0" = {
+      name = "sort-on";
+      packageName = "sort-on";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz";
-        sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2";
+        url = "https://registry.npmjs.org/sort-on/-/sort-on-1.3.0.tgz";
+        sha1 = "0dfd5b364b23df7f2acd86985daeb889e1a7c840";
       };
     };
-    "loader-utils-0.2.17" = {
-      name = "loader-utils";
-      packageName = "loader-utils";
-      version = "0.2.17";
+    "tabtab-1.3.2" = {
+      name = "tabtab";
+      packageName = "tabtab";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz";
-        sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348";
+        url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz";
+        sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7";
       };
     };
-    "memory-fs-0.4.1" = {
-      name = "memory-fs";
-      packageName = "memory-fs";
-      version = "0.4.1";
+    "titleize-1.0.0" = {
+      name = "titleize";
+      packageName = "titleize";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz";
-        sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
+        url = "https://registry.npmjs.org/titleize/-/titleize-1.0.0.tgz";
+        sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a";
       };
     };
-    "node-libs-browser-2.0.0" = {
-      name = "node-libs-browser";
-      packageName = "node-libs-browser";
-      version = "2.0.0";
+    "yeoman-character-1.1.0" = {
+      name = "yeoman-character";
+      packageName = "yeoman-character";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz";
-        sha1 = "a3a59ec97024985b46e958379646f96c4b616646";
+        url = "https://registry.npmjs.org/yeoman-character/-/yeoman-character-1.1.0.tgz";
+        sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7";
       };
     };
-    "watchpack-1.3.1" = {
-      name = "watchpack";
-      packageName = "watchpack";
-      version = "1.3.1";
+    "yeoman-doctor-2.1.0" = {
+      name = "yeoman-doctor";
+      packageName = "yeoman-doctor";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz";
-        sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87";
+        url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz";
+        sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
       };
     };
-    "webpack-sources-0.2.3" = {
-      name = "webpack-sources";
-      packageName = "webpack-sources";
-      version = "0.2.3";
+    "yeoman-environment-1.6.6" = {
+      name = "yeoman-environment";
+      packageName = "yeoman-environment";
+      version = "1.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz";
-        sha1 = "17c62bfaf13c707f9d02c479e0dcdde8380697fb";
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-1.6.6.tgz";
+        sha1 = "cd85fa67d156060e440d7807d7ef7cf0d2d1d671";
       };
     };
-    "yargs-6.6.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "6.6.0";
+    "yosay-1.2.1" = {
+      name = "yosay";
+      packageName = "yosay";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
-        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
+        url = "https://registry.npmjs.org/yosay/-/yosay-1.2.1.tgz";
+        sha1 = "9466ef969830e85b474e267b50f7688693ed3b5b";
       };
     };
-    "big.js-3.1.3" = {
-      name = "big.js";
-      packageName = "big.js";
-      version = "3.1.3";
+    "npmconf-2.1.2" = {
+      name = "npmconf";
+      packageName = "npmconf";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz";
-        sha1 = "4cada2193652eb3ca9ec8e55c9015669c9806978";
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
+        sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
       };
     };
-    "emojis-list-2.1.0" = {
-      name = "emojis-list";
-      packageName = "emojis-list";
-      version = "2.1.0";
+    "execall-1.0.0" = {
+      name = "execall";
+      packageName = "execall";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
-        sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
+        url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz";
+        sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73";
       };
     };
-    "os-browserify-0.2.1" = {
-      name = "os-browserify";
-      packageName = "os-browserify";
-      version = "0.2.1";
+    "clone-regexp-1.0.0" = {
+      name = "clone-regexp";
+      packageName = "clone-regexp";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
-        sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
+        url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz";
+        sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c";
       };
     };
-    "timers-browserify-2.0.2" = {
-      name = "timers-browserify";
-      packageName = "timers-browserify";
-      version = "2.0.2";
+    "is-regexp-1.0.0" = {
+      name = "is-regexp";
+      packageName = "is-regexp";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.2.tgz";
-        sha1 = "ab4883cf597dcd50af211349a00fbca56ac86b86";
+        url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz";
+        sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069";
       };
     };
-    "setimmediate-1.0.5" = {
-      name = "setimmediate";
-      packageName = "setimmediate";
-      version = "1.0.5";
+    "is-supported-regexp-flag-1.0.0" = {
+      name = "is-supported-regexp-flag";
+      packageName = "is-supported-regexp-flag";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
-        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+        url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz";
+        sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8";
       };
     };
-    "source-list-map-1.1.2" = {
-      name = "source-list-map";
-      packageName = "source-list-map";
-      version = "1.1.2";
+    "downgrade-root-1.2.2" = {
+      name = "downgrade-root";
+      packageName = "downgrade-root";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz";
-        sha1 = "9889019d1024cce55cdc069498337ef6186a11a1";
+        url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz";
+        sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c";
       };
     };
-    "yargs-parser-4.2.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "4.2.1";
+    "sudo-block-1.2.0" = {
+      name = "sudo-block";
+      packageName = "sudo-block";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
-        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+        url = "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz";
+        sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463";
       };
     };
-    "babel-runtime-6.23.0" = {
-      name = "babel-runtime";
-      packageName = "babel-runtime";
-      version = "6.23.0";
+    "default-uid-1.0.0" = {
+      name = "default-uid";
+      packageName = "default-uid";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz";
-        sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b";
+        url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz";
+        sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e";
       };
     };
-    "bytes-2.5.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "2.5.0";
+    "is-root-1.0.0" = {
+      name = "is-root";
+      packageName = "is-root";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz";
-        sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a";
+        url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz";
+        sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5";
       };
     };
-    "death-1.1.0" = {
-      name = "death";
-      packageName = "death";
+    "is-docker-1.1.0" = {
+      name = "is-docker";
+      packageName = "is-docker";
       version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/death/-/death-1.1.0.tgz";
-        sha1 = "01aa9c401edd92750514470b8266390c66c67318";
+        url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz";
+        sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1";
       };
     };
-    "detect-indent-5.0.0" = {
-      name = "detect-indent";
-      packageName = "detect-indent";
-      version = "5.0.0";
+    "dot-prop-2.4.0" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
-        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz";
+        sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c";
       };
     };
-    "inquirer-3.0.6" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "3.0.6";
+    "bin-version-check-2.1.0" = {
+      name = "bin-version-check";
+      packageName = "bin-version-check";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz";
-        sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347";
+        url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz";
+        sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0";
       };
     };
-    "invariant-2.2.2" = {
-      name = "invariant";
-      packageName = "invariant";
-      version = "2.2.2";
+    "each-async-1.1.1" = {
+      name = "each-async";
+      packageName = "each-async";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz";
-        sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360";
+        url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz";
+        sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473";
       };
     };
-    "is-ci-1.0.10" = {
-      name = "is-ci";
-      packageName = "is-ci";
-      version = "1.0.10";
+    "log-symbols-1.0.2" = {
+      name = "log-symbols";
+      packageName = "log-symbols";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz";
-        sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz";
+        sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
       };
     };
-    "node-emoji-1.5.1" = {
-      name = "node-emoji";
-      packageName = "node-emoji";
-      version = "1.5.1";
+    "object-values-1.0.0" = {
+      name = "object-values";
+      packageName = "object-values";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz";
-        sha1 = "fd918e412769bf8c448051238233840b2aff16a1";
+        url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz";
+        sha1 = "72af839630119e5b98c3b02bb8c27e3237158105";
       };
     };
-    "object-path-0.11.4" = {
-      name = "object-path";
-      packageName = "object-path";
-      version = "0.11.4";
+    "twig-0.8.9" = {
+      name = "twig";
+      packageName = "twig";
+      version = "0.8.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz";
-        sha1 = "370ae752fbf37de3ea70a861c23bba8915691949";
+        url = "https://registry.npmjs.org/twig/-/twig-0.8.9.tgz";
+        sha1 = "b1594f002b684e5f029de3e54e87bec4f084b6c2";
       };
     };
-    "proper-lockfile-2.0.1" = {
-      name = "proper-lockfile";
-      packageName = "proper-lockfile";
-      version = "2.0.1";
+    "bin-version-1.0.4" = {
+      name = "bin-version";
+      packageName = "bin-version";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz";
-        sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d";
+        url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz";
+        sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e";
       };
     };
-    "request-capture-har-1.2.2" = {
-      name = "request-capture-har";
-      packageName = "request-capture-har";
-      version = "1.2.2";
+    "semver-truncate-1.1.2" = {
+      name = "semver-truncate";
+      packageName = "semver-truncate";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz";
-        sha1 = "cd692cfb2cc744fd84a3358aac6ee51528cf720d";
+        url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz";
+        sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8";
       };
     };
-    "roadrunner-1.1.0" = {
-      name = "roadrunner";
-      packageName = "roadrunner";
-      version = "1.1.0";
+    "find-versions-1.2.1" = {
+      name = "find-versions";
+      packageName = "find-versions";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz";
-        sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
+        url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz";
+        sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62";
       };
     };
-    "tar-fs-1.15.2" = {
-      name = "tar-fs";
-      packageName = "tar-fs";
-      version = "1.15.2";
+    "semver-regex-1.0.0" = {
+      name = "semver-regex";
+      packageName = "semver-regex";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz";
-        sha1 = "761f5b32932c7b39461a60d537faea0d8084830c";
+        url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz";
+        sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9";
       };
     };
-    "v8-compile-cache-1.1.0" = {
-      name = "v8-compile-cache";
-      packageName = "v8-compile-cache";
-      version = "1.1.0";
+    "diff-2.2.3" = {
+      name = "diff";
+      packageName = "diff";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-1.1.0.tgz";
-        sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9";
+        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
+        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
       };
     };
-    "regenerator-runtime-0.10.5" = {
-      name = "regenerator-runtime";
-      packageName = "regenerator-runtime";
-      version = "0.10.5";
+    "globby-4.1.0" = {
+      name = "globby";
+      packageName = "globby";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz";
-        sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658";
+        url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz";
+        sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8";
       };
     };
-    "cli-cursor-2.1.0" = {
-      name = "cli-cursor";
-      packageName = "cli-cursor";
-      version = "2.1.0";
+    "grouped-queue-0.3.3" = {
+      name = "grouped-queue";
+      packageName = "grouped-queue";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
-        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+        url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz";
+        sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c";
       };
     };
-    "external-editor-2.0.1" = {
-      name = "external-editor";
-      packageName = "external-editor";
-      version = "2.0.1";
+    "mem-fs-1.1.3" = {
+      name = "mem-fs";
+      packageName = "mem-fs";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.1.tgz";
-        sha1 = "4c597c6c88fa6410e41dbbaa7b1be2336aa31095";
+        url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz";
+        sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc";
       };
     };
-    "figures-2.0.0" = {
-      name = "figures";
-      packageName = "figures";
+    "vinyl-file-2.0.0" = {
+      name = "vinyl-file";
+      packageName = "vinyl-file";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz";
-        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
+        url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz";
+        sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a";
       };
     };
-    "restore-cursor-2.0.0" = {
-      name = "restore-cursor";
-      packageName = "restore-cursor";
+    "strip-bom-stream-2.0.0" = {
+      name = "strip-bom-stream";
+      packageName = "strip-bom-stream";
       version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
-        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
-      };
-    };
-    "onetime-2.0.1" = {
-      name = "onetime";
-      packageName = "onetime";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
-        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
-      };
-    };
-    "loose-envify-1.3.1" = {
-      name = "loose-envify";
-      packageName = "loose-envify";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz";
-        sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
-      };
-    };
-    "ci-info-1.0.0" = {
-      name = "ci-info";
-      packageName = "ci-info";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz";
-        sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
-      };
-    };
-    "cli-list-0.1.8" = {
-      name = "cli-list";
-      packageName = "cli-list";
-      version = "0.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-list/-/cli-list-0.1.8.tgz";
-        sha1 = "aee6d45c4c59bf80068bb968089fb06f1aeddc0a";
-      };
-    };
-    "cross-spawn-3.0.1" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz";
-        sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982";
-      };
-    };
-    "fullname-2.1.0" = {
-      name = "fullname";
-      packageName = "fullname";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fullname/-/fullname-2.1.0.tgz";
-        sha1 = "c46bf0f7c3f24fd5b3358d00e4a41380eef87350";
-      };
-    };
-    "humanize-string-1.0.1" = {
-      name = "humanize-string";
-      packageName = "humanize-string";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.1.tgz";
-        sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42";
-      };
-    };
-    "inquirer-0.11.4" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "0.11.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz";
-        sha1 = "81e3374e8361beaff2d97016206d359d0b32fa4d";
-      };
-    };
-    "insight-0.7.0" = {
-      name = "insight";
-      packageName = "insight";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.7.0.tgz";
-        sha1 = "061f9189835bd38a97a60c2b76ea0c6b30099ff6";
-      };
-    };
-    "npm-keyword-4.2.0" = {
-      name = "npm-keyword";
-      packageName = "npm-keyword";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-4.2.0.tgz";
-        sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0";
+        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz";
+        sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca";
       };
     };
-    "opn-3.0.3" = {
-      name = "opn";
-      packageName = "opn";
-      version = "3.0.3";
+    "first-chunk-stream-2.0.0" = {
+      name = "first-chunk-stream";
+      packageName = "first-chunk-stream";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz";
-        sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a";
+        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz";
+        sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
       };
     };
-    "parse-help-0.1.1" = {
-      name = "parse-help";
-      packageName = "parse-help";
-      version = "0.1.1";
+    "pad-component-0.0.1" = {
+      name = "pad-component";
+      packageName = "pad-component";
+      version = "0.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz";
-        sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda";
+        url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz";
+        sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
       };
     };
-    "root-check-1.0.0" = {
-      name = "root-check";
-      packageName = "root-check";
+    "taketalk-1.0.0" = {
+      name = "taketalk";
+      packageName = "taketalk";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz";
-        sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697";
+        url = "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz";
+        sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd";
       };
     };
-    "sort-on-1.3.0" = {
-      name = "sort-on";
-      packageName = "sort-on";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sort-on/-/sort-on-1.3.0.tgz";
-        sha1 = "0dfd5b364b23df7f2acd86985daeb889e1a7c840";
-      };
-    };
-    "tabtab-1.3.2" = {
-      name = "tabtab";
-      packageName = "tabtab";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz";
-        sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7";
-      };
-    };
-    "titleize-1.0.0" = {
-      name = "titleize";
-      packageName = "titleize";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/titleize/-/titleize-1.0.0.tgz";
-        sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a";
-      };
-    };
-    "yeoman-character-1.1.0" = {
-      name = "yeoman-character";
-      packageName = "yeoman-character";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-character/-/yeoman-character-1.1.0.tgz";
-        sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7";
-      };
-    };
-    "yeoman-doctor-2.1.0" = {
-      name = "yeoman-doctor";
-      packageName = "yeoman-doctor";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz";
-        sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
-      };
-    };
-    "yeoman-environment-1.6.6" = {
-      name = "yeoman-environment";
-      packageName = "yeoman-environment";
-      version = "1.6.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-1.6.6.tgz";
-        sha1 = "cd85fa67d156060e440d7807d7ef7cf0d2d1d671";
-      };
-    };
-    "yosay-1.2.1" = {
-      name = "yosay";
-      packageName = "yosay";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yosay/-/yosay-1.2.1.tgz";
-        sha1 = "9466ef969830e85b474e267b50f7688693ed3b5b";
-      };
-    };
-    "npmconf-2.1.2" = {
-      name = "npmconf";
-      packageName = "npmconf";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
-        sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
-      };
-    };
-    "execall-1.0.0" = {
-      name = "execall";
-      packageName = "execall";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz";
-        sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73";
-      };
-    };
-    "clone-regexp-1.0.0" = {
-      name = "clone-regexp";
-      packageName = "clone-regexp";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz";
-        sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c";
-      };
-    };
-    "is-regexp-1.0.0" = {
-      name = "is-regexp";
-      packageName = "is-regexp";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz";
-        sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069";
-      };
-    };
-    "is-supported-regexp-flag-1.0.0" = {
-      name = "is-supported-regexp-flag";
-      packageName = "is-supported-regexp-flag";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz";
-        sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8";
-      };
-    };
-    "downgrade-root-1.2.2" = {
-      name = "downgrade-root";
-      packageName = "downgrade-root";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz";
-        sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c";
-      };
-    };
-    "sudo-block-1.2.0" = {
-      name = "sudo-block";
-      packageName = "sudo-block";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz";
-        sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463";
-      };
-    };
-    "default-uid-1.0.0" = {
-      name = "default-uid";
-      packageName = "default-uid";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz";
-        sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e";
-      };
-    };
-    "is-root-1.0.0" = {
-      name = "is-root";
-      packageName = "is-root";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz";
-        sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5";
-      };
-    };
-    "is-docker-1.1.0" = {
-      name = "is-docker";
-      packageName = "is-docker";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz";
-        sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1";
-      };
-    };
-    "dot-prop-2.4.0" = {
-      name = "dot-prop";
-      packageName = "dot-prop";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz";
-        sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c";
-      };
-    };
-    "bin-version-check-2.1.0" = {
-      name = "bin-version-check";
-      packageName = "bin-version-check";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz";
-        sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0";
-      };
-    };
-    "each-async-1.1.1" = {
-      name = "each-async";
-      packageName = "each-async";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz";
-        sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473";
-      };
-    };
-    "log-symbols-1.0.2" = {
-      name = "log-symbols";
-      packageName = "log-symbols";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz";
-        sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
-      };
-    };
-    "object-values-1.0.0" = {
-      name = "object-values";
-      packageName = "object-values";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz";
-        sha1 = "72af839630119e5b98c3b02bb8c27e3237158105";
-      };
-    };
-    "twig-0.8.9" = {
-      name = "twig";
-      packageName = "twig";
-      version = "0.8.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/twig/-/twig-0.8.9.tgz";
-        sha1 = "b1594f002b684e5f029de3e54e87bec4f084b6c2";
-      };
-    };
-    "bin-version-1.0.4" = {
-      name = "bin-version";
-      packageName = "bin-version";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz";
-        sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e";
-      };
-    };
-    "semver-truncate-1.1.2" = {
-      name = "semver-truncate";
-      packageName = "semver-truncate";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz";
-        sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8";
-      };
-    };
-    "find-versions-1.2.1" = {
-      name = "find-versions";
-      packageName = "find-versions";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz";
-        sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62";
-      };
-    };
-    "semver-regex-1.0.0" = {
-      name = "semver-regex";
-      packageName = "semver-regex";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz";
-        sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9";
-      };
-    };
-    "diff-2.2.3" = {
-      name = "diff";
-      packageName = "diff";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
-        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
-      };
-    };
-    "globby-4.1.0" = {
-      name = "globby";
-      packageName = "globby";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz";
-        sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8";
-      };
-    };
-    "grouped-queue-0.3.3" = {
-      name = "grouped-queue";
-      packageName = "grouped-queue";
-      version = "0.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz";
-        sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c";
-      };
-    };
-    "mem-fs-1.1.3" = {
-      name = "mem-fs";
-      packageName = "mem-fs";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz";
-        sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc";
-      };
-    };
-    "vinyl-file-2.0.0" = {
-      name = "vinyl-file";
-      packageName = "vinyl-file";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz";
-        sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a";
-      };
-    };
-    "strip-bom-stream-2.0.0" = {
-      name = "strip-bom-stream";
-      packageName = "strip-bom-stream";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz";
-        sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca";
-      };
-    };
-    "first-chunk-stream-2.0.0" = {
-      name = "first-chunk-stream";
-      packageName = "first-chunk-stream";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz";
-        sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
-      };
-    };
-    "pad-component-0.0.1" = {
-      name = "pad-component";
-      packageName = "pad-component";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz";
-        sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
-      };
-    };
-    "taketalk-1.0.0" = {
-      name = "taketalk";
-      packageName = "taketalk";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz";
-        sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd";
-      };
-    };
-  };
-in
-{
-  alloy = nodeEnv.buildNodePackage {
-    name = "alloy";
-    packageName = "alloy";
-    version = "1.9.11";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.11.tgz";
-      sha1 = "6e185c5c3211b5a86d272caec63b8daf80e5b186";
+  };
+in
+{
+  alloy = nodeEnv.buildNodePackage {
+    name = "alloy";
+    packageName = "alloy";
+    version = "1.10.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.10.1.tgz";
+      sha1 = "cdfb8b1b559acb79cc94cd22c49378ec72e11a81";
     };
     dependencies = [
+      sources."async-2.4.1"
+      (sources."babel-core-6.24.1" // {
+        dependencies = [
+          sources."source-map-0.5.6"
+        ];
+      })
+      sources."babel-plugin-minify-constant-folding-0.1.1"
+      sources."babel-plugin-minify-dead-code-elimination-0.1.6"
+      sources."babel-plugin-minify-numeric-literals-0.1.1"
+      sources."babel-traverse-6.24.1"
+      sources."babel-types-6.24.1"
+      sources."babylon-6.17.1"
       sources."colors-0.6.0-1"
+      sources."commander-0.6.1"
+      sources."deasync-0.1.9"
       sources."ejs-2.3.4"
+      sources."global-paths-0.1.2"
+      sources."jsonlint-1.5.1"
+      sources."moment-2.17.1"
+      sources."node.extend-1.0.10"
       sources."pkginfo-0.2.2"
-      sources."commander-0.6.1"
+      sources."resolve-1.3.3"
+      sources."source-map-0.1.9"
       sources."wrench-1.3.9"
+      sources."xml2tss-0.0.5"
       sources."xmldom-0.1.19"
-      sources."jsonlint-1.5.1"
-      (sources."uglify-js-2.6.1" // {
+      sources."lodash-4.17.4"
+      sources."babel-code-frame-6.22.0"
+      (sources."babel-generator-6.24.1" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
       })
-      sources."resolve-1.3.3"
-      sources."global-paths-0.1.2"
-      sources."source-map-0.1.9"
-      sources."xml2tss-0.0.5"
-      sources."moment-2.17.1"
-      sources."node.extend-1.0.10"
-      sources."nomnom-1.8.1"
-      sources."JSV-4.0.2"
-      sources."underscore-1.6.0"
-      sources."chalk-0.4.0"
-      sources."has-color-0.1.7"
-      sources."ansi-styles-1.0.0"
-      sources."strip-ansi-0.1.1"
-      sources."async-0.2.10"
-      sources."uglify-to-browserify-1.0.2"
-      sources."yargs-3.10.0"
-      sources."camelcase-1.2.1"
-      sources."cliui-2.1.0"
-      sources."decamelize-1.2.0"
-      sources."window-size-0.1.0"
-      sources."center-align-0.1.3"
-      sources."right-align-0.1.3"
-      sources."wordwrap-0.0.2"
-      sources."align-text-0.1.4"
-      sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.0"
-      sources."longest-1.0.1"
-      sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
-      sources."path-parse-1.0.5"
+      sources."babel-helpers-6.24.1"
+      sources."babel-messages-6.23.0"
+      sources."babel-template-6.24.1"
+      sources."babel-runtime-6.23.0"
+      sources."babel-register-6.24.1"
+      sources."convert-source-map-1.5.0"
+      sources."debug-2.6.8"
+      sources."json5-0.5.1"
+      sources."minimatch-3.0.4"
+      sources."path-is-absolute-1.0.1"
+      sources."private-0.1.7"
+      sources."slash-1.0.0"
+      sources."chalk-1.1.3"
+      sources."esutils-2.0.2"
+      sources."js-tokens-3.0.1"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."detect-indent-4.0.0"
+      sources."jsesc-1.3.0"
+      sources."trim-right-1.0.1"
+      sources."repeating-2.0.1"
+      sources."is-finite-1.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."core-js-2.4.1"
+      sources."regenerator-runtime-0.10.5"
+      sources."home-or-tmp-2.0.0"
+      sources."mkdirp-0.5.1"
+      (sources."source-map-support-0.4.15" // {
+        dependencies = [
+          sources."source-map-0.5.6"
+        ];
+      })
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."minimist-0.0.8"
+      sources."ms-2.0.0"
+      sources."brace-expansion-1.1.7"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."babel-helper-evaluate-path-0.1.0"
+      sources."babel-helper-mark-eval-scopes-0.1.1"
+      sources."babel-helper-remove-or-void-0.1.1"
+      sources."lodash.some-4.6.0"
+      sources."globals-9.17.0"
+      sources."invariant-2.2.2"
+      sources."loose-envify-1.3.1"
+      sources."to-fast-properties-1.0.3"
+      sources."bindings-1.2.1"
+      sources."nan-2.6.2"
       sources."array-unique-0.2.1"
       (sources."global-modules-0.2.3" // {
         dependencies = [
@@ -19984,10 +20073,21 @@ in
       sources."which-1.2.14"
       sources."parse-passwd-1.0.0"
       sources."isexe-2.0.0"
+      (sources."nomnom-1.8.1" // {
+        dependencies = [
+          sources."chalk-0.4.0"
+          sources."ansi-styles-1.0.0"
+          sources."strip-ansi-0.1.1"
+        ];
+      })
+      sources."JSV-4.0.2"
+      sources."underscore-1.6.0"
+      sources."has-color-0.1.7"
+      sources."is-0.3.0"
+      sources."path-parse-1.0.5"
       sources."amdefine-1.0.1"
       sources."xml2js-0.2.8"
       sources."sax-0.5.8"
-      sources."is-0.3.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -20000,10 +20100,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.12";
+    version = "0.10.13";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.12.tgz";
-      sha1 = "4446af5df8dda6c755a0bf7dfec2468a9f63f26d";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.13.tgz";
+      sha1 = "7e98a46b058f436fb2a3fbed982d143d49557348";
     };
     dependencies = [
       sources."adal-node-0.1.21"
@@ -20018,8 +20118,8 @@ in
       sources."azure-arm-cdn-1.0.3"
       sources."azure-arm-commerce-0.2.0"
       sources."azure-arm-compute-0.20.0"
-      sources."azure-arm-datalake-analytics-1.0.1-preview"
-      sources."azure-arm-datalake-store-1.0.1-preview"
+      sources."azure-arm-datalake-analytics-1.0.2-preview"
+      sources."azure-arm-datalake-store-1.0.2-preview"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
@@ -20162,14 +20262,14 @@ in
       sources."json-edm-parser-0.1.2"
       sources."md5.js-1.3.4"
       sources."jsonparse-1.2.0"
-      sources."hash-base-3.0.3"
+      sources."hash-base-3.0.4"
       sources."inherits-2.0.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."stack-trace-0.0.9"
+      sources."stack-trace-0.0.10"
       sources."keypress-0.1.0"
       sources."from-0.1.7"
       sources."map-stream-0.1.0"
@@ -20201,10 +20301,10 @@ in
       sources."ncp-0.4.2"
       sources."rimraf-2.6.1"
       sources."minimist-0.0.8"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -20225,7 +20325,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.4.0"
+          sources."async-2.4.1"
         ];
       })
       (sources."har-validator-2.0.6" // {
@@ -20305,7 +20405,7 @@ in
       (sources."concat-stream-1.6.0" // {
         dependencies = [
           sources."readable-stream-2.2.9"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."http-response-object-1.1.0"
@@ -20371,47 +20471,22 @@ in
       })
       sources."glob-6.0.4"
       sources."sprintf-js-1.0.3"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."ext-name-3.0.0"
       sources."graceful-fs-3.0.11"
       sources."intersect-1.0.1"
       sources."ends-with-0.2.0"
-      sources."ext-list-2.2.0"
-      (sources."meow-3.7.0" // {
-        dependencies = [
-          sources."object-assign-4.1.1"
-        ];
-      })
+      sources."ext-list-2.2.1"
+      sources."meow-3.7.0"
       sources."sort-keys-length-1.0.1"
-      sources."got-2.9.2"
-      sources."duplexify-3.5.0"
-      sources."infinity-agent-2.0.3"
-      sources."is-stream-1.1.0"
-      sources."lowercase-keys-1.0.0"
-      sources."nested-error-stacks-1.0.2"
-      sources."object-assign-2.1.1"
-      sources."prepend-http-1.0.4"
-      sources."read-all-stream-2.2.0"
-      sources."statuses-1.3.1"
-      sources."timed-out-2.0.0"
-      sources."end-of-stream-1.0.0"
-      sources."inherits-2.0.3"
-      sources."readable-stream-2.2.9"
-      sources."stream-shift-1.0.0"
-      sources."once-1.3.3"
-      sources."wrappy-1.0.2"
-      sources."buffer-shims-1.0.0"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
-      sources."util-deprecate-1.0.2"
+      sources."mime-db-1.28.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."minimist-1.2.0"
       sources."normalize-package-data-2.3.8"
+      sources."object-assign-4.1.1"
       sources."read-pkg-up-1.0.1"
       sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
@@ -20469,23 +20544,26 @@ in
       sources."path-is-absolute-1.0.1"
       (sources."rimraf-2.6.1" // {
         dependencies = [
-          sources."glob-7.1.1"
+          sources."glob-7.1.2"
         ];
       })
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.4"
+      sources."once-1.4.0"
+      sources."wrappy-1.0.2"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."q-1.5.0"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."os-tmpdir-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -20499,10 +20577,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "14.3.0";
+    version = "14.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-14.3.0.tgz";
-      sha1 = "fd003a2386ac1aec127f097885a3cc6373b745c4";
+      url = "https://registry.npmjs.org/browserify/-/browserify-14.4.0.tgz";
+      sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -20519,6 +20597,7 @@ in
       (sources."concat-stream-1.5.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
+          sources."string_decoder-0.10.31"
         ];
       })
       sources."console-browserify-1.1.0"
@@ -20529,7 +20608,7 @@ in
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."events-1.1.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."has-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
@@ -20548,17 +20627,13 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.9" // {
-        dependencies = [
-          sources."string_decoder-1.0.0"
-        ];
-      })
+      sources."readable-stream-2.2.9"
       sources."resolve-1.3.3"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.7.0"
-      sources."string_decoder-0.10.31"
+      sources."stream-http-2.7.1"
+      sources."string_decoder-1.0.1"
       sources."subarg-1.0.0"
       sources."syntax-error-1.3.0"
       sources."through2-2.0.3"
@@ -20576,7 +20651,7 @@ in
       })
       sources."vm-browserify-0.0.4"
       sources."xtend-4.0.1"
-      sources."jsonparse-1.3.0"
+      sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."combine-source-map-0.7.2"
       sources."umd-3.0.1"
@@ -20596,10 +20671,10 @@ in
       sources."browserify-cipher-1.0.0"
       sources."browserify-sign-4.0.4"
       sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.2"
-      sources."create-hmac-1.1.4"
+      sources."create-hash-1.1.3"
+      sources."create-hmac-1.1.6"
       sources."diffie-hellman-5.0.2"
-      sources."pbkdf2-3.0.9"
+      sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.3"
       sources."browserify-aes-1.0.6"
@@ -20618,12 +20693,14 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
-      sources."ripemd160-1.0.1"
+      sources."ripemd160-2.0.1"
       sources."sha.js-2.4.8"
+      sources."hash-base-2.0.2"
+      sources."safe-buffer-5.0.1"
       sources."miller-rabin-4.0.0"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -20634,7 +20711,7 @@ in
       sources."is-buffer-1.1.5"
       sources."lexical-scope-1.2.0"
       sources."astw-2.2.0"
-      sources."acorn-4.0.11"
+      sources."acorn-4.0.13"
       sources."stream-splicer-2.0.0"
       sources."detective-4.5.0"
       sources."stream-combiner2-1.1.1"
@@ -20675,12 +20752,12 @@ in
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."diveSync-0.3.0"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
       sources."keypress-0.2.1"
-      sources."mime-1.3.4"
+      sources."mime-1.3.6"
       sources."minimist-1.2.0"
       sources."peerflix-0.34.0"
       (sources."playerui-1.2.0" // {
@@ -20744,7 +20821,7 @@ in
       sources."thunky-0.1.0"
       sources."wrap-fn-0.1.5"
       sources."co-3.1.0"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."append-0.1.1"
       sources."object-assign-1.0.0"
       (sources."meow-3.7.0" // {
@@ -20891,7 +20968,7 @@ in
       sources."rimraf-2.6.1"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.1"
-      (sources."random-access-file-1.7.2" // {
+      (sources."random-access-file-1.7.3" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.2"
@@ -20917,10 +20994,10 @@ in
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
       sources."cyclist-0.1.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
@@ -20954,7 +21031,7 @@ in
         dependencies = [
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       (sources."simple-websocket-4.3.1" // {
@@ -20962,7 +21039,7 @@ in
           sources."readable-stream-2.2.9"
           sources."ws-2.3.1"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."string2compact-1.2.2"
@@ -21014,7 +21091,7 @@ in
         dependencies = [
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."exit-on-epipe-1.0.0"
@@ -21035,10 +21112,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.5";
+    version = "1.12.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.5.tgz";
-      sha1 = "809f4585419112bbfe46a073ad7543af18c27346";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.6.tgz";
+      sha1 = "285a3f7115689065064d6bf9ef4572db66695cbf";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -21051,10 +21128,10 @@ in
   cordova = nodeEnv.buildNodePackage {
     name = "cordova";
     packageName = "cordova";
-    version = "7.0.0";
+    version = "7.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cordova/-/cordova-7.0.0.tgz";
-      sha1 = "425b79539784c728149ee0b7668af0e63f4720b2";
+      url = "https://registry.npmjs.org/cordova/-/cordova-7.0.1.tgz";
+      sha1 = "69fd054300ce5105b092f67a1b286e80c4e88b9d";
     };
     dependencies = [
       sources."configstore-2.1.0"
@@ -21063,7 +21140,7 @@ in
           sources."q-1.5.0"
         ];
       })
-      (sources."cordova-lib-7.0.0" // {
+      (sources."cordova-lib-7.0.1" // {
         dependencies = [
           sources."glob-7.1.1"
           sources."nopt-4.0.1"
@@ -21106,7 +21183,7 @@ in
       sources."cordova-registry-mapper-1.1.15"
       sources."elementtree-0.1.6"
       sources."glob-5.0.15"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."plist-1.2.0"
       sources."semver-5.3.0"
       sources."shelljs-0.5.3"
@@ -21128,7 +21205,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."lodash-3.10.1"
       sources."aliasify-2.1.0"
-      (sources."cordova-create-1.1.0" // {
+      (sources."cordova-create-1.1.1" // {
         dependencies = [
           sources."shelljs-0.3.0"
         ];
@@ -21137,7 +21214,7 @@ in
         dependencies = [
           sources."q-1.5.0"
           sources."shelljs-0.7.7"
-          sources."glob-7.1.1"
+          sources."glob-7.1.2"
         ];
       })
       sources."cordova-js-4.2.1"
@@ -21153,7 +21230,7 @@ in
       })
       (sources."init-package-json-1.10.1" // {
         dependencies = [
-          sources."glob-7.1.1"
+          sources."glob-7.1.2"
         ];
       })
       (sources."npm-2.15.12" // {
@@ -21163,7 +21240,7 @@ in
           sources."hosted-git-info-2.1.5"
           (sources."init-package-json-1.9.6" // {
             dependencies = [
-              sources."glob-7.1.1"
+              sources."glob-7.1.2"
               sources."validate-npm-package-name-3.0.0"
             ];
           })
@@ -21216,7 +21293,7 @@ in
       sources."path-parse-1.0.5"
       (sources."browserify-13.3.0" // {
         dependencies = [
-          sources."glob-7.1.1"
+          sources."glob-7.1.2"
         ];
       })
       sources."JSONStream-1.3.1"
@@ -21265,13 +21342,13 @@ in
       (sources."readable-stream-2.2.9" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.7.0"
+      sources."stream-http-2.7.1"
       sources."string_decoder-0.10.31"
       (sources."subarg-1.0.0" // {
         dependencies = [
@@ -21280,7 +21357,7 @@ in
       })
       (sources."syntax-error-1.3.0" // {
         dependencies = [
-          sources."acorn-4.0.11"
+          sources."acorn-4.0.13"
         ];
       })
       sources."through2-2.0.3"
@@ -21298,7 +21375,7 @@ in
       })
       sources."vm-browserify-0.0.4"
       sources."xtend-4.0.1"
-      sources."jsonparse-1.3.0"
+      sources."jsonparse-1.3.1"
       sources."combine-source-map-0.7.2"
       sources."umd-3.0.1"
       sources."convert-source-map-1.1.3"
@@ -21314,10 +21391,10 @@ in
       sources."browserify-cipher-1.0.0"
       sources."browserify-sign-4.0.4"
       sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.2"
-      sources."create-hmac-1.1.4"
+      sources."create-hash-1.1.3"
+      sources."create-hmac-1.1.6"
       sources."diffie-hellman-5.0.2"
-      sources."pbkdf2-3.0.9"
+      sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.3"
       sources."browserify-aes-1.0.6"
@@ -21336,21 +21413,23 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
-      sources."ripemd160-1.0.1"
+      sources."ripemd160-2.0.1"
       sources."sha.js-2.4.8"
+      sources."hash-base-2.0.2"
+      sources."safe-buffer-5.0.1"
       sources."miller-rabin-4.0.0"
       sources."function-bind-1.1.0"
       sources."is-buffer-1.1.5"
       sources."lexical-scope-1.2.0"
       (sources."astw-2.2.0" // {
         dependencies = [
-          sources."acorn-4.0.11"
+          sources."acorn-4.0.13"
         ];
       })
       sources."stream-splicer-2.0.0"
       (sources."detective-4.5.0" // {
         dependencies = [
-          sources."acorn-4.0.11"
+          sources."acorn-4.0.13"
         ];
       })
       sources."stream-combiner2-1.1.1"
@@ -21367,10 +21446,10 @@ in
       sources."indexof-0.0.1"
       sources."chalk-1.1.3"
       sources."compression-1.6.2"
-      (sources."express-4.15.2" // {
+      (sources."express-4.15.3" // {
         dependencies = [
-          sources."debug-2.6.1"
-          sources."ms-0.7.2"
+          sources."debug-2.6.7"
+          sources."ms-2.0.0"
         ];
       })
       sources."ansi-styles-2.2.1"
@@ -21398,10 +21477,10 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.0"
-      (sources."finalhandler-1.0.2" // {
+      (sources."finalhandler-1.0.3" // {
         dependencies = [
-          sources."debug-2.6.4"
-          sources."ms-0.7.3"
+          sources."debug-2.6.7"
+          sources."ms-2.0.0"
         ];
       })
       sources."fresh-0.5.0"
@@ -21413,13 +21492,13 @@ in
       sources."proxy-addr-1.1.4"
       sources."qs-6.4.0"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.1" // {
+      (sources."send-0.15.3" // {
         dependencies = [
-          sources."debug-2.6.1"
-          sources."ms-0.7.2"
+          sources."debug-2.6.7"
+          sources."ms-2.0.0"
         ];
       })
-      sources."serve-static-1.12.1"
+      sources."serve-static-1.12.3"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
@@ -21437,7 +21516,7 @@ in
       sources."read-1.0.7"
       (sources."read-package-json-2.0.5" // {
         dependencies = [
-          sources."glob-7.1.1"
+          sources."glob-7.1.2"
         ];
       })
       sources."validate-npm-package-license-3.0.1"
@@ -21477,7 +21556,7 @@ in
       sources."lru-cache-4.0.2"
       (sources."node-gyp-3.6.1" // {
         dependencies = [
-          sources."glob-7.1.1"
+          sources."glob-7.1.2"
         ];
       })
       sources."normalize-git-url-3.0.2"
@@ -21500,7 +21579,7 @@ in
       sources."retry-0.10.1"
       (sources."rimraf-2.5.4" // {
         dependencies = [
-          sources."glob-7.1.1"
+          sources."glob-7.1.2"
         ];
       })
       sources."sha-2.0.1"
@@ -21553,7 +21632,7 @@ in
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
-      (sources."async-2.4.0" // {
+      (sources."async-2.4.1" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -21673,7 +21752,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."is-finite-1.0.2"
     ];
@@ -21822,7 +21901,7 @@ in
       sources."cycle-1.0.3"
       sources."eyes-0.1.8"
       sources."pkginfo-0.3.1"
-      sources."stack-trace-0.0.9"
+      sources."stack-trace-0.0.10"
       sources."formidable-1.0.14"
       sources."component-emitter-1.1.2"
       sources."cookiejar-2.0.1"
@@ -21899,7 +21978,7 @@ in
           sources."through2-2.0.3"
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."pump-1.0.2"
@@ -21909,12 +21988,12 @@ in
       sources."sorted-union-stream-1.0.2"
       sources."split2-0.2.1"
       sources."stream-collector-1.0.1"
-      (sources."tar-stream-1.5.2" // {
+      (sources."tar-stream-1.5.4" // {
         dependencies = [
           sources."bl-1.2.1"
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       (sources."through2-0.6.5" // {
@@ -21941,7 +22020,7 @@ in
           sources."readable-stream-2.2.9"
           sources."once-1.3.3"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."lru-cache-2.7.3"
@@ -21949,11 +22028,12 @@ in
       sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."level-packager-0.18.0"
       sources."bytewise-1.1.0"
       sources."ltgt-2.1.3"
       sources."pull-level-2.0.3"
-      sources."pull-stream-3.5.0"
+      sources."pull-stream-3.6.0"
       sources."typewiselite-1.0.0"
       sources."bytewise-core-1.2.3"
       sources."typewise-1.0.3"
@@ -21975,7 +22055,7 @@ in
       sources."level-post-1.0.5"
       sources."pull-cat-1.1.11"
       sources."pull-live-1.0.1"
-      sources."pull-pushable-2.0.1"
+      sources."pull-pushable-2.1.1"
       sources."pull-window-2.1.4"
       (sources."stream-to-pull-stream-1.7.2" // {
         dependencies = [
@@ -22001,22 +22081,34 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.2.0";
+    version = "3.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.2.0.tgz";
-      sha1 = "e2b430a7ac456512e1a34bdae7ac125c2566a998";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.0.tgz";
+      sha1 = "19aec66c4619e49a66dfa1106719819d9daecbc8";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
-      sources."async-2.4.0"
+      sources."async-2.4.1"
       sources."aws4-1.6.0"
-      sources."awscred-1.2.0"
+      sources."aws-sdk-2.58.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
-      sources."jsonparse-1.3.0"
+      sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."lodash-4.17.4"
+      sources."buffer-5.0.6"
+      sources."crypto-browserify-1.0.9"
+      sources."jmespath-0.15.0"
+      sources."querystring-0.2.0"
+      sources."sax-1.2.1"
+      sources."url-0.10.3"
+      sources."uuid-3.0.1"
+      sources."xml2js-0.4.17"
+      sources."xmlbuilder-4.2.1"
+      sources."base64-js-1.2.0"
+      sources."ieee754-1.1.8"
+      sources."punycode-1.3.2"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.6.0"
@@ -22037,9 +22129,12 @@ in
       sources."qs-6.4.0"
       sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
-      sources."tough-cookie-2.3.2"
+      (sources."tough-cookie-2.3.2" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -22082,7 +22177,6 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
-      sources."punycode-1.4.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22095,14 +22189,15 @@ in
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
-    version = "1.0.0";
+    version = "1.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emoj/-/emoj-1.0.0.tgz";
-      sha1 = "3cccbeec420e2b45f73b923e880c220392c055bd";
+      url = "https://registry.npmjs.org/emoj/-/emoj-1.1.0.tgz";
+      sha1 = "5a43ae17f6bf672cd8e40891357f84b086c52509";
     };
     dependencies = [
       sources."chalk-1.1.3"
       sources."clipboardy-0.1.2"
+      sources."conf-1.1.1"
       (sources."got-6.7.1" // {
         dependencies = [
           sources."get-stream-3.0.0"
@@ -22113,6 +22208,7 @@ in
       sources."log-update-1.0.2"
       sources."mem-1.1.0"
       sources."meow-3.7.0"
+      sources."skin-tone-1.0.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."strip-ansi-3.0.1"
@@ -22135,6 +22231,17 @@ in
       sources."pinkie-promise-2.0.1"
       sources."pinkie-2.0.4"
       sources."path-key-2.0.1"
+      sources."dot-prop-4.1.1"
+      sources."env-paths-1.0.0"
+      sources."make-dir-1.0.0"
+      sources."pkg-up-2.0.0"
+      sources."is-obj-1.0.1"
+      sources."pify-2.3.0"
+      sources."find-up-2.1.0"
+      sources."locate-path-2.0.0"
+      sources."p-locate-2.0.0"
+      sources."path-exists-3.0.0"
+      sources."p-limit-1.1.0"
       sources."create-error-class-3.0.2"
       sources."duplexer3-0.1.4"
       sources."is-redirect-1.0.0"
@@ -22158,7 +22265,12 @@ in
       sources."map-obj-1.0.1"
       sources."minimist-1.2.0"
       sources."normalize-package-data-2.3.8"
-      sources."read-pkg-up-1.0.1"
+      (sources."read-pkg-up-1.0.1" // {
+        dependencies = [
+          sources."find-up-1.1.2"
+          sources."path-exists-2.1.0"
+        ];
+      })
       sources."redent-1.0.0"
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
@@ -22172,14 +22284,11 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."find-up-1.1.2"
       sources."read-pkg-1.1.0"
-      sources."path-exists-2.1.0"
       sources."load-json-file-1.1.0"
       sources."path-type-1.1.0"
       sources."graceful-fs-4.1.11"
       sources."parse-json-2.2.0"
-      sources."pify-2.3.0"
       sources."strip-bom-2.0.0"
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
@@ -22190,6 +22299,7 @@ in
       sources."is-finite-1.0.2"
       sources."number-is-nan-1.0.1"
       sources."get-stdin-4.0.1"
+      sources."unicode-emoji-modifier-base-1.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22211,22 +22321,22 @@ in
       sources."babel-code-frame-6.22.0"
       sources."chalk-1.1.3"
       sources."concat-stream-1.6.0"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."doctrine-2.0.0"
       sources."escope-3.6.0"
-      sources."espree-3.4.2"
+      sources."espree-3.4.3"
       sources."esquery-1.0.0"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."globals-9.17.0"
-      sources."ignore-3.3.0"
+      sources."ignore-3.3.3"
       sources."imurmurhash-0.1.4"
       sources."inquirer-0.12.0"
       sources."is-my-json-valid-2.16.0"
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.8.3"
+      sources."js-yaml-3.8.4"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.4"
@@ -22262,9 +22372,10 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."ms-0.7.3"
+      sources."safe-buffer-5.0.1"
+      sources."ms-2.0.0"
       sources."es6-map-0.1.5"
       sources."es6-weak-map-2.0.2"
       (sources."esrecurse-4.1.0" // {
@@ -22273,7 +22384,7 @@ in
         ];
       })
       sources."d-1.0.0"
-      sources."es5-ext-0.10.15"
+      sources."es5-ext-0.10.21"
       sources."es6-iterator-2.0.1"
       sources."es6-set-0.1.5"
       sources."es6-symbol-3.1.1"
@@ -22303,7 +22414,7 @@ in
       sources."pinkie-2.0.4"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -22462,14 +22573,14 @@ in
       sources."async-0.2.10"
       sources."cycle-1.0.3"
       sources."pkginfo-0.3.1"
-      sources."stack-trace-0.0.9"
+      sources."stack-trace-0.0.10"
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."read-1.0.7"
       sources."revalidator-0.1.8"
       sources."mute-stream-0.0.7"
-      sources."chokidar-1.6.1"
-      sources."minimatch-3.0.3"
+      sources."chokidar-1.7.0"
+      sources."minimatch-3.0.4"
       sources."ps-tree-0.0.3"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
@@ -22488,7 +22599,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.1"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -22510,7 +22621,7 @@ in
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
-      sources."is-dotfile-1.0.2"
+      sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
@@ -22520,17 +22631,18 @@ in
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."nan-2.6.2"
-      sources."node-pre-gyp-0.6.34"
+      sources."node-pre-gyp-0.6.35"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
       sources."nopt-4.0.1"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.1.0"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -22559,12 +22671,12 @@ in
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
@@ -22584,7 +22696,6 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -22632,17 +22743,17 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
@@ -22678,13 +22789,15 @@ in
       sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4";
     };
     dependencies = [
-      sources."async-2.4.0"
+      sources."async-2.4.1"
       sources."lodash.groupby-4.6.0"
       sources."minilog-2.0.8"
-      sources."simple-git-1.70.0"
+      sources."simple-git-1.73.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
       sources."lodash-4.17.4"
       sources."microee-0.0.2"
+      sources."debug-2.6.8"
+      sources."ms-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22710,7 +22823,7 @@ in
       sources."glob-5.0.15"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -22737,7 +22850,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.5"
+      sources."coffee-script-1.12.6"
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
@@ -22747,7 +22860,7 @@ in
       sources."xml2js-0.4.17"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
-      (sources."clean-css-3.4.25" // {
+      (sources."clean-css-3.4.26" // {
         dependencies = [
           sources."commander-2.8.1"
         ];
@@ -22764,7 +22877,7 @@ in
           sources."source-map-0.1.43"
         ];
       })
-      (sources."uglify-js-2.8.22" // {
+      (sources."uglify-js-2.8.27" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -22802,7 +22915,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
@@ -22874,11 +22987,11 @@ in
         dependencies = [
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."vinyl-0.5.3"
-      sources."time-stamp-1.0.1"
+      sources."time-stamp-1.1.0"
       sources."glogg-1.0.0"
       sources."sparkles-1.0.0"
       sources."lodash._basecopy-3.0.1"
@@ -22903,6 +23016,7 @@ in
       sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
       sources."extend-3.0.1"
@@ -22926,7 +23040,7 @@ in
       sources."expand-brackets-0.1.5"
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.1"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -22951,7 +23065,7 @@ in
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
-      sources."is-dotfile-1.0.2"
+      sources."is-dotfile-1.0.3"
       sources."glob-parent-2.0.0"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
@@ -23080,7 +23194,7 @@ in
       sources."parserlib-0.2.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -23116,7 +23230,7 @@ in
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
       sources."glob-base-0.3.0"
-      sources."is-dotfile-1.0.2"
+      sources."is-dotfile-1.0.3"
       sources."is-extglob-1.0.0"
       sources."is-glob-2.0.1"
       sources."glob-parent-2.0.0"
@@ -23159,194 +23273,473 @@ in
       sources."escodegen-1.8.1"
       sources."esprima-2.7.3"
       sources."glob-5.0.15"
-      (sources."handlebars-4.0.8" // {
+      (sources."handlebars-4.0.10" // {
+        dependencies = [
+          sources."source-map-0.4.4"
+        ];
+      })
+      (sources."js-yaml-3.8.4" // {
+        dependencies = [
+          sources."esprima-3.1.3"
+        ];
+      })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."nopt-3.0.6"
+      sources."once-1.4.0"
+      sources."resolve-1.1.7"
+      sources."supports-color-3.2.3"
+      sources."which-1.2.14"
+      sources."wordwrap-1.0.0"
+      sources."estraverse-1.9.3"
+      sources."esutils-2.0.2"
+      sources."optionator-0.8.2"
+      sources."source-map-0.2.0"
+      sources."prelude-ls-1.1.2"
+      sources."deep-is-0.1.3"
+      sources."type-check-0.3.2"
+      sources."levn-0.3.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."amdefine-1.0.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.4"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.7"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."wordwrap-0.0.3"
+        ];
+      })
+      (sources."uglify-js-2.8.27" // {
+        dependencies = [
+          sources."source-map-0.5.6"
+        ];
+      })
+      sources."minimist-0.0.10"
+      sources."yargs-3.10.0"
+      sources."uglify-to-browserify-1.0.2"
+      sources."camelcase-1.2.1"
+      (sources."cliui-2.1.0" // {
+        dependencies = [
+          sources."wordwrap-0.0.2"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      sources."window-size-0.1.0"
+      sources."center-align-0.1.3"
+      sources."right-align-0.1.3"
+      sources."align-text-0.1.4"
+      sources."lazy-cache-1.0.4"
+      sources."kind-of-3.2.2"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.5"
+      sources."argparse-1.0.9"
+      sources."sprintf-js-1.0.3"
+      sources."has-flag-1.0.0"
+      sources."isexe-2.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests ";
+      homepage = "https://github.com/gotwarlost/istanbul#readme";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+  };
+  jayschema = nodeEnv.buildNodePackage {
+    name = "jayschema";
+    packageName = "jayschema";
+    version = "0.3.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
+      sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58";
+    };
+    dependencies = [
+      sources."when-3.4.6"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A comprehensive JSON Schema validator for Node.js";
+      homepage = https://github.com/natesilva/jayschema;
+      license = "BSD-3-Clause";
+    };
+    production = true;
+  };
+  jshint = nodeEnv.buildNodePackage {
+    name = "jshint";
+    packageName = "jshint";
+    version = "2.9.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz";
+      sha1 = "5e3ba97848d5290273db514aee47fe24cf592934";
+    };
+    dependencies = [
+      sources."cli-1.0.1"
+      sources."console-browserify-1.1.0"
+      sources."exit-0.1.2"
+      sources."htmlparser2-3.8.3"
+      sources."minimatch-3.0.4"
+      sources."shelljs-0.3.0"
+      sources."strip-json-comments-1.0.4"
+      sources."lodash-3.7.0"
+      sources."glob-7.1.2"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."date-now-0.1.4"
+      sources."domhandler-2.3.0"
+      sources."domutils-1.5.1"
+      sources."domelementtype-1.3.0"
+      sources."readable-stream-1.1.14"
+      sources."entities-1.0.0"
+      (sources."dom-serializer-0.1.0" // {
+        dependencies = [
+          sources."domelementtype-1.1.3"
+          sources."entities-1.1.1"
+        ];
+      })
+      sources."core-util-is-1.0.2"
+      sources."isarray-0.0.1"
+      sources."string_decoder-0.10.31"
+      sources."brace-expansion-1.1.7"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Static analysis tool for JavaScript";
+      homepage = http://jshint.com/;
+      license = "(MIT AND JSON)";
+    };
+    production = true;
+  };
+  json = nodeEnv.buildNodePackage {
+    name = "json";
+    packageName = "json";
+    version = "9.0.6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/json/-/json-9.0.6.tgz";
+      sha1 = "7972c2a5a48a42678db2730c7c2c4ee6e4e24585";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "a 'json' command for massaging and processing JSON on the command line";
+      homepage = "https://github.com/trentm/json#readme";
+    };
+    production = true;
+  };
+  jsontool = nodeEnv.buildNodePackage {
+    name = "jsontool";
+    packageName = "jsontool";
+    version = "7.0.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz";
+      sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "a 'json' command for massaging JSON on the command line";
+      homepage = https://github.com/trentm/json;
+    };
+    production = true;
+  };
+  json-server = nodeEnv.buildNodePackage {
+    name = "json-server";
+    packageName = "json-server";
+    version = "0.10.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.10.1.tgz";
+      sha1 = "1edd299681d3960959cf3b1859d192dc19898a40";
+    };
+    dependencies = [
+      sources."body-parser-1.17.2"
+      sources."chalk-1.1.3"
+      (sources."compression-1.6.2" // {
+        dependencies = [
+          sources."bytes-2.3.0"
+          sources."debug-2.2.0"
+          sources."ms-0.7.1"
+        ];
+      })
+      sources."connect-pause-0.1.1"
+      sources."cors-2.8.3"
+      sources."errorhandler-1.5.0"
+      sources."express-4.15.3"
+      sources."json-parse-helpfulerror-1.0.3"
+      sources."lodash-4.17.4"
+      sources."lodash-id-0.13.0"
+      sources."lowdb-0.15.5"
+      (sources."method-override-2.3.9" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
+      (sources."morgan-1.8.2" // {
+        dependencies = [
+          sources."debug-2.6.8"
+        ];
+      })
+      sources."object-assign-4.1.1"
+      sources."pluralize-3.1.0"
+      sources."request-2.81.0"
+      sources."server-destroy-1.0.1"
+      sources."shortid-2.2.8"
+      sources."update-notifier-1.0.3"
+      (sources."yargs-6.6.0" // {
+        dependencies = [
+          sources."camelcase-3.0.0"
+        ];
+      })
+      sources."bytes-2.4.0"
+      sources."content-type-1.0.2"
+      sources."debug-2.6.7"
+      sources."depd-1.1.0"
+      sources."http-errors-1.6.1"
+      sources."iconv-lite-0.4.15"
+      sources."on-finished-2.3.0"
+      sources."qs-6.4.0"
+      sources."raw-body-2.2.0"
+      sources."type-is-1.6.15"
+      sources."ms-2.0.0"
+      sources."inherits-2.0.3"
+      sources."setprototypeof-1.0.3"
+      sources."statuses-1.3.1"
+      sources."ee-first-1.1.1"
+      sources."unpipe-1.0.0"
+      sources."media-typer-0.3.0"
+      sources."mime-types-2.1.15"
+      sources."mime-db-1.27.0"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."accepts-1.3.3"
+      sources."compressible-2.0.10"
+      sources."on-headers-1.0.1"
+      sources."vary-1.1.1"
+      sources."negotiator-0.6.1"
+      sources."escape-html-1.0.3"
+      sources."array-flatten-1.1.1"
+      sources."content-disposition-0.5.2"
+      sources."cookie-0.3.1"
+      sources."cookie-signature-1.0.6"
+      sources."encodeurl-1.0.1"
+      sources."etag-1.8.0"
+      sources."finalhandler-1.0.3"
+      sources."fresh-0.5.0"
+      sources."merge-descriptors-1.0.1"
+      sources."methods-1.1.2"
+      sources."parseurl-1.3.1"
+      sources."path-to-regexp-0.1.7"
+      sources."proxy-addr-1.1.4"
+      sources."range-parser-1.2.0"
+      sources."send-0.15.3"
+      sources."serve-static-1.12.3"
+      sources."utils-merge-1.0.0"
+      sources."forwarded-0.1.0"
+      sources."ipaddr.js-1.3.0"
+      sources."destroy-1.0.4"
+      sources."mime-1.3.4"
+      sources."jju-1.3.0"
+      sources."graceful-fs-4.1.11"
+      sources."is-promise-2.1.0"
+      sources."steno-0.4.4"
+      sources."basic-auth-1.1.0"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.6.0"
+      sources."caseless-0.12.0"
+      sources."combined-stream-1.0.5"
+      sources."extend-3.0.1"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      sources."har-validator-4.2.1"
+      sources."hawk-3.1.3"
+      sources."http-signature-1.1.1"
+      sources."is-typedarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."json-stringify-safe-5.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."performance-now-0.2.0"
+      sources."safe-buffer-5.0.1"
+      sources."stringstream-0.0.5"
+      sources."tough-cookie-2.3.2"
+      sources."tunnel-agent-0.6.0"
+      sources."uuid-3.0.1"
+      sources."delayed-stream-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."ajv-4.11.8"
+      sources."har-schema-1.0.5"
+      sources."co-4.6.0"
+      sources."json-stable-stringify-1.0.1"
+      sources."jsonify-0.0.0"
+      sources."hoek-2.16.3"
+      sources."boom-2.10.1"
+      sources."cryptiles-2.0.5"
+      sources."sntp-1.0.9"
+      sources."assert-plus-0.2.0"
+      (sources."jsprim-1.4.0" // {
         dependencies = [
-          sources."source-map-0.4.4"
+          sources."assert-plus-1.0.0"
         ];
       })
-      (sources."js-yaml-3.8.3" // {
+      (sources."sshpk-1.13.0" // {
         dependencies = [
-          sources."esprima-3.1.3"
+          sources."assert-plus-1.0.0"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
+      sources."extsprintf-1.0.2"
+      sources."json-schema-0.2.3"
+      sources."verror-1.3.6"
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.1" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."assert-plus-1.0.0"
         ];
       })
-      sources."nopt-3.0.6"
-      sources."once-1.4.0"
-      sources."resolve-1.1.7"
-      sources."supports-color-3.2.3"
-      sources."which-1.2.14"
-      sources."wordwrap-1.0.0"
-      sources."estraverse-1.9.3"
-      sources."esutils-2.0.2"
-      sources."optionator-0.8.2"
-      sources."source-map-0.2.0"
-      sources."prelude-ls-1.1.2"
-      sources."deep-is-0.1.3"
-      sources."type-check-0.3.2"
-      sources."levn-0.3.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."amdefine-1.0.1"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
-      sources."path-is-absolute-1.0.1"
-      sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
-      sources."concat-map-0.0.1"
-      (sources."optimist-0.6.1" // {
+      (sources."getpass-0.1.7" // {
         dependencies = [
-          sources."wordwrap-0.0.3"
+          sources."assert-plus-1.0.0"
         ];
       })
-      (sources."uglify-js-2.8.22" // {
+      sources."jsbn-0.1.1"
+      sources."tweetnacl-0.14.5"
+      sources."jodid25519-1.0.2"
+      sources."ecc-jsbn-0.1.1"
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."punycode-1.4.1"
+      sources."boxen-0.6.0"
+      (sources."configstore-2.1.0" // {
         dependencies = [
-          sources."source-map-0.5.6"
+          sources."uuid-2.0.3"
         ];
       })
-      sources."minimist-0.0.10"
-      sources."yargs-3.10.0"
-      sources."uglify-to-browserify-1.0.2"
-      sources."camelcase-1.2.1"
-      (sources."cliui-2.1.0" // {
+      sources."is-npm-1.0.0"
+      sources."latest-version-2.0.0"
+      sources."lazy-req-1.1.0"
+      sources."semver-diff-2.1.0"
+      sources."xdg-basedir-2.0.0"
+      sources."ansi-align-1.1.0"
+      sources."camelcase-2.1.1"
+      sources."cli-boxes-1.0.0"
+      sources."filled-array-1.1.0"
+      sources."repeating-2.0.1"
+      sources."string-width-1.0.2"
+      sources."widest-line-1.0.0"
+      sources."is-finite-1.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."dot-prop-3.0.0"
+      sources."mkdirp-0.5.1"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.4"
+      sources."write-file-atomic-1.3.4"
+      sources."is-obj-1.0.1"
+      sources."minimist-0.0.8"
+      sources."os-homedir-1.0.2"
+      sources."imurmurhash-0.1.4"
+      sources."slide-1.1.6"
+      sources."package-json-2.4.0"
+      sources."got-5.7.1"
+      sources."registry-auth-token-3.3.1"
+      sources."registry-url-3.1.0"
+      sources."semver-5.3.0"
+      sources."create-error-class-3.0.2"
+      sources."duplexer2-0.1.4"
+      sources."is-redirect-1.0.0"
+      sources."is-retry-allowed-1.1.0"
+      sources."is-stream-1.1.0"
+      sources."lowercase-keys-1.0.0"
+      sources."node-status-codes-1.0.0"
+      sources."parse-json-2.2.0"
+      sources."pinkie-promise-2.0.1"
+      sources."read-all-stream-3.1.0"
+      sources."readable-stream-2.2.9"
+      sources."timed-out-3.1.3"
+      sources."unzip-response-1.0.2"
+      sources."url-parse-lax-1.0.0"
+      sources."capture-stack-trace-1.0.0"
+      sources."error-ex-1.3.1"
+      sources."is-arrayish-0.2.1"
+      sources."pinkie-2.0.4"
+      sources."buffer-shims-1.0.0"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."string_decoder-1.0.1"
+      sources."util-deprecate-1.0.2"
+      sources."prepend-http-1.0.4"
+      (sources."rc-1.2.1" // {
         dependencies = [
-          sources."wordwrap-0.0.2"
+          sources."minimist-1.2.0"
         ];
       })
+      sources."deep-extend-0.4.2"
+      sources."ini-1.3.4"
+      sources."strip-json-comments-2.0.1"
+      sources."cliui-3.2.0"
       sources."decamelize-1.2.0"
-      sources."window-size-0.1.0"
-      sources."center-align-0.1.3"
-      sources."right-align-0.1.3"
-      sources."align-text-0.1.4"
-      sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.0"
-      sources."longest-1.0.1"
-      sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
-      sources."argparse-1.0.9"
-      sources."sprintf-js-1.0.3"
-      sources."has-flag-1.0.0"
-      sources."isexe-2.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests ";
-      homepage = "https://github.com/gotwarlost/istanbul#readme";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-  };
-  jayschema = nodeEnv.buildNodePackage {
-    name = "jayschema";
-    packageName = "jayschema";
-    version = "0.3.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
-      sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58";
-    };
-    dependencies = [
-      sources."when-3.4.6"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A comprehensive JSON Schema validator for Node.js";
-      homepage = https://github.com/natesilva/jayschema;
-      license = "BSD-3-Clause";
-    };
-    production = true;
-  };
-  jshint = nodeEnv.buildNodePackage {
-    name = "jshint";
-    packageName = "jshint";
-    version = "2.9.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz";
-      sha1 = "5e3ba97848d5290273db514aee47fe24cf592934";
-    };
-    dependencies = [
-      sources."cli-1.0.1"
-      sources."console-browserify-1.1.0"
-      sources."exit-0.1.2"
-      sources."htmlparser2-3.8.3"
-      sources."minimatch-3.0.3"
-      sources."shelljs-0.3.0"
-      sources."strip-json-comments-1.0.4"
-      sources."lodash-3.7.0"
-      sources."glob-7.1.1"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."wrappy-1.0.2"
-      sources."date-now-0.1.4"
-      sources."domhandler-2.3.0"
-      sources."domutils-1.5.1"
-      sources."domelementtype-1.3.0"
-      sources."readable-stream-1.1.14"
-      sources."entities-1.0.0"
-      (sources."dom-serializer-0.1.0" // {
+      sources."get-caller-file-1.0.2"
+      sources."os-locale-1.4.0"
+      sources."read-pkg-up-1.0.1"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."set-blocking-2.0.0"
+      sources."which-module-1.0.0"
+      sources."y18n-3.2.1"
+      (sources."yargs-parser-4.2.1" // {
         dependencies = [
-          sources."domelementtype-1.1.3"
-          sources."entities-1.1.1"
+          sources."camelcase-3.0.0"
         ];
       })
-      sources."core-util-is-1.0.2"
-      sources."isarray-0.0.1"
-      sources."string_decoder-0.10.31"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
-      sources."concat-map-0.0.1"
+      sources."wrap-ansi-2.1.0"
+      sources."lcid-1.0.0"
+      sources."invert-kv-1.0.0"
+      sources."find-up-1.1.2"
+      sources."read-pkg-1.1.0"
+      sources."path-exists-2.1.0"
+      sources."load-json-file-1.1.0"
+      sources."normalize-package-data-2.3.8"
+      sources."path-type-1.1.0"
+      sources."pify-2.3.0"
+      sources."strip-bom-2.0.0"
+      sources."is-utf8-0.2.1"
+      sources."hosted-git-info-2.4.2"
+      sources."is-builtin-module-1.0.0"
+      sources."validate-npm-package-license-3.0.1"
+      sources."builtin-modules-1.1.1"
+      sources."spdx-correct-1.0.2"
+      sources."spdx-expression-parse-1.0.4"
+      sources."spdx-license-ids-1.2.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Static analysis tool for JavaScript";
-      homepage = http://jshint.com/;
-      license = "(MIT AND JSON)";
-    };
-    production = true;
-  };
-  json = nodeEnv.buildNodePackage {
-    name = "json";
-    packageName = "json";
-    version = "9.0.6";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/json/-/json-9.0.6.tgz";
-      sha1 = "7972c2a5a48a42678db2730c7c2c4ee6e4e24585";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "a 'json' command for massaging and processing JSON on the command line";
-      homepage = "https://github.com/trentm/json#readme";
-    };
-    production = true;
-  };
-  jsontool = nodeEnv.buildNodePackage {
-    name = "jsontool";
-    packageName = "jsontool";
-    version = "7.0.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz";
-      sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "a 'json' command for massaging JSON on the command line";
-      homepage = https://github.com/trentm/json;
+      description = "Serves JSON files through REST routes.";
+      homepage = https://github.com/typicode/json-server;
+      license = "MIT";
     };
     production = true;
   };
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.8.3";
+    version = "3.8.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.3.tgz";
-      sha1 = "33a05ec481c850c8875929166fe1beb61c728766";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz";
+      sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6";
     };
     dependencies = [
       sources."argparse-1.0.9"
@@ -23364,26 +23757,22 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.6.0";
+    version = "1.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.6.0.tgz";
-      sha1 = "0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e";
+      url = "https://registry.npmjs.org/karma/-/karma-1.7.0.tgz";
+      sha1 = "6f7a1a406446fa2e187ec95398698f4cee476269";
     };
     dependencies = [
       sources."bluebird-3.5.0"
-      sources."body-parser-1.17.1"
-      sources."chokidar-1.6.1"
+      sources."body-parser-1.17.2"
+      sources."chokidar-1.7.0"
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
       })
-      (sources."connect-3.6.1" // {
-        dependencies = [
-          sources."debug-2.6.3"
-        ];
-      })
+      sources."connect-3.6.2"
       sources."core-js-2.4.1"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
@@ -23395,7 +23784,7 @@ in
           sources."repeat-string-0.2.2"
         ];
       })
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."http-proxy-1.16.2"
       sources."isbinaryfile-3.0.2"
@@ -23408,8 +23797,8 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."mime-1.3.4"
-      sources."minimatch-3.0.3"
+      sources."mime-1.3.6"
+      sources."minimatch-3.0.4"
       sources."optimist-0.6.1"
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
@@ -23419,6 +23808,7 @@ in
         dependencies = [
           sources."debug-2.3.3"
           sources."object-assign-4.1.0"
+          sources."ms-0.7.2"
         ];
       })
       sources."source-map-0.5.6"
@@ -23426,7 +23816,7 @@ in
       sources."useragent-2.1.13"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
-      sources."debug-2.6.1"
+      sources."debug-2.6.7"
       sources."depd-1.1.0"
       sources."http-errors-1.6.1"
       sources."iconv-lite-0.4.15"
@@ -23434,7 +23824,7 @@ in
       sources."qs-6.4.0"
       sources."raw-body-2.2.0"
       sources."type-is-1.6.15"
-      sources."ms-0.7.2"
+      sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
@@ -23460,7 +23850,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.1"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -23482,7 +23872,7 @@ in
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
-      sources."is-dotfile-1.0.2"
+      sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
@@ -23491,13 +23881,13 @@ in
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
       sources."nan-2.6.2"
-      sources."node-pre-gyp-0.6.34"
+      sources."node-pre-gyp-0.6.35"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.1.0"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -23523,12 +23913,12 @@ in
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
@@ -23598,11 +23988,7 @@ in
       sources."once-1.4.0"
       sources."uid-number-0.0.6"
       sources."wrappy-1.0.2"
-      (sources."finalhandler-1.0.1" // {
-        dependencies = [
-          sources."debug-2.6.3"
-        ];
-      })
+      sources."finalhandler-1.0.3"
       sources."parseurl-1.3.1"
       sources."utils-merge-1.0.0"
       sources."encodeurl-1.0.1"
@@ -23622,6 +24008,7 @@ in
       (sources."engine.io-1.8.3" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       (sources."has-binary-0.1.7" // {
@@ -23632,11 +24019,13 @@ in
       (sources."socket.io-adapter-0.5.0" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       (sources."socket.io-client-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       (sources."socket.io-parser-2.3.1" // {
@@ -23666,6 +24055,7 @@ in
       (sources."engine.io-client-1.8.3" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       sources."indexof-0.0.1"
@@ -23757,11 +24147,11 @@ in
       })
       sources."finalhandler-0.4.0"
       sources."http-errors-1.3.1"
-      (sources."method-override-2.3.8" // {
+      (sources."method-override-2.3.9" // {
         dependencies = [
-          sources."debug-2.6.3"
+          sources."debug-2.6.8"
           sources."vary-1.1.1"
-          sources."ms-0.7.2"
+          sources."ms-2.0.0"
         ];
       })
       sources."morgan-1.6.1"
@@ -23868,8 +24258,9 @@ in
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
       sources."replace-ext-0.0.1"
@@ -23911,7 +24302,7 @@ in
       sources."to-absolute-glob-0.1.1"
       sources."unique-stream-2.2.1"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
@@ -23929,7 +24320,7 @@ in
         ];
       })
       sources."filename-regex-2.0.1"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       (sources."parse-glob-3.0.4" // {
@@ -23961,7 +24352,7 @@ in
           sources."is-extglob-1.0.0"
         ];
       })
-      sources."is-dotfile-1.0.2"
+      sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."is-stream-1.1.0"
@@ -24007,7 +24398,7 @@ in
       sources."eyes-0.1.8"
       sources."pkginfo-0.2.3"
       sources."request-2.9.203"
-      sources."stack-trace-0.0.9"
+      sources."stack-trace-0.0.10"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -24019,10 +24410,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "3.3.0";
+    version = "3.4.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-3.3.0.tgz";
-      sha1 = "d29b7428d3f52c82e2e65df1ecb7064e1aabbfb5";
+      url = "https://registry.npmjs.org/mocha/-/mocha-3.4.2.tgz";
+      sha1 = "d0ef4d332126dbf18d0d640c9b382dd48be97594";
     };
     dependencies = [
       sources."browser-stdout-1.3.0"
@@ -24041,7 +24432,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -24138,8 +24529,9 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."minimist-0.0.8"
       sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
@@ -24166,7 +24558,6 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -24214,10 +24605,10 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
@@ -24234,7 +24625,7 @@ in
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
@@ -24280,12 +24671,12 @@ in
     };
     dependencies = [
       sources."fstream-1.0.11"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.1.0"
       sources."osenv-0.1.4"
       sources."request-2.81.0"
       sources."rimraf-2.6.1"
@@ -24313,15 +24704,16 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
@@ -24345,7 +24737,6 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -24415,22 +24806,17 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
-      sources."debug-2.6.6"
-      (sources."express-4.15.2" // {
+      sources."debug-2.6.8"
+      (sources."express-4.15.3" // {
         dependencies = [
-          sources."debug-2.6.1"
-          sources."ms-0.7.2"
+          sources."debug-2.6.7"
         ];
       })
       sources."glob-5.0.15"
       sources."path-is-absolute-1.0.1"
       sources."rc-1.2.1"
       sources."semver-4.3.6"
-      (sources."serve-favicon-2.4.2" // {
-        dependencies = [
-          sources."ms-1.0.0"
-        ];
-      })
+      sources."serve-favicon-2.4.3"
       sources."strong-data-uri-1.0.4"
       sources."v8-debug-1.0.1"
       sources."v8-profiler-5.7.0"
@@ -24513,7 +24899,7 @@ in
       sources."is-finite-1.0.2"
       sources."number-is-nan-1.0.1"
       sources."get-stdin-4.0.1"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
@@ -24524,9 +24910,9 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.0"
-      (sources."finalhandler-1.0.2" // {
+      (sources."finalhandler-1.0.3" // {
         dependencies = [
-          sources."debug-2.6.4"
+          sources."debug-2.6.7"
         ];
       })
       sources."fresh-0.5.0"
@@ -24538,13 +24924,12 @@ in
       sources."proxy-addr-1.1.4"
       sources."qs-6.4.0"
       sources."range-parser-1.2.0"
-      (sources."send-0.15.1" // {
+      (sources."send-0.15.3" // {
         dependencies = [
-          sources."debug-2.6.1"
-          sources."ms-0.7.2"
+          sources."debug-2.6.7"
         ];
       })
-      sources."serve-static-1.12.1"
+      sources."serve-static-1.12.3"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
       sources."type-is-1.6.15"
@@ -24563,32 +24948,33 @@ in
       sources."inherits-2.0.3"
       sources."media-typer-0.3.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
+      sources."safe-buffer-5.0.1"
       sources."truncate-1.0.5"
       sources."nan-2.6.2"
-      (sources."node-pre-gyp-0.6.34" // {
+      (sources."node-pre-gyp-0.6.35" // {
         dependencies = [
           sources."rimraf-2.6.1"
           sources."semver-5.3.0"
-          sources."glob-7.1.1"
+          sources."glob-7.1.2"
         ];
       })
       sources."nopt-4.0.1"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.1.0"
       sources."request-2.81.0"
       sources."tar-2.2.1"
       (sources."tar-pack-3.4.0" // {
         dependencies = [
           sources."rimraf-2.6.1"
-          sources."glob-7.1.1"
+          sources."glob-7.1.2"
         ];
       })
       sources."abbrev-1.1.0"
@@ -24602,12 +24988,12 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."ansi-regex-2.1.1"
@@ -24626,7 +25012,6 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -24699,15 +25084,15 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.34";
+    version = "0.6.35";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz";
-      sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.35.tgz";
+      sha1 = "1c161fc9fbf1f3ffecd751959f0fdbd12a56c4ab";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.1.0"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -24734,20 +25119,21 @@ in
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
@@ -24767,7 +25153,6 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -24815,10 +25200,10 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -24828,10 +25213,10 @@ in
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
       sources."graceful-fs-4.1.11"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -24850,12 +25235,12 @@ in
       sha1 = "226c562bd2a7b13d3d7518b49ad4828a3623d06c";
     };
     dependencies = [
-      sources."chokidar-1.6.1"
-      sources."debug-2.6.6"
+      sources."chokidar-1.7.0"
+      sources."debug-2.6.8"
       sources."es6-promise-3.3.1"
       sources."ignore-by-default-1.0.1"
       sources."lodash.defaults-3.1.2"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."ps-tree-1.1.0"
       (sources."touch-1.0.0" // {
         dependencies = [
@@ -24882,7 +25267,7 @@ in
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.1"
       sources."is-extglob-1.0.0"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."normalize-path-2.1.1"
       sources."object.omit-2.0.1"
       sources."parse-glob-3.0.4"
@@ -24904,7 +25289,7 @@ in
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
-      sources."is-dotfile-1.0.2"
+      sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
@@ -24914,13 +25299,14 @@ in
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."nan-2.6.2"
-      sources."node-pre-gyp-0.6.34"
+      sources."node-pre-gyp-0.6.35"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.1.0"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -24947,12 +25333,12 @@ in
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
@@ -24972,7 +25358,6 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -25020,7 +25405,7 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
@@ -25029,7 +25414,7 @@ in
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."lodash.assign-3.2.0"
       sources."lodash.restparam-3.6.1"
       sources."lodash._baseassign-3.2.0"
@@ -25129,8 +25514,8 @@ in
       sources."express-4.14.0"
       (sources."follow-redirects-1.2.1" // {
         dependencies = [
-          sources."debug-2.6.6"
-          sources."ms-0.7.3"
+          sources."debug-2.6.8"
+          sources."ms-2.0.0"
         ];
       })
       sources."fs-extra-1.0.0"
@@ -25176,7 +25561,7 @@ in
           sources."tunnel-agent-0.6.0"
         ];
       })
-      sources."node-red-node-rbe-0.1.8"
+      sources."node-red-node-rbe-0.1.9"
       sources."bcrypt-1.0.2"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
@@ -25220,14 +25605,15 @@ in
       sources."boolbase-1.0.0"
       sources."nth-check-1.0.1"
       sources."domelementtype-1.3.0"
-      sources."domhandler-2.3.0"
+      sources."domhandler-2.4.1"
       sources."readable-stream-2.2.9"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."vary-1.1.1"
@@ -25291,17 +25677,17 @@ in
       sources."glob-stream-6.1.0"
       sources."through2-2.0.3"
       sources."extend-3.0.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."glob-parent-3.1.0"
       sources."is-negated-glob-1.0.0"
-      sources."ordered-read-streams-1.0.0"
+      sources."ordered-read-streams-1.0.1"
       sources."pumpify-1.3.5"
       sources."remove-trailing-separator-1.0.1"
       sources."to-absolute-glob-2.0.1"
       sources."unique-stream-2.2.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
@@ -25309,7 +25695,6 @@ in
       sources."is-glob-3.1.0"
       sources."path-dirname-1.0.2"
       sources."is-extglob-2.1.1"
-      sources."is-stream-1.1.0"
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
@@ -25328,7 +25713,6 @@ in
       sources."through2-filter-2.0.0"
       sources."jsonify-0.0.0"
       sources."bl-1.2.1"
-      sources."safe-buffer-5.0.1"
       sources."abbrev-1.1.0"
       sources."uid2-0.0.3"
       sources."passport-strategy-1.0.0"
@@ -25345,7 +25729,7 @@ in
       sources."wordwrap-0.0.2"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
@@ -25378,7 +25762,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.4.0"
+          sources."async-2.4.1"
         ];
       })
       sources."har-validator-2.0.6"
@@ -25510,7 +25894,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.1.0"
       sources."rc-1.1.7"
       sources."rimraf-2.5.4"
       sources."tar-2.2.1"
@@ -25531,11 +25915,11 @@ in
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."block-stream-0.0.9"
@@ -25605,9 +25989,9 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-2.6.6" // {
+      (sources."debug-2.6.8" // {
         dependencies = [
-          sources."ms-0.7.3"
+          sources."ms-2.0.0"
         ];
       })
       sources."qs-0.5.1"
@@ -25615,7 +25999,7 @@ in
       sources."bytes-0.2.0"
       sources."pause-0.0.1"
       sources."mime-1.2.6"
-      sources."coffee-script-1.12.5"
+      sources."coffee-script-1.12.6"
       sources."vows-0.8.1"
       sources."eyes-0.1.8"
       sources."diff-1.0.8"
@@ -25680,10 +26064,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.5.0";
+    version = "4.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.5.0.tgz";
-      sha1 = "dc6a31f28807e6db980ed5083315667dcc8d0475";
+      url = "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz";
+      sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -25705,8 +26089,8 @@ in
       sources."fs-vacuum-1.2.10"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fstream-1.0.11"
-      sources."fstream-npm-1.2.0"
-      sources."glob-7.1.1"
+      sources."fstream-npm-1.2.1"
+      sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.4.2"
@@ -25714,7 +26098,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.4"
-      sources."init-package-json-1.9.6"
+      sources."init-package-json-1.10.1"
       sources."lazy-property-1.0.0"
       sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
@@ -25788,14 +26172,14 @@ in
       sources."lodash.restparam-3.6.1"
       sources."readdir-scoped-modules-1.0.2"
       sources."validate-npm-package-license-3.0.1"
-      sources."jsonparse-1.3.0"
+      sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
       sources."proto-list-1.2.4"
       sources."fstream-ignore-1.0.5"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
@@ -25836,7 +26220,7 @@ in
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
@@ -25850,8 +26234,9 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -25869,7 +26254,6 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -25919,20 +26303,29 @@ in
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
-      (sources."boxen-1.0.0" // {
+      (sources."boxen-1.1.0" // {
         dependencies = [
           sources."string-width-2.0.0"
           sources."is-fullwidth-code-point-2.0.0"
         ];
       })
       sources."chalk-1.1.3"
-      sources."configstore-3.0.0"
+      (sources."configstore-3.1.0" // {
+        dependencies = [
+          sources."write-file-atomic-2.1.0"
+        ];
+      })
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
       sources."lazy-req-2.0.0"
       sources."semver-diff-2.1.0"
       sources."xdg-basedir-3.0.0"
-      sources."ansi-align-1.1.0"
+      (sources."ansi-align-2.0.0" // {
+        dependencies = [
+          sources."string-width-2.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
       sources."camelcase-4.1.0"
       sources."cli-boxes-1.0.0"
       sources."term-size-0.1.1"
@@ -25951,8 +26344,10 @@ in
       sources."has-ansi-2.0.0"
       sources."supports-color-2.0.0"
       sources."dot-prop-4.1.1"
+      sources."make-dir-1.0.0"
       sources."unique-string-1.0.0"
       sources."is-obj-1.0.1"
+      sources."pify-2.3.0"
       sources."crypto-random-string-1.0.0"
       sources."package-json-4.0.1"
       sources."got-6.7.1"
@@ -25974,7 +26369,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."builtins-1.0.3"
       sources."isexe-2.0.0"
@@ -26027,7 +26422,7 @@ in
       })
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.5"
+      sources."coffee-script-1.12.6"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."request-2.81.0"
@@ -26038,7 +26433,7 @@ in
       sources."rimraf-2.6.1"
       sources."retry-0.6.0"
       sources."couch-login-0.1.20"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.1.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -26104,11 +26499,11 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -26125,7 +26520,7 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
@@ -26133,7 +26528,7 @@ in
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
@@ -26177,10 +26572,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.11.0";
+    version = "2.11.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.11.0.tgz";
-      sha1 = "6073a2c022eaf27352e2a8b08de931776207b818";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.11.2.tgz";
+      sha1 = "1b36ffe4c8e67711a8a4618f73e3d2e3b35860c3";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -26203,7 +26598,7 @@ in
       sources."require-dir-0.3.1"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.30.0" // {
+      (sources."snyk-1.32.0" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -26250,8 +26645,8 @@ in
       sources."fs-vacuum-1.2.10"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fstream-1.0.11"
-      sources."fstream-npm-1.2.0"
-      sources."glob-7.1.1"
+      sources."fstream-npm-1.2.1"
+      sources."glob-7.1.2"
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.1.5"
@@ -26343,7 +26738,7 @@ in
       sources."clone-1.0.2"
       sources."proto-list-1.2.4"
       sources."fstream-ignore-1.0.5"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
@@ -26364,16 +26759,16 @@ in
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."es6-symbol-3.1.1"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.15"
+      sources."es5-ext-0.10.21"
       sources."es6-iterator-2.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
@@ -26387,8 +26782,9 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."mute-stream-0.0.7"
@@ -26546,11 +26942,11 @@ in
       sources."wordwrap-0.0.2"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
-      sources."js-yaml-3.8.3"
+      sources."js-yaml-3.8.4"
       sources."argparse-1.0.9"
       sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
@@ -26603,8 +26999,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."safe-buffer-5.0.1"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."get-caller-file-1.0.2"
       sources."lodash.assign-4.2.0"
@@ -26665,7 +27060,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."babybird-0.0.1"
-      (sources."body-parser-1.17.1" // {
+      (sources."body-parser-1.17.2" // {
         dependencies = [
           sources."content-type-1.0.2"
         ];
@@ -26683,15 +27078,10 @@ in
       sources."diff-1.4.0"
       sources."domino-1.0.28"
       sources."entities-1.1.1"
-      (sources."express-4.15.2" // {
+      (sources."express-4.15.3" // {
         dependencies = [
           sources."content-type-1.0.2"
-          (sources."finalhandler-1.0.2" // {
-            dependencies = [
-              sources."debug-2.6.4"
-            ];
-          })
-          sources."ms-0.7.3"
+          sources."finalhandler-1.0.3"
         ];
       })
       sources."express-handlebars-3.0.0"
@@ -26701,7 +27091,7 @@ in
           sources."ms-0.7.1"
         ];
       })
-      sources."js-yaml-3.8.3"
+      sources."js-yaml-3.8.4"
       sources."mediawiki-title-0.5.6"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
       sources."node-uuid-1.4.8"
@@ -26709,11 +27099,7 @@ in
       sources."prfun-2.1.4"
       sources."request-2.81.0"
       sources."semver-5.3.0"
-      (sources."serve-favicon-2.4.2" // {
-        dependencies = [
-          sources."ms-1.0.0"
-        ];
-      })
+      sources."serve-favicon-2.4.3"
       (sources."service-runner-2.3.0" // {
         dependencies = [
           sources."yargs-7.1.0"
@@ -26733,7 +27119,7 @@ in
       sources."asap-2.0.5"
       sources."is-arguments-1.0.2"
       sources."bytes-2.4.0"
-      sources."debug-2.6.1"
+      sources."debug-2.6.7"
       sources."depd-1.1.0"
       sources."http-errors-1.6.1"
       sources."iconv-lite-0.4.15"
@@ -26741,7 +27127,7 @@ in
       sources."qs-6.4.0"
       sources."raw-body-2.2.0"
       sources."type-is-1.6.15"
-      sources."ms-0.7.2"
+      sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
@@ -26775,8 +27161,8 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.4"
       sources."range-parser-1.2.0"
-      sources."send-0.15.1"
-      sources."serve-static-1.12.1"
+      sources."send-0.15.3"
+      sources."serve-static-1.12.3"
       sources."utils-merge-1.0.0"
       sources."forwarded-0.1.0"
       sources."ipaddr.js-1.3.0"
@@ -26784,7 +27170,7 @@ in
       sources."mime-1.3.4"
       sources."glob-6.0.4"
       sources."graceful-fs-4.1.11"
-      (sources."handlebars-4.0.8" // {
+      (sources."handlebars-4.0.10" // {
         dependencies = [
           sources."async-1.5.2"
         ];
@@ -26792,7 +27178,7 @@ in
       sources."object.assign-4.0.4"
       sources."promise-7.1.1"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -26801,7 +27187,7 @@ in
       sources."concat-map-0.0.1"
       sources."optimist-0.6.1"
       sources."source-map-0.4.4"
-      (sources."uglify-js-2.8.22" // {
+      (sources."uglify-js-2.8.27" // {
         dependencies = [
           sources."source-map-0.5.6"
           sources."yargs-3.10.0"
@@ -26823,7 +27209,7 @@ in
       sources."right-align-0.1.3"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
@@ -26905,11 +27291,11 @@ in
         dependencies = [
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."dnscache-1.0.1"
-      sources."dtrace-provider-0.8.1"
+      sources."dtrace-provider-0.8.2"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
@@ -26922,7 +27308,11 @@ in
       sources."ncp-2.0.0"
       sources."rimraf-2.4.5"
       sources."gelfling-0.3.1"
-      sources."kad-git+https://github.com/gwicke/kad.git#master"
+      (sources."kad-git+https://github.com/gwicke/kad.git#master" // {
+        dependencies = [
+          sources."ms-0.7.3"
+        ];
+      })
       sources."clarinet-0.11.0"
       sources."colors-1.1.2"
       sources."hat-0.0.3"
@@ -26930,7 +27320,7 @@ in
         dependencies = [
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."kad-localstorage-0.0.7"
@@ -26938,7 +27328,7 @@ in
         dependencies = [
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."lodash-3.10.1"
@@ -26947,7 +27337,7 @@ in
         dependencies = [
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."buffer-shims-1.0.0"
@@ -26958,7 +27348,7 @@ in
         dependencies = [
           sources."readable-stream-2.2.9"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.0"
+          sources."string_decoder-1.0.1"
         ];
       })
       sources."get-caller-file-1.0.2"
@@ -27033,7 +27423,7 @@ in
         ];
       })
       sources."keypress-0.2.1"
-      sources."mime-1.3.4"
+      sources."mime-1.3.6"
       sources."network-address-1.1.2"
       sources."numeral-1.5.6"
       sources."open-0.0.5"
@@ -27073,7 +27463,7 @@ in
       sources."bplist-parser-0.1.1"
       sources."concat-stream-1.6.0"
       sources."plist-1.2.0"
-      sources."reverse-http-1.2.0"
+      sources."reverse-http-1.3.0"
       sources."stream-buffers-2.2.0"
       sources."big-integer-1.6.22"
       sources."inherits-2.0.3"
@@ -27083,8 +27473,9 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
       sources."xmldom-0.1.27"
@@ -27117,7 +27508,6 @@ in
       sources."dns-packet-1.1.1"
       sources."thunky-0.1.0"
       sources."ip-1.1.5"
-      sources."safe-buffer-5.0.1"
       sources."meow-3.7.0"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
@@ -27190,7 +27580,7 @@ in
       sources."simple-concat-1.0.0"
       sources."unzip-response-2.0.1"
       sources."end-of-stream-1.4.0"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."bitfield-0.1.0"
@@ -27210,7 +27600,7 @@ in
       sources."rimraf-2.6.1"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.1"
-      (sources."random-access-file-1.7.2" // {
+      (sources."random-access-file-1.7.3" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.2"
@@ -27220,8 +27610,8 @@ in
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
       sources."buffer-alloc-unsafe-1.0.0"
-      sources."debug-2.6.6"
-      sources."ms-0.7.3"
+      sources."debug-2.6.8"
+      sources."ms-2.0.0"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
       (sources."peer-wire-protocol-0.7.0" // {
@@ -27235,10 +27625,10 @@ in
       sources."speedometer-0.1.4"
       sources."utp-0.0.7"
       sources."cyclist-0.1.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
@@ -27297,17 +27687,16 @@ in
   peerflix-server = nodeEnv.buildNodePackage {
     name = "peerflix-server";
     packageName = "peerflix-server";
-    version = "0.1.3";
+    version = "0.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.1.3.tgz";
-      sha1 = "1f3c2b81188de82482f64cf89d015f5428e4c4e5";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.2.0.tgz";
+      sha1 = "1848fdc14036f013af7489a39e8a5f0f9da48b87";
     };
     dependencies = [
-      sources."connect-multiparty-1.2.5"
-      (sources."express-3.5.3" // {
+      sources."connect-multiparty-2.0.0"
+      (sources."express-3.21.2" // {
         dependencies = [
-          sources."range-parser-1.0.0"
-          sources."mkdirp-0.4.0"
+          sources."range-parser-1.0.3"
         ];
       })
       sources."lodash-2.4.2"
@@ -27315,12 +27704,13 @@ in
       sources."pump-1.0.2"
       sources."range-parser-1.2.0"
       sources."read-torrent-1.3.0"
-      (sources."socket.io-1.7.3" // {
+      (sources."socket.io-1.7.4" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
-      (sources."torrent-stream-0.18.1" // {
+      (sources."torrent-stream-1.0.3" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
           sources."mkdirp-0.3.5"
@@ -27328,88 +27718,132 @@ in
         ];
       })
       sources."fluent-ffmpeg-2.1.2"
-      sources."multiparty-3.3.2"
-      sources."on-finished-2.1.1"
-      sources."qs-2.2.5"
-      sources."type-is-1.5.7"
-      sources."readable-stream-1.1.14"
-      sources."stream-counter-0.2.0"
-      sources."core-util-is-1.0.2"
-      sources."isarray-0.0.1"
-      sources."string_decoder-0.10.31"
-      sources."inherits-2.0.3"
-      sources."ee-first-1.1.0"
+      sources."multiparty-4.1.3"
+      sources."on-finished-2.3.0"
+      sources."qs-4.0.0"
+      sources."type-is-1.6.15"
+      sources."fd-slicer-1.0.1"
+      sources."pend-1.2.0"
+      sources."ee-first-1.1.1"
       sources."media-typer-0.3.0"
-      sources."mime-types-2.0.14"
-      sources."mime-db-1.12.0"
-      (sources."connect-2.14.5" // {
+      sources."mime-types-2.1.15"
+      sources."mime-db-1.27.0"
+      sources."basic-auth-1.0.4"
+      (sources."connect-2.30.2" // {
         dependencies = [
-          sources."qs-0.6.6"
-          sources."multiparty-2.2.0"
+          sources."multiparty-3.3.2"
         ];
       })
-      sources."commander-1.3.2"
-      sources."cookie-0.1.2"
-      sources."buffer-crc32-0.2.1"
-      sources."fresh-0.2.2"
-      sources."methods-0.1.0"
-      (sources."send-0.3.0" // {
+      sources."content-disposition-0.5.0"
+      sources."content-type-1.0.2"
+      sources."commander-2.6.0"
+      sources."cookie-0.1.3"
+      sources."cookie-signature-1.0.6"
+      sources."debug-2.2.0"
+      sources."depd-1.0.1"
+      sources."escape-html-1.0.2"
+      sources."etag-1.7.0"
+      sources."fresh-0.3.0"
+      sources."merge-descriptors-1.0.0"
+      sources."methods-1.1.2"
+      sources."parseurl-1.3.1"
+      sources."proxy-addr-1.0.10"
+      (sources."send-0.13.0" // {
         dependencies = [
-          sources."debug-0.8.0"
+          sources."destroy-1.0.3"
           sources."range-parser-1.0.3"
+          sources."statuses-1.2.1"
         ];
       })
-      sources."cookie-signature-1.0.3"
-      sources."merge-descriptors-0.0.2"
-      sources."debug-0.8.1"
+      sources."utils-merge-1.0.0"
+      sources."vary-1.0.1"
       sources."basic-auth-connect-1.0.0"
-      (sources."cookie-parser-1.0.1" // {
+      sources."body-parser-1.13.3"
+      sources."bytes-2.1.0"
+      sources."cookie-parser-1.3.5"
+      sources."compression-1.5.2"
+      sources."connect-timeout-1.6.2"
+      sources."csurf-1.8.3"
+      (sources."errorhandler-1.4.3" // {
+        dependencies = [
+          sources."accepts-1.3.3"
+          sources."escape-html-1.0.3"
+          sources."negotiator-0.6.1"
+        ];
+      })
+      (sources."express-session-1.11.3" // {
+        dependencies = [
+          sources."uid-safe-2.0.0"
+        ];
+      })
+      sources."finalhandler-0.4.0"
+      sources."http-errors-1.3.1"
+      (sources."method-override-2.3.9" // {
         dependencies = [
-          sources."cookie-0.1.0"
+          sources."debug-2.6.8"
+          sources."vary-1.1.1"
+          sources."ms-2.0.0"
         ];
       })
-      (sources."compression-1.0.0" // {
+      sources."morgan-1.6.1"
+      sources."on-headers-1.0.1"
+      sources."pause-0.1.0"
+      (sources."response-time-2.3.2" // {
         dependencies = [
-          sources."bytes-0.2.1"
+          sources."depd-1.1.0"
         ];
       })
-      sources."connect-timeout-1.0.0"
-      sources."csurf-1.1.0"
-      sources."errorhandler-1.0.0"
-      (sources."express-session-1.0.2" // {
+      (sources."serve-favicon-2.3.2" // {
         dependencies = [
-          sources."cookie-0.1.0"
-          sources."debug-0.7.4"
+          sources."ms-0.7.2"
         ];
       })
-      sources."method-override-1.0.0"
-      (sources."morgan-1.0.0" // {
+      (sources."serve-index-1.7.3" // {
         dependencies = [
-          sources."bytes-0.2.1"
+          sources."escape-html-1.0.3"
         ];
       })
-      sources."raw-body-1.1.4"
-      sources."response-time-1.0.0"
-      sources."setimmediate-1.0.1"
-      (sources."serve-index-1.0.1" // {
+      (sources."serve-static-1.10.3" // {
         dependencies = [
-          sources."negotiator-0.4.2"
+          sources."escape-html-1.0.3"
+          sources."send-0.13.2"
+          sources."depd-1.1.0"
+          sources."range-parser-1.0.3"
+          sources."statuses-1.2.1"
         ];
       })
-      sources."serve-static-1.1.0"
-      sources."static-favicon-1.0.2"
-      sources."vhost-1.0.0"
-      sources."bytes-0.3.0"
-      sources."pause-0.0.1"
-      sources."negotiator-0.3.0"
-      sources."compressible-1.0.0"
-      sources."uid2-0.0.3"
-      sources."scmp-0.0.3"
-      sources."utils-merge-1.0.0"
-      sources."batch-0.5.0"
-      sources."parseurl-1.0.1"
-      sources."keypress-0.1.0"
-      sources."mime-1.2.11"
+      sources."vhost-3.0.2"
+      sources."iconv-lite-0.4.11"
+      (sources."raw-body-2.1.7" // {
+        dependencies = [
+          sources."bytes-2.4.0"
+          sources."iconv-lite-0.4.13"
+        ];
+      })
+      sources."unpipe-1.0.0"
+      sources."accepts-1.2.13"
+      sources."compressible-2.0.10"
+      sources."negotiator-0.5.3"
+      sources."ms-0.7.1"
+      sources."csrf-3.0.6"
+      sources."rndm-1.2.0"
+      sources."tsscmp-1.0.5"
+      sources."uid-safe-2.1.4"
+      sources."random-bytes-1.0.0"
+      sources."crc-3.3.0"
+      sources."base64-url-1.2.1"
+      sources."inherits-2.0.3"
+      sources."statuses-1.3.1"
+      sources."readable-stream-1.1.14"
+      sources."stream-counter-0.2.0"
+      sources."core-util-is-1.0.2"
+      sources."isarray-0.0.1"
+      sources."string_decoder-0.10.31"
+      sources."batch-0.5.3"
+      sources."destroy-1.0.4"
+      sources."mime-1.3.4"
+      sources."forwarded-0.1.0"
+      sources."ipaddr.js-1.0.5"
       sources."minimist-0.0.8"
       sources."end-of-stream-1.4.0"
       sources."once-1.4.0"
@@ -27422,6 +27856,7 @@ in
       })
       (sources."request-2.16.6" // {
         dependencies = [
+          sources."mime-1.2.11"
           sources."qs-0.5.6"
         ];
       })
@@ -27432,7 +27867,11 @@ in
       sources."bencode-0.7.0"
       sources."simple-sha1-2.1.0"
       sources."rusha-0.8.6"
-      sources."form-data-0.0.10"
+      (sources."form-data-0.0.10" // {
+        dependencies = [
+          sources."mime-1.2.11"
+        ];
+      })
       sources."hawk-0.10.2"
       sources."node-uuid-1.4.8"
       sources."cookie-jar-0.2.0"
@@ -27448,10 +27887,13 @@ in
       sources."boom-0.3.8"
       sources."cryptiles-0.1.3"
       sources."sntp-0.1.4"
-      (sources."engine.io-1.8.3" // {
+      (sources."engine.io-1.8.4" // {
         dependencies = [
+          sources."accepts-1.3.3"
           sources."debug-2.3.3"
           sources."cookie-0.3.1"
+          sources."negotiator-0.6.1"
+          sources."ms-0.7.2"
         ];
       })
       sources."has-binary-0.1.7"
@@ -27459,31 +27901,23 @@ in
       (sources."socket.io-adapter-0.5.0" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
-      (sources."socket.io-client-1.7.3" // {
+      (sources."socket.io-client-1.7.4" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       (sources."socket.io-parser-2.3.1" // {
         dependencies = [
-          sources."debug-2.2.0"
           sources."component-emitter-1.1.2"
-          sources."ms-0.7.1"
-        ];
-      })
-      sources."ms-0.7.2"
-      (sources."accepts-1.3.3" // {
-        dependencies = [
-          sources."mime-types-2.1.15"
-          sources."negotiator-0.6.1"
-          sources."mime-db-1.27.0"
         ];
       })
       sources."base64id-1.0.0"
       sources."engine.io-parser-1.3.2"
-      sources."ws-1.1.2"
+      sources."ws-1.1.4"
       sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
@@ -27494,9 +27928,11 @@ in
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.3" // {
+      (sources."engine.io-client-1.8.4" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ws-1.1.2"
+          sources."ms-0.7.2"
         ];
       })
       sources."indexof-0.0.1"
@@ -27513,66 +27949,96 @@ in
       sources."callsite-1.0.0"
       sources."json3-3.3.2"
       sources."bitfield-0.1.0"
-      (sources."bittorrent-dht-3.2.6" // {
-        dependencies = [
-          sources."debug-2.6.6"
-          sources."ms-0.7.3"
-        ];
-      })
-      (sources."bittorrent-tracker-2.12.1" // {
-        dependencies = [
-          sources."bencode-0.6.0"
-          sources."debug-2.6.6"
-          sources."ms-0.7.3"
-        ];
-      })
       sources."bncode-0.5.3"
-      sources."compact2string-1.4.0"
+      sources."fs-chunk-store-1.6.5"
       sources."hat-0.0.3"
-      sources."ip-0.3.3"
-      (sources."ip-set-1.0.1" // {
-        dependencies = [
-          sources."ip-1.1.5"
-        ];
-      })
-      sources."peer-wire-swarm-0.9.2"
-      sources."random-access-file-0.3.2"
+      sources."immediate-chunk-store-1.0.8"
+      sources."ip-set-1.0.1"
+      sources."peer-wire-swarm-0.12.1"
       sources."rimraf-2.6.1"
-      sources."thunky-0.1.0"
-      sources."addr-to-ip-port-1.4.2"
-      sources."buffer-equal-0.0.1"
-      sources."is-ip-1.0.0"
-      sources."k-bucket-0.5.0"
-      sources."network-address-1.1.2"
-      sources."run-parallel-1.1.6"
-      sources."simple-get-1.4.3"
-      sources."string2compact-1.2.2"
-      sources."ip-regex-1.0.3"
-      sources."unzip-response-1.0.2"
-      sources."ipaddr.js-1.3.0"
-      sources."bn.js-1.3.0"
-      sources."extend.js-0.0.2"
-      (sources."portfinder-0.3.0" // {
+      sources."torrent-discovery-5.4.0"
+      sources."torrent-piece-1.1.1"
+      (sources."random-access-file-1.7.3" // {
         dependencies = [
-          sources."mkdirp-0.0.7"
+          sources."debug-2.6.8"
+          sources."ms-2.0.0"
         ];
       })
-      sources."run-series-1.1.4"
+      sources."randombytes-2.0.3"
+      sources."run-parallel-1.1.6"
+      sources."thunky-1.0.2"
+      sources."buffer-alloc-unsafe-1.0.0"
+      sources."ip-1.1.5"
+      sources."fifo-0.1.4"
       (sources."peer-wire-protocol-0.7.0" // {
         dependencies = [
           sources."bncode-0.2.3"
         ];
       })
-      sources."fifo-0.1.4"
       sources."speedometer-0.1.4"
-      sources."glob-7.1.1"
+      sources."utp-0.0.7"
+      sources."cyclist-0.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
+      sources."bittorrent-dht-6.4.2"
+      (sources."bittorrent-tracker-7.7.0" // {
+        dependencies = [
+          sources."bencode-0.8.0"
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."re-emitter-1.1.3"
+      sources."buffer-equals-1.0.4"
+      sources."k-bucket-0.6.0"
+      (sources."k-rpc-3.7.0" // {
+        dependencies = [
+          sources."k-bucket-2.0.1"
+        ];
+      })
+      sources."lru-2.0.1"
+      sources."buffer-equal-0.0.1"
+      (sources."k-rpc-socket-1.6.2" // {
+        dependencies = [
+          sources."bencode-0.11.0"
+        ];
+      })
+      sources."bn.js-4.11.6"
+      sources."compact2string-1.4.0"
+      sources."random-iterate-1.0.1"
+      sources."run-series-1.1.4"
+      sources."simple-get-2.6.0"
+      (sources."simple-peer-6.4.4" // {
+        dependencies = [
+          sources."readable-stream-2.2.9"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.1"
+        ];
+      })
+      (sources."simple-websocket-4.3.1" // {
+        dependencies = [
+          sources."readable-stream-2.2.9"
+          sources."ws-2.3.1"
+          sources."isarray-1.0.0"
+          sources."string_decoder-1.0.1"
+          sources."ultron-1.1.0"
+        ];
+      })
+      sources."string2compact-1.2.2"
+      sources."uniq-1.0.1"
+      sources."simple-concat-1.0.0"
+      sources."unzip-response-2.0.1"
+      sources."get-browser-rtc-1.0.2"
+      sources."buffer-shims-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
+      sources."addr-to-ip-port-1.4.2"
       sources."which-1.2.14"
       sources."isexe-2.0.0"
     ];
@@ -27621,10 +28087,10 @@ in
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
       sources."rimraf-2.6.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."brace-expansion-1.1.7"
@@ -27653,7 +28119,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.4.0"
+      sources."async-2.4.1"
       sources."lodash-4.17.4"
       sources."mime-db-1.27.0"
       sources."assert-plus-0.2.0"
@@ -27746,7 +28212,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -27796,11 +28262,11 @@ in
       sources."q-1.5.0"
       sources."recast-0.11.23"
       sources."graceful-readlink-1.0.1"
-      sources."acorn-4.0.11"
+      sources."acorn-4.0.13"
       sources."defined-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -27873,7 +28339,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -27889,7 +28355,7 @@ in
       sources."inherits-2.0.3"
       sources."keypress-0.1.0"
       sources."mime-1.2.11"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"
       sources."request-2.9.203"
       (sources."openid-2.0.6" // {
@@ -28000,11 +28466,13 @@ in
     dependencies = [
       sources."express-5.0.0-alpha.5"
       sources."express-json5-0.1.0"
-      (sources."body-parser-1.17.1" // {
+      (sources."body-parser-1.17.2" // {
         dependencies = [
           sources."bytes-2.4.0"
+          sources."debug-2.6.7"
           sources."iconv-lite-0.4.15"
           sources."raw-body-2.2.0"
+          sources."ms-2.0.0"
         ];
       })
       (sources."compression-1.6.2" // {
@@ -28015,7 +28483,7 @@ in
         ];
       })
       sources."commander-2.9.0"
-      sources."js-yaml-3.8.3"
+      sources."js-yaml-3.8.4"
       sources."cookies-0.7.0"
       sources."request-2.81.0"
       sources."async-0.9.2"
@@ -28051,10 +28519,10 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.0"
-      (sources."finalhandler-1.0.2" // {
+      (sources."finalhandler-1.0.3" // {
         dependencies = [
-          sources."debug-2.6.4"
-          sources."ms-0.7.3"
+          sources."debug-2.6.7"
+          sources."ms-2.0.0"
         ];
       })
       sources."fresh-0.5.0"
@@ -28067,7 +28535,12 @@ in
       sources."proxy-addr-1.1.4"
       sources."qs-6.4.0"
       sources."range-parser-1.2.0"
-      sources."router-1.3.0"
+      (sources."router-1.3.1" // {
+        dependencies = [
+          sources."debug-2.6.8"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."send-0.15.1"
       sources."serve-static-1.12.1"
       sources."setprototypeof-1.0.3"
@@ -28160,7 +28633,7 @@ in
       sources."punycode-1.4.1"
       sources."lru-cache-2.7.3"
       sources."sigmund-1.0.1"
-      sources."dtrace-provider-0.8.1"
+      sources."dtrace-provider-0.8.2"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
@@ -28169,7 +28642,7 @@ in
       sources."rimraf-2.4.5"
       (sources."glob-6.0.4" // {
         dependencies = [
-          sources."minimatch-3.0.3"
+          sources."minimatch-3.0.4"
         ];
       })
       sources."inflight-1.0.6"
@@ -28202,8 +28675,8 @@ in
       sources."regexp-quote-0.0.0"
       sources."xtend-4.0.1"
       sources."domelementtype-1.3.0"
-      sources."domhandler-2.3.0"
-      sources."domutils-1.6.0"
+      sources."domhandler-2.4.1"
+      sources."domutils-1.6.2"
       (sources."dom-serializer-0.1.0" // {
         dependencies = [
           sources."domelementtype-1.1.3"
@@ -28213,9 +28686,9 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."jsonparse-1.3.0"
+      sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."minimist-0.0.8"
     ];
@@ -28247,7 +28720,7 @@ in
       sources."colors-1.0.3"
       sources."graceful-readlink-1.0.1"
       sources."graceful-fs-4.1.11"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."readable-stream-2.2.9"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.7"
@@ -28258,8 +28731,9 @@ in
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -28333,7 +28807,7 @@ in
       sources."formidable-1.1.1"
       sources."http-signature-0.11.0"
       sources."keep-alive-agent-0.0.1"
-      sources."mime-1.3.4"
+      sources."mime-1.3.6"
       sources."negotiator-0.5.3"
       sources."node-uuid-1.4.8"
       sources."once-1.4.0"
@@ -28367,7 +28841,7 @@ in
       sources."glob-6.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
@@ -28396,8 +28870,9 @@ in
       sources."buffer-shims-1.0.0"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
@@ -28421,16 +28896,16 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
       sources."minimist-0.0.8"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
@@ -28457,7 +28932,7 @@ in
     };
     dependencies = [
       sources."sax-1.2.2"
-      sources."coa-1.0.1"
+      sources."coa-1.0.2"
       sources."js-yaml-3.7.0"
       sources."colors-1.1.2"
       sources."whet.extend-0.9.9"
@@ -28495,10 +28970,10 @@ in
       sha1 = "809c87a826e112494398cf8894f7c2d1b3464eb7";
     };
     dependencies = [
-      sources."acorn-4.0.11"
+      sources."acorn-4.0.13"
       sources."enhanced-resolve-2.3.0"
-      sources."glob-7.1.1"
-      sources."minimatch-3.0.3"
+      sources."glob-7.1.2"
+      sources."minimatch-3.0.4"
       sources."resolve-from-2.0.0"
       sources."tapable-0.2.6"
       sources."memory-fs-0.3.0"
@@ -28512,8 +28987,9 @@ in
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
@@ -28534,10 +29010,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.3.2";
+    version = "2.3.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.3.2.tgz";
-      sha1 = "f0f045e196f69a72f06b25fd3bd39d01c3ce9984";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz";
+      sha1 = "3d38321828231e434f287514959c37a82b629f42";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -28550,28 +29026,15 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "2.8.22";
+    version = "3.0.13";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.22.tgz";
-      sha1 = "d54934778a8da14903fa29a326fb24c0ab51a1a0";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.13.tgz";
+      sha1 = "1871d736aa1e550c728d7e5a6556579e70925d68";
     };
     dependencies = [
+      sources."commander-2.9.0"
       sources."source-map-0.5.6"
-      sources."yargs-3.10.0"
-      sources."uglify-to-browserify-1.0.2"
-      sources."camelcase-1.2.1"
-      sources."cliui-2.1.0"
-      sources."decamelize-1.2.0"
-      sources."window-size-0.1.0"
-      sources."center-align-0.1.3"
-      sources."right-align-0.1.3"
-      sources."wordwrap-0.0.2"
-      sources."align-text-0.1.4"
-      sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.0"
-      sources."longest-1.0.1"
-      sources."repeat-string-1.6.1"
-      sources."is-buffer-1.1.5"
+      sources."graceful-readlink-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -28584,30 +29047,22 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.16";
+    version = "1.1.19";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.16.tgz";
-      sha1 = "d19a80706583423f9895364dd20adf873b88d09e";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.19.tgz";
+      sha1 = "83e0c9d79c808f7acb5f2da5a1ea77e3db571558";
     };
     dependencies = [
-      sources."async-2.4.0"
+      sources."async-2.4.1"
       sources."bluebird-3.5.0"
       sources."blueimp-md5-2.7.0"
-      sources."body-parser-1.17.1"
+      sources."body-parser-1.17.2"
       sources."color-1.0.3"
       sources."cookie-parser-1.4.3"
       sources."crossroads-0.12.2"
       sources."diff2html-2.3.0"
-      (sources."express-4.15.2" // {
-        dependencies = [
-          sources."serve-static-1.12.1"
-        ];
-      })
-      (sources."express-session-1.15.2" // {
-        dependencies = [
-          sources."debug-2.6.3"
-        ];
-      })
+      sources."express-4.15.3"
+      sources."express-session-1.15.3"
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
@@ -28668,6 +29123,7 @@ in
         dependencies = [
           sources."json-stringify-safe-5.0.1"
           sources."uuid-3.0.0"
+          sources."stack-trace-0.0.9"
         ];
       })
       (sources."rc-1.2.1" // {
@@ -28677,23 +29133,14 @@ in
       })
       sources."rimraf-2.6.1"
       sources."semver-5.3.0"
-      (sources."serve-static-1.12.2" // {
-        dependencies = [
-          sources."send-0.15.2"
-          (sources."debug-2.6.4" // {
-            dependencies = [
-              sources."ms-0.7.3"
-            ];
-          })
-          sources."ms-1.0.0"
-        ];
-      })
+      sources."serve-static-1.12.3"
       sources."signals-1.0.0"
       sources."snapsvg-0.5.1"
-      (sources."socket.io-1.7.3" // {
+      (sources."socket.io-1.7.4" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."object-assign-4.1.0"
+          sources."ms-0.7.2"
         ];
       })
       (sources."superagent-0.21.0" // {
@@ -28729,7 +29176,7 @@ in
       })
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
-      sources."debug-2.6.1"
+      sources."debug-2.6.7"
       sources."depd-1.1.0"
       sources."http-errors-1.6.1"
       sources."iconv-lite-0.4.15"
@@ -28737,7 +29184,7 @@ in
       sources."qs-6.4.0"
       sources."raw-body-2.2.0"
       sources."type-is-1.6.15"
-      sources."ms-0.7.2"
+      sources."ms-2.0.0"
       sources."inherits-2.0.3"
       sources."setprototypeof-1.0.3"
       sources."statuses-1.3.1"
@@ -28768,12 +29215,7 @@ in
       sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.0"
-      (sources."finalhandler-1.0.2" // {
-        dependencies = [
-          sources."debug-2.6.4"
-          sources."ms-0.7.3"
-        ];
-      })
+      sources."finalhandler-1.0.3"
       sources."fresh-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -28781,7 +29223,7 @@ in
       sources."path-to-regexp-0.1.7"
       sources."proxy-addr-1.1.4"
       sources."range-parser-1.2.0"
-      sources."send-0.15.1"
+      sources."send-0.15.3"
       sources."utils-merge-1.0.0"
       sources."vary-1.1.1"
       sources."negotiator-0.6.1"
@@ -28832,7 +29274,7 @@ in
       sources."eyes-0.1.8"
       sources."cycle-1.0.3"
       sources."request-2.9.203"
-      sources."stack-trace-0.0.9"
+      sources."stack-trace-0.0.10"
       sources."ini-1.3.4"
       sources."optimist-0.6.0"
       sources."wordwrap-0.0.3"
@@ -28889,10 +29331,10 @@ in
       sources."fs-vacuum-1.2.10"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fstream-1.0.11"
-      sources."fstream-npm-1.2.0"
-      (sources."glob-7.1.1" // {
+      sources."fstream-npm-1.2.1"
+      (sources."glob-7.1.2" // {
         dependencies = [
-          sources."minimatch-3.0.3"
+          sources."minimatch-3.0.4"
         ];
       })
       sources."graceful-fs-4.1.11"
@@ -28912,7 +29354,7 @@ in
       sources."move-concurrently-1.0.1"
       (sources."node-gyp-3.6.1" // {
         dependencies = [
-          sources."minimatch-3.0.3"
+          sources."minimatch-3.0.4"
           sources."nopt-3.0.6"
         ];
       })
@@ -28968,7 +29410,7 @@ in
       sources."lodash.restparam-3.6.1"
       sources."readdir-scoped-modules-1.0.2"
       sources."validate-npm-package-license-3.0.1"
-      sources."jsonparse-1.3.0"
+      sources."jsonparse-1.3.1"
       sources."through-2.3.8"
       sources."wcwidth-1.0.1"
       (sources."defaults-1.0.3" // {
@@ -28979,7 +29421,7 @@ in
       sources."proto-list-1.2.4"
       (sources."fstream-ignore-1.0.5" // {
         dependencies = [
-          sources."minimatch-3.0.3"
+          sources."minimatch-3.0.4"
         ];
       })
       sources."brace-expansion-1.1.7"
@@ -29021,7 +29463,7 @@ in
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
@@ -29034,8 +29476,9 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -29045,7 +29488,6 @@ in
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."asynckit-0.4.0"
@@ -29088,20 +29530,29 @@ in
       sources."stream-iterate-1.2.0"
       sources."block-stream-0.0.9"
       sources."unique-slug-2.0.0"
-      (sources."boxen-1.0.0" // {
+      (sources."boxen-1.1.0" // {
         dependencies = [
           sources."string-width-2.0.0"
           sources."is-fullwidth-code-point-2.0.0"
         ];
       })
       sources."chalk-1.1.3"
-      sources."configstore-3.0.0"
+      (sources."configstore-3.1.0" // {
+        dependencies = [
+          sources."write-file-atomic-2.1.0"
+        ];
+      })
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
       sources."lazy-req-2.0.0"
       sources."semver-diff-2.1.0"
       sources."xdg-basedir-3.0.0"
-      sources."ansi-align-1.1.0"
+      (sources."ansi-align-2.0.0" // {
+        dependencies = [
+          sources."string-width-2.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
       sources."camelcase-4.1.0"
       sources."cli-boxes-1.0.0"
       sources."term-size-0.1.1"
@@ -29123,8 +29574,10 @@ in
       sources."has-ansi-2.0.0"
       sources."supports-color-2.0.0"
       sources."dot-prop-4.1.1"
+      sources."make-dir-1.0.0"
       sources."unique-string-1.0.0"
       sources."is-obj-1.0.1"
+      sources."pify-2.3.0"
       sources."crypto-random-string-1.0.0"
       sources."package-json-4.0.1"
       sources."got-6.7.1"
@@ -29146,16 +29599,17 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."ssri-4.1.2"
+      sources."ssri-4.1.3"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."eve-0.5.4"
-      (sources."engine.io-1.8.3" // {
+      (sources."engine.io-1.8.4" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       (sources."has-binary-0.1.7" // {
@@ -29166,11 +29620,13 @@ in
       (sources."socket.io-adapter-0.5.0" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
-      (sources."socket.io-client-1.7.3" // {
+      (sources."socket.io-client-1.7.4" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ms-0.7.2"
         ];
       })
       (sources."socket.io-parser-2.3.1" // {
@@ -29183,7 +29639,7 @@ in
       })
       sources."base64id-1.0.0"
       sources."engine.io-parser-1.3.2"
-      sources."ws-1.1.2"
+      sources."ws-1.1.4"
       sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
@@ -29194,9 +29650,11 @@ in
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.3" // {
+      (sources."engine.io-client-1.8.4" // {
         dependencies = [
           sources."debug-2.3.3"
+          sources."ws-1.1.2"
+          sources."ms-0.7.2"
         ];
       })
       sources."indexof-0.0.1"
@@ -29254,7 +29712,6 @@ in
       sources."load-json-file-2.0.0"
       sources."path-type-2.0.0"
       sources."parse-json-2.2.0"
-      sources."pify-2.3.0"
       sources."strip-bom-3.0.0"
       (sources."error-ex-1.3.1" // {
         dependencies = [
@@ -29333,10 +29790,10 @@ in
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
       sources."rimraf-2.6.1"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
@@ -29363,7 +29820,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.4.0"
+      sources."async-2.4.1"
       sources."lodash-4.17.4"
       sources."mime-db-1.27.0"
       sources."assert-plus-0.2.0"
@@ -29432,21 +29889,21 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "2.5.0";
+    version = "2.6.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-2.5.0.tgz";
-      sha1 = "5a17089f8d0e43442e606d6cf9b2a146c8ed9911";
+      url = "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz";
+      sha1 = "2e0457f0abb1ac5df3ab106c69c672f236785f07";
     };
     dependencies = [
       sources."acorn-5.0.3"
       (sources."acorn-dynamic-import-2.0.2" // {
         dependencies = [
-          sources."acorn-4.0.11"
+          sources."acorn-4.0.13"
         ];
       })
       sources."ajv-4.11.8"
       sources."ajv-keywords-1.5.1"
-      sources."async-2.4.0"
+      sources."async-2.4.1"
       sources."enhanced-resolve-3.1.0"
       sources."interpret-1.0.3"
       sources."json-loader-0.5.4"
@@ -29463,7 +29920,7 @@ in
       sources."source-map-0.5.6"
       sources."supports-color-3.2.3"
       sources."tapable-0.2.6"
-      (sources."uglify-js-2.8.22" // {
+      (sources."uglify-js-2.8.27" // {
         dependencies = [
           sources."yargs-3.10.0"
         ];
@@ -29492,8 +29949,9 @@ in
       sources."isarray-1.0.0"
       sources."inherits-2.0.3"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."minimist-0.0.8"
       sources."assert-1.4.1"
       sources."browserify-zlib-0.1.4"
@@ -29510,7 +29968,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.7.0"
+      sources."stream-http-2.7.1"
       sources."timers-browserify-2.0.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -29531,10 +29989,10 @@ in
       sources."browserify-cipher-1.0.0"
       sources."browserify-sign-4.0.4"
       sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.2"
-      sources."create-hmac-1.1.4"
+      sources."create-hash-1.1.3"
+      sources."create-hmac-1.1.6"
       sources."diffie-hellman-5.0.2"
-      sources."pbkdf2-3.0.9"
+      sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
       sources."randombytes-2.0.3"
       sources."browserify-aes-1.0.6"
@@ -29553,8 +30011,9 @@ in
       sources."hmac-drbg-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
-      sources."ripemd160-1.0.1"
+      sources."ripemd160-2.0.1"
       sources."sha.js-2.4.8"
+      sources."hash-base-2.0.2"
       sources."miller-rabin-4.0.0"
       sources."builtin-status-codes-3.0.0"
       sources."to-arraybuffer-1.0.1"
@@ -29573,11 +30032,11 @@ in
       sources."wordwrap-0.0.2"
       sources."align-text-0.1.4"
       sources."lazy-cache-1.0.4"
-      sources."kind-of-3.2.0"
+      sources."kind-of-3.2.2"
       sources."longest-1.0.1"
       sources."repeat-string-1.6.1"
       sources."is-buffer-1.1.5"
-      sources."chokidar-1.6.1"
+      sources."chokidar-1.7.0"
       sources."anymatch-1.3.0"
       sources."async-each-1.0.1"
       sources."glob-parent-2.0.0"
@@ -29613,19 +30072,19 @@ in
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
       sources."glob-base-0.3.0"
-      sources."is-dotfile-1.0.2"
+      sources."is-dotfile-1.0.3"
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."nan-2.6.2"
-      sources."node-pre-gyp-0.6.34"
+      sources."node-pre-gyp-0.6.35"
       sources."nopt-4.0.1"
-      sources."npmlog-4.0.2"
+      sources."npmlog-4.1.0"
       (sources."rc-1.2.1" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -29650,12 +30109,12 @@ in
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."wide-align-1.1.0"
+      sources."wide-align-1.1.2"
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."ansi-regex-2.1.1"
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
       sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
@@ -29675,7 +30134,6 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -29718,17 +30176,17 @@ in
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
-      sources."glob-7.1.1"
+      sources."glob-7.1.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."source-list-map-1.1.2"
       sources."get-caller-file-1.0.2"
       sources."os-locale-1.4.0"
@@ -29794,10 +30252,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.23.4";
+    version = "0.24.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.23.4.tgz";
-      sha1 = "f428c75ca27ad4910bc822174f586187c790c5db";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.24.5.tgz";
+      sha1 = "92c72adf4de8dacccaf6b4259eb4990f6c4f8e3b";
     };
     dependencies = [
       sources."babel-runtime-6.23.0"
@@ -29807,8 +30265,9 @@ in
       sources."cmd-shim-2.0.2"
       sources."commander-2.9.0"
       sources."death-1.1.0"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."detect-indent-5.0.0"
+      sources."gunzip-maybe-1.4.0"
       sources."ini-1.3.4"
       sources."inquirer-3.0.6"
       sources."invariant-2.2.2"
@@ -29816,21 +30275,20 @@ in
       sources."is-ci-1.0.10"
       sources."leven-2.1.0"
       sources."loud-rejection-1.6.0"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."mkdirp-0.5.1"
       sources."node-emoji-1.5.1"
-      sources."node-gyp-3.6.1"
       sources."object-path-0.11.4"
       sources."proper-lockfile-2.0.1"
       sources."read-1.0.7"
       sources."request-2.81.0"
       sources."request-capture-har-1.2.2"
       sources."rimraf-2.6.1"
-      sources."roadrunner-1.1.0"
       sources."semver-5.3.0"
       sources."strip-bom-3.0.0"
       sources."tar-fs-1.15.2"
-      sources."tar-stream-1.5.2"
+      sources."tar-stream-1.5.4"
+      sources."uuid-3.0.1"
       sources."v8-compile-cache-1.1.0"
       sources."validate-npm-package-license-3.0.1"
       sources."core-js-2.4.1"
@@ -29843,11 +30301,42 @@ in
       sources."ansi-regex-2.1.1"
       sources."graceful-fs-4.1.11"
       sources."graceful-readlink-1.0.1"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
+      sources."browserify-zlib-0.1.4"
+      sources."is-deflate-1.0.0"
+      sources."is-gzip-1.0.0"
+      sources."peek-stream-1.1.2"
+      sources."pumpify-1.3.5"
+      sources."through2-2.0.3"
+      sources."pako-0.2.9"
+      sources."duplexify-3.5.0"
+      sources."end-of-stream-1.0.0"
+      sources."inherits-2.0.3"
+      sources."readable-stream-2.2.9"
+      sources."stream-shift-1.0.0"
+      sources."once-1.3.3"
+      sources."wrappy-1.0.2"
+      sources."buffer-shims-1.0.0"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."string_decoder-1.0.1"
+      sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
+      (sources."pump-1.0.2" // {
+        dependencies = [
+          (sources."end-of-stream-1.4.0" // {
+            dependencies = [
+              sources."once-1.4.0"
+            ];
+          })
+        ];
+      })
+      sources."xtend-4.0.1"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.1.0"
-      sources."external-editor-2.0.1"
+      sources."external-editor-2.0.4"
       sources."figures-2.0.0"
       sources."lodash-4.17.4"
       sources."mute-stream-0.0.7"
@@ -29859,6 +30348,8 @@ in
       sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
+      sources."iconv-lite-0.4.17"
+      sources."jschardet-1.4.2"
       sources."tmp-0.0.31"
       sources."os-tmpdir-1.0.2"
       sources."is-promise-2.1.0"
@@ -29874,51 +30365,6 @@ in
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
       sources."string.prototype.codepointat-0.2.0"
-      sources."fstream-1.0.11"
-      sources."glob-7.1.1"
-      sources."nopt-3.0.6"
-      sources."npmlog-4.0.2"
-      sources."osenv-0.1.4"
-      sources."tar-2.2.1"
-      sources."which-1.2.14"
-      sources."inherits-2.0.3"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."wrappy-1.0.2"
-      sources."abbrev-1.1.0"
-      sources."are-we-there-yet-1.1.4"
-      sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.4" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."is-fullwidth-code-point-1.0.0"
-        ];
-      })
-      sources."set-blocking-2.0.0"
-      sources."delegates-1.0.0"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."aproba-1.1.1"
-      sources."has-unicode-2.0.1"
-      sources."object-assign-4.1.1"
-      (sources."wide-align-1.1.0" // {
-        dependencies = [
-          sources."string-width-1.0.2"
-          sources."is-fullwidth-code-point-1.0.0"
-        ];
-      })
-      sources."code-point-at-1.1.0"
-      sources."number-is-nan-1.0.1"
-      sources."os-homedir-1.0.2"
-      sources."block-stream-0.0.9"
-      sources."isexe-2.0.0"
       sources."retry-0.10.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -29937,11 +30383,9 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -29985,11 +30429,12 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
+      sources."glob-7.1.2"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."path-is-absolute-1.0.1"
       sources."chownr-1.0.1"
-      sources."pump-1.0.2"
-      sources."end-of-stream-1.4.0"
       sources."bl-1.2.1"
-      sources."xtend-4.0.1"
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
@@ -30140,8 +30585,9 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.0"
+      sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
+      sources."safe-buffer-5.0.1"
       sources."prepend-http-1.0.4"
       sources."decamelize-1.2.0"
       sources."ansi-escapes-1.4.0"
@@ -30195,7 +30641,6 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
       sources."stringstream-0.0.5"
       sources."tunnel-agent-0.6.0"
       sources."delayed-stream-1.0.0"
@@ -30267,7 +30712,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."deep-extend-0.4.1"
+      sources."deep-extend-0.4.2"
       sources."strip-json-comments-2.0.1"
       sources."registry-auth-token-3.3.1"
       sources."execall-1.0.0"
@@ -30290,9 +30735,9 @@ in
       sources."arrify-1.0.1"
       sources."dot-prop-2.4.0"
       sources."is-obj-1.0.1"
-      sources."debug-2.6.6"
+      sources."debug-2.6.8"
       sources."npmlog-2.0.4"
-      sources."ms-0.7.3"
+      sources."ms-2.0.0"
       sources."external-editor-1.1.1"
       sources."rx-4.1.0"
       sources."spawn-sync-1.0.15"
@@ -30340,7 +30785,7 @@ in
       sources."semver-regex-1.0.0"
       sources."set-immediate-shim-1.0.1"
       sources."walk-2.3.9"
-      sources."minimatch-3.0.3"
+      sources."minimatch-3.0.4"
       sources."foreachasync-3.0.0"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
-- 
GitLab


From 624c216f3ca48f3afd8996ec483ab89f8cca163e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 1 Jun 2017 01:09:30 +0000
Subject: [PATCH 0224/1490] instead: 2.4.1 -> 3.0.0

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

diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index e3fd6ccb2f7..a0bb45746f7 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
 
 let
-  version = "2.4.1";
+  version = "3.0.0";
 
   # I took several games at random from http://instead.syscall.ru/games/
   games = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
-    sha256 = "1i69b10jfb980d5zhmvh1i789hh982vxiwgqna82b84pdf3y7kgw";
+    sha256 = "14scbb5x36dywak930ry7hwv502jnzc4m5cjkymqn1vz1xkq2m5w";
   };
 
   NIX_LDFLAGS = "-llua -lgcc_s";
-- 
GitLab


From 5bc28da745b403b83946e7fbae6b4f524d48f4e6 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 1 Jun 2017 01:09:50 +0000
Subject: [PATCH 0225/1490] instead-launcher: 0.6.3 -> 0.7.0

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

diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix
index 6515db9dab3..39324843e5e 100644
--- a/pkgs/games/instead-launcher/default.nix
+++ b/pkgs/games/instead-launcher/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "instead-launcher-${version}";
 
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "instead-hub";
     repo = "instead-launcher";
     rev = version;
-    sha256 = "1q0hdgfy9pr48zvxr9x614ka6bd0g8sicdk2a673nwfdyd41p9cw";
+    sha256 = "1svy8i8anspway01pnz2cy69aad03anvkq04wrdfv1h9c34gbvb9";
   };
 
   patches = [ ./path.patch ];
-- 
GitLab


From 29acc510c05d853f4be464c715fde285db422a5f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 26 May 2017 00:11:03 -0500
Subject: [PATCH 0226/1490] lldb: fix on Darwin

This gives a few fixes for LLDB on Darwin. Note: you will have to do code
signing for it to work outside of root!
---
 pkgs/development/compilers/llvm/4/lldb.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index a71c2332dc1..a3c46a4c7e9 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -32,17 +32,21 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake python which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
 
+  cmakeFlags = [
+    "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+  ];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
     license     = licenses.ncsa;
-    platforms   = platforms.allBut platforms.darwin;
+    platforms   = platforms.all;
   };
 }
-- 
GitLab


From bd4c6b456e830eee5f34eae9d9e068278a5df74a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 1 Jun 2017 06:55:38 +0200
Subject: [PATCH 0227/1490] inkscape: patch python interpreter for extension
 code

---
 pkgs/applications/graphics/inkscape/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index fdcd7636c02..f48ce6a4ce4 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -26,17 +26,18 @@ stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs share/extensions
     patchShebangs fix-roff-punct
-  '';
 
-  # Python is used at run-time to execute scripts, e.g., those from
-  # the "Effects" menu.
-  propagatedBuildInputs = [ python2Env ];
+    # Python is used at run-time to execute scripts, e.g., those from
+    # the "Effects" menu.
+    substituteInPlace src/extension/implementation/script.cpp \
+      --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
+  '';
 
   buildInputs = [
     pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper intltool gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif automake114x potrace cmake
+    libvisio libcdr libexif automake114x potrace cmake python2Env
   ];
 
   enableParallelBuilding = true;
-- 
GitLab


From 790dedfee9527fb4f028913dd85ded64b5d83ba8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 1 Jun 2017 08:42:07 +0200
Subject: [PATCH 0228/1490] smplayer: 17.4.2 -> 17.6.0

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 41967f50bd0..146cb3b0e46 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmakeHook, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-17.4.2";
+  name = "smplayer-17.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "1lc5pj0y56yynygb7cnl98lpvsf82rc0aa4si8isn81nvy07hmq5";
+    sha256 = "0kgrkn50sgr79jfj66p59wka17prnxibf7fbfpg5m0n95kdkr7rg";
   };
 
   buildInputs = [ qtscript ];
-- 
GitLab


From 3a4d03dc7f4dcbcd7359ad301ca86ed47e42dbda Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 1 Jun 2017 08:42:21 +0200
Subject: [PATCH 0229/1490] smtube: 17.1.0 -> 17.5.0

---
 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 ea0bd083b1d..3f0aff6a15b 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  version = "17.1.0";
+  version = "17.5.0";
   name = "smtube-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
-    sha256 = "1kg45qkr7nvchy9ih24vlbpkn6vd8v8qw5xqsjhjpjkizcmzaa61";
+    sha256 = "13m0ll18n1da8i4r4b7gn0jjz9dgrkkyk9mpfas4rgnjw92m5jld";
   };
 
   makeFlags = [
-- 
GitLab


From 758864a0402da89ebdfa725fcda2a4a1d41402b4 Mon Sep 17 00:00:00 2001
From: Gemini Lasswell <gazally@runbox.com>
Date: Wed, 31 May 2017 16:05:18 -0700
Subject: [PATCH 0230/1490] arduino: 1.6.12 -> 1.8.2

---
 .../arduino/arduino-core/default.nix          |  18 ++-
 .../arduino/arduino-core/downloads.nix        | 138 +++++++++++-------
 2 files changed, 94 insertions(+), 62 deletions(-)

diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index fbc139c314f..fdb9d1be6ad 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -54,25 +54,25 @@ let
              + stdenv.lib.optionalString (!withGui) "-core";
 in
 stdenv.mkDerivation rec {
-  version = "1.6.12";
+  version = "1.8.2";
   name = "${flavor}-${version}";
 
   src = fetchFromGitHub {
     owner = "arduino";
     repo = "Arduino";
     rev = "${version}";
-    sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh";
+    sha256 = "1ssznjmzmahayslj2xnci9b5wpsl53nyg85say54akng93qipmfb";
   };
 
   teensyduino_src = fetchurl {
-    url = "http://www.pjrc.com/teensy/td_131/TeensyduinoInstall.${teensy_architecture}";
+    url = "https://www.pjrc.com/teensy/td_136/TeensyduinoInstall.${teensy_architecture}";
     sha256 =
       lib.optionalString ("${teensy_architecture}" == "linux64")
-        "1q4wv6s0900hyv9z1mjq33fr2isscps4q3bsy0h12wi3l7ir94g9"
+        "0qvb5z9y6nsqy0kzib9fvvbn8dakl50vib6r3nm6bnpvyxzwjl2r"
       + lib.optionalString ("${teensy_architecture}" == "linux32")
-        "06fl951f44avqyqim5qmy73siylbqcnsmz55zmj2dzhgf4sflkvc"
+        "14ca62vq7cpx269vfd92shi80qj8spf0dzli8gfcb39ss2zc4jf1"
       + lib.optionalString ("${teensy_architecture}" == "linuxarm")
-        "0ldf33w8wkqwklcj8fn4p22f23ibpwpf7873dc6i2jfmmbx0yvxn";
+        "122z1gxcgkmwjb8wdklb2w8c3qkj5rc1ap5n4a8fi3kjz29va9rx";
   };
 
   buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline
@@ -93,6 +93,10 @@ stdenv.mkDerivation rec {
       cp -v $file_src $file_dst
     done
 
+    # Deliberately break build.xml's download statement in order to cause
+    # an error if anything needed is missing from download.nix.
+    substituteInPlace build/build.xml --replace "get src" "get error"
+
     cd ./arduino-core && ant
     cd ../build && ant 
     cd ..
@@ -208,7 +212,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Open-source electronics prototyping platform";
     homepage = http://arduino.cc/;
-    license = stdenv.lib.licenses.gpl2;
+    license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ antono auntie robberer bjornfor ];
   };
diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix
index 9d3ed56bee9..f74da977372 100644
--- a/pkgs/development/arduino/arduino-core/downloads.nix
+++ b/pkgs/development/arduino/arduino-core/downloads.nix
@@ -2,28 +2,28 @@
 
 {
   "build/shared/reference-1.6.6-3.zip" = fetchurl {
-    url = "http://downloads.arduino.cc/reference-1.6.6-3.zip";
+    url = "https://downloads.arduino.cc/reference-1.6.6-3.zip";
     sha256 = "119nj1idz85l71fy6a6wwsx0mcd8y0ib1wy0l6j9kz88nkwvggy3";
   };
   "build/shared/Galileo_help_files-1.6.2.zip" = fetchurl {
-    url = "http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip";
+    url = "https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip";
     sha256 = "0qda0xml353sfhjmx9my4mlcyzbf531k40dcr1cnsa438xp2fw0w";
   };
   "build/shared/Edison_help_files-1.6.2.zip" = fetchurl {
-    url = "http://downloads.arduino.cc/Edison_help_files-1.6.2.zip";
+    url = "https://downloads.arduino.cc/Edison_help_files-1.6.2.zip";
     sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan";
   };
-  "build/Firmata-2.5.3.zip" = fetchurl {
-    url = "https://github.com/arduino-libraries/Firmata/archive/2.5.3.zip";
-    sha256 = "1ims6bdmwv8lgcvd4ri4i39vqm1q5jbwirmki35bybqqb1sl171v";
+  "build/Firmata-2.5.6.zip" = fetchurl {
+    url = "https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip";
+    sha256 = "117dd4pdlgv60gdlgm2ckjfq89i0dg1q8vszg6hxywdf701c1fk4";
   };
   "build/Bridge-1.6.3.zip" = fetchurl {
     url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip";
     sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj";
   };
-  "build/Robot_Control-1.0.2.zip" = fetchurl {
-    url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.2.zip";
-    sha256 = "1wdpz3ilnza3lfd5a628dryic46j72h4a89y8vp0qkbscvifcvdk";
+  "build/Robot_Control-1.0.3.zip" = fetchurl {
+    url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.3.zip";
+    sha256 = "1pc3b8skbpx7j32jnxa67mfqhnsmfz3876pc9mdyzpsad4mmcn62";
   };
   "build/Robot_Motor-1.0.2.zip" = fetchurl {
     url = "https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2.zip";
@@ -37,9 +37,9 @@
     url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip";
     sha256 = "1zs6ymlzw66bglrm0x6d3cvr52q85c8rlm525x0wags111xx3s90";
   };
-  "build/Temboo-1.1.7.zip" = fetchurl {
-    url = "https://github.com/arduino-libraries/Temboo/archive/1.1.7.zip";
-    sha256 = "0fq2q6qs0qp15njsl9dif8dkpxgb4cgg8jk3s5y0fcz9lb8m2j50";
+  "build/Temboo-1.2.1.zip" = fetchurl {
+    url = "https://github.com/arduino-libraries/Temboo/archive/1.2.1.zip";
+    sha256 = "1fyzfihsbcjpjasqbmbbfcall2zl48nzrp4xk9pslppal31mvl8x";
   };
   "build/Esplora-1.0.4.zip" = fetchurl {
     url = "https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip";
@@ -53,72 +53,100 @@
     url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip";
     sha256 = "1spv73zhjbrb0vgpzjnh6wr3bddlbyzv78d21dbn8z2l0aqv2sac";
   };
+  "build/SD-1.1.1.zip" = fetchurl {
+    url = "https://github.com/arduino-libraries/SD/archive/1.1.1.zip";
+    sha256 = "0nackcf7yx5np1s24wnsrcjl8j0nlmqqir6316vqqkfayvb1247n";
+  };
+  "build/Servo-1.1.2.zip" = fetchurl {
+    url = "https://github.com/arduino-libraries/Servo/archive/1.1.2.zip";
+    sha256 = "14k1883qrx425wnm0r8kszzq32yvvs3jwxf3g7ybp7v0ga0q47l7";
+  };
+  "build/Adafruit_CircuitPlayground-1.6.4.zip" = fetchurl {
+    url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.4.zip";
+    sha256 = "1ph7m0l1sfx9db56n2h6vi78pn3zyah813lfhqiqghncx34amrhj";
+  };
   "build/libastylej-2.05.1-3.zip" = fetchurl {
-    url = "http://downloads.arduino.cc/libastylej-2.05.1-3.zip";
+    url = "https://downloads.arduino.cc/libastylej-2.05.1-3.zip";
     sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6";
   };
-  "build/liblistSerials-1.1.4.zip" = fetchurl {
-    url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.4.zip";
-    sha256 = "1w0zs155hs5b87i5wj049hfj2jsnf9jk30qq93wz1mxab01261v0";
+  "build/liblistSerials-1.4.0.zip" = fetchurl {
+    url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip";
+    sha256 = "129mfbyx7snq3znzhkfbdjiifdr85cwk6wjn8l9ia0wynszs5zyv";
   };
-  "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip" = fetchurl {
-    url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.0/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip";
-    sha256 = "0fp4mb1qa3w02hrwd51wf261l8ywcl36mi9wipsrgx2y29pk759z";
+  "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" = fetchurl {
+    url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.0/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip";
+    sha256 = "1nkk87q2l3bs9y387hdxzgqllm0lqpmc5kdmr6my4hjz5lcpgbza";
   };
 }
 // optionalAttrs (system == "x86_64-linux") {
-  "build/arduino-builder-linux64-1.3.21_r1.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2";
-    sha256 = "1cqx5smzm4dhbj2ah191vbbxi0l7xj95c5gcdbgqm9283hrpfrn7";
+  "build/arduino-builder-linux64-1.3.25.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.25.tar.bz2";
+    sha256 = "15y80p255w2rg028vc8dq4hpqsmf770qigv3hgf78npb4qrjnqqf";
+  };
+  "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2";
+    sha256 = "132qm8l6h50z4s9h0i5mfv6bp0iia0pp9kc3gd37hkajy4bh4j0r";
   };
-  "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2";
-    sha256 = "124icbjh28cax6pgg6bzrfdi27shsn9mjjshgrr93pczpg8sc0rr";
+  "build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2";
+    sha256 = "0shz5ymnlsrbnaqcb13fwbd73hz9k45adw14gf1ywjgywa2cpk68";
   };
-  "build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2";
-    sha256 = "08b6dbllnvzv1aqx0v037zks4r3vqcx6yxxv040wf431mmf8gd4p";
+  "build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2";
+    sha256 = "0xy25srvpz6d0yfnz8b17mkmary3k51lb1cvgw7n2zyxayjd0npb";
   };
 }
 // optionalAttrs (system == "i686-linux") {
-  "build/arduino-builder-linux32-1.3.21_r1.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2";
-    sha256 = "1prfwb5scprvd74gihd78ibsdy3806b0fsjhgyj9in4w1q8s3dxj";
+  "build/arduino-builder-linux32-1.3.25.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.25.tar.bz2";
+    sha256 = "0hjiqbf7xspdcr7lganqnl68qcmndc9pz06dghkrwzbzc5ki72qr";
   };
-  "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2";
-    sha256 = "0s7chsp1jyk477zvfaraf0yacvlzahkwqxpws4k0kjadghg9a27i";
+  "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2";
+    sha256 = "1d81z5m4cklv29hgb5ywrmyq64ymlwmjx2plm1gzs1mcpg7d9ab3";
   };
-  "build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2";
-    sha256 = "1yyn016b5162j94nmqcznfabi5y2ly27z2whr77387bvjnqc8jsz";
+  "build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2";
+    sha256 = "12r1drjafxwzrvf1y1glxd46rv870mhz1ifn0g328ciwivas4da2";
+  };
+  "build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2";
+    sha256 = "1vvilbbbvv68svxzyhjspacbavcqakph5glhnz7c0mxkspqixjbs";
   };
 }
 // optionalAttrs (system == "x86_64-darwin") {
-  "build/arduino-builder-macosx-1.3.21_r1.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.21_r1.tar.bz2";
-    sha256 = "06y5j1z9jjnqa7v6nl9dflm1qqpf3ar1jc53zxgdgsrb9c473d8l";
+  "build/arduino-builder-macosx-1.3.25.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.25.tar.bz2";
+    sha256 = "0inkxjzdplb8b17j7lyam6v9gca25rxmsinrkgqnx3xxgkaxz2k0";
+  };
+  "build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2";
+    sha256 = "0c27i3y4f5biinxjdpp43wbj00lz7dvl08pnqr7hpkzaalsyvcv7";
   };
-  "build/linux/avr-gcc-4.9.2-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2";
-    sha256 = "12r4a1q7mh1gbasy7lqn0p4acg699lglw7il9d5f5vwd32pmh4ii";
+  "build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2";
+    sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r";
   };
-  "build/linux/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2";
-    sha256 = "11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r";
+  "build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl {
+    url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip";
+    sha256 = "1vz0g98ancfqdf7yx5m3zrxmzb3fwp18zh5lkh2nyl5xlr9m368z";
   };
 }
 // optionalAttrs (system == "armv6l-linux") {
-  "build/arduino-builder-arm-1.3.21_r1.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.21_r1.tar.bz2";
-    sha256 = "1ik6r5n6g20x4pb0vbxbkqxgzj39f13n995ki9xgpsrq22x6g1n4";
+  "build/arduino-builder-linuxarm-1.3.25.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.3.25.tar.bz2";
+    sha256 = "1jvlihpcbdv1sgq1wjdwp7dhznk7nd88zin6yj40kr80gcd2ykry";
+  };
+  "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2";
+    sha256 = "033jb1vmspcxsv0w9pk73xv195xnbnmckjsiccgqs8xx36g00dpf";
   };
-  "build/linux/avr-gcc-4.9.2-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2";
-    sha256 = "08b8z7ca0wcgzxmjz6q5ihjrm3i10frnrcqpvwjrlsxw37ah1wvp";
+  "build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2";
+    sha256 = "1kp1xry97385zbrs94j285h1gqlzyyhkchh26z7zq6c0wi5879i5";
   };
-  "build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
-    url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2";
-    sha256 = "1rybp4hgk0mm7dydr3rj7yx59jzi30s4kyadzkjv13nm4ds209i4";
+  "build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2" = fetchurl {
+    url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2";
+    sha256 = "0k1pib8lmvk6c0y3m038fj3mc18ax1hy3kbvgd5nygrxvy1hv274";
   };
 }
-- 
GitLab


From 6ce7049ebbbb63e6a885b623a0ff8a8b1c199636 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 Jun 2017 10:20:09 +0200
Subject: [PATCH 0231/1490] osc: udpdate to latest git version

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c694534d3a9..38ecc802dea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16052,13 +16052,13 @@ in {
   });
 
   osc = buildPythonPackage {
-    name = "osc-0.156.0-16-g9e6d1a5";
+    name = "osc-0.156.0-94-gd8ba394";
     disabled = isPy3k;
     src = pkgs.fetchFromGitHub {
       owner = "openSUSE";
       repo = "osc";
-      rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9";
-      sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z";
+      rev = "d8ba39416bb193a15489cb2ae57847434adbf1c8";
+      sha256 = "0bxl1sjfpdrhyc0qljyqlkffyzn1iywjqgaz2z1y07zq59gc8wq0";
     };
     buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper
     propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
-- 
GitLab


From be3b7c7408cee768d5620635d96a52d4205ed272 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 Jun 2017 10:20:27 +0200
Subject: [PATCH 0232/1490] osc: install completion file for fish

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 38ecc802dea..bc50969df91 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16064,6 +16064,7 @@ in {
     propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
     postInstall = ''
       ln -s $out/bin/osc-wrapper.py $out/bin/osc
+      install -D -m444 osc.fish $out/etc/fish/completions/osc.fish
       install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper
       mkdir -p $out/share/bash-completion/completions
       cat >>$out/share/bash-completion/completions/osc <<EOF
-- 
GitLab


From 6482224d45877fee411a7ba9fc83fe98d8dcda42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 1 Jun 2017 11:47:36 +0100
Subject: [PATCH 0233/1490] cgdb: 0.6.8 -> 0.7.0

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

diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index b9a517f671f..bd0e769a0fd 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cgdb-${version}";
-  version = "0.6.8";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "http://cgdb.me/files/${name}.tar.gz";
-    sha256 = "0hfgyj8jimb7imqlfdpzaln787r6r0yzwzmnk91rfl19pqlkw85y";
+    sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz";
   };
 
   buildInputs = [ ncurses readline flex texinfo help2man ];
-- 
GitLab


From bb21e5356f26dbeb9810189e902352457f263b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 17 May 2017 13:57:33 +0100
Subject: [PATCH 0234/1490] ropper: fix tests

---
 .../python-modules/ropper/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +----------
 2 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/ropper/default.nix

diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
new file mode 100644
index 00000000000..37369b8f0bd
--- /dev/null
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonApplication
+, fetchPypi
+, capstone
+, filebytes
+, pytest }:
+
+buildPythonApplication rec {
+  name = "${pname}-${version}";
+  pname = "ropper";
+  version = "1.10.10";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87";
+  };
+  checkPhase = ''
+    py.test testcases
+  '';
+  buildInputs = [pytest];
+  propagatedBuildInputs = [ capstone filebytes ];
+  meta = with stdenv.lib; {
+    homepage = "https://scoding.de/ropper/";
+    license = licenses.gpl2;
+    description = "Show information about files in different file formats";
+    maintainers = with maintainers; [ bennofs ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc50969df91..232b83a5644 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22009,21 +22009,7 @@ in {
      };
   };
 
-  ropper = buildPythonApplication rec {
-    name = "ropper-1.10.10";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/ropper/${name}.tar.gz";
-      sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87";
-    };
-    propagatedBuildInputs = with self; [ capstone filebytes ];
-    meta = with pkgs.stdenv.lib; {
-      homepage = "https://scoding.de/ropper/";
-      license = licenses.gpl2;
-      description = "Show information about files in different file formats";
-      maintainers = with maintainers; [ bennofs ];
-    };
-  };
-
+  ropper = callPackage ../development/python-modules/ropper { };
 
   routes = buildPythonPackage rec {
     name = "routes-1.12.3";
-- 
GitLab


From ef77b61f75c9f599c71f9bb69eef71c5326b0978 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 1 Jun 2017 19:11:21 +0800
Subject: [PATCH 0235/1490] kwalletcli: init at 3.00

---
 pkgs/tools/security/kwalletcli/default.nix | 55 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/tools/security/kwalletcli/default.nix

diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix
new file mode 100644
index 00000000000..c6217024f1b
--- /dev/null
+++ b/pkgs/tools/security/kwalletcli/default.nix
@@ -0,0 +1,55 @@
+{
+  kdeDerivation, kdeWrapper, fetchurl, lib,
+  pkgconfig,
+  kcoreaddons, ki18n, kwallet,
+  mksh
+}:
+
+let
+  pname = "kwalletcli";
+  version = "3.00";
+
+  unwrapped = kdeDerivation rec {
+    name = "${pname}-${version}";
+
+    src = fetchurl {
+      url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz";
+      sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98";
+    };
+
+    postPatch = ''
+      substituteInPlace GNUmakefile \
+        --replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \
+        --replace '-I/usr/include/KF5/KI18n'       '-I${ki18n.dev}/include/KF5/KI18n' \
+        --replace '-I/usr/include/KF5/KWallet'     '-I${kwallet.dev}/include/KF5/KWallet' \
+        --replace /usr/bin                         $out/bin \
+        --replace /usr/share/man                   $out/share/man
+    '';
+
+    makeFlags = [ "KDE_VER=5" ];
+
+    # we need this when building against qt 5.8+
+    NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
+    nativeBuildInputs = [ pkgconfig ];
+    # if using just kwallet, cmake will be added as a buildInput and fail the build
+    propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
+
+    preInstall = ''
+      mkdir -p $out/bin $out/share/man/man1
+    '';
+
+    meta = with lib; {
+      description = "Command-Line Interface to the KDE Wallet";
+      homepage = http://www.mirbsd.org/kwalletcli.htm;
+      license = licenses.miros;
+      maintainers = with maintainers; [ peterhoeg ];
+    };
+  };
+
+in kdeWrapper {
+  inherit unwrapped;
+  targets = map (b: "bin/" + b)
+    [ "kwalletaskpass" "kwalletcli" "kwalletcli_getpin" "pinentry-kwallet" ];
+  paths = [ mksh ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aecb500995f..f26e7a5029a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2634,6 +2634,8 @@ with pkgs;
 
   kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
 
+  kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
+
   peruse = libsForQt5.callPackage ../tools/misc/peruse { };
 
   kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };
-- 
GitLab


From 530ababdf6228000a6014d62a6501488b923d482 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 1 Jun 2017 14:29:45 +0300
Subject: [PATCH 0236/1490] blueman: wrap binaries in libexec

Fixup after c10af9e744c91dff1ccc07a52a0b57d1e4d339f3
---
 pkgs/tools/bluetooth/blueman/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 0c298aa1f21..db0c2c26d3c 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -33,7 +33,8 @@ in stdenv.mkDerivation rec {
 
   preFixup = ''
     makeWrapperArgs="--prefix PATH ':' ${binPath}"
-    wrapPythonPrograms
+    wrapPythonProgramsIn "$out/bin" "$pythonPath"
+    wrapPythonProgramsIn "$out/libexec" "$pythonPath"
   '';
 
   meta = with lib; {
-- 
GitLab


From fa1952908ede8ea3e51fb496f5809de9677d152a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 1 Jun 2017 08:43:52 -0500
Subject: [PATCH 0237/1490] dropbox: 26.4.24 -> 27.4.22

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index b894322062f..9c68253cf42 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "26.4.24";
+  version = "27.4.22";
   sha256 =
     {
-      "x86_64-linux" = "1qzz88d3akbqfk1539w2z0ldyjjscqjqgsvadf9i4xr2y0syfv4y";
-      "i686-linux"   = "12xwmmycrg56xl88k9pqd7mcn0jqi4jijf36vn4fdjvmn7ksskcw";
+      "x86_64-linux" = "1v1q799dj0bffg3s98ifzpsccjaajl221h5ckaqijlmpzr2q5hhh";
+      "i686-linux"   = "1qsw6c0mb0n0djz7xpfixispi9k68kbvf8dc92frpcbcvm0h845y";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
-- 
GitLab


From 0f1753b1d30b63008ff60c731fca03c8b3fd1594 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 1 Jun 2017 09:33:52 -0400
Subject: [PATCH 0238/1490] pants13-pre: 1.3.0rc2 -> 1.3.0rc4

---
 .../development/tools/build-managers/pants/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index f37c2502be6..1e37a3f85e2 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -23,16 +23,16 @@ let
     };
   };
 
-  pants13-version = "1.3.0rc2";
+  pants13-version = "1.3.0rc4";
 
   # TODO: compile the rust native engine ourselves so we don't need to do this shit. We don't use
   # fetchurl because we don't know the URL ahead of time, even though it's deterministic. So we have
   # this downloader figure out the URL on the fly and then produce the deterministic result, so we
   # can still be a fixed-output derivation.
   pants13-native-engine-info = {
-    "x86_64-darwin" = { prefix = "mac/10.11";    hash = "0n8z7rg0yfpxplvcw88lwv733zkhbzhc4w4zd4aznbcmfqdiz5br"; };
-    "x86_64-linux"  = { prefix = "linux/x86_64"; hash = "0cva97899q902m61xnfawhbjrh5h751716sn6ljli9b8fl7b5sz4"; };
-    "i686-linux"    = { prefix = "linux/i386";   hash = "1qckg0zsdq9x4jhn59pswbs11mxqxryl65qn42hrsvii2yxa9i5k"; };
+    "x86_64-darwin" = { prefix = "mac/10.11";    hash = "04kfqp4fcxj7zkyb21rgp1kdrlnmayfvakpg5xips716d7pp6vc7"; };
+    "x86_64-linux"  = { prefix = "linux/x86_64"; hash = "0vgmcqxcabryxgvk4wmbclqjn56jbmsaysckgwfzhmif8pxyrfam"; };
+    "i686-linux"    = { prefix = "linux/i386";   hash = "1xgma6cwvzg1d07xq6bd3j4rpzp6wn6lz82xqprr6vflyn78qaaw"; };
   }.${stdenv.system} or (throw "Unsupported system ${stdenv.system}!");
 
   pants13-native-engine = runCommand "pants-native-${pants13-version}" {
@@ -98,7 +98,7 @@ in {
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1d3i0jwhn94b96b3lwwxd10007hnxw6dw1azmwv3hhwq713gwnpi";
+      sha256 = "03zv3g55x056vjggwjr8lpniixcpb3kfy7xkl1bxsvjp2ih2wj6g";
     };
 
     prePatch = ''
-- 
GitLab


From af096c8bff1e534be9c69f50eed13e6b48427d0e Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Wed, 31 May 2017 07:10:01 +0100
Subject: [PATCH 0239/1490] dd-agent: 5.11.2 -> 5.13.2 + service rework

---
 .../monitoring/dd-agent/dd-agent-defaults.nix |   8 -
 .../services/monitoring/dd-agent/dd-agent.nix | 190 +++++-------------
 .../dd-agent/update-dd-agent-defaults         |   9 -
 pkgs/tools/networking/dd-agent/default.nix    |  57 ++++--
 4 files changed, 95 insertions(+), 169 deletions(-)
 delete mode 100644 nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
 delete mode 100755 nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults

diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
deleted file mode 100644
index 04512819742..00000000000
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.
-[
-  "auto_conf"
-  "agent_metrics.yaml.default"
-  "disk.yaml.default"
-  "network.yaml.default"
-  "ntp.yaml.default"
-]
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index 8d3d4f2065e..e55faed8e07 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -16,100 +16,24 @@ let
     forwarder_log_file: /var/log/datadog/forwarder.log
     dogstatsd_log_file: /var/log/datadog/dogstatsd.log
     pup_log_file:       /var/log/datadog/pup.log
-
-    # proxy_host: my-proxy.com
-    # proxy_port: 3128
-    # proxy_user: user
-    # proxy_password: password
-
-    # tags: mytag0, mytag1
     ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"}
-
-    # collect_ec2_tags: no
-    # recent_point_threshold: 30
-    # use_mount: no
-    # listen_port: 17123
-    # graphite_listen_port: 17124
-    # non_local_traffic: no
-    # use_curl_http_client: False
-    # bind_host: localhost
-
-    # use_pup: no
-    # pup_port: 17125
-    # pup_interface: localhost
-    # pup_url: http://localhost:17125
-
-    # dogstatsd_port : 8125
-    # dogstatsd_interval : 10
-    # dogstatsd_normalize : yes
-    # statsd_forward_host: address_of_own_statsd_server
-    # statsd_forward_port: 8125
-
-    # device_blacklist_re: .*\/dev\/mapper\/lxc-box.*
-
-    # ganglia_host: localhost
-    # ganglia_port: 8651
+    ${cfg.extraDdConfig}
   '';
 
-  diskConfig = pkgs.writeText "disk.yaml" ''
-    init_config:
-
-    instances:
-      - use_mount: no
-  '';
-  
-  networkConfig = pkgs.writeText "network.yaml" ''
-    init_config:
-
-    instances:
-      # Network check only supports one configured instance
-      - collect_connection_state: false
-        excluded_interfaces:
-          - lo
-          - lo0
-  '';
-  
-  postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;
-  nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;
-  mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig;
-  jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig;
-  processConfig = pkgs.writeText "process.yaml" cfg.processConfig;
-  
   etcfiles =
-    let
-      defaultConfd = import ./dd-agent-defaults.nix;
-    in (map (f: { source = "${pkgs.dd-agent}/agent/conf.d-system/${f}";
-                  target = "dd-agent/conf.d/${f}";
-                }) defaultConfd) ++ [
-      { source = ddConf;
-        target = "dd-agent/datadog.conf";
-      }
-      { source = diskConfig;
-        target = "dd-agent/conf.d/disk.yaml";
-      }
-      { source = networkConfig;
-        target = "dd-agent/conf.d/network.yaml";
-      } ] ++
-    (optional (cfg.postgresqlConfig != null)
-      { source = postgresqlConfig;
-        target = "dd-agent/conf.d/postgres.yaml";
-      }) ++
-    (optional (cfg.nginxConfig != null)
-      { source = nginxConfig;
-        target = "dd-agent/conf.d/nginx.yaml";
-      }) ++
-    (optional (cfg.mongoConfig != null)
-      { source = mongoConfig;
-        target = "dd-agent/conf.d/mongo.yaml";
-      }) ++
-    (optional (cfg.processConfig != null)
-      { source = processConfig;
-        target = "dd-agent/conf.d/process.yaml";
-      }) ++
-    (optional (cfg.jmxConfig != null)
-      { source = jmxConfig;
-        target = "dd-agent/conf.d/jmx.yaml";
-      });
+    map (i: { source = if builtins.hasAttr "config" i
+                       then pkgs.writeText "${i.name}.yaml" i.config
+                       else "${pkgs.dd-agent}/agent/conf.d-system/${i.name}.yaml";
+              target = "dd-agent/conf.d/${i.name}.yaml";
+            }
+        ) cfg.integrations ++
+        [ { source = ddConf;
+            target = "dd-agent/datadog.conf";
+          }
+        ];
+
+  # restart triggers
+  etcSources = map (i: i.source) etcfiles;
 
 in {
   options.services.dd-agent = {
@@ -139,44 +63,46 @@ in {
       type = types.uniq (types.nullOr types.string);
     };
 
-    postgresqlConfig = mkOption {
-      description = "Datadog PostgreSQL integration configuration";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
-    };
-
-    nginxConfig = mkOption {
-      description = "Datadog nginx integration configuration";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
-    };
-    
-    mongoConfig = mkOption {
-      description = "MongoDB integration configuration";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
-    };
-
-    jmxConfig = mkOption {
-      description = "JMX integration configuration";
-      default = null;
-      type = types.uniq (types.nullOr types.string);
+    agent = mkOption {
+      description = "The dd-agent package to use. Useful when overriding the package.";
+      default = pkgs.dd-agent;
+      type = types.package;
     };
 
-    processConfig = mkOption {
+    integrations = mkOption {
       description = ''
-        Process integration configuration
- 
-        See http://docs.datadoghq.com/integrations/process/
+        Any integrations to use. Default config used if none
+        specified. It is currently up to the user to make sure that
+        the dd-agent package used has all the dependencies chosen
+        integrations require in scope.
+      '';
+      type = types.listOf (types.attrsOf types.string);
+      default = [];
+      example = ''
+        [ { name = "elastic";
+            config = '''
+              init_config:
+
+              instances:
+                - url: http://localhost:9200
+            ''';
+          }
+          { name = "nginx"; }
+          { name = "ntp"; }
+          { name = "network"; }
+        ]
       '';
-      default = null;
-      type = types.uniq (types.nullOr types.string);
     };
 
+    extraDdConfig = mkOption {
+      description = "Extra settings to append to datadog agent config.";
+      default = "";
+      type = types.string;
+    };
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ];
+    environment.systemPackages = [ cfg.agent pkgs.sysstat pkgs.procps ];
 
     users.extraUsers.datadog = {
       description = "Datadog Agent User";
@@ -190,7 +116,7 @@ in {
 
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
-      path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ];
+      path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
@@ -199,28 +125,12 @@ in {
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ];
-    };
-
-    systemd.services.dogstatsd = {
-      description = "Datadog statsd";
-      path = [ pkgs."dd-agent" pkgs.python pkgs.procps ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start";
-        User = "datadog";
-        Group = "datadog";
-        Type = "forking";
-        PIDFile = "/tmp/dogstatsd.pid";
-        Restart = "always";
-        RestartSec = 2;
-      };
-      restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ];
+      restartTriggers = [ pkgs.dd-agent ddConf ] ++ etcSources;
     };
 
-    systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) {
+    systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) {
       description = "Datadog JMX Fetcher";
-      path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
+      path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch";
@@ -229,7 +139,7 @@ in {
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ];
+      restartTriggers = [ cfg.agent ddConf ] ++ etcSources;
     };
 
     environment.etc = etcfiles;
diff --git a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
deleted file mode 100755
index 76724173171..00000000000
--- a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-dd=$(nix-build --no-out-link -A dd-agent ../../../..)
-echo '# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.' > dd-agent-defaults.nix
-echo '[' >> dd-agent-defaults.nix
-echo '  "auto_conf"' >> dd-agent-defaults.nix
-for f in $(find $dd/agent/conf.d-system -maxdepth 1 -type f | grep -v '\.example' | sort); do
-  echo "  \"$(basename $f)\"" >> dd-agent-defaults.nix
-done
-echo ']' >> dd-agent-defaults.nix
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index d1171a3c835..2556287570f 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,5 +1,11 @@
 { stdenv, fetchFromGitHub, pythonPackages
-, sysstat, unzip, makeWrapper }:
+, sysstat, unzip, makeWrapper
+# We need extraBuildInputs as we want to be able to override this
+# package with python packages _and_ have the produced binaries
+# wrapper with their PYTHONPATH. This means overrideAttrs is not
+# strong enough (it overrides too late), we need to call it
+# beforehand.
+, extraBuildInputs ? [ pythonPackages.psutil ] }:
 let
   inherit (pythonPackages) python;
   docker_1_10 = pythonPackages.buildPythonPackage rec {
@@ -26,33 +32,42 @@ let
     # due to flake8
     doCheck = false;
   };
+  version = "5.13.2";
+
+  integrations = fetchFromGitHub {
+    owner = "datadog";
+    repo = "integrations-core";
+    rev = version;
+    sha256 = "1nbjmkq0wdfndmx0qap69h2rkwkkb0632j87h9d3j99bykyav3y3";
+  };
 
 in stdenv.mkDerivation rec {
-  version = "5.11.2";
   name = "dd-agent-${version}";
 
   src = fetchFromGitHub {
     owner  = "datadog";
     repo   = "dd-agent";
     rev    = version;
-    sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx";
+    sha256 = "0x2bxi70l2yf0wi232qksvcscjdpjg8l7dmgg1286vqryyfazfjb";
   };
 
   buildInputs = [
     python
     unzip
     makeWrapper
-    pythonPackages.requests
-    pythonPackages.psycopg2
-    pythonPackages.psutil
+    pythonPackages.boto
+    docker_1_10
+    pythonPackages.kazoo
     pythonPackages.ntplib
-    pythonPackages.simplejson
-    pythonPackages.pyyaml
-    pythonPackages.pymongo_2_9_1
-    pythonPackages.python-etcd
     pythonPackages.consul
-    docker_1_10
-  ];
+    pythonPackages.python-etcd
+    pythonPackages.pyyaml
+    pythonPackages.requests
+    pythonPackages.simplejson
+    pythonPackages.supervisor
+    pythonPackages.tornado
+    pythonPackages.uptime
+  ] ++ extraBuildInputs;
   propagatedBuildInputs = with pythonPackages; [ python tornado ];
 
   buildCommand = ''
@@ -67,6 +82,24 @@ in stdenv.mkDerivation rec {
     # Move out default conf.d so that /etc/dd-agent/conf.d is used
     mv $out/agent/conf.d $out/agent/conf.d-system
 
+    # Sometime between 5.11.2 and 5.13.2 datadog moved out all its
+    # checks into separate repository. Copy them back in so dd-agent
+    # service can easily pick and choose by copying out configs into
+    # its etc files.
+    mkdir -p $out/agent/checks.d
+    for i in ${toString integrations}/* # */
+    do
+      if [ -f "$i/check.py" ]; then
+        if [ -f "$i/conf.yaml.default" -o -f "$i/conf.yaml.example" ]; then
+          local name=$(basename $i)
+          cp $i/check.py $out/agent/checks.d/$name.py
+          # Copy .default file first unless it doesn't exist then copy .default
+          cp $i/conf.yaml.default $out/agent/conf.d-system/$name.yaml &> /dev/null || \
+            cp $i/conf.yaml.example $out/agent/conf.d-system/$name.yaml
+        fi
+      fi
+    done
+
     cat > $out/bin/dd-jmxfetch <<EOF
     #!/usr/bin/env bash
     exec ${python}/bin/python $out/agent/jmxfetch.py $@
-- 
GitLab


From 9cee10973d3356ce7e9af876abf15c70a4eea6eb Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 1 Jun 2017 16:18:00 +0200
Subject: [PATCH 0240/1490] electrum: 2.8.2 -> 2.8.3

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

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index a2d39f2d486..14c6c18f91c 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.8.2";
+  version = "2.8.3";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "01xphbi7lx64s9380zjfakz5h8blqmxp0ryqlll7px66qpmjn5fq";
+    sha256 = "04jswalydzwm16iismbq1h2shj17iq9sqm0mz8p98sh3dwkacvn1";
   };
 
   propagatedBuildInputs = with python2Packages; [
-- 
GitLab


From 41efae4500626d2f973fe1012f3ace6e00cc865b Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Thu, 1 Jun 2017 17:40:57 +0200
Subject: [PATCH 0241/1490] restic: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 92821290667..742c1cafc93 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "restic-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   goPackagePath = "github.com/restic/restic";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "0kjk8fyfmbnh2jayfjq4ggkc99rh02jkv8gvqcpyqnw3dxznwrk2";
+    sha256 = "1rp4s1gh07j06457rhl4r0qnxqn0h7n4i8k50akdr87nwyikkn17";
   };
 
   buildPhase = ''
-- 
GitLab


From 49edb1138a0a2ba1f43d54859b4f4a263e99a679 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:00:57 +0200
Subject: [PATCH 0242/1490] pythonPackages.argparse: remove because argparse is
 part of stdlib in 2.7 and 3.2+

---
 pkgs/top-level/python-packages.nix | 32 ++----------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 232b83a5644..abc3386ff4b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1287,36 +1287,8 @@ in {
 
   };
 
-  argparse = buildPythonPackage (rec {
-    name = "argparse-1.4.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/argparse/${name}.tar.gz";
-      sha256 = "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32";
-    };
-
-    checkPhase = ''
-      export PYTHONPATH=`pwd`/build/lib:$PYTHONPATH
-      ${python.interpreter} test/test_argparse.py
-    '';
-
-    # ordering issues in tests
-    doCheck = !isPy3k;
-
-    meta = {
-      homepage = http://code.google.com/p/argparse/;
-      license = licenses.asl20;
-      description = "argparse: Python command line parser";
-      longDescription = ''
-        The argparse module makes writing command line tools in Python
-        easy.  Just briefly describe your command line interface and
-        argparse will take care of the rest, including: parsing the
-        arguments and flags from sys.argv, converting arg strings into
-        objects for your program, formatting and printing any help
-        messages, and much more.
-      '';
-    };
-  });
+  # argparse is part of stdlib in 2.7 and 3.2+
+  argparse = null;
 
   astroid = callPackage ../development/python-modules/astroid { };
 
-- 
GitLab


From 10ee7b2bdae7378b2247d547d8b6b978234b9487 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:01:24 +0200
Subject: [PATCH 0243/1490] pythonPackages.wheel: move expression to separate
 file

---
 .../python-modules/wheel/default.nix          | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +------------
 2 files changed, 33 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/wheel/default.nix

diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
new file mode 100644
index 00000000000..5574a800b5b
--- /dev/null
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pytestcov
+, coverage
+, jsonschema
+}:
+
+buildPythonPackage rec {
+  pname = "wheel";
+  version = "0.29.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648";
+  };
+
+  buildInputs = [ pytest pytestcov coverage ];
+
+  propagatedBuildInputs = [ jsonschema ];
+
+  # We add this flag to ignore the copy installed by bootstrapped-pip
+  installFlags = [ "--ignore-installed" ];
+
+  meta = {
+    description = "A built-package format for Python";
+    license = with lib.licenses; [ mit ];
+    homepage = https://bitbucket.org/pypa/wheel/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index abc3386ff4b..155ae8c5eb6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25922,28 +25922,7 @@ EOF
     };
   };
 
-  wheel = buildPythonPackage rec {
-    name = "wheel-${version}";
-    version = "0.29.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/w/wheel/${name}.tar.gz";
-      sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648";
-    };
-
-    buildInputs = with self; [ pytest pytestcov coverage ];
-
-    propagatedBuildInputs = with self; [ jsonschema ];
-
-    # We add this flag to ignore the copy installed by bootstrapped-pip
-    installFlags = [ "--ignore-installed" ];
-
-    meta = {
-      description = "A built-package format for Python";
-      license = with licenses; [ mit ];
-      homepage = https://bitbucket.org/pypa/wheel/;
-    };
-  };
+  wheel = callPackage ../development/python-modules/wheel { };
 
   widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
 
-- 
GitLab


From f069498c3ab3e86145bc991cd02a38be1a275c37 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:01:43 +0200
Subject: [PATCH 0244/1490] python.pkgs.appdirs: 1.4.0 -> 1.4.3

---
 .../python-modules/appdirs/default.nix        | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 15 +------------
 2 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/appdirs/default.nix

diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix
new file mode 100644
index 00000000000..211d51c241d
--- /dev/null
+++ b/pkgs/development/python-modules/appdirs/default.nix
@@ -0,0 +1,21 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "appdirs";
+  version = "1.4.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92";
+  };
+
+  meta = {
+    description = "A python module for determining appropriate platform-specific dirs";
+    homepage = http://github.com/ActiveState/appdirs;
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 155ae8c5eb6..40fea0bde4c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1002,20 +1002,7 @@ in {
     };
   };
 
-  appdirs = buildPythonPackage rec {
-    name = "appdirs-1.4.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/appdirs/appdirs-1.4.0.tar.gz";
-      sha256 = "8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5";
-    };
-
-    meta = {
-      description = "A python module for determining appropriate platform-specific dirs";
-      homepage = http://github.com/ActiveState/appdirs;
-      license = licenses.mit;
-    };
-  };
+  appdirs = callPackage ../development/python-modules/appdirs { };
 
   application = buildPythonPackage rec {
     pname = "python-application";
-- 
GitLab


From ef6585474792ceb920a9513a753e63bc859b390e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:09:51 +0200
Subject: [PATCH 0245/1490] pythonPackages.Nikola: 7.8.4 -> 7.8.6

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

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index 503e655e65a..762c43d93c0 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -30,7 +30,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Nikola";
-  version = "7.8.4";
+  version = "7.8.6";
 
   # Nix contains only Python 3 supported version of doit, which is a dependency
   # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14pd5zk6l6f58snq9n9zpxwhqcc3xz8b1gz31zsrqajggg1i8fn8";
+    sha256 = "48d3a00c3fc9c61bcd305653a531949bdd777d9211434172549498fd8136e036";
   };
 
   meta = {
-- 
GitLab


From 69248bef6f0ea73fbac7ff8ab1183df6e9273dec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:10:23 +0200
Subject: [PATCH 0246/1490] python.pkgs.edward: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index ab7391595dc..4d78acf78de 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "edward";
-  version = "1.3.1";
+  version = "1.3.2";
   name  = "${pname}-${version}";
 
   disabled = !(isPy27 || pythonAtLeast "3.4");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5f868604c4d13ccc054906fae6c0115edf295a81897cc9dc97026bb083d275ae";
+    sha256 = "24aa0bf237965f47dd39d2b2ff43718ba75cb12c471b26ff80a972a66ff32de3";
   };
 
   # disabled for now due to Tensorflow trying to create files in $HOME:
-- 
GitLab


From 6919a949e5b8cc24dd641127f305e7e351c95dc7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:10:41 +0200
Subject: [PATCH 0247/1490] python.pkgs.Flask-Migrate: 2.0.3 -> 2.0.4

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

diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
index 26fbed4ca5e..3e2c7ac4602 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -5,12 +5,12 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
-  version = "2.0.3";
+  version = "2.0.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "107x78lkqsnbg92dld3dkagg07jvchp3ib3y0sivc4ipz6n1y7rk";
+    sha256 = "1e6dc83bed93aef9a4791d5daaa03b186c8ef5d96c99c7d88166da683c86e42d";
   };
 
   checkInputs = optional isPy3k glibcLocales;
-- 
GitLab


From 8742c1eeba3c80980d652275468571c819f036ba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:11:00 +0200
Subject: [PATCH 0248/1490] python.pkgs.guessit: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
index 7cf051b89a6..cc5c954b645 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "guessit";
-  version = "2.1.2";
+  version = "2.1.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9f7e12b7f2215548284631a20aae6fc009c8af2bb8cc5d5e5e339cb15361dd95";
+    sha256 = "b2eebbb61e4d2b3764ce4462e0b27da0dccbb25b78e13493a2f913a402e1d0fb";
   };
 
   # Tests require more packages.
-- 
GitLab


From 2050213c54a9dd7c7fdca28402b7720ece3217b2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:11:22 +0200
Subject: [PATCH 0249/1490] python.pkgs.hypothesis: 3.11.0 -> 3.11.1

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

diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
index cb0db6dc2e0..51887b83e7c 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
   # pytz fake_factory django numpy pytest
   # If you need these, you can just add them to your environment.
 
-  version = "3.11.0";
+  version = "3.11.1";
   pname = "hypothesis";
   name = "${pname}-${version}";
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis-python";
     rev = "${version}";
-    sha256 = "1s911pd3y9hvk0hq2fr6i68dqv1ciagryhgp13wgyfqh8hz8j6zv";
+    sha256 = "5344cc3327bc7fa543fc3b42e85c55f40dda0eeaec38327f9bf373c3ece42b39";
   };
 
   checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ];
-- 
GitLab


From e2c3d711d3efdbc26c88e092c48ea708aaa45ab8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:11:37 +0200
Subject: [PATCH 0250/1490] python.pkgs.ldap: 2.4.38 -> 2.4.39

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

diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index ff4d1445f77..b583a2ae2d8 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "python-ldap";
-  version = "2.4.38";
+  version = "2.4.39";
   name = "${pname}-${version}";
   disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779";
+    sha256 = "3fb75108d27e8091de80dffa2ba3bf45c7a3bdc357e2959006aed52fa58bb2f3";
   };
 
   # Needed by tests to setup a mockup ldap server.
-- 
GitLab


From cf35515dff0c30c018b110a182138522c08d2cfb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:11:57 +0200
Subject: [PATCH 0251/1490] python.pkgs.multidict: 2.1.5 -> 2.1.6

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

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 1031e81c5e3..faece73e172 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname = "multidict";
-  version = "2.1.5";
+  version = "2.1.6";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "20a30a474882ad174eb64873cfa7bae4604944105adf7f6847141bd7938c5ed1";
+    sha256 = "9ec33a1da4d2096949e29ddd66a352aae57fad6b5483087d54566a2f6345ae10";
   };
 
   buildInputs = [ pytest ];
-- 
GitLab


From 8cc237345ea4383df56b66a8c6d764a0a2f18fba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:12:17 +0200
Subject: [PATCH 0252/1490] python.pkgs.netcdf4: 1.2.7 -> 1.2.8

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

diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4.nix
index b50bcae033c..b123921a1ce 100644
--- a/pkgs/development/python-modules/netcdf4.nix
+++ b/pkgs/development/python-modules/netcdf4.nix
@@ -4,13 +4,13 @@
 buildPythonPackage rec {
   pname = "netCDF4";
   name = "${pname}-${version}";
-  version = "1.2.7";
+  version = "1.2.8";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
-    sha256 = "1fllizmnpw0zkzzm4j9pgamarlzfn3kmv9zrm0w65q1y31h9ni0c";
+    sha256 = "31eb4eae5fd3b2bd8f828721142ddcefdbf10287281bf6f636764dd7957f8450";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From d7456767be1670a921cc5bea6ef7b79102ee10e3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:12:32 +0200
Subject: [PATCH 0253/1490] python.pkgs.plotly: 2.0.8 -> 2.0.9

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

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 6e5627a58ca..4c78ac63d30 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.0.8";
+  version = "2.0.9";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zbwx771w6425w4g6l9fhq4x1854fdnni6xq9xhvs8xqgxkrljm5";
+    sha256 = "1b82ec9e09179b5191297b82a3f89f61055b730b09a1821c71fac18e82857e8f";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From 114f55732a2ce81580738d7f7b80d8e7aca2e7f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:12:53 +0200
Subject: [PATCH 0254/1490] python.pkgs.pyroute2: 0.4.14 -> 0.4.15

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

diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 5d2e1855f04..757933bd6b6 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.4.14";
+  version = "0.4.15";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-    sha256 = "eb41cdc5a9e7c017c65c8ff11013fd1b6d6699163bcf469e643cb1799a87d330";
+    sha256 = "273530e78261ac5e9e2985f12fad9e6c4231f8e49b8c285c05a23dcda5afce58";
   };
 
   # requires root priviledges
-- 
GitLab


From c251acecf3331a3402311022da7378ae754a33e8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:13:24 +0200
Subject: [PATCH 0255/1490] python.pkgs.vcrpy: 1.11.0 -> 1.11.1

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

diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index 953c77fb492..9387c7de792 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonPackage rec {
   pname = "vcrpy";
-  version = "1.11.0";
+  version = "1.11.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "beb30de89c3618482ea76662b4135d48fef7417589df49c303b2e85db40c9705";
+    sha256 = "f434fe7e05d940d576ac850709ae57a738ba40e7f317076ea8d359ced5b32320";
   };
 
   checkInputs = [
-- 
GitLab


From bdd3f307397a9c2e7ed838865ec4e70f5c36c722 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:20:42 +0200
Subject: [PATCH 0256/1490] python.pkgs.bootstrapped-pip: update setuptools to
 36.0.1

---
 .../bootstrapped-pip/default.nix              | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 7c992921e94..cdc77249cb8 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -1,24 +1,31 @@
-{ stdenv, python, fetchurl, makeWrapper, unzip }:
+{ stdenv, python, fetchPypi, makeWrapper, unzip }:
 
 let
-  wheel_source = fetchurl {
-    url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.29.0-py2.py3-none-any.whl";
+  wheel_source = fetchPypi {
+    pname = "wheel";
+    version = "0.29.0";
+    format = "wheel";
     sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd";
   };
-  setuptools_source = fetchurl {
-    url = "https://files.pythonhosted.org/packages/b8/cb/b919f52dd81b4b2210d0c5529b6b629a4002e08d49a90183605d1181b10c/setuptools-30.2.0-py2.py3-none-any.whl";
-    sha256 = "b7e7b28d6a728ea38953d66e12ef400c3c153c523539f1b3997c5a42f3770ff1";
+  setuptools_source = fetchPypi {
+    pname = "setuptools";
+    version = "36.0.1";
+    format = "wheel";
+    sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587";
   };
-  argparse_source = fetchurl {
-    url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl";
-    sha256 = "0533cr5w14da8wdb2q4py6aizvbvsdbk3sj7m1jx9lwznvnlf5n3";
+  argparse_source = fetchPypi {
+    pname = "argparse";
+    version = "1.4.0";
+    sha256 = "c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314";
   };
 in stdenv.mkDerivation rec {
-  name = "${python.libPrefix}-bootstrapped-pip-${version}";
+  pname = "pip";
   version = "9.0.1";
+  name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://files.pythonhosted.org/packages/b6/ac/7015eb97dc749283ffdec1c3a88ddb8ae03b8fad0f0e611408f196358da3/pip-9.0.1-py2.py3-none-any.whl";
+  src = fetchPypi {
+    inherit pname version;
+    format = "wheel";
     sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0";
   };
 
-- 
GitLab


From 6dfbfd6a070f89dc698d08500fe3b73ebe5b3d12 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 1 Jun 2017 18:21:23 +0200
Subject: [PATCH 0257/1490] python.pkgs.setuptools: 30.2.0 -> 36.0.1

---
 .../python-modules/setuptools/default.nix     | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 63e05736d79..59fe5f14839 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, lib, fetchurl, python, wrapPython }:
+{ stdenv
+, fetchPypi
+, python
+, wrapPython
+, unzip
+}:
 
+# Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  shortName = "${pname}-${version}";
-  name = "${python.libPrefix}-${shortName}";
+  version = "36.0.1";
+  name = "${python.libPrefix}-${pname}-${version}";
 
-  version = "30.2.0";
-
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz";
-    sha256 = "f865709919903e3399343c0b3c42f95e9aeddc41e38cfb334fb2bb5dfa384857";
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a";
   };
 
-  buildInputs = [ python wrapPython ];
+  buildInputs = [ python wrapPython unzip ];
   doCheck = false;  # requires pytest
   installPhase = ''
       dst=$out/${python.sitePackages}
@@ -27,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = http://pypi.python.org/pypi/setuptools;
-    license = with lib.licenses; [ psfl zpt20 ];
+    license = with licenses; [ psfl zpt20 ];
     platforms = platforms.all;
     priority = 10;
   };
-- 
GitLab


From 463df8c9f7dc0a29c4b4fa5b46b1eca073b40074 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 1 Jun 2017 18:29:45 +0200
Subject: [PATCH 0258/1490] perl-DBIx-Class-Schema-Loader: 0.07045 -> 0.07047

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5bab2ab8927..eaa46c16e5a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3800,17 +3800,16 @@ let self = _self // overrides; _self = with self; {
   };
 
   DBIxClassSchemaLoader = buildPerlPackage rec {
-    name = "DBIx-Class-Schema-Loader-0.07045";
+    name = "DBIx-Class-Schema-Loader-0.07047";
     src = fetchurl {
       url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz";
-      sha256 = "b132c667aa7dfe6f054e097c3e572a7dbf8ad433500f085e372740d5bc23a440";
+      sha256 = "6671fb3afbb1b4f3eb5905f34fb47ce18b29af3e055e479b06c09424bbc1421b";
     };
     buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose TestDeep TestDifferences TestException TestPod TestWarn namespaceautoclean ];
     propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DBIxClass DataDump HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger MROCompat ScalarListUtils ScopeGuard StringCamelCase StringToIdentifierEN TryTiny namespaceclean ];
     meta = {
       description = "Create a DBIx::Class::Schema based on a database";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
-- 
GitLab


From bd8ae7359b3bee5ce5e04521a52d1bf0edd2e80c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 1 Jun 2017 18:39:16 +0200
Subject: [PATCH 0259/1490] taskwarrior: install bash completion for fish

And also modernize the location of the bash completion file.
---
 pkgs/applications/misc/taskwarrior/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index e4938b928da..841e0a494e4 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake libuuid gnutls ];
 
   postInstall = ''
-    mkdir -p "$out/etc/bash_completion.d"
-    ln -s "../../share/doc/task/scripts/bash/task.sh" "$out/etc/bash_completion.d/"
+    mkdir -p "$out/share/bash-completion/completions"
+    ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/"
+    mkdir -p "$out/etc/fish/completions"
+    ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/etc/fish/completions/"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 08228e8bfae8edea003b1c9e91d55c7c166fc987 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 1 Jun 2017 19:30:43 +0200
Subject: [PATCH 0260/1490] nagstamon: init at 2.0.1

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

diff --git a/pkgs/tools/nagstamon/default.nix b/pkgs/tools/nagstamon/default.nix
new file mode 100644
index 00000000000..3163b78437e
--- /dev/null
+++ b/pkgs/tools/nagstamon/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "nagstamon-${version}";
+  version = "2.0.1";
+
+  src = fetchurl {
+    url = "https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz";
+    sha256 = "3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b";
+  };
+
+  # Test assumes darwin
+  doCheck = false;
+
+  propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests
+     beautifulsoup4  ];
+
+  meta = with stdenv.lib; {
+    description = "A status monitor for the desktop";
+    homepage = https://nagstamon.ifw-dresden.de/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub ];
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f26e7a5029a..e8ad1d79005 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2718,6 +2718,10 @@ with pkgs;
 
   mxt-app = callPackage ../misc/mxt-app { };
 
+  nagstamon = callPackage ../tools/nagstamon {
+    pythonPackages = python3Packages;
+  };
+
   netdata = callPackage ../tools/system/netdata { };
 
   netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec {
-- 
GitLab


From f30dd71a388b327102a8bbc628aed1b04488e44d Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Thu, 1 Jun 2017 20:40:21 +0200
Subject: [PATCH 0261/1490] go-modules/generic: add missing PATHs to GOPATH
 when using nix-shell (#26176)

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

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index b54f07fb004..c2e4b39472c 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -198,7 +198,7 @@ go.stdenv.mkDerivation (
      ln -s "${dep.src}" "$d/src/${dep.goPackagePath}"
   ''
   ) goPath) + ''
-    export GOPATH="$d:$GOPATH"
+    export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
   '';
 
   disallowedReferences = lib.optional (!allowGoReference) go
-- 
GitLab


From 40e94d56075ba511a7e09e2b7d04e120b96df2fb Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Thu, 1 Jun 2017 21:22:25 +0200
Subject: [PATCH 0262/1490] seth: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix
index 387f5594c62..bf2d6f65326 100644
--- a/pkgs/applications/altcoins/seth.nix
+++ b/pkgs/applications/altcoins/seth.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "seth-${version}";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "dapphub";
     repo = "seth";
     rev = "v${version}";
-    sha256 = "0bgygvilhbabb0y9pv9cn8cx7cj513w9is4vh6v69h2czknrjmgz";
+    sha256 = "1qph1gldj24r8l6aswb1w133lrm8zsxmmxl4krjik0a73bm4ghdm";
   };
 
   nativeBuildInputs = [makeWrapper];
-- 
GitLab


From 156ee07f3cf9fe38c5c5421bc85580bb1396890d Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 1 Jun 2017 20:30:50 +0100
Subject: [PATCH 0263/1490] python.pkgs.magic-wormhole: fix build mostly
 through adding new dependencies

---
 .../python-modules/magic-wormhole/default.nix            | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 62f40ce8337..a777094aea1 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pythonAtLeast
 , nettools
 , glibcLocales
 , autobahn
@@ -12,6 +13,10 @@
 , tqdm
 , python
 , mock
+, ipaddress
+, humanize
+, pyopenssl
+, service-identity
 }:
 
 buildPythonPackage rec {
@@ -26,7 +31,7 @@ buildPythonPackage rec {
 
   checkInputs = [ mock ];
   buildInputs = [ nettools glibcLocales ];
-  propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ];
+  propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity ];
 
   postPatch = ''
     sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
@@ -34,6 +39,8 @@ buildPythonPackage rec {
     # XXX: disable one test due to warning:
     # setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
     sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py
+  '' + lib.optionalString (pythonAtLeast "3.3") ''
+    sed -i -e 's|"ipaddress",||' setup.py
   '';
 
   checkPhase = ''
-- 
GitLab


From 5ae61ce156d9b7d77f09ecd87dc86f31119e2a8f Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 1 Jun 2017 22:05:26 +0200
Subject: [PATCH 0264/1490] pythonPackages.uncertainties: move to
 development/python-modules

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

diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
new file mode 100644
index 00000000000..a0aa1478944
--- /dev/null
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage, nose, numpy }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "uncertainties";
+  version = "3.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4";
+  };
+
+  buildInputs = [ nose numpy ];
+
+  # No tests included
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "http://pythonhosted.org/uncertainties/";
+    description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)";
+    maintainer = with maintainers; [ rnhmjoj ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c146ea70b2c..958f730b61d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28148,27 +28148,7 @@ EOF
   };
 
 
-  uncertainties = buildPythonPackage rec {
-    name = "uncertainties-${version}";
-    version = "3.0.1";
-
-    src = pkgs.fetchurl {
-       url = "mirror://pypi/u/uncertainties/${name}.tar.gz";
-       sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4";
-    };
-
-    buildInputs = with self; [ nose numpy ];
-
-    meta = {
-      homepage = "http://pythonhosted.org/uncertainties/";
-      description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)";
-      license = licenses.bsd3;
-    };
-
-    # No tests included
-    doCheck = false;
-  };
-
+  uncertainties = callPackage ../development/python-modules/uncertainties { };
 
   funcy = buildPythonPackage rec {
     name = "funcy-1.6";
-- 
GitLab


From 624887a3546ad691bc27a803a08fa4a321e693f2 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 1 Jun 2017 23:16:19 +0200
Subject: [PATCH 0265/1490] php: set extension dir to correct location

The extension dir was no longer correctly set to $out/lib/php/extensions
as PHP expects the EXTENSION_DIR as environment variable not config flag.
---
 pkgs/development/interpreters/php/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index b1fdb9e81f9..709f0fad41e 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -274,9 +274,10 @@ let
 
         #[[ -z "$libxml2" ]] || addToSearchPath PATH $libxml2/bin
 
+        export EXTENSION_DIR=$out/lib/php/extensions
+
         configureFlags+=(--with-config-file-path=$out/etc \
-          --includedir=$dev/include \
-          EXTENSION_DIR=$out/lib/php/extensions)
+          --includedir=$dev/include)
       '';
 
       configureFlags = [
-- 
GitLab


From 9e2aba35728de7012a0692f75a3f24685f0fc28b Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 1 Jun 2017 23:23:56 +0200
Subject: [PATCH 0266/1490] darwin-stdenv: remove python-sphinx and a bunch of
 other dependencies from the stdenv

---
 .../compilers/llvm/4/clang/default.nix           |  6 +++---
 pkgs/development/compilers/llvm/4/llvm.nix       | 16 +++++++++-------
 .../tools/build-managers/cmake/default.nix       |  2 +-
 pkgs/stdenv/darwin/default.nix                   | 12 ++++++------
 pkgs/top-level/all-packages.nix                  |  2 +-
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 004893873f5..64dbaa21dd4 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -37,7 +37,7 @@ let
 
     patches = [ ./purity.patch ];
 
-    postBuild = ''
+    postBuild = stdenv.lib.optionalString enableManpages ''
       cmake --build . --target docs-clang-man
     '';
 
@@ -49,7 +49,8 @@ let
       sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
     '';
 
-    outputs = [ "out" ] ++ stdenv.lib.optional enableManpages "man" ++ [ "python" ];
+    outputs = [ "out" "python" ]
+      ++ stdenv.lib.optional enableManpages "man";
 
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
@@ -68,7 +69,6 @@ let
       rm $out/bin/c-index-test
     ''
     + stdenv.lib.optionalString enableManpages ''
-
       # Manually install clang manpage
       cp docs/man/*.1 $out/share/man/man1/
 
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 7d55bc5b410..98c24495355 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -40,8 +40,8 @@ in stdenv.mkDerivation rec {
   '';
 
   outputs = [ "out" ]
-    ++ stdenv.lib.optional enableManpages "man"
-    ++ stdenv.lib.optional enableSharedLibraries "lib";
+    ++ stdenv.lib.optional enableSharedLibraries "lib"
+    ++ stdenv.lib.optional enableManpages "man";
 
   nativeBuildInputs = [ perl groff cmake python ]
     ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
@@ -86,17 +86,19 @@ in stdenv.mkDerivation rec {
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
     "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
-  ] ++ stdenv.lib.optionals enableManpages [
+  ]
+  ++ stdenv.lib.optional enableSharedLibraries
+    "-DLLVM_LINK_LLVM_DYLIB=ON"
+  ++ stdenv.lib.optionals enableManpages [
     "-DLLVM_BUILD_DOCS=ON"
     "-DLLVM_ENABLE_SPHINX=ON"
     "-DSPHINX_OUTPUT_MAN=ON"
     "-DSPHINX_OUTPUT_HTML=OFF"
     "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-  ] ++ stdenv.lib.optional enableSharedLibraries [
-    "-DLLVM_LINK_LLVM_DYLIB=ON"
-  ] ++ stdenv.lib.optional (!isDarwin)
+  ]
+  ++ stdenv.lib.optional (!isDarwin)
     "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
-    ++ stdenv.lib.optionals (isDarwin) [
+  ++ stdenv.lib.optionals (isDarwin) [
     "-DLLVM_ENABLE_LIBCXX=ON"
     "-DCAN_TARGET_i386=false"
   ];
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 00d76fbff9f..d0a34603835 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -3,7 +3,7 @@
 # darwin attributes
 , ps
 , isBootstrap ? false
-, useSharedLibraries ? !stdenv.isCygwin
+, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
 , useNcurses ? false, ncurses
 , useQt4 ? false, qt4
 }:
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index b9592014b46..fba5afd4f6e 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -233,11 +233,11 @@ in rec {
       libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
       coreutils findutils diffutils patchutils;
 
-    llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; };
-    in super.llvmPackages // {
-      llvm = llvmOverride;
-      clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; };
-    };
+    llvmPackages = let llvmOverride = llvmPackages.llvm.override { enableManpages = false; inherit libcxxabi; }; in
+      super.llvmPackages // {
+        llvm = llvmOverride;
+        clang-unwrapped = llvmPackages.clang-unwrapped.override { enableManpages = false; llvm = llvmOverride; };
+      };
 
     darwin = super.darwin // {
       inherit (darwin) dyld Libsystem libiconv locale;
@@ -313,7 +313,7 @@ in rec {
       xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out
       bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
       gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
-      gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.man patch pcre.out binutils-raw.out
+      gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
       binutils-raw.dev binutils gettext
     ]) ++ (with pkgs.darwin; [
       dyld Libsystem CF cctools ICU libiconv locale
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a4864faa6d..1334cdef5a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5624,7 +5624,7 @@ with pkgs;
   llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
     inherit (stdenvAdapters) overrideCC;
   } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-    cmake = cmake.override { isBootstrap = true; useSharedLibraries = false; };
+    cmake = cmake.override { isBootstrap = true; };
     libxml2 = libxml2.override { pythonSupport = false; };
     python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
   });
-- 
GitLab


From 7ba979cac370ebe4bbb4af565b198e116a4a6214 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 1 Jun 2017 18:43:27 -0300
Subject: [PATCH 0267/1490] ocp-indent: readd old version 1.5.2

Some packages (ocp-index, for instance) are not yet compatible with
newer versions of ocp-indent. So version 1.5.2 is still needed.
---
 .../tools/ocaml/ocp-indent/1.5.2.nix          | 37 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix

diff --git a/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
new file mode 100644
index 00000000000..ee70a80b6af
--- /dev/null
+++ b/pkgs/development/tools/ocaml/ocp-indent/1.5.2.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchzip, ocaml, findlib, ocpBuild, opam, cmdliner }:
+
+let inherit (stdenv.lib) getVersion versionAtLeast; in
+
+assert versionAtLeast (getVersion ocaml) "3.12.1";
+assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
+assert versionAtLeast "0.9.8" (getVersion cmdliner);
+
+stdenv.mkDerivation {
+
+  name = "ocp-indent-1.5.2";
+
+  src = fetchzip {
+    url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz";
+    sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
+  };
+
+  nativeBuildInputs = [ ocpBuild opam ];
+
+  buildInputs = [ ocaml findlib cmdliner ];
+
+  createFindlibDestdir = true;
+
+  preConfigure = "patchShebangs ./install.sh";
+
+  postInstall = ''
+    mv $out/lib/{ocp-indent,ocaml/${getVersion ocaml}/site-lib/}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://typerex.ocamlpro.com/ocp-indent.html";
+    description = "A customizable tool to indent OCaml code";
+    license = licenses.gpl3;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.jirkamarsik ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4c8bf5ce14d..ff6e12b63c1 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -389,6 +389,7 @@ let
     ocpBuild = callPackage ../development/tools/ocaml/ocp-build { };
 
     ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; };
+    ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { };
 
     ocp-index = callPackage ../development/tools/ocaml/ocp-index { };
 
-- 
GitLab


From f16a9f694e97db99c7a26cb5c2de3df343f82efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 1 Jun 2017 22:04:08 +0200
Subject: [PATCH 0268/1490] cgdb: remove unneeded 'help2man' dependency

Unused since version 0.7.0:

  https://raw.githubusercontent.com/cgdb/cgdb/v0.7.0/NEWS
---
 pkgs/development/tools/misc/cgdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index bd0e769a0fd..a5ad3910f3f 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, readline, flex, texinfo, help2man }:
+{ stdenv, fetchurl, ncurses, readline, flex, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "cgdb-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz";
   };
 
-  buildInputs = [ ncurses readline flex texinfo help2man ];
+  buildInputs = [ ncurses readline flex texinfo ];
 
   meta = with stdenv.lib; {
     description = "A curses interface to gdb";
-- 
GitLab


From 4103994414cf55ede5242ea19b8ca7a8982376d7 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 1 Jun 2017 18:47:59 -0300
Subject: [PATCH 0269/1490] ocp-index: add explicitly dependency on
 ocpIndent_1_5_2

ocp-index does not yet compile with newer versions of ocp-indent.
---
 pkgs/top-level/ocaml-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ff6e12b63c1..ab82597b9e5 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -391,7 +391,7 @@ let
     ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { cmdliner = cmdliner_1_0; };
     ocpIndent_1_5_2 = callPackage ../development/tools/ocaml/ocp-indent/1.5.2.nix { };
 
-    ocp-index = callPackage ../development/tools/ocaml/ocp-index { };
+    ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; };
 
     ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { };
 
-- 
GitLab


From 20730dc2805bdc030938518b90050f033ec580cd Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Tue, 30 May 2017 16:06:16 -0400
Subject: [PATCH 0270/1490] TheanoWithCuda: cudnn shouldn't be optional or list
 wrapped #26263

* python27.withPackages drops nested propagatedBuildInputs
* not clear why cudnn was optional to begin with
---
 .../python-modules/Theano/theano-with-cuda/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
index c9ea79bef9a..f65733557cb 100644
--- a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
+++ b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
@@ -56,7 +56,8 @@ buildPythonPackage rec {
     pycuda
     cudatoolkit
     libgpuarray
-  ] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]);
+    cudnn
+  ];
 
   passthru.cudaSupport = true;
 }
-- 
GitLab


From 46793d98876080f0e3738b07490aece6468b0cd0 Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Tue, 30 May 2017 16:08:48 -0400
Subject: [PATCH 0271/1490] TheanoWithCuda: depend on future for older pythons
 #26103

---
 .../python-modules/Theano/theano-with-cuda/default.nix        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
index f65733557cb..f8b7a713d08 100644
--- a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
+++ b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
@@ -1,5 +1,7 @@
 { buildPythonPackage
 , fetchFromGitHub
+, pythonOlder
+, future
 , numpy
 , six
 , scipy
@@ -57,7 +59,7 @@ buildPythonPackage rec {
     cudatoolkit
     libgpuarray
     cudnn
-  ];
+  ] ++ (stdenv.lib.optional (pythonOlder "3.0") future);
 
   passthru.cudaSupport = true;
 }
-- 
GitLab


From ceedd0b04abe1c1d790f800fbb7e06551099a7a1 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Fri, 2 Jun 2017 00:36:59 +0200
Subject: [PATCH 0272/1490] pirate-get: 0.2.9 -> 0.2.10

---
 pkgs/tools/networking/pirate-get/default.nix | 26 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 pkgs/top-level/python-packages.nix           | 23 -----------------
 3 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/tools/networking/pirate-get/default.nix

diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix
new file mode 100644
index 00000000000..bd7e87e2c10
--- /dev/null
+++ b/pkgs/tools/networking/pirate-get/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, python3Packages }:
+
+with python3Packages;
+
+buildPythonApplication rec {
+  name = "${pname}-${version}";
+  pname = "pirate-get";
+  version = "0.2.10";
+
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04gsilbyq2plldzi495dcf19h5xfldfyn6zdczj2fdki1m29jyr0";
+  };
+
+  propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 ];
+
+  meta = with stdenv.lib; {
+    description = "A command line interface for The Pirate Bay";
+    homepage = https://github.com/vikstrous/pirate-get;
+    license = licenses.gpl1;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aecb500995f..5ac94943f04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3630,6 +3630,8 @@ with pkgs;
 
   pingtcp = callPackage ../tools/networking/pingtcp { };
 
+  pirate-get = callPackage ../tools/networking/pirate-get { };
+
   pius = callPackage ../tools/security/pius { };
 
   pixiewps = callPackage ../tools/networking/pixiewps {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c146ea70b2c..589b1a85592 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8508,29 +8508,6 @@ in {
     };
   };
 
-  pirate-get = buildPythonPackage rec {
-    name = "pirate-get-${version}";
-    version = "0.2.9";
-
-    disabled = !isPy3k;
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pirate-get/${name}.tar.gz";
-      sha256 = "1djmfghnwsn3z525h6d98r0lllayvzsg71z0gskk25zr24kjs24a";
-    };
-
-    propagatedBuildInputs = with self; [ colorama veryprettytable beautifulsoup4 ];
-
-    meta = {
-      description = "A command line interface for The Pirate Bay";
-      homepage = https://github.com/vikstrous/pirate-get;
-      license = licenses.gpl1;
-      maintainers = with maintainers; [ rnhmjoj ];
-      platforms = platforms.unix;
-    };
-  };
-
   plotly = callPackage ../development/python-modules/plotly { };
 
   podcastparser = callPackage ../development/python-modules/podcastparser { };
-- 
GitLab


From 92b923b378d34efea3bbcc9470bc50abc7be884d Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zetok@openmailbox.org>
Date: Tue, 30 May 2017 21:59:30 +0100
Subject: [PATCH 0273/1490] i2pd: correct docs about bandwidth setting

---
 nixos/modules/services/networking/i2pd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 4e176353fc2..7622f030f83 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -212,7 +212,8 @@ in
         type = with types; nullOr int;
         default = null;
         description = ''
-           Set a router bandwidth limit integer in kbps or letters: L (32), O (256), P (2048), X (>9000)
+           Set a router bandwidth limit integer in KBps.
+           If not set, i2pd defaults to 32KBps.
         '';
       };
 
-- 
GitLab


From 01ef91aa045b1597769a0b53a1b03c8d2fe9ae55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 2 Jun 2017 06:31:29 +0200
Subject: [PATCH 0274/1490] i2pd: 2.13.0 -> 2.14.0

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 2f32c3b3a2d..fd78c52bc4f 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.13.0";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "1gz8jmy2vq520w642jiff1zg4qpgpm2qkad5dgrq9f14ri14lkpp";
+    sha256 = "1nlnzvb4n351zwg4vd15qjmm8xvbmn2350vfnd249q06va62fqjk";
   };
 
   buildInputs = [ boost zlib openssl ];
-- 
GitLab


From 68faf5d5e5e1583568f9f14a6dbc5dacb3334e7d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 2 Jun 2017 08:44:31 +0200
Subject: [PATCH 0275/1490] python.pkgs.hypothesis: fix hash

Update script used hash from PyPI while hypothesis was fetched from
GitHub.

https://github.com/NixOS/nixpkgs/commit/2050213c54a9dd7c7fdca28402b7720ece3217b2#commitcomment-22374103
---
 pkgs/development/python-modules/hypothesis.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
index 51887b83e7c..ab56cde9c13 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis-python";
     rev = "${version}";
-    sha256 = "5344cc3327bc7fa543fc3b42e85c55f40dda0eeaec38327f9bf373c3ece42b39";
+    sha256 = "0damf6zbm0db2a3gfwrbbj92yal576wpmhhchc0w0np8vdnax70n";
   };
 
   checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ];
-- 
GitLab


From 50f53da9eff3e7a1686ff439b341ada5bd63ddcd Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 2 Jun 2017 07:50:41 +0100
Subject: [PATCH 0276/1490] datadog: Properly use configured package.

---
 nixos/modules/services/monitoring/dd-agent/dd-agent.nix | 8 ++++----
 pkgs/tools/networking/dd-agent/default.nix              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index e55faed8e07..04a21871519 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -23,7 +23,7 @@ let
   etcfiles =
     map (i: { source = if builtins.hasAttr "config" i
                        then pkgs.writeText "${i.name}.yaml" i.config
-                       else "${pkgs.dd-agent}/agent/conf.d-system/${i.name}.yaml";
+                       else "${cfg.agent}/agent/conf.d-system/${i.name}.yaml";
               target = "dd-agent/conf.d/${i.name}.yaml";
             }
         ) cfg.integrations ++
@@ -119,13 +119,13 @@ in {
       path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
+        ExecStart = "${cfg.agent}/bin/dd-agent foreground";
         User = "datadog";
         Group = "datadog";
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ pkgs.dd-agent ddConf ] ++ etcSources;
+      restartTriggers = [ cfg.agent ddConf ] ++ etcSources;
     };
 
     systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) {
@@ -133,7 +133,7 @@ in {
       path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch";
+        ExecStart = "${cfg.agent}/bin/dd-jmxfetch";
         User = "datadog";
         Group = "datadog";
         Restart = "always";
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 2556287570f..338804aa26b 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -5,7 +5,7 @@
 # wrapper with their PYTHONPATH. This means overrideAttrs is not
 # strong enough (it overrides too late), we need to call it
 # beforehand.
-, extraBuildInputs ? [ pythonPackages.psutil ] }:
+, extraBuildInputs ? [ ] }:
 let
   inherit (pythonPackages) python;
   docker_1_10 = pythonPackages.buildPythonPackage rec {
-- 
GitLab


From 28cbb4ae6a10a44b40883479608b178d0be9c16c Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 1 Jun 2017 22:22:24 +0200
Subject: [PATCH 0277/1490] pythonPackages.colorama: move to
 development/python-modules

---
 .../python-modules/colorama/default.nix       | 22 +++++++
 pkgs/top-level/python-packages.nix            | 60 +++++++------------
 2 files changed, 44 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/development/python-modules/colorama/default.nix

diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix
new file mode 100644
index 00000000000..99a59ae8fd4
--- /dev/null
+++ b/pkgs/development/python-modules/colorama/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "colorama";
+  version = "0.3.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1wd1szk0z3073ghx26ynw43gnc140ibln1safgsis6s6z3s25ss8";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/tartley/colorama;
+    license = licenses.bsd3;
+    description = "Cross-platform colored terminal text";
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c146ea70b2c..c8b147a399e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1519,13 +1519,26 @@ in {
     };
   };
 
-  awscli = buildPythonPackage rec {
-    name = "awscli-${version}";
-    version = "1.11.75";
-      namePrefix = "";
-      src = pkgs.fetchurl {
-      url = "mirror://pypi/a/awscli/${name}.tar.gz";
-      sha256 = "0bkjyrgb78f29vvr8j2id0386d30w340wrl7krwiha725c9y3pz1";
+  awscli =
+  let
+    colorama_3_7 = self.colorama.overrideAttrs (old: rec {
+      name = "${pname}-${version}";
+      pname = "colorama";
+      version = "0.3.7";
+      src = fetchPypi {
+        inherit pname version;
+        sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
+      };
+    });
+  in buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "awscli";
+    version = "1.11.95";
+    namePrefix = "";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1f99cg5x5kw1p1awny64adp07rvva57srdfrbi81yl2kpw33ybjc";
     };
 
     # No tests included
@@ -1536,7 +1549,7 @@ in {
       bcdoc
       s3transfer
       six
-      colorama_3_3
+      colorama_3_7
       docutils
       rsa
       pyyaml
@@ -3846,36 +3859,7 @@ in {
     };
   };
 
-
-  colorama = buildPythonPackage rec {
-    name = "colorama-${version}";
-    version = "0.3.7";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/colorama/${name}.tar.gz";
-      sha256 = "e043c8d32527607223652021ff648fbb394d5e19cba9f1a698670b338c9d782b";
-    };
-
-    # No tests in archive
-    doCheck = false;
-
-    meta = {
-      homepage = https://github.com/tartley/colorama;
-      license = "bsd";
-      description = "Cross-platform colored terminal text";
-    };
-  };
-
-  # Needed for awscli
-  colorama_3_3 = self.colorama.override rec {
-    name = "colorama-${version}";
-    version = "0.3.3";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/colorama/${name}.tar.gz";
-      sha256 = "eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c";
-    };
-  };
-
+  colorama = callPackage ../development/python-modules/colorama { };
 
   CommonMark = buildPythonPackage rec {
     name = "CommonMark-${version}";
-- 
GitLab


From ffedf3fa1cafcd69f997b782f1bb302a9c640b5b Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 1 Jun 2017 22:40:54 +0200
Subject: [PATCH 0278/1490] pythonPackages.botocore: 1.5.38 -> 1.5.58

---
 pkgs/top-level/python-packages.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c8b147a399e..6eff8c13d7d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3070,11 +3070,13 @@ in {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.5.38"; # This version is required by awscli
-    name = "botocore-${version}";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/b/botocore/${name}.tar.gz";
-      sha256 = "04cvsi8g8p3r5vr3vr2nb5ldyrsm0y4c2phimabbpk33wv718qyx";
+    name = "${pname}-${version}";
+    pname = "botocore";
+    version = "1.5.58";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1kd9hngdqvpjm01amizsmsnc08h2a0dxiasdk0f4kg1pibpqdni5";
     };
 
     propagatedBuildInputs =
-- 
GitLab


From 805ee69aa3f04e1d58a2f651fcebc63db2014d43 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 1 Jun 2017 23:32:05 +0200
Subject: [PATCH 0279/1490] tmuxp: 1.2.7 -> 1.3.1

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

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index c254490555c..03950d601d0 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -2,17 +2,17 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "tmuxp-${version}";
-  version = "1.2.7";
+  version = "1.3.1";
 
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/t/tmuxp/${name}.tar.gz";
-    sha256 = "19s17frgyjvyvmr16fs0gl5mnbaxbmdffmkckadwhd5mg0pz2i4s";
+    sha256 = "189mxnb2pxj3wjijn56j8y5x1r23fil00fn2q7d6bd13vgr0f85s";
   };
 
   patchPhase = ''
-    sed -i 's/==.*$//' requirements/test.txt
+    sed -i 's/==.*$//' requirements/base.txt requirements/test.txt
   '';
 
   buildInputs = with pythonPackages; [
-- 
GitLab


From d6051936afd4c54b7870333140772c6ab8c84403 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 2 Jun 2017 07:13:06 -0400
Subject: [PATCH 0280/1490] ammonite: 0.9.5 -> 0.9.6

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 4f253c06186..62a373f2c07 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "0.9.5";
+  version = "0.9.6";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "1ni829qpdm5wflc1n827b9ywpv836r2068rmj9yd2nyh8b6q2him";
+    sha256 = "113h8i2i6mlm4f4r2wfj9bggg46lpvamdw3c112qji2y74iriljq";
   };
 
   propagatedBuildInputs = [ jre ] ;
-- 
GitLab


From a087081ebb1f5b3943b2ebd94e14e6d1ef221428 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 2 Jun 2017 19:05:22 +0800
Subject: [PATCH 0281/1490] network-manager: add support for internal DHCP

---
 .../services/networking/networkmanager.nix    | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 876dbe1524e..f8b7f26f5f2 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -12,6 +12,7 @@ let
   configFile = writeText "NetworkManager.conf" ''
     [main]
     plugins=keyfile
+    dhcp=${cfg.dhcp}
     dns=${if cfg.useDnsmasq then "dnsmasq" else "default"}
 
     [keyfile]
@@ -21,7 +22,7 @@ let
       ''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''}
 
     [logging]
-    level=WARN
+    level=${cfg.logLevel}
 
     [connection]
     ipv6.ip6-privacy=2
@@ -138,6 +139,22 @@ in {
         apply = list: (attrValues cfg.basePackages) ++ list;
       };
 
+      dhcp = mkOption {
+        type = types.enum [ "dhclient" "dhcpcd" "internal" ];
+        default = "dhclient";
+        description = ''
+          Which program (or internal library) should be used for DHCP.
+        '';
+      };
+
+      logLevel = mkOption {
+        type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ];
+        default = "WARN";
+        description = ''
+          Set the default logging verbosity level.
+        '';
+      };
+
       appendNameservers = mkOption {
         type = types.listOf types.str;
         default = [];
@@ -181,7 +198,7 @@ in {
             };
 
             type = mkOption {
-              type = types.enum (attrNames dispatcherTypesSubdirMap); 
+              type = types.enum (attrNames dispatcherTypesSubdirMap);
               default = "basic";
               description = ''
                 Dispatcher hook type. Only basic hooks are currently available.
-- 
GitLab


From e367d69fccef4a732715baab059e748872ceae74 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Fri, 2 Jun 2017 13:53:45 +0200
Subject: [PATCH 0282/1490] strongswan: 5.5.2 -> 5.5.3

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

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 5a9cf8f1f4b..2225df308ac 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "strongswan-${version}";
-  version = "5.5.2";
+  version = "5.5.3";
 
   src = fetchurl {
     url = "http://download.strongswan.org/${name}.tar.bz2";
-    sha256 = "0slzrr5amn1rs9lrjca0fv5n1ya5jwlspfiqg9xzq1bghg56z5ys";
+    sha256 = "1m7qq0l5pwj1wy0f7h2b7msb1d98rx78z6xg27g0hiqpk6qm9sn5";
   };
 
   dontPatchELF = true;
-- 
GitLab


From 27aac7afcfe1bb5ac4cb2f53a0c25e3074b7aec7 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 2 Jun 2017 20:53:26 +0800
Subject: [PATCH 0283/1490] qtox: 1.10.1 -> 1.10.2

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

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index bb5e26f3310..d1773456df2 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "qtox-${version}";
-  version = "1.10.1";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner  = "tux3";
     repo   = "qTox";
     rev    = "v${version}";
-    sha256 = "1c5y7fwhsq1f6z8208xl1jd6bl1r6k8g0fjqxf0z10373c9395jq";
+    sha256 = "0c2633rc9l73q9qs9hybn11hmlqbwsvih3sf6jk1jp4151k5wp1y";
   };
 
   buildInputs = [
-- 
GitLab


From daf674491eab3e68a653308ba36f5e5005fd58a7 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Fri, 2 Jun 2017 14:19:04 +0100
Subject: [PATCH 0284/1490] broadcom-sta: add patch for kernel 4.11+

---
 .../linux/broadcom-sta/default.nix            |  2 +
 .../linux/broadcom-sta/linux-4.11.patch       | 52 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 8b2bac38438..2723e662b79 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation {
     ./linux-4.7.patch
     # source: https://git.archlinux.org/svntogit/community.git/tree/trunk/004-linux48.patch?h=packages/broadcom-wl-dkms
     ./linux-4.8.patch
+    # source: https://aur.archlinux.org/cgit/aur.git/tree/linux411.patch?h=broadcom-wl
+    ./linux-4.11.patch
     ./null-pointer-fix.patch
     ./gcc.patch
   ];
diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch b/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch
new file mode 100644
index 00000000000..a779f8c84cf
--- /dev/null
+++ b/pkgs/os-specific/linux/broadcom-sta/linux-4.11.patch
@@ -0,0 +1,52 @@
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index a9671e2..da36405 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -30,6 +30,9 @@
+ #include <linux/kthread.h>
+ #include <linux/netdevice.h>
+ #include <linux/ieee80211.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#endif
+ #include <net/cfg80211.h>
+ #include <linux/nl80211.h>
+ #include <net/rtnetlink.h>
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 489c9f5..f8278ad 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -117,6 +117,9 @@ int wl_found = 0;
+ 
+ typedef struct priv_link {
+ 	wl_if_t *wlif;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++	unsigned long last_rx;
++#endif
+ } priv_link_t;
+ 
+ #define WL_DEV_IF(dev)          ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif)
+@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
+ {
+ 	struct sk_buff *oskb = (struct sk_buff *)p;
+ 	struct sk_buff *skb;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++	priv_link_t *priv_link;
++#endif
+ 	uchar *pdata;
+ 	uint len;
+ 
+@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
+ 	if (skb == NULL) return;
+ 
+ 	skb->dev = wl->monitor_dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++	priv_link = MALLOC(wl->osh, sizeof(priv_link_t));
++	priv_link = netdev_priv(skb->dev);
++	priv_link->last_rx = jiffies;
++#else
+ 	skb->dev->last_rx = jiffies;
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
+ 	skb_reset_mac_header(skb);
+ #else
-- 
GitLab


From 7eadf66244c26c70cf52bc1f19fb81d473093956 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 2 Jun 2017 21:41:03 +0800
Subject: [PATCH 0285/1490] neomutt: 20170428 -> 20170602

---
 .../mailreaders/neomutt/default.nix           | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index ad2f6e7b3ca..d9ec66a53e7 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,21 +1,29 @@
 { stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl
-, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }:
+, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  version = "20170428";
+  version = "20170602";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "1p6214agfv9plskkzalh03r5naiiyg1habrnknnjgck3nypb78ik";
+    sha256 = "0rpvxmv10ypl7la4nmp0s02ixmm9g5pn9g9ms8ygzsix9pa86w45";
   };
 
-  nativeBuildInputs = [ which autoreconfHook ];
-  buildInputs =
-    [ cyrus_sasl gdbm gpgme kerberos libidn ncurses
-      notmuch openssl perl lmdb ];
+  nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ];
+  buildInputs = [
+    cyrus_sasl gdbm gpgme kerberos libidn ncurses
+    notmuch openssl perl lmdb
+  ];
+
+  postPatch = ''
+    for f in doc/*.xsl ; do
+      substituteInPlace $f \
+        --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl
+    done
+  '';
 
   configureFlags = [
     "--enable-debug"
@@ -46,6 +54,8 @@ stdenv.mkDerivation rec {
 
   configureScript = "./prepare";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "A small but very powerful text-based mail client";
     homepage = http://www.neomutt.org;
-- 
GitLab


From ed93e8e16b57578e37aaefca0da941de6e3026fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 2 Jun 2017 16:21:35 +0200
Subject: [PATCH 0286/1490] libressl: work around some problem with man pages

https://github.com/NixOS/nixpkgs/commit/20ffc3cd73#commitcomment-22368612
---
 pkgs/development/libraries/libressl/2.5.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix
index 2284db5ad7d..6ab07248655 100644
--- a/pkgs/development/libraries/libressl/2.5.nix
+++ b/pkgs/development/libraries/libressl/2.5.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "man" ];
 
+  dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong
+
   meta = with stdenv.lib; {
     description = "Free TLS/SSL implementation";
     homepage    = "http://www.libressl.org";
-- 
GitLab


From 0fbe724172a1a54704f22d06b209f2a4122032a9 Mon Sep 17 00:00:00 2001
From: Drakonis <khronosforce@gmail.com>
Date: Fri, 2 Jun 2017 12:02:34 -0300
Subject: [PATCH 0287/1490] gzdoom: 3.0.1 -> 3.1.0

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

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 6e1a98bf258..dc51a6f0cc0 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "gzdoom-${version}";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "0s0hl7pa2gr3cm884q7np5naybhv4hqhbfd3s45a8hdf72n6c9cm";
+    sha256 = "02287xvlk4a07ssm9y9h5vfsvdssshz13n5bbz13pfcani5d9flv";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];
-- 
GitLab


From 779767e650ea60dea1b7d27cc4463b2e6af089d6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 2 Jun 2017 17:04:03 +0200
Subject: [PATCH 0288/1490] python.pkgs.nbformat: move expression

---
 .../python-modules/nbformat/default.nix       | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +-----------
 2 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/nbformat/default.nix

diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
new file mode 100644
index 00000000000..143c57321b6
--- /dev/null
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, glibcLocales
+, ipython_genutils
+, traitlets
+, testpath
+, jsonschema
+, jupyter_core
+}:
+
+buildPythonPackage rec {
+  pname = "nbformat";
+  version = "4.3.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b";
+  };
+  LC_ALL="en_US.UTF-8";
+
+  checkInputs = [ pytest glibcLocales ];
+  propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core ];
+
+  # Failing tests and permission issues
+  doCheck = false;
+
+  meta = {
+    description = "The Jupyter Notebook format";
+    homepage = "http://jupyter.org/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 98c7fb77cb3..221d1f40a69 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14834,28 +14834,7 @@ in {
     };
   };
 
-  nbformat = buildPythonPackage rec {
-    version = "4.3.0";
-    name = "nbformat-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/nbformat/${name}.tar.gz";
-      sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b";
-    };
-    LC_ALL="en_US.UTF-8";
-    buildInputs = with self; [ pytest pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ipython_genutils traitlets testpath jsonschema jupyter_core];
-
-    # Failing tests and permission issues
-    doCheck = false;
-
-    meta = {
-      description = "The Jupyter Notebook format";
-      homepage = "http://jupyter.org/";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  nbformat = callPackage ../development/python-modules/nbformat { };
 
   nbxmpp = buildPythonPackage rec {
     name = "nbxmpp-${version}";
-- 
GitLab


From 2957786355a12a9a0fba898fbdcf4d2e652a9138 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 2 Jun 2017 17:05:29 +0200
Subject: [PATCH 0289/1490] python.pkgs.nbconvert: 5.1.1 -> 5.2.1

---
 .../python-modules/nbconvert/default.nix      | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +---------
 2 files changed, 53 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/nbconvert/default.nix

diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
new file mode 100644
index 00000000000..881895ba6ba
--- /dev/null
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, nose
+, entrypoints
+, bleach
+, mistune
+, jinja2
+, pygments
+, traitlets
+, testpath
+, jupyter_core
+, nbformat
+, nbconvert
+, ipykernel
+, pandocfilters
+, tornado
+, jupyter_client
+}:
+
+buildPythonPackage rec {
+  pname = "nbconvert";
+  version = "5.2.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9ed68ec7fe90a8672b43795b29ea91cc75ea355c83debc83ebd12171521ec274";
+  };
+
+  checkInputs = [ nose pytest ];
+
+  propagatedBuildInputs = [
+    entrypoints bleach mistune jinja2 pygments traitlets testpath
+    jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client
+  ];
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  # PermissionError. Likely due to being in a chroot
+  doCheck = false;
+
+  meta = {
+    description = "Converting Jupyter Notebooks";
+    homepage = http://jupyter.org/;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 221d1f40a69..8e6ba055206 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14806,33 +14806,7 @@ in {
     };
   };
 
-  nbconvert = buildPythonPackage rec {
-    version = "5.1.1";
-    name = "nbconvert-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/nbconvert/${name}.tar.gz";
-      sha256 = "847731bc39829d0eb1e15a450ac98c71730e3598e53683d4d76a3f3b3fc5017d";
-    };
-
-    buildInputs = with self; [nose ipykernel ];
-
-    propagatedBuildInputs = with self; [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client];
-
-    checkPhase = ''
-      nosetests -v
-    '';
-
-    # PermissionError. Likely due to being in a chroot
-    doCheck = false;
-
-    meta = {
-      description = "Converting Jupyter Notebooks";
-      homepage = http://jupyter.org/;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  nbconvert = callPackage ../development/python-modules/nbconvert { };
 
   nbformat = callPackage ../development/python-modules/nbformat { };
 
-- 
GitLab


From c7867b8b34b7647edf04c654dfcf99514e48e3e5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 2 Jun 2017 17:05:50 +0200
Subject: [PATCH 0290/1490] python.pkgs.dask: 0.14.1 -> 0.14.3

---
 .../python-modules/dask/default.nix           | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +------------
 2 files changed, 40 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/dask/default.nix

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
new file mode 100644
index 00000000000..6d5388a443c
--- /dev/null
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, cloudpickle
+, numpy
+, toolz
+, dill
+, pandas
+, partd
+}:
+
+buildPythonPackage rec {
+  pname = "dask";
+  version = "0.14.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9bf007f9cedc08f73089f0621ff65ec0882fc0a834acef56830dfd2872908211";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ cloudpickle  numpy toolz dill pandas partd ];
+
+  checkPhase = ''
+    py.test dask
+  '';
+
+  # URLError
+  doCheck = false;
+
+  meta = {
+    description = "Minimal task scheduling abstraction";
+    homepage = "http://github.com/ContinuumIO/dask/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e6ba055206..6554d5b5306 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5354,33 +5354,7 @@ in {
     };
   });
 
-  dask = buildPythonPackage rec {
-    pname = "dask";
-    name = "${pname}-${version}";
-    version = "0.14.1";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "46c8ef9aa41a5755f2194b535bff7fdef1343d3993ab294b198caf95155ec94e";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ cloudpickle  numpy toolz dill pandas partd ];
-
-    checkPhase = ''
-      py.test dask
-    '';
-
-    # URLError
-    doCheck = false;
-
-    meta = {
-      description = "Minimal task scheduling abstraction";
-      homepage = "http://github.com/ContinuumIO/dask/";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
-  };
+  dask = callPackage ../development/python-modules/dask { };
 
   datrie = buildPythonPackage rec {
     name = "datrie";
-- 
GitLab


From 9cc17871c51ab13a4116c858e92a11b6b2e74cde Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 2 Jun 2017 17:10:02 +0200
Subject: [PATCH 0291/1490] python.pkgs.ipython: 6.0.0 -> 6.1.0

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

diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index de7d0a8d81b..af5bf5c4faa 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "6.0.0";
+  version = "6.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f429b82b8d9807068da734b15965768bd21b15d0b706340b6d1b4d6f6f5b98a4";
+    sha256 = "5c53e8ee4d4bec27879982b9f3b4aa2d6e3cfd7b26782d250fa117f85bb29814";
   };
 
   prePatch = lib.optionalString stdenv.isDarwin ''
-- 
GitLab


From 48c9e09190e1f43dbf811df8a56b9b6738a65603 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 2 Jun 2017 16:10:23 +0000
Subject: [PATCH 0292/1490] libnetfilter_log: init at 1.0.1

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

diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix
new file mode 100644
index 00000000000..e3c8447549d
--- /dev/null
+++ b/pkgs/development/libraries/libnetfilter_log/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
+
+stdenv.mkDerivation rec {
+  name = "libnetfilter_log-${version}";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "http://netfilter.org/projects/libnetfilter_log/files/${name}.tar.bz2";
+    sha256 = "089vjcfxl5qjqpswrbgklf4wflh44irmw6sk2k0kmfixfmszxq3l";
+  };
+
+  buildInputs = [ libmnl ];
+  propagatedBuildInputs = [ libnfnetlink ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Userspace library providing interface to packets that have been logged by the kernel packet filter";
+    longDescription = ''
+      libnetfilter_log is a userspace library providing interface to packets
+      that have been logged by the kernel packet filter. It is is part of a
+      system that deprecates the old syslog/dmesg based packet logging. This
+      library has been previously known as libnfnetlink_log.
+    '';
+    homepage = http://netfilter.org/projects/libnetfilter_log/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ orivej nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a40e8e38d99..29f2b8efc14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8912,6 +8912,8 @@ with pkgs;
 
   libnetfilter_cttimeout = callPackage ../development/libraries/libnetfilter_cttimeout { };
 
+  libnetfilter_log = callPackage ../development/libraries/libnetfilter_log { };
+
   libnetfilter_queue = callPackage ../development/libraries/libnetfilter_queue { };
 
   libnfnetlink = callPackage ../development/libraries/libnfnetlink { };
-- 
GitLab


From fc9937657d752feeafb0d268c6d4146ab563e2f2 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 2 Jun 2017 16:23:29 +0000
Subject: [PATCH 0293/1490] libmnl: fix license

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

diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix
index 02e86cc688b..33ccccea2e9 100644
--- a/pkgs/development/libraries/libmnl/default.nix
+++ b/pkgs/development/libraries/libmnl/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       re-inventing the wheel.
     '';
     homepage = http://netfilter.org/projects/libmnl/index.html;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = stdenv.lib.licenses.lgpl21Plus;
 
     platforms = stdenv.lib.platforms.linux;
   };
-- 
GitLab


From e37f970d00ca93134afa91a7a9088636aec8008c Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 31 May 2017 23:35:26 +0200
Subject: [PATCH 0294/1490] uwsgi: fix php plugin build

---
 pkgs/servers/uwsgi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 36d6fc3a62d..f871e6adf2b 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -34,7 +34,7 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else
                     # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
                     path = "plugins/php";
                     preBuild = "touch unix.h";
-                    inputs = [ php-embed php-embed.nativeBuildInputs ];
+                    inputs = [ php-embed ] ++ php-embed.buildInputs;
                   })
                 ];
 
-- 
GitLab


From ad7bee4eb406b88c77cb53edbe9d4de44e7e692d Mon Sep 17 00:00:00 2001
From: Itai Zukerman <zukerman@math-hat.com>
Date: Sun, 28 May 2017 11:04:25 -0700
Subject: [PATCH 0295/1490] steam: Added extraPkgs option to chroot env.

---
 pkgs/games/steam/chrootenv.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 1fbf5a9dd1a..ace8e9888a7 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -2,6 +2,7 @@
 , steam-runtime, steam-runtime-i686 ? null
 , withJava ? false
 , withPrimus ? false
+, extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
 , nativeOnly ? false
 , runtimeOnly ? false
 , newStdcpp ? false
@@ -37,7 +38,8 @@ let
       # Zoneinfo
       etc-zoneinfo
     ] ++ lib.optional withJava jdk
-      ++ lib.optional withPrimus primus2;
+      ++ lib.optional withPrimus primus2
+      ++ extraPkgs pkgs;
 
 in buildFHSUserEnv rec {
   name = "steam";
-- 
GitLab


From d5fe7d15343982baf23da77dd096f9945f5bc993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= <muoniurn@gmail.com>
Date: Fri, 2 Jun 2017 16:20:51 +0200
Subject: [PATCH 0296/1490] pythonPackages.Pmw: init at 2.0.1

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

diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix
new file mode 100644
index 00000000000..893caa88d67
--- /dev/null
+++ b/pkgs/development/python-modules/Pmw/default.nix
@@ -0,0 +1,24 @@
+{ lib , buildPythonPackage , fetchPypi, tkinter }:
+
+buildPythonPackage rec {
+  pname = "Pmw";
+  version = "2.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "080iml3868nxniyn56kcwnbghm10j7fw74a5nj0s19sm4zsji78b";
+  };
+
+  propagatedBuildInputs = [ tkinter ];
+
+  # Disable tests due to their xserver requirement
+  doCheck = false;
+
+  meta = {
+    description = "A toolkit for building high-level compound widgets in Python using the Tkinter module";
+    homepage = "http://pmw.sourceforge.net/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mounium ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 98c7fb77cb3..fedb255773e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -240,6 +240,8 @@ in {
 
   plantuml = callPackage ../tools/misc/plantuml { };
 
+  Pmw = callPackage ../development/python-modules/Pmw { };
+
   pyaes = callPackage ../development/python-modules/pyaes.nix { };
 
   pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}";
-- 
GitLab


From 2a1c535b7ed8cf294b559fd76e4ca2b8c872e4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= <muoniurn@gmail.com>
Date: Fri, 2 Jun 2017 16:34:16 +0200
Subject: [PATCH 0297/1490] pymol: added Pmw + python version bump

---
 .../science/chemistry/pymol/default.nix       | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index af0c2e85549..200d00395e2 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,24 +1,46 @@
-{ stdenv, fetchurl, python27Packages, glew, freeglut, libpng, libxml2, tk, freetype }:
+{ stdenv, fetchurl, makeDesktopItem, python3Packages, glew, freeglut, libpng, libxml2, tk, freetype }:
 
 let
-  version = "1.8.4.0";
+  pname = "pymol";
+  ver_maj = "1.8";
+  ver_min = "4";
+  version = "${ver_maj}.${ver_min}.0";
+  description = "A Python-enhanced molecular graphics tool";
+
+  desktopItem = makeDesktopItem {
+    name = "${pname}";
+    exec = "${pname}";
+    desktopName = "PyMol Molecular Graphics System";
+    genericName = "Molecular Modeller";
+    comment = description;
+    mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;";
+    categories = "Graphics;Education;Science;Chemistry;";
+  };
 in
-python27Packages.buildPythonApplication {
+python3Packages.buildPythonApplication {
   name = "pymol-${version}";
   src = fetchurl {
-    url = "mirror://sourceforge/project/pymol/pymol/1.8/pymol-v1.8.4.0.tar.bz2";
+    url = "mirror://sourceforge/project/pymol/pymol/${ver_maj}/pymol-v${version}.tar.bz2";
     sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n";
   };
 
-  buildInputs = [ python27Packages.numpy glew freeglut libpng libxml2 tk freetype ];
+  buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype ];
   NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
 
   installPhase = ''
     python setup.py install --home=$out
+    cp -r ${desktopItem}/share/ $out/
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/pymol \
+      --prefix PYTHONPATH : ${python3Packages.Pmw}/lib/python3.6/site-packages \
+      --prefix PYTHONPATH : ${python3Packages.tkinter}/lib/python3.6/site-packages
   '';
 
   meta = with stdenv.lib; {
-    description = "A Python-enhanced molecular graphics tool";
+    description = description;
     homepage = "https://www.pymol.org/";
     license = licenses.psfl;
   };
-- 
GitLab


From 2bd5c13af5033e10366aa99060d81c533391ed8e Mon Sep 17 00:00:00 2001
From: Kjartan Ovmilk <y.motara@ru.ac.za>
Date: Thu, 1 Jun 2017 16:48:13 +0200
Subject: [PATCH 0298/1490] resilio-sync: init at 2.5.2

---
 .../networking/resilio-sync/default.nix       | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/networking/resilio-sync/default.nix

diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
new file mode 100644
index 00000000000..706bc7841ca
--- /dev/null
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, ... }:
+
+let
+  arch = {
+    "x86_64-linux" = "x64";
+    "i686-linux" = "i386";
+  }.${stdenv.system};
+  sha256s = {
+    "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192";
+    "i686-linux"   = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8";
+  };
+  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
+in
+
+stdenv.mkDerivation rec {
+  name = "resilio-sync-${version}";
+  version = "2.5.2";
+
+  src = fetchurl {
+    urls = [
+      "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"
+    ];
+    sha256 = sha256s.${stdenv.system};
+  };
+
+  dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
+  sourceRoot = ".";
+
+  installPhase = ''
+    install -D rslsync "$out/bin/rslsync"
+    patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/rslsync"
+  '';
+
+  meta = {
+    description = "Automatically sync files via secure, distributed technology";
+    homepage    = https://www.resilio.com/;
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ domenkozar thoughtpolice cwoac ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a40e8e38d99..ef6b8bb80a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15823,6 +15823,8 @@ with pkgs;
 
   sxiv = callPackage ../applications/graphics/sxiv { };
 
+  resilio-sync = callPackage ../applications/networking/resilio-sync { };
+
   bittorrentSync = bittorrentSync14;
   bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
   bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
-- 
GitLab


From 919b39bb7c70a99b090b8e3debde5addc736c469 Mon Sep 17 00:00:00 2001
From: Kjartan Ovmilk <y.motara@ru.ac.za>
Date: Thu, 1 Jun 2017 16:50:17 +0200
Subject: [PATCH 0299/1490] resilio service: replaces btsync service, which is
 no longer supported upstream.

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/networking/resilio.nix | 315 ++++++++++++++++++
 3 files changed, 318 insertions(+)
 create mode 100644 nixos/modules/services/networking/resilio.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d217b3452fb..d7459e3fe91 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -294,6 +294,7 @@
       jackett = 276;
       aria2 = 277;
       clickhouse = 278;
+      rslsync = 279;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -557,6 +558,7 @@
       jackett = 276;
       aria2 = 277;
       clickhouse = 278;
+      rslsync = 279;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7afcb9051bd..47adfa334ee 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -485,6 +485,7 @@
   ./services/networking/radvd.nix
   ./services/networking/rdnssd.nix
   ./services/networking/redsocks.nix
+  ./services/networking/resilio.nix
   ./services/networking/rpcbind.nix
   ./services/networking/sabnzbd.nix
   ./services/networking/searx.nix
diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
new file mode 100644
index 00000000000..45274991d81
--- /dev/null
+++ b/nixos/modules/services/networking/resilio.nix
@@ -0,0 +1,315 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.resilio;
+
+  resilioSync = pkgs.resilio;
+
+  listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort);
+
+  boolStr = x: if x then "true" else "false";
+  optionalEmptyStr = b: v: optionalString (b != "") v;
+
+  webUIConfig = optionalString cfg.enableWebUI
+    ''
+      "webui":
+      {
+        ${optionalEmptyStr cfg.httpLogin     "\"login\":          \"${cfg.httpLogin}\","}
+        ${optionalEmptyStr cfg.httpPass      "\"password\":       \"${cfg.httpPass}\","}
+        ${optionalEmptyStr cfg.apiKey        "\"api_key\":        \"${cfg.apiKey}\","}
+        ${optionalEmptyStr cfg.directoryRoot "\"directory_root\": \"${cfg.directoryRoot}\","}
+        "listen": "${listenAddr}"
+      }
+    '';
+
+  knownHosts = e:
+    optionalString (e ? "knownHosts")
+      (concatStringsSep "," (map (v: "\"${v}\"") e."knownHosts"));
+
+  sharedFoldersRecord =
+    concatStringsSep "," (map (entry:
+      let helper = attr: v:
+        if (entry ? attr) then boolStr entry.attr else boolStr v;
+      in
+      ''
+        {
+          "secret": "${entry.secret}",
+          "dir":    "${entry.directory}",
+
+          "use_relay_server": ${helper "useRelayServer" true},
+          "use_tracker":      ${helper "useTracker"     true},
+          "use_dht":          ${helper "useDHT"        false},
+
+          "search_lan":       ${helper "searchLAN"      true},
+          "use_sync_trash":   ${helper "useSyncTrash"   true},
+
+          "known_hosts": [${knownHosts entry}]
+        }
+      '') cfg.sharedFolders);
+
+  sharedFoldersConfig = optionalString (cfg.sharedFolders != [])
+    ''
+      "shared_folders":
+        [
+        ${sharedFoldersRecord}
+        ]
+    '';
+
+  configFile = pkgs.writeText "config.json"
+    ''
+      {
+        "device_name":     "${cfg.deviceName}",
+        "storage_path":    "${cfg.storagePath}",
+        "listening_port":  ${toString cfg.listeningPort},
+        "use_gui":         false,
+
+        "check_for_updates": ${boolStr cfg.checkForUpdates},
+        "use_upnp":          ${boolStr cfg.useUpnp},
+        "download_limit":    ${toString cfg.downloadLimit},
+        "upload_limit":      ${toString cfg.uploadLimit},
+        "lan_encrypt_data":  ${boolStr cfg.encryptLAN},
+
+        ${webUIConfig}
+        ${sharedFoldersConfig}
+      }
+    '';
+in
+{
+  options = {
+    services.resilio = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If enabled, start the Resilio Sync daemon. Once enabled, you can
+          interact with the service through the Web UI, or configure it in your
+          NixOS configuration. Enabling the <literal>resilio</literal> service
+          also installs a systemd user unit which can be used to start
+          user-specific copies of the daemon. Once installed, you can use
+          <literal>systemctl --user start resilio</literal> as your user to start
+          the daemon using the configuration file located at
+          <literal>$HOME/.config/resilio-sync/config.json</literal>.
+        '';
+      };
+
+      deviceName = mkOption {
+        type = types.str;
+        example = "Voltron";
+        description = ''
+          Name of the Resilio Sync device.
+        '';
+      };
+
+      listeningPort = mkOption {
+        type = types.int;
+        default = 0;
+        example = 44444;
+        description = ''
+          Listening port. Defaults to 0 which randomizes the port.
+        '';
+      };
+
+      checkForUpdates = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Determines whether to check for updates and alert the user
+          about them in the UI.
+        '';
+      };
+
+      useUpnp = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Use Universal Plug-n-Play (UPnP)
+        '';
+      };
+
+      downloadLimit = mkOption {
+        type = types.int;
+        default = 0;
+        example = 1024;
+        description = ''
+          Download speed limit. 0 is unlimited (default).
+        '';
+      };
+
+      uploadLimit = mkOption {
+        type = types.int;
+        default = 0;
+        example = 1024;
+        description = ''
+          Upload speed limit. 0 is unlimited (default).
+        '';
+      };
+
+      httpListenAddr = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        example = "1.2.3.4";
+        description = ''
+          HTTP address to bind to.
+        '';
+      };
+
+      httpListenPort = mkOption {
+        type = types.int;
+        default = 9000;
+        description = ''
+          HTTP port to bind on.
+        '';
+      };
+
+      httpLogin = mkOption {
+        type = types.str;
+        example = "allyourbase";
+        default = "";
+        description = ''
+          HTTP web login username.
+        '';
+      };
+
+      httpPass = mkOption {
+        type = types.str;
+        example = "arebelongtous";
+        default = "";
+        description = ''
+          HTTP web login password.
+        '';
+      };
+
+      encryptLAN = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Encrypt LAN data.";
+      };
+
+      enableWebUI = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable Web UI for administration. Bound to the specified
+          <literal>httpListenAddress</literal> and
+          <literal>httpListenPort</literal>.
+          '';
+      };
+
+      storagePath = mkOption {
+        type = types.path;
+        default = "/var/lib/resilio-sync/";
+        description = ''
+          Where BitTorrent Sync will store it's database files (containing
+          things like username info and licenses). Generally, you should not
+          need to ever change this.
+        '';
+      };
+
+      apiKey = mkOption {
+        type = types.str;
+        default = "";
+        description = "API key, which enables the developer API.";
+      };
+
+      directoryRoot = mkOption {
+        type = types.str;
+        default = "";
+        example = "/media";
+        description = "Default directory to add folders in the web UI.";
+      };
+
+      sharedFolders = mkOption {
+        default = [];
+        example =
+          [ { secret         = "AHMYFPCQAHBM7LQPFXQ7WV6Y42IGUXJ5Y";
+              directory      = "/home/user/sync_test";
+              useRelayServer = true;
+              useTracker     = true;
+              useDHT         = false;
+              searchLAN      = true;
+              useSyncTrash   = true;
+              knownHosts     =
+                [ "192.168.1.2:4444"
+                  "192.168.1.3:4444"
+                ];
+            }
+          ];
+        description = ''
+          Shared folder list. If enabled, web UI must be
+          disabled. Secrets can be generated using <literal>rslsync
+          --generate-secret</literal>. Note that this secret will be
+          put inside the Nix store, so it is realistically not very
+          secret.
+
+          If you would like to be able to modify the contents of this
+          directories, it is recommended that you make your user a
+          member of the <literal>resilio</literal> group.
+
+          Directories in this list should be in the
+          <literal>resilio</literal> group, and that group must have
+          write access to the directory. It is also recommended that
+          <literal>chmod g+s</literal> is applied to the directory
+          so that any sub directories created will also belong to
+          the <literal>resilio</literal> group. Also,
+          <literal>setfacl -d -m group:resilio:rwx</literal> and
+          <literal>setfacl -m group:resilio:rwx</literal> should also
+          be applied so that the sub directories are writable by
+          the group.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions =
+      [ { assertion = cfg.deviceName != "";
+          message   = "Device name cannot be empty.";
+        }
+        { assertion = cfg.enableWebUI -> cfg.sharedFolders == [];
+          message   = "If using shared folders, the web UI cannot be enabled.";
+        }
+        { assertion = cfg.apiKey != "" -> cfg.enableWebUI;
+          message   = "If you're using an API key, you must enable the web server.";
+        }
+      ];
+
+    services.resilio.package = mkOptionDefault pkgs.resilio;
+
+    users.extraUsers.rslsync = {
+      description     = "Resilio Sync Service user";
+      home            = cfg.storagePath;
+      createHome      = true;
+      uid             = config.ids.uids.rslsync;
+      group           = "rslsync";
+    };
+
+    users.extraGroups = [ { name = "rslsync"; } ];
+
+    systemd.services.resilio = with pkgs; {
+      description = "Resilio Sync Service";
+      wantedBy    = [ "multi-user.target" ];
+      after       = [ "network.target" "local-fs.target" ];
+      serviceConfig = {
+        Restart   = "on-abort";
+        UMask     = "0002";
+        User      = "rslsync";
+        ExecStart =
+          "${resilioSync}/bin/rslsync --nodaemon --config ${configFile}";
+      };
+    };
+
+    systemd.user.services.resilio = with pkgs; {
+      description = "Resilio Sync user service";
+      after       = [ "network.target" "local-fs.target" ];
+      serviceConfig = {
+        Restart   = "on-abort";
+        ExecStart =
+          "${resilioSync}/bin/rslsync --nodaemon --config %h/.config/resilio-sync/config.json";
+      };
+    };
+
+    environment.systemPackages = [ cfg.package ];
+  };
+}
-- 
GitLab


From b6e384732e34008e37d0b48fffed7d0dc0880621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 1 Jun 2017 20:49:38 +0100
Subject: [PATCH 0300/1490] resilio-sync: cosmetic changes

---
 .../networking/resilio-sync/default.nix       | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 706bc7841ca..7622cb76ad2 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -5,22 +5,18 @@ let
     "x86_64-linux" = "x64";
     "i686-linux" = "i386";
   }.${stdenv.system};
-  sha256s = {
-    "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192";
-    "i686-linux"   = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8";
-  };
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
-in
 
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   name = "resilio-sync-${version}";
   version = "2.5.2";
 
   src = fetchurl {
-    urls = [
-      "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"
-    ];
-    sha256 = sha256s.${stdenv.system};
+    url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
+    sha256 = {
+      "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192";
+      "i686-linux"   = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8";
+    }.${stdenv.system};
   };
 
   dontStrip = true; # Don't strip, otherwise patching the rpaths breaks
@@ -28,14 +24,16 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     install -D rslsync "$out/bin/rslsync"
-    patchelf --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath} "$out/bin/rslsync"
+    patchelf \
+      --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath} "$out/bin/rslsync"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Automatically sync files via secure, distributed technology";
     homepage    = https://www.resilio.com/;
-    license     = stdenv.lib.licenses.unfreeRedistributable;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ domenkozar thoughtpolice cwoac ];
+    license     = licenses.unfreeRedistributable;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ];
   };
 }
-- 
GitLab


From c611d03842803c2d1bf081f6432449f34b1cebb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 1 Jun 2017 21:53:13 +0100
Subject: [PATCH 0301/1490] resilio: generate configuration with toJSON

---
 nixos/modules/services/networking/resilio.nix | 127 +++++++-----------
 1 file changed, 47 insertions(+), 80 deletions(-)

diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index 45274991d81..33ac24aabc4 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -5,76 +5,41 @@ with lib;
 let
   cfg = config.services.resilio;
 
-  resilioSync = pkgs.resilio;
-
-  listenAddr = cfg.httpListenAddr + ":" + (toString cfg.httpListenPort);
-
-  boolStr = x: if x then "true" else "false";
-  optionalEmptyStr = b: v: optionalString (b != "") v;
-
-  webUIConfig = optionalString cfg.enableWebUI
-    ''
-      "webui":
-      {
-        ${optionalEmptyStr cfg.httpLogin     "\"login\":          \"${cfg.httpLogin}\","}
-        ${optionalEmptyStr cfg.httpPass      "\"password\":       \"${cfg.httpPass}\","}
-        ${optionalEmptyStr cfg.apiKey        "\"api_key\":        \"${cfg.apiKey}\","}
-        ${optionalEmptyStr cfg.directoryRoot "\"directory_root\": \"${cfg.directoryRoot}\","}
-        "listen": "${listenAddr}"
-      }
-    '';
-
-  knownHosts = e:
-    optionalString (e ? "knownHosts")
-      (concatStringsSep "," (map (v: "\"${v}\"") e."knownHosts"));
-
-  sharedFoldersRecord =
-    concatStringsSep "," (map (entry:
-      let helper = attr: v:
-        if (entry ? attr) then boolStr entry.attr else boolStr v;
-      in
-      ''
-        {
-          "secret": "${entry.secret}",
-          "dir":    "${entry.directory}",
-
-          "use_relay_server": ${helper "useRelayServer" true},
-          "use_tracker":      ${helper "useTracker"     true},
-          "use_dht":          ${helper "useDHT"        false},
-
-          "search_lan":       ${helper "searchLAN"      true},
-          "use_sync_trash":   ${helper "useSyncTrash"   true},
-
-          "known_hosts": [${knownHosts entry}]
-        }
-      '') cfg.sharedFolders);
-
-  sharedFoldersConfig = optionalString (cfg.sharedFolders != [])
-    ''
-      "shared_folders":
-        [
-        ${sharedFoldersRecord}
-        ]
-    '';
-
-  configFile = pkgs.writeText "config.json"
-    ''
-      {
-        "device_name":     "${cfg.deviceName}",
-        "storage_path":    "${cfg.storagePath}",
-        "listening_port":  ${toString cfg.listeningPort},
-        "use_gui":         false,
-
-        "check_for_updates": ${boolStr cfg.checkForUpdates},
-        "use_upnp":          ${boolStr cfg.useUpnp},
-        "download_limit":    ${toString cfg.downloadLimit},
-        "upload_limit":      ${toString cfg.uploadLimit},
-        "lan_encrypt_data":  ${boolStr cfg.encryptLAN},
-
-        ${webUIConfig}
-        ${sharedFoldersConfig}
-      }
-    '';
+  resilioSync = pkgs.resilio-sync;
+
+  sharedFoldersRecord = map (entry: {
+    secret = entry.secret;
+    dir = entry.directory;
+
+    use_relay_server = entry.useRelayServer;
+    use_tracker = entry.useTracker;
+    use_dht = entry.useDHT;
+
+    search_lan = entry.searchLAN;
+    use_sync_trash = entry.useSyncTrash;
+    known_hosts = knownHosts;
+  }) cfg.sharedFolders;
+
+  configFile = pkgs.writeText "config.json" (builtins.toJSON ({
+    device_name = cfg.deviceName;
+    storage_path = cfg.storagePath;
+    listening_port = cfg.listeningPort;
+    use_gui = false;
+    check_for_updates = cfg.checkForUpdates;
+    use_upnp = cfg.useUpnp;
+    download_limit = cfg.downloadLimit;
+    upload_limit = cfg.uploadLimit;
+    lan_encrypt_data = cfg.encryptLAN;
+  } // optionalAttrs cfg.enableWebUI {
+    webui = { listen = "${cfg.httpListenAddr}:${toString cfg.httpListenPort}"; } //
+      (optionalAttrs (cfg.httpLogin != "") { login = cfg.httpLogin; }) //
+      (optionalAttrs (cfg.httpPass != "") { password = cfg.httpPass; }) //
+      (optionalAttrs (cfg.apiKey != "") { api_key = cfg.apiKey; }) //
+      (optionalAttrs (cfg.directoryRoot != "") { directory_root = cfg.directoryRoot; });
+  } // optionalAttrs (sharedFoldersRecord != []) {
+    shared_folders = sharedFoldersRecord;
+  }));
+
 in
 {
   options = {
@@ -97,6 +62,7 @@ in
       deviceName = mkOption {
         type = types.str;
         example = "Voltron";
+        default = config.networking.hostName;
         description = ''
           Name of the Resilio Sync device.
         '';
@@ -230,10 +196,10 @@ in
               useDHT         = false;
               searchLAN      = true;
               useSyncTrash   = true;
-              knownHosts     =
-                [ "192.168.1.2:4444"
-                  "192.168.1.3:4444"
-                ];
+              knownHosts     = [
+                "192.168.1.2:4444"
+                "192.168.1.3:4444"
+              ];
             }
           ];
         description = ''
@@ -275,7 +241,6 @@ in
         }
       ];
 
-    services.resilio.package = mkOptionDefault pkgs.resilio;
 
     users.extraUsers.rslsync = {
       description     = "Resilio Sync Service user";
@@ -295,8 +260,9 @@ in
         Restart   = "on-abort";
         UMask     = "0002";
         User      = "rslsync";
-        ExecStart =
-          "${resilioSync}/bin/rslsync --nodaemon --config ${configFile}";
+        ExecStart = ''
+          ${resilioSync}/bin/rslsync --nodaemon --config ${configFile}
+        '';
       };
     };
 
@@ -305,11 +271,12 @@ in
       after       = [ "network.target" "local-fs.target" ];
       serviceConfig = {
         Restart   = "on-abort";
-        ExecStart =
-          "${resilioSync}/bin/rslsync --nodaemon --config %h/.config/resilio-sync/config.json";
+        ExecStart = ''
+         ${resilioSync}/bin/rslsync --nodaemon --config %h/.config/resilio-sync/config.json
+        '';
       };
     };
 
-    environment.systemPackages = [ cfg.package ];
+    environment.systemPackages = [ resilioSync ];
   };
 }
-- 
GitLab


From 3d17573cd41587311d21d38b39d508b6234e39ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 2 Jun 2017 21:18:59 +0100
Subject: [PATCH 0302/1490] resilio: remove systemd user service

this used to be part of the upstream btsync package

fixes #26303
---
 nixos/modules/services/networking/resilio.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index 33ac24aabc4..6d2b7bdbca1 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -241,7 +241,6 @@ in
         }
       ];
 
-
     users.extraUsers.rslsync = {
       description     = "Resilio Sync Service user";
       home            = cfg.storagePath;
@@ -265,18 +264,5 @@ in
         '';
       };
     };
-
-    systemd.user.services.resilio = with pkgs; {
-      description = "Resilio Sync user service";
-      after       = [ "network.target" "local-fs.target" ];
-      serviceConfig = {
-        Restart   = "on-abort";
-        ExecStart = ''
-         ${resilioSync}/bin/rslsync --nodaemon --config %h/.config/resilio-sync/config.json
-        '';
-      };
-    };
-
-    environment.systemPackages = [ resilioSync ];
   };
 }
-- 
GitLab


From 4a62364c17819e953d943296e716c4910e57595b Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 2 Jun 2017 22:40:17 +0200
Subject: [PATCH 0303/1490] youtube-dl: 2017.05.23 -> 2017.05.29 (#26329)

* youtube-dl: add pycryptodome dependency

The pycrypto library is used for HLS streams with encrypted segments.

See https://github.com/rg3/youtube-dl/pull/8201

* youtube-dl: 2017.05.23 -> 2017.05.29
---
 pkgs/tools/misc/youtube-dl/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1acf0e65dea..853f644634d 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildPythonApplication
-, zip, ffmpeg, rtmpdump, atomicparsley, pandoc
+, zip, ffmpeg, rtmpdump, atomicparsley, pycryptodome, pandoc
 # Pandoc is required to build the package's man page. Release tarballs contain a
 # formatted man page already, though, it will still be installed. We keep the
 # manpage argument in place in case someone wants to use this derivation to
@@ -8,21 +8,23 @@
 , generateManPage ? false
 , ffmpegSupport ? true
 , rtmpSupport ? true
+, hlsEncryptedSupport ? true
 , makeWrapper }:
 
 with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.05.23";
+  version = "2017.05.29";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1na2ccja8p18i3ypf7vjrxlh653906746l966fwm06b5q6867iwd";
+    sha256 = "11zh0h4hwwx39iv6qbkqbvf5a5mgj71ngj2kp7zmq7g0qh37x9rx";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ zip ] ++ optional generateManPage pandoc;
+  propagatedBuildInputs = optional hlsEncryptedSupport pycryptodome;
 
   # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
   # rtmpdump is required to download files over RTMP
-- 
GitLab


From c972f01e2d670f9483a980312c0e12b81094cebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 2 Jun 2017 21:55:16 +0100
Subject: [PATCH 0304/1490] pymol: set PYTHONPATH in a future way

---
 .../science/chemistry/pymol/default.nix            | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 200d00395e2..ed208014f7d 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, makeDesktopItem, python3Packages, glew, freeglut, libpng, libxml2, tk, freetype }:
+{ stdenv, fetchurl, makeDesktopItem
+, python3, python3Packages
+, glew, freeglut, libpng, libxml2, tk, freetype }:
+
+
+with stdenv.lib;
 
 let
   pname = "pymol";
@@ -33,13 +38,12 @@ python3Packages.buildPythonApplication {
     runHook postInstall
   '';
 
-  postInstall = ''
+  postInstall = with python3Packages; ''
     wrapProgram $out/bin/pymol \
-      --prefix PYTHONPATH : ${python3Packages.Pmw}/lib/python3.6/site-packages \
-      --prefix PYTHONPATH : ${python3Packages.tkinter}/lib/python3.6/site-packages
+      --prefix PYTHONPATH : ${makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = description;
     homepage = "https://www.pymol.org/";
     license = licenses.psfl;
-- 
GitLab


From bafcdbbb67d2cb1b273e61614b739a6942dd3baa Mon Sep 17 00:00:00 2001
From: Judson Lester <nyarly@users.noreply.github.com>
Date: Fri, 2 Jun 2017 14:23:19 -0700
Subject: [PATCH 0305/1490] bcc: 0.2.0 -> 0.3.0 (#26315)

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

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index f3b262f1f7d..88242df76d4 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -2,14 +2,14 @@
   flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.0";
+  version = "0.3.0";
   name = "bcc-${version}";
 
   src = fetchFromGitHub {
     owner = "iovisor";
     repo = "bcc";
     rev = "v${version}";
-    sha256 = "1xifh8lcqmn4mk6w4srjf4zk6mlwgck4fpcyhhliy39963ch5k08";
+    sha256 = "19lkqmilfjmj7bnhxlacd0waa5db8gf4lng12fy2zgji0d77vm1d";
   };
 
   buildInputs = [ makeWrapper cmake llvmPackages.llvm llvmPackages.clang-unwrapped kernel
-- 
GitLab


From 4576e8dddd17fd8c25aa02a917e89982cf7e3e37 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 3 Jun 2017 00:37:48 +0200
Subject: [PATCH 0306/1490] trash-cli: fix build on Python 3.6

---
 pkgs/tools/misc/trash-cli/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 40fc72a0d71..77308ecf2ed 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils
+{ stdenv, fetchFromGitHub, fetchpatch, coreutils
 , python3, python3Packages, substituteAll }:
 
 assert stdenv.isLinux;
@@ -21,6 +21,12 @@ python3Packages.buildPythonApplication rec {
       df = "${coreutils}/bin/df";
       libc = "${stdenv.cc.libc.out}/lib/libc.so.6";
     })
+
+    # Fix build on Python 3.6.
+    (fetchpatch {
+      url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch";
+      sha256 = "0w49rjh433sjfc2cl5a9wlbr6kcn9f1qg905qsyv7ay3ar75wvyp";
+    })
   ];
 
   buildInputs = with python3Packages; [ nose mock ];
-- 
GitLab


From 6c2c8ba7ab50e513f032b19efdf5f7cf68f6a11f Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Fri, 2 Jun 2017 17:00:08 -0700
Subject: [PATCH 0307/1490] Update ipmiview to current version 2.12.0 - 160804

---
 pkgs/applications/misc/ipmiview/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 0afcbca4979..030431ef312 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -4,12 +4,12 @@ assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
    name = "IPMIView-${version}";
-   version = "20151223";
+   version = "160804";
 
-   src = fetchurl {
-     url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_V2.11.0_bundleJRE_Linux_x64_${version}.tar.gz";
-     sha256 = "1rv9j0id7i2ipm25n60bpfdm1gj44xg2aj8rnx4s6id3ln90q121";
-   };
+   src = pkgs.fetchurl {
+    url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.12.0_build.${version}_bundleJRE_Linux_x64.tar.gz";
+    sha256 = "787a060413451a4a5993c31805f55a221087b7199bbaf20e9fe1254e2a76db42";
+  };
 
    buildInputs = [ patchelf makeWrapper ];
 
@@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
    };
   }
-
-- 
GitLab


From 4c28cac0d36a4b2e54762ef6f123a936a8bac953 Mon Sep 17 00:00:00 2001
From: John Ramsden <johnramsden@users.noreply.github.com>
Date: Fri, 2 Jun 2017 17:03:52 -0700
Subject: [PATCH 0308/1490] Add buildversion and version

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

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 030431ef312..b841f064243 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -4,10 +4,11 @@ assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
    name = "IPMIView-${version}";
-   version = "160804";
+   version = "2.12.0";
+   buildVersion = "160804";
 
    src = pkgs.fetchurl {
-    url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_2.12.0_build.${version}_bundleJRE_Linux_x64.tar.gz";
+    url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
     sha256 = "787a060413451a4a5993c31805f55a221087b7199bbaf20e9fe1254e2a76db42";
   };
 
-- 
GitLab


From 4bee34dcc5e6886aac8c868410f12a670da03062 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@users.noreply.github.com>
Date: Fri, 2 Jun 2017 20:58:41 -0400
Subject: [PATCH 0309/1490] doc: clarify building-nixos CD/DVD instructions

This change updates the instructions for building a NixOS ISO so that it's clear how to do it.

Previously, the instructions stated to set NIXOS_CONFIG prior to running `nix-build`, yet the example provided by-passed NIXOS_CONFIG anyway. But the *really* important missing piece is the need for nixos/default.nix. See #21840.

This change removes the NIXOS_CONFIG verbiage, and adds steps to clone nixpkgs and (most importantly) cd'ing into nixpkgs/nixos. That way, the reader may think: *Oh, so I need a default.nix and a configuration.nix. Ahhh, OK.*

I purposely added the redundant default.nix argument.
---
 nixos/doc/manual/development/building-nixos.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml
index 150fa1d7017..2f963f8666f 100644
--- a/nixos/doc/manual/development/building-nixos.xml
+++ b/nixos/doc/manual/development/building-nixos.xml
@@ -12,12 +12,12 @@ your <filename>configuration.nix</filename> to configure the system that
 would be installed on the CD.</para>
 
 <para>Default CD/DVD configurations are available
-inside <filename>nixos/modules/installer/cd-dvd</filename>.  To build them
-you have to set <envar>NIXOS_CONFIG</envar> before
-running <command>nix-build</command> to build the ISO.
+inside <filename>nixos/modules/installer/cd-dvd</filename>.
 
 <screen>
-$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix</screen>
+$ git clone https://github.com/NixOS/nixpkgs.git
+$ cd nixpkgs/nixos
+$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix</screen>
 
 </para>
 
-- 
GitLab


From edaf76a99db739a04fb043678b2fcde422e2da71 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 3 Jun 2017 09:45:22 +0900
Subject: [PATCH 0310/1490] albert: 0.11.1 -> 0.11.3

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

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 80e77858a06..f3c011e3333 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "albert-${version}";
-  version = "0.11.1";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner  = "albertlauncher";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "1ai0h3lbdac0a4xzd6pm3i0r8w0gfdnw9rdkj0szyzvm428f88s6";
+    sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5";
   };
 
   nativeBuildInputs = [ cmake makeQtWrapper ];
-- 
GitLab


From fe1f560fefc5510dd3d649893e440b62432b4c60 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 3 Jun 2017 09:31:06 +0900
Subject: [PATCH 0311/1490] groonga: 7.0.0 -> 7.0.3

---
 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 e71c570f736..500913b5eec 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 = "7.0.0";
+  version = "7.0.3";
 
   src = fetchurl {
     url    = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "0c3vzw2ias0xpz1hwywlib1qqfjvvzwj1zggswd5l2cj87f1krfd";
+    sha256 = "17pp4sbfa6wpiiiqvdbnvd1qxrchmj7zh27zdrmmnbvwpyc5g2n6";
   };
 
   buildInputs = with stdenv.lib;
-- 
GitLab


From 3badf79b48d2d29edcc385702e0c8020eae98138 Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Thu, 1 Jun 2017 01:38:41 +0200
Subject: [PATCH 0312/1490] insync: Check if arch is x86_64 before downloading
 the binary.

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

diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 7beb489178b..5690705d1f2 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -3,10 +3,14 @@
 stdenv.mkDerivation rec {
   name = "insync-${version}";
   version = "1.3.16.36155";
-  src = fetchurl {
-    url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
-    sha256 = "1gf1qg7mkbcgqhwxkiljmd1w2zvarq6vhxhips3w06bqdyg12210";
-  };
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
+        sha256 = "1gf1qg7mkbcgqhwxkiljmd1w2zvarq6vhxhips3w06bqdyg12210";
+      }
+    else
+      throw "${name} is not supported on ${stdenv.system}";
 
   buildInputs = [ makeWrapper ];
 
-- 
GitLab


From 8c6fada372dba386c25e209a4dff440e2da5a0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Jun 2017 11:24:18 +0200
Subject: [PATCH 0313/1490] nixpkgs manual: advise against overriding whole
 phases

I've seen that mistake at least a few times already, e.g.
https://github.com/NixOS/nixpkgs/pull/26209#issuecomment-305925562
It might perhaps seem counter-intuitive if one doesn't know nixpkgs well.
---
 doc/stdenv.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index a2530e102ca..6e7134e16a5 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -318,7 +318,13 @@ containing some shell commands to be executed, or by redefining the
 shell function
 <varname><replaceable>name</replaceable>Phase</varname>.  The former
 is convenient to override a phase from the derivation, while the
-latter is convenient from a build script.</para>
+latter is convenient from a build script.
+
+However, typically one only wants to <emphasis>add</emphasis> some
+commands to a phase, e.g. by defining <literal>postInstall</literal>
+or <literal>preFixup</literal>, as skipping some of the default actions
+may have unexpected consequences.
+</para>
 
 
 <section xml:id="ssec-controlling-phases"><title>Controlling
-- 
GitLab


From 2606d395fce36e77c542ace1f0f318a57130a522 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 3 Jun 2017 11:59:34 +0200
Subject: [PATCH 0314/1490] dnschain: allow different bind and external
 addresses

---
 nixos/modules/services/networking/dnschain.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index b6492996057..ab7bbb15ad4 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -17,7 +17,7 @@ let
     host = ${cfg.dns.address}
     port = ${toString cfg.dns.port}
     oldDNSMethod = NO_OLD_DNS
-    externalIP = ${cfg.dns.address}
+    externalIP = ${cfg.dns.externalAddress}
 
     [http]
     host = ${cfg.api.hostname}
@@ -47,8 +47,18 @@ in
         type = types.str;
         default = "127.0.0.1";
         description = ''
-          The IP address that will be used to reach this machine.
-          Leave this unchanged if you do not wish to directly expose the DNSChain resolver.
+          The IP address the DNSChain resolver will bind to.
+          Leave this unchanged if you do not wish to directly expose the resolver.
+        '';
+      };
+
+      dns.externalAddress = mkOption {
+        type = types.str;
+        default = cfg.dns.address;
+        description = ''
+           The IP address used by clients to reach the resolver and the value of
+           the <literal>namecoin.dns</literal> record. Set this in case the bind address
+           is not the actual IP address (e.g. the machine is behind a NAT).
         '';
       };
 
-- 
GitLab


From 43f9c60e92fffb11a61932f3c58c8e777cfc6a86 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Fri, 2 Jun 2017 20:26:44 -0400
Subject: [PATCH 0315/1490] gambit: 4.8.5 -> 4.8.6

Use higher optimization settings and include openssl interface.
---
 pkgs/development/compilers/gambit/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 99a4d6fc4d1..7e17cee9abd 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -1,16 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
   name    = "gambit-${version}";
-  version = "4.8.5";
-  devver  = "4_8_5";
+  version = "4.8.6";
+  devver  = "4_8_6";
 
   src = fetchurl {
     url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${devver}-devel.tgz";
-    sha256 = "02b5bm06k2qr0lvdwwsl0ygxs7n8410rrkq95picn4s02kxszqnq";
+    sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl";
   };
 
-  configureFlags = [ "--enable-shared" "--enable-single-host" ];
+  configureFlags = [
+    "--enable-single-host"
+    "--enable-shared"
+    "--enable-absolute-shared-libs"
+    "--enable-c-opt=-O6" "--enable-gcc-opts" "--enable-inline-jumps"
+    "--enable-thread-system=posix" "--enable-dynamic-tls"
+    "--enable-openssl"
+  ];
+
+  buildInputs = [ openssl ];
 
   meta = {
     description = "Optimizing Scheme to C compiler";
-- 
GitLab


From 7cbdb10576ea6271c7fd080176494babfa4ce24c Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Fri, 2 Jun 2017 20:26:52 -0400
Subject: [PATCH 0316/1490] gerbil: init at 0.10

---
 pkgs/development/compilers/gerbil/default.nix | 74 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/development/compilers/gerbil/default.nix

diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
new file mode 100644
index 00000000000..1bad0a86071
--- /dev/null
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, fetchgit, gambit, openssl, zlib, coreutils, rsync, bash }:
+
+stdenv.mkDerivation rec {
+  name    = "gerbil-${version}";
+
+  version = "0.10";
+  src = fetchurl {
+    url    = "https://github.com/vyzo/gerbil/archive/v${version}.tar.gz";
+    sha256 = "14wzdnifr99g1mvm2xwks97nhaq62hfx43pxcw9gs647i7cymbly";
+  };
+
+  #version = "v0.7-49-g767926d";
+  #src = fetchgit {
+  #  url = "https://github.com/vyzo/gerbil.git";
+  #  rev = "767926d7d6dde7e717cc51307f07e21859c79989";
+  #  sha256 = "089lzsjmb43nns70pvn3kqg1gx6alsarbphvmh2a6qimnscdgv5z";
+  #};
+  # src = /home/fare/src/scheme/gerbil ;
+
+  buildInputs = [ gambit openssl zlib coreutils rsync ];
+
+  patchPhase = ''
+    SCRIPTS=(
+      src/*.sh
+      src/gerbil/gx?
+      src/gerbil/runtime/build.scm
+      src/lang/build*ss
+      src/std/build*.ss
+      src/std/run-tests.ss
+      src/std/web/fastcgi-test.ss
+      src/std/web/rack-test.ss
+      src/tutorial/lang/build.ss
+    )
+    for f in "''${SCRIPTS[@]}" ; do
+      substituteInPlace "$f" --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
+      substituteInPlace "$f" --replace '#!/usr/bin/env gsi-script' '#!${gambit}/bin/gsi-script'
+      substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
+    done
+  '';
+
+  buildPhase = ''
+    ( cd src && sh build.sh )
+  '';
+
+  installPhase = ''
+    ( mkdir -p $out/
+      cp -fa bin lib etc doc $out/
+      cd $out/bin
+      for f in "''${SCRIPTS[@]}" ; do
+        substituteInPlace gxc --replace "${coreutils}/bin/env gxi" "$out/bin/gxi"
+      done
+      ( echo '#!${bash}/bin/bash -e'
+        echo "GERBIL_HOME=$out"
+        echo 'export GERBIL_HOME'
+        echo 'case "$1" in -:*) GSIOPTIONS=$1 ; shift ;; esac'
+        echo 'if [[ $# = 0 ]] ; then '
+        echo '  ${gambit}/bin/gsi $GSIOPTIONS $GERBIL_HOME/lib/gxi-init $GERBIL_HOME/lib/gxi-interactive - ;'
+        echo 'else'
+        echo '  ${gambit}/bin/gsi $GSIOPTIONS $GERBIL_HOME/lib/gxi-init "$@"'
+        echo 'fi' ) > $out/bin/gxi
+    )
+  '';
+
+  dontStrip = true;
+  #dontFixup = true;
+
+  meta = {
+    description = "Gerbil";
+    homepage    = "https://github.com/vyzo/gerbil";
+    license     = stdenv.lib.licenses.lgpl2;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ fare ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 713a16ee113..51c4248ee79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5110,6 +5110,7 @@ with pkgs;
   fpc = callPackage ../development/compilers/fpc { };
 
   gambit = callPackage ../development/compilers/gambit { };
+  gerbil = callPackage ../development/compilers/gerbil { };
 
   gcc = gcc5;
   gcc-unwrapped = gcc.cc;
-- 
GitLab


From de0d0da1fdb393572fc24d93f771ada9aa06a028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 3 Jun 2017 10:17:44 +0100
Subject: [PATCH 0317/1490] gerbil: simplify shebang patching

fixes #26338
---
 pkgs/development/compilers/gerbil/default.nix | 61 +++++++------------
 1 file changed, 21 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index 1bad0a86071..1bffd1bd1c8 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -9,60 +9,41 @@ stdenv.mkDerivation rec {
     sha256 = "14wzdnifr99g1mvm2xwks97nhaq62hfx43pxcw9gs647i7cymbly";
   };
 
-  #version = "v0.7-49-g767926d";
-  #src = fetchgit {
-  #  url = "https://github.com/vyzo/gerbil.git";
-  #  rev = "767926d7d6dde7e717cc51307f07e21859c79989";
-  #  sha256 = "089lzsjmb43nns70pvn3kqg1gx6alsarbphvmh2a6qimnscdgv5z";
-  #};
-  # src = /home/fare/src/scheme/gerbil ;
+  buildInputs = [ gambit openssl zlib coreutils rsync bash ];
 
-  buildInputs = [ gambit openssl zlib coreutils rsync ];
+  postPatch = ''
+    patchShebangs .
 
-  patchPhase = ''
-    SCRIPTS=(
-      src/*.sh
-      src/gerbil/gx?
-      src/gerbil/runtime/build.scm
-      src/lang/build*ss
-      src/std/build*.ss
-      src/std/run-tests.ss
-      src/std/web/fastcgi-test.ss
-      src/std/web/rack-test.ss
-      src/tutorial/lang/build.ss
-    )
-    for f in "''${SCRIPTS[@]}" ; do
-      substituteInPlace "$f" --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash'
-      substituteInPlace "$f" --replace '#!/usr/bin/env gsi-script' '#!${gambit}/bin/gsi-script'
+    find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do
       substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
     done
   '';
 
   buildPhase = ''
+    runHook preBuild
     ( cd src && sh build.sh )
+    runHook postBuild
   '';
 
   installPhase = ''
-    ( mkdir -p $out/
-      cp -fa bin lib etc doc $out/
-      cd $out/bin
-      for f in "''${SCRIPTS[@]}" ; do
-        substituteInPlace gxc --replace "${coreutils}/bin/env gxi" "$out/bin/gxi"
-      done
-      ( echo '#!${bash}/bin/bash -e'
-        echo "GERBIL_HOME=$out"
-        echo 'export GERBIL_HOME'
-        echo 'case "$1" in -:*) GSIOPTIONS=$1 ; shift ;; esac'
-        echo 'if [[ $# = 0 ]] ; then '
-        echo '  ${gambit}/bin/gsi $GSIOPTIONS $GERBIL_HOME/lib/gxi-init $GERBIL_HOME/lib/gxi-interactive - ;'
-        echo 'else'
-        echo '  ${gambit}/bin/gsi $GSIOPTIONS $GERBIL_HOME/lib/gxi-init "$@"'
-        echo 'fi' ) > $out/bin/gxi
-    )
+    runHook preInstall
+    mkdir -p $out/
+    cp -fa bin lib etc doc $out/
+
+    cat > $out/bin/gxi <<EOF
+#!${bash}/bin/bash -e
+export GERBIL_HOME=$out
+case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
+if [[ \$# = 0 ]] ; then
+  ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
+else
+  ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
+fi
+EOF
+    runHook postInstall
   '';
 
   dontStrip = true;
-  #dontFixup = true;
 
   meta = {
     description = "Gerbil";
-- 
GitLab


From 668556331b78b67ca3278a6d7a33af9c6a392c7a Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 3 Jun 2017 12:27:43 +0100
Subject: [PATCH 0318/1490] Revert "datadog: Properly use configured package."

This reverts commit 50f53da9eff3e7a1686ff439b341ada5bd63ddcd.
---
 nixos/modules/services/monitoring/dd-agent/dd-agent.nix | 8 ++++----
 pkgs/tools/networking/dd-agent/default.nix              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index 04a21871519..e55faed8e07 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -23,7 +23,7 @@ let
   etcfiles =
     map (i: { source = if builtins.hasAttr "config" i
                        then pkgs.writeText "${i.name}.yaml" i.config
-                       else "${cfg.agent}/agent/conf.d-system/${i.name}.yaml";
+                       else "${pkgs.dd-agent}/agent/conf.d-system/${i.name}.yaml";
               target = "dd-agent/conf.d/${i.name}.yaml";
             }
         ) cfg.integrations ++
@@ -119,13 +119,13 @@ in {
       path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = "${cfg.agent}/bin/dd-agent foreground";
+        ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
         User = "datadog";
         Group = "datadog";
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ cfg.agent ddConf ] ++ etcSources;
+      restartTriggers = [ pkgs.dd-agent ddConf ] ++ etcSources;
     };
 
     systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) {
@@ -133,7 +133,7 @@ in {
       path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = "${cfg.agent}/bin/dd-jmxfetch";
+        ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch";
         User = "datadog";
         Group = "datadog";
         Restart = "always";
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 338804aa26b..2556287570f 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -5,7 +5,7 @@
 # wrapper with their PYTHONPATH. This means overrideAttrs is not
 # strong enough (it overrides too late), we need to call it
 # beforehand.
-, extraBuildInputs ? [ ] }:
+, extraBuildInputs ? [ pythonPackages.psutil ] }:
 let
   inherit (pythonPackages) python;
   docker_1_10 = pythonPackages.buildPythonPackage rec {
-- 
GitLab


From dcf171bc79c99ef1326136b5eb49fd81525d6ec5 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 3 Jun 2017 12:27:56 +0100
Subject: [PATCH 0319/1490] Revert "dd-agent: 5.11.2 -> 5.13.2 + service
 rework"

This reverts commit af096c8bff1e534be9c69f50eed13e6b48427d0e.
---
 .../monitoring/dd-agent/dd-agent-defaults.nix |   8 +
 .../services/monitoring/dd-agent/dd-agent.nix | 190 +++++++++++++-----
 .../dd-agent/update-dd-agent-defaults         |   9 +
 pkgs/tools/networking/dd-agent/default.nix    |  57 ++----
 4 files changed, 169 insertions(+), 95 deletions(-)
 create mode 100644 nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
 create mode 100755 nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults

diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
new file mode 100644
index 00000000000..04512819742
--- /dev/null
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
@@ -0,0 +1,8 @@
+# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.
+[
+  "auto_conf"
+  "agent_metrics.yaml.default"
+  "disk.yaml.default"
+  "network.yaml.default"
+  "ntp.yaml.default"
+]
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index e55faed8e07..8d3d4f2065e 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -16,24 +16,100 @@ let
     forwarder_log_file: /var/log/datadog/forwarder.log
     dogstatsd_log_file: /var/log/datadog/dogstatsd.log
     pup_log_file:       /var/log/datadog/pup.log
+
+    # proxy_host: my-proxy.com
+    # proxy_port: 3128
+    # proxy_user: user
+    # proxy_password: password
+
+    # tags: mytag0, mytag1
     ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"}
-    ${cfg.extraDdConfig}
+
+    # collect_ec2_tags: no
+    # recent_point_threshold: 30
+    # use_mount: no
+    # listen_port: 17123
+    # graphite_listen_port: 17124
+    # non_local_traffic: no
+    # use_curl_http_client: False
+    # bind_host: localhost
+
+    # use_pup: no
+    # pup_port: 17125
+    # pup_interface: localhost
+    # pup_url: http://localhost:17125
+
+    # dogstatsd_port : 8125
+    # dogstatsd_interval : 10
+    # dogstatsd_normalize : yes
+    # statsd_forward_host: address_of_own_statsd_server
+    # statsd_forward_port: 8125
+
+    # device_blacklist_re: .*\/dev\/mapper\/lxc-box.*
+
+    # ganglia_host: localhost
+    # ganglia_port: 8651
   '';
 
+  diskConfig = pkgs.writeText "disk.yaml" ''
+    init_config:
+
+    instances:
+      - use_mount: no
+  '';
+  
+  networkConfig = pkgs.writeText "network.yaml" ''
+    init_config:
+
+    instances:
+      # Network check only supports one configured instance
+      - collect_connection_state: false
+        excluded_interfaces:
+          - lo
+          - lo0
+  '';
+  
+  postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;
+  nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;
+  mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig;
+  jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig;
+  processConfig = pkgs.writeText "process.yaml" cfg.processConfig;
+  
   etcfiles =
-    map (i: { source = if builtins.hasAttr "config" i
-                       then pkgs.writeText "${i.name}.yaml" i.config
-                       else "${pkgs.dd-agent}/agent/conf.d-system/${i.name}.yaml";
-              target = "dd-agent/conf.d/${i.name}.yaml";
-            }
-        ) cfg.integrations ++
-        [ { source = ddConf;
-            target = "dd-agent/datadog.conf";
-          }
-        ];
-
-  # restart triggers
-  etcSources = map (i: i.source) etcfiles;
+    let
+      defaultConfd = import ./dd-agent-defaults.nix;
+    in (map (f: { source = "${pkgs.dd-agent}/agent/conf.d-system/${f}";
+                  target = "dd-agent/conf.d/${f}";
+                }) defaultConfd) ++ [
+      { source = ddConf;
+        target = "dd-agent/datadog.conf";
+      }
+      { source = diskConfig;
+        target = "dd-agent/conf.d/disk.yaml";
+      }
+      { source = networkConfig;
+        target = "dd-agent/conf.d/network.yaml";
+      } ] ++
+    (optional (cfg.postgresqlConfig != null)
+      { source = postgresqlConfig;
+        target = "dd-agent/conf.d/postgres.yaml";
+      }) ++
+    (optional (cfg.nginxConfig != null)
+      { source = nginxConfig;
+        target = "dd-agent/conf.d/nginx.yaml";
+      }) ++
+    (optional (cfg.mongoConfig != null)
+      { source = mongoConfig;
+        target = "dd-agent/conf.d/mongo.yaml";
+      }) ++
+    (optional (cfg.processConfig != null)
+      { source = processConfig;
+        target = "dd-agent/conf.d/process.yaml";
+      }) ++
+    (optional (cfg.jmxConfig != null)
+      { source = jmxConfig;
+        target = "dd-agent/conf.d/jmx.yaml";
+      });
 
 in {
   options.services.dd-agent = {
@@ -63,46 +139,44 @@ in {
       type = types.uniq (types.nullOr types.string);
     };
 
-    agent = mkOption {
-      description = "The dd-agent package to use. Useful when overriding the package.";
-      default = pkgs.dd-agent;
-      type = types.package;
+    postgresqlConfig = mkOption {
+      description = "Datadog PostgreSQL integration configuration";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+    };
+
+    nginxConfig = mkOption {
+      description = "Datadog nginx integration configuration";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+    };
+    
+    mongoConfig = mkOption {
+      description = "MongoDB integration configuration";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
+    };
+
+    jmxConfig = mkOption {
+      description = "JMX integration configuration";
+      default = null;
+      type = types.uniq (types.nullOr types.string);
     };
 
-    integrations = mkOption {
+    processConfig = mkOption {
       description = ''
-        Any integrations to use. Default config used if none
-        specified. It is currently up to the user to make sure that
-        the dd-agent package used has all the dependencies chosen
-        integrations require in scope.
-      '';
-      type = types.listOf (types.attrsOf types.string);
-      default = [];
-      example = ''
-        [ { name = "elastic";
-            config = '''
-              init_config:
-
-              instances:
-                - url: http://localhost:9200
-            ''';
-          }
-          { name = "nginx"; }
-          { name = "ntp"; }
-          { name = "network"; }
-        ]
+        Process integration configuration
+ 
+        See http://docs.datadoghq.com/integrations/process/
       '';
+      default = null;
+      type = types.uniq (types.nullOr types.string);
     };
 
-    extraDdConfig = mkOption {
-      description = "Extra settings to append to datadog agent config.";
-      default = "";
-      type = types.string;
-    };
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ cfg.agent pkgs.sysstat pkgs.procps ];
+    environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ];
 
     users.extraUsers.datadog = {
       description = "Datadog Agent User";
@@ -116,7 +190,7 @@ in {
 
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
-      path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ];
+      path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
@@ -125,12 +199,28 @@ in {
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ pkgs.dd-agent ddConf ] ++ etcSources;
+      restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ];
+    };
+
+    systemd.services.dogstatsd = {
+      description = "Datadog statsd";
+      path = [ pkgs."dd-agent" pkgs.python pkgs.procps ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start";
+        User = "datadog";
+        Group = "datadog";
+        Type = "forking";
+        PIDFile = "/tmp/dogstatsd.pid";
+        Restart = "always";
+        RestartSec = 2;
+      };
+      restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ];
     };
 
-    systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) {
+    systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) {
       description = "Datadog JMX Fetcher";
-      path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
+      path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch";
@@ -139,7 +229,7 @@ in {
         Restart = "always";
         RestartSec = 2;
       };
-      restartTriggers = [ cfg.agent ddConf ] ++ etcSources;
+      restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ];
     };
 
     environment.etc = etcfiles;
diff --git a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
new file mode 100755
index 00000000000..76724173171
--- /dev/null
+++ b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+dd=$(nix-build --no-out-link -A dd-agent ../../../..)
+echo '# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.' > dd-agent-defaults.nix
+echo '[' >> dd-agent-defaults.nix
+echo '  "auto_conf"' >> dd-agent-defaults.nix
+for f in $(find $dd/agent/conf.d-system -maxdepth 1 -type f | grep -v '\.example' | sort); do
+  echo "  \"$(basename $f)\"" >> dd-agent-defaults.nix
+done
+echo ']' >> dd-agent-defaults.nix
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 2556287570f..d1171a3c835 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,11 +1,5 @@
 { stdenv, fetchFromGitHub, pythonPackages
-, sysstat, unzip, makeWrapper
-# We need extraBuildInputs as we want to be able to override this
-# package with python packages _and_ have the produced binaries
-# wrapper with their PYTHONPATH. This means overrideAttrs is not
-# strong enough (it overrides too late), we need to call it
-# beforehand.
-, extraBuildInputs ? [ pythonPackages.psutil ] }:
+, sysstat, unzip, makeWrapper }:
 let
   inherit (pythonPackages) python;
   docker_1_10 = pythonPackages.buildPythonPackage rec {
@@ -32,42 +26,33 @@ let
     # due to flake8
     doCheck = false;
   };
-  version = "5.13.2";
-
-  integrations = fetchFromGitHub {
-    owner = "datadog";
-    repo = "integrations-core";
-    rev = version;
-    sha256 = "1nbjmkq0wdfndmx0qap69h2rkwkkb0632j87h9d3j99bykyav3y3";
-  };
 
 in stdenv.mkDerivation rec {
+  version = "5.11.2";
   name = "dd-agent-${version}";
 
   src = fetchFromGitHub {
     owner  = "datadog";
     repo   = "dd-agent";
     rev    = version;
-    sha256 = "0x2bxi70l2yf0wi232qksvcscjdpjg8l7dmgg1286vqryyfazfjb";
+    sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx";
   };
 
   buildInputs = [
     python
     unzip
     makeWrapper
-    pythonPackages.boto
-    docker_1_10
-    pythonPackages.kazoo
-    pythonPackages.ntplib
-    pythonPackages.consul
-    pythonPackages.python-etcd
-    pythonPackages.pyyaml
     pythonPackages.requests
+    pythonPackages.psycopg2
+    pythonPackages.psutil
+    pythonPackages.ntplib
     pythonPackages.simplejson
-    pythonPackages.supervisor
-    pythonPackages.tornado
-    pythonPackages.uptime
-  ] ++ extraBuildInputs;
+    pythonPackages.pyyaml
+    pythonPackages.pymongo_2_9_1
+    pythonPackages.python-etcd
+    pythonPackages.consul
+    docker_1_10
+  ];
   propagatedBuildInputs = with pythonPackages; [ python tornado ];
 
   buildCommand = ''
@@ -82,24 +67,6 @@ in stdenv.mkDerivation rec {
     # Move out default conf.d so that /etc/dd-agent/conf.d is used
     mv $out/agent/conf.d $out/agent/conf.d-system
 
-    # Sometime between 5.11.2 and 5.13.2 datadog moved out all its
-    # checks into separate repository. Copy them back in so dd-agent
-    # service can easily pick and choose by copying out configs into
-    # its etc files.
-    mkdir -p $out/agent/checks.d
-    for i in ${toString integrations}/* # */
-    do
-      if [ -f "$i/check.py" ]; then
-        if [ -f "$i/conf.yaml.default" -o -f "$i/conf.yaml.example" ]; then
-          local name=$(basename $i)
-          cp $i/check.py $out/agent/checks.d/$name.py
-          # Copy .default file first unless it doesn't exist then copy .default
-          cp $i/conf.yaml.default $out/agent/conf.d-system/$name.yaml &> /dev/null || \
-            cp $i/conf.yaml.example $out/agent/conf.d-system/$name.yaml
-        fi
-      fi
-    done
-
     cat > $out/bin/dd-jmxfetch <<EOF
     #!/usr/bin/env bash
     exec ${python}/bin/python $out/agent/jmxfetch.py $@
-- 
GitLab


From fcf6989c924c863d46629be89de0dcf1b42bc86d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Sat, 3 Jun 2017 13:30:40 +0200
Subject: [PATCH 0320/1490] inspectrum: unstable-2017-02-18 ->
 unstable-2017-05-31 (#26284)

* Upgrades Inspectrum to new version to work with QT5.8

* inspectrum: also increment version number
---
 pkgs/applications/misc/inspectrum/default.nix | 7 +++----
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix
index 6ec968ecc94..5097496d399 100644
--- a/pkgs/applications/misc/inspectrum/default.nix
+++ b/pkgs/applications/misc/inspectrum/default.nix
@@ -10,14 +10,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "inspectrum-${version}";
-  version = "20170218";
+  name = "inspectrum-unstable-2017-05-31";
 
   src = fetchFromGitHub {
     owner = "miek";
     repo = "inspectrum";
-    rev = "d8d1969a4cceeee0ebfd2f39e791fddd5155d4de";
-    sha256 = "05sarfin9wqkvgwn3fil1r4bay03cwzzhjwbdjslibc5chdrr2cn";
+    rev = "a89d1337efb31673ccb6a6681bb89c21894c76f7";
+    sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51c4248ee79..77db57d110d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14532,7 +14532,7 @@ with pkgs;
     lcms = lcms2;
   };
 
-  inspectrum = callPackage ../applications/misc/inspectrum { };
+  inspectrum = libsForQt5.callPackage ../applications/misc/inspectrum { };
 
   ion3 = callPackage ../applications/window-managers/ion-3 {
     lua = lua5_1;
-- 
GitLab


From 11236d9baaa825bad45a72ff9ee1640da4d2d95e Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 3 Jun 2017 13:49:35 +0200
Subject: [PATCH 0321/1490] pythonPackages.libtmux: 0.6.4 -> 0.7.3

---
 .../python-modules/libtmux/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +---------------
 2 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/libtmux/default.nix

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
new file mode 100644
index 00000000000..203b9e6bf75
--- /dev/null
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytest_29 }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "libtmux";
+  version = "0.7.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "111qbgq28za12la5b0aa9rr7hg8235zy0kyzzryn7fa6z3i5k5z8";
+  };
+
+  buildInputs = [ pytest_29 ];
+  patchPhase = ''
+    sed -i 's/==.*$//' requirements/test.txt
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Scripting library for tmux";
+    homepage = https://libtmux.readthedocs.io/;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6eff8c13d7d..da72a8f1d62 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5516,28 +5516,7 @@ in {
 
   libais = callPackage ../development/python-modules/libais { };
 
-  libtmux = buildPythonPackage rec {
-    name = "libtmux-${version}";
-    version = "0.6.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/libtmux/${name}.tar.gz";
-      sha256 = "0kmw7x8cxb2hj2mzibmg9nxaijhsm1kcm0vdihn99fhm5kw1phh5";
-    };
-
-    buildInputs = with self; [ pytest_29 ];
-    patchPhase = ''
-      sed -i 's/==.*$//' requirements/test.txt
-    '';
-
-    meta = with stdenv.lib; {
-      description = "Scripting library for tmux";
-      homepage = https://libtmux.readthedocs.io/;
-      license = licenses.bsd3;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ jgeerds ];
-    };
-  };
+  libtmux = callPackage ../development/python-modules/libtmux { };
 
   locket = buildPythonPackage rec {
     name = "locket-${version}";
-- 
GitLab


From f4844e91f0be2f9f36c3ece40b5623b29c6e5c6e Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Fri, 2 Jun 2017 20:26:29 -0400
Subject: [PATCH 0322/1490] Add fare to maintainers.

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index db40b36fd6a..7bf7b43df65 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -178,6 +178,7 @@
   exlevan = "Alexey Levan <exlevan@gmail.com>";
   expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";
   fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
+  fare = "Francois-Rene Rideau <fahree@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
-- 
GitLab


From 0886c1b3213da969c9571d17a591e6359ec2507a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 3 Jun 2017 13:11:55 +0100
Subject: [PATCH 0323/1490] wireguard: 0.0.20170517 -> 0.0.20170531

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 10c84948a49..696166f3947 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170517";
+  version = "0.0.20170531";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "7303e973654a3585039f4789e89a562f807f0d6010c7787b9b69ca72aa7a6908";
+    sha256 = "1k6asxx7qzmxasvdwkvlalvav643fqfbndv80vjkbjqxy6mdkdrf";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 4e32f5bda32cd580a7ec731beb381b14bbf2b528 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 3 Jun 2017 09:37:36 -0400
Subject: [PATCH 0324/1490] docbook-xsl: Install dbtoepub

---
 .../data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index a955f5cf8a4..a527765688d 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, ruby }:
 
 let
 
@@ -10,6 +10,8 @@ let
       inherit sha256;
     };
 
+    buildInputs = [ ruby ];
+
     dontBuild = true;
 
     installPhase = ''
@@ -21,6 +23,9 @@ let
       # Backwards compatibility. Will remove eventually.
       mkdir -p $out/xml/xsl
       ln -s $dst $out/xml/xsl/docbook
+
+      ln -sv $dst/epub/bin $out
+      chmod +x $out/bin/dbtoepub
     '';
 
     meta = {
-- 
GitLab


From ede0d138fdbb2bf93ff8ab0a09c3969c189c0d6b Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 3 Jun 2017 13:46:35 +0000
Subject: [PATCH 0325/1490] half: init at 1.12.0

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

diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix
new file mode 100644
index 00000000000..d235c6cb086
--- /dev/null
+++ b/pkgs/development/libraries/half/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  version = "1.12.0";
+  name = "half-${version}";
+
+  src = fetchzip {
+    url = "mirror://sourceforge/half/${version}/half-${version}.zip";
+    sha256 = "0096xiw8nj86vxnn3lfcl94vk9qbi5i8lnydri9ws358ly6002vc";
+    stripRoot = false;
+  };
+
+  buildCommand = ''
+    mkdir -p $out/include $out/share/doc
+    cp $src/include/half.hpp               $out/include/
+    cp $src/{ChangeLog,LICENSE,README}.txt $out/share/doc/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "C++ library for half precision floating point arithmetics";
+    platforms = platforms.all;
+    license = licenses.mit;
+    maintainers = [ maintainers.volth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be01bc6a5a7..dcf644ac8dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2327,6 +2327,8 @@ with pkgs;
 
   hal-flash = callPackage ../os-specific/linux/hal-flash { };
 
+  half = callPackage ../development/libraries/half { };
+
   halibut = callPackage ../tools/typesetting/halibut { };
 
   hardinfo = callPackage ../tools/system/hardinfo { };
-- 
GitLab


From d0b4c5fef7bba8865ac210b7a5ad089ddc419bdb Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 3 Jun 2017 10:33:56 -0400
Subject: [PATCH 0326/1490] Disable travis email notifications.

Travis checks on nixpkgs are a waste of time, if people insist on keeping them they can at least not spam our inboxes
---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2bd784ed30a..a83e0c5c495 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,8 +24,3 @@ matrix:
 env:
     global:
         - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f
-
-notifications:
-    email:
-        on_success: never
-        on_failure: change
-- 
GitLab


From bdb106860a03e9f201dcbd1b6610d351bf454305 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 3 Jun 2017 12:13:29 -0400
Subject: [PATCH 0327/1490] Actually disable travis emails

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a83e0c5c495..8ecd12642a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,3 +24,6 @@ matrix:
 env:
     global:
         - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f
+
+notifications:
+    email: false
-- 
GitLab


From 2bbced71ebb55e14a4105849fb6dd2b53f3fc366 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 3 Jun 2017 19:52:20 +0200
Subject: [PATCH 0328/1490] skypeforlinux: 5.2.0.1 -> 5.3.0.1

---
 .../instant-messengers/skypeforlinux/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index aa89e802cb2..9bad366b8ef 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -4,7 +4,7 @@
 
 let
 
-  version = "5.2.0.1";
+  version = "5.3.0.1";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -24,7 +24,7 @@ let
     gnome2.pango
 
     gnome2.gnome_keyring
-    
+
     libnotify
     nspr
     nss
@@ -49,8 +49,8 @@ let
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_5.2.0.1_amd64.deb";
-        sha256 = "1dwyj5wm2amkysbnzxsskq6sl7rbqggm6n4sabnq7wd5xnbq4i06";
+        url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
+        sha256 = "08sf9nqnznsydw4965w7ixwwba54hjc02ga7vcnz9vpx5hln3nrz";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.system}";
-- 
GitLab


From 5b3c1e8a78d438ce13824b506ae3f4670ad2f50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Sat, 3 Jun 2017 20:32:14 +0200
Subject: [PATCH 0329/1490] pgcli: 1.5.1 -> 1.6.0

---
 pkgs/development/tools/database/pgcli/default.nix | 7 ++++---
 pkgs/top-level/python-packages.nix                | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix
index 2b278e0416f..bcb0cf1d5e4 100644
--- a/pkgs/development/tools/database/pgcli/default.nix
+++ b/pkgs/development/tools/database/pgcli/default.nix
@@ -2,10 +2,10 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "pgcli-${version}";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
-    sha256 = "1wp8pzi9hwz16fpcr0mq3ffydwdscfg5whhzc91757dw995sgl0s";
+    sha256 = "0f1zv4kwi2991pclf8chrhgjwf8jkqxdh5ndc9qx6igh56iyyncz";
     rev = "v${version}";
     repo = "pgcli";
     owner = "dbcli";
@@ -13,7 +13,8 @@ pythonPackages.buildPythonApplication rec {
 
   buildInputs = with pythonPackages; [ pytest mock ];
   checkPhase = ''
-    py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri'
+    mkdir /tmp/homeless-shelter
+    HOME=/tmp/homeless-shelter py.test tests -k 'not test_missing_rc_dir and not test_quoted_db_uri and not test_port_db_uri'
   '';
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e292dbcb0c..1c7ef881804 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17679,17 +17679,18 @@ in {
 
   pgspecial = buildPythonPackage rec {
     pname = "pgspecial";
-    version = "1.7.0";
+    version = "1.8.0";
     name = "${pname}-${version}";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0jnv8mr75pjhj2azb2ljhhkd7s1b0b59f7xps322kqbpmwf26zi9";
+      sha256 = "1dwlv3m4jl34zsakmvxg6hgbfv786jl8dcffxsrlnmcpks829xc9";
     };
 
     buildInputs = with self; [ pytest psycopg2 ];
 
     checkPhase = ''
+      find tests -name \*.pyc -delete
       py.test tests
     '';
 
-- 
GitLab


From a604f14184db07fc502b87538d200d87f98c5fd8 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 3 Jun 2017 20:47:09 +0200
Subject: [PATCH 0330/1490] sqlite3_analyzer: 3.17.0 -> 3.19.2

---
 pkgs/development/libraries/sqlite/sqlite3_analyzer.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
index d450cd21aec..e5fffc076f7 100644
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.17.0";
+  name = "sqlite3_analyzer-3.19.2";
 
   src = fetchurl {
-    url = "https://www.sqlite.org/2017/sqlite-src-3170000.zip";
-    sha256 = "1hs8nzk2pjr4fhhrwcyqwpa24gd4ndp6f0japykg5wfadgp4nxc6";
+    url = "https://www.sqlite.org/2017/sqlite-src-3190200.zip";
+    sha256 = "1hdbs41mdyyy641gix87pllsd29p8dim7gj4qvmiyfra2q5kg749";
   };
 
   nativeBuildInputs = [ unzip ];
-- 
GitLab


From 7567c5c1ee4afde01d798c8419b8a7f89ed081d8 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 3 Jun 2017 20:45:51 +0200
Subject: [PATCH 0331/1490] fetchgit: add postFetch argument

---
 pkgs/build-support/fetchgit/builder.sh  | 1 +
 pkgs/build-support/fetchgit/default.nix | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh
index 4bbef1d6e62..6ae46469738 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@@ -12,4 +12,5 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \
   ${fetchSubmodules:+--fetch-submodules} \
   ${branchName:+--branch-name "$branchName"}
 
+runHook postFetch
 stopNest
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index d85d2c893c5..a5f81ef1794 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -15,6 +15,9 @@ in
 , fetchSubmodules ? true, deepClone ? false
 , branchName ? null
 , name ? urlToName url rev
+, # Shell code executed after the file has been fetched
+  # successfully. This can do things like check or transform the file.
+  postFetch ? ""
 }:
 
 /* NOTE:
@@ -54,7 +57,7 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = sha256;
 
-  inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
+  inherit url rev leaveDotGit fetchSubmodules deepClone branchName postFetch;
 
   GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
-- 
GitLab


From 045515a54a25a30e98b4c1f8f7945473930be2dc Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sat, 3 Jun 2017 19:57:35 +0100
Subject: [PATCH 0332/1490] jenkins: 2.62 -> 2.63

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 2c1a8135012..db7002d163e 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.62";
+  version = "2.63";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "1dqmvbl5sa82zsc03ns5i7ppjmdlg3pyk676xjxyr0p5ccbqlxxh";
+    sha256 = "024bzbca2ikk3904df4f8ri37qjq7nzzmg58jax8cbvcbxcik699";
   };
 
   buildCommand = ''
-- 
GitLab


From b96ba3a17a3b589f0124a27e64446cee7702680c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sat, 3 Jun 2017 21:06:20 +0200
Subject: [PATCH 0333/1490] libgcrypt: 1.7.6 -> 1.7.7

See https://lists.gnu.org/archive/html/info-gnu/2017-06/msg00001.html
for release announcement.
---
 pkgs/development/libraries/libgcrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index fc2c859a5f8..1903787149c 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   name = "libgcrypt-${version}";
-  version = "1.7.6";
+  version = "1.7.7";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "1g05prhgqw4ryd0w433q8nhds0h93kf47hfjagi2r7dghkpaysk2";
+    sha256 = "16ndaj93asw122mwjz172x2ilpm03w1yp5mqcrp3xslk0yx5xf5r";
   };
 
   outputs = [ "out" "dev" "info" ];
-- 
GitLab


From a81f45386b21b3c430f94c2ad5c5e1f7c58cbef2 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <github@sub.monoid.al>
Date: Sat, 3 Jun 2017 20:35:37 +0100
Subject: [PATCH 0334/1490] fetchdarcs: Use NIX_SSL_CERT_FILE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`SSL_CERT_FILE` has been replaced with `NIX_SSL_CERT_FILE`.

Before this change using `fetchdarcs` resulted in an error message like:

```
Identifying repository http://hub.darcs.net/scravy/easyplot inventory

darcs failed:  Not a repository: http://hub.darcs.net/scravy/easyplot (Peer certificate cannot be authenticated with given CA certificates)

HINT: Do you have the right URI for the repository?

builder for ‘/nix/store/imyvcs6lvb5yva66krc5wk39931sam8v-fetchdarcs.drv’ failed with exit code 2
```
---
 pkgs/build-support/fetchdarcs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix
index c28cc35219c..2df1b136c55 100644
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/pkgs/build-support/fetchdarcs/default.nix
@@ -7,7 +7,7 @@ if md5 != "" then
 else
 stdenv.mkDerivation {
   name = "fetchdarcs";
-  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+  NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
   builder = ./builder.sh;
   buildInputs = [darcs];
 
-- 
GitLab


From 6f8f50fae2c82e779ab55cbfe54befdc75f79357 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 3 Jun 2017 15:55:17 -0400
Subject: [PATCH 0335/1490] libinput: 1.5.1 -> 1.7.2

Changelogs:

1.5.2: https://lists.freedesktop.org/archives/wayland-devel/2016-November/031926.html
1.5.3: https://lists.freedesktop.org/archives/wayland-devel/2016-December/032110.html
1.5.5: https://lists.freedesktop.org/archives/wayland-devel/2017-January/032610.html
1.6.0: https://lists.freedesktop.org/archives/wayland-devel/2017-January/032746.html
1.6.1: https://lists.freedesktop.org/archives/wayland-devel/2017-February/032940.html
1.6.2: https://lists.freedesktop.org/archives/wayland-devel/2017-February/033169.html
1.6.3: https://lists.freedesktop.org/archives/wayland-devel/2017-March/033377.html
1.7.0: https://lists.freedesktop.org/archives/wayland-devel/2017-March/033531.html
1.7.1: https://lists.freedesktop.org/archives/wayland-devel/2017-April/033962.html
1.7.2: https://lists.freedesktop.org/archives/wayland-devel/2017-May/034037.html

Lots of fixes, most notably around trackpad support on high-dpi
systems.
---
 pkgs/development/libraries/libinput/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index f0257ed8a44..17950b383bb 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -17,11 +17,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.5.1";
+  version = "1.7.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "d4f63933b0967bd691735af5e3919e2d29c2121d4e05867cc4e10ff3ae8e2dd8";
+    sha256 = "0b1e5a6c106ccc609ccececd9e33e6b27c8b01fc7457ddb4c1dd266e780d6bc2";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 62653064a0dee52810bc6c5b1d68dc55368d7115 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 3 Jun 2017 22:50:33 +0200
Subject: [PATCH 0336/1490] gollum: 4.0.1 -> 4.1.1

---
 pkgs/applications/misc/gollum/Gemfile.lock |  57 ++++---
 pkgs/applications/misc/gollum/default.nix  |  13 +-
 pkgs/applications/misc/gollum/gemset.nix   | 176 +++++++++++----------
 3 files changed, 136 insertions(+), 110 deletions(-)

diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 074a0c6fa43..4322b408843 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -2,48 +2,53 @@ GEM
   remote: https://rubygems.org/
   specs:
     charlock_holmes (0.7.3)
-    diff-lcs (1.2.5)
-    github-markup (1.3.3)
-    gitlab-grit (2.7.3)
+    diff-lcs (1.3)
+    gemojione (3.2.0)
+      json
+    github-markup (1.6.0)
+    gitlab-grit (2.8.1)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
+      mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
-    gollum (4.0.1)
+    gollum (4.1.1)
+      gemojione (~> 3.2)
       gollum-lib (~> 4.0, >= 4.0.1)
-      kramdown (~> 1.8.0)
+      kramdown (~> 1.9.0)
       mustache (>= 0.99.5, < 1.0.0)
       sinatra (~> 1.4, >= 1.4.4)
-      useragent (~> 0.14.0)
-    gollum-grit_adapter (1.0.0)
+      useragent (~> 0.16.2)
+    gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.1.0)
-      github-markup (~> 1.3.3)
+    gollum-lib (4.2.5)
+      gemojione (~> 3.2)
+      github-markup (~> 1.6)
       gollum-grit_adapter (~> 1.0)
       nokogiri (~> 1.6.4)
-      rouge (~> 1.9)
-      sanitize (~> 2.1.0)
-      stringex (~> 2.5.1)
-    kramdown (1.8.0)
-    mime-types (1.25.1)
-    mini_portile2 (2.0.0)
+      rouge (~> 2.0)
+      sanitize (~> 2.1)
+      stringex (~> 2.6)
+    json (2.1.0)
+    kramdown (1.9.0)
+    mime-types (2.99.3)
+    mini_portile2 (2.1.0)
     mustache (0.99.8)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    posix-spawn (0.3.11)
-    rack (1.6.4)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    posix-spawn (0.3.13)
+    rack (1.6.8)
     rack-protection (1.5.3)
       rack
-    rouge (1.10.1)
+    rouge (2.0.7)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sinatra (1.4.7)
+    sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    stringex (2.5.2)
-    tilt (2.0.2)
-    useragent (0.14.0)
+    stringex (2.7.1)
+    tilt (2.0.7)
+    useragent (0.16.8)
 
 PLATFORMS
   ruby
@@ -52,4 +57,4 @@ DEPENDENCIES
   gollum
 
 BUNDLED WITH
-   1.10.6
+   1.15.0
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 1f3cc9e27c0..db401a2dbdc 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -1,16 +1,21 @@
-{ stdenv, lib, bundlerEnv, ruby_2_2, icu, zlib }:
+{ stdenv, lib, bundlerEnv, ruby
+, icu, zlib }:
 
 bundlerEnv rec {
   name = "gollum-${version}";
-  version = "4.0.1";
+  version = (import gemset).gollum.version;
 
-  ruby = ruby_2_2;
+  inherit ruby;
   gemdir = ./.;
+  gemset = ./gemset.nix;
+
+  # FIXME: Add Git as runtime dependency.
 
   meta = with lib; {
     description = "A simple, Git-powered wiki";
+    homepage = "https://github.com/gollum/gollum";
     license = licenses.mit;
-    maintainers = with maintainers; [ jgillich ];
+    maintainers = with maintainers; [ jgillich primeos ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index f0c71fa455c..2ad724b2bc7 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -1,170 +1,186 @@
 {
-  useragent = {
-    version = "0.14.0";
+  charlock_holmes = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "124r3mgkw1zjymsqq9r25zh1vwjrjgiji5fm620z53lpmmryj22j";
+      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
+      type = "gem";
     };
+    version = "0.7.3";
   };
-  tilt = {
-    version = "2.0.2";
+  diff-lcs = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84";
+      sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
+      type = "gem";
     };
+    version = "1.3";
   };
-  stringex = {
-    version = "2.5.2";
+  gemojione = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17";
+      sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik";
+      type = "gem";
     };
+    version = "3.2.0";
   };
-  sinatra = {
-    version = "1.4.7";
+  github-markup = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp";
+      sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9";
+      type = "gem";
     };
+    version = "1.6.0";
   };
-  sanitize = {
-    version = "2.1.0";
+  gitlab-grit = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+      sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
+      type = "gem";
     };
+    version = "2.8.1";
   };
-  rouge = {
-    version = "1.10.1";
+  gollum = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
+      sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s";
+      type = "gem";
     };
+    version = "4.1.1";
   };
-  rack-protection = {
-    version = "1.5.3";
+  gollum-grit_adapter = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+      sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
+      type = "gem";
     };
+    version = "1.0.1";
   };
-  rack = {
-    version = "1.6.4";
+  gollum-lib = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
+      sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z";
+      type = "gem";
     };
+    version = "4.2.5";
   };
-  posix-spawn = {
-    version = "0.3.11";
+  json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
       type = "gem";
+    };
+    version = "2.1.0";
+  };
+  kramdown = {
+    source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
+      sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0";
+      type = "gem";
     };
+    version = "1.9.0";
   };
-  nokogiri = {
-    version = "1.6.7.2";
+  mime-types = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
       type = "gem";
+    };
+    version = "2.99.3";
+  };
+  mini_portile2 = {
+    source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv";
+      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
+      type = "gem";
     };
+    version = "2.1.0";
   };
   mustache = {
-    version = "0.99.8";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2";
+      type = "gem";
     };
+    version = "0.99.8";
   };
-  mini_portile2 = {
-    version = "2.0.0";
+  nokogiri = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
+      sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj";
+      type = "gem";
     };
+    version = "1.6.8.1";
   };
-  mime-types = {
-    version = "1.25.1";
+  posix-spawn = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+      sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw";
+      type = "gem";
     };
+    version = "0.3.13";
   };
-  kramdown = {
-    version = "1.8.0";
+  rack = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0ryqq055h5n10c1cfba6pxsssa907l2hkw29anp0d41ryh47ca2l";
+      sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza";
+      type = "gem";
     };
+    version = "1.6.8";
   };
-  gollum-lib = {
-    version = "4.1.0";
+  rack-protection = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm";
+      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+      type = "gem";
     };
+    version = "1.5.3";
   };
-  gollum-grit_adapter = {
-    version = "1.0.0";
+  rouge = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7";
+      sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
+      type = "gem";
     };
+    version = "2.0.7";
   };
-  gollum = {
-    version = "4.0.1";
+  sanitize = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "02pgx083sns75zgnqx94p5h5bpr7cfiw5mys4ayb4k33hcjm6ydg";
+      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+      type = "gem";
     };
+    version = "2.1.0";
   };
-  gitlab-grit = {
-    version = "2.7.3";
+  sinatra = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b";
+      sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
+      type = "gem";
     };
+    version = "1.4.8";
   };
-  github-markup = {
-    version = "1.3.3";
+  stringex = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq";
+      sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv";
+      type = "gem";
     };
+    version = "2.7.1";
   };
-  diff-lcs = {
-    version = "1.2.5";
+  tilt = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
+      sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b";
+      type = "gem";
     };
+    version = "2.0.7";
   };
-  charlock_holmes = {
-    version = "0.7.3";
+  useragent = {
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
+      sha256 = "1139cjqyv1hk1qcw89k81ajjkqyakqgbcyvmfrsmjqi8yn9kgqhq";
+      type = "gem";
     };
+    version = "0.16.8";
   };
 }
\ No newline at end of file
-- 
GitLab


From 0dc54737306051cf8649394b96f5e9513616fa8b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 26 May 2017 03:47:08 +0300
Subject: [PATCH 0337/1490] gcc7: init at 7.1.0

---
 pkgs/development/compilers/gcc/7/default.nix | 551 +++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  15 +
 2 files changed, 566 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/7/default.nix

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
new file mode 100644
index 00000000000..a14fc0ce246
--- /dev/null
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -0,0 +1,551 @@
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langFortran ? false
+, langObjC ? stdenv.isDarwin
+, langObjCpp ? stdenv.isDarwin
+, langJava ? false
+, langAda ? false
+, langVhdl ? false
+, langGo ? false
+, profiledCompiler ? false
+, staticCompiler ? false
+, enableShared ? true
+, texinfo ? null
+, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, gmp, mpfr, libmpc, gettext, which
+, libelf                      # optional, for link-time optimizations (LTO)
+, isl ? null # optional, for the Graphite optimization framework.
+, zlib ? null, boehmgc ? null
+, zip ? null, unzip ? null, pkgconfig ? null
+, gtk2 ? null, libart_lgpl ? null
+, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
+, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
+, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
+, x11Support ? langJava
+, gnatboot ? null
+, enableMultilib ? false
+, enablePlugin ? true             # whether to support user-supplied plug-ins
+, name ? "gcc"
+, cross ? null
+, libcCross ? null
+, crossStageStatic ? true
+, gnat ? null
+, libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
+, stripped ? true
+, gnused ? null
+, binutils ? null
+, cloog # unused; just for compat with gcc4, as we override the parameter on some places
+, darwin ? null
+, flex ? null
+, buildPlatform, hostPlatform, targetPlatform
+}:
+
+assert langJava     -> zip != null && unzip != null
+                       && zlib != null && boehmgc != null
+                       && perl != null;  # for `--enable-java-home'
+assert langAda      -> gnatboot != null;
+assert langVhdl     -> gnat != null;
+
+# LTO needs libelf and zlib.
+assert libelf != null -> zlib != null;
+
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
+# Need c++filt on darwin
+assert stdenv.isDarwin -> binutils != null;
+
+# The go frontend is written in c++
+assert langGo -> langCC;
+
+with stdenv.lib;
+with builtins;
+
+let version = "7.1.0";
+
+    # Whether building a cross-compiler for GNU/Hurd.
+    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+
+    enableParallelBuilding = true;
+
+    patches =
+      [ ]
+      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional noSysDirs ../no-sys-dirs.patch
+      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
+      # target libraries and tools.
+      ++ optional langAda ../gnat-cflags.patch
+      ++ optional langFortran ../gfortran-driving.patch;
+
+    javaEcj = fetchurl {
+      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
+      # `configure' time.
+
+      # XXX: Eventually we might want to take it from upstream.
+      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
+      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
+    };
+
+    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
+    # binary distribution here to allow the whole chain to be bootstrapped.
+    javaAntlr = fetchurl {
+      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
+      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
+    };
+
+    xlibs = [
+      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
+      xproto renderproto xextproto inputproto randrproto
+    ];
+
+    javaAwtGtk = langJava && x11Support;
+
+    /* Platform flags */
+    platformFlags = let
+        gccArch = stdenv.platform.gcc.arch or null;
+        gccCpu = stdenv.platform.gcc.cpu or null;
+        gccAbi = stdenv.platform.gcc.abi or null;
+        gccFpu = stdenv.platform.gcc.fpu or null;
+        gccFloat = stdenv.platform.gcc.float or null;
+        gccMode = stdenv.platform.gcc.mode or null;
+        withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+        withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+        withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode;
+
+    /* Cross-gcc settings */
+    crossMingw = cross != null && cross.libc == "msvcrt";
+    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossConfigureFlags = let
+        gccArch = targetPlatform.gcc.arch or null;
+        gccCpu = targetPlatform.gcc.cpu or null;
+        gccAbi = targetPlatform.gcc.abi or null;
+        gccFpu = targetPlatform.gcc.fpu or null;
+        gccFloat = targetPlatform.gcc.float or null;
+        gccMode = targetPlatform.gcc.mode or null;
+        withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
+        withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
+        withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        "--target=${cross.config}" +
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode +
+        # Ensure that -print-prog-name is able to find the correct programs.
+        " --with-as=${binutils}/bin/${cross.config}-as" +
+        " --with-ld=${binutils}/bin/${cross.config}-ld" +
+        (if crossMingw && crossStageStatic then
+          " --with-headers=${libcCross}/include" +
+          " --with-gcc" +
+          " --with-gnu-as" +
+          " --with-gnu-ld" +
+          " --with-gnu-ld" +
+          " --disable-shared" +
+          " --disable-nls" +
+          " --disable-debug" +
+          " --enable-sjlj-exceptions" +
+          " --enable-threads=win32" +
+          " --disable-win32-registry"
+          else if crossStageStatic then
+          " --disable-libssp --disable-nls" +
+          " --without-headers" +
+          " --disable-threads " +
+          " --disable-libgomp " +
+          " --disable-libquadmath" +
+          " --disable-shared" +
+          " --disable-libatomic " +  # libatomic requires libc
+          " --disable-decimal-float" # libdecnumber requires libc
+          else
+          (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"
+           else                " --with-headers=${getDev libcCross}/include") +
+          # Ensure that -print-prog-name is able to find the correct programs.
+          " --enable-__cxa_atexit" +
+          " --enable-long-long" +
+          (if crossMingw then
+            " --enable-threads=win32" +
+            " --enable-sjlj-exceptions" +
+            " --enable-hash-synchronization" +
+            " --disable-libssp" +
+            " --disable-nls" +
+            " --with-dwarf2" +
+            # I think noone uses shared gcc libs in mingw, so we better do the same.
+            # In any case, mingw32 g++ linking is broken by default with shared libs,
+            # unless adding "-lsupc++" to any linking command. I don't know why.
+            " --disable-shared" +
+            # To keep ABI compatibility with upstream mingw-w64
+            " --enable-fully-dynamic-string"
+            else (if cross.libc == "uclibc" then
+              # libsanitizer requires netrom/netrom.h which is not
+              # available in uclibc.
+              " --disable-libsanitizer" +
+              # In uclibc cases, libgomp needs an additional '-ldl'
+              # and as I don't know how to pass it, I disable libgomp.
+              " --disable-libgomp" else "") +
+            " --enable-threads=posix" +
+            " --enable-nls" +
+            " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
+          );
+    stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
+    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+
+  bootstrap = cross == null;
+
+in
+
+# We need all these X libraries when building AWT with GTK+.
+assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
+
+stdenv.mkDerivation ({
+  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+
+  builder = ../builder.sh;
+
+  src = fetchurl {
+    url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.bz2";
+    sha256 = "05xwps0ci7wgxh50askpa2r9p8518qxdgh6ad7pnyk7n6p13d0ca";
+  };
+
+  inherit patches;
+
+  outputs = [ "out" "lib" "man" "info" ];
+  setOutputFlags = false;
+  NIX_NO_SELF_RPATH = true;
+
+  libc_dev = stdenv.cc.libc_dev;
+
+  hardeningDisable = [ "format" ];
+
+  postPatch =
+    if (stdenv.isHurd
+        || (libcCross != null                  # e.g., building `gcc.crossDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
+        || (crossGNU && libcCross != null))
+    then
+      # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
+      # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
+      let
+        libc = if libcCross != null then libcCross else stdenv.glibc;
+        gnu_h = "gcc/config/gnu.h";
+        extraCPPDeps =
+             libc.propagatedBuildInputs
+          ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
+          ++ stdenv.lib.optional (libpthread != null) libpthread;
+        extraCPPSpec =
+          concatStrings (intersperse " "
+                          (map (x: "-I${x.dev or x}/include") extraCPPDeps));
+        extraLibSpec =
+          if libpthreadCross != null
+          then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
+          else "-L${libpthread}/lib";
+      in
+        '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
+
+           echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
+        ''
+    else if cross != null || stdenv.cc.libc != null then
+      # On NixOS, use the right path to the dynamic linker instead of
+      # `/lib/ld*.so'.
+      let
+        libc = if libcCross != null then libcCross else stdenv.cc.libc;
+      in
+        '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
+           for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+           do
+             grep -q LIBC_DYNAMIC_LINKER "$header" || continue
+             echo "  fixing \`$header'..."
+             sed -i "$header" \
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
+           done
+        ''
+    else null;
+
+  inherit noSysDirs staticCompiler langJava crossStageStatic
+    libcCross crossMingw;
+
+  nativeBuildInputs = [ texinfo which gettext ]
+    ++ (optional (perl != null) perl)
+    ++ (optional javaAwtGtk pkgconfig);
+
+  buildInputs = [ gmp mpfr libmpc libelf flex ]
+    ++ (optional (isl != null) isl)
+    ++ (optional (zlib != null) zlib)
+    ++ (optionals langJava [ boehmgc zip unzip ])
+    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
+    ++ (optionals (cross != null) [binutils])
+    ++ (optionals langAda [gnatboot])
+    ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
+    ++ (optional stdenv.isDarwin binutils)
+    ;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
+
+  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+    export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+    export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+    export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+    export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+  '';
+
+  dontDisableStatic = true;
+
+  configureFlags = "
+    ${if stdenv.isSunOS then
+      " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
+      # On Illumos/Solaris GNU as is preferred
+      " --with-gnu-as --without-gnu-ld "
+      else ""}
+    --enable-lto
+    ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
+    ${if enableShared then "" else "--disable-shared"}
+    ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
+    ${optionalString (isl != null) "--with-isl=${isl}"}
+    ${if langJava then
+      "--with-ecj-jar=${javaEcj} " +
+
+      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
+      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
+      "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre "
+      else ""}
+    ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+    ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
+    --with-gmp-include=${gmp.dev}/include
+    --with-gmp-lib=${gmp.out}/lib
+    --with-mpfr-include=${mpfr.dev}/include
+    --with-mpfr-lib=${mpfr.out}/lib
+    --with-mpc=${libmpc}
+    ${if libelf != null then "--with-libelf=${libelf}" else ""}
+    --disable-libstdcxx-pch
+    --without-included-gettext
+    --with-system-zlib
+    --enable-static
+    --enable-languages=${
+      concatStrings (intersperse ","
+        (  optional langC        "c"
+        ++ optional langCC       "c++"
+        ++ optional langFortran  "fortran"
+        ++ optional langJava     "java"
+        ++ optional langAda      "ada"
+        ++ optional langVhdl     "vhdl"
+        ++ optional langGo       "go"
+        ++ optional langObjC     "objc"
+        ++ optional langObjCpp   "obj-c++"
+        ++ optionals crossDarwin [ "objc" "obj-c++" ]
+        )
+      )
+    }
+    ${if cross == null
+      then if stdenv.isDarwin
+        then " --with-native-system-header-dir=${darwin.usr-include}"
+        else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
+      else ""}
+    ${if langAda then " --enable-libada" else ""}
+    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
+    ${if cross != null then crossConfigureFlags else ""}
+    ${if !bootstrap then "--disable-bootstrap" else ""}
+    ${if cross == null then platformFlags else ""}
+  ";
+
+  targetConfig = if cross != null then cross.config else null;
+
+  buildFlags = if bootstrap then
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap")
+    else "";
+
+  installTargets =
+    if stripped
+    then "install-strip"
+    else "install";
+
+  crossAttrs = let
+    xgccArch = targetPlatform.gcc.arch or null;
+    xgccCpu = targetPlatform.gcc.cpu or null;
+    xgccAbi = targetPlatform.gcc.abi or null;
+    xgccFpu = targetPlatform.gcc.fpu or null;
+    xgccFloat = targetPlatform.gcc.float or null;
+    xwithArch = if xgccArch != null then " --with-arch=${xgccArch}" else "";
+    xwithCpu = if xgccCpu != null then " --with-cpu=${xgccCpu}" else "";
+    xwithAbi = if xgccAbi != null then " --with-abi=${xgccAbi}" else "";
+    xwithFpu = if xgccFpu != null then " --with-fpu=${xgccFpu}" else "";
+    xwithFloat = if xgccFloat != null then " --with-float=${xgccFloat}" else "";
+  in {
+    AR = "${targetPlatform.config}-ar";
+    LD = "${targetPlatform.config}-ld";
+    CC = "${targetPlatform.config}-gcc";
+    CXX = "${targetPlatform.config}-gcc";
+    AR_FOR_TARGET = "${targetPlatform.config}-ar";
+    LD_FOR_TARGET = "${targetPlatform.config}-ld";
+    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
+    NM_FOR_TARGET = "${targetPlatform.config}-nm";
+    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
+    # If we are making a cross compiler, cross != null
+    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    dontStrip = true;
+    configureFlags = ''
+      ${if enableMultilib then "" else "--disable-multilib"}
+      ${if enableShared then "" else "--disable-shared"}
+      ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
+      ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+      ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
+      --with-gmp=${gmp.crossDrv}
+      --with-mpfr=${mpfr.crossDrv}
+      --with-mpc=${libmpc.crossDrv}
+      --disable-libstdcxx-pch
+      --without-included-gettext
+      --with-system-zlib
+      --enable-languages=${
+        concatStrings (intersperse ","
+          (  optional langC        "c"
+          ++ optional langCC       "c++"
+          ++ optional langFortran  "fortran"
+          ++ optional langJava     "java"
+          ++ optional langAda      "ada"
+          ++ optional langVhdl     "vhdl"
+          ++ optional langGo       "go"
+          )
+        )
+      }
+      ${if langAda then " --enable-libada" else ""}
+      --target=${targetPlatform.config}
+      ${xwithArch}
+      ${xwithCpu}
+      ${xwithAbi}
+      ${xwithFpu}
+      ${xwithFloat}
+    '';
+    buildFlags = "";
+  };
+
+
+  # Needed for the cross compilation to work
+  AR = "ar";
+  LD = "ld";
+  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";
+
+  # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find
+  # the library headers and binaries, regarless of the language being
+  # compiled.
+
+  # Note: When building the Java AWT GTK+ peer, the build system doesn't
+  # honor `--with-gmp' et al., e.g., when building
+  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just
+  # add them to $CPATH and $LIBRARY_PATH in this case.
+  #
+  # Likewise, the LTO code doesn't find zlib.
+
+  CPATH = makeSearchPathOutput "dev" "include" ([]
+    ++ optional (zlib != null) zlib
+    ++ optional langJava boehmgc
+    ++ optionals javaAwtGtk xlibs
+    ++ optionals javaAwtGtk [ gmp mpfr ]
+    ++ optional (libpthread != null) libpthread
+    ++ optional (libpthreadCross != null) libpthreadCross
+
+    # On GNU/Hurd glibc refers to Mach & Hurd
+    # headers.
+    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")
+                 libcCross.propagatedBuildInputs);
+
+  LIBRARY_PATH = makeLibraryPath ([]
+    ++ optional (zlib != null) zlib
+    ++ optional langJava boehmgc
+    ++ optionals javaAwtGtk xlibs
+    ++ optionals javaAwtGtk [ gmp mpfr ]
+    ++ optional (libpthread != null) libpthread);
+
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null then [
+        "-idirafter ${getDev libcCross}/include"
+      ]
+      ++ optionals (! crossStageStatic) [
+        "-B${libcCross.out}/lib"
+      ]
+    else null;
+
+  EXTRA_TARGET_LDFLAGS =
+    if cross != null && libcCross != null then [
+        "-Wl,-L${libcCross.out}/lib"
+      ]
+      ++ (if crossStageStatic then [
+        "-B${libcCross.out}/lib"
+      ] else [
+        "-Wl,-rpath,${libcCross.out}/lib"
+        "-Wl,-rpath-link,${libcCross.out}/lib"
+      ])
+      ++ optionals (libpthreadCross != null) [
+        "-L${libpthreadCross}/lib"
+        "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
+      ]
+    else null;
+
+  passthru =
+    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+
+  inherit enableParallelBuilding enableMultilib;
+
+  inherit (stdenv) is64bit;
+
+  meta = {
+    homepage = http://gcc.gnu.org/;
+    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    description = "GNU Compiler Collection, version ${version}"
+      + (if stripped then "" else " (with debugging info)");
+
+    longDescription = ''
+      The GNU Compiler Collection includes compiler front ends for C, C++,
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
+      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+
+      GCC development is a part of the GNU Project, aiming to improve the
+      compiler used in the GNU system including the GNU/Linux variant.
+    '';
+
+    maintainers = with stdenv.lib.maintainers; [ ];
+
+    # gnatboot is not available out of linux platforms, so we disable the darwin build
+    # for the gnat (ada compiler).
+    platforms =
+      stdenv.lib.platforms.linux ++
+      stdenv.lib.platforms.freebsd ++
+      optionals (langAda == false) stdenv.lib.platforms.darwin;
+  };
+}
+
+// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+  makeFlags = [ "all-gcc" "all-target-libgcc" ];
+  installTargets = "install-gcc install-target-libgcc";
+}
+
+# Strip kills static libs of other archs (hence cross != null)
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+
+// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcf644ac8dd..ad0cfb1bad5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5261,6 +5261,21 @@ with pkgs;
     isl = if !stdenv.isDarwin then isl_0_14 else null;
   }));
 
+  gcc7 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/7 {
+    inherit noSysDirs;
+
+    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
+    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+
+    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if targetPlatform != buildPlatform then libcCross else null;
+
+    isl = if !stdenv.isDarwin then isl_0_17 else null;
+  }));
+
   gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot {
     inherit noSysDirs;
 
-- 
GitLab


From d0074286212761d27b86386681e09a4a844a1efc Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 3 Jun 2017 17:34:31 -0400
Subject: [PATCH 0338/1490] dex: init at 2.4.1

There is already another thing called "dex" that manipulates .desktop
files, so I called this one "dex-oidc" in all-packages.nix.
---
 pkgs/servers/dex/default.nix    | 32 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/servers/dex/default.nix

diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix
new file mode 100644
index 00000000000..119d5f03f62
--- /dev/null
+++ b/pkgs/servers/dex/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+let version = "2.4.1"; in
+
+buildGoPackage rec {
+  name = "dex-${version}";
+
+  goPackagePath = "github.com/coreos/dex";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "coreos";
+    repo = "dex";
+    sha256 = "11qpn3wh74mq16xgl9l50n2v02ffqcd14xccf77j5il04xr764nx";
+  };
+
+  subPackages = [
+    "cmd/dex"
+  ];
+
+  buildFlagsArray = [
+    "-ldflags=-w -X ${goPackagePath}/version.Version=${src.rev}"
+  ];
+
+  meta = {
+    description = "OpenID Connect and OAuth2 identity provider with pluggable connectors";
+    license = lib.licenses.asl20;
+    homepage = https://github.com/coreos/dex;
+    maintainers = with lib.maintainers; [benley];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a4864faa6d..23f8cc17494 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10871,6 +10871,8 @@ with pkgs;
 
   couchpotato = callPackage ../servers/couchpotato {};
 
+  dex-oidc = callPackage ../servers/dex { };
+
   dico = callPackage ../servers/dico { };
 
   dict = callPackage ../servers/dict {
-- 
GitLab


From 2d0a7c4eeecd22f26eb37f6077a0397c32250375 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 27 May 2017 20:44:00 +0300
Subject: [PATCH 0339/1490] aliases: don't distribute on Hydra

---
 lib/meta.nix               |  5 +++++
 pkgs/top-level/aliases.nix | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index ae652e579c3..8f77bbe0148 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -17,6 +17,11 @@ rec {
     drv // { meta = (drv.meta or {}) // newAttrs; };
 
 
+  /* Disable Hydra builds of given derivation.
+  */
+  dontDistribute = drv: addMetaAttrs { hydraPlatforms = []; } drv;
+
+
   /* Change the symbolic name of a package for presentation purposes
      (i.e., so that nix-env users can tell them apart).
   */
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7fb271682d0..a14732fb859 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -5,18 +5,25 @@ with self;
 let
   # Removing recurseForDerivation prevents derivations of aliased attribute
   # set to appear while listing all the packages available.
-  removeRecurseForDerivations = _n: alias: with lib;
+  removeRecurseForDerivations = alias: with lib;
     if alias.recurseForDerivations or false then
       removeAttrs alias ["recurseForDerivations"]
     else alias;
 
-  doNotDisplayTwice = aliases:
-    lib.mapAttrs removeRecurseForDerivations aliases;
+  # Disabling distribution prevents top-level aliases for non-recursed package
+  # sets from building on Hydra.
+  removeDistribute = alias: with lib;
+    if isDerivation alias then
+      dontDistribute alias
+    else alias;
+
+  mapAliases = aliases:
+    lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations alias)) aliases;
 in
 
   ### Deprecated aliases - for backward compatibility
 
-doNotDisplayTwice rec {
+mapAliases (rec {
   accounts-qt = libsForQt5.accounts-qt;  # added 2015-12-19
   adobeReader = adobe-reader;
   aircrackng = aircrack-ng; # added 2016-01-14
@@ -156,4 +163,4 @@ doNotDisplayTwice rec {
   ocaml_4_02   = ocamlPackages_4_02.ocaml;
   ocaml_4_03   = ocamlPackages_4_03.ocaml;
   ocaml        = ocamlPackages.ocaml;
-})
+}))
-- 
GitLab


From e7530e6a5a1d8858e48f1a2c7ea90a5b6aba9478 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 27 May 2017 14:12:36 +0300
Subject: [PATCH 0340/1490] wine: reorganize packages

Move most of wine configurations to winePackages which is not built on Hydra.
Leave two top-level packages:

wine: stable release with an "office" configuration;
wineStaging: staging release with a "full" configuration.
---
 pkgs/applications/audio/airwave/default.nix |  5 +-
 pkgs/misc/emulators/wine/base.nix           | 10 ++-
 pkgs/top-level/aliases.nix                  |  6 ++
 pkgs/top-level/all-packages.nix             | 94 ++++++++++++---------
 4 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix
index 39946fd5c7d..5a6901a9434 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/applications/audio/airwave/default.nix
@@ -1,5 +1,5 @@
 { stdenv, cmake, fetchFromGitHub, file, gcc_multi, libX11, makeWrapper
-, overrideCC, qt5, requireFile, unzip, wineStable
+, overrideCC, qt5, requireFile, unzip, wine
 }:
 
 let
@@ -26,7 +26,8 @@ let
     installPhase = "cp -r . $out";
   };
 
-  wine-wow64 = wineStable.override {
+  wine-wow64 = wine.override {
+    wineRelease = "stable";
     wineBuild = "wineWow";
   };
 
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 80070dec2d9..92815ffaa0a 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -91,9 +91,13 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
           ((map (links "share/wine/gecko") geckos)
         ++ (map (links "share/wine/mono")  monos))}
   '' + lib.optionalString supportFlags.gstreamerSupport ''
-    wrapProgram "$out/bin/wine" \
-      --argv0 "" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
+    for i in wine wine64; do
+      if [ -e "$out/bin/$i" ]; then
+        wrapProgram "$out/bin/$i" \
+          --argv0 "" \
+          --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
+      fi
+    done
   '';
   
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a14732fb859..c47e3fe325b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -148,6 +148,12 @@ mapAliases (rec {
   xlibs = xorg; # added 2015-09
   youtubeDL = youtube-dl;  # added 2014-10-26
 
+  # added 2017-05-27
+  wineMinimal = winePackages.minimal;
+  wineFull = winePackages.full;
+  wineStable = winePackages.stable;
+  wineUnstable = winePackages.unstable;
+
   inherit (ocaml-ng) # added 2016-09-14
     ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1
     ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fabc84c569..a579ea3f587 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18640,49 +18640,59 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  wineMinimal = callPackage ../misc/emulators/wine {
-    wineRelease = config.wine.release or "stable";
-    wineBuild = config.wine.build or "wine32";
-  };
-  wine = lowPrio (self.wineMinimal.override {
-    pngSupport = true;
-    jpegSupport = true;
-    tiffSupport = true;
-    gettextSupport = true;
-    fontconfigSupport = true;
-    alsaSupport = true;
-    openglSupport = true;
-    tlsSupport = true;
-    cupsSupport = true;
-    colorManagementSupport = true;
-    dbusSupport = true;
-    mpg123Support = true;
-    openalSupport = true;
-    cairoSupport = true;
-    cursesSupport = true;
-    pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
-    xineramaSupport = true;
-    xmlSupport = true;
-  });
-  wineFull = lowPrio (self.wine.override {
-    gtkSupport = true;
-    gstreamerSupport = true;
-    openclSupport = true;
-    odbcSupport = true;
-    netapiSupport = true;
-    vaSupport = true;
-    pcapSupport = true;
-    v4lSupport = true;
-    saneSupport = true;
-    gsmSupport = true;
-    gphoto2Support = true;
-    ldapSupport = true;
-    pulseaudioSupport = true;
-    udevSupport = true;
+  winePackages = rec {
+    minimal = callPackage ../misc/emulators/wine {
+      wineRelease = config.wine.release or "stable";
+      wineBuild = config.wine.build or "wine32";
+    };
+
+    base = minimal.override {
+      pngSupport = true;
+      jpegSupport = true;
+      tiffSupport = true;
+      gettextSupport = true;
+      fontconfigSupport = true;
+      alsaSupport = true;
+      openglSupport = true;
+      tlsSupport = true;
+      cupsSupport = true;
+      dbusSupport = true;
+      cairoSupport = true;
+      cursesSupport = true;
+      saneSupport = true;
+      pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
+      udevSupport = true;
+      xineramaSupport = true;
+      xmlSupport = true;
+    };
+
+    full = base.override {
+      gtkSupport = true;
+      gstreamerSupport = true;
+      colorManagementSupport = true;
+      mpg123Support = true;
+      openalSupport = true;
+      openclSupport = true;
+      odbcSupport = true;
+      netapiSupport = true;
+      vaSupport = true;
+      pcapSupport = true;
+      v4lSupport = true;
+      gsmSupport = true;
+      gphoto2Support = true;
+      ldapSupport = true;
+    };
+
+    stable = base.override { wineRelease = "stable"; };
+    unstable = base.override { wineRelease = "unstable"; };
+    staging = base.override { wineRelease = "staging"; };
+  };
+
+  wine = winePackages.base;
+
+  wineStaging = lowPrio (winePackages.full.override {
+    wineRelease = "staging";
   });
-  wineStable = self.wine.override { wineRelease = "stable"; };
-  wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });
-  wineStaging = lowPrio (self.wine.override { wineRelease = "staging"; });
 
   winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
     inherit (gnome2) zenity;
-- 
GitLab


From 7123cad74262177b73d6b29af303a65313b85921 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sat, 27 May 2017 13:08:34 -0400
Subject: [PATCH 0341/1490] slack: 2.5.2 -> 2.6.2

---
 .../networking/instant-messengers/slack/default.nix      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index c0d50a86c71..edd66bd900b 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, dpkg
-, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
-, libnotify, nspr, nss, systemd, xorg }:
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
+, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }:
 
 let
 
-  version = "2.5.2";
+  version = "2.6.2";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -22,6 +22,7 @@ let
     gnome2.gtk
     gnome2.pango
     libnotify
+    libxcb
     nspr
     nss
     stdenv.cc.cc
@@ -45,7 +46,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "0mg8js18lnnwyvqksrhpym7d04bin16bh7sdmxbm36iijb9ajxmi";
+        sha256 = "01zdzzpnv8qpmcpy6h9x7izrnwm0y015j5p5rnjwx8ki712wnmm8";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";
-- 
GitLab


From f5edcbde8f78b5ef9a7c30cad92461220be2b775 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sat, 3 Jun 2017 19:04:40 -0400
Subject: [PATCH 0342/1490] iosevka: 1.12.5 -> 1.13.0

---
 pkgs/data/fonts/iosevka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 5fde19e0128..10bc5787e40 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "iosevka-${version}";
-  version = "1.12.5";
+  version = "1.13.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip";
-    sha256 = "0s3g6mk0ngwsrw9h9dqinb50cd9i8zhqdcmmh93fhyf4d87yfwyi";
+    sha256 = "03jc8a10177wk35gyp0n317azakyy5qzc6vbh331552asawckswr";
   };
 
   sourceRoot = ".";
-- 
GitLab


From 1845a2d7352450fd726d77042190a3d64dd4f8df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 4 Jun 2017 03:20:30 +0200
Subject: [PATCH 0343/1490] retroarch: 1.3.4 -> 1.6.0

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

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index ac8e1e46112..171453b89d5 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -23,12 +23,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "retroarch-bare-${version}";
-  version = "1.3.4";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "RetroArch";
-    sha256 = "0ccp17580w0884baxj5kcynlm03jgd7i62dprz1ajxbi2s7b3mi3";
+    sha256 = "1ym2kws58fbavkc3giz5xqaqiqqdbf7wrz7y7iw53p1bnkc3l8yi";
     rev = "v${version}";
   };
 
-- 
GitLab


From f270376cd771ce6b97317d5bee56cf75e57fe50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 4 Jun 2017 03:24:18 +0200
Subject: [PATCH 0344/1490] libretro.*: 2015-11-20 -> 2017-06-04

---
 pkgs/misc/emulators/retroarch/cores.nix | 121 ++++++++++++------------
 1 file changed, 62 insertions(+), 59 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index b7b720af508..9d311760298 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, pkgconfig, makeWrapper, python27, retroarch
 , alsaLib, fluidsynth, mesa, portaudio, SDL, ffmpeg, libpng, libjpeg
-, libvorbis, zlib }:
+, libvorbis, xorg, zlib }:
 
 let
 
@@ -10,7 +10,7 @@ let
   stdenv.lib.makeOverridable stdenv.mkDerivation rec {
 
     name = "libretro-${core}-${version}";
-    version = "2015-11-20";
+    version = "2017-06-04";
     inherit src;
 
     buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or [];
@@ -54,8 +54,8 @@ in
     core = "4do";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "cbd700e2bb95f08f241ca24330fa732aa6af8018";
-      sha256 = "1xp43hpd23rhj96pns13fz9mjp66gmxzl5frqa8q9fqcn2qkx7b1";
+      rev = "52d881743dd8614d96b4de8bd153cb725b87d474";
+      sha256 = "1n42f70vni2zavppayaq8xmsyx5cn40qi4zk4pgq1w3hh2q8mj72";
     };
     description = "Port of 4DO/libfreedo to libretro";
   }).override {
@@ -66,8 +66,8 @@ in
     core = "mednafen-pce-fast";
     src = fetchRetro {
       repo = "beetle-pce-fast-libretro";
-      rev = "6e2eaf75da2eb3dfcf2fd64413f471c8c90cf885";
-      sha256 = "0m946108wzawg0c4xvqpv6yzfmjngz6lji5hn4swgk0z5f2bj5a5";
+      rev = "2954e645d668ee73d93803dc30da4462fc7a459b";
+      sha256 = "0p0k7kqfd6xg1qh6vgzgwp122miprb2bpzljgxd9kvigxihsl6f7";
     };
     description = "Port of Mednafen's PC Engine core to libretro";
   }).override {
@@ -79,8 +79,8 @@ in
     core = "mednafen-psx";
     src = fetchRetro {
       repo = "beetle-psx-libretro";
-      rev = "20c9b0eb0062b8768cc40aca0e2b2d626f1002a2";
-      sha256 = "192xzvdbjjqlxrnxxn45hmrr6yjpxw3gapkbax6nhrabnxhva43k";
+      rev = "76862abefdde9097561e2b795e75b49247deff17";
+      sha256 = "1k4b7g50ajzchjrm6d3v68hvri4k3hzvacn2l99i5yq3hxp7vs7x";
     };
     description = "Port of Mednafen's PSX Engine core to libretro";
   }).override {
@@ -92,8 +92,8 @@ in
     core = "mednafen-saturn";
     src = fetchRetro {
       repo = "beetle-saturn-libretro";
-      rev = "bb5d0c126feb25cf980f5cc1fc57d6a5a6f6e7ab";
-      sha256 = "0bnsdy27378b71y6aa65k4jxxy2xw6ky2ici3z53hkky2jnnjq0b";
+      rev = "3f1661b39ef249e105e6e2e655854ad0c87cd497";
+      sha256 = "1d1brysynwr6inlwfgv7gwkl3i9mf4lsaxd9wm2szw86g4diyn4c";
     };
     description = "Port of Mednafen's Saturn core to libretro";
   }).override {
@@ -106,8 +106,8 @@ in
     core = bname + "-accuracy";
     src = fetchRetro {
       repo = bname;
-      rev = "0bfe7f4f895af0927cec1c06dcae096b59416159";
-      sha256 = "0dmaa1vy6nfj9jk6xkvrbbcxa9j3f3zrp24zflnqbizc088vncb9";
+      rev = "e89c9a2e0a12d588366ee4f5c76b7d75139d938b";
+      sha256 = "0vkn1f38vwazpp3kbvvv8c467ghak6yfx00s48wkxwvhmak74a3s";
     };
     description = "Fork of bsnes with HLE DSP emulation restored";
   }).override {
@@ -118,8 +118,8 @@ in
     core = "desmume";
     src = fetchRetro {
       repo = core;
-      rev = "cae5945149a72b1dc0b130d6e60e2690b88a925a";
-      sha256 = "1qzlbw0vy87zi3w6hp5zj9dxdkj3qc9czjf41sj70irwyvqi0kii";
+      rev = "ce1f93abb4c3aa55099f56298e5438a03a3c2bbd";
+      sha256 = "064gzfbr7yizmvi91ry5y6bzikj633kdqhvzycb9f1g6kspf8yyl";
     };
     description = "libretro wrapper for desmume NDS emulator";
   }).override {
@@ -130,15 +130,15 @@ in
     core = "fba";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "b642e054a1f581fbac16c08f4b8df9ab6c474203";
-      sha256 = "0jxbzjhpyw1fzipm2ai2nv62vb0q5cb203m093vakr1zdsx7si2n";
+      rev = "9146c18ac989c619256d1cb8954d49e728e44ea3";
+      sha256 = "159dww8mxi95xz4ypw38vsn1g4k6z8sv415qqf0qriydwhw6mh2m";
     };
     description = "Port of Final Burn Alpha to libretro";
   }).override {
     buildPhase = ''
       cd svn-current/trunk \
       && make -f makefile.libretro \
-      && mv fb_alpha_libretro.so fba_libretro.so
+      && mv fbalpha2012_libretro.so fba_libretro.so
     '';
   };
 
@@ -146,30 +146,28 @@ in
     core = "fceumm";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "eb19d48804ebeb381b20e74db7033c321f6b6d04";
-      sha256 = "18wm6yzwshqfkd75kkcv035p1s2yhnchn98bcn9aj15aw5qyhvd4";
+      rev = "45f773a1c221121746bbe2680e3aaaf92776a87e";
+      sha256 = "0jnwh1338q710x47bzrx319g5xbq9ipv35kyjlbkrzhqjq1blz0b";
     };
     description = "FCEUmm libretro port";
   };
 
-  gambatte = (mkLibRetroCore rec {
+  gambatte = mkLibRetroCore rec {
     core = "gambatte";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "59fb6a652e0de3c3a3b29e58af5ac035958da37e";
-      sha256 = "0n2416lgqbzah1q3ji1hhpcdi9h29563gz739kf9libmnz86vd6f";
+      rev = "db7af6cf6ea39fd5e39eea137ff752649599a4e4";
+      sha256 = "0h7hyj630nk1s32wx02y4q9x2lp6wbnh6nkc9ihf4pygcsignmwr";
     };
     description = "Gambatte libretro port";
-  }).override {
-    configurePhase = "cd libgambatte";
   };
 
   genesis-plus-gx = mkLibRetroCore rec {
     core = "genesis-plus-gx";
     src = fetchRetro {
       repo = "Genesis-Plus-GX";
-      rev = "7d8d5f1026af8cfd00cdf32c67a999bd1e454a09";
-      sha256 = "16jm97h66bb2sqlimjlks31sapb23x4q8sr16wdqn1xgi670xw3c";
+      rev = "365a28c7349b691e6aaa3ad59b055261c42bd130";
+      sha256 = "0s11ddpnb44q4xjkl7dylldhi9y5zqywqavpk0bbwyj84r1cbz3c";
     };
     description = "Enhanced Genesis Plus libretro port";
   };
@@ -178,20 +176,20 @@ in
     core = "mame";
     src = fetchRetro {
       repo = "mame";
-      rev = "8da2303292bb8530f9f4ffad8bf1df95ee4cab74";
-      sha256 = "0afsxsm1d4x9jn28qz6v47hhnp7q9i0yqk62i4lk4d7i7m4dq5j9";
+      rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e";
+      sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1";
     };
     description = "Port of MAME to libretro";
 
-    extraBuildInputs = [ alsaLib portaudio python27 ];
+    extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ];
   };
 
   mgba = mkLibRetroCore rec {
     core = "mgba";
     src = fetchRetro {
       repo = core;
-      rev = "4000128339b535896615c994cafcd777637573f4";
-      sha256 = "1yar78rvgfqx7jdna9chkmmbnpcf7k9ckbzj506f7k7m7zv819fn";
+      rev = "fdaaaee661e59f28c94c7cfa4e82e70b71e24a9d";
+      sha256 = "1b30sa861r4bhbqkx6vkklh4iy625bpzki2ks4ivvjns1ijczvc7";
     };
     description = "Port of mGBA to libretro";
   };
@@ -200,12 +198,12 @@ in
     core = "mupen64plus";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "7db9296453629a44de806589f3ff64e824e775ad";
-      sha256 = "075lpmwmj99yf9d9905x7apawd4bqz0whr37mh2fgr3jf730yiyl";
+      rev = "407bcd40b3a42bff6b856a6d6f88a7d5d670bf9e";
+      sha256 = "0q5kvjz7rpk7mp75cdywqjgmy10c0h7ky26hh1x90d39y94idcd8";
     };
     description = "Libretro port of Mupen64 Plus, GL only";
 
-    extraBuildInputs = [ mesa ];
+    extraBuildInputs = [ mesa libpng ];
   }).override {
     buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}";
   };
@@ -214,8 +212,8 @@ in
     core = "nestopia";
     src = fetchRetro {
       repo = core;
-      rev = "dcaed965760669161d6fd44755887545ea393041";
-      sha256 = "03fy5hb181ffx8sk9wmm415k084zqqhfqga4crgc7hdqi16s3r5v";
+      rev = "ecfa170a582e5b8ec11225ca645843fa064955ca";
+      sha256 = "17ac7dhasch6f4lpill8c5scsvaix0jvbf1cp797qbll4hk84f2q";
     };
     description = "nestopia undead libretro port";
   }).override {
@@ -226,8 +224,8 @@ in
     core = "picodrive";
     src = fetchRetro {
       repo = core;
-      rev = "e912fdf26376bfa5d7d6488055fe6fdbd13c2e49";
-      sha256 = "1mi36y8kx6s76cgygpj11zw35p44gd66mxygmxliz7k6xsd7ww41";
+      rev = "cbc93b68dca1d72882d07b54bbe1ef25b980558a";
+      sha256 = "0fl9r6jj2x9231md5zc4scra79j5hfn1n2z67scff1375xg1k64h";
     };
     description = "Fast MegaDrive/MegaCD/32X emulator";
 
@@ -241,8 +239,8 @@ in
     core = "ppsspp";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "ea17e27fcf16b9f875718b6550fe7145c6257c06";
-      sha256 = "0w5njj5pamqc4a022hdplb7vapwkf34ad1w4acz3c8b05vkl457d";
+      rev = "5f7bcf7bfc15f83d405bcecd7a163a55ad1e7573";
+      sha256 = "06k1gzmypz61dslynrw4b5i161rhj43y6wnr2nhbzvwcv5bw8w8r";
     };
     description = "ppsspp libretro port";
     extraBuildInputs = [ mesa ffmpeg ];
@@ -254,8 +252,8 @@ in
     core = "prboom";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "90ad0db331c53e8851581e1547b7377fb9fffe5b";
-      sha256 = "0jk73nakrs9jxj3d0dmjs0csskjhddn8a4sky3mpk9vp30csx0ll";
+      rev = "4c690eb6b569a276c5b2a87680718f715477eae2";
+      sha256 = "02vkl3y5dmyzifsviphspqv03a2rdyf36zpjpgfg7x0s226f56ja";
     };
     description = "Prboom libretro port";
   }).override {
@@ -266,8 +264,8 @@ in
     core = "quicknes";
     src = fetchRetro {
       repo = "QuickNES_Core";
-      rev = "518638b8064c9d0cb1b5aa29d96419f8528c9de5";
-      sha256 = "0jv1z65m4j3hbfnb3chklh0dhwlc4gdqr0asswdsc1y4iwp0331c";
+      rev = "8613b48cee97f1472145bbafa76e543854b2bbd5";
+      sha256 = "18lizdb9zjlfhh8ibvmcscldlf3mw4aj8nds3pah68cd2lw170w1";
     };
     description = "QuickNES libretro port";
   }).override {
@@ -278,8 +276,8 @@ in
     core = "reicast";
     src = fetchRetro {
       repo = core + "-emulator";
-      rev = "ed47c72cf2e124d9d753285fd61d12ea8e071d0d";
-      sha256 = "05dw7qjnprf1lw3ps0sb7sp73hsh1a27rxbwjqd26j85zr84g3r9";
+      rev = "40d4e8af2dd67a3f317c14224873c8ec0e1f9d11";
+      sha256 = "0d8wzpv7pcyh437gmvi439vim26wyrjmi5hj97wvyvggywjwrx8m";
     };
     description = "Reicast libretro port";
     extraBuildInputs = [ mesa ];
@@ -291,8 +289,8 @@ in
     core = "scummvm";
     src = fetchRetro {
       repo = core;
-      rev = "c3e719acc08c1873609bab3578939b7c9e606511";
-      sha256 = "03wvffy3h62qc7f3d8042wd234m8ikd843ggp903y285sgh54r9y";
+      rev = "de8d7e58caa23f071ce9d1bc5133f45d16c3ff1c";
+      sha256 = "097i2dq3hw14hicsplrs36j1qa3r45vhzny5v4aw6qw4aj34hksy";
     };
     description = "Libretro port of ScummVM";
     extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ];
@@ -304,30 +302,35 @@ in
     core = "snes9x";
     src = fetchRetro {
       repo = core;
-      rev = "ccf1ee2eae73ed1e4044c8dd9536dd4ac1be6d8b";
-      sha256 = "1bwjk817m8v69s13fc9kcj605ig6707rsj57wmz2ri2ggmydhvcb";
+      rev = "db4bfaba3b0d5a067fe9aea323503656837a8d9a";
+      sha256 = "02f04ss45km32lp68diyfkix1gryx89qy8cc80189ipwnx80pgip";
     };
     description = "Port of SNES9x git to libretro";
   }).override {
     buildPhase = "cd libretro && make";
   };
 
-  snes9x-next = mkLibRetroCore rec {
+  snes9x-next = (mkLibRetroCore rec {
     core = "snes9x-next";
     src = fetchRetro {
       repo = core;
-      rev = "dfb7eef46d6bc2dbcc98f25e2bfadc9d2cff5cfd";
-      sha256 = "0vdfjdwr6b5izh3gy63lcfnrdvr99qhlqfibjw4mmyqk9gkjrwm8";
+      rev = "b2a69de0df1eb39ed362806f9c9633f4544272af";
+      sha256 = "1vhgsrg9l562nincfvpj2h2dqkkblg1qmh0v47jqlqgmgl2b1zij";
     };
     description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
+  }).override {
+    buildPhase = ''
+      make -f Makefile.libretro
+      mv snes9x2010_libretro.so snes9x_next_libretro.so
+    '';
   };
 
   stella = (mkLibRetroCore rec {
     core = "stella";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "ada5c57d632ace0ba915ce7a470d504a5d89ebcc";
-      sha256 = "090isch1l5hm07l22l8hja31cdiaxc0vgc3i01qs8zgdyvsx4vvg";
+      rev = "bbe65db0e344dcb38905586bd853076b65963e5a";
+      sha256 = "18r1yyfzvjq2hq04d94y37kzsq6aywh1aim69a3imk8kh46gwrh0";
     };
     description = "Port of Stella to libretro";
   }).override {
@@ -338,8 +341,8 @@ in
     core = "vba-next";
     src = fetchRetro {
       repo = core;
-      rev = "0c20cd92bc8684340d7a1bcae14a603001ad5e4a";
-      sha256 = "016vm2xyjfkkcqkqfw3n09if4bxxppk3g6p92waa9bv2ni4xli69";
+      rev = "e7734756d228ea604f8fa872cea1bba987780791";
+      sha256 = "03s4rh7dbbhbfc4pfdvr9jcbxrp4ijg8yp49s1xhr7sxsblj2vpv";
     };
     description = "VBA-M libretro port with modifications for speed";
   };
@@ -348,8 +351,8 @@ in
     core = "vbam";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "bedddba614bc4fcbcf5b0d8565f94619b094c20c";
-      sha256 = "1hvq4wsznb2vzg11iqmy5dnfjpiga368p1lmsx9d7ci7dcqyw7wy";
+      rev = "1b82fc2d761f027567632692f787482d1e287ec2";
+      sha256 = "043djmqvh2grc25hwjw4b5kfx57b89ryp6fcl8v632sm35l3dd6z";
     };
     description = "vanilla VBA-M libretro port";
   }).override {
-- 
GitLab


From a8c48bb68b955e3552b8d7515f20f08e224c1509 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Sun, 4 Jun 2017 13:49:46 +1000
Subject: [PATCH 0345/1490] binaryen: add package

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

diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
new file mode 100644
index 00000000000..31f5845cc86
--- /dev/null
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, cmake, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "32";
+  rev = "version_${version}";
+  name = "binaryen-${version}";
+
+  src = fetchFromGitHub {
+    owner = "WebAssembly";
+    repo = "binaryen";
+    sha256 = "0zclw6pa2pkzrnp8ib9qwbjvq38r2h5ynfg8fjl99b5lcyz5m590";
+    inherit rev;
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/WebAssembly/binaryen;
+    description = "Compiler infrastructure and toolchain library for WebAssembly, in C++";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ asppsa ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bca3cee890..bd71c17b352 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5014,6 +5014,8 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
+  binaryen = callPackage ../development/compilers/binaryen { };
+
   boo = callPackage ../development/compilers/boo {
     inherit (gnome2) gtksourceview;
   };
-- 
GitLab


From 8f33800061eff8a8b1ef7a89f66893247a93ab8b Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Sun, 4 Jun 2017 13:50:51 +1000
Subject: [PATCH 0346/1490] emscripten: add binaryen dep for compiling to WASM

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

diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index ad1cd437ffa..f118a11e419 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
+{ stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler
+, jre, binaryen, enableWasm ? true
+}:
 
 let
   rev = "1.37.10";
@@ -36,6 +38,9 @@ stdenv.mkDerivation {
     echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config
     echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config
     echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config
+  ''
+  + stdenv.lib.optionalString enableWasm ''
+    echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 5029b39b44f4be140d3fa6bb0b945c0b612eeb20 Mon Sep 17 00:00:00 2001
From: David Asabina <vid@bina.me>
Date: Sun, 4 Jun 2017 03:30:21 +0200
Subject: [PATCH 0347/1490] apvlv: copy main_menubar.glade to out dir

The application requires the main_menubar.glade alongside the
Startup.pdf. Just making sure all required assets are present :wink:.

Currently `apvlv` fails with the `(apvlv:16999): Gtk-ERROR **: failed to add UI: Failed to open file '${store-path}-apvlv-0.1.5/share/doc/apvlv/main_menubar.glade': No such file or directory
zsh: trace trap  apvlv` error.
---
 pkgs/applications/misc/apvlv/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index 977f5e94e5d..6dca5b30f4a 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
     # displays pdfStartup.pdf as default pdf entry
     mkdir -p $out/share/doc/apvlv/
     cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf
+    cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From c57d0be40af780f3971deeee03836090a21e4bb9 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Sun, 4 Jun 2017 09:20:55 +0200
Subject: [PATCH 0348/1490] racket: 6.8 -> 6.9

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 72217a860b4..245ff7b006f 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -33,11 +33,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "6.8";
+  version = "6.9";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "1l9z1a0r5zydr50cklx9xjw3l0pwnf64i10xq7112fl1r89q3qgv";
+    sha256 = "1cd218ee2ba1dc683de858a866c6666eb72a11adee8d1df6cdd59c5c5a47b714";
   };
 
   FONTCONFIG_FILE = fontsConf;
-- 
GitLab


From c2d1cf5f3645e7a32b9b2c0eaaf2995ca7e34a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 3 Jun 2017 12:00:12 +0100
Subject: [PATCH 0349/1490] ipmiview: fix wrapper

---
 pkgs/applications/misc/ipmiview/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index b841f064243..11ef001ef54 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
    version = "2.12.0";
    buildVersion = "160804";
 
-   src = pkgs.fetchurl {
+   src = fetchurl {
     url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
     sha256 = "787a060413451a4a5993c31805f55a221087b7199bbaf20e9fe1254e2a76db42";
   };
@@ -24,8 +24,9 @@ stdenv.mkDerivation rec {
    installPhase = ''
      mkdir -p $out/bin
      cp -R . $out/
-     echo "$out/jre/bin/java -jar $out/IPMIView20.jar" > $out/bin/IPMIView
-     chmod +x $out/bin/IPMIView
+     makeWrapper $out/jre/bin/java $out/bin/IPMIView \
+       --prefix PATH : "$out/jre/bin" \
+       --add-flags "-jar $out/IPMIView20.jar"
    '';
 
    meta = with stdenv.lib; {
-- 
GitLab


From 5fcdd6c562e2e63c9cff33222bc4a87b5ad5e289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 4 Jun 2017 11:00:09 +0100
Subject: [PATCH 0350/1490] apvlv: use wrapGAppsHook

---
 pkgs/applications/misc/apvlv/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index 6dca5b30f4a..a07e0b6db61 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy
-, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence
+, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
     libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
   ];
 
+  nativeBuildInputs = [
+    wrapGAppsHook
+  ];
+
   patches = [
     (fetchpatch {
       url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch";
-- 
GitLab


From a3b69c0d5c80062acf19a8858da2032d7b1b85b3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 3 Jun 2017 20:45:51 +0200
Subject: [PATCH 0351/1490] fetchgit: add postFetch argument

---
 pkgs/build-support/fetchgit/builder.sh  | 1 +
 pkgs/build-support/fetchgit/default.nix | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh
index 4bbef1d6e62..6ae46469738 100644
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@@ -12,4 +12,5 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \
   ${fetchSubmodules:+--fetch-submodules} \
   ${branchName:+--branch-name "$branchName"}
 
+runHook postFetch
 stopNest
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index d85d2c893c5..a5f81ef1794 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -15,6 +15,9 @@ in
 , fetchSubmodules ? true, deepClone ? false
 , branchName ? null
 , name ? urlToName url rev
+, # Shell code executed after the file has been fetched
+  # successfully. This can do things like check or transform the file.
+  postFetch ? ""
 }:
 
 /* NOTE:
@@ -54,7 +57,7 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = sha256;
 
-  inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
+  inherit url rev leaveDotGit fetchSubmodules deepClone branchName postFetch;
 
   GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
-- 
GitLab


From 0ff914b6600c9eef4df03d2555238277f94a5bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 4 Jun 2017 11:21:42 +0100
Subject: [PATCH 0352/1490] rtags: fix platform dependent checksum

---
 pkgs/development/tools/rtags/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index da55afbd1fb..23ee6dec86a 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -12,11 +12,17 @@ stdenv.mkDerivation rec {
            LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
   '';
 
+
   src = fetchgit {
     rev = "refs/tags/v${version}";
     fetchSubmodules = true;
     url = "https://github.com/andersbakken/rtags.git";
-    sha256 = "0z32yncn3x1pm2l6r349kfwi6mi83vll820kka87agcla64pl1f2";
+    sha256 = "0rv5hz4cfc1adpxvp4j4227nfc0p0yrjdc6l9i32jj11p69a5401";
+    # unicode file names lead to different checksums on HFS+ vs. other
+    # filesystems because of unicode normalisation
+    postFetch = ''
+      rm $out/src/rct/tests/testfile_*.txt
+    '';
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 56a850701bffd4b230e0cb3b4ff3690885491152 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 4 Jun 2017 12:24:32 +0200
Subject: [PATCH 0353/1490] python.pkgs.aiofiles: init at 0.3.1

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

diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix
new file mode 100644
index 00000000000..d1c6e279064
--- /dev/null
+++ b/pkgs/development/python-modules/aiofiles/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy33
+, pythonOlder
+, asyncio
+, singledispatch
+}:
+
+buildPythonPackage rec {
+  pname = "aiofiles";
+  version = "0.3.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6c4936cea65175277183553dbc27d08b286a24ae5bd86f44fbe485dfcf77a14a";
+  };
+
+  disabled = pythonOlder "3.3";
+
+  propagatedBuildInputs = lib.optionals isPy33 [ asyncio singledispatch ];
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = {
+    description = "File support for asyncio";
+    homepage = https://github.com/Tinche/aiofiles;
+    license = with lib.licenses; [ asl20 ];
+    maintainer = with lib.maintainers; [ fridh ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1c7ef881804..0a1d8932972 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -600,6 +600,8 @@ in {
     };
   };
 
+  aiofiles = callPackage ../development/python-modules/aiofiles { };
+
   aiohttp = buildPythonPackage rec {
     name = "aiohttp-${version}";
     version = "1.1.6";
-- 
GitLab


From b62dea5c325054e498355296accb4094dda31ed9 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 4 Jun 2017 14:39:17 +0300
Subject: [PATCH 0354/1490] rambox: 0.5.3 -> 0.5.9

---
 .../networking/instant-messengers/rambox/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index f3212ea9b77..8f650e889f6 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -6,7 +6,7 @@ let
   bits = if stdenv.system == "x86_64-linux" then "x64"
          else "ia32";
 
-  version = "0.5.3";
+  version = "0.5.9";
 
   myIcon = fetchurl {
     url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png";
@@ -25,8 +25,8 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz";
     sha256 = if bits == "x64" then
-      "14pp466l0fj98p5qsb7i11hd603gwsir26m3j4gljzcizb9hirqv" else
-      "13xmljsdahffdzndg30qxh8mj7bgd9jwkxknrvlh3l6w35pbj085";
+      "0wx1cj3h1h28lhvl8ysmvr2wxq39lklk37361i598vph2pvnibi0" else
+      "1dqjd5rmml63h3y43n1r68il3pn8zwy0wwr0866cnpizsbis96fy";
   };
 
   # don't remove runtime deps
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
 
   deps = (with xorg; [
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
-    libXrender libX11 libXtst libXScrnSaver
+    libXrender libX11 libXtst libXScrnSaver libxcb
   ]) ++ [
     gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
-- 
GitLab


From 4def9b8f42b96af86f50317df74d58ded6317848 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 4 Jun 2017 14:47:27 +0300
Subject: [PATCH 0355/1490] wpsoffice: cleanup and i686 version

---
 .../applications/office/wpsoffice/default.nix | 69 ++++++++++++-------
 1 file changed, 46 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index d6640b6c5bb..41dd8595c30 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -1,32 +1,38 @@
-{stdenv, fetchurl, unzip, libX11, libcxxabi, glib, xorg, qt4, fontconfig, phonon, freetype, zlib, libpng12, libICE, libXrender, cups, lib}:
+{ stdenv, fetchurl, fetchFromGitHub
+, libX11, glib, xorg, fontconfig, freetype
+, zlib, libpng12, libICE, libXrender, cups }:
+
+let
+  bits = if stdenv.system == "x86_64-linux" then "x86_64"
+         else "x86";
 
-stdenv.mkDerivation rec{
-  name = "wpsoffice-${version}";
   version = "10.1.0.5672";
+in stdenv.mkDerivation rec{
+  name = "wpsoffice-${version}";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_10.1.0.5672~a21_x86_64.tar.xz";
-    sha1 = "7e9b17572ed5cea50af24f01457f726fc558a515";
+    name = "${name}.tar.xz";
+    url = "http://kdl.cc.ksosoft.com/wps-community/download/a21/wps-office_${version}~a21_${bits}.tar.xz";
+    sha256 = if bits == "x86_64" then
+      "0mi3n9kplf82gd0g2m0np957agy53p4g1qh81pbban49r4n0ajcz" else
+      "1dk400ap5qwdhjvn8lnk602f5akayr391fkljxdkrpn5xac01m97";
   };
   
   meta = {
     description = "Office program originally named Kingsoft Office";
     homepage = http://wps-community.org/;
-    platforms = [ "x86_64-linux" ];
-    # Binary for i686 is also available if someone can package it
-    license = lib.licenses.unfreeRedistributable;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    hydraPlatforms = [];
+    license = stdenv.lib.licenses.unfreeRedistributable;
   };
 
   libPath = stdenv.lib.makeLibraryPath [
     libX11
-    libcxxabi
     libpng12
     glib
     xorg.libSM
     xorg.libXext
     fontconfig
-    phonon
     zlib
     freetype
     libICE
@@ -34,19 +40,36 @@ stdenv.mkDerivation rec{
     libXrender
   ];
 
-  phases = [ "unpackPhase" "installPhase" ];
+  dontPatchELF = true;
 
   installPhase = ''
-    cp -r . "$out"
-    chmod +x "$out/office6/wpp"
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/wpp"
-    chmod +x "$out/office6/wps"
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/wps"
-    chmod +x "$out/office6/et"
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/et"
-    mkdir -p "$out/bin/"
-    ln -s "$out/office6/wpp" "$out/bin/wpspresentation"
-    ln -s "$out/office6/wps" "$out/bin/wpswriter"
-    ln -s "$out/office6/et" "$out/bin/wpsspreadsheets"
+    prefix=$out/opt/kingsoft/wps-office
+    mkdir -p $prefix
+    cp -r . $prefix
+
+    # Avoid forbidden reference error due use of patchelf
+    rm -r $PWD
+
+    mkdir $out/bin
+    for i in wps wpp et; do
+      patchelf \
+        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --force-rpath --set-rpath "$prefix/office6:$libPath" \
+        $prefix/office6/$i
+
+      substitute $prefix/$i $out/bin/$i \
+        --replace /opt/kingsoft/wps-office $prefix
+      chmod +x $out/bin/$i
+
+      substituteInPlace $prefix/resource/applications/wps-office-$i.desktop \
+        --replace /usr/bin $out/bin
+    done
+
+    # China fonts
+    mkdir -p $prefix/resource/fonts/wps-office $out/etc/fonts/conf.d
+    ln -s $prefix/fonts/* $prefix/resource/fonts/wps-office
+    ln -s $prefix/fontconfig/*.conf $out/etc/fonts/conf.d
+
+    ln -s $prefix/resource $out/share
   '';
 }
-- 
GitLab


From dcb7a6b33204777ee3ebf416c50034f5e3cde27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Sun, 4 Jun 2017 14:08:24 +0200
Subject: [PATCH 0356/1490] eslint_d: init at 4.2.5

---
 .../node-packages/composition-v4.nix          |    4 +-
 .../node-packages/composition-v6.nix          |    2 +-
 pkgs/development/node-packages/node-env.nix   |  160 +-
 .../node-packages/node-packages-v4.nix        |  815 ++++++---
 .../node-packages/node-packages-v6.json       |    1 +
 .../node-packages/node-packages-v6.nix        | 1604 ++++++++++-------
 6 files changed, 1572 insertions(+), 1014 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index b78bbda5d5e..8c4a5390f55 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index 02a2fc1f3de..ea30c5b04c4 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index bd1de3e9f93..356e78f027b 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -57,60 +57,6 @@ let
 
   # Recursively composes the dependencies of a package
   composePackage = { name, packageName, src, dependencies ? [], ... }@args:
-    let
-      fixImpureDependencies = writeTextFile {
-        name = "fixDependencies.js";
-        text = ''
-          var fs = require('fs');
-          var url = require('url');
-
-          /*
-           * Replaces an impure version specification by *
-           */
-          function replaceImpureVersionSpec(versionSpec) {
-              var parsedUrl = url.parse(versionSpec);
-
-              if(versionSpec == "latest" || versionSpec == "unstable" ||
-                  versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
-                  return '*';
-              else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" ||
-                  parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:")
-                  return '*';
-              else
-                  return versionSpec;
-          }
-
-          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
-          /* Replace dependencies */
-          if(packageObj.dependencies !== undefined) {
-              for(var dependency in packageObj.dependencies) {
-                  var versionSpec = packageObj.dependencies[dependency];
-                  packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-
-          /* Replace development dependencies */
-          if(packageObj.devDependencies !== undefined) {
-              for(var dependency in packageObj.devDependencies) {
-                  var versionSpec = packageObj.devDependencies[dependency];
-                  packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-
-          /* Replace optional dependencies */
-          if(packageObj.optionalDependencies !== undefined) {
-              for(var dependency in packageObj.optionalDependencies) {
-                  var versionSpec = packageObj.optionalDependencies[dependency];
-                  packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
-              }
-          }
-
-          /* Write the fixed JSON file */
-          fs.writeFileSync("package.json", JSON.stringify(packageObj));
-        '';
-      };
-    in
     ''
       DIR=$(pwd)
       cd $TMPDIR
@@ -150,17 +96,97 @@ let
       # Unset the stripped name to not confuse the next unpack step
       unset strippedName
 
-      # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
-      # The following JavaScript replaces these by * to prevent that
-      cd "$DIR/${packageName}"
-      node ${fixImpureDependencies}
-
       # Include the dependencies of the package
+      cd "$DIR/${packageName}"
       ${includeDependencies { inherit dependencies; }}
       cd ..
       ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
     '';
 
+  pinpointDependencies = {dependencies, production}:
+    let
+      pinpointDependenciesFromPackageJSON = writeTextFile {
+        name = "pinpointDependencies.js";
+        text = ''
+          var fs = require('fs');
+          var path = require('path');
+          
+          function resolveDependencyVersion(location, name) {
+              if(location == process.env['NIX_STORE']) {
+                  return null;
+              } else {
+                  var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
+                  
+                  if(fs.existsSync(dependencyPackageJSON)) {
+                      var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
+                      
+                      if(dependencyPackageObj.name == name) {
+                          return dependencyPackageObj.version;
+                      }
+                  } else {
+                      return resolveDependencyVersion(path.resolve(location, ".."), name);
+                  }
+              }
+          }
+          
+          function replaceDependencies(dependencies) {
+              if(typeof dependencies == "object" && dependencies !== null) {
+                  for(var dependency in dependencies) {
+                      var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+                      
+                      if(resolvedVersion === null) {
+                          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+                      } else {
+                          dependencies[dependency] = resolvedVersion;
+                      }
+                  }
+              }
+          }
+          
+          /* Read the package.json configuration */
+          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+          
+          /* Pinpoint all dependencies */
+          replaceDependencies(packageObj.dependencies);
+          if(process.argv[2] == "development") {
+              replaceDependencies(packageObj.devDependencies);
+          }
+          replaceDependencies(packageObj.optionalDependencies);
+          
+          /* Write the fixed package.json file */
+          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
+        '';
+      };
+    in
+    ''
+      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+      
+      ${stdenv.lib.optionalString (dependencies != [])
+        ''
+          if [ -d node_modules ]
+          then
+              cd node_modules
+              ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+              cd ..
+          fi
+        ''}
+    '';
+  
+  # Recursively traverses all dependencies of a package and pinpoints all
+  # dependencies in the package.json file to the versions that are actually
+  # being used.
+  
+  pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+    ''
+      if [ -d "${packageName}" ]
+      then
+          cd "${packageName}"
+          ${pinpointDependencies { inherit dependencies production; }}
+          cd ..
+          ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+      fi
+    '';
+
   # Extract the Node.js source code which is used to compile packages with
   # native bindings
   nodeSources = runCommand "node-sources" {} ''
@@ -183,7 +209,9 @@ let
       buildPhase = args.buildPhase or "true";
 
       compositionScript = composePackage args;
-      passAsFile = [ "compositionScript" ];
+      pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+      
+      passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
 
       installPhase = args.installPhase or ''
         # Create and enter a root node_modules/ folder
@@ -192,6 +220,10 @@ let
 
         # Compose the package and all its dependencies
         source $compositionScriptPath
+        
+        # Pinpoint the versions of all dependencies to the ones that are actually being used
+        echo "pinpointing versions of dependencies..."
+        source $pinpointDependenciesScriptPath
 
         # Patch the shebangs of the bundled modules to prevent them from
         # calling executables outside the Nix store as much as possible
@@ -254,12 +286,18 @@ let
         buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
 
         includeScript = includeDependencies { inherit dependencies; };
-        passAsFile = [ "includeScript" ];
+        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+        
+        passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
 
         buildCommand = ''
           mkdir -p $out/lib
           cd $out/lib
           source $includeScriptPath
+          
+          # Pinpoint the versions of all dependencies to the ones that are actually being used
+          echo "pinpointing versions of dependencies..."
+          source $pinpointDependenciesScriptPath
 
           # Create fake package.json to make the npm commands work properly
           cat > package.json <<EOF
diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 4d6c57c65c3..b483c75cf6f 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -634,13 +634,13 @@ let
         sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
       };
     };
-    "readable-stream-2.2.9" = {
+    "readable-stream-2.2.10" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.9";
+      version = "2.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz";
-        sha1 = "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz";
+        sha1 = "effe72bb7c884c0dd335e2379d526196d9d011ee";
       };
     };
     "xtend-4.0.1" = {
@@ -652,15 +652,6 @@ let
         sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
       };
     };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    };
     "isarray-1.0.0" = {
       name = "isarray";
       packageName = "isarray";
@@ -679,6 +670,15 @@ let
         sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
       };
     };
+    "safe-buffer-5.1.0" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz";
+        sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223";
+      };
+    };
     "string_decoder-1.0.1" = {
       name = "string_decoder";
       packageName = "string_decoder";
@@ -697,15 +697,6 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "safe-buffer-5.0.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
-      };
-    };
     "clone-1.0.2" = {
       name = "clone";
       packageName = "clone";
@@ -1777,13 +1768,13 @@ let
         sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
       };
     };
-    "aproba-1.1.1" = {
+    "aproba-1.1.2" = {
       name = "aproba";
       packageName = "aproba";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz";
-        sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab";
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
+        sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1";
       };
     };
     "has-unicode-2.0.1" = {
@@ -2569,13 +2560,13 @@ let
         sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
-    "big-integer-1.6.22" = {
+    "big-integer-1.6.23" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.22";
+      version = "1.6.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.22.tgz";
-        sha1 = "487c95fce886022ea48ff5f19e388932df46dd2e";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.23.tgz";
+        sha1 = "e85d508220c74e3f43a4ce72eed51f3da4db94d1";
       };
     };
     "camelcase-keys-2.1.0" = {
@@ -3244,6 +3235,15 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
+    "safe-buffer-5.0.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
+      };
+    };
     "truncate-1.0.5" = {
       name = "truncate";
       packageName = "truncate";
@@ -3262,13 +3262,13 @@ let
         sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45";
       };
     };
-    "node-pre-gyp-0.6.35" = {
+    "node-pre-gyp-0.6.36" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.35";
+      version = "0.6.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.35.tgz";
-        sha1 = "1c161fc9fbf1f3ffecd751959f0fdbd12a56c4ab";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz";
+        sha1 = "db604112cb74e0d477554e9b505b17abddfab786";
       };
     };
     "nopt-4.0.1" = {
@@ -3415,15 +3415,6 @@ let
         sha1 = "5de60415bda071bb37127854c864f41b23254539";
       };
     };
-    "asap-2.0.5" = {
-      name = "asap";
-      packageName = "asap";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz";
-        sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
-      };
-    };
     "bluebird-3.5.0" = {
       name = "bluebird";
       packageName = "bluebird";
@@ -3433,6 +3424,15 @@ let
         sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
       };
     };
+    "cacache-9.2.6" = {
+      name = "cacache";
+      packageName = "cacache";
+      version = "9.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.6.tgz";
+        sha1 = "ea5c7f2b6b514710a22a58a27f857fd972fdfa51";
+      };
+    };
     "call-limit-1.1.0" = {
       name = "call-limit";
       packageName = "call-limit";
@@ -3478,6 +3478,15 @@ let
         sha1 = "aba09747dfbe4c3e70e766a6e41586e1859fc6f2";
       };
     };
+    "detect-indent-5.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
+        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
+      };
+    };
     "dezalgo-1.0.3" = {
       name = "dezalgo";
       packageName = "dezalgo";
@@ -3604,6 +3613,15 @@ let
         sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
       };
     };
+    "lru-cache-4.0.2" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
+        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
+      };
+    };
     "mississippi-1.3.0" = {
       name = "mississippi";
       packageName = "mississippi";
@@ -3622,22 +3640,13 @@ let
         sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
       };
     };
-    "node-gyp-3.6.1" = {
+    "node-gyp-3.6.2" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.1.tgz";
-        sha1 = "19561067ff185464aded478212681f47fd578cbc";
-      };
-    };
-    "normalize-git-url-3.0.2" = {
-      name = "normalize-git-url";
-      packageName = "normalize-git-url";
-      version = "3.0.2";
+      version = "3.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.2.tgz";
-        sha1 = "8e5f14be0bdaedb73e07200310aa416c27350fc4";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
+        sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
       };
     };
     "npm-cache-filename-1.0.2" = {
@@ -3658,40 +3667,31 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-package-arg-4.2.1" = {
+    "npm-package-arg-5.1.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "4.2.1";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz";
-        sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.1.tgz";
+        sha1 = "a3d09053f2d8a0bfa562624507baa597737fc3bf";
       };
     };
-    "npm-registry-client-8.1.1" = {
+    "npm-registry-client-8.3.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "8.1.1";
+      version = "8.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz";
-        sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz";
+        sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f";
       };
     };
-    "npm-user-validate-0.1.5" = {
+    "npm-user-validate-1.0.0" = {
       name = "npm-user-validate";
       packageName = "npm-user-validate";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.5.tgz";
-        sha1 = "52465d50c2d20294a57125b996baedbf56c5004b";
-      };
-    };
-    "npmlog-4.0.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "4.0.2";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
-        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
+        url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz";
+        sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951";
       };
     };
     "opener-1.4.3" = {
@@ -3703,6 +3703,15 @@ let
         sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
+    "pacote-2.7.27" = {
+      name = "pacote";
+      packageName = "pacote";
+      version = "2.7.27";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.27.tgz";
+        sha1 = "ab3a7e6b584d351c9d19bfe76b0b420f7013eff6";
+      };
+    };
     "path-is-inside-1.0.2" = {
       name = "path-is-inside";
       packageName = "path-is-inside";
@@ -3712,6 +3721,15 @@ let
         sha1 = "365417dede44430d1c11af61027facf074bdfc53";
       };
     };
+    "promise-inflight-1.0.1" = {
+      name = "promise-inflight";
+      packageName = "promise-inflight";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz";
+        sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
+      };
+    };
     "read-1.0.7" = {
       name = "read";
       packageName = "read";
@@ -3748,22 +3766,13 @@ let
         sha1 = "f93a64e641529df68a08c64de46389e8a3f88845";
       };
     };
-    "read-package-tree-5.1.5" = {
+    "read-package-tree-5.1.6" = {
       name = "read-package-tree";
       packageName = "read-package-tree";
-      version = "5.1.5";
+      version = "5.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz";
-        sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
-      };
-    };
-    "realize-package-specifier-3.0.3" = {
-      name = "realize-package-specifier";
-      packageName = "realize-package-specifier";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.3.tgz";
-        sha1 = "d0def882952b8de3f67eba5e91199661271f41f4";
+        url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
+        sha1 = "4f03e83d0486856fb60d97c94882841c2a7b1b7a";
       };
     };
     "retry-0.10.1" = {
@@ -3811,6 +3820,15 @@ let
         sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
       };
     };
+    "ssri-4.1.4" = {
+      name = "ssri";
+      packageName = "ssri";
+      version = "4.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.4.tgz";
+        sha1 = "22be0659c075a612b622158872b585d5fe6b03af";
+      };
+    };
     "text-table-0.2.0" = {
       name = "text-table";
       packageName = "text-table";
@@ -3856,13 +3874,13 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
-    "write-file-atomic-1.3.4" = {
+    "write-file-atomic-2.1.0" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "1.3.4";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz";
-        sha1 = "f807a4f0b1d9e913ae7a48112e6cc3af1991b45f";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
+        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
       };
     };
     "debuglog-1.0.1" = {
@@ -3964,6 +3982,15 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
+    "asap-2.0.5" = {
+      name = "asap";
+      packageName = "asap";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz";
+        sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f";
+      };
+    };
     "promzard-0.3.0" = {
       name = "promzard";
       packageName = "promzard";
@@ -3982,6 +4009,24 @@ let
         sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26";
       };
     };
+    "pseudomap-1.0.2" = {
+      name = "pseudomap";
+      packageName = "pseudomap";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
+        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+      };
+    };
+    "yallist-2.1.2" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
+      };
+    };
     "concat-stream-1.6.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
@@ -4117,22 +4162,148 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "mute-stream-0.0.7" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.7";
+    "make-fetch-happen-2.4.10" = {
+      name = "make-fetch-happen";
+      packageName = "make-fetch-happen";
+      version = "2.4.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
-        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.10.tgz";
+        sha1 = "5e52244a4cd80be925f5c8118a38ad0c2ceb4a81";
       };
     };
-    "util-extend-1.0.3" = {
-      name = "util-extend";
-      packageName = "util-extend";
+    "npm-pick-manifest-1.0.3" = {
+      name = "npm-pick-manifest";
+      packageName = "npm-pick-manifest";
       version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz";
-        sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.3.tgz";
+        sha1 = "a56fed120b2d8adaec5334ddd07cf23b2389e8de";
+      };
+    };
+    "promise-retry-1.1.1" = {
+      name = "promise-retry";
+      packageName = "promise-retry";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz";
+        sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d";
+      };
+    };
+    "protoduck-4.0.0" = {
+      name = "protoduck";
+      packageName = "protoduck";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz";
+        sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
+      };
+    };
+    "tar-fs-1.15.2" = {
+      name = "tar-fs";
+      packageName = "tar-fs";
+      version = "1.15.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz";
+        sha1 = "761f5b32932c7b39461a60d537faea0d8084830c";
+      };
+    };
+    "tar-stream-1.5.4" = {
+      name = "tar-stream";
+      packageName = "tar-stream";
+      version = "1.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz";
+        sha1 = "36549cf04ed1aee9b2a30c0143252238daf94016";
+      };
+    };
+    "agentkeepalive-3.1.0" = {
+      name = "agentkeepalive";
+      packageName = "agentkeepalive";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.1.0.tgz";
+        sha1 = "0393a4f1e68f85d355887c2e71681b28f3b7df35";
+      };
+    };
+    "http-cache-semantics-3.7.3" = {
+      name = "http-cache-semantics";
+      packageName = "http-cache-semantics";
+      version = "3.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.7.3.tgz";
+        sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72";
+      };
+    };
+    "http-proxy-agent-1.0.0" = {
+      name = "http-proxy-agent";
+      packageName = "http-proxy-agent";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz";
+        sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a";
+      };
+    };
+    "https-proxy-agent-1.0.0" = {
+      name = "https-proxy-agent";
+      packageName = "https-proxy-agent";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz";
+        sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6";
+      };
+    };
+    "node-fetch-npm-2.0.1" = {
+      name = "node-fetch-npm";
+      packageName = "node-fetch-npm";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.1.tgz";
+        sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465";
+      };
+    };
+    "socks-proxy-agent-2.1.0" = {
+      name = "socks-proxy-agent";
+      packageName = "socks-proxy-agent";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.0.tgz";
+        sha1 = "ddfb01b5dbea5fc879490ca38a25fe87d3d15912";
+      };
+    };
+    "humanize-ms-1.2.1" = {
+      name = "humanize-ms";
+      packageName = "humanize-ms";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz";
+        sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
+      };
+    };
+    "agent-base-2.1.1" = {
+      name = "agent-base";
+      packageName = "agent-base";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz";
+        sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7";
+      };
+    };
+    "semver-5.0.3" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
+        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
+      };
+    };
+    "encoding-0.1.12" = {
+      name = "encoding";
+      packageName = "encoding";
+      version = "0.1.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz";
+        sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
       };
     };
     "json-parse-helpfulerror-1.0.3" = {
@@ -4144,6 +4315,15 @@ let
         sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc";
       };
     };
+    "iconv-lite-0.4.17" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz";
+        sha1 = "4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d";
+      };
+    };
     "jju-1.3.0" = {
       name = "jju";
       packageName = "jju";
@@ -4153,6 +4333,78 @@ let
         sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa";
       };
     };
+    "socks-1.1.10" = {
+      name = "socks";
+      packageName = "socks";
+      version = "1.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz";
+        sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a";
+      };
+    };
+    "ip-1.1.5" = {
+      name = "ip";
+      packageName = "ip";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz";
+        sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
+      };
+    };
+    "smart-buffer-1.1.15" = {
+      name = "smart-buffer";
+      packageName = "smart-buffer";
+      version = "1.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz";
+        sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16";
+      };
+    };
+    "err-code-1.1.2" = {
+      name = "err-code";
+      packageName = "err-code";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz";
+        sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
+      };
+    };
+    "genfun-4.0.1" = {
+      name = "genfun";
+      packageName = "genfun";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/genfun/-/genfun-4.0.1.tgz";
+        sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1";
+      };
+    };
+    "bl-1.2.1" = {
+      name = "bl";
+      packageName = "bl";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz";
+        sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
+      };
+    };
+    "mute-stream-0.0.7" = {
+      name = "mute-stream";
+      packageName = "mute-stream";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
+        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
+      };
+    };
+    "util-extend-1.0.3" = {
+      name = "util-extend";
+      packageName = "util-extend";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz";
+        sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
+      };
+    };
     "from2-1.3.0" = {
       name = "from2";
       packageName = "from2";
@@ -4360,33 +4612,6 @@ let
         sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
       };
     };
-    "lru-cache-4.0.2" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz";
-        sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
-      };
-    };
-    "pseudomap-1.0.2" = {
-      name = "pseudomap";
-      packageName = "pseudomap";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
-      };
-    };
-    "yallist-2.1.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
-        sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
-      };
-    };
     "dot-prop-4.1.1" = {
       name = "dot-prop";
       packageName = "dot-prop";
@@ -4414,15 +4639,6 @@ let
         sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
       };
     };
-    "write-file-atomic-2.1.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
-      };
-    };
     "is-obj-1.0.1" = {
       name = "is-obj";
       packageName = "is-obj";
@@ -5279,18 +5495,14 @@ in
           sources."replace-ext-0.0.1"
           (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.2.9" // {
+              (sources."readable-stream-2.2.10" // {
                 dependencies = [
-                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
+                  sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
-                  (sources."string_decoder-1.0.1" // {
-                    dependencies = [
-                      sources."safe-buffer-5.0.1"
-                    ];
-                  })
+                  sources."safe-buffer-5.1.0"
+                  sources."string_decoder-1.0.1"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -5621,10 +5833,10 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.6.1";
+    version = "3.6.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.1.tgz";
-      sha1 = "19561067ff185464aded478212681f47fd578cbc";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
+      sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
     };
     dependencies = [
       (sources."fstream-1.0.11" // {
@@ -5675,18 +5887,14 @@ in
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.9" // {
+              (sources."readable-stream-2.2.10" // {
                 dependencies = [
-                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
+                  sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
-                  (sources."string_decoder-1.0.1" // {
-                    dependencies = [
-                      sources."safe-buffer-5.0.1"
-                    ];
-                  })
+                  sources."safe-buffer-5.1.0"
+                  sources."string_decoder-1.0.1"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -5695,7 +5903,7 @@ in
           sources."console-control-strings-1.1.0"
           (sources."gauge-2.7.4" // {
             dependencies = [
-              sources."aproba-1.1.1"
+              sources."aproba-1.1.2"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.1"
               sources."signal-exit-3.0.2"
@@ -5803,7 +6011,7 @@ in
           sources."oauth-sign-0.8.2"
           sources."performance-now-0.2.0"
           sources."qs-6.4.0"
-          sources."safe-buffer-5.0.1"
+          sources."safe-buffer-5.1.0"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -5893,7 +6101,7 @@ in
                 dependencies = [
                   (sources."bplist-parser-0.1.1" // {
                     dependencies = [
-                      sources."big-integer-1.6.22"
+                      sources."big-integer-1.6.23"
                     ];
                   })
                   (sources."meow-3.7.0" // {
@@ -6161,7 +6369,7 @@ in
       (sources."v8-debug-1.0.1" // {
         dependencies = [
           sources."nan-2.6.2"
-          (sources."node-pre-gyp-0.6.35" // {
+          (sources."node-pre-gyp-0.6.36" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -6184,18 +6392,14 @@ in
                   (sources."are-we-there-yet-1.1.4" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.9" // {
+                      (sources."readable-stream-2.2.10" // {
                         dependencies = [
-                          sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
-                          sources."isarray-1.0.0"
                           sources."inherits-2.0.3"
+                          sources."isarray-1.0.0"
                           sources."process-nextick-args-1.0.7"
-                          (sources."string_decoder-1.0.1" // {
-                            dependencies = [
-                              sources."safe-buffer-5.0.1"
-                            ];
-                          })
+                          sources."safe-buffer-5.1.0"
+                          sources."string_decoder-1.0.1"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -6204,7 +6408,7 @@ in
                   sources."console-control-strings-1.1.0"
                   (sources."gauge-2.7.4" // {
                     dependencies = [
-                      sources."aproba-1.1.1"
+                      sources."aproba-1.1.2"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.1"
                       sources."signal-exit-3.0.2"
@@ -6306,7 +6510,7 @@ in
                   sources."oauth-sign-0.8.2"
                   sources."performance-now-0.2.0"
                   sources."qs-6.4.0"
-                  sources."safe-buffer-5.0.1"
+                  sources."safe-buffer-5.1.0"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -6387,18 +6591,14 @@ in
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.2.9" // {
+                  (sources."readable-stream-2.2.10" // {
                     dependencies = [
-                      sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
-                      sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
+                      sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
-                      (sources."string_decoder-1.0.1" // {
-                        dependencies = [
-                          sources."safe-buffer-5.0.1"
-                        ];
-                      })
+                      sources."safe-buffer-5.1.0"
+                      sources."string_decoder-1.0.1"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -6412,7 +6612,7 @@ in
       (sources."v8-profiler-5.7.0" // {
         dependencies = [
           sources."nan-2.6.2"
-          (sources."node-pre-gyp-0.6.35" // {
+          (sources."node-pre-gyp-0.6.36" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -6435,18 +6635,14 @@ in
                   (sources."are-we-there-yet-1.1.4" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.9" // {
+                      (sources."readable-stream-2.2.10" // {
                         dependencies = [
-                          sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
-                          sources."isarray-1.0.0"
                           sources."inherits-2.0.3"
+                          sources."isarray-1.0.0"
                           sources."process-nextick-args-1.0.7"
-                          (sources."string_decoder-1.0.1" // {
-                            dependencies = [
-                              sources."safe-buffer-5.0.1"
-                            ];
-                          })
+                          sources."safe-buffer-5.1.0"
+                          sources."string_decoder-1.0.1"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -6455,7 +6651,7 @@ in
                   sources."console-control-strings-1.1.0"
                   (sources."gauge-2.7.4" // {
                     dependencies = [
-                      sources."aproba-1.1.1"
+                      sources."aproba-1.1.2"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.1"
                       sources."signal-exit-3.0.2"
@@ -6557,7 +6753,7 @@ in
                   sources."oauth-sign-0.8.2"
                   sources."performance-now-0.2.0"
                   sources."qs-6.4.0"
-                  sources."safe-buffer-5.0.1"
+                  sources."safe-buffer-5.1.0"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -6638,18 +6834,14 @@ in
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.2.9" // {
+                  (sources."readable-stream-2.2.10" // {
                     dependencies = [
-                      sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
-                      sources."isarray-1.0.0"
                       sources."inherits-2.0.3"
+                      sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
-                      (sources."string_decoder-1.0.1" // {
-                        dependencies = [
-                          sources."safe-buffer-5.0.1"
-                        ];
-                      })
+                      sources."safe-buffer-5.1.0"
+                      sources."string_decoder-1.0.1"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -6724,10 +6916,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.35";
+    version = "0.6.36";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.35.tgz";
-      sha1 = "1c161fc9fbf1f3ffecd751959f0fdbd12a56c4ab";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz";
+      sha1 = "db604112cb74e0d477554e9b505b17abddfab786";
     };
     dependencies = [
       (sources."mkdirp-0.5.1" // {
@@ -6751,18 +6943,14 @@ in
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.9" // {
+              (sources."readable-stream-2.2.10" // {
                 dependencies = [
-                  sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
-                  sources."isarray-1.0.0"
                   sources."inherits-2.0.3"
+                  sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
-                  (sources."string_decoder-1.0.1" // {
-                    dependencies = [
-                      sources."safe-buffer-5.0.1"
-                    ];
-                  })
+                  sources."safe-buffer-5.1.0"
+                  sources."string_decoder-1.0.1"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -6771,7 +6959,7 @@ in
           sources."console-control-strings-1.1.0"
           (sources."gauge-2.7.4" // {
             dependencies = [
-              sources."aproba-1.1.1"
+              sources."aproba-1.1.2"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.1"
               sources."signal-exit-3.0.2"
@@ -6881,7 +7069,7 @@ in
           sources."oauth-sign-0.8.2"
           sources."performance-now-0.2.0"
           sources."qs-6.4.0"
-          sources."safe-buffer-5.0.1"
+          sources."safe-buffer-5.1.0"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -6968,18 +7156,14 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."readable-stream-2.2.9" // {
+          (sources."readable-stream-2.2.10" // {
             dependencies = [
-              sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
-              sources."isarray-1.0.0"
               sources."inherits-2.0.3"
+              sources."isarray-1.0.0"
               sources."process-nextick-args-1.0.7"
-              (sources."string_decoder-1.0.1" // {
-                dependencies = [
-                  sources."safe-buffer-5.0.1"
-                ];
-              })
+              sources."safe-buffer-5.1.0"
+              sources."string_decoder-1.0.1"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -6998,10 +7182,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.6.1";
+    version = "5.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz";
-      sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
+      url = "https://registry.npmjs.org/npm/-/npm-5.0.2.tgz";
+      sha1 = "139e6c29c5a4982af11dda04e48aea783156d190";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -7014,10 +7198,14 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."archy-1.0.0"
-      sources."asap-2.0.5"
       sources."bluebird-3.5.0"
+      (sources."cacache-9.2.6" // {
+        dependencies = [
+          sources."y18n-3.2.1"
+        ];
+      })
       sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
@@ -7039,7 +7227,12 @@ in
           sources."proto-list-1.2.4"
         ];
       })
-      sources."dezalgo-1.0.3"
+      sources."detect-indent-5.0.0"
+      (sources."dezalgo-1.0.3" // {
+        dependencies = [
+          sources."asap-2.0.5"
+        ];
+      })
       sources."editor-1.0.0"
       sources."fs-vacuum-1.2.10"
       sources."fs-write-stream-atomic-1.0.10"
@@ -7102,6 +7295,12 @@ in
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
+      (sources."lru-cache-4.0.2" // {
+        dependencies = [
+          sources."pseudomap-1.0.2"
+          sources."yallist-2.1.2"
+        ];
+      })
       (sources."mississippi-1.3.0" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
@@ -7152,7 +7351,7 @@ in
           sources."run-queue-1.0.3"
         ];
       })
-      (sources."node-gyp-3.6.1" // {
+      (sources."node-gyp-3.6.2" // {
         dependencies = [
           (sources."minimatch-3.0.4" // {
             dependencies = [
@@ -7168,7 +7367,6 @@ in
         ];
       })
       sources."nopt-4.0.1"
-      sources."normalize-git-url-3.0.2"
       (sources."normalize-package-data-2.3.8" // {
         dependencies = [
           (sources."is-builtin-module-1.0.0" // {
@@ -7180,8 +7378,8 @@ in
       })
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.2.1"
-      (sources."npm-registry-client-8.1.1" // {
+      sources."npm-package-arg-5.1.1"
+      (sources."npm-registry-client-8.3.0" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
             dependencies = [
@@ -7190,8 +7388,8 @@ in
           })
         ];
       })
-      sources."npm-user-validate-0.1.5"
-      (sources."npmlog-4.0.2" // {
+      sources."npm-user-validate-1.0.0"
+      (sources."npmlog-4.1.0" // {
         dependencies = [
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
@@ -7227,7 +7425,123 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
+      (sources."pacote-2.7.27" // {
+        dependencies = [
+          (sources."make-fetch-happen-2.4.10" // {
+            dependencies = [
+              (sources."agentkeepalive-3.1.0" // {
+                dependencies = [
+                  (sources."humanize-ms-1.2.1" // {
+                    dependencies = [
+                      sources."ms-2.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."http-cache-semantics-3.7.3"
+              (sources."http-proxy-agent-1.0.0" // {
+                dependencies = [
+                  (sources."agent-base-2.1.1" // {
+                    dependencies = [
+                      sources."semver-5.0.3"
+                    ];
+                  })
+                  sources."extend-3.0.1"
+                  (sources."debug-2.6.8" // {
+                    dependencies = [
+                      sources."ms-2.0.0"
+                    ];
+                  })
+                ];
+              })
+              (sources."https-proxy-agent-1.0.0" // {
+                dependencies = [
+                  (sources."agent-base-2.1.1" // {
+                    dependencies = [
+                      sources."semver-5.0.3"
+                    ];
+                  })
+                  (sources."debug-2.6.8" // {
+                    dependencies = [
+                      sources."ms-2.0.0"
+                    ];
+                  })
+                  sources."extend-3.0.1"
+                ];
+              })
+              (sources."node-fetch-npm-2.0.1" // {
+                dependencies = [
+                  (sources."encoding-0.1.12" // {
+                    dependencies = [
+                      sources."iconv-lite-0.4.17"
+                    ];
+                  })
+                  (sources."json-parse-helpfulerror-1.0.3" // {
+                    dependencies = [
+                      sources."jju-1.3.0"
+                    ];
+                  })
+                ];
+              })
+              (sources."socks-proxy-agent-2.1.0" // {
+                dependencies = [
+                  (sources."agent-base-2.1.1" // {
+                    dependencies = [
+                      sources."semver-5.0.3"
+                    ];
+                  })
+                  sources."extend-3.0.1"
+                  (sources."socks-1.1.10" // {
+                    dependencies = [
+                      sources."ip-1.1.5"
+                      sources."smart-buffer-1.1.15"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          (sources."minimatch-3.0.4" // {
+            dependencies = [
+              (sources."brace-expansion-1.1.7" // {
+                dependencies = [
+                  sources."balanced-match-0.4.2"
+                  sources."concat-map-0.0.1"
+                ];
+              })
+            ];
+          })
+          sources."npm-pick-manifest-1.0.3"
+          (sources."promise-retry-1.1.1" // {
+            dependencies = [
+              sources."err-code-1.1.2"
+            ];
+          })
+          (sources."protoduck-4.0.0" // {
+            dependencies = [
+              sources."genfun-4.0.1"
+            ];
+          })
+          (sources."tar-fs-1.15.2" // {
+            dependencies = [
+              (sources."pump-1.0.2" // {
+                dependencies = [
+                  sources."end-of-stream-1.4.0"
+                ];
+              })
+            ];
+          })
+          (sources."tar-stream-1.5.4" // {
+            dependencies = [
+              sources."bl-1.2.1"
+              sources."end-of-stream-1.4.0"
+              sources."xtend-4.0.1"
+            ];
+          })
+        ];
+      })
       sources."path-is-inside-1.0.2"
+      sources."promise-inflight-1.0.1"
       (sources."read-1.0.7" // {
         dependencies = [
           sources."mute-stream-0.0.7"
@@ -7248,22 +7562,16 @@ in
           })
         ];
       })
-      sources."read-package-tree-5.1.5"
-      (sources."readable-stream-2.2.9" // {
+      sources."read-package-tree-5.1.6"
+      (sources."readable-stream-2.2.10" // {
         dependencies = [
-          sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
           sources."isarray-1.0.0"
           sources."process-nextick-args-1.0.7"
-          (sources."string_decoder-1.0.1" // {
-            dependencies = [
-              sources."safe-buffer-5.0.1"
-            ];
-          })
+          sources."string_decoder-1.0.1"
           sources."util-deprecate-1.0.2"
         ];
       })
-      sources."realize-package-specifier-3.0.3"
       (sources."request-2.81.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
@@ -7341,7 +7649,6 @@ in
           sources."oauth-sign-0.8.2"
           sources."performance-now-0.2.0"
           sources."qs-6.4.0"
-          sources."safe-buffer-5.0.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -7353,6 +7660,7 @@ in
       })
       sources."retry-0.10.1"
       sources."rimraf-2.6.1"
+      sources."safe-buffer-5.0.1"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -7377,6 +7685,7 @@ in
           })
         ];
       })
+      sources."ssri-4.1.4"
       sources."strip-ansi-3.0.1"
       (sources."tar-2.2.1" // {
         dependencies = [
@@ -7408,16 +7717,7 @@ in
                 dependencies = [
                   (sources."execa-0.4.0" // {
                     dependencies = [
-                      (sources."cross-spawn-async-2.2.5" // {
-                        dependencies = [
-                          (sources."lru-cache-4.0.2" // {
-                            dependencies = [
-                              sources."pseudomap-1.0.2"
-                              sources."yallist-2.1.2"
-                            ];
-                          })
-                        ];
-                      })
+                      sources."cross-spawn-async-2.2.5"
                       sources."is-stream-1.1.0"
                       sources."npm-run-path-1.0.0"
                       sources."object-assign-4.1.1"
@@ -7468,7 +7768,6 @@ in
                   sources."crypto-random-string-1.0.0"
                 ];
               })
-              sources."write-file-atomic-2.1.0"
             ];
           })
           sources."is-npm-1.0.0"
@@ -7489,7 +7788,6 @@ in
                       sources."is-retry-allowed-1.1.0"
                       sources."is-stream-1.1.0"
                       sources."lowercase-keys-1.0.0"
-                      sources."safe-buffer-5.0.1"
                       sources."timed-out-4.0.1"
                       sources."unzip-response-2.0.1"
                       (sources."url-parse-lax-1.0.0" // {
@@ -7508,7 +7806,6 @@ in
                           sources."strip-json-comments-2.0.1"
                         ];
                       })
-                      sources."safe-buffer-5.0.1"
                     ];
                   })
                   (sources."registry-url-3.1.0" // {
@@ -7543,7 +7840,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.3.4"
+      sources."write-file-atomic-2.1.0"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 98d722f67d4..1a83b7ae900 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -13,6 +13,7 @@
 , "elasticdump"
 , "emoj"
 , "eslint"
+, "eslint_d"
 , "emojione"
 , "fetch-bower"
 , "forever"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 3e65dd53a07..6b6f878b908 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.1.1. Do not edit!
+# This file has been generated by node2nix 1.2.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -22,33 +22,6 @@ let
         sha1 = "8c428564dce1e1f41fb337ec34f4c3b022b5ad83";
       };
     };
-    "babel-plugin-minify-constant-folding-0.1.1" = {
-      name = "babel-plugin-minify-constant-folding";
-      packageName = "babel-plugin-minify-constant-folding";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.1.1.tgz";
-        sha1 = "905fd18b19f1eccbdea251f6f4935edfaee14ab8";
-      };
-    };
-    "babel-plugin-minify-dead-code-elimination-0.1.6" = {
-      name = "babel-plugin-minify-dead-code-elimination";
-      packageName = "babel-plugin-minify-dead-code-elimination";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.1.6.tgz";
-        sha1 = "c5471346fb0a1046863fd765c784cba97d7b22e3";
-      };
-    };
-    "babel-plugin-minify-numeric-literals-0.1.1" = {
-      name = "babel-plugin-minify-numeric-literals";
-      packageName = "babel-plugin-minify-numeric-literals";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.1.1.tgz";
-        sha1 = "d4b8b0c925f874714ee33ee4b26678583d7ce7fb";
-      };
-    };
     "babel-traverse-6.24.1" = {
       name = "babel-traverse";
       packageName = "babel-traverse";
@@ -67,13 +40,13 @@ let
         sha1 = "a136879dc15b3606bda0d90c1fc74304c2ff0975";
       };
     };
-    "babylon-6.17.1" = {
+    "babylon-6.17.2" = {
       name = "babylon";
       packageName = "babylon";
-      version = "6.17.1";
+      version = "6.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babylon/-/babylon-6.17.1.tgz";
-        sha1 = "17f14fddf361b695981fe679385e4f1c01ebd86f";
+        url = "https://registry.npmjs.org/babylon/-/babylon-6.17.2.tgz";
+        sha1 = "201d25ef5f892c41bae49488b08db0dd476e9f5c";
       };
     };
     "colors-0.6.0-1" = {
@@ -589,42 +562,6 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "babel-helper-evaluate-path-0.1.0" = {
-      name = "babel-helper-evaluate-path";
-      packageName = "babel-helper-evaluate-path";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.1.0.tgz";
-        sha1 = "95d98c4ea36150483db2e7d3ec9e1954a72629cb";
-      };
-    };
-    "babel-helper-mark-eval-scopes-0.1.1" = {
-      name = "babel-helper-mark-eval-scopes";
-      packageName = "babel-helper-mark-eval-scopes";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.1.1.tgz";
-        sha1 = "4554345edf9f2549427bd2098e530253f8af2992";
-      };
-    };
-    "babel-helper-remove-or-void-0.1.1" = {
-      name = "babel-helper-remove-or-void";
-      packageName = "babel-helper-remove-or-void";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.1.1.tgz";
-        sha1 = "9d7e1856dc6fafcb41b283a416730dc1844f66d7";
-      };
-    };
-    "lodash.some-4.6.0" = {
-      name = "lodash.some";
-      packageName = "lodash.some";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz";
-        sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d";
-      };
-    };
     "globals-9.17.0" = {
       name = "globals";
       packageName = "globals";
@@ -1669,13 +1606,13 @@ let
         sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
       };
     };
-    "safe-buffer-5.0.1" = {
+    "safe-buffer-5.1.0" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.0.1";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz";
+        sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223";
       };
     };
     "buffer-equal-constant-time-1.0.1" = {
@@ -2650,13 +2587,13 @@ let
         sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
       };
     };
-    "fibers-1.0.15" = {
+    "fibers-1.0.16" = {
       name = "fibers";
       packageName = "fibers";
-      version = "1.0.15";
+      version = "1.0.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz";
-        sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c";
+        url = "https://registry.npmjs.org/fibers/-/fibers-1.0.16.tgz";
+        sha1 = "ccb48d58ec82eb646a769ab8278f514b85f34ca8";
       };
     };
     "galaxy-0.1.12" = {
@@ -2704,22 +2641,13 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.9" = {
+    "readable-stream-2.2.10" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz";
-        sha1 = "cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8";
-      };
-    };
-    "buffer-shims-1.0.0" = {
-      name = "buffer-shims";
-      packageName = "buffer-shims";
-      version = "1.0.0";
+      version = "2.2.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz";
+        sha1 = "effe72bb7c884c0dd335e2379d526196d9d011ee";
       };
     };
     "string_decoder-1.0.1" = {
@@ -2938,13 +2866,13 @@ let
         sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a";
       };
     };
-    "ext-list-2.2.1" = {
+    "ext-list-2.2.2" = {
       name = "ext-list";
       packageName = "ext-list";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.1.tgz";
-        sha1 = "ba045fac10c92300b4e0606269e4988ddc572b1e";
+        url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz";
+        sha1 = "0b98e64ed82f5acf0f2931babf69212ef52ddd37";
       };
     };
     "meow-3.7.0" = {
@@ -3901,13 +3829,13 @@ let
         sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
       };
     };
-    "randombytes-2.0.3" = {
+    "randombytes-2.0.4" = {
       name = "randombytes";
       packageName = "randombytes";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz";
-        sha1 = "674c99760901c3c4112771a31e521dc349cc09ec";
+        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.4.tgz";
+        sha1 = "9551df208422c8f80eb58e2326dd0b840ff22efd";
       };
     };
     "browserify-aes-1.0.6" = {
@@ -5521,6 +5449,15 @@ let
         sha1 = "6b94b3e447cb6a363f785eaf94af6359e8e81c80";
       };
     };
+    "safe-buffer-5.0.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
+      };
+    };
     "ultron-1.1.0" = {
       name = "ultron";
       packageName = "ultron";
@@ -6079,13 +6016,13 @@ let
         sha1 = "364200d5f13646ca8bcd44490271335614792300";
       };
     };
-    "big-integer-1.6.22" = {
+    "big-integer-1.6.23" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.22";
+      version = "1.6.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.22.tgz";
-        sha1 = "487c95fce886022ea48ff5f19e388932df46dd2e";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.23.tgz";
+        sha1 = "e85d508220c74e3f43a4ce72eed51f3da4db94d1";
       };
     };
     "sax-0.3.5" = {
@@ -6799,13 +6736,13 @@ let
         sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
       };
     };
-    "npm-package-arg-5.0.1" = {
+    "npm-package-arg-5.1.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "5.0.1";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.0.1.tgz";
-        sha1 = "09a816e3f45a549e3ddaf33e9bae5e7b31077872";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.1.tgz";
+        sha1 = "a3d09053f2d8a0bfa562624507baa597737fc3bf";
       };
     };
     "promzard-0.3.0" = {
@@ -7087,13 +7024,13 @@ let
         sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e";
       };
     };
-    "node-gyp-3.6.1" = {
+    "node-gyp-3.6.2" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "3.6.1";
+      version = "3.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.1.tgz";
-        sha1 = "19561067ff185464aded478212681f47fd578cbc";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
+        sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
       };
     };
     "nopt-3.0.6" = {
@@ -7456,6 +7393,15 @@ let
         sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
       };
     };
+    "buffer-shims-1.0.0" = {
+      name = "buffer-shims";
+      packageName = "buffer-shims";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz";
+        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
+      };
+    };
     "builtins-0.0.7" = {
       name = "builtins";
       packageName = "builtins";
@@ -9071,13 +9017,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.58.0" = {
+    "aws-sdk-2.62.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.58.0";
+      version = "2.62.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.58.0.tgz";
-        sha1 = "7ea8c3aa59e97a87c570dbe12d0042082ac1debf";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.62.0.tgz";
+        sha1 = "98508d3f93aaf3f74f18ca3b8cfe3a11bdad1a5f";
       };
     };
     "request-2.81.0" = {
@@ -9674,13 +9620,13 @@ let
         sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
       };
     };
-    "es5-ext-0.10.21" = {
+    "es5-ext-0.10.22" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.21";
+      version = "0.10.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.21.tgz";
-        sha1 = "19a725f9e51d0300bbc1e8e821109fd9daf55925";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz";
+        sha1 = "1876c51f990769c112c781ea3ebe89f84fd39071";
       };
     };
     "es6-iterator-2.0.1" = {
@@ -9998,6 +9944,33 @@ let
         sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
+    "eslint-3.19.0" = {
+      name = "eslint";
+      packageName = "eslint";
+      version = "3.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
+        sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
+      };
+    };
+    "supports-color-3.2.3" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "3.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz";
+        sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6";
+      };
+    };
+    "has-flag-1.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz";
+        sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
+      };
+    };
     "glob-3.2.11" = {
       name = "glob";
       packageName = "glob";
@@ -10511,13 +10484,13 @@ let
         sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
       };
     };
-    "node-pre-gyp-0.6.35" = {
+    "node-pre-gyp-0.6.36" = {
       name = "node-pre-gyp";
       packageName = "node-pre-gyp";
-      version = "0.6.35";
+      version = "0.6.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.35.tgz";
-        sha1 = "1c161fc9fbf1f3ffecd751959f0fdbd12a56c4ab";
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz";
+        sha1 = "db604112cb74e0d477554e9b505b17abddfab786";
       };
     };
     "npmlog-4.1.0" = {
@@ -10565,13 +10538,13 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "aproba-1.1.1" = {
+    "aproba-1.1.2" = {
       name = "aproba";
       packageName = "aproba";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz";
-        sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab";
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz";
+        sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1";
       };
     };
     "wide-align-1.1.2" = {
@@ -10818,13 +10791,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.8.27" = {
+    "uglify-js-2.8.28" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.8.27";
+      version = "2.8.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.27.tgz";
-        sha1 = "47787f912b0f242e5b984343be8e35e95f694c9c";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz";
+        sha1 = "e335032df9bb20dcb918f164589d5af47f38834a";
       };
     };
     "void-elements-2.0.1" = {
@@ -12024,15 +11997,6 @@ let
         sha1 = "3d30c718b09a3d96f23ea4cc1f403c4d3ba9ff4f";
       };
     };
-    "supports-color-3.2.3" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "3.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz";
-        sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6";
-      };
-    };
     "estraverse-1.9.3" = {
       name = "estraverse";
       packageName = "estraverse";
@@ -12051,15 +12015,6 @@ let
         sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d";
       };
     };
-    "has-flag-1.0.0" = {
-      name = "has-flag";
-      packageName = "has-flag";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz";
-        sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
-      };
-    };
     "when-3.4.6" = {
       name = "when";
       packageName = "when";
@@ -14400,31 +14355,31 @@ let
         sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018";
       };
     };
-    "node-red-node-feedparser-0.1.7" = {
+    "node-red-node-feedparser-0.1.8" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
-      version = "0.1.7";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.7.tgz";
-        sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
+        url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.8.tgz";
+        sha1 = "56cf6f69bc6d23557f8627ee63b74c1caa85c65b";
       };
     };
-    "node-red-node-email-0.1.22" = {
+    "node-red-node-email-0.1.23" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.22";
+      version = "0.1.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.22.tgz";
-        sha1 = "99c610fdba3f498ddab71da9273d6003e4e0280e";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.23.tgz";
+        sha1 = "ff910b8abb34ac926c1228e082d7667f92bb3737";
       };
     };
-    "node-red-node-twitter-0.1.10" = {
+    "node-red-node-twitter-0.1.11" = {
       name = "node-red-node-twitter";
       packageName = "node-red-node-twitter";
-      version = "0.1.10";
+      version = "0.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.10.tgz";
-        sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221";
+        url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.11.tgz";
+        sha1 = "52c074f42a32140132baea108d42cbcd0ef397d2";
       };
     };
     "node-red-node-rbe-0.1.9" = {
@@ -14580,6 +14535,15 @@ let
         sha1 = "80d6492dc1470864bbf583533b651f42a9f52415";
       };
     };
+    "lodash.some-4.6.0" = {
+      name = "lodash.some";
+      packageName = "lodash.some";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz";
+        sha1 = "1bb9f314ef6b8baded13b549169b2a945eb68e4d";
+      };
+    };
     "css-what-2.1.0" = {
       name = "css-what";
       packageName = "css-what";
@@ -15687,6 +15651,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "cacache-9.2.6" = {
+      name = "cacache";
+      packageName = "cacache";
+      version = "9.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.6.tgz";
+        sha1 = "ea5c7f2b6b514710a22a58a27f857fd972fdfa51";
+      };
+    };
     "call-limit-1.1.0" = {
       name = "call-limit";
       packageName = "call-limit";
@@ -15696,6 +15669,15 @@ let
         sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea";
       };
     };
+    "detect-indent-5.0.0" = {
+      name = "detect-indent";
+      packageName = "detect-indent";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
+        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
+      };
+    };
     "fstream-npm-1.2.1" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -15786,22 +15768,22 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-registry-client-8.1.1" = {
+    "npm-registry-client-8.3.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
-      version = "8.1.1";
+      version = "8.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz";
-        sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz";
+        sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f";
       };
     };
-    "npmlog-4.0.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "4.0.2";
+    "npm-user-validate-1.0.0" = {
+      name = "npm-user-validate";
+      packageName = "npm-user-validate";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
-        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
+        url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-1.0.0.tgz";
+        sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951";
       };
     };
     "opener-1.4.3" = {
@@ -15813,6 +15795,24 @@ let
         sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
+    "pacote-2.7.27" = {
+      name = "pacote";
+      packageName = "pacote";
+      version = "2.7.27";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.27.tgz";
+        sha1 = "ab3a7e6b584d351c9d19bfe76b0b420f7013eff6";
+      };
+    };
+    "promise-inflight-1.0.1" = {
+      name = "promise-inflight";
+      packageName = "promise-inflight";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz";
+        sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
+      };
+    };
     "read-cmd-shim-1.0.1" = {
       name = "read-cmd-shim";
       packageName = "read-cmd-shim";
@@ -15822,13 +15822,13 @@ let
         sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b";
       };
     };
-    "read-package-tree-5.1.5" = {
+    "read-package-tree-5.1.6" = {
       name = "read-package-tree";
       packageName = "read-package-tree";
-      version = "5.1.5";
+      version = "5.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.5.tgz";
-        sha1 = "ace7e6381c7684f970aaa98fc7c5d2b666addab6";
+        url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.6.tgz";
+        sha1 = "4f03e83d0486856fb60d97c94882841c2a7b1b7a";
       };
     };
     "sorted-union-stream-2.1.3" = {
@@ -15840,6 +15840,15 @@ let
         sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
       };
     };
+    "ssri-4.1.4" = {
+      name = "ssri";
+      packageName = "ssri";
+      version = "4.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.4.tgz";
+        sha1 = "22be0659c075a612b622158872b585d5fe6b03af";
+      };
+    };
     "unique-filename-1.1.0" = {
       name = "unique-filename";
       packageName = "unique-filename";
@@ -15858,6 +15867,15 @@ let
         sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
       };
     };
+    "write-file-atomic-2.1.0" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
+        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
+      };
+    };
     "lodash._baseindexof-3.1.0" = {
       name = "lodash._baseindexof";
       packageName = "lodash._baseindexof";
@@ -15957,98 +15975,269 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "stream-iterate-1.2.0" = {
-      name = "stream-iterate";
-      packageName = "stream-iterate";
-      version = "1.2.0";
+    "make-fetch-happen-2.4.10" = {
+      name = "make-fetch-happen";
+      packageName = "make-fetch-happen";
+      version = "2.4.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
-        sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.10.tgz";
+        sha1 = "5e52244a4cd80be925f5c8118a38ad0c2ceb4a81";
       };
     };
-    "unique-slug-2.0.0" = {
-      name = "unique-slug";
-      packageName = "unique-slug";
-      version = "2.0.0";
+    "npm-pick-manifest-1.0.3" = {
+      name = "npm-pick-manifest";
+      packageName = "npm-pick-manifest";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz";
-        sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.3.tgz";
+        sha1 = "a56fed120b2d8adaec5334ddd07cf23b2389e8de";
       };
     };
-    "boxen-1.1.0" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "1.1.0";
+    "promise-retry-1.1.1" = {
+      name = "promise-retry";
+      packageName = "promise-retry";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz";
-        sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102";
+        url = "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz";
+        sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d";
       };
     };
-    "configstore-3.1.0" = {
-      name = "configstore";
-      packageName = "configstore";
-      version = "3.1.0";
+    "protoduck-4.0.0" = {
+      name = "protoduck";
+      packageName = "protoduck";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz";
-        sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1";
+        url = "https://registry.npmjs.org/protoduck/-/protoduck-4.0.0.tgz";
+        sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
       };
     };
-    "latest-version-3.1.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
+    "tar-fs-1.15.2" = {
+      name = "tar-fs";
+      packageName = "tar-fs";
+      version = "1.15.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz";
+        sha1 = "761f5b32932c7b39461a60d537faea0d8084830c";
+      };
+    };
+    "agentkeepalive-3.1.0" = {
+      name = "agentkeepalive";
+      packageName = "agentkeepalive";
       version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz";
-        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
+        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.1.0.tgz";
+        sha1 = "0393a4f1e68f85d355887c2e71681b28f3b7df35";
       };
     };
-    "lazy-req-2.0.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "2.0.0";
+    "http-cache-semantics-3.7.3" = {
+      name = "http-cache-semantics";
+      packageName = "http-cache-semantics";
+      version = "3.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
-        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.7.3.tgz";
+        sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72";
       };
     };
-    "xdg-basedir-3.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "3.0.0";
+    "http-proxy-agent-1.0.0" = {
+      name = "http-proxy-agent";
+      packageName = "http-proxy-agent";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
-        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
+        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz";
+        sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a";
       };
     };
-    "ansi-align-2.0.0" = {
-      name = "ansi-align";
-      packageName = "ansi-align";
-      version = "2.0.0";
+    "https-proxy-agent-1.0.0" = {
+      name = "https-proxy-agent";
+      packageName = "https-proxy-agent";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";
-        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz";
+        sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6";
       };
     };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
+    "node-fetch-npm-2.0.1" = {
+      name = "node-fetch-npm";
+      packageName = "node-fetch-npm";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.1.tgz";
+        sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465";
       };
     };
-    "term-size-0.1.1" = {
-      name = "term-size";
-      packageName = "term-size";
-      version = "0.1.1";
+    "socks-proxy-agent-2.1.0" = {
+      name = "socks-proxy-agent";
+      packageName = "socks-proxy-agent";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz";
-        sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca";
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.0.tgz";
+        sha1 = "ddfb01b5dbea5fc879490ca38a25fe87d3d15912";
       };
     };
-    "execa-0.4.0" = {
-      name = "execa";
+    "humanize-ms-1.2.1" = {
+      name = "humanize-ms";
+      packageName = "humanize-ms";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz";
+        sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed";
+      };
+    };
+    "agent-base-2.1.1" = {
+      name = "agent-base";
+      packageName = "agent-base";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz";
+        sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7";
+      };
+    };
+    "semver-5.0.3" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
+        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
+      };
+    };
+    "iconv-lite-0.4.17" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz";
+        sha1 = "4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d";
+      };
+    };
+    "socks-1.1.10" = {
+      name = "socks";
+      packageName = "socks";
+      version = "1.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz";
+        sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a";
+      };
+    };
+    "smart-buffer-1.1.15" = {
+      name = "smart-buffer";
+      packageName = "smart-buffer";
+      version = "1.1.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz";
+        sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16";
+      };
+    };
+    "err-code-1.1.2" = {
+      name = "err-code";
+      packageName = "err-code";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz";
+        sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
+      };
+    };
+    "genfun-4.0.1" = {
+      name = "genfun";
+      packageName = "genfun";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/genfun/-/genfun-4.0.1.tgz";
+        sha1 = "ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1";
+      };
+    };
+    "stream-iterate-1.2.0" = {
+      name = "stream-iterate";
+      packageName = "stream-iterate";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stream-iterate/-/stream-iterate-1.2.0.tgz";
+        sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1";
+      };
+    };
+    "unique-slug-2.0.0" = {
+      name = "unique-slug";
+      packageName = "unique-slug";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz";
+        sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
+      };
+    };
+    "boxen-1.1.0" = {
+      name = "boxen";
+      packageName = "boxen";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz";
+        sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102";
+      };
+    };
+    "configstore-3.1.0" = {
+      name = "configstore";
+      packageName = "configstore";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/configstore/-/configstore-3.1.0.tgz";
+        sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1";
+      };
+    };
+    "latest-version-3.1.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz";
+        sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
+      };
+    };
+    "lazy-req-2.0.0" = {
+      name = "lazy-req";
+      packageName = "lazy-req";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz";
+        sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4";
+      };
+    };
+    "xdg-basedir-3.0.0" = {
+      name = "xdg-basedir";
+      packageName = "xdg-basedir";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz";
+        sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
+      };
+    };
+    "ansi-align-2.0.0" = {
+      name = "ansi-align";
+      packageName = "ansi-align";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz";
+        sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f";
+      };
+    };
+    "camelcase-4.1.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+        sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+      };
+    };
+    "term-size-0.1.1" = {
+      name = "term-size";
+      packageName = "term-size";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz";
+        sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca";
+      };
+    };
+    "execa-0.4.0" = {
+      name = "execa";
       packageName = "execa";
       version = "0.4.0";
       src = fetchurl {
@@ -16092,15 +16281,6 @@ let
         sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
       };
     };
-    "write-file-atomic-2.1.0" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.1.0.tgz";
-        sha1 = "1769f4b551eedce419f0505deae2e26763542d37";
-      };
-    };
     "crypto-random-string-1.0.0" = {
       name = "crypto-random-string";
       packageName = "crypto-random-string";
@@ -16353,13 +16533,13 @@ let
         sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea";
       };
     };
-    "require-dir-0.3.1" = {
+    "require-dir-0.3.2" = {
       name = "require-dir";
       packageName = "require-dir";
-      version = "0.3.1";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.1.tgz";
-        sha1 = "b5a8e28bae0343bb0d0cc38ab1f531e1931b264a";
+        url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.2.tgz";
+        sha1 = "c1d5c75e9fbffde9f2e6b33e383db4f594b5a6a9";
       };
     };
     "semver-utils-1.1.1" = {
@@ -16371,13 +16551,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.32.0" = {
+    "snyk-1.33.0" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.32.0";
+      version = "1.33.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.32.0.tgz";
-        sha1 = "ccf3719a6bdebaed4e94ab5f1f7eb1671f0b9774";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.33.0.tgz";
+        sha1 = "8e31a889e26f58819ca5eb5b39f95600afa67ac1";
       };
     };
     "spawn-please-0.2.0" = {
@@ -16407,6 +16587,15 @@ let
         sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36";
       };
     };
+    "npmlog-4.0.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.0.2.tgz";
+        sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f";
+      };
+    };
     "request-2.75.0" = {
       name = "request";
       packageName = "request";
@@ -17527,96 +17716,6 @@ let
         sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     };
-    "ast-types-0.9.8" = {
-      name = "ast-types";
-      packageName = "ast-types";
-      version = "0.9.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.8.tgz";
-        sha1 = "6cb6a40beba31f49f20928e28439fc14a3dab078";
-      };
-    };
-    "babylon-7.0.0-beta.8" = {
-      name = "babylon";
-      packageName = "babylon";
-      version = "7.0.0-beta.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.8.tgz";
-        sha1 = "2bdc5ae366041442c27e068cce6f0d7c06ea9949";
-      };
-    };
-    "flow-parser-0.45.0" = {
-      name = "flow-parser";
-      packageName = "flow-parser";
-      version = "0.45.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.45.0.tgz";
-        sha1 = "aa29d4ae27f06aa02817772bba0fcbefef7e62f0";
-      };
-    };
-    "jest-validate-19.0.0" = {
-      name = "jest-validate";
-      packageName = "jest-validate";
-      version = "19.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-validate/-/jest-validate-19.0.0.tgz";
-        sha1 = "8c6318a20ecfeaba0ba5378bfbb8277abded4173";
-      };
-    };
-    "jest-matcher-utils-19.0.0" = {
-      name = "jest-matcher-utils";
-      packageName = "jest-matcher-utils";
-      version = "19.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-19.0.0.tgz";
-        sha1 = "5ecd9b63565d2b001f61fbf7ec4c7f537964564d";
-      };
-    };
-    "leven-2.1.0" = {
-      name = "leven";
-      packageName = "leven";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
-        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
-      };
-    };
-    "pretty-format-19.0.0" = {
-      name = "pretty-format";
-      packageName = "pretty-format";
-      version = "19.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-format/-/pretty-format-19.0.0.tgz";
-        sha1 = "56530d32acb98a3fa4851c4e2b9d37b420684c84";
-      };
-    };
-    "ansi-styles-3.0.0" = {
-      name = "ansi-styles";
-      packageName = "ansi-styles";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.0.0.tgz";
-        sha1 = "5404e93a544c4fec7f048262977bebfe3155e0c1";
-      };
-    };
-    "color-convert-1.9.0" = {
-      name = "color-convert";
-      packageName = "color-convert";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
-        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
-      };
-    };
-    "color-name-1.1.2" = {
-      name = "color-name";
-      packageName = "color-name";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
-        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
-      };
-    };
     "commoner-0.10.8" = {
       name = "commoner";
       packageName = "commoner";
@@ -17635,15 +17734,6 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "iconv-lite-0.4.17" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz";
-        sha1 = "4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d";
-      };
-    };
     "recast-0.11.23" = {
       name = "recast";
       packageName = "recast";
@@ -18806,15 +18896,6 @@ let
         sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
       };
     };
-    "npm-registry-client-8.3.0" = {
-      name = "npm-registry-client";
-      packageName = "npm-registry-client";
-      version = "8.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz";
-        sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f";
-      };
-    };
     "octicons-3.5.0" = {
       name = "octicons";
       packageName = "octicons";
@@ -18878,6 +18959,15 @@ let
         sha1 = "420ef75e840c1457a80adcca9bc6fa3849de51aa";
       };
     };
+    "color-convert-1.9.0" = {
+      name = "color-convert";
+      packageName = "color-convert";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz";
+        sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
+      };
+    };
     "color-string-1.5.2" = {
       name = "color-string";
       packageName = "color-string";
@@ -18887,6 +18977,15 @@ let
         sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9";
       };
     };
+    "color-name-1.1.2" = {
+      name = "color-name";
+      packageName = "color-name";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz";
+        sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d";
+      };
+    };
     "simple-swizzle-0.2.2" = {
       name = "simple-swizzle";
       packageName = "simple-swizzle";
@@ -19058,13 +19157,13 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
-    "ssri-4.1.3" = {
-      name = "ssri";
-      packageName = "ssri";
-      version = "4.1.3";
+    "npm-registry-client-8.1.1" = {
+      name = "npm-registry-client";
+      packageName = "npm-registry-client";
+      version = "8.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.3.tgz";
-        sha1 = "ec8b5585cbfc726a5f9aad829efce238de831935";
+        url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.1.1.tgz";
+        sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf";
       };
     };
     "lsmod-1.0.0" = {
@@ -19364,15 +19463,6 @@ let
         sha1 = "01aa9c401edd92750514470b8266390c66c67318";
       };
     };
-    "detect-indent-5.0.0" = {
-      name = "detect-indent";
-      packageName = "detect-indent";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
-        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
-      };
-    };
     "gunzip-maybe-1.4.0" = {
       name = "gunzip-maybe";
       packageName = "gunzip-maybe";
@@ -19400,6 +19490,15 @@ let
         sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
       };
     };
+    "leven-2.1.0" = {
+      name = "leven";
+      packageName = "leven";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
+        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
+      };
+    };
     "node-emoji-1.5.1" = {
       name = "node-emoji";
       packageName = "node-emoji";
@@ -19436,15 +19535,6 @@ let
         sha1 = "cd692cfb2cc744fd84a3358aac6ee51528cf720d";
       };
     };
-    "tar-fs-1.15.2" = {
-      name = "tar-fs";
-      packageName = "tar-fs";
-      version = "1.15.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz";
-        sha1 = "761f5b32932c7b39461a60d537faea0d8084830c";
-      };
-    };
     "v8-compile-cache-1.1.0" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
@@ -19964,10 +20054,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.10.1";
+    version = "1.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.10.1.tgz";
-      sha1 = "cdfb8b1b559acb79cc94cd22c49378ec72e11a81";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.10.2.tgz";
+      sha1 = "998e5cc410fc8eec02fb9007ef95c76ab4ac586f";
     };
     dependencies = [
       sources."async-2.4.1"
@@ -19976,12 +20066,9 @@ in
           sources."source-map-0.5.6"
         ];
       })
-      sources."babel-plugin-minify-constant-folding-0.1.1"
-      sources."babel-plugin-minify-dead-code-elimination-0.1.6"
-      sources."babel-plugin-minify-numeric-literals-0.1.1"
       sources."babel-traverse-6.24.1"
       sources."babel-types-6.24.1"
-      sources."babylon-6.17.1"
+      sources."babylon-6.17.2"
       sources."colors-0.6.0-1"
       sources."commander-0.6.1"
       sources."deasync-0.1.9"
@@ -20046,10 +20133,6 @@ in
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."babel-helper-evaluate-path-0.1.0"
-      sources."babel-helper-mark-eval-scopes-0.1.1"
-      sources."babel-helper-remove-or-void-0.1.1"
-      sources."lodash.some-4.6.0"
       sources."globals-9.17.0"
       sources."invariant-2.2.2"
       sources."loose-envify-1.3.1"
@@ -20250,7 +20333,7 @@ in
       sources."xpath.js-1.0.7"
       sources."base64url-2.0.0"
       sources."jwa-1.1.5"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."buffer-equal-constant-time-1.0.1"
       sources."ecdsa-sig-formatter-1.0.9"
       sources."dateformat-1.0.2-1.2.3"
@@ -20399,19 +20482,18 @@ in
       sources."punycode-1.4.1"
       sources."ctype-0.5.2"
       sources."source-map-0.1.43"
-      sources."fibers-1.0.15"
+      sources."fibers-1.0.16"
       sources."galaxy-0.1.12"
       sources."amdefine-1.0.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."string_decoder-1.0.1"
         ];
       })
       sources."http-response-object-1.1.0"
       sources."then-request-2.2.0"
       sources."typedarray-0.0.6"
-      sources."buffer-shims-1.0.0"
       sources."http-basic-2.5.1"
       sources."promise-7.1.1"
       sources."asap-2.0.5"
@@ -20476,7 +20558,7 @@ in
       sources."graceful-fs-3.0.11"
       sources."intersect-1.0.1"
       sources."ends-with-0.2.0"
-      sources."ext-list-2.2.1"
+      sources."ext-list-2.2.2"
       sources."meow-3.7.0"
       sources."sort-keys-length-1.0.1"
       sources."mime-db-1.28.0"
@@ -20627,7 +20709,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."resolve-1.3.3"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
@@ -20676,7 +20758,7 @@ in
       sources."diffie-hellman-5.0.2"
       sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
-      sources."randombytes-2.0.3"
+      sources."randombytes-2.0.4"
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.0"
@@ -20696,7 +20778,7 @@ in
       sources."ripemd160-2.0.1"
       sources."sha.js-2.4.8"
       sources."hash-base-2.0.2"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."miller-rabin-4.0.0"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -20716,7 +20798,6 @@ in
       sources."detective-4.5.0"
       sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
-      sources."buffer-shims-1.0.0"
       sources."path-parse-1.0.5"
       sources."json-stable-stringify-0.0.1"
       sources."jsonify-0.0.0"
@@ -20933,7 +21014,7 @@ in
       sources."magnet-uri-5.1.7"
       sources."parse-torrent-file-4.0.2"
       sources."simple-get-2.6.0"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."thirty-two-1.0.2"
       sources."uniq-1.0.1"
       sources."bencode-0.11.0"
@@ -20975,7 +21056,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."randombytes-2.0.3"
+      sources."randombytes-2.0.4"
       sources."run-parallel-1.1.6"
       sources."buffer-alloc-unsafe-1.0.0"
       sources."inherits-2.0.3"
@@ -21029,17 +21110,18 @@ in
       sources."run-series-1.1.4"
       (sources."simple-peer-6.4.4" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
       })
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."ws-2.3.1"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
         ];
       })
       sources."string2compact-1.2.2"
@@ -21050,7 +21132,6 @@ in
       })
       sources."ipaddr.js-1.3.0"
       sources."get-browser-rtc-1.0.2"
-      sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."ultron-1.1.0"
@@ -21089,7 +21170,7 @@ in
       sources."voc-0.5.0"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
@@ -21189,7 +21270,7 @@ in
       sources."shelljs-0.5.3"
       sources."underscore-1.8.3"
       sources."unorm-1.4.1"
-      sources."big-integer-1.6.22"
+      sources."big-integer-1.6.23"
       sources."sax-0.3.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -21339,7 +21420,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.9" // {
+      (sources."readable-stream-2.2.10" // {
         dependencies = [
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
@@ -21396,7 +21477,7 @@ in
       sources."diffie-hellman-5.0.2"
       sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
-      sources."randombytes-2.0.3"
+      sources."randombytes-2.0.4"
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.0"
@@ -21416,7 +21497,7 @@ in
       sources."ripemd160-2.0.1"
       sources."sha.js-2.4.8"
       sources."hash-base-2.0.2"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."miller-rabin-4.0.0"
       sources."function-bind-1.1.0"
       sources."is-buffer-1.1.5"
@@ -21434,7 +21515,6 @@ in
       })
       sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
-      sources."buffer-shims-1.0.0"
       sources."json-stable-stringify-0.0.1"
       sources."jsonify-0.0.0"
       sources."array-filter-0.0.1"
@@ -21511,7 +21591,7 @@ in
       sources."http-errors-1.6.1"
       sources."mime-1.3.4"
       sources."media-typer-0.3.0"
-      sources."npm-package-arg-5.0.1"
+      sources."npm-package-arg-5.1.1"
       sources."promzard-0.3.0"
       sources."read-1.0.7"
       (sources."read-package-json-2.0.5" // {
@@ -21554,7 +21634,7 @@ in
       sources."ini-1.3.4"
       sources."lockfile-1.0.3"
       sources."lru-cache-4.0.2"
-      (sources."node-gyp-3.6.1" // {
+      (sources."node-gyp-3.6.2" // {
         dependencies = [
           sources."glob-7.1.2"
         ];
@@ -21607,6 +21687,7 @@ in
       sources."debuglog-1.0.1"
       sources."readdir-scoped-modules-1.0.2"
       sources."util-extend-1.0.3"
+      sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       (sources."bl-1.1.2" // {
@@ -21976,7 +22057,7 @@ in
           sources."minimist-1.2.0"
           sources."split2-2.1.1"
           sources."through2-2.0.3"
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
@@ -21991,7 +22072,7 @@ in
       (sources."tar-stream-1.5.4" // {
         dependencies = [
           sources."bl-1.2.1"
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
@@ -22017,7 +22098,7 @@ in
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."once-1.3.3"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
@@ -22025,10 +22106,9 @@ in
       })
       sources."lru-cache-2.7.3"
       sources."stream-shift-1.0.0"
-      sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."level-packager-0.18.0"
       sources."bytewise-1.1.0"
       sources."ltgt-2.1.3"
@@ -22090,7 +22170,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.4.1"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.58.0"
+      sources."aws-sdk-2.62.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
@@ -22127,7 +22207,7 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."stringstream-0.0.5"
       (sources."tough-cookie-2.3.2" // {
         dependencies = [
@@ -22247,7 +22327,7 @@ in
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
       sources."lowercase-keys-1.0.0"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."timed-out-4.0.1"
       sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
@@ -22258,68 +22338,245 @@ in
       sources."restore-cursor-1.0.1"
       sources."exit-hook-1.1.1"
       sources."onetime-1.1.0"
-      sources."mimic-fn-1.1.0"
-      sources."camelcase-keys-2.1.0"
-      sources."decamelize-1.2.0"
-      sources."loud-rejection-1.6.0"
-      sources."map-obj-1.0.1"
-      sources."minimist-1.2.0"
-      sources."normalize-package-data-2.3.8"
-      (sources."read-pkg-up-1.0.1" // {
-        dependencies = [
-          sources."find-up-1.1.2"
-          sources."path-exists-2.1.0"
-        ];
-      })
-      sources."redent-1.0.0"
-      sources."trim-newlines-1.0.0"
-      sources."camelcase-2.1.1"
-      sources."currently-unhandled-0.4.1"
-      sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.4.2"
-      sources."is-builtin-module-1.0.0"
-      sources."semver-5.3.0"
-      sources."validate-npm-package-license-3.0.1"
-      sources."builtin-modules-1.1.1"
-      sources."spdx-correct-1.0.2"
-      sources."spdx-expression-parse-1.0.4"
-      sources."spdx-license-ids-1.2.2"
-      sources."read-pkg-1.1.0"
-      sources."load-json-file-1.1.0"
-      sources."path-type-1.1.0"
-      sources."graceful-fs-4.1.11"
-      sources."parse-json-2.2.0"
-      sources."strip-bom-2.0.0"
-      sources."error-ex-1.3.1"
-      sources."is-arrayish-0.2.1"
-      sources."is-utf8-0.2.1"
-      sources."indent-string-2.1.0"
-      sources."strip-indent-1.0.1"
-      sources."repeating-2.0.1"
-      sources."is-finite-1.0.2"
+      sources."mimic-fn-1.1.0"
+      sources."camelcase-keys-2.1.0"
+      sources."decamelize-1.2.0"
+      sources."loud-rejection-1.6.0"
+      sources."map-obj-1.0.1"
+      sources."minimist-1.2.0"
+      sources."normalize-package-data-2.3.8"
+      (sources."read-pkg-up-1.0.1" // {
+        dependencies = [
+          sources."find-up-1.1.2"
+          sources."path-exists-2.1.0"
+        ];
+      })
+      sources."redent-1.0.0"
+      sources."trim-newlines-1.0.0"
+      sources."camelcase-2.1.1"
+      sources."currently-unhandled-0.4.1"
+      sources."array-find-index-1.0.2"
+      sources."hosted-git-info-2.4.2"
+      sources."is-builtin-module-1.0.0"
+      sources."semver-5.3.0"
+      sources."validate-npm-package-license-3.0.1"
+      sources."builtin-modules-1.1.1"
+      sources."spdx-correct-1.0.2"
+      sources."spdx-expression-parse-1.0.4"
+      sources."spdx-license-ids-1.2.2"
+      sources."read-pkg-1.1.0"
+      sources."load-json-file-1.1.0"
+      sources."path-type-1.1.0"
+      sources."graceful-fs-4.1.11"
+      sources."parse-json-2.2.0"
+      sources."strip-bom-2.0.0"
+      sources."error-ex-1.3.1"
+      sources."is-arrayish-0.2.1"
+      sources."is-utf8-0.2.1"
+      sources."indent-string-2.1.0"
+      sources."strip-indent-1.0.1"
+      sources."repeating-2.0.1"
+      sources."is-finite-1.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."get-stdin-4.0.1"
+      sources."unicode-emoji-modifier-base-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Find relevant emoji from text on the command-line";
+      homepage = "https://github.com/sindresorhus/emoj#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
+  eslint = nodeEnv.buildNodePackage {
+    name = "eslint";
+    packageName = "eslint";
+    version = "3.19.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
+      sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
+    };
+    dependencies = [
+      sources."babel-code-frame-6.22.0"
+      sources."chalk-1.1.3"
+      sources."concat-stream-1.6.0"
+      sources."debug-2.6.8"
+      sources."doctrine-2.0.0"
+      sources."escope-3.6.0"
+      sources."espree-3.4.3"
+      sources."esquery-1.0.0"
+      sources."estraverse-4.2.0"
+      sources."esutils-2.0.2"
+      sources."file-entry-cache-2.0.0"
+      sources."glob-7.1.2"
+      sources."globals-9.17.0"
+      sources."ignore-3.3.3"
+      sources."imurmurhash-0.1.4"
+      sources."inquirer-0.12.0"
+      sources."is-my-json-valid-2.16.0"
+      sources."is-resolvable-1.0.0"
+      sources."js-yaml-3.8.4"
+      sources."json-stable-stringify-1.0.1"
+      sources."levn-0.3.0"
+      sources."lodash-4.17.4"
+      sources."mkdirp-0.5.1"
+      sources."natural-compare-1.4.0"
+      sources."optionator-0.8.2"
+      sources."path-is-inside-1.0.2"
+      sources."pluralize-1.2.1"
+      sources."progress-1.1.8"
+      sources."require-uncached-1.0.3"
+      sources."shelljs-0.7.7"
+      sources."strip-bom-3.0.0"
+      sources."strip-json-comments-2.0.1"
+      (sources."table-3.8.3" // {
+        dependencies = [
+          sources."string-width-2.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
+      sources."text-table-0.2.0"
+      sources."user-home-2.0.0"
+      sources."js-tokens-3.0.1"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."supports-color-2.0.0"
+      sources."ansi-regex-2.1.1"
+      sources."inherits-2.0.3"
+      sources."typedarray-0.0.6"
+      sources."readable-stream-2.2.10"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
+      sources."string_decoder-1.0.1"
+      sources."util-deprecate-1.0.2"
+      sources."ms-2.0.0"
+      sources."es6-map-0.1.5"
+      sources."es6-weak-map-2.0.2"
+      (sources."esrecurse-4.1.0" // {
+        dependencies = [
+          sources."estraverse-4.1.1"
+        ];
+      })
+      sources."d-1.0.0"
+      sources."es5-ext-0.10.22"
+      sources."es6-iterator-2.0.1"
+      sources."es6-set-0.1.5"
+      sources."es6-symbol-3.1.1"
+      sources."event-emitter-0.3.5"
+      sources."object-assign-4.1.1"
+      sources."acorn-5.0.3"
+      (sources."acorn-jsx-3.0.1" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+        ];
+      })
+      sources."flat-cache-1.2.2"
+      sources."circular-json-0.3.1"
+      sources."del-2.2.2"
+      sources."graceful-fs-4.1.11"
+      sources."write-0.2.1"
+      sources."globby-5.0.0"
+      sources."is-path-cwd-1.0.0"
+      sources."is-path-in-cwd-1.0.0"
+      sources."pify-2.3.0"
+      sources."pinkie-promise-2.0.1"
+      sources."rimraf-2.6.1"
+      sources."array-union-1.0.2"
+      sources."arrify-1.0.1"
+      sources."array-uniq-1.0.3"
+      sources."is-path-inside-1.0.0"
+      sources."pinkie-2.0.4"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."minimatch-3.0.4"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.7"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."ansi-escapes-1.4.0"
+      sources."cli-cursor-1.0.2"
+      sources."cli-width-2.1.0"
+      sources."figures-1.7.0"
+      sources."readline2-1.0.1"
+      sources."run-async-0.1.0"
+      sources."rx-lite-3.1.2"
+      sources."string-width-1.0.2"
+      sources."through-2.3.8"
+      sources."restore-cursor-1.0.1"
+      sources."exit-hook-1.1.1"
+      sources."onetime-1.1.0"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."mute-stream-0.0.5"
       sources."number-is-nan-1.0.1"
-      sources."get-stdin-4.0.1"
-      sources."unicode-emoji-modifier-base-1.0.0"
+      sources."generate-function-2.0.0"
+      sources."generate-object-property-1.2.0"
+      sources."jsonpointer-4.0.1"
+      sources."xtend-4.0.1"
+      sources."is-property-1.0.2"
+      sources."tryit-1.0.3"
+      sources."argparse-1.0.9"
+      sources."esprima-3.1.3"
+      sources."sprintf-js-1.0.3"
+      sources."jsonify-0.0.0"
+      sources."prelude-ls-1.1.2"
+      sources."type-check-0.3.2"
+      sources."minimist-0.0.8"
+      sources."deep-is-0.1.3"
+      sources."wordwrap-1.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."caller-path-0.1.0"
+      sources."resolve-from-1.0.1"
+      sources."callsites-0.2.0"
+      sources."interpret-1.0.3"
+      sources."rechoir-0.6.2"
+      sources."resolve-1.3.3"
+      sources."path-parse-1.0.5"
+      sources."ajv-4.11.8"
+      sources."ajv-keywords-1.5.1"
+      sources."slice-ansi-0.0.4"
+      sources."co-4.6.0"
+      sources."os-homedir-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Find relevant emoji from text on the command-line";
-      homepage = "https://github.com/sindresorhus/emoj#readme";
+      description = "An AST-based pattern checker for JavaScript.";
+      homepage = http://eslint.org/;
       license = "MIT";
     };
     production = true;
   };
-  eslint = nodeEnv.buildNodePackage {
-    name = "eslint";
-    packageName = "eslint";
-    version = "3.19.0";
+  eslint_d = nodeEnv.buildNodePackage {
+    name = "eslint_d";
+    packageName = "eslint_d";
+    version = "4.2.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
-      sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-4.2.5.tgz";
+      sha1 = "f0d3a150e2960a7d787841ab83eaef746432c5e1";
     };
     dependencies = [
+      (sources."chalk-1.1.3" // {
+        dependencies = [
+          sources."supports-color-2.0.0"
+        ];
+      })
+      sources."eslint-3.19.0"
+      sources."optionator-0.8.2"
+      sources."resolve-1.3.3"
+      sources."supports-color-3.2.3"
+      sources."ansi-styles-2.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."has-ansi-2.0.0"
+      sources."strip-ansi-3.0.1"
+      sources."ansi-regex-2.1.1"
       sources."babel-code-frame-6.22.0"
-      sources."chalk-1.1.3"
       sources."concat-stream-1.6.0"
       sources."debug-2.6.8"
       sources."doctrine-2.0.0"
@@ -22342,7 +22599,6 @@ in
       sources."lodash-4.17.4"
       sources."mkdirp-0.5.1"
       sources."natural-compare-1.4.0"
-      sources."optionator-0.8.2"
       sources."path-is-inside-1.0.2"
       sources."pluralize-1.2.1"
       sources."progress-1.1.8"
@@ -22359,22 +22615,15 @@ in
       sources."text-table-0.2.0"
       sources."user-home-2.0.0"
       sources."js-tokens-3.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.2.10"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."ms-2.0.0"
       sources."es6-map-0.1.5"
       sources."es6-weak-map-2.0.2"
@@ -22384,7 +22633,7 @@ in
         ];
       })
       sources."d-1.0.0"
-      sources."es5-ext-0.10.21"
+      sources."es5-ext-0.10.22"
       sources."es6-iterator-2.0.1"
       sources."es6-set-0.1.5"
       sources."es6-symbol-3.1.1"
@@ -22450,26 +22699,26 @@ in
       sources."prelude-ls-1.1.2"
       sources."type-check-0.3.2"
       sources."minimist-0.0.8"
-      sources."deep-is-0.1.3"
-      sources."wordwrap-1.0.0"
-      sources."fast-levenshtein-2.0.6"
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
       sources."interpret-1.0.3"
       sources."rechoir-0.6.2"
-      sources."resolve-1.3.3"
-      sources."path-parse-1.0.5"
       sources."ajv-4.11.8"
       sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
       sources."os-homedir-1.0.2"
+      sources."deep-is-0.1.3"
+      sources."wordwrap-1.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."path-parse-1.0.5"
+      sources."has-flag-1.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "An AST-based pattern checker for JavaScript.";
-      homepage = http://eslint.org/;
+      description = "Makes eslint the fastest linter on the planet";
+      homepage = https://github.com/mantoni/eslint_d.js;
       license = "MIT";
     };
     production = true;
@@ -22626,16 +22875,15 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."set-immediate-shim-1.0.1"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."nan-2.6.2"
-      sources."node-pre-gyp-0.6.35"
+      sources."node-pre-gyp-0.6.36"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -22666,7 +22914,7 @@ in
       })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -22877,7 +23125,7 @@ in
           sources."source-map-0.1.43"
         ];
       })
-      (sources."uglify-js-2.8.27" // {
+      (sources."uglify-js-2.8.28" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -22985,7 +23233,7 @@ in
       sources."replace-ext-0.0.1"
       (sources."through2-2.0.3" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
@@ -23013,10 +23261,9 @@ in
       sources."string_decoder-0.10.31"
       sources."inherits-2.0.3"
       sources."xtend-4.0.1"
-      sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
       sources."extend-3.0.1"
@@ -23317,7 +23564,7 @@ in
           sources."wordwrap-0.0.3"
         ];
       })
-      (sources."uglify-js-2.8.27" // {
+      (sources."uglify-js-2.8.28" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -23573,7 +23820,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -23667,7 +23914,7 @@ in
       sources."parse-json-2.2.0"
       sources."pinkie-promise-2.0.1"
       sources."read-all-stream-3.1.0"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."timed-out-3.1.3"
       sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
@@ -23675,7 +23922,6 @@ in
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
       sources."pinkie-2.0.4"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -23803,7 +24049,7 @@ in
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
       sources."rimraf-2.6.1"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       (sources."socket.io-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
@@ -23876,15 +24122,14 @@ in
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."set-immediate-shim-1.0.1"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
       sources."nan-2.6.2"
-      sources."node-pre-gyp-0.6.35"
+      sources."node-pre-gyp-0.6.36"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.0"
@@ -23907,7 +24152,7 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -24251,16 +24496,15 @@ in
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-fs-2.4.4"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."xtend-4.0.1"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
       sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
       sources."replace-ext-0.0.1"
@@ -24524,14 +24768,13 @@ in
       sources."npmlog-3.1.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.2.10"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."minimist-0.0.8"
       sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
@@ -24618,7 +24861,7 @@ in
       sources."gauge-2.6.0"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
@@ -24664,10 +24907,10 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "3.6.1";
+    version = "3.6.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.1.tgz";
-      sha1 = "19561067ff185464aded478212681f47fd578cbc";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz";
+      sha1 = "9bfbe54562286284838e750eac05295853fa1c60";
     };
     dependencies = [
       sources."fstream-1.0.11"
@@ -24699,15 +24942,14 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.2.10"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -24858,7 +25100,7 @@ in
       sources."bplist-parser-0.1.1"
       sources."meow-3.7.0"
       sources."untildify-2.1.0"
-      sources."big-integer-1.6.22"
+      sources."big-integer-1.6.23"
       sources."camelcase-keys-2.1.0"
       sources."decamelize-1.2.0"
       sources."loud-rejection-1.6.0"
@@ -24960,7 +25202,7 @@ in
       sources."safe-buffer-5.0.1"
       sources."truncate-1.0.5"
       sources."nan-2.6.2"
-      (sources."node-pre-gyp-0.6.35" // {
+      (sources."node-pre-gyp-0.6.36" // {
         dependencies = [
           sources."rimraf-2.6.1"
           sources."semver-5.3.0"
@@ -24983,13 +25225,12 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.2.10"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.1"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
@@ -25084,10 +25325,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.6.35";
+    version = "0.6.36";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.35.tgz";
-      sha1 = "1c161fc9fbf1f3ffecd751959f0fdbd12a56c4ab";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz";
+      sha1 = "db604112cb74e0d477554e9b505b17abddfab786";
     };
     dependencies = [
       sources."mkdirp-0.5.1"
@@ -25113,16 +25354,15 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.2.10"
       sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
       sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -25294,16 +25534,15 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."set-immediate-shim-1.0.1"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."nan-2.6.2"
-      sources."node-pre-gyp-0.6.35"
+      sources."node-pre-gyp-0.6.36"
       sources."mkdirp-0.5.1"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.0"
@@ -25327,7 +25566,7 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -25549,9 +25788,9 @@ in
       sources."when-3.7.7"
       sources."ws-1.1.1"
       sources."xml2js-0.4.17"
-      sources."node-red-node-feedparser-0.1.7"
-      sources."node-red-node-email-0.1.22"
-      (sources."node-red-node-twitter-0.1.10" // {
+      sources."node-red-node-feedparser-0.1.8"
+      sources."node-red-node-email-0.1.23"
+      (sources."node-red-node-twitter-0.1.11" // {
         dependencies = [
           sources."request-2.81.0"
           sources."caseless-0.12.0"
@@ -25606,14 +25845,13 @@ in
       sources."nth-check-1.0.1"
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.1"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.2.10"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
       sources."vary-1.1.1"
@@ -25910,7 +26148,7 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -25926,6 +26164,7 @@ in
       sources."fstream-1.0.11"
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
+      sources."buffer-shims-1.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -26064,10 +26303,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.6.1";
+    version = "5.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.6.1.tgz";
-      sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646";
+      url = "https://registry.npmjs.org/npm/-/npm-5.0.2.tgz";
+      sha1 = "139e6c29c5a4982af11dda04e48aea783156d190";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -26075,15 +26314,16 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."archy-1.0.0"
-      sources."asap-2.0.5"
       sources."bluebird-3.5.0"
+      sources."cacache-9.2.6"
       sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
       sources."columnify-1.5.4"
       sources."config-chain-1.1.11"
+      sources."detect-indent-5.0.0"
       sources."dezalgo-1.0.3"
       sources."editor-1.0.0"
       sources."fs-vacuum-1.2.10"
@@ -26106,37 +26346,39 @@ in
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
+      sources."lru-cache-4.0.2"
       sources."mississippi-1.3.0"
       sources."mkdirp-0.5.1"
       sources."move-concurrently-1.0.1"
-      (sources."node-gyp-3.6.1" // {
+      (sources."node-gyp-3.6.2" // {
         dependencies = [
           sources."nopt-3.0.6"
         ];
       })
       sources."nopt-4.0.1"
-      sources."normalize-git-url-3.0.2"
       sources."normalize-package-data-2.3.8"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-4.2.1"
-      sources."npm-registry-client-8.1.1"
-      sources."npm-user-validate-0.1.5"
-      sources."npmlog-4.0.2"
+      sources."npm-package-arg-5.1.1"
+      sources."npm-registry-client-8.3.0"
+      sources."npm-user-validate-1.0.0"
+      sources."npmlog-4.1.0"
       sources."once-1.4.0"
       sources."opener-1.4.3"
       sources."osenv-0.1.4"
+      sources."pacote-2.7.27"
       sources."path-is-inside-1.0.2"
+      sources."promise-inflight-1.0.1"
       sources."read-1.0.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.5"
-      sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.9"
-      sources."realize-package-specifier-3.0.3"
+      sources."read-package-tree-5.1.6"
+      sources."readable-stream-2.2.10"
       sources."request-2.81.0"
       sources."retry-0.10.1"
       sources."rimraf-2.6.1"
+      sources."safe-buffer-5.0.1"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -26149,6 +26391,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
+      sources."ssri-4.1.4"
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."text-table-0.2.0"
@@ -26161,7 +26404,7 @@ in
       sources."validate-npm-package-name-3.0.0"
       sources."which-1.2.14"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.3.4"
+      sources."write-file-atomic-2.1.0"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -26174,10 +26417,12 @@ in
       sources."validate-npm-package-license-3.0.1"
       sources."jsonparse-1.3.1"
       sources."through-2.3.8"
+      sources."y18n-3.2.1"
       sources."wcwidth-1.0.1"
       sources."defaults-1.0.3"
       sources."clone-1.0.2"
       sources."proto-list-1.2.4"
+      sources."asap-2.0.5"
       sources."fstream-ignore-1.0.5"
       sources."minimatch-3.0.4"
       sources."brace-expansion-1.1.7"
@@ -26188,6 +26433,8 @@ in
       sources."promzard-0.3.0"
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.1.2"
       sources."concat-stream-1.6.0"
       (sources."duplexify-3.5.0" // {
         dependencies = [
@@ -26226,22 +26473,48 @@ in
       sources."number-is-nan-1.0.1"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."mute-stream-0.0.7"
-      sources."util-extend-1.0.3"
+      sources."make-fetch-happen-2.4.10"
+      sources."npm-pick-manifest-1.0.3"
+      sources."promise-retry-1.1.1"
+      sources."protoduck-4.0.0"
+      sources."tar-fs-1.15.2"
+      sources."tar-stream-1.5.4"
+      sources."agentkeepalive-3.1.0"
+      sources."http-cache-semantics-3.7.3"
+      sources."http-proxy-agent-1.0.0"
+      sources."https-proxy-agent-1.0.0"
+      sources."node-fetch-npm-2.0.1"
+      sources."socks-proxy-agent-2.1.0"
+      sources."humanize-ms-1.2.1"
+      sources."ms-2.0.0"
+      (sources."agent-base-2.1.1" // {
+        dependencies = [
+          sources."semver-5.0.3"
+        ];
+      })
+      sources."extend-3.0.1"
+      sources."debug-2.6.8"
+      sources."encoding-0.1.12"
       sources."json-parse-helpfulerror-1.0.3"
+      sources."iconv-lite-0.4.17"
       sources."jju-1.3.0"
-      sources."buffer-shims-1.0.0"
+      sources."socks-1.1.10"
+      sources."ip-1.1.5"
+      sources."smart-buffer-1.1.15"
+      sources."err-code-1.1.2"
+      sources."genfun-4.0.1"
+      sources."bl-1.2.1"
+      sources."mute-stream-0.0.7"
+      sources."util-extend-1.0.3"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.5"
-      sources."extend-3.0.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
       sources."har-validator-4.2.1"
@@ -26310,11 +26583,7 @@ in
         ];
       })
       sources."chalk-1.1.3"
-      (sources."configstore-3.1.0" // {
-        dependencies = [
-          sources."write-file-atomic-2.1.0"
-        ];
-      })
+      sources."configstore-3.1.0"
       sources."is-npm-1.0.0"
       sources."latest-version-3.1.0"
       sources."lazy-req-2.0.0"
@@ -26336,9 +26605,6 @@ in
       sources."npm-run-path-1.0.0"
       sources."path-key-1.0.0"
       sources."strip-eof-1.0.0"
-      sources."lru-cache-4.0.2"
-      sources."pseudomap-1.0.2"
-      sources."yallist-2.1.2"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -26451,7 +26717,7 @@ in
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
       sources."qs-6.4.0"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -26515,14 +26781,13 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.2.10"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -26572,10 +26837,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.11.2";
+    version = "2.11.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.11.2.tgz";
-      sha1 = "1b36ffe4c8e67711a8a4618f73e3d2e3b35860c3";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.11.3.tgz";
+      sha1 = "5e0172857f89004340b1b9afc0e9acb3bc56d440";
     };
     dependencies = [
       sources."bluebird-3.5.0"
@@ -26595,10 +26860,10 @@ in
           sources."semver-4.3.6"
         ];
       })
-      sources."require-dir-0.3.1"
+      sources."require-dir-0.3.2"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.32.0" // {
+      (sources."snyk-1.33.0" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -26696,7 +26961,7 @@ in
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.5"
-      sources."read-package-tree-5.1.5"
+      sources."read-package-tree-5.1.6"
       (sources."readable-stream-2.1.5" // {
         dependencies = [
           sources."string_decoder-0.10.31"
@@ -26768,27 +27033,27 @@ in
       sources."es6-symbol-3.1.1"
       sources."ms-2.0.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.21"
+      sources."es5-ext-0.10.22"
       sources."es6-iterator-2.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
         ];
       })
       sources."typedarray-0.0.6"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
+      sources."buffer-shims-1.0.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       (sources."bl-1.1.2" // {
@@ -27099,7 +27364,11 @@ in
       sources."prfun-2.1.4"
       sources."request-2.81.0"
       sources."semver-5.3.0"
-      sources."serve-favicon-2.4.3"
+      (sources."serve-favicon-2.4.3" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       (sources."service-runner-2.3.0" // {
         dependencies = [
           sources."yargs-7.1.0"
@@ -27187,7 +27456,7 @@ in
       sources."concat-map-0.0.1"
       sources."optimist-0.6.1"
       sources."source-map-0.4.4"
-      (sources."uglify-js-2.8.27" // {
+      (sources."uglify-js-2.8.28" // {
         dependencies = [
           sources."source-map-0.5.6"
           sources."yargs-3.10.0"
@@ -27235,7 +27504,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -27289,7 +27558,7 @@ in
       sources."hot-shots-4.5.0"
       (sources."limitation-0.2.0" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
@@ -27318,7 +27587,7 @@ in
       sources."hat-0.0.3"
       (sources."kad-fs-0.0.4" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
@@ -27326,7 +27595,7 @@ in
       sources."kad-localstorage-0.0.7"
       (sources."kad-memstore-0.0.1" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
@@ -27335,18 +27604,17 @@ in
       sources."merge-1.2.0"
       (sources."msgpack5-3.4.1" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
       })
-      sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
       sources."dom-storage-2.0.2"
       (sources."bl-1.2.1" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
@@ -27465,17 +27733,16 @@ in
       sources."plist-1.2.0"
       sources."reverse-http-1.3.0"
       sources."stream-buffers-2.2.0"
-      sources."big-integer-1.6.22"
+      sources."big-integer-1.6.23"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.2.10"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
       sources."xmldom-0.1.27"
@@ -27607,7 +27874,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."randombytes-2.0.3"
+      sources."randombytes-2.0.4"
       sources."run-parallel-1.1.6"
       sources."buffer-alloc-unsafe-1.0.0"
       sources."debug-2.6.8"
@@ -27662,6 +27929,7 @@ in
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
           sources."ws-2.3.1"
+          sources."safe-buffer-5.0.1"
         ];
       })
       sources."string2compact-1.2.2"
@@ -27964,10 +28232,11 @@ in
           sources."ms-2.0.0"
         ];
       })
-      sources."randombytes-2.0.3"
+      sources."randombytes-2.0.4"
       sources."run-parallel-1.1.6"
       sources."thunky-1.0.2"
       sources."buffer-alloc-unsafe-1.0.0"
+      sources."safe-buffer-5.1.0"
       sources."ip-1.1.5"
       sources."fifo-0.1.4"
       (sources."peer-wire-protocol-0.7.0" // {
@@ -28015,17 +28284,18 @@ in
       sources."simple-get-2.6.0"
       (sources."simple-peer-6.4.4" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
         ];
       })
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
           sources."ws-2.3.1"
           sources."isarray-1.0.0"
           sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
           sources."ultron-1.1.0"
         ];
       })
@@ -28034,10 +28304,8 @@ in
       sources."simple-concat-1.0.0"
       sources."unzip-response-2.0.1"
       sources."get-browser-rtc-1.0.2"
-      sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."addr-to-ip-port-1.4.2"
       sources."which-1.2.14"
       sources."isexe-2.0.0"
@@ -28186,49 +28454,11 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.3.1";
+    version = "1.4.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.3.1.tgz";
-      sha1 = "fa0ea84b45ac0ba6de6a1e4cecdcff900d563151";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.4.2.tgz";
+      sha1 = "bcdd95ed1eca434ac7f98ca26ea4d25a2af6a2ac";
     };
-    dependencies = [
-      sources."ast-types-0.9.8"
-      sources."babel-code-frame-6.22.0"
-      sources."babylon-7.0.0-beta.8"
-      sources."chalk-1.1.3"
-      sources."esutils-2.0.2"
-      sources."flow-parser-0.45.0"
-      sources."get-stdin-5.0.1"
-      sources."glob-7.1.1"
-      sources."jest-validate-19.0.0"
-      sources."minimist-1.2.0"
-      sources."js-tokens-3.0.1"
-      sources."ansi-styles-2.2.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."has-ansi-2.0.0"
-      sources."strip-ansi-3.0.1"
-      sources."supports-color-2.0.0"
-      sources."ansi-regex-2.1.1"
-      sources."fs.realpath-1.0.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."minimatch-3.0.4"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
-      sources."concat-map-0.0.1"
-      sources."jest-matcher-utils-19.0.0"
-      sources."leven-2.1.0"
-      (sources."pretty-format-19.0.0" // {
-        dependencies = [
-          sources."ansi-styles-3.0.0"
-        ];
-      })
-      sources."color-convert-1.9.0"
-      sources."color-name-1.1.2"
-    ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Prettier is an opinionated JavaScript formatter";
@@ -28384,7 +28614,7 @@ in
       sources."mime-types-2.1.15"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -28584,7 +28814,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."oauth-sign-0.8.2"
       sources."performance-now-0.2.0"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
@@ -28669,7 +28899,7 @@ in
       sources."uc.micro-1.0.3"
       (sources."htmlparser2-3.9.2" // {
         dependencies = [
-          sources."readable-stream-2.2.9"
+          sources."readable-stream-2.2.10"
         ];
       })
       sources."regexp-quote-0.0.0"
@@ -28682,7 +28912,6 @@ in
           sources."domelementtype-1.1.3"
         ];
       })
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -28721,19 +28950,18 @@ in
       sources."graceful-readlink-1.0.1"
       sources."graceful-fs-4.1.11"
       sources."minimatch-3.0.4"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.7"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
       sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -28866,13 +29094,12 @@ in
         ];
       })
       sources."json-schema-0.2.3"
-      sources."readable-stream-2.2.9"
-      sources."buffer-shims-1.0.0"
+      sources."readable-stream-2.2.10"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
@@ -28980,16 +29207,15 @@ in
       sources."graceful-fs-4.1.11"
       sources."object-assign-4.1.1"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."prr-0.0.0"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
       sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
@@ -29026,10 +29252,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.0.13";
+    version = "3.0.15";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.13.tgz";
-      sha1 = "1871d736aa1e550c728d7e5a6556579e70925d68";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.15.tgz";
+      sha1 = "aacb323a846b234602270dead8a32441a8806f42";
     };
     dependencies = [
       sources."commander-2.9.0"
@@ -29318,7 +29544,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."archy-1.0.0"
       sources."asap-2.0.5"
       sources."call-limit-1.1.0"
@@ -29352,7 +29578,7 @@ in
       sources."lodash.without-4.4.0"
       sources."mississippi-1.3.0"
       sources."move-concurrently-1.0.1"
-      (sources."node-gyp-3.6.1" // {
+      (sources."node-gyp-3.6.2" // {
         dependencies = [
           sources."minimatch-3.0.4"
           sources."nopt-3.0.6"
@@ -29373,8 +29599,8 @@ in
       sources."read-cmd-shim-1.0.1"
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.5"
-      sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.9"
+      sources."read-package-tree-5.1.6"
+      sources."readable-stream-2.2.10"
       sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.1"
       sources."sha-2.0.1"
@@ -29472,13 +29698,12 @@ in
       sources."util-extend-1.0.3"
       sources."json-parse-helpfulerror-1.0.3"
       sources."jju-1.3.0"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -29599,7 +29824,7 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."ssri-4.1.3"
+      sources."ssri-4.1.4"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
@@ -29920,7 +30145,7 @@ in
       sources."source-map-0.5.6"
       sources."supports-color-3.2.3"
       sources."tapable-0.2.6"
-      (sources."uglify-js-2.8.27" // {
+      (sources."uglify-js-2.8.28" // {
         dependencies = [
           sources."yargs-3.10.0"
         ];
@@ -29942,16 +30167,15 @@ in
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."prr-0.0.0"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
       sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."minimist-0.0.8"
       sources."assert-1.4.1"
       sources."browserify-zlib-0.1.4"
@@ -29994,7 +30218,7 @@ in
       sources."diffie-hellman-5.0.2"
       sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
-      sources."randombytes-2.0.3"
+      sources."randombytes-2.0.4"
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.0"
@@ -30082,7 +30306,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."nan-2.6.2"
-      sources."node-pre-gyp-0.6.35"
+      sources."node-pre-gyp-0.6.36"
       sources."nopt-4.0.1"
       sources."npmlog-4.1.0"
       (sources."rc-1.2.1" // {
@@ -30104,7 +30328,7 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.1.1"
+      sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -30312,17 +30536,16 @@ in
       sources."duplexify-3.5.0"
       sources."end-of-stream-1.0.0"
       sources."inherits-2.0.3"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."stream-shift-1.0.0"
       sources."once-1.3.3"
       sources."wrappy-1.0.2"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       (sources."pump-1.0.2" // {
         dependencies = [
           (sources."end-of-stream-1.4.0" // {
@@ -30574,20 +30797,19 @@ in
       sources."node-status-codes-1.0.0"
       sources."parse-json-2.2.0"
       sources."read-all-stream-3.1.0"
-      sources."readable-stream-2.2.9"
+      sources."readable-stream-2.2.10"
       sources."timed-out-3.1.3"
       sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
       sources."error-ex-1.3.1"
       sources."is-arrayish-0.2.1"
-      sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.1.0"
       sources."string_decoder-1.0.1"
       sources."util-deprecate-1.0.2"
-      sources."safe-buffer-5.0.1"
       sources."prepend-http-1.0.4"
       sources."decamelize-1.2.0"
       sources."ansi-escapes-1.4.0"
-- 
GitLab


From 60dcb9cc01c047126e5702cdb4bf81187cb92000 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 4 Jun 2017 13:41:28 +0100
Subject: [PATCH 0357/1490] fetchsvn: set LC_ALL in builder to allow svn to
 handle unicode filenames

---
 pkgs/build-support/fetchsvn/builder.sh  | 4 ++++
 pkgs/build-support/fetchsvn/default.nix | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh
index 7a8a161712d..8ed30b37fc7 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/pkgs/build-support/fetchsvn/builder.sh
@@ -18,6 +18,10 @@ if test -n "$http_proxy"; then
     export HOME="$PWD"
 fi;
 
+if test -z "$LC_ALL"; then
+    export LC_ALL="en_US.UTF-8"
+fi;
+
 # Pipe the "p" character into Subversion to force it to accept the
 # server's certificate.  This is perfectly safe: we don't care
 # whether the server is being spoofed --- only the cryptographic
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 6ed34ec0276..8a1085affd3 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -1,4 +1,4 @@
-{stdenv, subversion, sshSupport ? false, openssh ? null}:
+{stdenv, subversion, glibcLocales, sshSupport ? false, openssh ? null}:
 {url, rev ? "HEAD", md5 ? "", sha256 ? "",
  ignoreExternals ? false, ignoreKeywords ? false, name ? null}:
 
@@ -31,7 +31,7 @@ else
 stdenv.mkDerivation {
   name = name_;
   builder = ./builder.sh;
-  buildInputs = [subversion];
+  buildInputs = [ subversion glibcLocales ];
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-- 
GitLab


From 2e6239f6661b7f9d1f6bb8ff21ce49babecc6ced Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 4 May 2017 21:41:54 +0200
Subject: [PATCH 0358/1490] goffice: 0.10.32 -> 0.10.34

---
 pkgs/development/libraries/goffice/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index cf9ab101018..8b4103dec7f 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -2,11 +2,11 @@
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.32";
+  name = "goffice-0.10.34";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "02b37da9f54fb92725b973875d1d2da49b54f6486eb03648fd1ea58e4a297ac3";
+    sha256 = "554a75a22b5863b3b17595148bee6462122f2dbf031dfa78b61e941e3c2dd603";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
-- 
GitLab


From 0de9ed92e8a14823684c99e6488678ebba4afe26 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 4 May 2017 21:42:28 +0200
Subject: [PATCH 0359/1490] gnumeric: 1.12.32 -> 1.12.34

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

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index fcd9f954a67..fda320dd54a 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -1,24 +1,35 @@
 { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
 , goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages
+, itstool
 }:
 
 let
   inherit (pythonPackages) python pygobject3;
+  isopub = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent; sha256 = "073l492jz70chcadr2p7ssx7gz5hd731s2cazhxx4r845kilyr77"; };
+  isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; };
+  isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; };
 in stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.32";
+  name = "gnumeric-1.12.34";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "a07bc83e2adaeb94bfa2c737c9a19d90381a19cb203dd7c4d5f7d6cfdbee6de8";
+    sha256 = "0b4920812d82ec4c25204543dff9dd3bdbac17bfaaabd1aa02d47fbe2981c725";
   };
 
   configureFlags = "--disable-component";
 
+  prePatch = ''
+    substituteInPlace doc/C/gnumeric.xml \
+	--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isopub.ent ${isopub} \
+	--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent ${isonum} \
+	--replace http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent ${isogrk1}
+  '';
+
   # ToDo: optional libgda, introspection?
   buildInputs = [
     pkgconfig intltool perl perlXMLParser bison
     goffice gtk3 makeWrapper gnome3.defaultIconTheme
-    python pygobject3
+    python pygobject3 itstool
   ];
 
   enableParallelBuilding = true;
@@ -35,7 +46,7 @@ in stdenv.mkDerivation rec {
     description = "The GNOME Office Spreadsheet";
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://projects.gnome.org/gnumeric/;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.vcunat ];
   };
 }
-- 
GitLab


From 2c84e814e8261e2910595e40ee4e3e6b74ed5302 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 4 Jun 2017 17:18:58 +0200
Subject: [PATCH 0360/1490] randoop: init at 3.1.5

---
 .../tools/analysis/randoop/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/randoop/default.nix

diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix
new file mode 100644
index 00000000000..4fc85c30166
--- /dev/null
+++ b/pkgs/development/tools/analysis/randoop/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "3.1.5";
+  name = "randoop-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/randoop/randoop/releases/download/v${version}/${name}.zip";
+    sha256 = "13zspyi9fgnqc90qfqqnj0hb7869l0aixv0vwgj8m4m1hggpadlx";
+  };
+
+  buildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p $out/lib $out/doc
+
+    cp -R *.jar $out/lib
+    cp README.txt $out/doc
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Automatic test generation for Java";
+    homepage = https://randoop.github.io/randoop/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bca3cee890..ce212b7482e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7072,6 +7072,8 @@ with pkgs;
 
   ragel = ragelStable;
 
+  randoop = callPackage ../development/tools/analysis/randoop { };
+
   inherit (callPackages ../development/tools/parsing/ragel {
       tex = texlive.combined.scheme-small;
     }) ragelStable ragelDev;
-- 
GitLab


From 84da90074399cdee7a1afc6360a65a3dbf65bfa2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 4 Jun 2017 17:37:52 +0200
Subject: [PATCH 0361/1490] perlPackages.DataGUID: 0.048 -> 0.049

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eaa46c16e5a..14d47410857 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2941,11 +2941,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DataGUID = buildPerlPackage {
-    name = "Data-GUID-0.048";
+  DataGUID = buildPerlPackage rec {
+    name = "Data-GUID-0.049";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.048.tar.gz;
-      sha256 = "cb263b1e6eeecc5797de6f945d42ace2db26c156172883550b73fa2ecdab29dc";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "0yx7d4qwsr9n85gslip0y3mdwr5fkncfbwxz7si2a17x95yl7bxq";
     };
     propagatedBuildInputs = [ DataUUID SubExporter SubInstall ];
     meta = {
-- 
GitLab


From f39a047dacc48db0c7873cf1a001c4aa37db0250 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 4 Jun 2017 17:48:25 +0200
Subject: [PATCH 0362/1490] yara: 3.5.0 > 3.6.0, fixes CVE-2017-5924

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

diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index a3b3c1c0290..21e5c3ffcef 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/pkgs/tools/security/yara/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.5.0";
+  version = "3.6.0";
   name = "yara-${version}";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara";
     rev = "v${version}";
-    sha256 = "18hn6acfj0cha9cv70f6hyaqf8qbgj0c0dm9db4v2q8z7cgi1681";
+    sha256 = "05nadqpvihdyxym11mn6n02rzv2ng8ga7j9l0g5gnjx366gcai42";
   };
 
   # FIXME: this is probably not the right way to make it work
-- 
GitLab


From 5cb03b9538e25929b93c7d5cfd8d9ec23d9fd092 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 4 Jun 2017 18:16:59 +0200
Subject: [PATCH 0363/1490] xlockmore: 5.53 -> 5.54

---
 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 bed8c605245..f87e24efe18 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
 
-  name = "xlockmore-5.53";
+  name = "xlockmore-5.54";
   src = fetchurl {
     url = "http://sillycycle.com/xlock/${name}.tar.xz";
-    sha256 = "0rs9vc22xgk9gi88ifimdyrhqfjgs2jybwr9kvklg5qx7ff6aws9";
+    sha256 = "0mdgl20619iii1i04pj2dq29nwvasbngy48cvd819h0wfawsqkwz";
     curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 
-- 
GitLab


From 7445649387b86f4cbf2c776fa47b5fbece8639ce Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 4 Jun 2017 13:45:53 -0400
Subject: [PATCH 0364/1490] xorg-input-libinput: 0.25.0 -> 0.25.1

This isn't part of a full xorg release, so I just added it to the xorg
overrides.nix.

Changelog and release announcement:
https://lists.x.org/archives/xorg-announce/2017-May/002798.html
---
 pkgs/servers/x11/xorg/overrides.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 99c9ffa14c2..09f75b436da 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -316,6 +316,11 @@ in
   };
 
   xf86inputlibinput = attrs: attrs // {
+    name = "xf86-input-libinput-0.25.1";
+    src = args.fetchurl {
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.1.tar.bz2;
+      sha256 = "1q67hjd67ni1nq7kgxdrrdgkyhzaqvvn2vlnsiiq9w4y3icpv7s8";
+    };
     buildInputs = attrs.buildInputs ++ [ args.libinput ];
     installFlags = "sdkdir=\${out}/include/xorg";
   };
-- 
GitLab


From beb04aabac132833e4f33e6ecbb92d6ae7380ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 4 Jun 2017 10:10:14 +0200
Subject: [PATCH 0365/1490] libretro.dolphin: init at 2017-06-04

---
 pkgs/misc/emulators/retroarch/cores.nix | 35 ++++++++++++++++++++++---
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 9d311760298..79dc382c92d 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchgit, pkgconfig, makeWrapper, python27, retroarch
-, alsaLib, fluidsynth, mesa, portaudio, SDL, ffmpeg, libpng, libjpeg
-, libvorbis, xorg, zlib }:
+{ stdenv, fetchgit, cmake, pkgconfig, makeWrapper, python27, retroarch
+, alsaLib, fluidsynth, curl, hidapi, mesa, gettext, glib, gtk2, portaudio, SDL
+, ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis
+, miniupnpc, sfml, xorg, zlib }:
 
 let
 
@@ -126,6 +127,34 @@ in
     configurePhase = "cd desmume";
   };
 
+  dolphin = (mkLibRetroCore {
+    core = "dolphin";
+    src = fetchRetro {
+      repo = "dolphin";
+      rev = "a6ad451fdd4ac8753fd1a8e2234ec34674677754";
+      sha256 = "1cshlfmhph8dl3vgvn37imvp2b7xs2cx1r1ifp5js5psvhycrbz3";
+    };
+    description = "Port of Dolphin to libretro";
+
+    extraBuildInputs = [
+      cmake curl mesa pcre pkgconfig sfml miniupnpc
+      gettext glib gtk2 hidapi
+      libevdev libudev
+    ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]);
+  }).override {
+    cmakeFlags = [
+        "-DLINUX_LOCAL_DEV=true"
+        "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
+        "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+        "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
+    ];
+    dontUseCmakeBuildDir = "yes";
+    buildPhase = ''
+      cd Source/Core/DolphinLibretro
+      make
+    '';
+  };
+
   fba = (mkLibRetroCore rec {
     core = "fba";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce212b7482e..375ec6818bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16483,6 +16483,7 @@ with pkgs;
       ++ optional (cfg.enableBeetleSaturn or false) beetle-saturn
       ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury
       ++ optional (cfg.enableDesmume or false) desmume
+      ++ optional (cfg.enableDolphin or false) dolphin
       ++ optional (cfg.enableFBA or false) fba
       ++ optional (cfg.enableFceumm or false) fceumm
       ++ optional (cfg.enableGambatte or false) gambatte
-- 
GitLab


From b8ebc60abdec00a219d2cffb0246787f292f34f5 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sun, 4 Jun 2017 15:23:34 -0400
Subject: [PATCH 0366/1490] programs.zsh.syntaxHighlighting: Fix default value
 for patterns

---
 nixos/modules/programs/zsh/zsh-syntax-highlighting.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 3bd7ab81896..9452489e2fb 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -32,7 +32,7 @@ in
         };
 
         patterns = mkOption {
-          default = [];
+          default = {};
           type = types.attrsOf types.string;
 
           example = literalExample ''
-- 
GitLab


From 96faeb19144277c73a0975ef161dd6ea384fd714 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 4 Jun 2017 16:02:42 +0200
Subject: [PATCH 0367/1490] gollum: Add Git as runtime dependency

Now "nix-shell -p gollum --pure --run gollum" should work properly.
---
 pkgs/applications/misc/gollum/default.nix | 31 +++++++++++++++--------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index db401a2dbdc..160b38463b6 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -1,17 +1,28 @@
-{ stdenv, lib, bundlerEnv, ruby
-, icu, zlib }:
+{ stdenv, bundlerEnv, ruby, makeWrapper
+, git }:
 
-bundlerEnv rec {
-  name = "gollum-${version}";
-  version = (import gemset).gollum.version;
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "gollum";
+  version = (import ./gemset.nix).gollum.version;
 
-  inherit ruby;
-  gemdir = ./.;
-  gemset = ./gemset.nix;
+  nativeBuildInputs = [ makeWrapper ];
 
-  # FIXME: Add Git as runtime dependency.
+  env = bundlerEnv {
+    name = "${name}-gems";
+    inherit pname ruby;
+    gemdir = ./.;
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/gollum $out/bin/gollum \
+      --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]}
+  '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A simple, Git-powered wiki";
     homepage = "https://github.com/gollum/gollum";
     license = licenses.mit;
-- 
GitLab


From 9caa9220a7f806c69182a5379fa9b1000781b31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=AFl=20Senhaji?= <ismail.senhaji@gmail.com>
Date: Sun, 4 Jun 2017 16:57:28 +0200
Subject: [PATCH 0368/1490] i3lock-color: 2.7-2017-04-01 -> 2.9.1-c

---
 pkgs/applications/window-managers/i3/lock-color.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index aa4001f62de..ade6182ec7b 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -2,14 +2,14 @@
 , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }:
 
 stdenv.mkDerivation rec {
-  version = "2.7-2017-04-01";
+  version = "2.9.1-c";
   name = "i3lock-color-${version}";
 
   src = fetchFromGitHub {
     owner = "chrjguill";
     repo = "i3lock-color";
-    rev = "61f6428aedbe4829d3e0f51d137283c8aec1e206";
-    sha256 = "0h4nzx46kcsp6b1i2lm9y4d1w1icrpvjl8g1h3wbpa5x4crh4703";
+    rev = version;
+    sha256 = "0qnw71qbppgp3ywj1k07av7wkl9syfb8j6izrkhj143q2ks4rkvl";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11
-- 
GitLab


From 970ad2b93afb67df8e9b557763aa5ef62eecd916 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sun, 4 Jun 2017 23:21:38 -0400
Subject: [PATCH 0369/1490] pythonPackages.systemd: 231 -> 233

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0a1d8932972..6a3b424780b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24043,21 +24043,18 @@ in {
   };
 
   systemd = buildPythonPackage rec {
-    version = "231";
+    version = "233";
     name = "python-systemd-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/systemd/python-systemd/archive/v${version}.tar.gz";
-      sha256 = "1sifq7mdg0y5ngab8vjy8995nz9c0hxny35dxs5qjx0k0hyzb71c";
+      sha256 = "1ryzv0d5y448mxpf2cx97rk0403w2w44bha8rqgww1fasx0c9dgg";
     };
 
     buildInputs = with pkgs; [ systemd pkgconfig ];
 
-    patchPhase = ''
-      substituteInPlace setup.py \
-          --replace "/usr/include" "${pkgs.systemd.dev}/include"
-      echo '#include <time.h>' >> systemd/pyutil.h
-    '';
+    # Certain tests only run successfully on a machine w/ systemd.
+    doCheck = false;
 
     meta = {
       description = "Python module for native access to the systemd facilities";
-- 
GitLab


From 2e08839cbe430a1e47d08467a55dd3c2dd9facad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 5 Jun 2017 06:11:51 +0100
Subject: [PATCH 0370/1490] sysdig: fix unified cgroup handling

---
 pkgs/os-specific/linux/sysdig/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index e7c101918ac..ed0e0849721 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "1h3f9nkc5fkvks6va0maq377m9qxnsf4q3f2dc14rdzfvnzidy06";
   };
 
+  patches = [
+    (fetchpatch {
+       # Sysdig fails to run on linux kernels with unified cgroups enabled
+       url = https://github.com/draios/sysdig/files/909689/0001-Fix-for-linux-kernels-with-cgroup-v2-API-enabled.patch.txt;
+       sha256 = "10nmisifa500hzpa3899rs837bcal72pnqidxmrnr1js187z8j84";
+    })
+  ];
+
   buildInputs = [
     cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc
   ];
-- 
GitLab


From e6550cb5c19599d7016bab488f94e8f59d0c924c Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Mon, 5 Jun 2017 07:10:49 +0200
Subject: [PATCH 0371/1490] calibre: fix RPATH problems

It took quite some discussions to find a good solution:
close #26201, close #26209.
(Authorship assigned to the author of the idea.)
---
 pkgs/applications/misc/calibre/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 6dcd96216cb..5d228d264d0 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -62,6 +62,8 @@ stdenv.mkDerivation rec {
   ]);
 
   installPhase = ''
+    runHook preInstall
+
     export HOME=$TMPDIR/fakehome
     export POPPLER_INC_DIR=${poppler_utils.dev}/include/poppler
     export POPPLER_LIB_DIR=${poppler_utils.out}/lib
@@ -92,6 +94,8 @@ stdenv.mkDerivation rec {
     for entry in $out/share/applications/*.desktop; do
       substituteAllInPlace $entry
     done
+
+    runHook postInstall
   '';
 
   calibreDesktopItem = makeDesktopItem {
-- 
GitLab


From 68eb2c2379826ea8ada3403e737fefcb963a1e4a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 31 May 2017 07:45:28 +0000
Subject: [PATCH 0372/1490] ocamlPackages.re2: mark broken on darwin

---
 pkgs/development/ocaml-modules/janestreet/default.nix | 9 ++-------
 pkgs/tools/misc/patdiff/default.nix                   | 1 -
 pkgs/top-level/ocaml-packages.nix                     | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index 98a303e2a67..d6acbaa7142 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -1,4 +1,4 @@
-{ lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime,
+{ stdenv, lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime,
   ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith,
   openssl }:
 
@@ -328,7 +328,7 @@ rec {
     propagatedBuildInputs = [ core_kernel ];
     meta = {
       description = "OCaml bindings for RE2";
-      platforms = lib.platforms.linux;
+      broken = stdenv.isDarwin;
     };
   };
 
@@ -348,7 +348,6 @@ rec {
     '';
     meta = {
       description = "Jane Street Capital's standard library overlay";
-      inherit (re2.meta) platforms;
     };
   };
 
@@ -416,7 +415,6 @@ rec {
     propagatedBuildInputs = [ core_extended async ];
     meta = {
       description = "Shell helpers for Async";
-      inherit (core_extended.meta) platforms;
     };
   };
 
@@ -479,7 +477,6 @@ rec {
     propagatedBuildInputs = [ core_extended ];
     meta = {
       description = "Micro-benchmarking library for OCaml";
-      inherit (core_extended.meta) platforms;
     };
   };
 
@@ -489,7 +486,6 @@ rec {
     propagatedBuildInputs = [ core_extended ];
     meta = {
       description = "Profiling library";
-      inherit (core_extended.meta) platforms;
     };
   };
 
@@ -513,7 +509,6 @@ rec {
     propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ];
     meta = {
       description = "E-mail message parser";
-      inherit (core_extended.meta) platforms;
     };
   };
 
diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix
index 6e3c635f87a..908da587d4b 100644
--- a/pkgs/tools/misc/patdiff/default.nix
+++ b/pkgs/tools/misc/patdiff/default.nix
@@ -8,6 +8,5 @@ janePackage {
   buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ];
   meta = {
     description = "File Diff using the Patience Diff algorithm";
-    inherit (core_extended.meta) platforms;
   };
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ab82597b9e5..708cb374880 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -594,7 +594,7 @@ let
     janeStreet = import ../development/ocaml-modules/janestreet {
       inherit lib janePackage ocamlbuild ctypes cryptokit magic-mime;
       inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith;
-      openssl = pkgs.openssl;
+      inherit (pkgs) stdenv openssl;
     };
 
     js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {};
-- 
GitLab


From e6b5a7e6272642589e692bf9af612c12b45b81eb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 5 Jun 2017 05:46:44 +0000
Subject: [PATCH 0373/1490] gnome-backgrounds: build on all unices

---
 pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix
index 32d6d6e7535..eb801caf565 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
 
   meta = with stdenv.lib; {
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = gnome3.maintainers;
   };
 }
-- 
GitLab


From dd1471b4c4d60f59ff8328d8da78af0411068b15 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 5 Jun 2017 05:50:46 +0000
Subject: [PATCH 0374/1490] libvirt: fix build on darwin

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 9449a8f538f..511f97eb3cd 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
-    attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap parted
+    libxslt xhtml1 perlPackages.XMLXPath curl libpcap
   ] ++ optionals stdenv.isLinux [
     libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs
-    libapparmor libcap_ng numactl xen
+    libapparmor libcap_ng numactl xen attr parted
   ] ++ optionals stdenv.isDarwin [
      libiconv gmp
   ];
@@ -50,7 +50,6 @@ stdenv.mkDerivation rec {
     "--with-test"
     "--with-esx"
     "--with-remote"
-    "--with-storage-disk"
   ] ++ optionals stdenv.isLinux [
     "--with-attr"
     "--with-apparmor"
@@ -59,6 +58,7 @@ stdenv.mkDerivation rec {
     "--with-macvtap"
     "--with-virtualport"
     "--with-init-script=systemd+redhat"
+    "--with-storage-disk"
     "--with-storage-zfs"
   ] ++ optionals stdenv.isDarwin [
     "--with-init-script=none"
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/libexec/libvirt-guests.sh \
       --replace "$out/bin" "${gettext}/bin" \
       --replace "lock/subsys" "lock"
-    rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
   '' + optionalString stdenv.isLinux ''
+    rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
     wrapProgram $out/sbin/libvirtd \
       --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]}
   '';
-- 
GitLab


From 6d47735c385467c9b23324cd64090b82e89f1ce8 Mon Sep 17 00:00:00 2001
From: James Kent <jameschristopherkent@gmail.com>
Date: Mon, 5 Jun 2017 08:31:26 +0100
Subject: [PATCH 0375/1490] Disable simplejson test on Darwin otherwise build
 fails.

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

diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 983d1765521..4deac80fb06 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -1,12 +1,14 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, stdenv
 }:
 
 buildPythonPackage rec {
   pname = "simplejson";
   version = "3.10.0";
   name = "${pname}-${version}";
+  doCheck = !stdenv.isDarwin;
 
   src = fetchPypi {
     inherit pname version;
@@ -25,4 +27,4 @@ buildPythonPackage rec {
     homepage = http://code.google.com/p/simplejson/;
     license = lib.licenses.mit;
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From 5b747cc7c458f4a20d4773c29c4676a41ba04340 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 5 Jun 2017 15:37:48 +0800
Subject: [PATCH 0376/1490] paperkey: 1.3 -> 1.4

---
 pkgs/tools/security/paperkey/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/paperkey/default.nix b/pkgs/tools/security/paperkey/default.nix
index c3b1d64c3a3..97a8c0af2c8 100644
--- a/pkgs/tools/security/paperkey/default.nix
+++ b/pkgs/tools/security/paperkey/default.nix
@@ -1,17 +1,16 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-
-  version = "1.3";
   name = "paperkey-${version}";
-  
+  version = "1.4";
+
   src = fetchurl {
     url = "http://www.jabberwocky.com/software/paperkey/${name}.tar.gz";
-    sha256 = "5b57d7522336fb65c4c398eec27bf44ec0aaa35926157b79a76423231792cbfb";
+    sha256 = "0vrkryxqbsjcmqalsnxvc3pahg6vvyrn139aj8md29sihgnb0az1";
   };
 
   enableParallelBuilding = true;
-  
+
   meta = with stdenv.lib; {
     description = "Store OpenPGP or GnuPG on paper";
     longDescription = ''
@@ -23,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.jabberwocky.com/software/paperkey/";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.skeidel ];
+    maintainers = with maintainers; [ skeidel ];
   };
 }
-- 
GitLab


From 1890b1fe9f1470d07f1649d5e142e3947ea44c8a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 2 Jun 2017 21:00:43 +0800
Subject: [PATCH 0377/1490] wp-cli: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix
index c52f2553e3d..9e692e214b9 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/pkgs/development/tools/wp-cli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, php }:
 
 let
-  version = "1.1.0";
+  version = "1.2.0";
 
   bin  = "bin/wp";
   ini  = "etc/php/wp-cli.ini";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
-    sha256 = "08b2lzc8fa9f5xldbdza6x3lg6jsp3wfwpyy187gxqw5pmqp11xc";
+    sha256 = "1v51230gpw3ghz8vp3s1ykrwnmka9gj0r7xjad79bc9y250vr920";
   };
 
   buildCommand = ''
-- 
GitLab


From a0598f9b347c197f979c513d6d3034aeb1855780 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 5 Jun 2017 18:02:03 +0800
Subject: [PATCH 0378/1490] tomb: clean up and use gnupg 2 instead of gnupg 1

---
 pkgs/os-specific/linux/tomb/default.nix | 44 ++++++++++++++-----------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index 141af86a337..f1347c197bf 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchurl, zsh, pinentry, cryptsetup, gnupg1orig, makeWrapper }:
-
-let
-    version = "2.4";
-in
+{ stdenv, lib, fetchFromGitHub, gettext, zsh, pinentry, cryptsetup, gnupg, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "tomb-${version}";
+  version = "2.4";
 
-  src = fetchurl {
-    url = "https://files.dyne.org/tomb/Tomb-${version}.tar.gz";
-    sha256 = "1hv1w79as7swqj0n137vz8n8mwvcgwlvd91sdyssz41jarg7f1vr";
+  src = fetchFromGitHub {
+    owner  = "dyne";
+    repo   = "Tomb";
+    rev    = "v${version}";
+    sha256 = "192jpgn02mvi4d4inbq2q11zl7xw6njymvali7al8wmygkkycrw4";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  postPatch = ''
+    # if not, it shows .tomb-wrapped when running
+    substituteInPlace tomb \
+      --replace 'TOMBEXEC=$0' 'TOMBEXEC=tomb'
+  '';
 
   buildPhase = ''
     # manually patch the interpreter
@@ -20,22 +25,21 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/man/man1
+    install -Dm755 tomb       $out/bin/tomb
+    install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1
 
-    cp tomb $out/bin/tomb
-    cp doc/tomb.1 $out/share/man/man1
+    # it works fine with gnupg v2, but it looks for an executable named gpg
+    ln -s ${gnupg}/bin/gpg2 $out/bin/gpg
 
     wrapProgram $out/bin/tomb \
-        --prefix PATH : "${pinentry}/bin" \
-        --prefix PATH : "${cryptsetup}/bin" \
-        --prefix PATH : "${gnupg1orig}/bin"
+      --prefix PATH : $out/bin:${lib.makeBinPath [ cryptsetup gettext pinentry ]}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "File encryption on GNU/Linux";
-    homepage = https://www.dyne.org/software/tomb/;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    homepage    = https://www.dyne.org/software/tomb/;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.linux;
   };
 }
-- 
GitLab


From 760095290dc49efca6fba8f4f3e5b64b82b0ca04 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 5 Jun 2017 12:57:40 +0200
Subject: [PATCH 0379/1490] emby: 3.2.15.0 -> 3.2.19.0

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

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index c3b68477808..1bf92b2247c 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.15.0";
+  version = "3.2.19.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0xfjj899l7xmmiwwbfj4j9dwgrq10911nls06viz793bflmxw082";
+    sha256 = "14gwkglngaf29zzjqyph8pqz8i8i9j2vha9g2m17slgdxif4ijzc";
   };
 
   buildInputs = with pkgs; [
-- 
GitLab


From e2bd407aef64818a0811597146b6ef8f141f9974 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 5 Jun 2017 12:59:58 +0200
Subject: [PATCH 0380/1490] sonarr: 2.0.0.4689 -> 2.0.0.4753

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

diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index de147e31da7..bd921df6e52 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sonarr-${version}";
-  version = "2.0.0.4689";
+  version = "2.0.0.4753";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "056ndn98byn6gkiq46vn8pl0s715ni7wklxnmid2hk5xwyjy7bwk";
+    sha256 = "1rhdnd37fd5a4wbnrd817bf7ln4095kzmv283kmm8fz93nmmc19c";
   };
 
   buildInputs = [
-- 
GitLab


From 48fac1c38d6fa0593094b8b407def05575a7917b Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 5 Jun 2017 13:02:32 +0200
Subject: [PATCH 0381/1490] radarr: 0.2.0.654 -> 0.2.0.696

---
 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 af6cea97d2f..861aaa71cde 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.654";
+  version = "0.2.0.696";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "05sb3zk8gvydmkiy7g9ha5cmiqzqfwcydljm401zjndzwzhkz698";
+    sha256 = "0rqxhzn8hmg6a8di1gaxlrfp5f7mykf2lxrzhri10zqs975i3a29";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 385ba07615da1968b14d6b609907d447a6341f03 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 5 Jun 2017 09:10:26 -0400
Subject: [PATCH 0382/1490] git: 2.13.0 -> 2.13.1

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index eccd869ba56..bb00a22730b 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2.13.0";
+  version = "2.13.1";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0n0j36rapw31zb0sabap88ffncv8jg3nwc4miyim64ilyav2mgsb";
+    sha256 = "1zl88rlga9nhgaqc9d04vp1l1g4x6qj1d02698asnxrzk36vxh9v";
   };
 
   hardeningDisable = [ "format" ];
-- 
GitLab


From 1bcb4eb36005f0ad1cbdbe04ed4cf6c033afbf21 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 5 Jun 2017 09:12:06 -0400
Subject: [PATCH 0383/1490] ammonite: 0.9.6 -> 0.9.9

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 62a373f2c07..0843c37df06 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "0.9.6";
+  version = "0.9.9";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "113h8i2i6mlm4f4r2wfj9bggg46lpvamdw3c112qji2y74iriljq";
+    sha256 = "0qiqy681y1w21gjxw30kn44vxh9615j3825v06aq690p56w3rc63";
   };
 
   propagatedBuildInputs = [ jre ] ;
-- 
GitLab


From b9fd51afcde6362d57213dc9590e627d48ebc454 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 5 Jun 2017 15:28:14 +0200
Subject: [PATCH 0384/1490] binaryen: 32 -> 33

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

diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 31f5845cc86..72eaae99877 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,14 +1,14 @@
 { stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "32";
+  version = "33";
   rev = "version_${version}";
   name = "binaryen-${version}";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "binaryen";
-    sha256 = "0zclw6pa2pkzrnp8ib9qwbjvq38r2h5ynfg8fjl99b5lcyz5m590";
+    sha256 = "0zijs2mcgfv0iynwdb0l4zykm0891b1zccf6r8w35ipxvcdwbsbp";
     inherit rev;
   };
 
-- 
GitLab


From 6971bdbbd35e3da8d8117af979dbdac3f95d88a7 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 5 Jun 2017 15:28:35 +0200
Subject: [PATCH 0385/1490] emscripten, emscriptenfastcomp: 1.37.10 -> 1.37.13

---
 pkgs/development/compilers/emscripten-fastcomp/default.nix | 6 +++---
 pkgs/development/compilers/emscripten/default.nix          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index 99e22215bc7..ae7a5ce87b2 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, python, ... }:
 
 let
-  rev = "1.37.10";
+  rev = "1.37.13";
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in
 stdenv.mkDerivation rec {
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp";
-    sha256 = "0zl55jaas3cibjscr5q1q6rgw63wqwyc9iffhvs4xi9g1bk5cnx9";
+    sha256 = "1r4f4d5dmhxqwmpf2psainx7sj1j26fdp5acifdwg4sbbpsv96az";
     inherit rev;
   };
 
   srcFL = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp-clang";
-    sha256 = "0cdvld0lfl3cl7m6yax7f87ip9iq4rmz8icr68l2g8bl2w8qd89j";
+    sha256 = "1p0108iz77vmzm7i1aa29sk93g5vd95xiwmags18qkr7x3fmfqsw";
     inherit rev;
   };
 
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index f118a11e419..b39198f30a4 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  rev = "1.37.10";
+  rev = "1.37.13";
   appdir = "share/emscripten";
 in
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "08f3zagxzsj96i09gjg1djd1bmy1gr1ar8n96mzg3ykaygf82d0s";
+    sha256 = "0xnr8nq431pksb346fwsbs5knqmcygb8mywzzl0c9nz3ims1vkx5";
     inherit rev;
   };
 
-- 
GitLab


From 9edfc2b02b61d0045dee12739cd4af0450637e06 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 5 Jun 2017 01:47:08 +0000
Subject: [PATCH 0386/1490] xfce4_namebar_plugin: init at 0.3.1

---
 pkgs/desktops/xfce/default.nix                |  1 +
 .../panel-plugins/xfce4-namebar-plugin.nix    | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 8dae4190237..6fa9c991dbd 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -89,6 +89,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4_fsguard_plugin          = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix          { };
   xfce4_genmon_plugin           = callPackage ./panel-plugins/xfce4-genmon-plugin.nix           { };
   xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { };
+  xfce4_namebar_plugin          = callPackage ./panel-plugins/xfce4-namebar-plugin.nix          { };
   xfce4_netload_plugin          = callPackage ./panel-plugins/xfce4-netload-plugin.nix          { };
   xfce4_notes_plugin            = callPackage ./panel-plugins/xfce4-notes-plugin.nix            { };
   xfce4_mailwatch_plugin        = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix        { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
new file mode 100644
index 00000000000..5822ff173c9
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
@@ -0,0 +1,35 @@
+{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4panel }:
+
+stdenv.mkDerivation rec {
+  ver = "0.3.1";
+  rev = "07a23b3";
+  name = "xfce4-namebar-plugin-${ver}";
+
+  src = fetchFromGitHub {
+    owner = "TiZ-EX1";
+    repo = "xfce4-namebar-plugin";
+    rev = rev;
+    sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad";
+  };
+
+  buildInputs = [ pkgconfig python2 vala gtk2 libwnck libxfce4util xfce4panel ];
+
+  postPatch = ''
+    substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
+    substituteInPlace src/namebar.vala     --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
+  '';
+
+  configurePhase = "python waf configure --prefix=$out";
+
+  buildPhase = "python waf build";
+
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/TiZ-EX1/xfce4-namebar-plugin;
+    description = "A plugins which integrates titlebar and window controls into the xfce4-panel";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.volth ];
+  };
+}
-- 
GitLab


From 7c476b98df084f2ea174c2a01d959c63b2979a5f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 5 Jun 2017 10:01:53 -0400
Subject: [PATCH 0387/1490] linux: 4.12-rc3 -> 4.12-rc4

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 8c8da674f4d..c9dc44ba753 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12-rc3";
-  modDirVersion = "4.12.0-rc3";
+  version = "4.12-rc4";
+  modDirVersion = "4.12.0-rc4";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0jwhsmw4igf5iwf4qndqbjzayag2wj2riypzl0v3yrh5zkhfl4dm";
+    sha256 = "05sdyf9vs3cmcfpgn7bwmz59bpdpz65ly755lknxm5nms5vg7ph3";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 72b9aad4a2eb16efc927fb6b216906a308455312 Mon Sep 17 00:00:00 2001
From: Victor Berger <victor.berger@m4x.org>
Date: Mon, 5 Jun 2017 16:17:51 +0200
Subject: [PATCH 0388/1490] drbd: Fix incorrect substitution in derivation

Prior to this, the build failed as the generated udev rules file
refers to a non-existing file, due to an incorrect substitution.
---
 pkgs/os-specific/linux/drbd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index ead0d41ab8d..5c0fae7bf4f 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       substituteInPlace user/legacy/Makefile.in \
         --replace '$(DESTDIR)/lib/drbd' '$(DESTDIR)$(LIBDIR)'
       substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd
-      substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm
+      substituteInPlace scripts/drbd.rules --replace /usr/sbin/drbdadm $out/sbin/drbdadm
     '';
 
   makeFlags = "SHELL=${stdenv.shell}";
-- 
GitLab


From 7060a692c5db7e5e8ab6c61efa543064d85ad6a9 Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Sun, 4 Jun 2017 23:58:13 +0900
Subject: [PATCH 0389/1490] virtmanager: Fix python import error

---
 pkgs/applications/virtualization/virt-manager/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 766779b1299..dad16ffb0f0 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -44,6 +44,10 @@ python2Packages.buildPythonApplication rec {
     ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas
   '';
 
+  preFixup = ''
+    gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")
+  '';
+
   # Failed tests
   doCheck = false;
 
-- 
GitLab


From 6b89277fed6bf06417776cc9423e5f3c01e465e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 5 Jun 2017 15:53:12 +0100
Subject: [PATCH 0390/1490] python.pkgs.systemd: 233 -> 234

also python library does not match with our systemd version, the
changes done in this release are systemd 233 and python 3.6 related.
---
 .../python-modules/systemd/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 ++--------------
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/systemd/default.nix

diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix
new file mode 100644
index 00000000000..c856e019f46
--- /dev/null
+++ b/pkgs/development/python-modules/systemd/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, systemd, pkgconfig }:
+
+buildPythonPackage rec {
+  name = "python-systemd-${version}";
+  version = "234";
+
+  src = fetchFromGitHub {
+    owner = "systemd";
+    repo = "python-systemd";
+    rev = "v${version}";
+    sha256 = "1fakw7qln44mfd6pj4kqsgyrhkc6cyr653id34kv0rdnb1bvysrz";
+  };
+
+  buildInputs = [ systemd ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  doCheck = false;
+
+  meta = with stdenv.licenses; {
+    description = "Python module for native access to the systemd facilities";
+    homepage = http://www.freedesktop.org/software/systemd/python-systemd/;
+    license = licenses.lgpl21;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a3b424780b..595894ad505 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24042,25 +24042,8 @@ in {
     };
   };
 
-  systemd = buildPythonPackage rec {
-    version = "233";
-    name = "python-systemd-${version}";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/systemd/python-systemd/archive/v${version}.tar.gz";
-      sha256 = "1ryzv0d5y448mxpf2cx97rk0403w2w44bha8rqgww1fasx0c9dgg";
-    };
-
-    buildInputs = with pkgs; [ systemd pkgconfig ];
-
-    # Certain tests only run successfully on a machine w/ systemd.
-    doCheck = false;
-
-    meta = {
-      description = "Python module for native access to the systemd facilities";
-      homepage = http://www.freedesktop.org/software/systemd/python-systemd/;
-      license = licenses.lgpl21;
-    };
+  systemd = callPackage ../development/python-modules/systemd {
+    inherit (pkgs) pkgconfig systemd;
   };
 
   tabulate = buildPythonPackage rec {
-- 
GitLab


From 513e66e310f324f42565faea0d87128787d875a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 5 Jun 2017 17:07:30 +0200
Subject: [PATCH 0391/1490] kodiPlugins: move build funs to common

---
 pkgs/applications/video/kodi/commons.nix | 84 ++++++++++++++++++++++++
 pkgs/applications/video/kodi/plugins.nix | 82 ++++-------------------
 pkgs/top-level/all-packages.nix          |  4 +-
 3 files changed, 97 insertions(+), 73 deletions(-)
 create mode 100644 pkgs/applications/video/kodi/commons.nix

diff --git a/pkgs/applications/video/kodi/commons.nix b/pkgs/applications/video/kodi/commons.nix
new file mode 100644
index 00000000000..7e3446d51db
--- /dev/null
+++ b/pkgs/applications/video/kodi/commons.nix
@@ -0,0 +1,84 @@
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib
+, unzip, cmake, kodiPlain, steam, libcec_platform, tinyxml
+, libusb, pcre-cpp, jsoncpp, libhdhomerun }:
+
+rec {
+
+  pluginDir = "/share/kodi/addons";
+
+  kodi-platform = stdenv.mkDerivation rec {
+    project = "kodi-platform";
+    version = "17.1";
+    name = "${project}-${version}";
+
+    src = fetchFromGitHub {
+      owner = "xbmc";
+      repo = project;
+      rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
+      sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
+    };
+
+    buildInputs = [ cmake kodiPlain libcec_platform tinyxml ];
+
+  };
+
+  mkKodiAPIPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }:
+  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
+
+    inherit src meta sourceDir;
+
+    name = "kodi-plugin-${plugin}-${version}";
+
+    passthru = {
+      kodiPlugin = pluginDir;
+      namespace = namespace;
+    };
+
+    dontStrip = true;
+
+    installPhase = ''
+      ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
+      d=$out${pluginDir}/${namespace}
+      mkdir -p $d
+      sauce="."
+      [ -d ${namespace} ] && sauce=${namespace}
+      cp -R "$sauce/"* $d
+    '';
+
+  };
+
+  mkKodiPlugin = mkKodiAPIPlugin;
+
+  mkKodiABIPlugin = { plugin, namespace, version, src, meta
+                    , extraBuildInputs ? [], sourceDir ? null, ... }:
+  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
+
+    inherit src meta sourceDir;
+
+    name = "kodi-plugin-${plugin}-${version}";
+
+    passthru = {
+      kodiPlugin = pluginDir;
+      namespace = namespace;
+    };
+
+    dontStrip = true;
+
+    buildInputs = [ cmake kodiPlain kodi-platform libcec_platform ]
+               ++ extraBuildInputs;
+
+    # disables check ensuring install prefix is that of kodi
+    cmakeFlags = [
+      "-DOVERRIDE_PATHS=1"
+    ];
+
+    # kodi checks for plugin .so libs existance in the addon folder (share/...)
+    # and the non-wrapped kodi lib/... folder before even trying to dlopen
+    # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
+    installPhase = let n = namespace; in ''
+      make install
+      ln -s $out/lib/addons/${n}/${n}.so.${version} $out/${pluginDir}/${n}.so
+    '';
+
+  };
+}
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 495171b77ee..f82e1005615 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,47 +1,9 @@
-{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib
-, unzip, cmake, kodi, steam, libcec_platform, tinyxml
-, jsoncpp, libhdhomerun }:
+{ stdenv, lib, callPackage, fetchurl, fetchFromGitHub, unzip
+, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun }:
 
-let
+with (callPackage ./commons.nix {});
 
-  pluginDir = "/share/kodi/addons";
-
-  kodi-platform = stdenv.mkDerivation rec {
-    project = "kodi-platform";
-    version = "17.1";
-    name = "${project}-${version}";
-
-    src = fetchFromGitHub {
-      owner = "xbmc";
-      repo = project;
-      rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
-      sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
-    };
-
-    buildInputs = [ cmake kodi libcec_platform tinyxml ];
-  };
-
-  mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }:
-  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-    inherit src meta sourceDir;
-    name = "kodi-plugin-${plugin}-${version}";
-    passthru = {
-      kodiPlugin = pluginDir;
-      namespace = namespace;
-    };
-    dontStrip = true;
-    installPhase = ''
-      ${if isNull sourceDir then "" else "cd $src/$sourceDir"}
-      d=$out${pluginDir}/${namespace}
-      mkdir -p $d
-      sauce="."
-      [ -d ${namespace} ] && sauce=${namespace}
-      cp -R "$sauce/"* $d
-    '';
-  };
-
-in
-{
+rec {
 
   advanced-launcher = mkKodiPlugin rec {
 
@@ -234,7 +196,8 @@ in
     };
   };
 
-  pvr-hts = (mkKodiPlugin rec {
+  pvr-hts = mkKodiABIPlugin rec {
+
     plugin = "pvr-hts";
     namespace = "pvr.hts";
     version = "3.4.16";
@@ -252,22 +215,11 @@ in
       platforms = platforms.all;
       maintainers = with maintainers; [ cpages ];
     };
-  }).override {
-    buildInputs = [ cmake kodi libcec_platform kodi-platform ];
-
-    # disables check ensuring install prefix is that of kodi
-    cmakeFlags = [ "-DOVERRIDE_PATHS=1" ];
-
-    # kodi checks for plugin .so libs existance in the addon folder (share/...)
-    # and the non-wrapped kodi lib/... folder before even trying to dlopen
-    # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
-    installPhase = ''
-      make install
-      ln -s $out/lib/addons/pvr.hts/pvr.hts.so* $out/share/kodi/addons/pvr.hts
-    '';
+
   };
 
-  pvr-hdhomerun = (mkKodiPlugin rec {
+  pvr-hdhomerun = mkKodiABIPlugin rec {
+
     plugin = "pvr-hdhomerun";
     namespace = "pvr.hdhomerun";
     version = "2.4.7";
@@ -285,18 +237,8 @@ in
       platforms = platforms.all;
       maintainers = with maintainers; [ titanous ];
     };
-  }).override {
-    buildInputs = [ cmake jsoncpp libhdhomerun kodi libcec_platform kodi-platform ];
-
-    # disables check ensuring install prefix is that of kodi
-    cmakeFlags = [ "-DOVERRIDE_PATHS=1" ];
-
-    # kodi checks for plugin .so libs existance in the addon folder (share/...)
-    # and the non-wrapped kodi lib/... folder before even trying to dlopen
-    # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
-    installPhase = ''
-      make install
-      ln -s $out/lib/addons/pvr.hdhomerun/pvr.hdhomerun.so* $out/share/kodi/addons/pvr.hdhomerun
-    '';
+
+    extraBuildInputs = [ jsoncpp libhdhomerun ];
+
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4dc82ad078b..ad935fc1037 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16584,9 +16584,7 @@ with pkgs;
   };
   xbmcPlain = kodiPlain;
 
-  kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {
-    kodi = kodiPlain;
-  });
+  kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});
   xbmcPlugins = kodiPlugins;
 
   kodi = wrapKodi {
-- 
GitLab


From 4f410bfc8dfd51954000fce4a975d457b4915fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 5 Jun 2017 17:10:31 +0200
Subject: [PATCH 0392/1490] kodiPlugins.advanced-emulator-launcher: init at
 0.9.6

---
 pkgs/applications/video/kodi/plugins.nix | 29 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index f82e1005615..de261d69341 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -35,6 +35,35 @@ rec {
 
   };
 
+  advanced-emulator-launcher = mkKodiPlugin rec {
+
+    plugin = "advanced-emulator-launcher";
+    namespace = "plugin.program.advanced.emulator.launcher";
+    version = "0.9.6";
+
+    src = fetchFromGitHub {
+      owner = "Wintermute0110";
+      repo = namespace;
+      rev = version;
+      sha256 = "1sv9z77jj6bam6llcnd9b3dgkbvhwad2m1v541rv3acrackms2z2";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "http://forum.kodi.tv/showthread.php?tid=287826";
+      description = "A program launcher for Kodi";
+      longDescription = ''
+        Advanced Emulator Launcher is a multi-emulator front-end for Kodi
+        scalable to collections of thousands of ROMs. Includes offline scrapers
+        for MAME and No-Intro ROM sets and also supports scrapping ROM metadata
+        and artwork online. ROM auditing for No-Intro ROMs using No-Intro XML
+        DATs. Launching of games and standalone applications is also available.
+      '';
+      platforms = platforms.all;
+      maintainers = with maintainers; [ edwtjo ];
+    };
+
+  };
+
   controllers = let
     pname = "game-controller";
     version = "1.0.3";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad935fc1037..734cb0e7737 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16527,6 +16527,8 @@ with pkgs;
     plugins = let inherit (lib) optional optionals; in with kodiPlugins;
       ([]
       ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher
+      ++ optional (config.kodi.enableAdvancedEmulatorLauncher or false)
+        advanced-emulator-launcher
       ++ optionals (config.kodi.enableControllers or false)
         (with controllers;
           [ default dreamcast gba genesis mouse n64 nes ps snes ])
-- 
GitLab


From fe0b858113728f3057464d98bd12ade3f1b71526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 5 Jun 2017 17:12:57 +0200
Subject: [PATCH 0393/1490] kodiPlugins.joystick: init at 1.3.6

---
 pkgs/applications/video/kodi/plugins.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 23 insertions(+)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index de261d69341..0fb7be3b877 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -147,6 +147,28 @@ rec {
     };
   };
 
+  joystick = mkKodiABIPlugin rec {
+    namespace = "peripheral.joystick";
+    version = "1.3.6";
+    plugin = namespace;
+
+    src = fetchFromGitHub {
+      owner = "kodi-game";
+      repo = namespace;
+      rev = "5b480ccdd4a87f2ca3283a7b8d1bd69a114af0db";
+      sha256 = "1zf5zwghx96bqk7bx53qra27lfbgfdi1dsk4s3hwixr8ii72cqpp";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Binary addon for raw joystick input.";
+      platforms = platforms.all;
+      maintainers = with maintainers; [ edwtjo ];
+    };
+
+    extraBuildInputs = [ libusb pcre-cpp ];
+
+  };
+
   svtplay = mkKodiPlugin rec {
 
     plugin = "svtplay";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 734cb0e7737..6544d2f9331 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16535,6 +16535,7 @@ with pkgs;
       ++ optional (config.kodi.enableExodus or false) exodus
       ++ optionals (config.kodi.enableHyperLauncher or false)
            (with hyper-launcher; [ plugin service pdfreader ])
+      ++ optional (config.kodi.enableJoystick or false) joystick
       ++ optional (config.kodi.enableSVTPlay or false) svtplay
       ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher
       ++ optional (config.kodi.enablePVRHTS or false) pvr-hts
-- 
GitLab


From 677f194a1008bd52b48ecda1b051a624158e373a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 5 Jun 2017 17:14:36 +0200
Subject: [PATCH 0394/1490] kodiPlugins.steam-controller: init at 0.9.0

---
 pkgs/applications/video/kodi/plugins.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 23 insertions(+)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 0fb7be3b877..51ff8fece63 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -198,6 +198,28 @@ rec {
 
   };
 
+  steam-controller = mkKodiABIPlugin rec {
+    namespace = "peripheral.steamcontroller";
+    version = "0.9.0";
+    plugin = namespace;
+
+    src = fetchFromGitHub {
+      owner = "kodi-game";
+      repo = namespace;
+      rev = "76f640fad4f68118f4fab6c4c3338d13daca7074";
+      sha256 = "0yqlfdiiymb8z6flyhpval8w3kdc9qv3mli3jg1xn5ac485nxsxh";
+    };
+
+    extraBuildInputs = [ libusb ];
+
+    meta = with stdenv.lib; {
+      description = "Binary addon for steam controller.";
+      platforms = platforms.all;
+      maintainers = with maintainers; [ edwtjo ];
+    };
+
+  };
+
   steam-launcher = (mkKodiPlugin rec {
 
     plugin = "steam-launcher";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6544d2f9331..647aea58623 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16537,6 +16537,7 @@ with pkgs;
            (with hyper-launcher; [ plugin service pdfreader ])
       ++ optional (config.kodi.enableJoystick or false) joystick
       ++ optional (config.kodi.enableSVTPlay or false) svtplay
+      ++ optional (config.kodi.enableSteamController or false) steam-controller
       ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher
       ++ optional (config.kodi.enablePVRHTS or false) pvr-hts
       ++ optional (config.kodi.enablePVRHDHomeRun or false) pvr-hdhomerun
-- 
GitLab


From abc4f5acf590ec83ecdf64cb36eb8e665cb6e12a Mon Sep 17 00:00:00 2001
From: Venkateswara Rao Mandela <venkat.mandela@gmail.com>
Date: Mon, 5 Jun 2017 22:28:16 +0530
Subject: [PATCH 0395/1490] git-series: install man page

---
 pkgs/development/tools/git-series/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index 6617117ef83..b792cfe8c99 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -18,6 +18,11 @@ buildRustPackage rec {
   nativeBuildInputs = [ cmake pkgconfig perl ];
   buildInputs = [ openssl zlib ];
 
+  postBuild = ''
+    mkdir -p "$out/man/man1"
+    cp "$src/git-series.1" "$out/man/man1"
+  '';
+
   meta = with stdenv.lib; {
     description = "A tool to help with formatting git patches for review on mailing lists";
     longDescription = ''
-- 
GitLab


From 10785e8960b905f5e41ef8db014530bfbd033a8f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 5 Jun 2017 19:28:15 +0200
Subject: [PATCH 0396/1490] python.pkgs.systemd: fix eval

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

diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix
index c856e019f46..4786e7eb7e1 100644
--- a/pkgs/development/python-modules/systemd/default.nix
+++ b/pkgs/development/python-modules/systemd/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with stdenv.licenses; {
+  meta = with stdenv.lib; {
     description = "Python module for native access to the systemd facilities";
     homepage = http://www.freedesktop.org/software/systemd/python-systemd/;
     license = licenses.lgpl21;
-- 
GitLab


From d0c68a165880c71e24b5903052ddd7ef1003c2e8 Mon Sep 17 00:00:00 2001
From: Renzo Carbonara <gnuk0001@gmail.com>
Date: Mon, 5 Jun 2017 20:01:26 +0200
Subject: [PATCH 0397/1490] ghcjsHEAD: bump git revision

This particular revision brings significant performance improvements
when building code that uses TemplateHaskell.
---
 pkgs/development/compilers/ghcjs/head.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix
index 591660f5c34..01b13262ef0 100644
--- a/pkgs/development/compilers/ghcjs/head.nix
+++ b/pkgs/development/compilers/ghcjs/head.nix
@@ -8,10 +8,10 @@ bootPkgs.callPackage ./base.nix {
   ghcjsSrc = fetchFromGitHub {
     # TODO: switch back to the regular ghcjs repo
     # when https://github.com/ghcjs/ghcjs/pull/573 is merged.
-    owner = "basvandijk";
+    owner = "k0001";
     repo = "ghcjs";
-    rev = "e6cdc71964a1c2e4184416a493e9d384c408914c";
-    sha256 = "00fk9qwyx4vpvr0h9jbqxwlrvl6w63l5sq8r357prsp6xyv5zniz";
+    rev = "600015e085a28da601b65a41c513d4a458fcd184";
+    sha256 = "01kirrg0fnfwhllvwgfqjiwzwj4yv4lyig87x61n9jp6y5shzjdx";
   };
   ghcjsBootSrc = fetchgit {
     # TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git
-- 
GitLab


From b81124b4fb9084aa1f6cc6f7b134a27200c7c0ed Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Mon, 5 Jun 2017 19:08:07 +0100
Subject: [PATCH 0398/1490] Fix hooks not being called when overriding phases
 in various packages

It's necessary to do this in order to fix ckb's compilation, now that
fixupPhase rejects derivation results containing references to the temporary
build directory. It seems like good practice so I've added it to the
other packages that I maintain.
---
 .../applications/graphics/unigine-valley/default.nix | 12 ++++++++++++
 pkgs/os-specific/linux/intel-ocl/default.nix         | 12 ++++++++++++
 pkgs/tools/misc/ckb/default.nix                      |  4 ++++
 pkgs/tools/security/hashcat/hashcat3/default.nix     |  2 ++
 4 files changed, 30 insertions(+)

diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index 1bb57538cd5..dc896e0b0d9 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -51,20 +51,30 @@ in
     ];
 
     unpackPhase = ''
+      runHook preUnpack
+
       cp $src extractor.run
       chmod +x extractor.run
       ./extractor.run --target $sourceRoot
+
+      runHook postUnpack
     '';
 
     patchPhase = ''
+      runHook prePatch
+
       # Patch ELF files.
       elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1)
       for elf in $elfs; do
         patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true
       done
+
+      runHook postPatch
     '';
 
     installPhase = ''
+      runHook preInstall
+
       instdir=$out/${instPath}
 
       # Install executables and libraries
@@ -86,6 +96,8 @@ in
       wrapProgram $out/bin/valley \
         --run "cd $instdir" \
         --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath
+
+      runHook postInstall
     '';
 
     stripDebugList = ["${instPath}/bin"];
diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix
index 688cfbb8df5..0d33954fd5d 100644
--- a/pkgs/os-specific/linux/intel-ocl/default.nix
+++ b/pkgs/os-specific/linux/intel-ocl/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
   '';
 
   patchPhase = ''
+    runHook prePatch
+
     # Remove libOpenCL.so, since we use ocl-icd's libOpenCL.so instead and this would cause a clash.
     rm opt/intel/opencl/libOpenCL.so*
 
@@ -35,18 +37,28 @@ stdenv.mkDerivation rec {
     for lib in opt/intel/opencl/*.so; do
       patchelf --set-rpath "${libPath}:$out/lib/intel-ocl" $lib || true
     done
+
+    runHook postPatch
   '';
 
   buildPhase = ''
+    runHook preBuild
+
     # Create ICD file, which just contains the path of the corresponding shared library.
     echo "$out/lib/intel-ocl/libintelocl.so" > intel.icd
+
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
+
     install -D -m 0755 opt/intel/opencl/*.so* -t $out/lib/intel-ocl
     install -D -m 0644 opt/intel/opencl/*.{o,rtl,bin} -t $out/lib/intel-ocl
     install -D -m 0644 opt/intel/opencl/{LICENSE,NOTICES} -t $out/share/doc/intel-ocl
     install -D -m 0644 intel.icd -t $out/etc/OpenCL/vendors
+
+    runHook postInstall
   '';
 
   dontStrip = true;
diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix
index f2dc5150bbd..b90adfd5852 100644
--- a/pkgs/tools/misc/ckb/default.nix
+++ b/pkgs/tools/misc/ckb/default.nix
@@ -29,8 +29,12 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   installPhase = ''
+    runHook preInstall
+
     install -D --mode 0755 --target-directory $out/bin bin/ckb-daemon bin/ckb
     install -D --mode 0755 --target-directory $out/libexec/ckb-animations bin/ckb-animations/*
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/hashcat/hashcat3/default.nix b/pkgs/tools/security/hashcat/hashcat3/default.nix
index 810d9df9e2f..c8a8acf907d 100644
--- a/pkgs/tools/security/hashcat/hashcat3/default.nix
+++ b/pkgs/tools/security/hashcat/hashcat3/default.nix
@@ -18,7 +18,9 @@ stdenv.mkDerivation rec {
 
   # $out is not known until the build has started.
   configurePhase = ''
+    runHook preConfigure
     makeFlags="$makeFlags PREFIX=$out"
+    runHook postConfigure
   '';
 
   postFixup = ''
-- 
GitLab


From fe53a6c17c0d6388748b593b8513b9c8cfbaf4de Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 1 Jun 2017 21:35:03 +0300
Subject: [PATCH 0399/1490] rssguard: init at 3.4.0

---
 .../feedreaders/rssguard/default.nix          | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/networking/feedreaders/rssguard/default.nix

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
new file mode 100644
index 00000000000..0c17485b27b
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, qmakeHook, qtwebengine, qttools }:
+
+stdenv.mkDerivation rec {
+  name = "rssguard-${version}";
+  version = "3.4.0";
+
+  src = fetchFromGitHub {
+    owner = "martinrotter";
+    repo = "rssguard";
+    # fetchFromGitHub doesn't support rev being a tag when fetchSubmodules=true,
+    # so need to use the hash commit. See:
+    # https://github.com/NixOS/nixpkgs/issues/26302
+    #rev = "${version}";
+    rev = "cb15ba92c9bc1b80e2b81d7976438e562ee1ef90";
+    sha256 = "1cdpfjj2lm1q2qh0w0mh505blcmi4n78458d3z3c1zn9ls9b9zsp";
+    fetchSubmodules = true;
+  };
+
+  buildInputs =  [ qmakeHook qtwebengine qttools ];
+
+  preConfigure = ''
+    qmakeFlags="$qmakeFlags CONFIG+=release"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple RSS/Atom feed reader with online synchronization";
+    longDescription = ''
+      RSS Guard is a simple, light and easy-to-use RSS/ATOM feed aggregator
+      developed using Qt framework and with online feed synchronization support
+      for ownCloud/Nextcloud.
+    '';
+    homepage = https://github.com/martinrotter/rssguard;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 647aea58623..c148252df66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15162,6 +15162,9 @@ with pkgs;
 
   polybar = callPackage ../applications/misc/polybar { };
 
+  rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
+  #rssguard = libsForQt5.callPackage ../applications/networking/newsreaders/rssguard { };
+
   scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
 
   shotcut = libsForQt5.callPackage ../applications/video/shotcut { };
-- 
GitLab


From a4b8c214beab3254bc97d699ecfa75ba9064f3e2 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 5 Jun 2017 21:41:31 +0200
Subject: [PATCH 0400/1490] cloud-init: remove argparse from requirements.txt

Argparse is part of python stdlib.
---
 pkgs/tools/virtualization/cloud-init/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 94dae1e47fa..caea7c21c91 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -23,10 +23,13 @@ in pythonPackages.buildPythonApplication rec {
 
     substituteInPlace cloudinit/config/cc_growpart.py \
       --replace 'util.subp(["growpart"' 'util.subp(["${cloud-utils}/bin/growpart"'
+
+    # Argparse is part of python stdlib
+    sed -i s/argparse// requirements.txt
     '';
 
   propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable
-    oauthlib pyserial configobj pyyaml argparse requests jsonpatch ];
+    oauthlib pyserial configobj pyyaml requests jsonpatch ];
 
   meta = {
     homepage = http://cloudinit.readthedocs.org;
-- 
GitLab


From cf2c5f1be9443323893efd8e71345d54e67ec29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 5 Jun 2017 22:04:28 +0100
Subject: [PATCH 0401/1490] python.pkgs.scikitlearn: fix python 3.6 tests

---
 .../python-modules/scikitlearn/default.nix    | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 28 +------------
 2 files changed, 43 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/scikitlearn/default.nix

diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix
new file mode 100644
index 00000000000..6ac787bc82b
--- /dev/null
+++ b/pkgs/development/python-modules/scikitlearn/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, python
+, nose, pillow
+, gfortran, glibcLocales
+, numpy, scipy
+}:
+
+buildPythonPackage rec {
+  pname = "scikit-learn";
+  version = "0.18.1";
+  name = "${pname}-${version}";
+  disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c";
+  };
+
+  patches = [
+    # python 3.6 test fixes (will be part of 0.18.2)
+    (fetchpatch {
+       url = https://github.com/scikit-learn/scikit-learn/pull/8123/commits/b77f28a7163cb4909da1b310f1fb741bee3cabfe.patch;
+       sha256 = "1rp6kr6hiabb6s0vh7mkgr10qwrqlq3z1fhpi0s011hg434ckh19";
+     })
+  ];
+
+  buildInputs = [ nose pillow gfortran glibcLocales ];
+  propagatedBuildInputs = [ numpy scipy numpy.blas ];
+
+  LC_ALL="en_US.UTF-8";
+
+  checkPhase = ''
+    HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A set of python modules for machine learning and data mining";
+    homepage = http://scikit-learn.org;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 595894ad505..238e4ec6d0c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22177,32 +22177,8 @@ in {
     };
   };
 
-
-  scikitlearn = buildPythonPackage rec {
-    name = "scikit-learn-${version}";
-    version = "0.18.1";
-    disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/scikit-learn/${name}.tar.gz";
-      sha256 = "1eddfc27bb37597a5d514de1299981758e660e0af56981c0bfdf462c9568a60c";
-    };
-
-    buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ numpy scipy numpy.blas ];
-
-    LC_ALL="en_US.UTF-8";
-
-    checkPhase = ''
-      HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/
-    '';
-
-    meta = {
-      description = "A set of python modules for machine learning and data mining";
-      homepage = http://scikit-learn.org;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
-    };
+  scikitlearn = callPackage ../development/python-modules/scikitlearn {
+    inherit (pkgs) gfortran glibcLocales;
   };
 
   scripttest = buildPythonPackage rec {
-- 
GitLab


From 766cbda1f32112633f265d8ad0aad3252346dfb0 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Mon, 5 Jun 2017 18:37:58 +0200
Subject: [PATCH 0402/1490] journalbeat: 5.1.2 -> 5.4.1

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

diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix
index 5a66fcf5299..4b8ea62219e 100644
--- a/pkgs/tools/system/journalbeat/default.nix
+++ b/pkgs/tools/system/journalbeat/default.nix
@@ -7,7 +7,7 @@ let
 in buildGoPackage rec {
 
   name = "journalbeat-${version}";
-  version = "5.1.2";
+  version = "5.4.1";
 
   goPackagePath = "github.com/mheese/journalbeat";
 
@@ -22,7 +22,7 @@ in buildGoPackage rec {
     owner = "mheese";
     repo = "journalbeat";
     rev = "v${version}";
-    sha256 = "179jayzvd5k4mwhn73yflbzl5md1fmv7a9hb8vz2ir76lvr33g3l";
+    sha256 = "14mhx3gqg19ljcr07ahbry9k5hkbj2mjji4qsjrbc7jknis6frz4";
   };
 
   meta = with lib; {
-- 
GitLab


From d2f453bc0d88579c7730f678253aee2b0da3984f Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 5 Jun 2017 23:37:35 +0000
Subject: [PATCH 0403/1490] fix #25511

---
 pkgs/tools/X11/xdg-utils/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 16e339b41c2..a1d3a059a83 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -29,15 +29,16 @@ stdenv.mkDerivation rec {
 
   postInstall = stdenv.lib.optionalString mimiSupport ''
     cp ${mimisrc}/xdg-open $out/bin/xdg-open
-  ''
-  + ''
-    for tool in "${coreutils}/bin/cut" "${gnused}/bin/sed" \
-      "${gnugrep}"/bin/{e,}grep "${file}/bin/file" \
-      ${stdenv.lib.optionalString mimiSupport
-        '' "${gawk}/bin/awk" "${coreutils}/bin/sort" ''} ;
-    do
-      sed "s# $(basename "$tool") # $tool #g" -i "$out"/bin/*
-    done
+  '' + ''
+    sed  '2s#.#\
+    cut()   { ${coreutils}/bin/cut  "$@"; }\
+    sed()   { ${gnused}/bin/sed     "$@"; }\
+    grep()  { ${gnugrep}/bin/grep   "$@"; }\
+    egrep() { ${gnugrep}/bin/egrep  "$@"; }\
+    file()  { ${file}/bin/file      "$@"; }\
+    awk()   { ${gawk}/bin/awk       "$@"; }\
+    sort()  { ${coreutils}/bin/sort "$@"; }\
+    &#' -i "$out"/bin/*
 
     substituteInPlace $out/bin/xdg-open \
       --replace "/usr/bin/printf" "${coreutils}/bin/printf"
-- 
GitLab


From f0a4e9161280c470cdb6e42caf96418eb282ecee Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 2 Jun 2017 00:36:55 +0200
Subject: [PATCH 0404/1490] batman-adv: 2017.0 -> 2017.1

---
 pkgs/os-specific/linux/batman-adv/alfred.nix  | 4 ++--
 pkgs/os-specific/linux/batman-adv/batctl.nix  | 4 ++--
 pkgs/os-specific/linux/batman-adv/default.nix | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 5d58e50fd7b..7b800fe6f4f 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
 
 let
-  ver = "2017.0";
+  ver = "2017.1";
 in
 stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "1a0gnl8v8l7zj01hca0srbsc11sk51rj1qac6lw242z35hyximpq";
+    sha256 = "1c6zq8j0nb1wm9zzlzc2bn8a500pvqbn2vv9hrv6nvq7il2silzq";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index e7c20a07b05..c34c7746b90 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2017.0";
+  ver = "2017.1";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "11n66hcs4jdnfdl896kzz22zlw8d2p8n6sldxfmlc2q7sqki3fy0";
+    sha256 = "1imb59iaaw50y76595z6zvqnbpjgqkkp79gq4s7w7nj8wikiqcgq";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index a48909685d7..8a96279c66b 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, kernel }:
 
-#assert stdenv.lib.versionOlder kernel.version "3.17";
-
-let base = "batman-adv-2017.0.1"; in
+let base = "batman-adv-2017.1"; in
 
 stdenv.mkDerivation rec {
   name = "${base}-${kernel.version}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha256 = "0z640jgi9l9355s8v75yhrb9wjyc7cd4618pjpb17vy576bvrhjm";
+    sha256 = "05cck0mlg8xsvbra69x6i25xclsq1xc49dggxq81gi086c14h67c";
   };
 
   hardeningDisable = [ "pic" ];
-- 
GitLab


From 51a359cc81e7fb2ee5e346117a9f978c3a1a9ba9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 6 Jun 2017 03:00:13 +0200
Subject: [PATCH 0405/1490] lmdb: 0.9.19 -> 0.9.21

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

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index ec3e9997690..30703fc7e3e 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -3,13 +3,13 @@
 let optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "lmdb-${version}";
-  version = "0.9.19";
+  version = "0.9.21";
 
   src = fetchFromGitHub {
     owner = "LMDB";
     repo = "lmdb";
     rev = "LMDB_${version}";
-    sha256 = "04qx803jdmhkcam748fn0az3cyzvj91lw28kcvwfyq0al7pmjkfs";
+    sha256 = "026a6himvg3y4ssnccdbgr3c2pq3w2d47nayn05v512875z4f2w3";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
-- 
GitLab


From f18bcc1e2ad87b2f23254ac358cd5003826fbb90 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 6 Jun 2017 03:00:50 +0200
Subject: [PATCH 0406/1490] knot-dns: 2.4.2 -> 2.5.0

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

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 97c0da86ec9..a719bdbff62 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.4.2";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "37da7fcf1f194bd6376c63d8c4fa28a21899b56a3f3b63dba7095740a5752c52";
+    sha256 = "1x293cyp10c84hvcnaqpf2s6kyma08l380858l0isy19n074zaiw";
   };
 
   outputs = [ "bin" "out" "dev" ];
-- 
GitLab


From b74866b9a7e8c538f5287781fc3adca3e52d1903 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 6 Jun 2017 03:39:22 +0200
Subject: [PATCH 0407/1490] nginxMainline: 1.13.0 -> 1.13.1

---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 348aba5338c..a24eedce7c7 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.13.0";
-  sha256 = "1mq56rl3rq3bhnrqsywxfrwh0y5m0n0q0sck8ca4x18ganv2mxbr";
+  version = "1.13.1";
+  sha256 = "0xk7gcsgwhz047h54adn8crnkrkr7g1z79w8ik34v6k0lrr6r1d5";
 })
-- 
GitLab


From 4b8b89f069f66dd9a1acf1a544375ba7754f371e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 31 May 2017 08:55:09 +0200
Subject: [PATCH 0408/1490] grafana: 4.2.0 -> 4.3.2

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index dbcebf84239..56d2f854654 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 = "4.2.0";
+  version = "4.3.2";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0zzvdzakswqidxbsss98nfa8rw80r36f45yviai12xsns9jzmj7z";
+    sha256 = "0hz323favjm0gz4s2112rl8ygw7dy2pz808yhraplq8nljqh4h11";
   };
 
   srcStatic = fetchurl {
-    url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "1cs7ghkp13znz9yxv108770xjfsp8vks6xkzpqqhsjis5h5y0g9w";
+    url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-x64.tar.gz";
+    sha256 = "0vk668ibayx0hqlam9jns5c7pggdh83yy54hnz5l7fnws4lm50qc";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
-- 
GitLab


From 086c2efb19b4612c5960218c8d76169f8308ae13 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 6 Jun 2017 10:30:45 +0800
Subject: [PATCH 0409/1490] syncthing: 0.14.28 -> 0.14.29

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 568f7359697..87018c1e08e 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.28";
+  version = "0.14.29";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "0bb4ccyb5rjga651z633abiwlps5gy9hpalr5gi0wlrfxwbdivrb";
+    sha256 = "01q0xlixjvmzs0acrg54b07fp68sa5axh1wb4lz25mmxfjl04v1d";
   };
 
   buildInputs = [ go removeReferencesTo ];
-- 
GitLab


From 85aa14fa373c5986d0aa08d66461c8c38458b16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 6 Jun 2017 00:24:11 +0100
Subject: [PATCH 0410/1490] rssguard: use fetchgit; wrapGAppsHook

---
 .../feedreaders/rssguard/default.nix          | 21 +++++++------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index 0c17485b27b..a9e3c1d74e2 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,26 +1,19 @@
-{ stdenv, fetchFromGitHub, qmakeHook, qtwebengine, qttools }:
+{ stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "rssguard-${version}";
   version = "3.4.0";
 
-  src = fetchFromGitHub {
-    owner = "martinrotter";
-    repo = "rssguard";
-    # fetchFromGitHub doesn't support rev being a tag when fetchSubmodules=true,
-    # so need to use the hash commit. See:
-    # https://github.com/NixOS/nixpkgs/issues/26302
-    #rev = "${version}";
-    rev = "cb15ba92c9bc1b80e2b81d7976438e562ee1ef90";
+  src = fetchgit {
+    url = https://github.com/martinrotter/rssguard;
+    rev = "refs/tags/${version}";
     sha256 = "1cdpfjj2lm1q2qh0w0mh505blcmi4n78458d3z3c1zn9ls9b9zsp";
     fetchSubmodules = true;
   };
 
-  buildInputs =  [ qmakeHook qtwebengine qttools ];
-
-  preConfigure = ''
-    qmakeFlags="$qmakeFlags CONFIG+=release"
-  '';
+  buildInputs =  [ qtwebengine qttools ];
+  nativeBuildInputs = [ qmakeHook wrapGAppsHook ];
+  qmakeFlags = [ "CONFIG+=release" ];
 
   meta = with stdenv.lib; {
     description = "Simple RSS/Atom feed reader with online synchronization";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c148252df66..2ace6bb8ace 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15163,7 +15163,6 @@ with pkgs;
   polybar = callPackage ../applications/misc/polybar { };
 
   rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
-  #rssguard = libsForQt5.callPackage ../applications/networking/newsreaders/rssguard { };
 
   scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
 
-- 
GitLab


From 1b32055a35cccf52bc4c8fba2e8308dfa893f461 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 6 Jun 2017 09:14:56 +0200
Subject: [PATCH 0411/1490] gdb: 7.12.1 -> 8.0

See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00002.html
for release announcement.
---
 pkgs/development/tools/misc/gdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 725fb86914b..e6dcc3057d1 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -15,7 +15,7 @@
 
 let
   basename = "gdb-${version}";
-  version = "7.12.1";
+  version = "8.0";
 in
 
 assert targetPlatform.isHurd -> mig != null && hurd != null;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "11ii260h1sd7v0bs3cz6d5l8gqxxgldry0md60ncjgixjw5nh1s6";
+    sha256 = "1vplyf8v70yn0rdqjx6awl9nmfbwaj5ynwwjxwa71rhp97z4z8pn";
   };
 
   nativeBuildInputs = [ pkgconfig texinfo perl ]
-- 
GitLab


From b0e86e6cd895aa8ed6529d16666f6311e1499a4a Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Tue, 6 Jun 2017 15:21:21 +0800
Subject: [PATCH 0412/1490] pythonPackages.pygit2: 0.25.0 -> 0.25.1

This also fixes a failed test when builds with cffi 1.10
https://github.com/libgit2/pygit2/issues/694
---
 pkgs/top-level/python-packages.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 238e4ec6d0c..0d0649440c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18663,13 +18663,24 @@ in {
   };
 
   pygit2 = buildPythonPackage rec {
-    name = "pygit2-0.25.0";
+    name = "pygit2-0.25.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pygit2/${name}.tar.gz";
-      sha256 = "0wf5rp0fvrw7j3j18dvwjq6xqlbm611wd55aphrfpps0v1gxh3ny";
+      sha256 = "0sja3g9mqwp5bnhdc313b2gc4z3p70nn6zzf2h8j581g0lrn0sg8";
     };
 
+    # Fixes a bug which can cause test failed when cffi==1.10
+    prePatch = let
+      cffiVersionPatch = pkgs.fetchurl {
+        url = "https://github.com/libgit2/pygit2/commit/b88dc868423af2f760f649960112efd0e37e5335.patch";
+        sha256 = "14cfrz56y2dnwlxrrss9pjhxfnyyg5856gbabzjzyx674k0qcid4";
+      };
+    in ''
+      # we need to delete part of the patch because the missing .travis.yml causes problem
+      sed -e '1,36d' ${cffiVersionPatch} | patch -p1
+    '';
+
     preConfigure = ( if stdenv.isDarwin then ''
       export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib"
     '' else "" );
@@ -18680,6 +18691,7 @@ in {
       # disable tests that require networking
       rm test/test_repository.py
       rm test/test_credentials.py
+      rm test/test_submodule.py
     '';
 
     meta = {
-- 
GitLab


From 3729247acd2a7a1554e5b773b6e65614b566a1ae Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 30 May 2017 23:42:15 +0100
Subject: [PATCH 0413/1490] mesa: add valgrind support

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index a8561d22bf5..130f75ae91b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, intltool, autoreconfHook, substituteAll
 , file, expat, libdrm, xorg, wayland, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva
-, libelf, libvdpau
+, libelf, libvdpau, valgrind-light
 , grsecEnabled ? false
 , enableRadv ? false
 # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
@@ -152,6 +152,7 @@ stdenv.mkDerivation {
     libX11 libXext libxcb libXt libXfixes libxshmfence
     libffi wayland libvdpau libelf libXvMC
     libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
+    valgrind-light
   ];
 
 
-- 
GitLab


From c0b1e8a5fb174cd405dcca9f7fec275714ad9f4b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 11:26:49 +0200
Subject: [PATCH 0414/1490] python.pkgs.pathpy: 10.1 -> 10.3.1

---
 .../python-modules/path.py/default.nix        | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 24 +------------
 2 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/path.py/default.nix

diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix
new file mode 100644
index 00000000000..a40635b8d33
--- /dev/null
+++ b/pkgs/development/python-modules/path.py/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytestrunner
+, pytest
+, glibcLocales
+}:
+
+buildPythonPackage rec {
+  pname = "path.py";
+  version = "10.3.1";
+  name = "path.py-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "412706be1cd8ab723c77829f9aa0c4d4b7c7b26c7b1be0275a6841c3cb1001e0";
+  };
+
+  checkInputs = [ pytest pytestrunner ];
+  buildInputs = [setuptools_scm glibcLocales ];
+
+  LC_ALL="en_US.UTF-8";
+
+  meta = {
+    description = "A module wrapper for os.path";
+    homepage = http://github.com/jaraco/path.py;
+    license = lib.licenses.mit;
+  };
+
+  checkPhase = ''
+    py.test test_path.py
+  '';
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0d0649440c2..d2fa2c38ca3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17486,29 +17486,7 @@ in {
 
   };
 
-  pathpy = buildPythonPackage rec {
-    version = "10.1";
-    name = "path.py-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/path.py/${name}.tar.gz";
-      sha256 = "8b0ee56f6c1421a9038823926ee8da354ce70933424b408558bc6b48496587f3";
-    };
-
-    buildInputs = with self; [setuptools_scm pytestrunner pytest pkgs.glibcLocales ];
-
-    LC_ALL="en_US.UTF-8";
-
-    meta = {
-      description = "A module wrapper for os.path";
-      homepage = http://github.com/jaraco/path.py;
-      license = licenses.mit;
-    };
-
-    checkPhase = ''
-      py.test test_path.py
-    '';
-  };
+  pathpy = callPackage ../development/python-modules/path.py { };
 
   paypalrestsdk = buildPythonPackage rec {
     name = "paypalrestsdk-0.7.0";
-- 
GitLab


From 819f990feab189b8ac3f5a2f95b5eb4f76cd0895 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Tue, 6 Jun 2017 13:05:50 +0100
Subject: [PATCH 0415/1490] jenkins: 2.63 -> 2.64

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index db7002d163e..2c80e9c8002 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.63";
+  version = "2.64";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "024bzbca2ikk3904df4f8ri37qjq7nzzmg58jax8cbvcbxcik699";
+    sha256 = "0w0yz36kj4bw5lswyxqg6rfcvrqmkvidfrbbvdn8rq6sfrcpvjrg";
   };
 
   buildCommand = ''
-- 
GitLab


From 314da48f313cc4bc47cf26cbe18b9591850b832f Mon Sep 17 00:00:00 2001
From: Simon Jagoe <simon@simonjagoe.com>
Date: Tue, 6 Jun 2017 15:05:42 +0300
Subject: [PATCH 0416/1490] grin: Fix build dependencies

Using old source, grin was unable to build due to missing argparse pypi
package.
---
 pkgs/tools/text/grin/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index 56ea13de40e..5cbeb54a0b1 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchgit, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
   name = "grin-1.2.1";
   namePrefix = "";
 
-  src = fetchurl {
-    url = "mirror://pypi/g/grin/${name}.tar.gz";
-    sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz";
+  src = fetchgit {
+    url = "git://github.com/rkern/grin";
+    rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f";
+    sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd";
   };
 
   buildInputs = with python2Packages; [ nose ];
-  propagatedBuildInputs = with python2Packages; [ argparse ];
 
   meta = {
     homepage = https://pypi.python.org/pypi/grin;
-- 
GitLab


From 003710748f1fab5dd407258cee5f9db7b705c67e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 11:31:46 +0200
Subject: [PATCH 0417/1490] python.pkgs.Nikola: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index 762c43d93c0..5ba7c0d0413 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -30,7 +30,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Nikola";
-  version = "7.8.6";
+  version = "7.8.7";
 
   # Nix contains only Python 3 supported version of doit, which is a dependency
   # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "48d3a00c3fc9c61bcd305653a531949bdd777d9211434172549498fd8136e036";
+    sha256 = "d9c77ce9758cc0e848d4c99229a28314e8bd2a590c77c56540fa919fca4d779f";
   };
 
   meta = {
-- 
GitLab


From 8144d13fd36185c04be326ef05a444701e159aef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 11:32:19 +0200
Subject: [PATCH 0418/1490] python.pkgs.astroid: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index 52f7fdf039c..fd742031d5a 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonPackage, python, logilab_common, six
+{ lib, fetchPypi, buildPythonPackage, python, logilab_common, six
 , lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder
 , backports_functools_lru_cache
 }:
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "astroid";
-  version = "1.5.2";
+  version = "1.5.3";
 
-  src = fetchurl {
-    url = "mirror://pypi/a/${pname}/${name}.tar.gz";
-    sha256 = "271f1c9ad6519a5dde2a7f0c9b62c2923b55e16569bdd888f9f9055cc5be37ed";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "492c2a2044adbf6a84a671b7522e9295ad2f6a7c781b899014308db25312dd35";
   };
 
   propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]
-- 
GitLab


From 6df7edd4645eb95570d1e7785db11f3e41d824b9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 11:32:32 +0200
Subject: [PATCH 0419/1490] python.pkgs.guessit: 2.1.3 -> 2.1.4

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

diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
index cc5c954b645..b0c0bb9496f 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "guessit";
-  version = "2.1.3";
+  version = "2.1.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b2eebbb61e4d2b3764ce4462e0b27da0dccbb25b78e13493a2f913a402e1d0fb";
+    sha256 = "90e6f9fb49246ad27f34f8b9984357e22562ccc3059241cbc08b4fac1d401c56";
   };
 
   # Tests require more packages.
-- 
GitLab


From e6ff0aa59745183a24f1569b97ebd174915320df Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 11:33:31 +0200
Subject: [PATCH 0420/1490] python.pkgs.m2r: 0.1.5 -> 0.1.6

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

diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index 5a67d6a719b..74cc87d5d89 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchPypi,
   mistune, docutils } :
 buildPythonPackage rec {
   pname = "m2r";
   name = "${pname}-${version}";
-  version = "0.1.5";
+  version = "0.1.6";
 
-  src = fetchurl {
-    url = "mirror://pypi/m/m2r/${name}.tar.gz";
-    sha256 = "08rjn3x1qag60wawjnq95wmgijrn33apr4fhj01s2p6hmrqgfj1l";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a26bc2e25e0ad3f8650385aea25cf734ac4fcd30e54faec92fd39675da75e527";
   };
 
   propagatedBuildInputs = [ mistune docutils ];
-- 
GitLab


From 51d9995d043c378e31eea8ef8edecebcccff68ca Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 11:33:45 +0200
Subject: [PATCH 0421/1490] python.pkgs.ntlm-auth: 1.0.3 -> 1.0.4

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

diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix
index 03890f712af..22d8cd09c35 100644
--- a/pkgs/development/python-modules/ntlm-auth/default.nix
+++ b/pkgs/development/python-modules/ntlm-auth/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ntlm-auth";
-  version = "1.0.3";
+  version = "1.0.4";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = "ntlm-auth";
     rev = "v${version}";
-    sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz";
+    sha256 = "3d411413f1309fcd443095d57ab169b637e5b57ce701ac7ae8dbf572cb3533c0";
   };
 
   checkInputs = [ mock pytest unittest2 ];
-- 
GitLab


From 64cd993ba6a9c0110a539173affa98a2698d6486 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 11:34:41 +0200
Subject: [PATCH 0422/1490] python.pkgs.pyopencl: 2017.1 -> 2017.1.1

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

diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index 6b07df0b110..ddab1cde1e6 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl
+, fetchPypi
 , buildPythonPackage
 , Mako
 , pytest
@@ -15,16 +15,16 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2017.1";
+  version = "2017.1.1";
   name = "${pname}-${version}";
 
   buildInputs = [ pytest opencl-headers ocl-icd ];
 
   propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ];
 
-  src = fetchurl {
-    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "b5085b6412e5a1037b893853e4e47ecb36dd04586b0f8e1809f50f7fe1437dae";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "928c458a463321c6c91e7fa54bf325bf71d7a8aa5ff750ec8fed2472f6aeb323";
   };
 
   # gcc: error: pygpu_language_opencl.cpp: No such file or directory
-- 
GitLab


From 7111351963a56e5052f8e3fbb016a0b2b1ab3a91 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 14:41:06 +0200
Subject: [PATCH 0423/1490] python.pkgs.pandas: 0.20.1 -> 0.20.2

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 0d3a2d2dd5c..ee75d211ad8 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -27,12 +27,12 @@ let
   inherit (stdenv) isDarwin;
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.20.1";
+  version = "0.20.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "42707365577ef69f7c9c168ddcf045df2957595a9ee71bc13c7997eecb96b190";
+    sha256 = "92173c976fcca70cb19a958eccdacf98af62ef7301bf786d0321cb8857cdfae6";
   };
 
   LC_ALL = "en_US.UTF-8";
-- 
GitLab


From 76e082922f34ba9915d53492b1a4075e51fd2915 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 14:41:54 +0200
Subject: [PATCH 0424/1490] python.pkgs.bootstripped-pip: remove obsolete
 argparse code

because we no longer have Python 2.6.
---
 .../python-modules/bootstrapped-pip/default.nix           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index cdc77249cb8..0f8b6652c26 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -13,11 +13,6 @@ let
     format = "wheel";
     sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587";
   };
-  argparse_source = fetchPypi {
-    pname = "argparse";
-    version = "1.4.0";
-    sha256 = "c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314";
-  };
 in stdenv.mkDerivation rec {
   pname = "pip";
   version = "9.0.1";
@@ -34,11 +29,8 @@ in stdenv.mkDerivation rec {
     unzip -d $out/${python.sitePackages} $src
     unzip -d $out/${python.sitePackages} ${setuptools_source}
     unzip -d $out/${python.sitePackages} ${wheel_source}
-  '' + stdenv.lib.optionalString (python.isPy26 or false) ''
-    unzip -d $out/${python.sitePackages} ${argparse_source}
   '';
 
-
   patchPhase = ''
     mkdir -p $out/bin
   '';
-- 
GitLab


From 0a280a346093b9546537767e075dd2f7f805d1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Tue, 6 Jun 2017 14:44:30 +0200
Subject: [PATCH 0425/1490] hyper: 1.3.1 -> 1.3.3

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

diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 287efc89812..2202dd8c4c4 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -11,11 +11,11 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  version = "1.3.1";
+  version = "1.3.3";
   name = "hyper-${version}";
   src = fetchurl {
     url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}.deb";
-    sha256 = "1i1rnq10a9kid8lggrd1gp9g08v98la8idnyk4kx4vn0svqy7nvl";
+    sha256 = "1i68n77yv1g4dfx4xfmcb06mfpwhf0gnb3wmldg2gxkhs0fn19zg";
   };
   buildInputs = [ dpkg ];
   unpackPhase = ''
-- 
GitLab


From 66e059559a1ec431e79873a9a2d3c970fdf5cd1f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 14:48:42 +0200
Subject: [PATCH 0426/1490] Revert "python.pkgs.ntlm-auth: 1.0.3 -> 1.0.4"

This reverts commit 51d9995d043c378e31eea8ef8edecebcccff68ca.

Wrong hash, see https://github.com/NixOS/nixpkgs/issues/26320.
---
 pkgs/development/python-modules/ntlm-auth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix
index 22d8cd09c35..03890f712af 100644
--- a/pkgs/development/python-modules/ntlm-auth/default.nix
+++ b/pkgs/development/python-modules/ntlm-auth/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ntlm-auth";
-  version = "1.0.4";
+  version = "1.0.3";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = "ntlm-auth";
     rev = "v${version}";
-    sha256 = "3d411413f1309fcd443095d57ab169b637e5b57ce701ac7ae8dbf572cb3533c0";
+    sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz";
   };
 
   checkInputs = [ mock pytest unittest2 ];
-- 
GitLab


From 3d4a8e1f84b4ad654b1bd8a6577cd786e18a3f6b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 6 Jun 2017 15:03:03 +0200
Subject: [PATCH 0427/1490] nixUnstable: 1.12pre5350_7689181e ->
 1.12pre5413_b4b1f452

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a7624b095ba..40ef90fa2b2 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
 , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline
 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
+, libseccomp, busybox
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
@@ -8,23 +9,38 @@
 
 let
 
+  sh = busybox.override {
+    useMusl = true;
+    enableStatic = true;
+    enableMinimal = true;
+    extraConfig = ''
+      CONFIG_ASH y
+      CONFIG_ASH_BUILTIN_ECHO y
+      CONFIG_ASH_BUILTIN_TEST y
+      CONFIG_ASH_OPTIMIZE_FOR_SIZE y
+    '';
+  };
+
   common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec {
     inherit name src;
     version = lib.getVersion name;
 
+    is112 = lib.versionAtLeast version "1.12pre";
+
     VERSION_SUFFIX = lib.optionalString fromGit suffix;
 
     outputs = [ "out" "dev" "man" "doc" ];
 
     nativeBuildInputs =
       [ pkgconfig ]
-      ++ lib.optionals (!lib.versionAtLeast version "1.12pre") [ perl ]
+      ++ lib.optionals (!is112) [ perl ]
       ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];
 
     buildInputs = [ curl openssl sqlite xz ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
       ++ lib.optionals fromGit [ brotli readline ] # Since 1.12
-      ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre")
+      ++ lib.optional (stdenv.isLinux && is112) libseccomp
+      ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112)
           (aws-sdk-cpp.override {
             apis = ["s3"];
             customMemoryManagement = false;
@@ -48,10 +64,12 @@ let
         "--disable-init-state"
         "--enable-gc"
       ]
-      ++ lib.optionals (!lib.versionAtLeast version "1.12pre") [
+      ++ lib.optionals (!is112) [
         "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
         "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
         "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
+      ] ++ lib.optionals (is112 && stdenv.isLinux) [
+        "--with-sandbox-shell=${sh}/bin/busybox"
       ];
 
     makeFlags = "profiledir=$(out)/etc/profile.d";
@@ -139,12 +157,12 @@ in rec {
 
   nixUnstable = (lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5350_7689181e";
+    suffix = "pre5413_b4b1f452";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "7689181e4f5921d3356736996079ec0310e834c6";
-      sha256 = "08daxcpj18dffsbqs3fckahq06gzs8kl6xr4b4jgijwdl5vqwiri";
+      rev = "b4b1f4525f8dc8f320d666c208bff5cb36777580";
+      sha256 = "0qb18k2rp6bbg8g50754srl95dq0lr96i297856yhrx1hh1ja37z";
     };
     fromGit = true;
   })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
-- 
GitLab


From e5449af0bf85bdc1b3238c8b82fe983c43a246fa Mon Sep 17 00:00:00 2001
From: ss1h2a3tw <ss1ha3tw@gmail.com>
Date: Sun, 4 Jun 2017 02:22:07 +0800
Subject: [PATCH 0428/1490] pythonPackages.powerline: 2.5.2 -> 2.6

---
 .../python-modules/powerline/default.nix      | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 39 +---------------
 2 files changed, 47 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/development/python-modules/powerline/default.nix

diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix
new file mode 100644
index 00000000000..86f5adb2824
--- /dev/null
+++ b/pkgs/development/python-modules/powerline/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, git
+, mercurial
+, bazaar
+, psutil
+, pygit2
+}:
+
+buildPythonPackage rec {
+  rev  = "2.6";
+  name = "powerline-${rev}";
+  src = fetchurl {
+    url    = "https://github.com/powerline/powerline/archive/${rev}.tar.gz";
+    name   = "${name}.tar.gz";
+    sha256 = "c108f11fe10dc910febb94b87d3abded85d4363fb950366a9e30282b9ba7c272";
+  };
+
+  propagatedBuildInputs = [ git mercurial bazaar psutil pygit2];
+
+# error: This is still beta and some tests still fail
+  doCheck = false;
+
+  postInstall = ''
+    install -dm755 "$out/share/fonts/OTF/"
+    install -dm755 "$out/etc/fonts/conf.d"
+    install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf"
+    install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf"
+
+    install -dm755 "$out/share/vim/vimfiles/plugin"
+    install -m644 "powerline/bindings/vim/plugin/powerline.vim" "$out/share/vim/vimfiles/plugin/powerline.vim"
+
+    install -dm755 "$out/share/zsh/site-contrib"
+    install -m644 "powerline/bindings/zsh/powerline.zsh" "$out/share/zsh/site-contrib/powerline.zsh"
+
+    install -dm755 "$out/share/tmux"
+    install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf"
+    '';
+
+  meta = {
+    homepage    = https://github.com/powerline/powerline;
+    description = "The ultimate statusline/prompt utility";
+    license     = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2fa2c38ca3..c664655a062 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18093,44 +18093,7 @@ in {
     };
   };
 
-  powerline = buildPythonPackage rec {
-    rev  = "2.5.2";
-    name = "powerline-${rev}";
-    src = pkgs.fetchurl {
-      url    = "https://github.com/powerline/powerline/archive/${rev}.tar.gz";
-      name   = "${name}.tar.gz";
-      sha256 = "064rp2jzz4vp1xqk3445qf08pq3aif00q1rjqaqx2pla15s27yrz";
-    };
-
-    propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ];
-
-    # error: This is still beta and some tests still fail
-    doCheck = false;
-
-    postInstall = ''
-      install -dm755 "$out/share/fonts/OTF/"
-      install -dm755 "$out/etc/fonts/conf.d"
-      install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf"
-      install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf"
-
-      install -dm755 "$out/share/vim/vimfiles/plugin"
-      install -m644 "powerline/bindings/vim/plugin/powerline.vim" "$out/share/vim/vimfiles/plugin/powerline.vim"
-
-      install -dm755 "$out/share/zsh/site-contrib"
-      install -m644 "powerline/bindings/zsh/powerline.zsh" "$out/share/zsh/site-contrib/powerline.zsh"
-
-      install -dm755 "$out/share/tmux"
-      install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf"
-    '';
-
-    meta = {
-      homepage    = https://github.com/powerline/powerline;
-      description = "The ultimate statusline/prompt utility";
-      license     = licenses.mit;
-      maintainers = with maintainers; [ lovek323 ];
-      platforms   = platforms.all;
-    };
-  };
+  powerline = callPackage ../development/python-modules/powerline { };
 
   pox = buildPythonPackage rec {
     name = "pox-${version}";
-- 
GitLab


From f0002ea292effc5ef5899769080d1fb0f3e4663a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 6 Jun 2017 17:20:10 +0200
Subject: [PATCH 0429/1490] Python: improve update script

- remove dead code
- improve readability
- skip fetchFromGitHub (#26320)
---
 maintainers/scripts/update-python-libraries | 297 ++++++++++----------
 1 file changed, 144 insertions(+), 153 deletions(-)

diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index 90f6c94233a..278c467b054 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -25,18 +25,33 @@ INDEX = "https://pypi.io/pypi"
 EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
 """Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
 
-def _get_value(attribute, text):
-    """Match attribute in text and return it."""
+import logging
+logging.basicConfig(level=logging.INFO)
+
+
+def _get_values(attribute, text):
+    """Match attribute in text and return all matches.
+
+    :returns: List of matches.
+    """
     regex = '{}\s+=\s+"(.*)";'.format(attribute)
     regex = re.compile(regex)
-    value = regex.findall(text)
-    n = len(value)
+    values = regex.findall(text)
+    return values
+
+def _get_unique_value(attribute, text):
+    """Match attribute in text and return unique match.
+
+    :returns: Single match.
+    """
+    values = _get_values(attribute, text)
+    n = len(values)
     if n > 1:
-        raise ValueError("Found too many values for {}".format(attribute))
+        raise ValueError("found too many values for {}".format(attribute))
     elif n == 1:
-        return value[0]
+        return values[0]
     else:
-        raise ValueError("No value found for {}".format(attribute))
+        raise ValueError("no value found for {}".format(attribute))
 
 def _get_line_and_value(attribute, text):
     """Match attribute in text. Return the line and the value of the attribute."""
@@ -45,11 +60,11 @@ def _get_line_and_value(attribute, text):
     value = regex.findall(text)
     n = len(value)
     if n > 1:
-        raise ValueError("Found too many values for {}".format(attribute))
+        raise ValueError("found too many values for {}".format(attribute))
     elif n == 1:
         return value[0]
     else:
-        raise ValueError("No value found for {}".format(attribute))
+        raise ValueError("no value found for {}".format(attribute))
 
 
 def _replace_value(attribute, value, text):
@@ -64,175 +79,151 @@ def _fetch_page(url):
     if r.status_code == requests.codes.ok:
         return r.json()
     else:
-        raise ValueError("Request for {} failed".format(url))
-
-def _get_latest_version(package, extension):
-
+        raise ValueError("request for {} failed".format(url))
 
+def _get_latest_version_pypi(package, extension):
+    """Get latest version and hash from PyPI."""
     url = "{}/{}/json".format(INDEX, package)
     json = _fetch_page(url)
 
-    data = extract_relevant_nix_data(json, extension)[1]
-
-    version = data['latest_version']
-    if version in data['versions']:
-        sha256 = data['versions'][version]['sha256']
-    else:
-        sha256 = None   # Its possible that no file was uploaded to PyPI
+    version = json['info']['version']
+    for release in json['releases'][version]:
+        if release['filename'].endswith(extension):
+            # TODO: In case of wheel we need to do further checks!
+            sha256 = release['digests']['sha256']
 
     return version, sha256
 
 
-def extract_relevant_nix_data(json, extension):
-    """Extract relevant Nix data from the JSON of a package obtained from PyPI.
+def _get_latest_version_github(package, extension):
+    raise ValueError("updating from GitHub is not yet supported.")
+
+
+FETCHERS = {
+    'fetchFromGitHub'   :   _get_latest_version_github,
+    'fetchPypi'         :   _get_latest_version_pypi,
+    'fetchurl'          :   _get_latest_version_pypi,
+}
 
-    :param json: JSON obtained from PyPI
+
+DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz'
+
+
+FORMATS = {
+    'setuptools'        :   DEFAULT_SETUPTOOLS_EXTENSION,
+    'wheel'             :   'whl'
+}
+
+def _determine_fetcher(text):
+    # Count occurences of fetchers.
+    nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys())
+    if nfetchers == 0:
+        raise ValueError("no fetcher.")
+    elif nfetchers > 1:
+        raise ValueError("multiple fetchers.")
+    else:
+        # Then we check which fetcher to use.
+        for fetcher in FETCHERS.keys():
+            if 'src = {}'.format(fetcher) in text:
+                return fetcher
+
+
+def _determine_extension(text, fetcher):
+    """Determine what extension is used in the expression.
+
+    If we use:
+    - fetchPypi, we check if format is specified.
+    - fetchurl, we determine the extension from the url.
+    - fetchFromGitHub we simply use `.tar.gz`.
     """
-    def _extract_license(json):
-        """Extract license from JSON."""
-        return json['info']['license']
-
-    def _available_versions(json):
-        return json['releases'].keys()
-
-    def _extract_latest_version(json):
-        return json['info']['version']
-
-    def _get_src_and_hash(json, version, extensions):
-        """Obtain url and hash for a given version and list of allowable extensions."""
-        if not json['releases']:
-            msg = "Package {}: No releases available.".format(json['info']['name'])
-            raise ValueError(msg)
-        else:
-            # We use ['releases'] and not ['urls'] because we want to have the possibility for different version.
-            for possible_file in json['releases'][version]:
-                for extension in extensions:
-                    if possible_file['filename'].endswith(extension):
-                        src = {'url': str(possible_file['url']),
-                               'sha256': str(possible_file['digests']['sha256']),
-                                }
-                        return src
-            else:
-                msg = "Package {}: No release with valid file extension available.".format(json['info']['name'])
-                logging.info(msg)
-                return None
-                #raise ValueError(msg)
-
-    def _get_sources(json, extensions):
-        versions = _available_versions(json)
-        releases = {version: _get_src_and_hash(json, version, extensions) for version in versions}
-        releases = toolz.itemfilter(lambda x: x[1] is not None, releases)
-        return releases
-
-    # Collect data)
-    name = str(json['info']['name'])
-    latest_version = str(_extract_latest_version(json))
-    #src = _get_src_and_hash(json, latest_version, EXTENSIONS)
-    sources = _get_sources(json, [extension])
-
-    # Collect meta data
-    license = str(_extract_license(json))
-    license = license if license != "UNKNOWN" else None
-    summary = str(json['info'].get('summary')).strip('.')
-    summary = summary if summary != "UNKNOWN" else None
-    #description = str(json['info'].get('description'))
-    #description = description if description != "UNKNOWN" else None
-    homepage = json['info'].get('home_page')
-
-    data = {
-        'latest_version'    : latest_version,
-        'versions'  : sources,
-        #'src'           : src,
-        'meta'          : {
-            'description'            : summary if summary else None,
-            #'longDescription'        : description,
-            'license'                : license,
-            'homepage'               : homepage,
-            },
-        }
-    return name, data
+    if fetcher == 'fetchPypi':
+        try:
+            format = _get_unique_value('format', text)
+        except ValueError as e:
+            format = None   # format was not given
+
+        try:
+            extension = _get_unique_value('extension', text)
+        except ValueError as e:
+            extension = None    # extension was not given
+
+        if extension is None:
+            if format is None:
+                format = 'setuptools'
+            extension = FORMATS[format]
+
+    elif fetcher == 'fetchurl':
+        url = _get_unique_value('url', text)
+        extension = os.path.splitext(url)[1]
+        if 'pypi' not in url:
+            raise ValueError('url does not point to PyPI.')
+
+    elif fetcher == 'fetchFromGitHub':
+        raise ValueError('updating from GitHub is not yet implemented.')
+
+    return extension
 
 
 def _update_package(path):
 
+
+
+    # Read the expression
+    with open(path, 'r') as f:
+        text = f.read()
+
+    # Determine pname.
+    pname = _get_unique_value('pname', text)
+
+    # Determine version.
+    version = _get_unique_value('version', text)
+
+    # First we check how many fetchers are mentioned.
+    fetcher = _determine_fetcher(text)
+
+    extension = _determine_extension(text, fetcher)
+
+    new_version, new_sha256 = _get_latest_version_pypi(pname, extension)
+
+    if new_version == version:
+        logging.info("Path {}: no update available for {}.".format(path, pname))
+        return False
+    if not new_sha256:
+        raise ValueError("no file available for {}.".format(pname))
+
+    text = _replace_value('version', new_version, text)
+    text = _replace_value('sha256', new_sha256, text)
+
+    with open(path, 'w') as f:
+        f.write(text)
+
+        logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version))
+
+    return True
+
+
+def _update(path):
+
     # We need to read and modify a Nix expression.
     if os.path.isdir(path):
         path = os.path.join(path, 'default.nix')
 
+    # If a default.nix does not exist, we quit.
     if not os.path.isfile(path):
-        logging.warning("Path does not exist: {}".format(path))
+        logging.info("Path {}: does not exist.".format(path))
         return False
 
+    # If file is not a Nix expression, we quit.
     if not path.endswith(".nix"):
-        logging.warning("Path does not end with `.nix`, skipping: {}".format(path))
-        return False
-
-    with open(path, 'r') as f:
-        text = f.read()
-
-    try:
-        pname = _get_value('pname', text)
-    except ValueError as e:
-        logging.warning("Path {}: {}".format(path, str(e)))
+        logging.info("Path {}: does not end with `.nix`.".format(path))
         return False
 
     try:
-        version = _get_value('version', text)
+        return _update_package(path)
     except ValueError as e:
-        logging.warning("Path {}: {}".format(path, str(e)))
+        logging.warning("Path {}: {}".format(path, e))
         return False
 
-    # If we use a wheel, then we need to request a wheel as well
-    try:
-        format = _get_value('format', text)
-    except ValueError as e:
-        # No format mentioned, then we assume we have setuptools
-        # and use a .tar.gz
-        logging.info("Path {}: {}".format(path, str(e)))
-        extension = ".tar.gz"
-    else:
-        if format == 'wheel':
-            extension = ".whl"
-        else:
-            try:
-                url = _get_value('url', text)
-                extension = os.path.splitext(url)[1]
-                if 'pypi' not in url:
-                    logging.warning("Path {}: uses non-PyPI url, not updating.".format(path))
-                    return False
-            except ValueError as e:
-                logging.info("Path {}: {}".format(path, str(e)))
-                extension = ".tar.gz"
-
-    try:
-        new_version, new_sha256 = _get_latest_version(pname, extension)
-    except ValueError as e:
-        logging.warning("Path {}: {}".format(path, str(e)))
-    else:
-        if not new_sha256:
-            logging.warning("Path has no valid file available: {}".format(path))
-            return False
-        if new_version != version:
-            try:
-                text = _replace_value('version', new_version, text)
-            except ValueError as e:
-                logging.warning("Path {}: {}".format(path, str(e)))
-            try:
-                text = _replace_value('sha256', new_sha256, text)
-            except ValueError as e:
-                logging.warning("Path {}: {}".format(path, str(e)))
-
-            with open(path, 'w') as f:
-                f.write(text)
-
-            logging.info("Updated {} from {} to {}".format(pname, version, new_version))
-
-        else:
-            logging.info("No update available for {} at {}".format(pname, version))
-
-    return True
-
-
 def main():
 
     parser = argparse.ArgumentParser()
@@ -240,11 +231,11 @@ def main():
 
     args = parser.parse_args()
 
-    packages = args.package
+    packages = map(os.path.abspath, args.package)
 
-    count = list(map(_update_package, packages))
+    count = list(map(_update, packages))
 
-    #logging.info("{} package(s) updated".format(sum(count)))
+    logging.info("{} package(s) updated".format(sum(count)))
 
 if __name__ == '__main__':
     main()
\ No newline at end of file
-- 
GitLab


From 8f4619bb3d5229cc4fd0734d9a6aac19e923571a Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Mon, 5 Jun 2017 18:36:12 +0200
Subject: [PATCH 0430/1490] kdevelop: 5.0.4 -> 5.1.1

Including also a patch for bug https://bugs.kde.org/show_bug.cgi?id=379433
which is a quite annoying regression from 5.0.4. The patch is the same as
the change committed upstream.
---
 .../applications/editors/kdevelop5/kdevelop.nix |  7 +++----
 .../editors/kdevelop5/kdevplatform.nix          | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 9191d7a6653..c599666f4d5 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -9,16 +9,15 @@
 
 let
   pname = "kdevelop";
-  version = "5.0.4";
-  dirVersion = "5.0.4";
+  version = "5.1.1";
 
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";
-    sha256 = "191142b2bdb14837c82721fdfeb15e852329f2c4c0d48fd479c57514c3235d55";
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "0a01a4ffb2f01802cf4945521a3149a8f82c21fa8a97935991f1854b7db5d754";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index f2b4fc32fe4..d3680aff3d8 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
+{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
 , boost, subversion, apr, aprutil
 , qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
 , kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
@@ -6,18 +6,25 @@
 
 let
   pname = "kdevplatform";
-  version = "5.0.4";
-  dirVersion = "5.0.4";
+  version = "5.1.1";
 
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   
   src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz";
-    sha256 = "01abfcd71383048d017fe989ccce0e7590010a3975bbe6e161f55ababe2ad471";
+    url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz";
+    sha256 = "3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "kdevplatform-project-selection.patch";
+      url = "https://cgit.kde.org/kdevplatform.git/patch/?id=da4c0fdfcf21dc2a8f48a2b1402213a32effd47a";
+      sha256 = "16ws8l6dciy2civjnsaj03ml2bzvg4a9g7gd4iyx4hprw65zrcxm";
+    })
+  ];
+
   nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
 
   propagatedBuildInputs = [ ];
-- 
GitLab


From 18008383649e0fce42c07d30fac0c35af1fedc15 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 6 Jun 2017 15:52:30 -0400
Subject: [PATCH 0431/1490] synergy: 1.7.6 -> 1.8.8

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

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index a56b49752e3..b7ac784951b 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -5,13 +5,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "synergy-${version}";
-  version = "1.7.6";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "symless";
     repo = "synergy";
     rev = "v${version}-stable";
-    sha256 = "1bjksvdr74mc3xh11z4fd6qlhgklny51q5r6gqg1bhnvn9dzyrxw";
+    sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
   };
 
   postPatch = ''
-- 
GitLab


From a64194f9d43334f428f12d1dac393abda20828ad Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 6 Jun 2017 18:46:40 -0400
Subject: [PATCH 0432/1490] openssl: 1.1.0e -> 1.1.0f

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 2009daa1cc8..03d9aca5e6e 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -114,8 +114,8 @@ in {
   };
 
   openssl_1_1_0 = common {
-    version = "1.1.0e";
-    sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp";
+    version = "1.1.0f";
+    sha256 = "0r97n4n552ns571diz54qsgarihrxvbn7kvyv8wjyfs9ybrldxqj";
   };
 
 }
-- 
GitLab


From 200ac02d0f9947cb997edfb9688818042fd52569 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 3 Jun 2017 20:28:05 -0400
Subject: [PATCH 0433/1490] binutils: Modernize derivation

No hashes of any sort should be changed
---
 .../tools/misc/binutils/default.nix           | 24 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 6bfd933bf9b..23ea7aed251 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -1,13 +1,17 @@
-{ stdenv, fetchurl, noSysDirs, zlib
-, cross ? null, gold ? true, bison ? null
+{ stdenv, buildPackages
+, fetchurl, zlib
+, buildPlatform, hostPlatform, targetPlatform
+, noSysDirs, gold ? true, bison ? null
 }:
 
-let basename = "binutils-2.28"; in
-
-let inherit (stdenv.lib) optional optionals optionalString; in
+let
+  version = "2.28";
+  basename = "binutils-${version}";
+  inherit (stdenv.lib) optional optionals optionalString;
+in
 
 stdenv.mkDerivation rec {
-  name = optionalString (cross != null) "${cross.config}-" + basename;
+  name = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-" + basename;
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
@@ -42,9 +46,9 @@ stdenv.mkDerivation rec {
 
   # TODO: all outputs on all platform
   outputs = [ "out" ]
-    ++ optional (cross == null && !stdenv.isDarwin) "lib" # problems in Darwin stdenv
+    ++ optional (targetPlatform == hostPlatform && !hostPlatform.isDarwin) "lib" # problems in Darwin stdenv
     ++ [ "info" ]
-    ++ optional (cross == null) "dev";
+    ++ optional (targetPlatform == hostPlatform) "dev";
 
   nativeBuildInputs = [ bison ];
   buildInputs = [ zlib ];
@@ -69,14 +73,14 @@ stdenv.mkDerivation rec {
 
   # As binutils takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
-  NIX_CFLAGS_COMPILE = if stdenv.isDarwin
+  NIX_CFLAGS_COMPILE = if hostPlatform.isDarwin
     then "-Wno-string-plus-int -Wno-deprecated-declarations"
     else "-static-libgcc";
 
   configureFlags =
     [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"
-    ++ optional (cross != null) "--target=${cross.config}" # TODO: make this unconditional
+    ++ optional (targetPlatform != hostPlatform) "--target=${targetPlatform.config}" # TODO: make this unconditional
     ++ optionals gold [ "--enable-gold" "--enable-plugins" ]
     ++ optional (stdenv.system == "i686-linux") "--enable-targets=x86_64-linux-gnu";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bca3cee890..86130ada3e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6535,7 +6535,6 @@ with pkgs;
   binutils-raw = callPackage ../development/tools/misc/binutils {
     # FHS sys dirs presumably only have stuff for the build platform
     noSysDirs = (targetPlatform != buildPlatform) || noSysDirs;
-    cross = if targetPlatform != hostPlatform then targetPlatform else null;
   };
 
   binutils_nogold = lowPrio (binutils-raw.override {
-- 
GitLab


From e854685d65f4f6bf9afe5b34550c15f69afa9247 Mon Sep 17 00:00:00 2001
From: Ross MacLeod <rmm-github@z.odi.ac>
Date: Mon, 5 Jun 2017 00:10:17 +0000
Subject: [PATCH 0434/1490] gcc*: Remove cross argument and instead use
 hostPlatform and targetPlatform

---
 .../development/compilers/gcc/4.5/default.nix | 47 +++++++++----------
 .../development/compilers/gcc/4.8/default.nix | 47 +++++++++----------
 .../development/compilers/gcc/4.9/default.nix | 47 +++++++++----------
 pkgs/development/compilers/gcc/5/default.nix  | 47 +++++++++----------
 pkgs/development/compilers/gcc/6/default.nix  | 47 +++++++++----------
 .../compilers/gcc/snapshot/default.nix        | 47 +++++++++----------
 pkgs/top-level/all-packages.nix               | 26 ----------
 7 files changed, 138 insertions(+), 170 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 288a91398d2..7c5d91c9128 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -19,7 +19,6 @@
 , gnatboot ? null
 , enableMultilib ? false
 , name ? "gcc"
-, cross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -65,22 +64,22 @@ let version = "4.5.4";
     javaAwtGtk = langJava && gtk2 != null;
 
     /* Cross-gcc settings */
-    gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross;
-    gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross;
-    gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross;
+    gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null targetPlatform;
+    gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null targetPlatformt;
+    gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null targetPlatform;
     withArch = if gccArch != null then " --with-arch=${gccArch}" else "";
     withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else "";
     withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else "";
-    crossMingw = (cross != null && cross.libc == "msvcrt");
+    crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt");
 
     crossConfigureFlags =
-      "--target=${cross.config}" +
+      "--target=${targetPlatform.config}" +
       withArch +
       withCpu +
       withAbi +
       # Ensure that -print-prog-name is able to find the correct programs.
-      " --with-as=${binutils}/bin/${cross.config}-as" +
-      " --with-ld=${binutils}/bin/${cross.config}-ld" +
+      " --with-as=${binutils}/bin/${targetPlatform.config}-as" +
+      " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
       (if crossMingw && crossStageStatic then
         " --with-headers=${libcCross}/include" +
         " --with-gcc" +
@@ -120,7 +119,7 @@ let version = "4.5.4";
         );
     stageNameAddon = if crossStageStatic then "-stage-static" else
       "-stage-final";
-    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
 
 in
 
@@ -148,7 +147,7 @@ stdenv.mkDerivation ({
 
   patches =
     [ ]
-    ++ optional (cross != null) ../libstdc++-target.patch
+    ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
     ++ optional noSysDirs ./no-sys-dirs.patch
     # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
     # target libraries and tools.
@@ -161,7 +160,7 @@ stdenv.mkDerivation ({
         || (libcCross != null                  # e.g., building `gcc.crossDrv'
             && libcCross ? crossConfig
             && libcCross.crossConfig == "i586-pc-gnu")
-        || (cross != null && cross.config == "i586-pc-gnu"
+        || (targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"
             && libcCross != null))
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
@@ -197,7 +196,7 @@ stdenv.mkDerivation ({
            sed -i gcc/config/t-gnu \
                -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g'
         ''
-    else if cross != null || stdenv.cc.libc != null then
+    else if targetPlatform != hostPlatform || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
@@ -227,7 +226,7 @@ stdenv.mkDerivation ({
     ++ (optional langJava boehmgc)
     ++ (optionals langJava [zip unzip])
     ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs))
-    ++ (optionals (cross != null) [binutils])
+    ++ (optionals (targetPlatform != hostPlatform) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
     ;
@@ -265,13 +264,13 @@ stdenv.mkDerivation ({
       )
     }
     ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
-      if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
+      if targetPlatform == hostPlatform && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
     ${if langAda then " --enable-libada" else ""}
-    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
-    ${if cross != null then crossConfigureFlags else ""}
+    ${if targetPlatform == hostPlatform && stdenv.isi686 then "--with-arch=i686" else ""}
+    ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
   ";
 
-  targetConfig = if cross != null then cross.config else null;
+  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
   crossAttrs = {
     AR = "${targetPlatform.config}-ar";
@@ -284,7 +283,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
@@ -312,8 +311,8 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
-      ${if cross != null then crossConfigureFlags else ""}
+      ${if targetPlatform == hostPlatform && stdenv.isi686 then "--with-arch=i686" else ""}
+      ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
       --target=${targetPlatform.config}
     '';
   };
@@ -357,7 +356,7 @@ stdenv.mkDerivation ({
     ++ optional (libpthread != null) libpthread);
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-idirafter ${libcCross.dev}/include"
       ]
       ++ optionals (! crossStageStatic) [
@@ -366,7 +365,7 @@ stdenv.mkDerivation ({
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-Wl,-L${libcCross.out}/lib"
       ]
       ++ (if crossStageStatic then [
@@ -412,14 +411,14 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (cross != null || libcCross != null) {
+// optionalAttrs (targetPlatform != hostPlatform || libcCross != null) {
   # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of,
   # say, "i586-pc-gnu-gcc -E" when building `gcc.crossDrv'.
   # FIXME: Fix `builder.sh' directly in the next stdenv-update.
   postUnpack = "unset CPP";
 }
 
-// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";
 }
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index ee013809faf..c057624398b 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -25,7 +25,6 @@
 , enableMultilib ? false
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
-, cross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -60,13 +59,13 @@ with builtins;
 let version = "4.8.5";
 
     # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
 
     enableParallelBuilding = true;
 
     patches = [ ]
       ++ optional enableParallelBuilding ../parallel-bconfig.patch
-      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
@@ -120,8 +119,8 @@ let version = "4.8.5";
         withMode;
 
     /* Cross-gcc settings */
-    crossMingw = cross != null && cross.libc == "msvcrt";
-    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+    crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
     crossConfigureFlags = let
         gccArch = targetPlatform.gcc.arch or null;
         gccCpu = targetPlatform.gcc.cpu or null;
@@ -136,7 +135,7 @@ let version = "4.8.5";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${cross.config}" +
+        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -144,8 +143,8 @@ let version = "4.8.5";
         withFloat +
         withMode +
         # Ensure that -print-prog-name is able to find the correct programs.
-        " --with-as=${binutils}/bin/${cross.config}-as" +
-        " --with-ld=${binutils}/bin/${cross.config}-ld" +
+        " --with-as=${binutils}/bin/${targetPlatform.config}-as" +
+        " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -187,7 +186,7 @@ let version = "4.8.5";
             " --disable-shared" +
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
-            else (if cross.libc == "uclibc" then
+            else (if targetPlatform.libc == "uclibc" then
               # In uclibc cases, libgomp needs an additional '-ldl'
               # and as I don't know how to pass it, I disable libgomp.
               " --disable-libgomp" else "") +
@@ -196,9 +195,9 @@ let version = "4.8.5";
             " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
           );
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
 
-    bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
+    bootstrap = targetPlatform == hostPlatform && !stdenv.isArm && !stdenv.isMips;
 
 in
 
@@ -262,7 +261,7 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
         ''
-    else if cross != null || stdenv.cc.libc != null then
+    else if targetPlatform != hostPlatform || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
@@ -292,7 +291,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutils])
+    ++ (optionals (targetPlatform != hostPlatform) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -357,19 +356,19 @@ stdenv.mkDerivation ({
         )
       )
     }
-    ${if cross == null
+    ${if targetPlatform == hostPlatform
       then if stdenv.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
-    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
-    ${if cross != null then crossConfigureFlags else ""}
+    ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
+    ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
     ${if !bootstrap then "--disable-bootstrap" else ""}
-    ${if cross == null then platformFlags else ""}
+    ${if targetPlatform == hostPlatform then platformFlags else ""}
   ";
 
-  targetConfig = if cross != null then cross.config else null;
+  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
   buildFlags = if bootstrap then
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
@@ -402,7 +401,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
@@ -479,7 +478,7 @@ stdenv.mkDerivation ({
     ++ optional (libpthread != null) libpthread);
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-idirafter ${libcCross.dev}/include"
       ]
       ++ optionals (! crossStageStatic) [
@@ -488,7 +487,7 @@ stdenv.mkDerivation ({
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-Wl,-L${libcCross.out}/lib"
       ]
       ++ (if crossStageStatic then [
@@ -537,13 +536,13 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
+# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
+// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 872f78fcf37..3469710f991 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -25,7 +25,6 @@
 , enableMultilib ? false
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
-, cross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -60,14 +59,14 @@ with builtins;
 let version = "4.9.4";
 
     # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
 
     enableParallelBuilding = true;
 
     patches =
       [ ../use-source-date-epoch.patch ]
       ++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ]
-      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
@@ -122,8 +121,8 @@ let version = "4.9.4";
         withMode;
 
     /* Cross-gcc settings */
-    crossMingw = cross != null && cross.libc == "msvcrt";
-    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+    crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
     crossConfigureFlags = let
         gccArch = targetPlatform.gcc.arch or null;
         gccCpu = targetPlatform.gcc.cpu or null;
@@ -138,7 +137,7 @@ let version = "4.9.4";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${cross.config}" +
+        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -146,8 +145,8 @@ let version = "4.9.4";
         withFloat +
         withMode +
         # Ensure that -print-prog-name is able to find the correct programs.
-        " --with-as=${binutils}/bin/${cross.config}-as" +
-        " --with-ld=${binutils}/bin/${cross.config}-ld" +
+        " --with-as=${binutils}/bin/${targetPlatform.config}-as" +
+        " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -187,7 +186,7 @@ let version = "4.9.4";
             " --disable-shared" +
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
-            else (if cross.libc == "uclibc" then
+            else (if targetPlatform.libc == "uclibc" then
               # libsanitizer requires netrom/netrom.h which is not
               # available in uclibc.
               " --disable-libsanitizer" +
@@ -199,9 +198,9 @@ let version = "4.9.4";
             " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
           );
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
 
-  bootstrap = cross == null;
+  bootstrap = targetPlatform == hostPlatform;
 
 in
 
@@ -266,7 +265,7 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
         ''
-    else if cross != null || stdenv.cc.libc != null then
+    else if targetPlatform != hostPlatform || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
@@ -296,7 +295,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutils])
+    ++ (optionals (targetPlatform != hostPlatform) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -363,19 +362,19 @@ stdenv.mkDerivation ({
         )
       )
     }
-    ${if cross == null
+    ${if targetPlatform == hostPlatform
       then if stdenv.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
-    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
-    ${if cross != null then crossConfigureFlags else ""}
+    ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
+    ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
     ${if !bootstrap then "--disable-bootstrap" else ""}
-    ${if cross == null then platformFlags else ""}
+    ${if targetPlatform == hostPlatform then platformFlags else ""}
   ";
 
-  targetConfig = if cross != null then cross.config else null;
+  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
   buildFlags = if bootstrap then
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
@@ -408,7 +407,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
@@ -485,7 +484,7 @@ stdenv.mkDerivation ({
     ++ optional (libpthread != null) libpthread);
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-idirafter ${libcCross.dev}/include"
       ]
       ++ optionals (! crossStageStatic) [
@@ -494,7 +493,7 @@ stdenv.mkDerivation ({
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-Wl,-L${libcCross.out}/lib"
       ]
       ++ (if crossStageStatic then [
@@ -543,13 +542,13 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
+# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
+// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 70cd0838390..2569b8c5dc7 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -25,7 +25,6 @@
 , enableMultilib ? false
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
-, cross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -63,13 +62,13 @@ let version = "5.4.0";
     sha256 = "0fihlcy5hnksdxk0sn6bvgnyq8gfrgs8m794b1jxwd1dxinzg3b0";
 
     # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
 
     enableParallelBuilding = true;
 
     patches =
       [ ../use-source-date-epoch.patch ]
-      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
@@ -126,8 +125,8 @@ let version = "5.4.0";
         withMode;
 
     /* Cross-gcc settings */
-    crossMingw = cross != null && cross.libc == "msvcrt";
-    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+    crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
     crossConfigureFlags = let
         gccArch = targetPlatform.gcc.arch or null;
         gccCpu = targetPlatform.gcc.cpu or null;
@@ -142,7 +141,7 @@ let version = "5.4.0";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${cross.config}" +
+        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -150,8 +149,8 @@ let version = "5.4.0";
         withFloat +
         withMode +
         # Ensure that -print-prog-name is able to find the correct programs.
-        " --with-as=${binutils}/bin/${cross.config}-as" +
-        " --with-ld=${binutils}/bin/${cross.config}-ld" +
+        " --with-as=${binutils}/bin/${targetPlatform.config}-as" +
+        " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -191,7 +190,7 @@ let version = "5.4.0";
             " --disable-shared" +
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
-            else (if cross.libc == "uclibc" then
+            else (if targetPlatform.libc == "uclibc" then
               # libsanitizer requires netrom/netrom.h which is not
               # available in uclibc.
               " --disable-libsanitizer" +
@@ -203,9 +202,9 @@ let version = "5.4.0";
             " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
           );
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
 
-  bootstrap = cross == null;
+  bootstrap = targetPlatform == hostPlatform;
 
 in
 
@@ -283,7 +282,7 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
         ''
-    else if cross != null || stdenv.cc.libc != null then
+    else if targetPlatform != hostPlatform || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
@@ -312,7 +311,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutils])
+    ++ (optionals (targetPlatform != hostPlatform) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -378,19 +377,19 @@ stdenv.mkDerivation ({
         )
       )
     }
-    ${if cross == null
+    ${if targetPlatform == hostPlatform
       then if stdenv.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
-    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
-    ${if cross != null then crossConfigureFlags else ""}
+    ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
+    ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
     ${if !bootstrap then "--disable-bootstrap" else ""}
-    ${if cross == null then platformFlags else ""}
+    ${if targetPlatform == hostPlatform then platformFlags else ""}
   ";
 
-  targetConfig = if cross != null then cross.config else null;
+  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
   buildFlags = if bootstrap then
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
@@ -423,7 +422,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
@@ -499,7 +498,7 @@ stdenv.mkDerivation ({
     ++ optional (libpthread != null) libpthread);
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-idirafter ${getDev libcCross}/include"
       ]
       ++ optionals (! crossStageStatic) [
@@ -508,7 +507,7 @@ stdenv.mkDerivation ({
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-Wl,-L${libcCross.out}/lib"
       ]
       ++ (if crossStageStatic then [
@@ -556,13 +555,13 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
+# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
+// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 1a95f476ada..8086bfb24df 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -25,7 +25,6 @@
 , enableMultilib ? false
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
-, cross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -62,13 +61,13 @@ with builtins;
 let version = "6.3.0";
 
     # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
 
     enableParallelBuilding = true;
 
     patches =
       [ ../use-source-date-epoch.patch ]
-      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
@@ -122,8 +121,8 @@ let version = "6.3.0";
         withMode;
 
     /* Cross-gcc settings */
-    crossMingw = cross != null && cross.libc == "msvcrt";
-    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+    crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
     crossConfigureFlags = let
         gccArch = targetPlatform.gcc.arch or null;
         gccCpu = targetPlatform.gcc.cpu or null;
@@ -138,7 +137,7 @@ let version = "6.3.0";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${cross.config}" +
+        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -146,8 +145,8 @@ let version = "6.3.0";
         withFloat +
         withMode +
         # Ensure that -print-prog-name is able to find the correct programs.
-        " --with-as=${binutils}/bin/${cross.config}-as" +
-        " --with-ld=${binutils}/bin/${cross.config}-ld" +
+        " --with-as=${binutils}/bin/${targetPlatform.config}-as" +
+        " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -187,7 +186,7 @@ let version = "6.3.0";
             " --disable-shared" +
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
-            else (if cross.libc == "uclibc" then
+            else (if targetPlatform.libc == "uclibc" then
               # libsanitizer requires netrom/netrom.h which is not
               # available in uclibc.
               " --disable-libsanitizer" +
@@ -199,9 +198,9 @@ let version = "6.3.0";
             " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
           );
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
 
-  bootstrap = cross == null;
+  bootstrap = targetPlatform == hostPlatform;
 
 in
 
@@ -265,7 +264,7 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
         ''
-    else if cross != null || stdenv.cc.libc != null then
+    else if targetPlatform != hostPlatform || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
@@ -294,7 +293,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutils])
+    ++ (optionals (targetPlatform != hostPlatform) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -360,19 +359,19 @@ stdenv.mkDerivation ({
         )
       )
     }
-    ${if cross == null
+    ${if targetPlatform == hostPlatform
       then if stdenv.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
-    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
-    ${if cross != null then crossConfigureFlags else ""}
+    ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
+    ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
     ${if !bootstrap then "--disable-bootstrap" else ""}
-    ${if cross == null then platformFlags else ""}
+    ${if targetPlatform == hostPlatform then platformFlags else ""}
   ";
 
-  targetConfig = if cross != null then cross.config else null;
+  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
   buildFlags = if bootstrap then
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
@@ -405,7 +404,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
@@ -481,7 +480,7 @@ stdenv.mkDerivation ({
     ++ optional (libpthread != null) libpthread);
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-idirafter ${getDev libcCross}/include"
       ]
       ++ optionals (! crossStageStatic) [
@@ -490,7 +489,7 @@ stdenv.mkDerivation ({
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-Wl,-L${libcCross.out}/lib"
       ]
       ++ (if crossStageStatic then [
@@ -538,13 +537,13 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; }
+# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
+// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index cbb373eb3ed..33a202fdb98 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -25,7 +25,6 @@
 , enableMultilib ? false
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
-, cross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -63,13 +62,13 @@ with builtins;
 let version = "7-20170409";
 
     # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
 
     enableParallelBuilding = true;
 
     patches =
       [ ]
-      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
@@ -122,8 +121,8 @@ let version = "7-20170409";
         withMode;
 
     /* Cross-gcc settings */
-    crossMingw = cross != null && cross.libc == "msvcrt";
-    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+    crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
     crossConfigureFlags = let
         gccArch = targetPlatform.gcc.arch or null;
         gccCpu = targetPlatform.gcc.cpu or null;
@@ -138,7 +137,7 @@ let version = "7-20170409";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${cross.config}" +
+        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -146,8 +145,8 @@ let version = "7-20170409";
         withFloat +
         withMode +
         # Ensure that -print-prog-name is able to find the correct programs.
-        " --with-as=${binutils}/bin/${cross.config}-as" +
-        " --with-ld=${binutils}/bin/${cross.config}-ld" +
+        " --with-as=${binutils}/bin/${targetPlatform.config}-as" +
+        " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -188,7 +187,7 @@ let version = "7-20170409";
             " --disable-shared" +
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
-            else (if cross.libc == "uclibc" then
+            else (if targetPlatform.libc == "uclibc" then
               # libsanitizer requires netrom/netrom.h which is not
               # available in uclibc.
               " --disable-libsanitizer" +
@@ -200,9 +199,9 @@ let version = "7-20170409";
             " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
           );
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
 
-  bootstrap = cross == null;
+  bootstrap = targetPlatform == hostPlatform;
 
 in
 
@@ -266,7 +265,7 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
         ''
-    else if cross != null || stdenv.cc.libc != null then
+    else if targetPlatform != hostPlatform || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
@@ -295,7 +294,7 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutils])
+    ++ (optionals (targetPlatform != hostPlatform) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -361,19 +360,19 @@ stdenv.mkDerivation ({
         )
       )
     }
-    ${if cross == null
+    ${if targetPlatform == hostPlatform
       then if stdenv.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
-    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
-    ${if cross != null then crossConfigureFlags else ""}
+    ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
+    ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
     ${if !bootstrap then "--disable-bootstrap" else ""}
-    ${if cross == null then platformFlags else ""}
+    ${if targetPlatform == hostPlatform then platformFlags else ""}
   ";
 
-  targetConfig = if cross != null then cross.config else null;
+  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
   buildFlags = if bootstrap then
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
@@ -406,7 +405,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
@@ -482,7 +481,7 @@ stdenv.mkDerivation ({
     ++ optional (libpthread != null) libpthread);
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-idirafter ${getDev libcCross}/include"
       ]
       ++ optionals (! crossStageStatic) [
@@ -491,7 +490,7 @@ stdenv.mkDerivation ({
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-Wl,-L${libcCross.out}/lib"
       ]
       ++ (if crossStageStatic then [
@@ -539,13 +538,13 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
+// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86130ada3e7..f8d0d2cc7f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5145,7 +5145,6 @@ with pkgs;
       else null;
     in wrapGCCCross {
       gcc = forcedNativePackages.gcc.cc.override {
-        cross = targetPlatform;
         crossStageStatic = true;
         langCC = false;
         libcCross = libcCross1;
@@ -5168,7 +5167,6 @@ with pkgs;
 
   gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapGCCCross {
     gcc = forcedNativePackages.gcc.cc.override {
-      cross = targetPlatform;
       crossStageStatic = false;
 
       # Why is this needed?
@@ -5190,10 +5188,6 @@ with pkgs;
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
     profiledCompiler = !stdenv.isArm;
 
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
     libcCross = if targetPlatform != buildPlatform then libcCross else null;
   }));
 
@@ -5203,10 +5197,6 @@ with pkgs;
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
     profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64));
 
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
     libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_14 else null;
@@ -5220,10 +5210,6 @@ with pkgs;
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
     profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
 
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
     libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_11 else null;
@@ -5237,10 +5223,6 @@ with pkgs;
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
     profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
 
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
     libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_14 else null;
@@ -5252,10 +5234,6 @@ with pkgs;
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
     profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
 
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
     libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_14 else null;
@@ -5282,10 +5260,6 @@ with pkgs;
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
     profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
 
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
     libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = isl_0_17;
-- 
GitLab


From 35ed21d09636ea85806685c92723a5ebc2d6bb39 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 4 Jun 2017 23:55:29 -0400
Subject: [PATCH 0435/1490] gcc*: Replace stdenv.is* with
 {host,target}Platform.is*

Host everywhere would be guaranteed to preserve the old semantics,
but in a few places it doesn't matter in practice, target is used
instead for clarity.
---
 .../development/compilers/gcc/4.5/default.nix |  6 ++---
 .../development/compilers/gcc/4.8/default.nix | 20 ++++++++--------
 .../development/compilers/gcc/4.9/default.nix | 18 +++++++-------
 pkgs/development/compilers/gcc/5/default.nix  | 24 +++++++++----------
 pkgs/development/compilers/gcc/6/default.nix  | 24 +++++++++----------
 .../compilers/gcc/snapshot/default.nix        | 22 ++++++++---------
 6 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 7c5d91c9128..67981ad1056 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -138,7 +138,7 @@ stdenv.mkDerivation ({
 
   hardeningDisable = [ "format" ] ++ optional (name != "gnat") "all";
 
-  outputs = if (stdenv.is64bit && langAda) then [ "out" "doc" ]
+  outputs = if (hostPlatform.is64bit && langAda) then [ "out" "doc" ]
     else [ "out" "lib" "doc" ];
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
@@ -266,7 +266,7 @@ stdenv.mkDerivation ({
     ${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
       if targetPlatform == hostPlatform && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
     ${if langAda then " --enable-libada" else ""}
-    ${if targetPlatform == hostPlatform && stdenv.isi686 then "--with-arch=i686" else ""}
+    ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
     ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
   ";
 
@@ -311,7 +311,7 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      ${if targetPlatform == hostPlatform && stdenv.isi686 then "--with-arch=i686" else ""}
+      ${if targetplatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
       ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
       --target=${targetPlatform.config}
     '';
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index c057624398b..de9d3165b55 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
-, langObjC ? stdenv.isDarwin
-, langObjCpp ? stdenv.isDarwin
+, langObjC ? targetPlatform.isDarwin
+, langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
 , langAda ? false
 , langVhdl ? false
@@ -48,7 +48,7 @@ assert cloog != null -> isl != null;
 assert libelf != null -> zlib != null;
 
 # Make sure we get GNU sed.
-assert stdenv.isDarwin -> gnused != null;
+assert hostPlatform.isDarwin -> gnused != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -71,7 +71,7 @@ let version = "4.8.5";
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
-      ++ optional stdenv.isDarwin ../gfortran-darwin-NXConstStr.patch;
+      ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -197,7 +197,7 @@ let version = "4.8.5";
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
 
-    bootstrap = targetPlatform == hostPlatform && !stdenv.isArm && !stdenv.isMips;
+    bootstrap = targetPlatform == hostPlatform && !hostPlatform.isArm && !hostPlatform.isMips;
 
 in
 
@@ -225,7 +225,7 @@ stdenv.mkDerivation ({
   libc_dev = stdenv.cc.libc_dev;
 
   postPatch =
-    if (stdenv.isHurd
+    if (hostPlatform.isHurd
         || (libcCross != null                  # e.g., building `gcc.crossDrv'
             && libcCross ? crossConfig
             && libcCross.crossConfig == "i586-pc-gnu")
@@ -297,11 +297,11 @@ stdenv.mkDerivation ({
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ (optional stdenv.isDarwin gnused)
+    ++ (optional hostPlatform.isDarwin gnused)
     ;
 
 
-  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
@@ -311,7 +311,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   configureFlags = "
-    ${if stdenv.isSunOS then
+    ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
       # On Illumos/Solaris GNU as is preferred
       " --with-gnu-as --without-gnu-ld "
@@ -357,7 +357,7 @@ stdenv.mkDerivation ({
       )
     }
     ${if targetPlatform == hostPlatform
-      then if stdenv.isDarwin
+      then if hostPlatform.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 3469710f991..c5bebdf3300 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
-, langObjC ? stdenv.isDarwin
-, langObjCpp ? stdenv.isDarwin
+, langObjC ? targetPlatform.isDarwin
+, langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
 , langAda ? false
 , langVhdl ? false
@@ -48,7 +48,7 @@ assert cloog != null -> isl != null;
 assert libelf != null -> zlib != null;
 
 # Make sure we get GNU sed.
-assert stdenv.isDarwin -> gnused != null;
+assert hostPlatform.isDarwin -> gnused != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -73,7 +73,7 @@ let version = "4.9.4";
       ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
       # The NXConstStr.patch can be removed at 4.9.4
-      ++ optional stdenv.isDarwin ../gfortran-darwin-NXConstStr.patch;
+      ++ optional hostPlatform.isDarwin ../gfortran-darwin-NXConstStr.patch;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -229,7 +229,7 @@ stdenv.mkDerivation ({
   libc_dev = stdenv.cc.libc_dev;
 
   postPatch =
-    if (stdenv.isHurd
+    if (hostPlatform.isHurd
         || (libcCross != null                  # e.g., building `gcc.crossDrv'
             && libcCross ? crossConfig
             && libcCross.crossConfig == "i586-pc-gnu")
@@ -301,10 +301,10 @@ stdenv.mkDerivation ({
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ (optional stdenv.isDarwin gnused)
+    ++ (optional hostPlatform.isDarwin gnused)
     ;
 
-  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     sed -i -e "s/-lrt//g" libstdc++-v3/configure
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
@@ -319,7 +319,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   configureFlags = "
-    ${if stdenv.isSunOS then
+    ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
       # On Illumos/Solaris GNU as is preferred
       " --with-gnu-as --without-gnu-ld "
@@ -363,7 +363,7 @@ stdenv.mkDerivation ({
       )
     }
     ${if targetPlatform == hostPlatform
-      then if stdenv.isDarwin
+      then if hostPlatform.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 2569b8c5dc7..b4a74300d36 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
-, langObjC ? stdenv.isDarwin
-, langObjCpp ? stdenv.isDarwin
+, langObjC ? targetPlatform.isDarwin
+, langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
 , langAda ? false
 , langVhdl ? false
@@ -47,10 +47,10 @@ assert langVhdl     -> gnat != null;
 assert libelf != null -> zlib != null;
 
 # Make sure we get GNU sed.
-assert stdenv.isDarwin -> gnused != null;
+assert hostPlatform.isDarwin -> gnused != null;
 
 # Need c++filt on darwin
-assert stdenv.isDarwin -> binutils != null;
+assert hostPlatform.isDarwin -> binutils != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -234,7 +234,7 @@ stdenv.mkDerivation ({
 
   # This should kill all the stdinc frameworks that gcc and friends like to
   # insert into default search paths.
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
     substituteInPlace gcc/config/darwin-c.c \
       --replace 'if (stdinc)' 'if (0)'
 
@@ -246,7 +246,7 @@ stdenv.mkDerivation ({
   '';
 
   postPatch =
-    if (stdenv.isHurd
+    if (hostPlatform.isHurd
         || (libcCross != null                  # e.g., building `gcc.crossDrv'
             && libcCross ? crossConfig
             && libcCross.crossConfig == "i586-pc-gnu")
@@ -317,13 +317,13 @@ stdenv.mkDerivation ({
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ (optional stdenv.isDarwin gnused)
-    ++ (optional stdenv.isDarwin binutils)
+    ++ (optional hostPlatform.isDarwin gnused)
+    ++ (optional hostPlatform.isDarwin binutils)
     ;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
@@ -333,7 +333,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   configureFlags = "
-    ${if stdenv.isSunOS then
+    ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
       # On Illumos/Solaris GNU as is preferred
       " --with-gnu-as --without-gnu-ld "
@@ -378,7 +378,7 @@ stdenv.mkDerivation ({
       )
     }
     ${if targetPlatform == hostPlatform
-      then if stdenv.isDarwin
+      then if hostPlatform.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 8086bfb24df..057acf9794e 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
-, langObjC ? stdenv.isDarwin
-, langObjCpp ? stdenv.isDarwin
+, langObjC ? targetPlatform.isDarwin
+, langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
 , langAda ? false
 , langVhdl ? false
@@ -47,10 +47,10 @@ assert langVhdl     -> gnat != null;
 assert libelf != null -> zlib != null;
 
 # Make sure we get GNU sed.
-assert stdenv.isDarwin -> gnused != null;
+assert hostPlatform.isDarwin -> gnused != null;
 
 # Need c++filt on darwin
-assert stdenv.isDarwin -> binutils != null;
+assert hostPlatform.isDarwin -> binutils != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -73,7 +73,7 @@ let version = "6.3.0";
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
-      ++ optional stdenv.isDarwin ./darwin-const-correct.patch; # Kill this after 6.3.0
+      ++ optional hostPlatform.isDarwin ./darwin-const-correct.patch; # Kill this after 6.3.0
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -228,7 +228,7 @@ stdenv.mkDerivation ({
   hardeningDisable = [ "format" ];
 
   postPatch =
-    if (stdenv.isHurd
+    if (hostPlatform.isHurd
         || (libcCross != null                  # e.g., building `gcc.crossDrv'
             && libcCross ? crossConfig
             && libcCross.crossConfig == "i586-pc-gnu")
@@ -299,13 +299,13 @@ stdenv.mkDerivation ({
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ (optional stdenv.isDarwin gnused)
-    ++ (optional stdenv.isDarwin binutils)
+    ++ (optional hostPlatform.isDarwin gnused)
+    ++ (optional hostPlatform.isDarwin binutils)
     ;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
@@ -315,7 +315,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   configureFlags = "
-    ${if stdenv.isSunOS then
+    ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
       # On Illumos/Solaris GNU as is preferred
       " --with-gnu-as --without-gnu-ld "
@@ -360,7 +360,7 @@ stdenv.mkDerivation ({
       )
     }
     ${if targetPlatform == hostPlatform
-      then if stdenv.isDarwin
+      then if hostPlatform.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 33a202fdb98..bb2c9d8a5c0 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
-, langObjC ? stdenv.isDarwin
-, langObjCpp ? stdenv.isDarwin
+, langObjC ? targetPlatform.isDarwin
+, langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
 , langAda ? false
 , langVhdl ? false
@@ -48,10 +48,10 @@ assert langVhdl     -> gnat != null;
 assert libelf != null -> zlib != null;
 
 # Make sure we get GNU sed.
-assert stdenv.isDarwin -> gnused != null;
+assert hostPlatform.isDarwin -> gnused != null;
 
 # Need c++filt on darwin
-assert stdenv.isDarwin -> binutils != null;
+assert hostPlatform.isDarwin -> binutils != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -229,7 +229,7 @@ stdenv.mkDerivation ({
   hardeningDisable = [ "format" ];
 
   postPatch =
-    if (stdenv.isHurd
+    if (hostPlatform.isHurd
         || (libcCross != null                  # e.g., building `gcc.crossDrv'
             && libcCross ? crossConfig
             && libcCross.crossConfig == "i586-pc-gnu")
@@ -300,13 +300,13 @@ stdenv.mkDerivation ({
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ (optional stdenv.isDarwin gnused)
-    ++ (optional stdenv.isDarwin binutils)
+    ++ (optional hostPlatform.isDarwin gnused)
+    ++ (optional hostPlatform.isDarwin binutils)
     ;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
@@ -316,7 +316,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   configureFlags = "
-    ${if stdenv.isSunOS then
+    ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
       # On Illumos/Solaris GNU as is preferred
       " --with-gnu-as --without-gnu-ld "
@@ -361,7 +361,7 @@ stdenv.mkDerivation ({
       )
     }
     ${if targetPlatform == hostPlatform
-      then if stdenv.isDarwin
+      then if hostPlatform.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
-- 
GitLab


From acf4f0ce69e179de8ef617a13c708bfc8598100c Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Wed, 7 Jun 2017 10:20:20 +0800
Subject: [PATCH 0436/1490] libthumbor: 1.2.0 -> 1.3.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2fa2c38ca3..7e54f32b430 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7662,13 +7662,15 @@ in {
 
   libthumbor = buildPythonPackage rec {
     name = "libthumbor-${version}";
-    version = "1.2.0";
+    version = "1.3.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/l/libthumbor/${name}.tar.gz";
-      sha256 = "09bbaf08124ee33ea4ef99881625bd20450b0b43ab90fd678479beba8c03f86e";
+      sha256 = "1vjhszsf8wl9k16wyg2rfjycjnawzl7z8j39bhiysbz5x4lqg91b";
     };
 
+    buildInputs = with self; [ django ];
+
     propagatedBuildInputs = with self; [ six pycrypto ];
 
     meta = {
-- 
GitLab


From e864345d37087418ef7562b77353a113a365f0d6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 7 Jun 2017 05:59:00 +0200
Subject: [PATCH 0437/1490] irssi: 1.0.2 -> 1.0.3 (security)

See https://irssi.org/security/irssi_sa_2017_06.txt.
---
 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 7ab6a4438f3..60a04f05991 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, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.2";
+  version = "1.0.3";
   name = "irssi-${version}";
 
   src = fetchurl {
     url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1fas6dqz6g8m2400spvkhfxihj3w06qb917h4vhcb716g9wpjkwf";
+    sha256 = "08nfm1pcf2b9npnp83175yi2vcwnhjdiwsq8whz7iky33hlhvijk";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 5788bd82c1ec2d61a4555bdf43db21597f229cfa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 7 Jun 2017 06:14:18 +0200
Subject: [PATCH 0438/1490] synergy: broken on darwin

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

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index b7ac784951b..9ae6bfae116 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -56,5 +56,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.aszlig ];
     platforms = platforms.all;
+    broken = stdenv.isDarwin;
   };
 }
-- 
GitLab


From 67c1f0e65a541a321a1721a32dd83acfe90a1216 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 6 Jun 2017 18:51:34 -0400
Subject: [PATCH 0439/1490] openssl: 1.0.2k -> 1.0.2l

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 2009daa1cc8..e2deb48988d 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -109,8 +109,8 @@ let
 in {
 
   openssl_1_0_2 = common {
-    version = "1.0.2k";
-    sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb";
+    version = "1.0.2l";
+    sha256 = "037kvpisc6qh5dkppcwbm5bg2q800xh2hma3vghz8xcycmdij1yf";
   };
 
   openssl_1_1_0 = common {
-- 
GitLab


From ac0fc387b25b2351398cecf6379cc2081b6f0127 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Mon, 5 Jun 2017 14:58:03 -0700
Subject: [PATCH 0440/1490] silver-searcher: 1.0.2 -> 2.0.0

---
 pkgs/tools/text/silver-searcher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index 26e1f9ef275..14680896312 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "silver-searcher-${version}";
-  version = "1.0.2";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "ggreer";
     repo = "the_silver_searcher";
     rev = "${version}";
-    sha256 = "1c504x62yxf4b5k8ixvr97g97nd4kff32flxdjnvxvcrrnany8zx";
+    sha256 = "074ll6l0486ak4ijvfzhwsp6fp8w55x4yjviql5kb8qpisi9ll7y";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-- 
GitLab


From 48996dba46b842eefd2c8b3d813f5f25301affda Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 7 Jun 2017 06:54:34 +0200
Subject: [PATCH 0441/1490] gitlab: fix build, add nokogiri exception to
 Gemfile.lock

---
 pkgs/applications/version-management/gitlab/Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 1916267bb89..398a88a1387 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -920,7 +920,7 @@ DEPENDENCIES
   mysql2 (~> 0.3.16)
   net-ssh (~> 3.0.1)
   newrelic_rpm (~> 3.16)
-  nokogiri (~> 1.6.7, >= 1.6.7.2)
+  nokogiri (< 1.6.8, ~> 1.6.7, >= 1.6.7.2)
   oauth2 (~> 1.2.0)
   octokit (~> 4.6.2)
   oj (~> 2.17.4)
-- 
GitLab


From 110e03897f3d6cea7bf3c8a64596b63ab67652a2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 4 Jun 2017 13:58:35 -0700
Subject: [PATCH 0442/1490] xterm: install desktop file and icon

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

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index d01dc120735..22e0466df36 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -49,6 +49,9 @@ stdenv.mkDerivation rec {
     for bin in $out/bin/*; do
       wrapProgram $bin --set XAPPLRESDIR $out/lib/X11/app-defaults/
     done
+
+    install -D -t $out/share/applications xterm.desktop
+    install -D -t $out/share/icons/hicolor/48x48/apps icons/xterm-color_48x48.xpm
   '';
 
   meta = {
-- 
GitLab


From 48c910611f8a592426cbf6dee1cb3c212aa3299b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20J=C3=A4ger?= <jger.tm@gmail.com>
Date: Tue, 6 Jun 2017 20:35:29 -0700
Subject: [PATCH 0443/1490] buck: init at v2017.05.31.01

---
 .../tools/build-managers/buck/default.nix     | 46 +++++++++++++++++++
 .../tools/build-managers/buck/pex-mtime.patch | 21 +++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/buck/default.nix
 create mode 100644 pkgs/development/tools/build-managers/buck/pex-mtime.patch

diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
new file mode 100644
index 00000000000..020750393cd
--- /dev/null
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -0,0 +1,46 @@
+  { stdenv, pkgs, fetchFromGitHub, fetchgit, jdk, ant, python2, watchman, unzip, bash }:
+
+stdenv.mkDerivation rec {
+  name = "buck-${version}";
+  version = "v2017.05.31.01";
+
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "buck";
+    rev = "0b8b3828a11afa79dc128832cb55b106f07e48aa";
+    sha256 = "1g3yg8qq91cdhsq7zmir7wxw3767l120f5zhq969gppdw9apqy0s";
+  };
+
+  patches = [ ./pex-mtime.patch ];
+
+  postPatch = ''
+    for f in $(grep -l -r '/bin/bash'); do
+      substituteInPlace "$f" --replace '/bin/bash' '${bash}/bin/bash'
+    done
+  '';
+
+  buildInputs = [ jdk ant ];
+
+  propagatedBuildInputs = [ python2 watchman pkgs.python27Packages.pywatchman ];
+
+  buildPhase =
+    ''
+      ant
+      ./bin/buck --version
+      ./bin/buck build buck
+    '';
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp  buck-out/gen/programs/buck.pex $out/bin/buck
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://buckbuild.com/;
+    description = "A high-performance build tool";
+    maintainers = [ maintainers.jgertm ];
+    license = licenses.asl20;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/buck/pex-mtime.patch b/pkgs/development/tools/build-managers/buck/pex-mtime.patch
new file mode 100644
index 00000000000..01640f342ae
--- /dev/null
+++ b/pkgs/development/tools/build-managers/buck/pex-mtime.patch
@@ -0,0 +1,21 @@
+diff --git a/third-party/py/pex/pex/common.py b/third-party/py/pex/pex/common.py
+index 76459ce23..491dcfc0b 100644
+--- a/third-party/py/pex/pex/common.py
++++ b/third-party/py/pex/pex/common.py
+@@ -12,6 +12,7 @@ import stat
+ import sys
+ import tempfile
+ import threading
++import time
+ import zipfile
+ from collections import defaultdict
+ from uuid import uuid4
+@@ -328,4 +329,7 @@ class Chroot(object):
+   def zip(self, filename, mode='wb'):
+     with contextlib.closing(zipfile.ZipFile(filename, mode)) as zf:
+       for f in sorted(self.files()):
+-        zf.write(os.path.join(self.chroot, f), arcname=f, compress_type=zipfile.ZIP_DEFLATED)
++        file = os.path.join(self.chroot, f)
++        instant = 315532800
++        os.utime(file, (instant, instant))
++        zf.write(file, arcname=f, compress_type=zipfile.ZIP_DEFLATED)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bca3cee890..7f84f3ac9e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6552,6 +6552,8 @@ with pkgs;
     wxGTK = wxGTK30;
   };
 
+  buck = callPackage ../development/tools/build-managers/buck { };
+
   buildbot = callPackage ../development/tools/build-managers/buildbot {
     pythonPackages = python2Packages;
   };
-- 
GitLab


From 69cfc7f26586d2bcf278937ba051fc11aa3c7d8c Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Wed, 7 Jun 2017 11:12:24 +0800
Subject: [PATCH 0444/1490] thumbor: 5.2.1 -> 6.3.2

---
 pkgs/top-level/python-packages.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7e54f32b430..462f619ce2a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28080,7 +28080,7 @@ EOF
 
   thumbor = buildPythonPackage rec {
     name = "thumbor-${version}";
-    version = "5.2.1";
+    version = "6.3.2";
 
     disabled = ! isPy27;
 
@@ -28090,6 +28090,7 @@ EOF
       tornado
       pycrypto
       pycurl
+      pytz
       pillow
       derpconf
       python_magic
@@ -28101,14 +28102,18 @@ EOF
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/t/thumbor/${name}.tar.gz";
-      sha256 = "57b0d7e261e792b2e2c53a79c3d8c722964003d1828331995dc3491dc67db7d8";
+      sha256 = "0787245x4yci34cdfc9xaxhds0lv60476qgp132pwa78hrpc9m31";
     };
 
+    prePatch = ''
+      substituteInPlace setup.py \
+        --replace '"argparse",' ""
+    '';
+
     meta = {
       description = "A smart imaging service";
       homepage = https://github.com/globocom/thumbor/wiki;
       license = licenses.mit;
-      broken = true;
     };
   };
 
-- 
GitLab


From 9135c9f73a4c34181d2bba1455d2f432b3c49065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Jun 2017 08:54:38 +0200
Subject: [PATCH 0445/1490] gnutls: maintenance 3.5.12 -> 3.5.13

It contains a fix for DOS possibility in servers.
http://gnutls.org/security.html#GNUTLS-SA-2017-4
---
 pkgs/development/libraries/gnutls/3.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index 8071cd4b46b..bca23f2e748 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchurl, libunistring, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.5.12";
+  version = "3.5.13";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
-    sha256 = "1jspvrmydqgz30c1ji94b55gr2dynz7p96p4y8fkhad0xajkkjv3";
+    sha256 = "15ihq6p0hnnhs8cnjrkj40dmlcaa1jjg8xg0g2ydbnlqs454ixbr";
   };
 
   # Skip two tests introduced in 3.5.11.  Probable reasons of failure:
-- 
GitLab


From 445b107d9399427f1df25437ff783160beed3fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Jun 2017 09:33:26 +0200
Subject: [PATCH 0446/1490] openssh: fixup build on Hydra

http://hydra.nixos.org/build/53993444
---
 pkgs/tools/networking/openssh/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 0bcb0baaab8..aaef2723da0 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -49,6 +49,13 @@ stdenv.mkDerivation rec {
     ]
     ++ optional withGssapiPatches gssapiSrc;
 
+  postPatch =
+    # On Hydra this makes installation fail (sometimes?),
+    # and nix store doesn't allow such fancy permission bits anyway.
+    ''
+      substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
+    '';
+
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
     ++ optional withKerberos kerberos
     ++ optional hpnSupport autoreconfHook;
-- 
GitLab


From e9da05ee8b6d6e470d54e38869710d316d9935c8 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Wed, 7 Jun 2017 12:01:01 +0300
Subject: [PATCH 0447/1490] zoom-us: init at 2.0.91373.0502

Actually, reintroduce after removal (https://github.com/NixOS/nixpkgs/commit/bb99babc5a1c62edd012da5a1ad14cd3fe1abf0a)
and use bundled Qt.
---
 .../instant-messengers/zoom-us/default.nix    | 91 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 93 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/zoom-us/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
new file mode 100644
index 00000000000..45be8da8a97
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -0,0 +1,91 @@
+{ stdenv, fetchurl, system, rsync, makeWrapper,
+  alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
+  libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg }:
+
+let
+
+  version = "2.0.91373.0502";
+  srcs = {
+    x86_64-linux = fetchurl {
+      url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
+      sha256 = "0gcbfsvybkvnyklm82irgz19x3jl0hz9bwf2l9jga188057pfj7a";
+    };
+  };
+
+in stdenv.mkDerivation {
+  name = "zoom-us-${version}";
+
+  src = srcs.${system};
+
+  buildInputs = [ rsync makeWrapper ];
+
+  libPath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    dbus
+    glib
+    gstreamer
+    fontconfig
+    freetype
+    libpulseaudio
+    libxml2
+    libxslt
+    mesa
+    nspr
+    nss
+    sqlite
+    utillinux
+    zlib
+
+    xorg.libX11
+    xorg.libSM
+    xorg.libICE
+    xorg.libxcb
+    xorg.xcbutilimage
+    xorg.xcbutilkeysyms
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXdamage
+    xorg.libXtst
+    xorg.libxshmfence
+    xorg.libXi
+    xorg.libXrender
+    xorg.libXcomposite
+
+    stdenv.cc.cc
+  ];
+
+  installPhase = ''
+    $preInstallHooks
+
+    mkdir -p $out/share
+    mkdir -p $out/bin
+    rsync -av . $out/share/
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $out/share/zoom
+    # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53
+    # it works for me without it, but, well...
+    paxmark m $out/share/zoom
+    #paxmark m $out/share/QtWebEngineProcess # is this what dtzWill talked about?
+
+    # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it
+    wrapProgram $out/share/zoom \
+        --prefix LD_LIBRARY_PATH : "$out/share:$libPath" \
+        --set QT_PLUGIN_PATH "$out/share/platforms" \
+        --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
+        --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
+    ln -s "$out/share/zoom" "$out/bin/zoom"
+
+    $postInstallHooks
+  '';
+
+  meta = {
+    homepage = http://zoom.us;
+    description = "zoom.us video conferencing application";
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ danbst ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9fbad23713d..2a6b76580ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16788,6 +16788,8 @@ with pkgs;
 
   zim = callPackage ../applications/office/zim { };
 
+  zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { };
+
   zotero = callPackage ../applications/office/zotero {
     firefox = firefox-esr-unwrapped;
   };
-- 
GitLab


From fad6fc3dae16b5161895165bf275e329e20860d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 2 Jun 2017 16:47:09 +0200
Subject: [PATCH 0448/1490] icu: Trivial improvement

---
 pkgs/development/libraries/icu/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index b64d8c84e22..fdf1c6dffe9 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -33,18 +33,9 @@ stdenv.mkDerivation ({
     echo Source root reset to ''${sourceRoot}
   '';
 
-  # This pre/postPatch shenanigans is to handle that the patches expect
-  # to be outside of `source`.
-  prePatch = ''
-    pushd ..
-  '';
-  postPatch = ''
-    popd
-    patch -p4 < ${keywordFix}
-  '';
+  patchFlags = "-p4";
 
-  patches = [
-  ];
+  patches = [ keywordFix ];
 
   preConfigure = ''
     sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
-- 
GitLab


From 0996ea8a68096b596b27678dfdd0f4acde7b92de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 7 Jun 2017 11:57:36 +0200
Subject: [PATCH 0449/1490] NixOS VM tests: Don't create a setgid group in
 vde_switch

Nix no longer allows this for security reasons.

http://hydra.nixos.org/build/53993125
---
 nixos/lib/test-driver/test-driver.pl                 | 2 +-
 pkgs/build-support/vm/windows/controller/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl
index 854be99552a..a3354fb0e1e 100644
--- a/nixos/lib/test-driver/test-driver.pl
+++ b/nixos/lib/test-driver/test-driver.pl
@@ -35,7 +35,7 @@ foreach my $vlan (split / /, $ENV{VLANS} || "") {
     if ($pid == 0) {
         dup2(fileno($pty->slave), 0);
         dup2(fileno($stdoutW), 1);
-        exec "vde_switch -s $socket" or _exit(1);
+        exec "vde_switch -s $socket --dirmode 0700" or _exit(1);
     }
     close $stdoutW;
     print $pty "version\n";
diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix
index 9009702113e..17803a28330 100644
--- a/pkgs/build-support/vm/windows/controller/default.nix
+++ b/pkgs/build-support/vm/windows/controller/default.nix
@@ -185,7 +185,7 @@ let
     MONITOR_SOCKET="$(pwd)/monitor"
     WINVM_PIDFILE="$(pwd)/winvm.pid"
     CTRLVM_PIDFILE="$(pwd)/ctrlvm.pid"
-    ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
+    ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" --dirmode 0700 &
     echo 'alive?' | ${socat}/bin/socat - \
       UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20
   '';
-- 
GitLab


From 5c9f0d00c38190e96a00f1eeba13148b69faed7c Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 7 Jun 2017 13:23:36 +0300
Subject: [PATCH 0450/1490] autorandr: 855c18b -> 1.1

---
 nixos/modules/services/misc/autorandr.nix | 14 ++------------
 pkgs/tools/misc/autorandr/default.nix     | 18 ++++++------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix
index 6746f3fec69..792a4c8375d 100644
--- a/nixos/modules/services/misc/autorandr.nix
+++ b/nixos/modules/services/misc/autorandr.nix
@@ -22,19 +22,9 @@ in {
 
     environment.systemPackages = [ pkgs.autorandr ];
 
-    # systemd.unitPackages = [ pkgs.autorandr ];
+    systemd.packages = [ pkgs.autorandr ];
+
     systemd.services.autorandr = {
-      unitConfig = {
-        Description = "autorandr execution hook";
-        After = [ "sleep.target" ];
-        StartLimitInterval = "5";
-        StartLimitBurst = "1";
-      };
-      serviceConfig = {
-        ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default default";
-        Type = "oneshot";
-        RemainAfterExit = false;
-      };
       wantedBy = [ "sleep.target" ];
     };
 
diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index d63819ade21..8b0885eee07 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -6,10 +6,10 @@
 let
   python = python3Packages.python;
   wrapPython = python3Packages.wrapPython;
-  date = "2017-01-22";
+  version = "1.1";
 in
   stdenv.mkDerivation {
-    name = "autorandr-unstable-${date}";
+    name = "autorandr-${version}";
 
     buildInputs = [ python wrapPython ];
 
@@ -23,18 +23,12 @@ in
 
       make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out
 
-      ${if false then ''
-        # breaks systemd-udev-settle during boot so disabled
+      ${if systemd != null then ''
         make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \
           SYSTEMD_UNIT_DIR=/lib/systemd/system \
           UDEV_RULES_DIR=/etc/udev/rules.d
         substituteInPlace $out/etc/udev/rules.d/40-monitor-hotplug.rules \
-          --replace /bin "${systemd}/bin"
-      '' else if systemd != null then ''
-        make install TARGETS='systemd' PREFIX=$out DESTDIR=$out \
-          SYSTEMD_UNIT_DIR=/lib/systemd/system
-        make install TARGETS='udev' PREFIX=$out DESTDIR=$out \
-          UDEV_RULES_DIR=/etc/udev/rules.d
+          --replace /bin/systemctl "${systemd}/bin/systemctl"
       '' else ''
         make install TARGETS='pmutils' DESTDIR=$out \
           PM_SLEEPHOOKS_DIR=/lib/pm-utils/sleep.d
@@ -46,8 +40,8 @@ in
     src = fetchFromGitHub {
       owner = "phillipberndt";
       repo = "autorandr";
-      rev = "855c18b7f2cfd364d6f085d4301b5b98ba6e572a";
-      sha256 = "1yp1gns3lwa8796cb7par9czkc9i7paap2fkzf7wj6zqlkgjdvv0";
+      rev = "${version}";
+      sha256 = "05jlzxlrdyd4j90srr71fv91c2hf32diw40n9rmybgcdvy45kygd";
     };
 
     meta = {
-- 
GitLab


From 6d2e0b5a26a369b9882dd5a7fd0160862b35039a Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 7 Jun 2017 11:49:24 +0100
Subject: [PATCH 0451/1490] openscenegraph: 3.2.3 -> 3.4.0

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

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index ec85542c920..8d083904189 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name = "openscenegraph-${version}";
-  version = "3.2.3";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip";
-    sha256 = "0gic1hy7fhs27ipbsa5862q120a9y4bx176nfaw2brcjp522zvb9";
+    sha256 = "03h4wfqqk7rf3mpz0sa99gy715cwpala7964z2npd8jxfn27swjw";
   };
 
   nativeBuildInputs = [ pkgconfig cmake doxygen unzip ];
-- 
GitLab


From 02184088468e1d540070bdb91dc7c387cba14a6b Mon Sep 17 00:00:00 2001
From: Simon Jagoe <simon@simonjagoe.com>
Date: Wed, 7 Jun 2017 14:22:52 +0300
Subject: [PATCH 0452/1490] grin: Use fetchFromGitHub instead of fetchgit

---
 pkgs/tools/text/grin/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index 5cbeb54a0b1..837ec5b7a5f 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchgit, python2Packages }:
+{ stdenv, fetchFromGitHub, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "grin-1.2.1";
+  program = "grin";
+  version = "1.2.1";
+  name = "${program}-${version}";
   namePrefix = "";
 
-  src = fetchgit {
-    url = "git://github.com/rkern/grin";
+  src = fetchFromGitHub {
+    owner = "rkern";
+    repo = program;
     rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f";
     sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd";
   };
@@ -13,7 +16,7 @@ python2Packages.buildPythonApplication rec {
   buildInputs = with python2Packages; [ nose ];
 
   meta = {
-    homepage = https://pypi.python.org/pypi/grin;
+    homepage = https://github.com/rkern/grin;
     description = "A grep program configured the way I like it";
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.sjagoe ];
-- 
GitLab


From e7ca6cd176f238607223516945890bbde063e2ed Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Sat, 8 Apr 2017 00:00:00 +0000
Subject: [PATCH 0453/1490] firefoxPackages: tor-browser: use gtk2 by default
 (like tor-browser-bin does)

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

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 2244ee571b0..4fe89a403de 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -19,7 +19,7 @@
 , alsaSupport ? true, alsaLib
 , pulseaudioSupport ? true, libpulseaudio
 , ffmpegSupport ? true, gstreamer, gst-plugins-base
-, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
+, gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook
 
 ## privacy-related options
 
-- 
GitLab


From c6df7ca5cfea724fae4093ac201f98b7c4ada8f5 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Sat, 8 Apr 2017 00:00:00 +0000
Subject: [PATCH 0454/1490] perl: Image-ExifTool: 9.27 -> 10.48, add alias to
 all-packages.nix

---
 pkgs/top-level/all-packages.nix  | 2 ++
 pkgs/top-level/perl-packages.nix | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9fbad23713d..e5904ae06da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1777,6 +1777,8 @@ with pkgs;
 
   exiftags = callPackage ../tools/graphics/exiftags { };
 
+  exiftool = perlPackages.ImageExifTool;
+
   extundelete = callPackage ../tools/filesystems/extundelete { };
 
   expect = callPackage ../tools/misc/expect { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 14d47410857..e8cc8695640 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7095,11 +7095,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   ImageExifTool = buildPerlPackage rec {
-    name = "Image-ExifTool-9.27";
+    name = "Image-ExifTool-${version}";
+    version = "10.48";
 
     src = fetchurl {
       url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz";
-      sha256 = "1f37pi7a6fcphp0kkhj7yr9b5c95m2wvy5jcwjq1xdiq74gdi16c";
+      sha256 = "1wbwapwhv4imh1lj4dw4a8z2mhw983wk5pzdbp7pkijfji0vjj0p";
     };
 
     meta = with stdenv.lib; {
-- 
GitLab


From 66faa421c967e3deaea52bb926c6265e7445ca8c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Jun 2017 08:05:45 -0400
Subject: [PATCH 0455/1490] linux: 4.11.3 -> 4.11.4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index 6680384a03a..ce3240ecb81 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11.3";
+  version = "4.11.4";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "15xgm2hwp3liy400jgndzlf51bxhg1d6sr0qck6qvk8w5karxzav";
+    sha256 = "144a8ianp6sy057pbhnssg6xs4f3dc5cwwkz8d4q9jzpd87fdm43";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From 01fc1a80b362edee624e67709eea9844e2c061a9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Jun 2017 08:07:53 -0400
Subject: [PATCH 0456/1490] linux: 4.4.70 -> 4.4.71

---
 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 02982fb8055..01309774dba 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.70";
+  version = "4.4.71";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1yid0y4ha7mrn9ns037kjsrgbqffcz2c2p27rgn92jh4m5nb7a60";
+    sha256 = "1az64a2qkx4yc0x4snhma9mvgkrgaj66z7pqs1zijcnzsqr5bka4";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From c7abd6943eb259d4ed8cd153383bebabc4585fe3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 7 Jun 2017 08:09:37 -0400
Subject: [PATCH 0457/1490] linux: 4.9.30 -> 4.9.31

---
 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 0f25ff75b5a..aaffa40b353 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.30";
+  version = "4.9.31";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1fqbfcfkmbviqkmww9lc3n81ag71hzjwpdcij9y73kg8bh1fywj2";
+    sha256 = "0mlqr9ngpsg5i2rd2rqmh85y9ga1f3rpfyjv2m82bnhncavdiji8";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From d22ed21a7b17e4d2b23594fa8ffc6747bd44368a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 7 Jun 2017 12:20:37 +0000
Subject: [PATCH 0458/1490] libtiff: 4.0.7-6.debian -> 4.0.8-2.debian

---
 pkgs/development/libraries/libtiff/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index a23e3704035..595ec9d01cc 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -1,21 +1,20 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, xz }:
 
 let
-  version = "4.0.7";
+  version = "4.0.8";
 in
 stdenv.mkDerivation rec {
   name = "libtiff-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
-    sha256 = "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz";
+    sha256 = "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr";
   };
 
   prePatch =let
-      # https://lwn.net/Vulnerabilities/711777/ and more patched in *-6 -> *-7
       debian = fetchurl {
-        url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.7-6.debian.tar.xz;
-        sha256 = "9c9048c28205bdbeb5ba36c7a194d0cd604bd137c70961607bfc8a079be5fa31";
+        url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.8-2.debian.tar.xz;
+        sha256 = "1ssjh6vn9rvl2jwm34i3p89g8lj0c7fj3cziva9rj4vasfps58ng";
       };
     in ''
       tar xf '${debian}'
-- 
GitLab


From 833bc78dcf8fe8c00d0c8e835f49145be9b87523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Jun 2017 14:21:04 +0200
Subject: [PATCH 0459/1490] shadow: fixup setuid/setgid build problems,
 hopefully

---
 pkgs/os-specific/linux/shadow/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 54129c79b83..6d83c98a422 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
       })
     ];
 
+  # The nix daemon often forbids even creating set[ug]id files.
+  postPatch =
+    ''sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am
+    '';
+
   outputs = [ "out" "su" "man" ];
 
   enableParallelBuilding = true;
-- 
GitLab


From 1aac1fe5dd46767b81a62b9eb7169c2421bbe366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Jun 2017 15:17:40 +0200
Subject: [PATCH 0460/1490] util-linux: fixup setuid/setgid build problems

... hopefully.  Also refactor some nix code a little.
---
 pkgs/os-specific/linux/util-linux/default.nix | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 5d7f701b39e..01bd8beea3d 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -30,30 +30,29 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = lib.optionalString (systemd != null) ''
-    configureFlags+="--with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/"
+    configureFlags+=" --with-systemd --with-systemdsystemunitdir=$bin/lib/systemd/system/"
   '';
 
   # !!! It would be better to obtain the path to the mount helpers
   # (/sbin/mount.*) through an environment variable, but that's
   # somewhat risky because we have to consider that mount can setuid
   # root...
-  configureFlags = ''
-    --enable-write
-    --enable-last
-    --enable-mesg
-    --disable-use-tty-group
-    --enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin
-    ${if ncurses == null then "--without-ncurses" else ""}
-  '';
+  configureFlags = [
+    "--enable-write"
+    "--enable-last"
+    "--enable-mesg"
+    "--disable-use-tty-group"
+    "--enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin"
+    "--disable-makeinstall-setuid" "--disable-makeinstall-chown"
+  ]
+    ++ lib.optional (ncurses == null) "--without-ncurses";
 
   makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs =
     [ zlib pam ]
-    ++ lib.optional (ncurses != null) ncurses
-    ++ lib.optional (systemd != null) systemd
-    ++ lib.optional (perl != null) perl;
+    ++ lib.filter (p: p != null) [ ncurses systemd perl ];
 
   postInstall = ''
     rm "$bin/bin/su" # su should be supplied by the su package (shadow)
-- 
GitLab


From 3c3a25acc5ccc7685b8f31db97cd8dbcd6c62cfe Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 7 Jun 2017 13:09:48 +0100
Subject: [PATCH 0461/1490] jing-trang: use jre_headless

This halves its closure size.
---
 pkgs/tools/text/xml/jing-trang/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix
index 4c4f6ed7e19..162f7e1a397 100644
--- a/pkgs/tools/text/xml/jing-trang/default.nix
+++ b/pkgs/tools/text/xml/jing-trang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, jre, jdk, ant, saxon }:
+{ stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:
 
 stdenv.mkDerivation rec {
   name = "jing-trang-${version}";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
     for tool in jing trang; do
     cat > "$out/bin/$tool" <<EOF
     #! $SHELL
-    export JAVA_HOME='${jre}'
-    exec '${jre}/bin/java' -jar '$out/share/java/$tool.jar' "\$@"
+    export JAVA_HOME='${jre_headless}'
+    exec '${jre_headless}/bin/java' -jar '$out/share/java/$tool.jar' "\$@"
     EOF
     done
 
-- 
GitLab


From d73ef2636fb6e3ebdf72de7a7064b27f2699f14b Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 7 Jun 2017 11:37:31 +0000
Subject: [PATCH 0462/1490] fetchurl: add some https ImageMagick mirrors

---
 pkgs/build-support/fetchurl/mirrors.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 1dfe968f129..41bfc84c247 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -141,9 +141,11 @@ rec {
     http://bitlbee.intergenia.de/
   ];
 
-  # ImageMagick mirrors, see http://www.imagemagick.org/script/download.php.
+  # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php
   imagemagick = [
-    http://www.imagemagick.org/download/
+    https://www.imagemagick.org/download/
+    https://mirror.checkdomain.de/imagemagick/
+    https://ftp.nluug.nl/ImageMagick/
     ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors
     http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/
     ftp://ftp.imagemagick.org/pub/ImageMagick/
-- 
GitLab


From 66963789118f131deae8554a9b3e7ab527654e9d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 7 Jun 2017 11:38:04 +0000
Subject: [PATCH 0463/1490] ImageMagick: 6.9.8-6 -> 6.9.8-9

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index d6c74c9ed0c..052d424376d 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -12,8 +12,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.8-6";
-    sha256 = "1sxg2wx3nrzbymh5wcqiv1x401nrz95xkrqgk3x446vx8lq7ln6w";
+    version = "6.9.8-9";
+    sha256 = "0wr6wcmvaw62f6pkgnpqnjmp331wfwmds9wmqzr4zv53s9k1lkzn";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.
-- 
GitLab


From b509cd4a16aa35e7d3aafc37550c2b4232453bfb Mon Sep 17 00:00:00 2001
From: Duarte David <deltaduartedavid@gmail.com>
Date: Wed, 7 Jun 2017 15:29:22 +0200
Subject: [PATCH 0464/1490] teamspeak_client: 3.0.19.4 -> 3.1.4

---
 .../instant-messengers/teamspeak/client.nix    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 36a91716f5e..efafbd9050c 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
-, xorg, fontconfig, qtbase, xkeyboard_config, alsaLib, libpulseaudio ? null
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl
+, xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, xkeyboard_config, alsaLib, libpulseaudio ? null
 , libredirect, quazip, less, which, unzip, llvmPackages
 }:
 
@@ -10,10 +10,10 @@ let
   libDir = if stdenv.is64bit then "lib64" else "lib";
 
   deps =
-    [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
+    [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl
       xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
-      xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase libpulseaudio
-      llvmPackages.libcxx llvmPackages.libcxxabi
+      xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qtbase qtwebengine qtwebchannel libpulseaudio
+      quazip llvmPackages.libcxx llvmPackages.libcxxabi
     ];
 
   desktopItem = makeDesktopItem {
@@ -31,7 +31,7 @@ in
 stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
-  version = "3.0.19.4";
+  version = "3.1.4";
 
   src = fetchurl {
     urls = [
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
     sha256 = if stdenv.is64bit
-                then "f74617d2a2f5cb78e0ead345e6ee66c93e4a251355779018fd060828e212294a"
-                else "e11467dc1732ddc21ec0d86c2853c322af7a6b8307e3e8dfebc6b4b4d7404841";
+                then "337aec99070366aa3bb82b1bedd8215372b9c74014b198d45d5d6375d1f1c3a8"
+                else "4e126e005b1180655b0847cbdbfc9c47c59c639b7f93f0d988b54a8c4c6ec80f";
   };
 
   # grab the plugin sdk for the desktop icon
@@ -72,6 +72,7 @@ stdenv.mkDerivation rec {
     ''
       # Delete unecessary libraries - these are provided by nixos.
       rm *.so.* *.so
+      rm QtWebEngineProcess
       rm qt.conf
 
       # Install files.
@@ -89,7 +90,6 @@ stdenv.mkDerivation rec {
       ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
 
       wrapProgram $out/bin/ts3client \
-        --set LD_LIBRARY_PATH "${quazip}/lib" \
         --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
         --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
         --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
-- 
GitLab


From 0f3ca3f1f66fe66f0b6a5afccb1f77bf5497f990 Mon Sep 17 00:00:00 2001
From: Duarte David <deltaduartedavid@gmail.com>
Date: Wed, 7 Jun 2017 15:30:08 +0200
Subject: [PATCH 0465/1490] teamspeak_server: 3.0.13.5 -> 3.0.13.6

---
 .../networking/instant-messengers/teamspeak/server.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index 73e8ab83f72..c86de07bc84 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper }:
 
 let
-  version = "3.0.13.5";
+  version = "3.0.13.6";
   arch = if stdenv.is64bit then "amd64" else "x86";
   libDir = if stdenv.is64bit then "lib64" else "lib";
 in
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"
     ];
     sha256 = if stdenv.is64bit 
-      then "bd5933dd17d17f93d56f69332927cd1ce6f34439ec464a0ce2ca73102d85080c"
-      else "848e1a44af3c2b00840a280ba558a13407f4844432ddfd262ee8a7800365386b";
+      then "19ccd8db5427758d972a864b70d4a1263ebb9628fcc42c3de75ba87de105d179"
+      else "2f70b3e70a3d9bf86106fab67a938922c8d27fec24e66e229913f78a0791b967";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 7179b0119981750d7b72b092587a16544774ac92 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Wed, 7 Jun 2017 17:20:00 +0300
Subject: [PATCH 0466/1490] zoom-us: little fixes after review by @k0001

---
 .../instant-messengers/zoom-us/default.nix    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 45be8da8a97..a1e94817b24 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, system, rsync, makeWrapper,
+{ stdenv, fetchurl, system, makeWrapper,
   alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
   libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg }:
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
 
   src = srcs.${system};
 
-  buildInputs = [ rsync makeWrapper ];
+  buildInputs = [ makeWrapper ];
 
   libPath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -58,24 +58,25 @@ in stdenv.mkDerivation {
   installPhase = ''
     $preInstallHooks
 
-    mkdir -p $out/share
+    packagePath=$out/share/zoom-us
+    mkdir -p $packagePath
     mkdir -p $out/bin
-    rsync -av . $out/share/
+    cp -ar * $packagePath
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      $out/share/zoom
+      $packagePath/zoom
     # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53
     # it works for me without it, but, well...
-    paxmark m $out/share/zoom
-    #paxmark m $out/share/QtWebEngineProcess # is this what dtzWill talked about?
+    paxmark m $packagePath/zoom
+    #paxmark m $packagePath/QtWebEngineProcess # is this what dtzWill talked about?
 
     # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it
-    wrapProgram $out/share/zoom \
-        --prefix LD_LIBRARY_PATH : "$out/share:$libPath" \
-        --set QT_PLUGIN_PATH "$out/share/platforms" \
+    wrapProgram $packagePath/zoom \
+        --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \
+        --set QT_PLUGIN_PATH "$packagePath/platforms" \
         --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
         --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
-    ln -s "$out/share/zoom" "$out/bin/zoom"
+    ln -s "$packagePath/zoom" "$out/bin/zoom-us"
 
     $postInstallHooks
   '';
-- 
GitLab


From df8837ccfa171485fcf147e46218472e6a53e553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urban=20=C5=A0kudnik?= <urban.skudnik@gmail.com>
Date: Tue, 6 Jun 2017 16:42:11 +0200
Subject: [PATCH 0467/1490] jetbrains.idea-ultimate: 2017.1.2 -> 2017.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index d8738203f13..284100cc2c3 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -269,12 +269,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2017.1.2";
+    version = "2017.1.3";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "03p5946j8m1v2ca21fz4cy4d90y6ksb8xcgd6ff7g15lg46hpjsm";
+      sha256 = "1gl62zrs3yxakgwbm29bv9z68jgy5ixc28zcagydx2h4j2b1fb19";
     };
     wmClass = "jetbrains-idea";
   };
-- 
GitLab


From 3b83c23012ab435bd38a38a4cf6f927c48e8d609 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 7 Jun 2017 17:28:34 +0200
Subject: [PATCH 0468/1490] python.pkgs.bootstrapped-pip: upgrade
 pkg_resources, fixes #26392

pip 9.0.1 vendors a version of setuptools/pkg_resources which has been
fixed in setuptools/pkg_resources but not yet in pip. Because we're now
facing this issue with nox, we update pkg_resources to the version we
also have in setuptools. Let's cross our fingers this will work without
breaking other stuff.
---
 .../python-modules/bootstrapped-pip/default.nix     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 0f8b6652c26..3e07806986b 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, fetchPypi, makeWrapper, unzip }:
+{ stdenv, python, fetchPypi, fetchurl, makeWrapper, unzip }:
 
 let
   wheel_source = fetchPypi {
@@ -13,6 +13,15 @@ let
     format = "wheel";
     sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587";
   };
+
+  # TODO: Shouldn't be necessary anymore for pip > 9.0.1!
+  # https://github.com/NixOS/nixpkgs/issues/26392
+  # https://github.com/pypa/setuptools/issues/885
+  pkg_resources = fetchurl {
+    url = https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py;
+    sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv";
+  };
+
 in stdenv.mkDerivation rec {
   pname = "pip";
   version = "9.0.1";
@@ -29,6 +38,8 @@ in stdenv.mkDerivation rec {
     unzip -d $out/${python.sitePackages} $src
     unzip -d $out/${python.sitePackages} ${setuptools_source}
     unzip -d $out/${python.sitePackages} ${wheel_source}
+    # TODO: Shouldn't be necessary anymore for pip > 9.0.1!
+    cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py
   '';
 
   patchPhase = ''
-- 
GitLab


From e249d6e8ce627e24ff2880350007a218fcf7b269 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 7 Jun 2017 17:13:39 +0200
Subject: [PATCH 0469/1490] python.pkgs.characteristic: 14.1.0 -> 14.3.0

---
 .../python-modules/characteristic/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 15 +------------
 2 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/characteristic/default.nix

diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix
new file mode 100644
index 00000000000..c44989ab5b7
--- /dev/null
+++ b/pkgs/development/python-modules/characteristic/default.nix
@@ -0,0 +1,22 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "characteristic";
+  version = "14.3.0";
+  name = "${pname}-${version}";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380";
+  };
+
+  checkInputs = [ pytest ];
+
+  meta = {
+    description = "Python attributes without boilerplate";
+    homepage = https://characteristic.readthedocs.org;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4bd03714065..b54f34b9133 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3477,20 +3477,7 @@ in {
 
   certifi = callPackage ../development/python-modules/certifi { };
 
-  characteristic = buildPythonPackage rec {
-    name = "characteristic-14.1.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/characteristic/${name}.tar.gz";
-      sha256 = "91e254948180678dd69e6143202b4686f2fa47cce136936079bb4d9a3b82419d";
-    };
-
-    buildInputs = with self; [ self.pytest ];
-
-    meta = {
-      description = "Python attributes without boilerplate";
-      homepage = https://characteristic.readthedocs.org;
-    };
-  };
+  characteristic = callPackage ../development/python-modules/characteristic { };
 
   # This package is no longer actively maintained and can be removed if it becomes broken.
   cgkit = buildPythonPackage rec {
-- 
GitLab


From 8b6f7b6f03f4f3866d694735d5d509bf7a992dbb Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Wed, 7 Jun 2017 17:13:19 +0200
Subject: [PATCH 0470/1490] pythonPackages.ipaddress: 1.0.16 -> 1.0.18

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2fa2c38ca3..29fe579e79c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12461,11 +12461,11 @@ in {
   };
 
   ipaddress = if (pythonAtLeast "3.3") then null else buildPythonPackage rec {
-    name = "ipaddress-1.0.16";
+    name = "ipaddress-1.0.18";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/i/ipaddress/${name}.tar.gz";
-      sha256 = "1c3imabdrw8nfksgjjflzg7h4ynjckqacb188rf541m74arq4cas";
+      sha256 = "1q8klj9d84cmxgz66073x1j35cplr3r77vx1znhxiwl5w74391ax";
     };
 
     checkPhase = ''
-- 
GitLab


From db0235ce765df9741e9d99777e877a3100a30f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Jun 2017 17:57:42 +0200
Subject: [PATCH 0471/1490] knot-dns: quick bugfix 2.5.0 -> 2.5.1

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

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index a719bdbff62..57c3acbd534 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "1x293cyp10c84hvcnaqpf2s6kyma08l380858l0isy19n074zaiw";
+    sha256 = "1643q2pj5sjhgv19jp8r2bhvqyk6mmlajdmr6qhjcbhql30cs23c";
   };
 
   outputs = [ "bin" "out" "dev" ];
-- 
GitLab


From 5b5f3f542a8d62f16ba360dfde42a98c7ee02e1a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 7 Jun 2017 19:04:51 +0200
Subject: [PATCH 0472/1490] tor-browser-bundle-bin: 6.5.2 -> 7.0

Now requires pulseaudio for audio playback.

https://blog.torproject.org/blog/tor-browser-70-released
---
 .../browsers/tor-browser-bundle-bin/default.nix    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 2c9661c36fa..d8ab6d5d1d1 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -6,7 +6,6 @@
 , zlib
 
 # libxul run-time dependencies
-, alsaLib
 , atk
 , cairo
 , dbus
@@ -16,14 +15,15 @@
 , gdk_pixbuf
 , glib
 , gtk2
+, libxcb
 , libX11
 , libXext
 , libXrender
 , libXt
 , pango
 
-# Pulseaudio support
-, pulseaudioSupport ? mediaSupport
+, audioSupport ? mediaSupport
+, pulseaudioSupport ? audioSupport
 , libpulseaudio
 
 # Media support (implies pulseaudio support)
@@ -43,7 +43,6 @@ with stdenv.lib;
 
 let
   libPath = makeLibraryPath ([
-    alsaLib
     atk
     cairo
     dbus
@@ -53,6 +52,7 @@ let
     gdk_pixbuf
     glib
     gtk2
+    libxcb
     libX11
     libXext
     libXrender
@@ -81,7 +81,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "6.5.2";
+  version = "7.0";
 
   lang = "en-US";
 
@@ -91,7 +91,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0jn98arczlgjigpmql1qg5b7izabv4zy4mji6vvcg3b8g1ma108r";
+      sha256 = "1c9aiv4qdpi95yymmj86hkkinvkgbcdsa12vvdh9c18wsh4qrfvn";
     };
 
     "i686-linux" = fetchurl {
@@ -99,7 +99,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0micxgkbys0py4bj6csbc8xz4gq0x5v2zirgi38krnm5x5riqj3w";
+      sha256 = "1znbywcwlrrl3hbvk4dvq92b00flr8niw2kqk5pwvwwbl1gxiyz0";
     };
   };
 in
-- 
GitLab


From d69cdaa52b9d16f24adee3ddc100c37196ce8d31 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 7 Jun 2017 17:27:47 +0000
Subject: [PATCH 0473/1490] klavaro: fix meta (#26449)

---
 pkgs/games/klavaro/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index 162543da10c..ea56c1f1ac2 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://klavaro.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = stdenv.lib.platforms.linux;
-    maintainer = [stdenv.lib.maintainers.mimadrid];
+    maintainers = [stdenv.lib.maintainers.mimadrid];
   };
 }
-- 
GitLab


From 905790c78334351427b3872d80b420aa3a1458ac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 31 May 2017 15:53:55 +0200
Subject: [PATCH 0474/1490] LTS Haskell 8.16

---
 .../configuration-hackage2nix.yaml            | 92 +++++++++----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f0fbfe43cad..3bcb3e708ec 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 8.15
+  # LTS Haskell 8.16
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -58,7 +58,7 @@ default-package-overrides:
   - aeson-extra ==0.4.0.0
   - aeson-generic-compat ==0.0.1.0
   - aeson-injector ==1.0.8.0
-  - aeson-pretty ==0.8.2
+  - aeson-pretty ==0.8.4
   - aeson-qq ==0.8.1
   - aeson-utils ==0.3.0.2
   - Agda ==2.5.2
@@ -161,7 +161,7 @@ default-package-overrides:
   - amqp ==0.14.1
   - annotated-wl-pprint ==0.7.0
   - anonymous-sums ==0.6.0.0
-  - ansi-terminal ==0.6.2.3
+  - ansi-terminal ==0.6.3
   - ansi-wl-pprint ==0.6.7.3
   - ansigraph ==0.3.0.2
   - app-settings ==0.2.0.11
@@ -217,7 +217,7 @@ default-package-overrides:
   - base64-string ==0.2
   - basic-prelude ==0.6.1.1
   - bcrypt ==0.0.10
-  - bench ==1.0.3
+  - bench ==1.0.4
   - benchpress ==0.2.2.9
   - bencode ==0.6.0.0
   - bento ==0.1.0
@@ -320,7 +320,7 @@ default-package-overrides:
   - camfort ==0.901
   - carray ==0.1.6.6
   - cartel ==0.18.0.2
-  - case-insensitive ==1.2.0.9
+  - case-insensitive ==1.2.0.10
   - cased ==0.1.0.0
   - cases ==0.1.3.2
   - casing ==0.1.2.1
@@ -334,7 +334,7 @@ default-package-overrides:
   - cereal-text ==0.1.0.2
   - cereal-vector ==0.2.0.1
   - cgi ==3001.3.0.2
-  - ChannelT ==0.0.0.2
+  - ChannelT ==0.0.0.4
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.2
   - Chart ==1.8.2
@@ -482,7 +482,7 @@ default-package-overrides:
   - data-accessor-transformers ==0.2.1.7
   - data-binary-ieee754 ==0.4.4
   - data-bword ==0.1.0.1
-  - data-check ==0.1.0
+  - data-check ==0.1.1
   - data-checked ==0.3
   - data-default ==0.7.1.1
   - data-default-class ==0.1.2.0
@@ -526,7 +526,7 @@ default-package-overrides:
   - diagrams-core ==1.4
   - diagrams-gtk ==1.4
   - diagrams-html5 ==1.4
-  - diagrams-lib ==1.4.0.1
+  - diagrams-lib ==1.4.1
   - diagrams-postscript ==1.4
   - diagrams-rasterific ==1.4
   - diagrams-solve ==0.1.0.1
@@ -626,7 +626,7 @@ default-package-overrides:
   - erf ==2.0.0.0
   - errors ==2.1.3
   - ersatz ==0.3.1
-  - esqueleto ==2.5.1
+  - esqueleto ==2.5.2
   - etc ==0.0.0.2
   - etcd ==1.0.5
   - ether ==0.4.2.0
@@ -684,8 +684,8 @@ default-package-overrides:
   - fixed-length ==0.2
   - fixed-vector ==0.9.0.0
   - fixed-vector-hetero ==0.3.1.1
-  - flac ==0.1.1
-  - flac-picture ==0.1.0
+  - flac ==0.1.2
+  - flac-picture ==0.1.1
   - flat-mcmc ==1.5.0
   - flexible-defaults ==0.0.1.2
   - FloatingHex ==0.4
@@ -916,7 +916,7 @@ default-package-overrides:
   - H ==0.9.0.1
   - hackage-db ==1.22
   - hackage-security ==0.5.2.2
-  - hackernews ==1.1.1.0
+  - hackernews ==1.1.2.0
   - haddock-library ==1.4.3
   - hailgun ==0.4.1.3
   - hailgun-simple ==0.1.0.0
@@ -989,11 +989,11 @@ default-package-overrides:
   - heaps ==0.3.4.1
   - hebrew-time ==0.1.1
   - hedis ==0.9.8
-  - here ==1.2.9
+  - here ==1.2.11
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.4.0
   - hex ==0.1.2
-  - hexml ==0.3.1
+  - hexml ==0.3.2
   - hexpat ==0.20.10
   - hexstring ==0.11.1
   - hflags ==0.4.2
@@ -1042,7 +1042,7 @@ default-package-overrides:
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
-  - hpio ==0.8.0.7
+  - hpio ==0.8.0.9
   - hpp ==0.4.0
   - hpqtypes ==1.5.1.1
   - hquantlib ==0.0.4.0
@@ -1090,7 +1090,7 @@ default-package-overrides:
   - hsshellscript ==3.4.1
   - hstatistics ==0.3
   - hstatsd ==0.1
-  - HStringTemplate ==0.8.5
+  - HStringTemplate ==0.8.6
   - hsx-jmacro ==7.3.8
   - hsx2hs ==0.14.1
   - hsyslog ==4
@@ -1102,7 +1102,7 @@ default-package-overrides:
   - htoml ==1.0.0.3
   - HTTP ==4000.3.7
   - http-api-data ==0.3.7.1
-  - http-client ==0.5.6.1
+  - http-client ==0.5.7.0
   - http-client-openssl ==0.2.0.5
   - http-client-tls ==0.3.4.2
   - http-common ==0.8.2.0
@@ -1147,7 +1147,7 @@ default-package-overrides:
   - hyphenation ==0.6
   - ical ==0.0.1
   - iconv ==0.4.1.3
-  - identicon ==0.2.1
+  - identicon ==0.2.2
   - idris ==1.0
   - ieee754 ==0.8.0
   - if ==0.1.0.0
@@ -1214,7 +1214,7 @@ default-package-overrides:
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
   - jni ==0.2.3
-  - jose ==0.5.0.3
+  - jose ==0.5.0.4
   - jose-jwt ==0.7.6
   - js-flot ==0.8.3
   - js-jquery ==3.1.1
@@ -1245,7 +1245,7 @@ default-package-overrides:
   - kraken ==0.0.3
   - l10n ==0.1.0.1
   - labels ==0.3.2
-  - lackey ==0.4.2
+  - lackey ==0.4.3
   - language-c ==0.5.0
   - language-c-quote ==0.11.7.3
   - language-dockerfile ==0.3.6.0
@@ -1292,7 +1292,7 @@ default-package-overrides:
   - licensor ==0.2.0
   - lift-generics ==0.1.1
   - lifted-async ==0.9.1.1
-  - lifted-base ==0.2.3.10
+  - lifted-base ==0.2.3.11
   - line ==2.2.0
   - linear ==1.20.6
   - linear-accelerate ==0.2
@@ -1426,7 +1426,7 @@ default-package-overrides:
   - monoid-subclasses ==0.4.3.1
   - monoid-transformer ==0.0.3
   - monoidal-containers ==0.3.0.1
-  - morte ==1.6.6
+  - morte ==1.6.7
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.1
@@ -1494,7 +1494,7 @@ default-package-overrides:
   - non-empty ==0.3
   - non-empty-sequence ==0.2.0.2
   - non-negative ==0.1.1
-  - nonce ==1.0.2
+  - nonce ==1.0.4
   - nondeterminism ==1.4
   - NoTrace ==0.3.0.1
   - nsis ==0.3.1
@@ -1514,7 +1514,7 @@ default-package-overrides:
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
   - once ==0.2
-  - one-liner ==0.8.1
+  - one-liner ==0.9
   - OneTuple ==0.2.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.5.3.0
@@ -1592,7 +1592,7 @@ default-package-overrides:
   - pinboard ==0.9.12.4
   - pinch ==0.3.1.0
   - pinchot ==0.24.0.0
-  - pipes ==4.3.3
+  - pipes ==4.3.4
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.4
   - pipes-cacophony ==0.4.1
@@ -1612,7 +1612,7 @@ default-package-overrides:
   - pixelated-avatar-generator ==0.1.3
   - pkcs10 ==0.2.0.0
   - placeholders ==0.1
-  - plan-b ==0.2.0
+  - plan-b ==0.2.1
   - plot ==0.2.3.7
   - plot-gtk ==0.2.0.4
   - plot-gtk-ui ==0.3.0.2
@@ -1659,7 +1659,7 @@ default-package-overrides:
   - probability ==0.2.5.1
   - process-extras ==0.7.1
   - product-profunctors ==0.7.1.0
-  - profiteur ==0.4.2.2
+  - profiteur ==0.4.3.0
   - profunctor-extras ==4.0
   - profunctors ==5.2
   - project-template ==0.2.0
@@ -1701,7 +1701,7 @@ default-package-overrides:
   - quickcheck-simple ==0.1.0.1
   - quickcheck-special ==0.1.0.4
   - quickcheck-text ==0.1.2.1
-  - quickcheck-unicode ==1.0.0.1
+  - quickcheck-unicode ==1.0.1.0
   - raaz ==0.1.1
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
@@ -1790,7 +1790,7 @@ default-package-overrides:
   - retry ==0.7.4.2
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
-  - riak ==1.1.1.0
+  - riak ==1.1.2.0
   - riak-protobuf ==0.22.0.0
   - RNAlien ==1.3.7
   - rng-utils ==0.2.1
@@ -1817,7 +1817,7 @@ default-package-overrides:
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
-  - scientific ==0.3.4.12
+  - scientific ==0.3.4.13
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.5
   - scrypt ==0.5.0
@@ -1856,7 +1856,7 @@ default-package-overrides:
   - servant-static-th ==0.1.0.3
   - servant-subscriber ==0.5.0.3
   - servant-swagger ==1.1.2
-  - servant-swagger-ui ==0.2.2.2.2.8
+  - servant-swagger-ui ==0.2.3.2.2.8
   - servant-yaml ==0.1.0.0
   - serversession ==1.0.1
   - serversession-backend-acid-state ==1.0.3
@@ -1877,7 +1877,7 @@ default-package-overrides:
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
   - show-prettyprint ==0.1.2
-  - sibe ==0.2.0.4
+  - sibe ==0.2.0.5
   - signal ==0.1.0.3
   - silently ==1.2.5
   - simple ==0.11.2
@@ -1905,7 +1905,7 @@ default-package-overrides:
   - snap-core ==1.0.2.1
   - snap-server ==1.0.2.2
   - snowflake ==0.1.1.1
-  - soap ==0.2.3.3
+  - soap ==0.2.3.5
   - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.2
   - socket ==0.7.0.0
@@ -1933,7 +1933,7 @@ default-package-overrides:
   - spool ==0.1
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.4
-  - sql-words ==0.1.4.1
+  - sql-words ==0.1.5.0
   - sqlite-simple ==0.4.13.0
   - sqlite-simple-errors ==0.6.0.0
   - srcloc ==0.5.1.1
@@ -1958,7 +1958,7 @@ default-package-overrides:
   - stm-containers ==0.2.15
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.2
-  - stm-split ==0.0.1
+  - stm-split ==0.0.2
   - stm-stats ==0.2.0.0
   - stm-supply ==0.2.0.0
   - STMonadTrans ==0.4.3
@@ -2017,7 +2017,7 @@ default-package-overrides:
   - tagchup ==0.4.0.5
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.0
-  - tagged-identity ==0.1.1
+  - tagged-identity ==0.1.2
   - taggy ==0.2.0
   - taggy-lens ==0.1.2
   - tagshare ==0.0
@@ -2053,7 +2053,7 @@ default-package-overrides:
   - tcp-streams-openssl ==0.6.0.0
   - tdigest ==0.1
   - tdigest-Chart ==0
-  - telegram-api ==0.6.1.1
+  - telegram-api ==0.6.3.0
   - template ==0.2.0.10
   - temporary ==1.2.0.4
   - temporary-rc ==1.2.0.3
@@ -2146,7 +2146,7 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuple-th ==0.2.5
   - tuples-homogenous-h98 ==0.1.1.0
-  - turtle ==1.3.3
+  - turtle ==1.3.4
   - turtle-options ==0.1.0.4
   - twitter-feed ==0.2.0.11
   - twitter-types ==0.7.2.2
@@ -2176,7 +2176,7 @@ default-package-overrides:
   - unbounded-delays ==0.1.1.0
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
-  - unfoldable ==0.9.2
+  - unfoldable ==0.9.3
   - unfoldable-restricted ==0.0.3
   - unicode ==0.0
   - unicode-show ==0.1.0.2
@@ -2238,16 +2238,16 @@ default-package-overrides:
   - vector-space ==0.10.4
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
-  - vectortiles ==1.2.0.4
+  - vectortiles ==1.2.0.5
   - verbosity ==0.2.3.0
-  - versions ==3.0.1.1
+  - versions ==3.0.2
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.2
   - viewprof ==0.0.0.1
   - vinyl ==0.5.3
   - vinyl-utils ==0.3.0.0
   - void ==0.7.2
-  - vty ==5.15
+  - vty ==5.15.1
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
   - wai-cli ==0.1.1
@@ -2281,7 +2281,7 @@ default-package-overrides:
   - waitra ==0.0.4.0
   - warp ==3.2.12
   - warp-tls ==3.2.3
-  - wave ==0.1.4
+  - wave ==0.1.5
   - wavefront ==0.7.1
   - wavefront-obj ==0.1.0.1
   - web-plugins ==0.2.9
@@ -2367,8 +2367,8 @@ default-package-overrides:
   - xmonad-contrib ==0.13
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
-  - yahoo-finance-api ==0.2.0.1
-  - yaml ==0.8.22.1
+  - yahoo-finance-api ==0.2.0.2
+  - yaml ==0.8.23
   - Yampa ==0.10.6
   - YampaSynth ==0.2
   - yes-precure5-command ==5.5.3
@@ -2412,7 +2412,7 @@ default-package-overrides:
   - youtube ==0.2.1
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.5
-  - zip ==0.1.10
+  - zip ==0.1.11
   - zip-archive ==0.3.0.6
   - zippers ==0.2.3
   - ziptastic-client ==0.3.0.2
-- 
GitLab


From 0b58fdb8ebf4cc23969ae9e7fe215a0e0765daf1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 28 May 2017 04:01:33 +0200
Subject: [PATCH 0475/1490] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-7-g2ed2e10 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/35d1e1157e81524f618ab731473d6811b7691272.
---
 .../haskell-modules/hackage-packages.nix      | 2098 +++++++++--------
 1 file changed, 1085 insertions(+), 1013 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 32ed0045309..093dc45ddd8 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -840,22 +840,22 @@ self: {
      }) {};
 
   "Allure" = callPackage
-    ({ mkDerivation, base, containers, enummapset-th, filepath
-     , LambdaHack, template-haskell, text
+    ({ mkDerivation, async, base, containers, enummapset-th, filepath
+     , LambdaHack, random, template-haskell, text, zlib
      }:
      mkDerivation {
        pname = "Allure";
-       version = "0.5.0.0";
-       sha256 = "0lmkfa6wk0hqin43lf6ll3227c4h7qvya7s6k6sfz8syy51ggqx7";
+       version = "0.6.0.0";
+       sha256 = "1baqvfrg5qsrfzlg6para87vf11srk0dmi062fpzfv1x452wx6ja";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers enummapset-th filepath LambdaHack template-haskell
-         text
+         async base containers enummapset-th filepath LambdaHack random
+         template-haskell text zlib
        ];
        testHaskellDepends = [
-         base containers enummapset-th filepath LambdaHack template-haskell
-         text
+         base containers enummapset-th filepath LambdaHack random
+         template-haskell text zlib
        ];
        homepage = "http://allureofthestars.com";
        description = "Near-future Sci-Fi roguelike and tactical squad game";
@@ -2576,18 +2576,6 @@ self: {
      }) {};
 
   "ChannelT" = callPackage
-    ({ mkDerivation, base, free, mmorph, mtl, transformers-base }:
-     mkDerivation {
-       pname = "ChannelT";
-       version = "0.0.0.2";
-       sha256 = "1857i9pwizdq8wr2502ff0ghaq9ggrklajj28fkj7lqi689n98qw";
-       libraryHaskellDepends = [ base free mmorph mtl transformers-base ];
-       homepage = "https://github.com/pthariensflame/ChannelT";
-       description = "Generalized stream processors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ChannelT_0_0_0_4" = callPackage
     ({ mkDerivation, base, free, mmorph, mtl, transformers-base }:
      mkDerivation {
        pname = "ChannelT";
@@ -2597,7 +2585,6 @@ self: {
        homepage = "https://github.com/pthariensflame/ChannelT";
        description = "Generalized stream processors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart" = callPackage
@@ -4935,8 +4922,8 @@ self: {
      }:
      mkDerivation {
        pname = "Euterpea";
-       version = "2.0.2";
-       sha256 = "1d2dnjx7lml4b4bp7n3ac8lxg90pdpjgxpy12c93zbnf5kcgwzcv";
+       version = "2.0.3";
+       sha256 = "0khr4yqrg258x0fqrhzpwrzzsmzwdk3x3b3vyyqqmy5vh9hagvfy";
        libraryHaskellDepends = [
          array arrows base bytestring containers deepseq ghc-prim HCodecs
          heap PortMidi random stm
@@ -6402,6 +6389,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Glob_0_8_0" = callPackage
+    ({ mkDerivation, base, containers, directory, dlist, filepath
+     , HUnit, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "Glob";
+       version = "0.8.0";
+       sha256 = "15p8nbi19mhl3iisngbawmdpvk8paaqq4248fqgan63q1sz13w1q";
+       libraryHaskellDepends = [
+         base containers directory dlist filepath transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers directory dlist filepath HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+         transformers transformers-compat
+       ];
+       homepage = "http://iki.fi/matti.niemenmaa/glob/";
+       description = "Globbing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GlomeTrace" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -8299,6 +8310,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "HSoM" = callPackage
+    ({ mkDerivation, array, arrows, base, containers, deepseq, Euterpea
+     , ghc-prim, HCodecs, markov-chain, pure-fft, random, UISF
+     }:
+     mkDerivation {
+       pname = "HSoM";
+       version = "1.0.0";
+       sha256 = "1hh23kid568yhc92j4j0xd18xxlfwgrdhmbpb3zvxzrg0ah0pxkk";
+       libraryHaskellDepends = [
+         array arrows base containers deepseq Euterpea ghc-prim HCodecs
+         markov-chain pure-fft random UISF
+       ];
+       homepage = "http://www.euterpea.com";
+       description = "Library for computer music education";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "HSoundFile" = callPackage
     ({ mkDerivation, base, binary, bytestring, filepath, haskell98, mtl
      , parallel
@@ -8317,26 +8345,6 @@ self: {
      }) {};
 
   "HStringTemplate" = callPackage
-    ({ mkDerivation, array, base, blaze-builder, bytestring, containers
-     , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
-     , syb, template-haskell, text, time, void
-     }:
-     mkDerivation {
-       pname = "HStringTemplate";
-       version = "0.8.5";
-       sha256 = "1zrmbclnc0njdcppzsjlp4ln69hzcixmw1x1l6rjvxx5y51k0az0";
-       revision = "1";
-       editedCabalFile = "0qwz8lby7096vpmi73wryanky27aimwxpmfwpbarjm2lzbiq868i";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring containers deepseq directory
-         filepath mtl old-locale parsec pretty syb template-haskell text
-         time void
-       ];
-       description = "StringTemplate implementation in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HStringTemplate_0_8_6" = callPackage
     ({ mkDerivation, array, base, blaze-builder, bytestring, containers
      , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
      , syb, template-haskell, text, time, void
@@ -8352,7 +8360,6 @@ self: {
        ];
        description = "StringTemplate implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HStringTemplateHelpers" = callPackage
@@ -8560,6 +8567,8 @@ self: {
        pname = "HUnit-approx";
        version = "1.1";
        sha256 = "19ih90i0j7zzydqpii9lv9g16ndbkylmsyilnd2zis4j0099xk6p";
+       revision = "1";
+       editedCabalFile = "1h78rwj5vy88pdj192l57181z0617gn5p8psrgbz6qgimfq35dpw";
        libraryHaskellDepends = [ base HUnit ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/goldfirere/HUnit-approx";
@@ -8666,6 +8675,8 @@ self: {
        pname = "HaRe";
        version = "0.8.4.0";
        sha256 = "1yqm2vwai3ss5r4brfgmx90kqifwvy5m8jrldb49b88aix3p4ckk";
+       revision = "1";
+       editedCabalFile = "0l303mkjls5m3dx0g3wlwdc97pi6av2xlpabq21mmamgb5whasx2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10901,48 +10912,45 @@ self: {
      }) {};
 
   "LambdaHack" = callPackage
-    ({ mkDerivation, array, assert-failure, async, base, binary
-     , bytestring, containers, data-default, deepseq, directory
-     , enummapset-th, filepath, ghc-prim, gtk, gtk2, hashable, hsini
-     , keys, miniutter, mtl, old-time, pretty-show, random, stm
-     , template-haskell, text, transformers, unordered-containers
-     , vector, vector-binary-instances, zlib
+    ({ mkDerivation, assert-failure, async, base, base-compat, binary
+     , bytestring, containers, deepseq, directory, enummapset-th
+     , filepath, ghc-prim, hashable, hsini, keys, miniutter, pretty-show
+     , random, sdl2, sdl2-ttf, stm, template-haskell, text, time
+     , transformers, unordered-containers, vector
+     , vector-binary-instances, zlib
      }:
      mkDerivation {
        pname = "LambdaHack";
-       version = "0.5.0.0";
-       sha256 = "0vzra6020jmir6pqs26fnw2pgap7l10160v5admk7wnrrnfr91r5";
-       revision = "1";
-       editedCabalFile = "1xxwkcb4c9jxfrjy124wijcvrpv40nbkagap9bsc640459c5ipx5";
+       version = "0.6.0.0";
+       sha256 = "12bvsl4bshks02dqk09nzjz8jd8mspf408h88bmswsxyhq6r03gc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array assert-failure async base binary bytestring containers
-         data-default deepseq directory enummapset-th filepath ghc-prim gtk
-         hashable hsini keys miniutter mtl old-time pretty-show random stm
-         text transformers unordered-containers vector
-         vector-binary-instances zlib
+         assert-failure async base base-compat binary bytestring containers
+         deepseq directory enummapset-th filepath ghc-prim hashable hsini
+         keys miniutter pretty-show random sdl2 sdl2-ttf stm text time
+         transformers unordered-containers vector vector-binary-instances
+         zlib
        ];
-       libraryPkgconfigDepends = [ gtk2 ];
        executableHaskellDepends = [
-         array assert-failure async base binary bytestring containers
-         data-default deepseq directory enummapset-th filepath ghc-prim
-         hashable hsini keys miniutter mtl old-time pretty-show random stm
-         template-haskell text transformers unordered-containers vector
-         vector-binary-instances zlib
+         assert-failure async base base-compat binary bytestring containers
+         deepseq directory enummapset-th filepath ghc-prim hashable hsini
+         keys miniutter pretty-show random stm template-haskell text time
+         transformers unordered-containers vector vector-binary-instances
+         zlib
        ];
        testHaskellDepends = [
-         array assert-failure async base binary bytestring containers
-         data-default deepseq directory enummapset-th filepath ghc-prim
-         hashable hsini keys miniutter mtl old-time pretty-show random stm
-         template-haskell text transformers unordered-containers vector
-         vector-binary-instances zlib
+         assert-failure async base base-compat binary bytestring containers
+         deepseq directory enummapset-th filepath ghc-prim hashable hsini
+         keys miniutter pretty-show random stm template-haskell text time
+         transformers unordered-containers vector vector-binary-instances
+         zlib
        ];
-       homepage = "http://github.com/LambdaHack/LambdaHack";
+       homepage = "https://lambdahack.github.io";
        description = "A game engine library for roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk2 = pkgs.gnome2.gtk;};
+     }) {};
 
   "LambdaINet" = callPackage
     ({ mkDerivation, base, containers, GLFW, GLFW-task, monad-task, mtl
@@ -21289,8 +21297,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-pretty";
-       version = "0.8.2";
-       sha256 = "1c5r1w1hcv297pmj9yjpz9al22k3mh61gimi37wddga02212kd3c";
+       version = "0.8.4";
+       sha256 = "028527bymhvvry5knaqwjj32x3v15flj6d1c9zqy6gwqp87ji3zx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -25032,25 +25040,25 @@ self: {
      }) {};
 
   "ansi-terminal" = callPackage
-    ({ mkDerivation, base, unix }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.6.2.3";
-       sha256 = "0hpfw0k025y681m9ml1c712skrb1p4vh7z5x1f0ci9ww7ssjrh2d";
+       version = "0.6.3";
+       sha256 = "1m9s5h8cj5gh23ybkl1kim3slmlprmk3clrbrnnb078afamlwg6s";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base unix ];
+       libraryHaskellDepends = [ base ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ansi-terminal_0_6_3" = callPackage
+  "ansi-terminal_0_6_3_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.6.3";
-       sha256 = "1m9s5h8cj5gh23ybkl1kim3slmlprmk3clrbrnnb078afamlwg6s";
+       version = "0.6.3.1";
+       sha256 = "15c0c0vb66y3mr11kcvgjf4h0f7dqg7k1xq7zzq9fy11r7h9i3s5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -27341,6 +27349,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "async-extra_0_2_0_0" = callPackage
+    ({ mkDerivation, async, base, deepseq, split }:
+     mkDerivation {
+       pname = "async-extra";
+       version = "0.2.0.0";
+       sha256 = "0hyc27mphjpc7m9khs47ch0q6j6hy2hmibk82vzrfmc3rfjxa1hd";
+       libraryHaskellDepends = [ async base deepseq split ];
+       homepage = "https://github.com/agrafix/async-extra#readme";
+       description = "Useful concurrent combinators";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "async-extras" = callPackage
     ({ mkDerivation, async, base, lifted-async, lifted-base
      , monad-control, SafeSemaphore, stm, transformers-base
@@ -28234,17 +28255,15 @@ self: {
      }:
      mkDerivation {
        pname = "aur";
-       version = "6.0.0";
-       sha256 = "1gnd5nq4s23sxil86a54wvcyrs12vvqsqrhjlxp3n05paickq36p";
-       revision = "1";
-       editedCabalFile = "13jpk4f3215dij8y01z3bq4i6kfss4fksz4k06bjmiyxfphgan2a";
+       version = "6.0.0.1";
+       sha256 = "1ip97gnny26h5ayq7x0yx4afls3nhd1kfhqz3l3bsjq7fvkn8jx0";
        libraryHaskellDepends = [
          aeson base http-client servant servant-client text
        ];
        testHaskellDepends = [
          base http-client http-client-tls tasty tasty-hunit
        ];
-       homepage = "https://github.com/aurapm/aura";
+       homepage = "https://github.com/fosskers/haskell-aur";
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28573,8 +28592,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "10";
-       editedCabalFile = "0fpch12cdz7ll52xyxmc8ymwszrzn4m4yc97crxy0mdd9acs7wlj";
+       revision = "11";
+       editedCabalFile = "0panmqlzp0mq004fc0rm6fywrmc07cgwsp2567g4v1ay8g812ls2";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -29985,6 +30004,8 @@ self: {
        pname = "barrier";
        version = "0.1.1";
        sha256 = "1n8yx66lvyn90ixyvpjafrmhpgnznnqj9il5rixlr651xq0xm5b3";
+       revision = "1";
+       editedCabalFile = "167akvi72l47gcqbq5609m24469pq0xmv0kjbmivnrxs796gh890";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29995,7 +30016,7 @@ self: {
          base bytestring lens-family-core tasty tasty-golden
        ];
        homepage = "https://github.com/philopon/barrier";
-       description = "Shield.io style badge generator";
+       description = "Shields.io style badge generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -30763,25 +30784,6 @@ self: {
      }) {};
 
   "bench" = callPackage
-    ({ mkDerivation, base, criterion, optparse-applicative, silently
-     , text, turtle
-     }:
-     mkDerivation {
-       pname = "bench";
-       version = "1.0.3";
-       sha256 = "1ik097g76yr8vinnr6h2d0388x74f9milksyipd2i9sixr7bj1ri";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base criterion optparse-applicative silently text turtle
-       ];
-       homepage = "http://github.com/Gabriel439/bench";
-       description = "Command-line benchmark tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "bench_1_0_4" = callPackage
     ({ mkDerivation, base, criterion, optparse-applicative, silently
      , text, turtle
      }:
@@ -31840,8 +31842,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "1167rlb2lnib1vin9p75hp7fzcjqxljlw56bhmkwn05c5f6an7ri";
-       revision = "5";
-       editedCabalFile = "1arlkc6f4ckm0xarvqf45yj9hvx9y1v4ih4s4fmjdfj3y7rzzbrr";
+       revision = "6";
+       editedCabalFile = "02fw1994ln0f63v77qfr9zwsfzhl3pmmsck9dzcv43895jkq55pi";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -32320,8 +32322,8 @@ self: {
     ({ mkDerivation, base, bindings-DSL, blas, liblapack }:
      mkDerivation {
        pname = "bindings-levmar";
-       version = "1.1.0.3";
-       sha256 = "1da9n88wwjpm3ph7q73niv3cslpa0h8r0lsyfl35arymxfqpb4c0";
+       version = "1.1.0.4";
+       sha256 = "1dxr9lbgf08a143d4vm78d1iibafzjx6zdlvpdxfri1v523z3sgd";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ blas liblapack ];
        homepage = "https://github.com/basvandijk/bindings-levmar";
@@ -34547,14 +34549,15 @@ self: {
      }) {};
 
   "bluemix-sdk" = callPackage
-    ({ mkDerivation, aeson, base, http-client, http-types, text, vector
+    ({ mkDerivation, aeson, base, bytestring, http-client, http-types
+     , text, vector
      }:
      mkDerivation {
        pname = "bluemix-sdk";
-       version = "0.1.0.0";
-       sha256 = "0j7x6mw6z4kvs2icis4p517fv09b11fgnl8qvbnrajx6wzjl3sdj";
+       version = "0.1.1.0";
+       sha256 = "0ljpjk7wd11y90maib0vyx8y6v96b6ng9skdig136xjfy27vv82r";
        libraryHaskellDepends = [
-         aeson base http-client http-types text vector
+         aeson base bytestring http-client http-types text vector
        ];
        homepage = "https://github.com/agrafix/bluemix-sdk#readme";
        description = "Bindings to Bluemix APIs";
@@ -38452,6 +38455,40 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "camfort_0_902" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
+     , happy, hmatrix, hspec, lattices, matrix, mtl, partial-order
+     , QuickCheck, sbv, syb, syz, text, transformers, uniplate, vector
+     }:
+     mkDerivation {
+       pname = "camfort";
+       version = "0.902";
+       sha256 = "0pakm4zdygzxpfnvxmn88pc1y1dx33xw71lkg0hbxj1k4dn4651q";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory fgl filepath
+         fortran-src GenericPretty ghc-prim hmatrix lattices matrix mtl
+         partial-order sbv syb syz text transformers uniplate vector
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory fgl filepath
+         fortran-src GenericPretty ghc-prim hmatrix lattices matrix mtl
+         partial-order QuickCheck sbv syb syz text transformers uniplate
+         vector
+       ];
+       testHaskellDepends = [
+         array base binary bytestring containers directory filepath
+         fortran-src hmatrix hspec lattices mtl partial-order QuickCheck sbv
+         text uniplate
+       ];
+       description = "CamFort - Cambridge Fortran infrastructure";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "camh" = callPackage
     ({ mkDerivation, base, bytestring, Imlib, terminfo }:
      mkDerivation {
@@ -39015,8 +39052,8 @@ self: {
      }:
      mkDerivation {
        pname = "case-insensitive";
-       version = "1.2.0.9";
-       sha256 = "1f6jjgxnc8579pzf4d96xlg2gk20mrglpdrq85fwsizz113qrpm7";
+       version = "1.2.0.10";
+       sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6";
        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
@@ -41735,6 +41772,8 @@ self: {
        pname = "clash-ghc";
        version = "0.7.2";
        sha256 = "1fjimvj07mc8d8z6i9sl9ifyvcil262p53bz6gap833jrirqd3yh";
+       revision = "1";
+       editedCabalFile = "1np4zs8bqdvzlls8c8zpiwqq91bvx2aiz7qpvza0fzdvc0df2cmj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41764,6 +41803,8 @@ self: {
        pname = "clash-lib";
        version = "0.7.1";
        sha256 = "1mml3f10mdirlihjnbzjh3jjnmvgcqfqs16k22a13m8pd4whcw88";
+       revision = "1";
+       editedCabalFile = "00vdln8qysx9m7br6mcszgkw810dglry6irfs9d24r0vrwfvfrig";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clash-prelude concurrent-supply
          containers data-binary-ieee754 deepseq directory errors fgl
@@ -41800,6 +41841,8 @@ self: {
        pname = "clash-prelude";
        version = "0.11.2";
        sha256 = "1ccbcqkqcq5kyfjfvpkis2z40ishc4yqjjjswfsg92qrklk38wcl";
+       revision = "1";
+       editedCabalFile = "1ckr7vjww2qfbgvqyxdg5j2pzca0nridwh17ydvpsmzchf4xdrqp";
        libraryHaskellDepends = [
          array base constraints data-binary-ieee754 data-default deepseq
          ghc-prim ghc-typelits-extra ghc-typelits-knownnat
@@ -45023,16 +45066,25 @@ self: {
      }) {};
 
   "concrete-haskell" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hashable, QuickCheck
-     , text, thrift, unordered-containers, vector
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , hashable, megaparsec, mtl, optparse-applicative, process
+     , QuickCheck, tar, text, thrift, time, unordered-containers, uuid
+     , vector, zlib
      }:
      mkDerivation {
        pname = "concrete-haskell";
-       version = "0.1.0.4";
-       sha256 = "0azbckg3dqr8fy89m0mmjwa5z8y86jpm9qsk6xxmy2yb4dq49gkg";
+       version = "0.1.0.6";
+       sha256 = "12faqwdsc1zy18qnqdl5chysib65q749n9cfaai9j759n32l6xia";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers hashable QuickCheck text thrift
-         unordered-containers vector
+         base bytestring containers directory filepath hashable process
+         QuickCheck tar text thrift time unordered-containers uuid vector
+         zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory filepath megaparsec mtl
+         optparse-applicative process text vector zlib
        ];
        homepage = "https://github.com/hltcoe";
        description = "Library for the Concrete data format";
@@ -45842,8 +45894,8 @@ self: {
      }:
      mkDerivation {
        pname = "config-schema";
-       version = "0.4.0.0";
-       sha256 = "0pzsaklq1nx4f2jln7iqlimz2xiad10xajjsfx70lyf20hnpq6rj";
+       version = "0.4.1.0";
+       sha256 = "03ikwswgjc1in7qln15ssh1bxm8x1ycz4g0lhma7dcqhaq1ml7xs";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -45874,8 +45926,8 @@ self: {
     ({ mkDerivation, alex, array, base, happy, pretty, text }:
      mkDerivation {
        pname = "config-value";
-       version = "0.6.2.1";
-       sha256 = "1ilbl2ff0sdk49wi4czqabqk2bkc5ivac5m356y5w8hmmzi03w4y";
+       version = "0.6.3";
+       sha256 = "0c7ghasn06m4mlhk3lg5pxpssbsr4l88ibi6vzvp8ylbqha0b3gn";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
@@ -48266,6 +48318,8 @@ self: {
        pname = "creatur";
        version = "5.9.16";
        sha256 = "03ipmz55cw6d8d79zv0m7cg8r6izdgy2v50xc8s7hk1sln86qbmx";
+       revision = "1";
+       editedCabalFile = "0vna37j7y2bzvhizizi69gghqqpz32w0aasy9xdaxpwq4y8wc83c";
        libraryHaskellDepends = [
          array base bytestring cereal cond directory exceptions filepath
          gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
@@ -48602,12 +48656,11 @@ self: {
      }:
      mkDerivation {
        pname = "crjdt-haskell";
-       version = "0.2.1";
-       sha256 = "0ddlfncbnrnnbkv4cwv058s12jlcafbrd7gxjpyxagby9nyq24qy";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.0";
+       sha256 = "1cxfmpvsm4zjaks6afcf7fjcr7k50p9nx2pasah6862j47j4npgc";
+       revision = "1";
+       editedCabalFile = "118xzpnj3mlhag71dhpr0lj35pfxkz5xgykw9wqjyfldqy53p00b";
        libraryHaskellDepends = [ base containers free mtl text ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base containers hedgehog hspec mtl ];
        homepage = "https://github.com/amarpotghan/crjdt-haskell#readme";
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
@@ -51073,19 +51126,6 @@ self: {
      }) {};
 
   "data-check" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "data-check";
-       version = "0.1.0";
-       sha256 = "1rwspik0l5j7ymj7xgs3xa9y5nwvnyj7qkf9b7pax7vii4vd4z2q";
-       libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/mrkkrp/data-check";
-       description = "Library for checking and normalization of data (e.g. from web forms)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-check_0_1_1" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck }:
      mkDerivation {
        pname = "data-check";
@@ -51096,7 +51136,6 @@ self: {
        homepage = "https://github.com/mrkkrp/data-check";
        description = "Library for checking and normalization of data (e.g. from web forms)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-checked" = callPackage
@@ -54316,11 +54355,12 @@ self: {
      }:
      mkDerivation {
        pname = "dependent-sum-template";
-       version = "0.0.0.5";
-       sha256 = "0r87c0m2cjgvp62r84ki7nkaimdyjsv6l62sc8xvrn55ld6mhgxj";
+       version = "0.0.0.6";
+       sha256 = "1bcipqkkgj1afi2ax726gbvp9haqghvm5016rawx3jj9364v8k4r";
        libraryHaskellDepends = [
          base dependent-sum template-haskell th-extras
        ];
+       testHaskellDepends = [ base dependent-sum ];
        homepage = "/dev/null";
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
        license = stdenv.lib.licenses.publicDomain;
@@ -55233,23 +55273,21 @@ self: {
      }) {};
 
   "diagrams-lib" = callPackage
-    ({ mkDerivation, active, adjunctions, array, base, cereal, colour
-     , containers, criterion, data-default-class, deepseq, diagrams-core
-     , diagrams-solve, directory, distributive, dual-tree, exceptions
-     , filepath, fingertree, fsnotify, hashable, intervals, JuicyPixels
-     , lens, linear, monoid-extras, mtl, numeric-extras
-     , optparse-applicative, process, profunctors, semigroups, tagged
-     , tasty, tasty-hunit, tasty-quickcheck, text, transformers
-     , unordered-containers
+    ({ mkDerivation, active, adjunctions, array, base, bytestring
+     , cereal, colour, containers, criterion, data-default-class
+     , deepseq, diagrams-core, diagrams-solve, directory, distributive
+     , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable
+     , intervals, JuicyPixels, lens, linear, monoid-extras, mtl
+     , numeric-extras, optparse-applicative, process, profunctors
+     , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.4.0.1";
-       sha256 = "1iidlcqb001w2a0a4wnxv1qwybjv23qjx12k8a6hairhr28bah2i";
-       revision = "1";
-       editedCabalFile = "12jyrrfsxz8mmjf55m7r53vinam88g1rm430ybldldfv7b6sp6dh";
+       version = "1.4.1";
+       sha256 = "0x7v0j27ydizb6lw89q7wilalzwyl545nqdwkxwnzg0fdnnhkz5w";
        libraryHaskellDepends = [
-         active adjunctions array base cereal colour containers
+         active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
          distributive dual-tree exceptions filepath fingertree fsnotify
          hashable intervals JuicyPixels lens linear monoid-extras mtl
@@ -62715,33 +62753,6 @@ self: {
      }) {};
 
   "esqueleto" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
-     , hspec, HUnit, monad-control, monad-logger, persistent
-     , persistent-sqlite, persistent-template, QuickCheck, resourcet
-     , tagged, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "esqueleto";
-       version = "2.5.1";
-       sha256 = "1nc71jaqc8i5rhgv3kshgrg2ya26qwyfgy6q50dx9q5lqj25r9vn";
-       revision = "1";
-       editedCabalFile = "1f0h4x07j6gz1d3fizys5lh9r6b4nmfav23x39b6jzbywm1vq4nn";
-       libraryHaskellDepends = [
-         base blaze-html bytestring conduit monad-logger persistent
-         resourcet tagged text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base conduit containers hspec HUnit monad-control monad-logger
-         persistent persistent-sqlite persistent-template QuickCheck
-         resourcet text transformers
-       ];
-       homepage = "https://github.com/bitemyapp/esqueleto";
-       description = "Type-safe EDSL for SQL queries on persistent backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "esqueleto_2_5_2" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -65617,17 +65628,36 @@ self: {
      }) {};
 
   "feature-flipper" = callPackage
-    ({ mkDerivation, base, containers, hspec, mtl, QuickCheck, text }:
+    ({ mkDerivation, base, containers, hspec, mtl, text }:
      mkDerivation {
        pname = "feature-flipper";
-       version = "0.1.0.0";
-       sha256 = "0gl8r3xxxw5ys7dac45gc8mrmzyzrh1nplxb3w36qsj6fm6bzg6g";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.1";
+       sha256 = "16d9cx3cm5ljbi6f5xmnm654hfi8kkw5wrv077k0zv41wzkpn5md";
        libraryHaskellDepends = [ base containers mtl text ];
-       executableHaskellDepends = [ base containers mtl ];
-       testHaskellDepends = [ base containers hspec mtl QuickCheck ];
-       homepage = "https://github.com/toddmohney/feature-flipper#readme";
+       testHaskellDepends = [ base containers hspec mtl ];
+       homepage = "https://github.com/toddmohney/flipper#readme";
+       description = "A minimally obtrusive feature flag library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "feature-flipper-postgres" = callPackage
+    ({ mkDerivation, base, bytestring, containers, feature-flipper
+     , hspec, monad-logger, mtl, persistent, persistent-postgresql
+     , persistent-template, text, time
+     }:
+     mkDerivation {
+       pname = "feature-flipper-postgres";
+       version = "0.1.0.1";
+       sha256 = "1mhwdqpy3l0dx7cwmxi67yp9mp223ang5vpawsh27ms0p8qbgp95";
+       libraryHaskellDepends = [
+         base bytestring containers feature-flipper monad-logger mtl
+         persistent persistent-postgresql persistent-template text time
+       ];
+       testHaskellDepends = [
+         base bytestring containers feature-flipper hspec monad-logger mtl
+         persistent persistent-postgresql
+       ];
+       homepage = "https://github.com/toddmohney/flipper-postgres#readme";
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67296,32 +67326,6 @@ self: {
      }) {};
 
   "flac" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default-class
-     , directory, exceptions, filepath, FLAC, hspec, mtl, temporary
-     , text, transformers, vector, wave
-     }:
-     mkDerivation {
-       pname = "flac";
-       version = "0.1.1";
-       sha256 = "0gl707qcxyzc8cbqsajhxm7j648iv23mpfdayyfc7pwvndy2idsq";
-       revision = "2";
-       editedCabalFile = "1l0mldkciqx5p3crzsyxn174znaygx56drqsmvrydp81gn2mv99a";
-       libraryHaskellDepends = [
-         base bytestring containers data-default-class directory exceptions
-         filepath mtl text transformers vector wave
-       ];
-       librarySystemDepends = [ FLAC ];
-       testHaskellDepends = [
-         base bytestring data-default-class directory filepath hspec
-         temporary transformers vector wave
-       ];
-       homepage = "https://github.com/mrkkrp/flac";
-       description = "Complete high-level binding to libFLAC";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {FLAC = null;};
-
-  "flac_0_1_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , directory, exceptions, filepath, FLAC, hspec, mtl, temporary
      , text, transformers, vector, wave
@@ -67346,27 +67350,6 @@ self: {
      }) {FLAC = null;};
 
   "flac-picture" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, directory
-     , flac, hspec, JuicyPixels, temporary
-     }:
-     mkDerivation {
-       pname = "flac-picture";
-       version = "0.1.0";
-       sha256 = "14rjzczbbzlhfcndrsnp3c2hv44jwwrz4073d4m50i5vrvwxydiw";
-       revision = "1";
-       editedCabalFile = "006dailwwrgq7pi3rcd5m0ly7c6568hyr5q45srhaa31pqpz7zxa";
-       libraryHaskellDepends = [ base bytestring flac JuicyPixels ];
-       testHaskellDepends = [
-         base bytestring data-default-class directory flac hspec JuicyPixels
-         temporary
-       ];
-       homepage = "https://github.com/mrkkrp/flac-picture";
-       description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "flac-picture_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, directory
      , flac, hspec, JuicyPixels, temporary
      }:
@@ -67927,8 +67910,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.1.8";
-       sha256 = "0y0fkn067f0iwpvwhk7ypnp3b0zpgzyxzkmr69vkmmcaliqzcayz";
+       version = "0.5.2.4";
+       sha256 = "196hfy2sw2ikgfnlwycmyn9bm8aykaqh05c67bjr03cgi42rnixk";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -68223,6 +68206,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foldl_1_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers
+     , contravariant, criterion, hashable, mwc-random, primitive
+     , profunctors, text, transformers, unordered-containers, vector
+     , vector-builder
+     }:
+     mkDerivation {
+       pname = "foldl";
+       version = "1.3.0";
+       sha256 = "1rinr1a18pjwlrk21d9sfg0f954cwdc3bk9jl276ypcf8ydy3yin";
+       libraryHaskellDepends = [
+         base bytestring comonad containers contravariant hashable
+         mwc-random primitive profunctors text transformers
+         unordered-containers vector vector-builder
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Composable, streaming, and efficient left folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl-incremental" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty
@@ -68271,6 +68275,31 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "foldl-statistics_0_1_4_4" = callPackage
+    ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
+     , profunctors, quickcheck-instances, semigroups, statistics, tasty
+     , tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "foldl-statistics";
+       version = "0.1.4.4";
+       sha256 = "1lihrkc3k3h8mdkbvlwvq0xf9cbhszy50ykshg7yv1y4zdcwqk0q";
+       libraryHaskellDepends = [
+         base foldl math-functions profunctors semigroups
+       ];
+       testHaskellDepends = [
+         base foldl profunctors quickcheck-instances semigroups statistics
+         tasty tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion foldl mwc-random statistics vector
+       ];
+       homepage = "http://github.com/Data61/foldl-statistics#readme";
+       description = "Statistical functions from the statistics package implemented as Folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl-transduce" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
      , criterion, doctest, foldl, free, lens-family-core
@@ -69587,6 +69616,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "freer-converse" = callPackage
+    ({ mkDerivation, base, freer-effects, tasty, tasty-hunit
+     , tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "freer-converse";
+       version = "0.1.0.0";
+       sha256 = "00a9apnr6kpg29yi3nfdfqjdbyld1fj2w3dkpv3xf4z8l00lflxj";
+       libraryHaskellDepends = [ base freer-effects text ];
+       testHaskellDepends = [
+         base freer-effects tasty tasty-hunit tasty-quickcheck text
+       ];
+       description = "Handle effects conversely using monadic conversation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "freer-effects" = callPackage
     ({ mkDerivation, base, criterion, free, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
@@ -72702,6 +72747,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-events_0_6_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers }:
+     mkDerivation {
+       pname = "ghc-events";
+       version = "0.6.0";
+       sha256 = "0s87rrap5j9xca8l1x6gi8nmx3w6fn4avckn1i9hx4d1v7fajz97";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers
+       ];
+       executableHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base ];
+       description = "Library and tool for parsing .eventlog files from GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-events-analyze" = callPackage
     ({ mkDerivation, base, containers, diagrams-lib, diagrams-svg
      , filepath, ghc-events, lens, mtl, optparse-applicative, parsec
@@ -72772,6 +72835,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-exactprint_0_5_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, Diff, directory
+     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
+     , silently, syb
+     }:
+     mkDerivation {
+       pname = "ghc-exactprint";
+       version = "0.5.4.0";
+       sha256 = "1kpfk81iir3dn4420lczwal9bhs787z24g05vdd0g44jcp07d6nk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath free ghc ghc-boot
+         ghc-paths mtl syb
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff directory filemanip filepath ghc
+         ghc-boot ghc-paths HUnit mtl silently syb
+       ];
+       description = "ExactPrint for GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-gc-tune" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -74027,8 +74114,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstbase";
-       version = "1.0.12";
-       sha256 = "09fzs82d62gwmfb94jrqxy1rjkylb8n6vlzmnfsm2wjnrbfbadsq";
+       version = "1.0.13";
+       sha256 = "1s3x30d65yl908hwy67mb9a7c55lrypiaxjq13j7fhl99clppy6b";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
@@ -74042,6 +74129,49 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
+  "gi-gstpbutils" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gi-gst, gi-gstaudio, gi-gsttag, gi-gstvideo
+     , gstreamer-pbutils, haskell-gi, haskell-gi-base, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-gstpbutils";
+       version = "1.0.12";
+       sha256 = "1skbvijcnjd2nqic2q2ggqfbz1amrxpy7gkbmvsgv4qzxgywsyv3";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio
+         gi-gsttag gi-gstvideo haskell-gi haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ gstreamer-pbutils ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GStreamer Plugins Base Utils bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {gstreamer-pbutils = null;};
+
+  "gi-gsttag" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gi-gst, gi-gstbase, gstreamer-tag, haskell-gi
+     , haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gsttag";
+       version = "1.0.12";
+       sha256 = "1xn4aav9gz08wakgsspm385iv7gvd9v1xkisgnl64lwlgah7rkh2";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
+         haskell-gi haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ gstreamer-tag ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GStreamer Tag bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {gstreamer-tag = null;};
+
   "gi-gstvideo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi
@@ -79703,6 +79833,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-oauth2-jwt_0_2_1" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
+     , RSA, text, unix-time
+     }:
+     mkDerivation {
+       pname = "google-oauth2-jwt";
+       version = "0.2.1";
+       sha256 = "0fmqcwvn4rf4l8hzvwhnkfc22akkdbnbv3hw70r4akfplay0nc9g";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring HsOpenSSL RSA text unix-time
+       ];
+       homepage = "https://github.com/MichelBoucey/google-oauth2-jwt";
+       description = "Get a signed JWT for Google Service Accounts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "google-search" = callPackage
     ({ mkDerivation, base, free, nats, text, time }:
      mkDerivation {
@@ -80237,6 +80384,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "grammatical-parsers" = callPackage
+    ({ mkDerivation, base, checkers, containers, criterion, deepseq
+     , doctest, monoid-subclasses, parsers, QuickCheck, rank2classes
+     , tasty, tasty-quickcheck, testing-feat, text, transformers
+     }:
+     mkDerivation {
+       pname = "grammatical-parsers";
+       version = "0.1";
+       sha256 = "0bk85y27mbbxq2rp9f68ym2f1s2l36d126hahy25svdiqcq6s1ss";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers monoid-subclasses parsers rank2classes transformers
+       ];
+       executableHaskellDepends = [
+         base containers monoid-subclasses rank2classes
+       ];
+       testHaskellDepends = [
+         base checkers doctest monoid-subclasses parsers QuickCheck
+         rank2classes tasty tasty-quickcheck testing-feat
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq monoid-subclasses rank2classes
+         text
+       ];
+       homepage = "https://github.com/blamario/grampa/tree/master/grammatical-parsers";
+       description = "parsers that can combine into grammars";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "grapefruit-examples" = callPackage
     ({ mkDerivation, base, colour, containers, fraction, grapefruit-frp
      , grapefruit-records, grapefruit-ui
@@ -83545,8 +83722,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackernews";
-       version = "1.1.1.0";
-       sha256 = "0i78kyf1kbgxd083anmn9bw6ahivpbpvhmhmvsvckl4nvq1yni35";
+       version = "1.1.2.0";
+       sha256 = "07hsky158rgl3v70vrvfj1babvk9ad3pmasvx5sd932rkdwmz8g5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83563,15 +83740,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hackernews_1_1_2_0" = callPackage
+  "hackernews_1_2_0_0" = callPackage
     ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
      , http-types, QuickCheck, quickcheck-instances, servant
      , servant-client, string-conversions, text
      }:
      mkDerivation {
        pname = "hackernews";
-       version = "1.1.2.0";
-       sha256 = "07hsky158rgl3v70vrvfj1babvk9ad3pmasvx5sd932rkdwmz8g5";
+       version = "1.2.0.0";
+       sha256 = "08akddv2n1zll630vqi5i9ja1q99zp75hbx1jkgzp9ly81pdf1v7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83711,8 +83888,8 @@ self: {
     ({ mkDerivation, base, filepath, haddock-api, hspec }:
      mkDerivation {
        pname = "haddock";
-       version = "2.17.4";
-       sha256 = "1z3h3v7w84dzsm47iavdppc2w899mr4c1agq9fzghgz902i0a655";
+       version = "2.17.5";
+       sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
@@ -84906,6 +85083,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hamtsolo" = callPackage
+    ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary
+     , bytestring, conduit, conduit-combinators, conduit-extra
+     , exceptions, optparse-applicative, resourcet, stm-conduit, unix
+     , word8
+     }:
+     mkDerivation {
+       pname = "hamtsolo";
+       version = "1.0.0";
+       sha256 = "0lpac24fayd9s40b39l46aak9d51vv3bjslg0drgj2xlp1d9w60y";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec attoparsec-binary base binary bytestring conduit
+         conduit-combinators conduit-extra exceptions optparse-applicative
+         resourcet stm-conduit unix word8
+       ];
+       homepage = "https://github.com/tfc/hamtsolo#readme";
+       description = "Intel AMT serial-over-lan (SOL) client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hamusic" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, haskore
      , HaXml, musicxml, non-negative, process
@@ -86700,8 +86899,8 @@ self: {
        pname = "hask";
        version = "0";
        sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39";
-       revision = "1";
-       editedCabalFile = "09h0sr60vwkjnjdfawg8d8shz8vh3r7q7n9vgwfs3fkzbajcpaq4";
+       revision = "2";
+       editedCabalFile = "19gb0kn40nd9904adiqpj5h3pcsic6nqflzh8nvpvblphrn5npxs";
        libraryHaskellDepends = [
          base constraints ghc-prim reflection tagged transformers void
        ];
@@ -87855,6 +88054,8 @@ self: {
        pname = "haskell-src-meta";
        version = "0.7.0.1";
        sha256 = "0fka53lw1xh6fa77s7bxcyaf888v3dr89yalrg4x8if6j0f5m3j2";
+       revision = "1";
+       editedCabalFile = "0g6jslwrz934hpq8x0b7r50rk2q96raw5a6s4mxanjx36g19rrgp";
        libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
        ];
@@ -87862,15 +88063,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "haskell-src-meta_0_8" = callPackage
+  "haskell-src-meta_0_8_0_1" = callPackage
     ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
      , template-haskell, test-framework, test-framework-hunit
      , th-orphans
      }:
      mkDerivation {
        pname = "haskell-src-meta";
-       version = "0.8";
-       sha256 = "0kv9xcgfgrs1558cfqj94y1mzqpnpsq3hxnpw3wm8nvnbqyss24x";
+       version = "0.8.0.1";
+       sha256 = "1i5f21mx061k50nl3pvvffjqsbvvldl50y8d4b9b31g63l0jg5q9";
        libraryHaskellDepends = [
          base haskell-src-exts pretty syb template-haskell th-orphans
        ];
@@ -91010,6 +91211,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hdaemonize_0_5_4" = callPackage
+    ({ mkDerivation, base, bytestring, extensible-exceptions, filepath
+     , hsyslog, mtl, unix
+     }:
+     mkDerivation {
+       pname = "hdaemonize";
+       version = "0.5.4";
+       sha256 = "0r6bfb2bc9lg4iywbql7ik9swvvn4lfhq0qn7r20v4gq5fkpwgvw";
+       libraryHaskellDepends = [
+         base bytestring extensible-exceptions filepath hsyslog mtl unix
+       ];
+       homepage = "http://github.com/greydot/hdaemonize";
+       description = "Library to handle the details of writing daemons for UNIX";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hdaemonize-buildfix" = callPackage
     ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog
      , mtl, unix
@@ -92258,8 +92476,8 @@ self: {
      }:
      mkDerivation {
        pname = "here";
-       version = "1.2.9";
-       sha256 = "0f7zr2np52zy10jgbmb501imh4dfbb2hvbfwljvi995zkf47vs66";
+       version = "1.2.11";
+       sha256 = "1jpcwzi5pq82zlv1w987dlpfyi566gvabaj2wywyr9i95hv97jk8";
        libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell
        ];
@@ -92668,19 +92886,6 @@ self: {
      }) {};
 
   "hexml" = callPackage
-    ({ mkDerivation, base, bytestring, extra }:
-     mkDerivation {
-       pname = "hexml";
-       version = "0.3.1";
-       sha256 = "1c5il2n1f1k27m47ma4xpzf18vfvndhp11hv1yfgnyxqps8ivlwh";
-       libraryHaskellDepends = [ base bytestring extra ];
-       testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/ndmitchell/hexml#readme";
-       description = "XML subset DOM parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hexml_0_3_2" = callPackage
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
        pname = "hexml";
@@ -92691,7 +92896,6 @@ self: {
        homepage = "https://github.com/ndmitchell/hexml#readme";
        description = "XML subset DOM parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat" = callPackage
@@ -95980,14 +96184,14 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, attoparsec
      , attoparsec-iso8601, base, bytestring, conduit
      , conduit-combinators, conduit-extra, containers, criterion
-     , directory, hspec, hspec-attoparsec, hspec-core
+     , deepseq, directory, hspec, hspec-attoparsec, hspec-core
      , hspec-expectations, ip, optparse-applicative, permute, random
      , resourcet, text, time, word8, yaml
      }:
      mkDerivation {
        pname = "hnormalise";
-       version = "0.3.1.0";
-       sha256 = "0jrx5xxwpfzvjxj3bzz47csals1sgs99dgn8asqzx2w73d53srl8";
+       version = "0.3.2.0";
+       sha256 = "1dyin8ffwzwbkljfvs4n1a0h2ria99i81c5qy1dg7bzgw2bnb6xv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96004,7 +96208,7 @@ self: {
          hspec-attoparsec hspec-core hspec-expectations ip text time
        ];
        benchmarkHaskellDepends = [
-         attoparsec base criterion random text
+         aeson attoparsec base criterion deepseq random text
        ];
        homepage = "https://github.com/itkovian/hnormalise#readme";
        description = "Log message normalisation tool producing structured JSON messages";
@@ -97098,8 +97302,8 @@ self: {
      }:
      mkDerivation {
        pname = "hops";
-       version = "0.7.0";
-       sha256 = "1d0g4vcwdrmdp4wy0d5f3b8s1h0q4z2ny0xrjbkykmd2fasp08zp";
+       version = "0.7.1";
+       sha256 = "04hgpvk7lrp1iqw02yjawnh2mvxjnp21h3cd36yzy4hw74am33sp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97818,37 +98022,6 @@ self: {
      }) {};
 
   "hpio" = callPackage
-    ({ mkDerivation, async, base, base-compat, bytestring, containers
-     , directory, doctest, exceptions, filepath, hlint, hspec, mtl
-     , mtl-compat, optparse-applicative, QuickCheck, text, transformers
-     , transformers-compat, unix, unix-bytestring
-     }:
-     mkDerivation {
-       pname = "hpio";
-       version = "0.8.0.7";
-       sha256 = "0c76irxdcj34sm65w7b5mpccziw3a3girhqgk23lrd6pyd4za0x0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat bytestring containers directory exceptions
-         filepath mtl mtl-compat QuickCheck text transformers
-         transformers-compat unix unix-bytestring
-       ];
-       executableHaskellDepends = [
-         async base base-compat exceptions mtl mtl-compat
-         optparse-applicative transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         async base base-compat bytestring containers directory doctest
-         exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
-         transformers transformers-compat unix unix-bytestring
-       ];
-       homepage = "https://github.com/dhess/hpio";
-       description = "Monads for GPIO in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hpio_0_8_0_9" = callPackage
     ({ mkDerivation, async, base, base-compat, bytestring, containers
      , directory, doctest, exceptions, filepath, hlint, hspec, mtl
      , mtl-compat, optparse-applicative, QuickCheck, text, transformers
@@ -97877,7 +98050,6 @@ self: {
        homepage = "https://github.com/quixoftic/hpio";
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hplayground" = callPackage
@@ -98260,8 +98432,8 @@ self: {
      }:
      mkDerivation {
        pname = "hreader-lens";
-       version = "0.1.2.0";
-       sha256 = "0a3pv1vb390b8419n0as4qp9wn3xw9xg12qn0whg058hw8nf4i2d";
+       version = "0.1.3.0";
+       sha256 = "1l02fplf2gjns869rhlwzglg08gl8cpjciv9fh05rg74dhn0m3s0";
        libraryHaskellDepends = [
          base comonad hreader hset lens lens-action profunctors
        ];
@@ -99746,8 +99918,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.2.3.2";
-       sha256 = "0ajm7nf8dil629ws285hr2zb5pdrdspp3a224sgf14qnlq80nqrz";
+       version = "0.2.5.0";
+       sha256 = "12x26y11xd5h0j3s2j3pvfjak6mbdc417brhx6zva9k1x4lijagm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101129,15 +101301,16 @@ self: {
   "hspec-snap" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , digestive-functors, directory, HandsomeSoup, hspec, hspec-core
-     , hxt, lens, mtl, snap, snap-core, text, transformers
+     , HUnit, hxt, lens, mtl, snap, snap-core, text, transformers
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "1.0.0.1";
-       sha256 = "1kjc3z6q3c8asnv6n4lc84v7vxybms17d2w43p9gzzl15lnbv5sc";
+       version = "1.0.0.2";
+       sha256 = "0d2mr14ksyjvzaprakfqb5pdrsdgxi8jlfa4a2bwd3yfsdmj8pp5";
        libraryHaskellDepends = [
          aeson base bytestring containers digestive-functors HandsomeSoup
-         hspec hspec-core hxt lens mtl snap snap-core text transformers
+         hspec hspec-core HUnit hxt lens mtl snap snap-core text
+         transformers
        ];
        testHaskellDepends = [
          aeson base bytestring containers digestive-functors directory
@@ -102666,8 +102839,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.5.6.1";
-       sha256 = "1v9bdb8dkhb5g6jl9azk86ig7ia8xh9arr64n7s8r94fp0vl6c1c";
+       version = "0.5.7.0";
+       sha256 = "18zza3smv5fn5clgq2nij0wqnakh950xif9lwlfqbkam5k1flhg2";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie deepseq exceptions filepath
@@ -102841,6 +103014,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client-tls_0_3_5" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, connection
+     , containers, criterion, cryptonite, data-default-class, exceptions
+     , hspec, http-client, http-types, memory, network, network-uri
+     , text, tls, transformers
+     }:
+     mkDerivation {
+       pname = "http-client-tls";
+       version = "0.3.5";
+       sha256 = "1jgwca2dn269c7z14yasj0i1qayz5lvxxqf72m0y62cqwx4hdm5h";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive connection containers cryptonite
+         data-default-class exceptions http-client http-types memory network
+         network-uri text tls transformers
+       ];
+       testHaskellDepends = [ base hspec http-client http-types ];
+       benchmarkHaskellDepends = [ base criterion http-client ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "http-client backend using the connection package and tls library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-common" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , case-insensitive, directory, mtl, network, text, transformers
@@ -103159,8 +103356,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-pony";
-       version = "0.1.0.6";
-       sha256 = "1k1pdm0qmskv3vrh8msanppqxkl4y68aq7rf89qv18z6fnvh53j8";
+       version = "0.1.0.7";
+       sha256 = "1zlz9fmnhaxb38axscmpda4iqsv8idv3wq116pr449dvxs5kj721";
        libraryHaskellDepends = [
          base bytestring exceptions network pipes pipes-network pipes-safe
          transformers
@@ -106188,26 +106385,6 @@ self: {
      }) {};
 
   "identicon" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels
-     , QuickCheck, random, tf-random
-     }:
-     mkDerivation {
-       pname = "identicon";
-       version = "0.2.1";
-       sha256 = "0gy14lg6sc4s45b2csk6y3gc4nb4vyill949k2gsb0047g89crxq";
-       libraryHaskellDepends = [ base bytestring JuicyPixels ];
-       testHaskellDepends = [
-         base bytestring hspec JuicyPixels QuickCheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion JuicyPixels random tf-random
-       ];
-       homepage = "https://github.com/mrkkrp/identicon";
-       description = "Flexible generation of identicons";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "identicon_0_2_2" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels
      , QuickCheck, random, tf-random
      }:
@@ -106227,7 +106404,6 @@ self: {
        homepage = "https://github.com/mrkkrp/identicon";
        description = "Flexible generation of identicons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "identifiers" = callPackage
@@ -107953,8 +108129,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.1.2.1";
-       sha256 = "1ih916gj21mrl9v7is64fs5ns4j5jsimh2c6cnxqkfmp5n9dby7w";
+       version = "1.1.2.2";
+       sha256 = "038031446gpby3s805j1imffriwfq35jvkmd7z8gjnz5x5xciz9b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108747,6 +108923,8 @@ self: {
        pname = "interpolate";
        version = "0.1.0";
        sha256 = "0wlc10qd1bq3xj64a3yq2gzds9kas9zyylkm9kxd46gy35fns6id";
+       revision = "1";
+       editedCabalFile = "0ld319k9phmp6dp8m87bdhqp5519dxggf8r2a5z8hkznyjpa131j";
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        testHaskellDepends = [
          base bytestring haskell-src-meta hspec QuickCheck
@@ -108756,6 +108934,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "interpolate_0_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
+     , QuickCheck, quickcheck-instances, template-haskell, text
+     }:
+     mkDerivation {
+       pname = "interpolate";
+       version = "0.1.1";
+       sha256 = "120ygxs8vfsjcc7xr9v8p8bcyqidhlg1rd568ym2bsl1nhx4h22b";
+       libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
+       testHaskellDepends = [
+         base bytestring haskell-src-meta hspec QuickCheck
+         quickcheck-instances template-haskell text
+       ];
+       homepage = "https://github.com/sol/interpolate#readme";
+       description = "String interpolation done right";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "interpolatedstring-perl6" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-meta
      , template-haskell, text
@@ -111266,21 +111463,23 @@ self: {
      }) {};
 
   "jenkinsPlugins2nix" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bytestring
-     , containers, cryptohash, data-fix, hnix, http-conduit, mtl
-     , tasty-hspec, text, zip-archive
+    ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bimap
+     , bytestring, containers, cryptohash, hnix, http-conduit, mtl
+     , optparse-applicative, tasty-hspec, text, zip-archive
      }:
      mkDerivation {
        pname = "jenkinsPlugins2nix";
-       version = "0.1.0.0";
-       sha256 = "0fsn6dr9ai7m03vnrbpkq8bzsvi2inxg5d0zgqaaxn8ab71cx947";
+       version = "0.2.0.2";
+       sha256 = "04ddcri3rwszxjl65c5kha6lkrf3w89gfri2cdghdq0znl51hvf5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint attoparsec base bytestring containers cryptohash
-         data-fix hnix http-conduit mtl text zip-archive
+         hnix http-conduit mtl text zip-archive
+       ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base bimap optparse-applicative text
        ];
-       executableHaskellDepends = [ ansi-wl-pprint base text ];
        testHaskellDepends = [ base containers tasty-hspec text ];
        homepage = "https://github.com/Fuuzetsu/jenkinsPlugins2nix#readme";
        description = "Generate nix for Jenkins plugins";
@@ -111541,8 +111740,8 @@ self: {
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.5.0.3";
-       sha256 = "0n1a450g8a7w30ans6lpgwiim3pizg3c5a4cqb8h5a1ncx6nq8fi";
+       version = "0.5.0.4";
+       sha256 = "164cgpz7a9yyd861y43ljw7wkjajvp7ylli4j2qyq4947v7ibxg9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111564,7 +111763,7 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "jose_0_6_0_1" = callPackage
+  "jose_0_6_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, concise, containers, cryptonite, hspec, lens, memory
      , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
@@ -111573,8 +111772,8 @@ self: {
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.6.0.1";
-       sha256 = "06icsxvv8l82qhix9gd37i23xzxjwfcsg9ajllifpw1xd31s7rm0";
+       version = "0.6.0.2";
+       sha256 = "1m6ck60z9lmvc3rb8lpf4h7j3yvzmshwb8dm96s0d1ldhcmk26jy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112099,10 +112298,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-feed";
-       version = "0.0.1";
-       sha256 = "1y37dbifc3q9lr4d0vr9s6r8xf4yzbvrs8cr9pwxh964h84j9h0s";
-       revision = "1";
-       editedCabalFile = "0sxsa637qm6434n7h12flfm71xfc0swyrljf2s9ayaknvwzxdmjq";
+       version = "0.0.2";
+       sha256 = "0ka8g2d3hn8z122k8r7gxs8m72s4ys46j6s2yc2ys045r1fhzlc1";
        libraryHaskellDepends = [
          aeson base bytestring mime-types network-uri tagsoup text time
        ];
@@ -114897,21 +115094,6 @@ self: {
      }) {};
 
   "lackey" = callPackage
-    ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
-     , text
-     }:
-     mkDerivation {
-       pname = "lackey";
-       version = "0.4.2";
-       sha256 = "1jbq701wwk7nvqs4ckzzsayk5v0gvbicyidgwypqlnh1dsv2hzrs";
-       libraryHaskellDepends = [ base servant servant-foreign text ];
-       testHaskellDepends = [ base servant tasty tasty-hspec text ];
-       homepage = "https://github.com/tfausak/lackey#readme";
-       description = "Generate Ruby clients from Servant APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lackey_0_4_3" = callPackage
     ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
      , text
      }:
@@ -114924,7 +115106,6 @@ self: {
        homepage = "https://github.com/tfausak/lackey#readme";
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lagrangian" = callPackage
@@ -118128,8 +118309,8 @@ self: {
     ({ mkDerivation, base, bindings-levmar, hmatrix, vector }:
      mkDerivation {
        pname = "levmar";
-       version = "1.2.1.6";
-       sha256 = "0zkllbk281jhny5sjzh4430jb5sm017rn1qp0mpfm51ydl55drlh";
+       version = "1.2.1.7";
+       sha256 = "07sdxa5xbgp26bjpchiy1g2n37chy95v0hfy8al5wyfbnlfws5xg";
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
@@ -118570,25 +118751,25 @@ self: {
     ({ mkDerivation, aeson, base, base-unicode-symbols, binary
      , boomerang, bytestring, concurrent-machines, containers
      , containers-unicode-symbols, contravariant, data-textual, dns
-     , exceptions, filepath, hjsonschema, lens, lifted-async, machines
-     , managed, monad-control, mtl, network, network-ip, parsers
-     , pathtype, protolude, QuickCheck, random, semigroups, stm
-     , stm-chans, stm-containers, temporary, test-framework
-     , test-framework-quickcheck2, test-framework-th, text, text-icu
-     , text-icu-normalized, text-printer, time, transformers
-     , transformers-base, zippers
+     , exceptions, filepath, hjsonschema, lens, lifted-async
+     , lifted-base, machines, managed, monad-control, mtl, network
+     , network-ip, parsers, pathtype, protolude, QuickCheck, random
+     , semigroups, stm, stm-chans, stm-containers, temporary
+     , test-framework, test-framework-quickcheck2, test-framework-th
+     , text, text-icu, text-icu-normalized, text-printer, time
+     , transformers, transformers-base, zippers
      }:
      mkDerivation {
        pname = "liblawless";
-       version = "0.23.1";
-       sha256 = "190lw6ppqszfzx48y7f8l5yywz1zb98wrr4yjzvpvgiabazjbh5i";
+       version = "0.24.0";
+       sha256 = "1dqz2d8zgwb8i176fhga5637y8mfxiq0vq1ws0lsy9ijlpyiikmp";
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
          concurrent-machines containers containers-unicode-symbols
          contravariant data-textual dns exceptions hjsonschema lens
-         lifted-async machines managed monad-control mtl network network-ip
-         parsers pathtype protolude QuickCheck random semigroups stm
-         stm-chans stm-containers temporary text text-icu
+         lifted-async lifted-base machines managed monad-control mtl network
+         network-ip parsers pathtype protolude QuickCheck random semigroups
+         stm stm-chans stm-containers temporary text text-icu
          text-icu-normalized text-printer time transformers
          transformers-base zippers
        ];
@@ -118959,8 +119140,8 @@ self: {
     ({ mkDerivation, base, bytestring, cpu }:
      mkDerivation {
        pname = "libvorbis";
-       version = "0.1.0.1";
-       sha256 = "0ykv2jv559yalypadwnvpzv87rksn24b4h8qi9x1x6r2x4kbwvrl";
+       version = "0.1.0.2";
+       sha256 = "19mx07gvwsqhbish8cbbiplgpw75birn19sl0hhn2300kpryyxfb";
        libraryHaskellDepends = [ base bytestring cpu ];
        homepage = "https://github.com/the-real-blackh/libvorbis";
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
@@ -119139,8 +119320,8 @@ self: {
      }:
      mkDerivation {
        pname = "lifted-base";
-       version = "0.2.3.10";
-       sha256 = "1z149mwf839yc0l3islm485n6yfwxbdjfbwd8yi0vi3nn5hfaxz6";
+       version = "0.2.3.11";
+       sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
          base HUnit monad-control test-framework test-framework-hunit
@@ -120533,8 +120714,8 @@ self: {
      }:
      mkDerivation {
        pname = "list-tries";
-       version = "0.6.3";
-       sha256 = "0dcww6rfrahr3kkgda876dws2ahc3gb2g94acys8f9lwk2rjyipm";
+       version = "0.6.4";
+       sha256 = "0l1qm1n3sh6shzcl4g00w705gx0xy8qwnj68dlm18hsa9y0z572h";
        libraryHaskellDepends = [ base binary containers dlist ];
        testHaskellDepends = [
          base binary ChasingBottoms HUnit QuickCheck template-haskell
@@ -121249,8 +121430,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, hedgehog, loc-test }:
      mkDerivation {
        pname = "loc";
-       version = "0.1.2.1";
-       sha256 = "1fsv8jibzw0sfymx9ccfb4hp7gmds415b2l679vsai9s83j8nr4g";
+       version = "0.1.2.3";
+       sha256 = "064q3hyjnfpa2r2290604m9pcgh9l1g9fbap176d3n7xknn3lvcc";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hedgehog loc-test ];
        homepage = "https://github.com/chris-martin/haskell-libraries";
@@ -121846,6 +122027,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "logging-facade_0_3_0" = callPackage
+    ({ mkDerivation, base, call-stack, hspec, transformers }:
+     mkDerivation {
+       pname = "logging-facade";
+       version = "0.3.0";
+       sha256 = "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf";
+       libraryHaskellDepends = [ base call-stack transformers ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/sol/logging-facade#readme";
+       description = "Simple logging abstraction that allows multiple back-ends";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-facade-journald" = callPackage
     ({ mkDerivation, base, hspec, libsystemd-journal, logging-facade
      , text, unordered-containers
@@ -121974,10 +122169,11 @@ self: {
     ({ mkDerivation, base, hspec, hsyslog, logging-facade, time }:
      mkDerivation {
        pname = "logsink";
-       version = "0.1.0";
-       sha256 = "1yxzqx47017z0djm8bymz43pc8cccnpkawaisvvzb646j6nbrw93";
+       version = "0.2.0";
+       sha256 = "1mvxwfdqqk9hkkffz5fx0zrh27z9x44v2wp2jrjjmidj2k9i1hrh";
        libraryHaskellDepends = [ base hsyslog logging-facade time ];
-       testHaskellDepends = [ base hspec logging-facade ];
+       testHaskellDepends = [ base hspec hsyslog logging-facade time ];
+       homepage = "https://github.com/sol/logsink#readme";
        description = "A logging framework for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123723,17 +123919,18 @@ self: {
 
   "mailchimp" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, generics-sop
-     , http-client, http-client-tls, servant, servant-client, text
-     , transformers
+     , hspec, http-client, http-client-tls, servant, servant-client
+     , text, transformers
      }:
      mkDerivation {
        pname = "mailchimp";
-       version = "0.2.0";
-       sha256 = "1np4lkghkqw1zkc27daqfdnp40swl25ck1mxkr7crydq56kfrjq3";
+       version = "0.2.1";
+       sha256 = "0hwgxqcwk677497pnhxl2z8d8vgw8b6v53ydkik6sapv10xqr5z2";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring generics-sop http-client
          http-client-tls servant servant-client text transformers
        ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/jpvillaisaza/mailchimp-haskell";
        description = "Bindings for the MailChimp API";
        license = stdenv.lib.licenses.mit;
@@ -123920,13 +124117,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "makefile_1_0_0_2" = callPackage
+  "makefile_1_0_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, text
      }:
      mkDerivation {
        pname = "makefile";
-       version = "1.0.0.2";
-       sha256 = "197cbh921nf58assp1rswvcqj2b5n0vl46k104fylchnp2cdpzfd";
+       version = "1.0.0.3";
+       sha256 = "0w36rxzx4ryhrmjayqm9fad2zpkxnq4dmpxshd8q2x8wa3wp8j5p";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [
          attoparsec base doctest Glob QuickCheck text
@@ -125106,6 +125303,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "matplotlib_0_5_0" = callPackage
+    ({ mkDerivation, ad, aeson, base, bytestring, containers, filepath
+     , process, random, raw-strings-qq, split, tasty
+     , tasty-expected-failure, tasty-golden, tasty-hunit, temporary
+     }:
+     mkDerivation {
+       pname = "matplotlib";
+       version = "0.5.0";
+       sha256 = "0mfmrgh7axyv6ybkks3n5na2cg3jfhbfjbrv4p2dhwzyf9hc076z";
+       libraryHaskellDepends = [
+         aeson base bytestring containers filepath process split temporary
+       ];
+       testHaskellDepends = [
+         ad base bytestring process random raw-strings-qq split tasty
+         tasty-expected-failure tasty-golden tasty-hunit temporary
+       ];
+       homepage = "https://github.com/abarbu/matplotlib-haskell";
+       description = "Bindings to Matplotlib; a Python plotting library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrices" = callPackage
     ({ mkDerivation, base, criterion, deepseq, primitive, tasty
      , tasty-hunit, tasty-quickcheck, vector
@@ -129864,7 +130083,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mongoDB_2_2_0" = callPackage
+  "mongoDB_2_3_0" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , binary, bson, bytestring, conduit, conduit-extra, containers
      , criterion, cryptohash, data-default-class, hashtables, hspec
@@ -129874,8 +130093,8 @@ self: {
      }:
      mkDerivation {
        pname = "mongoDB";
-       version = "2.2.0";
-       sha256 = "0saxkir0155ssshs76nj73srb549p01s6cxg3qlyn8zynl9y44xw";
+       version = "2.3.0";
+       sha256 = "024w6183nnaq30r9jnfiy5pjv422mnnkawqdgzgzafngi7sad322";
        libraryHaskellDepends = [
          array base base16-bytestring base64-bytestring binary bson
          bytestring conduit conduit-extra containers cryptohash
@@ -129957,8 +130176,10 @@ self: {
      }:
      mkDerivation {
        pname = "monky";
-       version = "2.1.3.0";
-       sha256 = "0skkf8xsvc5hj8jy4p10503smc1wn76mk2v8y7964i7dla8yw3x8";
+       version = "2.2.0.0";
+       sha256 = "1bh86myk4nar4ckq0sly7hvj3bzz022yh2sgmfchr6wb05g92pav";
+       revision = "1";
+       editedCabalFile = "00666fcv432m8whkmnwpijjvj5w5xa64iv7wrcsrc3dcwq5wy20g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130397,37 +130618,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, code-page, containers
-     , criterion, deepseq, Earley, http-client, http-client-tls
-     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
-     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
-     , tasty-quickcheck, text, text-format, transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.6.6";
-       sha256 = "09ffljl5p76nb2lcbsvb1nvl7x60787vgk2jyp2v1pf4rshdycy9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text text-format transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         base code-page optparse-applicative text text-format
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion system-filepath text ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_7" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, http-client, http-client-tls
      , microlens, microlens-mtl, mtl, optparse-applicative, pipes
@@ -130456,7 +130646,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -131917,6 +132106,8 @@ self: {
        pname = "music-pitch-literal";
        version = "1.9.0";
        sha256 = "0vsvw7c29qvi69z9gy2zzq9bpajmjd5vs1kll7jw0qbsh28jsqql";
+       revision = "1";
+       editedCabalFile = "0v86clbcjkgg7psx8jbxq4za66v8ln1vkr7ywrm0vz6vbgkg356f";
        libraryHaskellDepends = [ base semigroups ];
        description = "Overloaded pitch literals";
        license = stdenv.lib.licenses.bsd3;
@@ -134129,6 +134320,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network_2_6_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
+     , test-framework-hunit, unix
+     }:
+     mkDerivation {
+       pname = "network";
+       version = "2.6.3.2";
+       sha256 = "1dn092zfqmxfbzln6d0khka4gizzjivf2yja9w9hwb5g9q3pfi1m";
+       revision = "1";
+       editedCabalFile = "17234sy0vqic8g9wg8gmfmc0by50scjwbdk8bkcl9kjf3fvs4nyx";
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [
+         base bytestring doctest HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/haskell/network";
+       description = "Low-level networking interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-address" = callPackage
     ({ mkDerivation, base, Cabal, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -135964,39 +136175,19 @@ self: {
      }) {};
 
   "nonce" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, cprng-aes
-     , crypto-random, text, transformers
-     }:
-     mkDerivation {
-       pname = "nonce";
-       version = "1.0.2";
-       sha256 = "1l4w6bdrwa42r90n6xzwr8lz2fdrn3m763ls311pnygajr4ih10h";
-       revision = "1";
-       editedCabalFile = "012hkf9hlvwmlbf1n1v05vgidssxv99z4bq2lbpbf1dlb366madj";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring cprng-aes crypto-random text
-         transformers
-       ];
-       homepage = "https://github.com/prowdsponsor/nonce";
-       description = "Generate cryptographic nonces";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "nonce_1_0_3" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite
-     , text, transformers
+    ({ mkDerivation, base, base64-bytestring, bytestring, entropy, text
+     , transformers
      }:
      mkDerivation {
        pname = "nonce";
-       version = "1.0.3";
-       sha256 = "03y4365ljd79wl2gfvlplkdirvvd7lai8mqblssnd413fl56dvw5";
+       version = "1.0.4";
+       sha256 = "1xkf107sbcm3pvm6r4xk4719sccaq2kzja6nf8bky9m7vpiilrji";
        libraryHaskellDepends = [
-         base base64-bytestring bytestring cryptonite text transformers
+         base base64-bytestring bytestring entropy text transformers
        ];
        homepage = "https://github.com/prowdsponsor/nonce";
        description = "Generate cryptographic nonces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nondeterminism" = callPackage
@@ -137684,24 +137875,6 @@ self: {
      }) {};
 
   "one-liner" = callPackage
-    ({ mkDerivation, base, bifunctors, contravariant, ghc-prim
-     , profunctors, tagged, transformers
-     }:
-     mkDerivation {
-       pname = "one-liner";
-       version = "0.8.1";
-       sha256 = "0ma4cas2nvih95z9xbp888zzxx6znawc470v2znb2brba386n4xr";
-       libraryHaskellDepends = [
-         base bifunctors contravariant ghc-prim profunctors tagged
-         transformers
-       ];
-       homepage = "https://github.com/sjoerdvisscher/one-liner";
-       description = "Constraint-based generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "one-liner_0_9" = callPackage
     ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
      , profunctors, tagged, transformers
      }:
@@ -139981,8 +140154,8 @@ self: {
        pname = "pandoc";
        version = "1.19.2.1";
        sha256 = "00bq5h70byfs1fnszkggwws33hp7dpr7lzs0lfdvp5dzfwyjys88";
-       revision = "3";
-       editedCabalFile = "0lpsrqabjrcjx6xycr8xkcqm0ma7bacgh5jlhfwj7ayh5wlnsxqa";
+       revision = "4";
+       editedCabalFile = "0r5lypd2jxsh221djvb49an7zcn4dlzr563cyf5xchchhnz9mcxp";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -141936,6 +142109,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "paths" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, directory, filepath
+     , time
+     }:
+     mkDerivation {
+       pname = "paths";
+       version = "0.1";
+       sha256 = "0cccvc2p04rmhbg61jaa592jd86dp08ipamk3ddvswr5ih3rhdgx";
+       libraryHaskellDepends = [
+         base bytestring deepseq directory filepath time
+       ];
+       description = "Library for representing and manipulating type-safe file paths";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pathtype" = callPackage
     ({ mkDerivation, base, deepseq, directory, old-time, QuickCheck
      , random, tagged, time, transformers, utility-ht
@@ -144461,29 +144649,6 @@ self: {
      }) {};
 
   "pipes" = callPackage
-    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
-     , optparse-applicative, QuickCheck, test-framework
-     , test-framework-quickcheck2, transformers, void
-     }:
-     mkDerivation {
-       pname = "pipes";
-       version = "4.3.3";
-       sha256 = "0sgnlawi06mcwvm986vrixrmjdd3fy436kwfij8gn01vpa5p53bl";
-       libraryHaskellDepends = [
-         base exceptions mmorph mtl transformers void
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck test-framework test-framework-quickcheck2
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion mtl optparse-applicative transformers
-       ];
-       description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes_4_3_4" = callPackage
     ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
      , optparse-applicative, QuickCheck, test-framework
      , test-framework-quickcheck2, transformers, void
@@ -144504,7 +144669,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -144926,6 +145090,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-extras_1_0_10" = callPackage
+    ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
+     , test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-extras";
+       version = "1.0.10";
+       sha256 = "1an1ca8dbwnz7jsz0l9gyrzgibyhl46p855m3hzvy0jvhai0fz2j";
+       libraryHaskellDepends = [ base foldl pipes transformers ];
+       testHaskellDepends = [
+         base HUnit pipes test-framework test-framework-hunit transformers
+       ];
+       description = "Extra utilities for pipes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-fastx" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, pipes
      , pipes-attoparsec, pipes-bytestring
@@ -145780,23 +145961,6 @@ self: {
      }) {};
 
   "plan-b" = callPackage
-    ({ mkDerivation, base, exceptions, hspec, path, path-io
-     , transformers
-     }:
-     mkDerivation {
-       pname = "plan-b";
-       version = "0.2.0";
-       sha256 = "0sf7h18wddwlspg5gglfnbcha534nhm5va6idrd6mqqfk8j4nrgi";
-       libraryHaskellDepends = [
-         base exceptions path path-io transformers
-       ];
-       testHaskellDepends = [ base hspec path path-io ];
-       homepage = "https://github.com/mrkkrp/plan-b";
-       description = "Failure-tolerant file and directory editing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "plan-b_0_2_1" = callPackage
     ({ mkDerivation, base, exceptions, hspec, path, path-io
      , transformers
      }:
@@ -145811,7 +145975,6 @@ self: {
        homepage = "https://github.com/mrkkrp/plan-b";
        description = "Failure-tolerant file and directory editing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "planar-graph" = callPackage
@@ -148901,8 +149064,10 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter";
-       version = "0.1";
-       sha256 = "0n45ag89xlcs3sfpwhghfqgwradldlzs8rgkn5z6747s7v2m40aj";
+       version = "1";
+       sha256 = "00l4ax9h7b761474vvb2fv3mqs3nfy752ypzhmv8pnqzqb3mhlrf";
+       revision = "1";
+       editedCabalFile = "19rdsvym1kch6v7jfgn4358fd1k28smpi1sd21lhi61561rcb727";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -148924,8 +149089,10 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter-ansi-terminal";
-       version = "0.1";
-       sha256 = "0n42hapidn94pq0jw0854l42pwwp3bpy0b9x685anzh1lkf0djrp";
+       version = "1";
+       sha256 = "0amsc1cdk7h53b3xvrsx79j6w0b64bcih13rriclizk6kqkidjcd";
+       revision = "1";
+       editedCabalFile = "0sdgi3sc2nljfdpb9i6l579yjz1blxjl7bw78wf0x1407xmbzkh9";
        libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
        testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/quchen/prettyprinter";
@@ -148937,8 +149104,10 @@ self: {
     ({ mkDerivation, base, prettyprinter, text }:
      mkDerivation {
        pname = "prettyprinter-compat-annotated-wl-pprint";
-       version = "0.1";
-       sha256 = "1q3579nrlxbyl69advndr6sl2x9qlq4km42v7kghmlpnc0yxn2vc";
+       version = "1";
+       sha256 = "0zpmpbpnyxqswfb7gdj0kwz7hw606fj1iwkpl1qv0xcxk6n9n99c";
+       revision = "1";
+       editedCabalFile = "17r1vqpri6031q7l5gvl4v0r5yrjmb0c44l6rwwg1xnvlsa81x1x";
        libraryHaskellDepends = [ base prettyprinter text ];
        homepage = "http://github.com/quchen/prettyprinter";
        description = "Prettyprinter compatibility module for previous users of the annotated-wl-pprint package";
@@ -148951,8 +149120,10 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter-compat-ansi-wl-pprint";
-       version = "0.1";
-       sha256 = "1kqqd3csd5m510a74dxlzw5rl4vv55czacsh3cgn3qi72xjd0ff8";
+       version = "1";
+       sha256 = "1w84df99n1fwzwyflfjh6bsbrv03yzdsq8b42ziqcb3m1mq5hf1v";
+       revision = "1";
+       editedCabalFile = "09igfp6q9lgiaspwmkfm09jvc4d9vwwayfynklq3q5mg87w9lmaf";
        libraryHaskellDepends = [
          base prettyprinter prettyprinter-ansi-terminal text
        ];
@@ -148965,8 +149136,10 @@ self: {
     ({ mkDerivation, base, prettyprinter, text }:
      mkDerivation {
        pname = "prettyprinter-compat-wl-pprint";
-       version = "1";
-       sha256 = "1g53l61gxry1bkzvvybrz9dhajrva6701c3wkwpi7kcqg0jkwa8p";
+       version = "1.0.0.1";
+       sha256 = "17jj8m9s3cp1s1szpy67g7wni9ssid78jqksh3aym7p6ci81y8km";
+       revision = "1";
+       editedCabalFile = "0dycsmi7pcp3m7qzc6b6r5w9gzj5byb5sxk6x6rciq1bhh1n6bz6";
        libraryHaskellDepends = [ base prettyprinter text ];
        homepage = "http://github.com/quchen/prettyprinter";
        description = "Prettyprinter compatibility module for previous users of the wl-pprint package";
@@ -149688,26 +149861,6 @@ self: {
      }) {};
 
   "profiteur" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, filepath
-     , ghc-prof, js-jquery, scientific, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "profiteur";
-       version = "0.4.2.2";
-       sha256 = "0gwm1a61sw1rrzf9ldrlalaxsh5fayk6yl2m6wsb156wjz0s39ya";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring containers filepath ghc-prof js-jquery
-         scientific text unordered-containers vector
-       ];
-       homepage = "http://github.com/jaspervdj/profiteur";
-       description = "Treemap visualiser for GHC prof files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "profiteur_0_4_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , ghc-prof, js-jquery, scientific, text, unordered-containers
      , vector
@@ -149725,7 +149878,6 @@ self: {
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -150735,20 +150887,17 @@ self: {
      }) {};
 
   "pub" = callPackage
-    ({ mkDerivation, base, bytestring, cmdargs, ConfigFile, containers
-     , groom, hedis, hslogger, mtl, network, pipes, pipes-bytestring
-     , safe, system-filepath, text, time, transformers
+    ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes
+     , pipes-bytestring, text
      }:
      mkDerivation {
        pname = "pub";
-       version = "2.0.2";
-       sha256 = "0ps4i5q4kzkla6gzr8amf2bql2y5g0gb4dbjf9w0q58yzzvpp2c8";
+       version = "3.0.0";
+       sha256 = "1svyfvpqarmfy634s61l1pg7wc9y35bn753zq3vs1rvbw9lmxpj5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring cmdargs ConfigFile containers groom hedis hslogger
-         mtl network pipes pipes-bytestring safe system-filepath text time
-         transformers
+         base bytestring hedis optparse-generic pipes pipes-bytestring text
        ];
        description = "Pipe stdin to a redis pub/sub channel";
        license = stdenv.lib.licenses.bsd3;
@@ -151943,10 +152092,8 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "1.0.1.0";
-       sha256 = "0j1zrvpgfnhp1jy93lfx7y9hpbr35bahxa66b10hgz1x501yfjvn";
-       revision = "1";
-       editedCabalFile = "1m38fnl6h004c7m8lhjnk5dcnlmcwwyb37j1p9c7cxg75akbz236";
+       version = "1.0.1.1";
+       sha256 = "1jx81ha39khy115als4sai7xz8n49i44a8nxix0gvr48p8in8cv0";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels microlens MissingH optparse-applicative
@@ -151954,7 +152101,7 @@ self: {
        ];
        libraryPkgconfigDepends = [ libqrencode ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/vmchale/QR-writer";
+       homepage = "https://github.com/vmchale/QRImager#readme";
        description = "Library to generate QR codes from bytestrings and objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152656,18 +152803,6 @@ self: {
      }) {};
 
   "quickcheck-unicode" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
-     mkDerivation {
-       pname = "quickcheck-unicode";
-       version = "1.0.0.1";
-       sha256 = "1a8nl6x7l9b22yx61wm0bh2n1xzb1hd5i5zgg1w4fpaivjnrrhi4";
-       libraryHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/bos/quickcheck-unicode";
-       description = "Generator and shrink functions for testing Unicode-related software";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-unicode_1_0_1_0" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-unicode";
@@ -152677,7 +152812,6 @@ self: {
        homepage = "https://github.com/bos/quickcheck-unicode";
        description = "Generator and shrink functions for testing Unicode-related software";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-webdriver" = callPackage
@@ -153920,6 +154054,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rank2classes" = callPackage
+    ({ mkDerivation, base, doctest, template-haskell, transformers }:
+     mkDerivation {
+       pname = "rank2classes";
+       version = "0.1";
+       sha256 = "1izr3nrbrrcf4496m0p5fpvd9h6gzgirb6q76kvn4chd4p45j0iz";
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/blamario/grampa/tree/master/rank2classes";
+       description = "a mirror image of some standard type classes, with methods of rank 2 types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rapid" = callPackage
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
@@ -159219,38 +159366,6 @@ self: {
      }) {};
 
   "riak" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder
-     , bytestring, containers, criterion, data-default-class, deepseq
-     , enclosed-exceptions, exceptions, hashable, HUnit
-     , mersenne-random-pure64, monad-control, mtl, network
-     , protocol-buffers, pureMD5, QuickCheck, random, resource-pool
-     , riak-protobuf, semigroups, stm, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers, transformers-base
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "riak";
-       version = "1.1.1.0";
-       sha256 = "17vnycbw8i2s10888qmhvi3p1yk2vki6dqnwy2f0mhvnbk38bv76";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary blaze-builder bytestring containers
-         data-default-class deepseq enclosed-exceptions exceptions hashable
-         mersenne-random-pure64 monad-control network protocol-buffers
-         pureMD5 random resource-pool riak-protobuf semigroups stm text time
-         transformers transformers-base unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers data-default-class HUnit mtl QuickCheck
-         riak-protobuf semigroups tasty tasty-hunit tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
-       homepage = "http://github.com/markhibberd/riak-haskell-client";
-       description = "A Haskell client for the Riak decentralized data store";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "riak_1_1_2_0" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary
      , blaze-builder, bytestring, containers, criterion
      , data-default-class, deepseq, enclosed-exceptions, exceptions
@@ -161374,6 +161489,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "safeio" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , directory, filepath, HUnit, resourcet, test-framework
+     , test-framework-hunit, test-framework-th, unix
+     }:
+     mkDerivation {
+       pname = "safeio";
+       version = "0.0.2.0";
+       sha256 = "0ajz4hd3dycy10abngccqdbkj1356d2sggsnrlc34s370381hi9w";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-combinators directory filepath
+         resourcet unix
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators directory filepath
+         HUnit resourcet test-framework test-framework-hunit
+         test-framework-th unix
+       ];
+       description = "Write output to disk atomically";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "safepath" = callPackage
     ({ mkDerivation, base, doctest, text, validity }:
      mkDerivation {
@@ -162092,15 +162229,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sbv_6_0" = callPackage
+  "sbv_6_1" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc
      , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
      }:
      mkDerivation {
        pname = "sbv";
-       version = "6.0";
-       sha256 = "0rhrc22l5qhyhix7hf1fxisyp397mzy20j0iraj5108ipszimp48";
+       version = "6.1";
+       sha256 = "1a8wa2pgzd6z5bnndb6adzxcxyq1b6qlxwh8apjynqzbrhhjspn5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162661,8 +162798,8 @@ self: {
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.4.12";
-       sha256 = "0pcm5s918sbyahbr7hinfkjcnv8fqp9xddkg6mmniyw2f1sqzyi6";
+       version = "0.3.4.13";
+       sha256 = "0fpn0mwv4rvvn44dn2lm5nxws8w90jv9vlwjy85xsvhn5dvv7bhq";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq ghc-prim hashable
          integer-gmp integer-logarithms text vector
@@ -166208,8 +166345,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-snap";
-       version = "0.7.0.5";
-       sha256 = "1wa4c79vid7smg216z26bsi2pbwqfim2cj5x9j8l2m82gylyb4ja";
+       version = "0.7.3";
+       sha256 = "0ahk3slcl25c4ykxix8j8nqf1mxqc4gnrzx6hpll3ab9m02g1qzf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166369,32 +166506,6 @@ self: {
      }) {};
 
   "servant-swagger-ui" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
-     , directory, file-embed, filepath, http-media, lens, servant
-     , servant-blaze, servant-server, servant-swagger, swagger2
-     , template-haskell, text, transformers, transformers-compat, wai
-     , wai-app-static, warp
-     }:
-     mkDerivation {
-       pname = "servant-swagger-ui";
-       version = "0.2.2.2.2.8";
-       sha256 = "1yw483lfflpy1a16ybiy1ird1q6b0xhhaylyffxkxavaxdavrkvx";
-       libraryHaskellDepends = [
-         base blaze-markup bytestring directory file-embed filepath
-         http-media servant servant-blaze servant-server servant-swagger
-         swagger2 template-haskell text transformers transformers-compat
-         wai-app-static
-       ];
-       testHaskellDepends = [
-         aeson base base-compat lens servant servant-server servant-swagger
-         swagger2 text transformers transformers-compat wai warp
-       ];
-       homepage = "https://github.com/phadej/servant-swagger-ui#readme";
-       description = "Servant swagger ui";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger-ui_0_2_3_2_2_8" = callPackage
     ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
      , directory, file-embed, filepath, http-media, lens, servant
      , servant-blaze, servant-server, servant-swagger, swagger2
@@ -166418,7 +166529,6 @@ self: {
        homepage = "https://github.com/phadej/servant-swagger-ui#readme";
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-yaml" = callPackage
@@ -167956,8 +168066,8 @@ self: {
      }:
      mkDerivation {
        pname = "shikensu";
-       version = "0.3.2";
-       sha256 = "07rha4mva0i23y9nvnk2p3h0b1gpihspq0aa5n63svq8kb96xivl";
+       version = "0.3.3";
+       sha256 = "15a2favvch2ph3sh0y1915vzqisl3bhkpnqp1kfmlyzpdw75h8yn";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath flow Glob text
          unordered-containers
@@ -168158,6 +168268,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "show-prettyprint_0_2" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter
+     , trifecta
+     }:
+     mkDerivation {
+       pname = "show-prettyprint";
+       version = "0.2";
+       sha256 = "14yjffqjkadmb0aw3zf2n1v525vn293rinhmbwby71ch76nij42w";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base prettyprinter trifecta
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/quchen/show-prettyprint#readme";
+       description = "Robust prettyprinter for output of auto-generated Show instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "show-type" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -168277,33 +168405,6 @@ self: {
      }) {};
 
   "sibe" = callPackage
-    ({ mkDerivation, base, Chart, Chart-cairo, containers
-     , data-default-class, deepseq, directory, hmatrix, JuicyPixels
-     , lens, random, random-shuffle, regex-base, regex-pcre, split
-     , stemmer, text, vector
-     }:
-     mkDerivation {
-       pname = "sibe";
-       version = "0.2.0.4";
-       sha256 = "1p4djnjqyd7hdnhs4s9xbry5qn6gcwn1s8d9m79qqav016q3hh0h";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base Chart Chart-cairo containers data-default-class deepseq
-         hmatrix lens random random-shuffle regex-base regex-pcre split
-         stemmer text vector
-       ];
-       executableHaskellDepends = [
-         base Chart Chart-cairo containers data-default-class directory
-         hmatrix JuicyPixels random random-shuffle split vector
-       ];
-       homepage = "https://github.com/mdibaiee/sibe";
-       description = "Machine Learning algorithms";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "sibe_0_2_0_5" = callPackage
     ({ mkDerivation, base, Chart, Chart-cairo, containers
      , data-default-class, deepseq, directory, hmatrix, JuicyPixels
      , lens, random, random-shuffle, regex-base, regex-pcre, split
@@ -169531,6 +169632,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singletons_2_3" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl
+     , process, syb, tasty, tasty-golden, template-haskell, text
+     , th-desugar
+     }:
+     mkDerivation {
+       pname = "singletons";
+       version = "2.3";
+       sha256 = "022747kp55yf2hzsqk03wcbmvqn47nbvhiqjam06c9hkcj3gixf5";
+       libraryHaskellDepends = [
+         base containers mtl syb template-haskell text th-desugar
+       ];
+       testHaskellDepends = [
+         base Cabal directory filepath process tasty tasty-golden
+       ];
+       homepage = "http://www.github.com/goldfirere/singletons";
+       description = "A framework for generating singleton types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sink" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -169620,25 +169742,19 @@ self: {
   "sitepipe" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , exceptions, filepath, Glob, lens, lens-aeson, megaparsec
-     , MissingH, mtl, mustache, optparse-applicative, optparse-generic
-     , pandoc, parsec, shelly, text, unordered-containers, yaml
+     , MissingH, mtl, mustache, optparse-applicative, pandoc, parsec
+     , shelly, text, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "sitepipe";
-       version = "0.1.0";
-       sha256 = "1vdfhmmhppca40iq27dry6ic1cirmjb5canjp7v8vl2d6jg646bq";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.1";
+       sha256 = "1kymvi3pf67chjsvqxv29i4fbac2yyrjx5llc2r7qjfw3hblf5sj";
        libraryHaskellDepends = [
          aeson base bytestring containers directory exceptions filepath Glob
          lens lens-aeson megaparsec MissingH mtl mustache
-         optparse-applicative optparse-generic pandoc parsec shelly text
-         unordered-containers yaml
-       ];
-       executableHaskellDepends = [
-         base containers lens mustache text unordered-containers
+         optparse-applicative pandoc parsec shelly text unordered-containers
+         yaml
        ];
-       testHaskellDepends = [ base ];
        homepage = "https://github.com/ChrisPenner/sitepipe#readme";
        description = "A simple to understand static site generator";
        license = stdenv.lib.licenses.bsd3;
@@ -171098,6 +171214,8 @@ self: {
        pname = "snap-server";
        version = "1.0.2.2";
        sha256 = "0zw3z9s61kkfmlvrg3sfqvd0c3mzg9zjwp01hm1br3z8cawmzpi7";
+       revision = "1";
+       editedCabalFile = "1r35srci0bglwz8bbl6kwgb33g0lpqdwv8lsy7hfc1l3kj4a7p2f";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -172298,32 +172416,8 @@ self: {
      }:
      mkDerivation {
        pname = "soap";
-       version = "0.2.3.3";
-       sha256 = "0yarhkcnn9z11ghjs756fmcdawgr33r4mipzf32aqp677g45j5rd";
-       libraryHaskellDepends = [
-         base bytestring conduit configurator data-default exceptions
-         http-client http-types iconv mtl resourcet text
-         unordered-containers xml-conduit xml-conduit-writer xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring hspec HUnit text unordered-containers xml-conduit
-         xml-conduit-writer
-       ];
-       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
-       description = "SOAP client tools";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "soap_0_2_3_4" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, configurator
-     , data-default, exceptions, hspec, http-client, http-types, HUnit
-     , iconv, mtl, resourcet, text, unordered-containers, xml-conduit
-     , xml-conduit-writer, xml-types
-     }:
-     mkDerivation {
-       pname = "soap";
-       version = "0.2.3.4";
-       sha256 = "08ff0v6vfa8pgcwzgc4ajsah572zrjp29ryghhbg3g5mb75qx6dm";
+       version = "0.2.3.5";
+       sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs";
        libraryHaskellDepends = [
          base bytestring conduit configurator data-default exceptions
          http-client http-types iconv mtl resourcet text
@@ -172336,7 +172430,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "SOAP client tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-openssl" = callPackage
@@ -173024,6 +173117,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "spake2" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite
+     , memory, optparse-applicative, protolude, QuickCheck, tasty
+     , tasty-hspec
+     }:
+     mkDerivation {
+       pname = "spake2";
+       version = "0.1.0";
+       sha256 = "08g8n99zdpl8f2wlhvjl16zrnnazp6swvg3688l1bfma5igs9zsy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cryptonite memory protolude
+       ];
+       executableHaskellDepends = [
+         base base16-bytestring cryptonite optparse-applicative protolude
+       ];
+       testHaskellDepends = [
+         base cryptonite protolude QuickCheck tasty tasty-hspec
+       ];
+       homepage = "https://github.com/jml/haskell-spake2#readme";
+       description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "spanout" = callPackage
     ({ mkDerivation, base, containers, gloss, lens, linear, MonadRandom
      , mtl, netwire
@@ -174112,12 +174230,12 @@ self: {
     ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
      mkDerivation {
        pname = "sql-words";
-       version = "0.1.4.1";
-       sha256 = "1bixzyr6gy64ncmal010y22v9gdqxdnaambsc22sv08jcbwshgpm";
+       version = "0.1.5.0";
+       sha256 = "164a4bls6sqp8dmwn63dqa4dxyd7nd7fr7n2996bhrq7h4dk0ydv";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Simple idea SQL keywords data constructor into OverloadedString";
+       description = "SQL keywords data constructors into OverloadedString";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -176149,17 +176267,6 @@ self: {
      }) {};
 
   "stm-split" = callPackage
-    ({ mkDerivation, base, stm }:
-     mkDerivation {
-       pname = "stm-split";
-       version = "0.0.1";
-       sha256 = "1f91fj1w8z5mahfn7c5933iag7vary2ljp12j4bv360lnvp3q700";
-       libraryHaskellDepends = [ base stm ];
-       description = "TMVars, TVars and TChans with distinguished input and output side";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stm-split_0_0_2" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "stm-split";
@@ -176168,7 +176275,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "TMVars, TVars and TChans with distinguished input and output side";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-stats" = callPackage
@@ -176820,6 +176926,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-binary" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hspec, streaming
+     , streaming-bytestring
+     }:
+     mkDerivation {
+       pname = "streaming-binary";
+       version = "0.3.0.1";
+       sha256 = "0n39as3mjwp6v1j4qrxm616h3zs0plnal2z46kwcqh5fbcszsayd";
+       libraryHaskellDepends = [
+         base binary bytestring streaming streaming-bytestring
+       ];
+       testHaskellDepends = [
+         base binary bytestring hspec streaming streaming-bytestring
+       ];
+       homepage = "https://github.com/mboes/streaming-binary#readme";
+       description = "Streaming interface to binary";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl
      , resourcet, smallcheck, streaming, tasty, tasty-smallcheck
@@ -176867,6 +176992,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "streaming-commons_0_1_18" = callPackage
+    ({ mkDerivation, array, async, base, blaze-builder, bytestring
+     , criterion, deepseq, directory, hspec, network, process
+     , QuickCheck, random, stm, text, transformers, unix, zlib
+     }:
+     mkDerivation {
+       pname = "streaming-commons";
+       version = "0.1.18";
+       sha256 = "1jw3y3clh2l0kmsrkhhn6n1b8i8gnwz5cwbczj1kq00sj3xjxbr7";
+       libraryHaskellDepends = [
+         array async base blaze-builder bytestring directory network process
+         random stm text transformers unix zlib
+       ];
+       testHaskellDepends = [
+         array async base blaze-builder bytestring deepseq hspec network
+         QuickCheck text unix zlib
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq text
+       ];
+       homepage = "https://github.com/fpco/streaming-commons";
+       description = "Common lower-level functions needed by various streaming data libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streaming-eversion" = callPackage
     ({ mkDerivation, base, doctest, foldl, microlens, pipes
      , pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit
@@ -178147,6 +178298,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sum-type-boilerplate" = callPackage
+    ({ mkDerivation, base, hlint, hspec, HUnit, template-haskell }:
+     mkDerivation {
+       pname = "sum-type-boilerplate";
+       version = "0.1.0";
+       sha256 = "1nibnrnj35sdi6jywjlg5f41138a22q2vg7hn0vqczynzswjb5y8";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hlint hspec HUnit template-haskell ];
+       homepage = "https://github.com/jdreaver/sum-type-boilerplate#readme";
+       description = "Library for reducing the boilerplate involved with sum types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "sump" = callPackage
     ({ mkDerivation, base, bytestring, data-default, lens, serialport
      , transformers, vector
@@ -178319,16 +178483,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "superbuffer_0_3_1_0" = callPackage
+  "superbuffer_0_3_1_1" = callPackage
     ({ mkDerivation, async, base, buffer-builder, bytestring, criterion
      , HTF, QuickCheck
      }:
      mkDerivation {
        pname = "superbuffer";
-       version = "0.3.1.0";
-       sha256 = "1aimkngya9b1l6imjnv9xgdfbrrw8wljgjm52fs9rz26vp5lgdxm";
-       revision = "1";
-       editedCabalFile = "1nz1ix5xsb10zvi1xskfvx9x1yrdlvn8i20abjx0i8vqbdh4yl67";
+       version = "0.3.1.1";
+       sha256 = "0y3c2v2ca5lzz6265bcn9g04j6aihm7kw8w91ywfl7bkg1agp9fp";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ async base bytestring HTF QuickCheck ];
        benchmarkHaskellDepends = [
@@ -178389,8 +178551,8 @@ self: {
      }:
      mkDerivation {
        pname = "superconstraints";
-       version = "0.0.1";
-       sha256 = "1gx9p9i5jli91dnvvrc30j04h1v2m3d71i8sxli6qrhplq5y63dk";
+       version = "0.0.2";
+       sha256 = "0wdh3vjqls9mdvii7qxcv993305ahznffiv0qkfkwg0lxsshwdxy";
        libraryHaskellDepends = [
          base constraints containers haskell-src-meta mtl tagged
          template-haskell type-eq
@@ -180270,18 +180432,6 @@ self: {
      }) {};
 
   "tagged-identity" = callPackage
-    ({ mkDerivation, base, mtl, transformers }:
-     mkDerivation {
-       pname = "tagged-identity";
-       version = "0.1.1";
-       sha256 = "1a0s02xclpqbq22mqs7gi9kzv9hjlpjb2nkr91fic8hlr9nngw6w";
-       libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/mrkkrp/tagged-identity";
-       description = "Trivial monad transformer that allows identical monad stacks have different types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tagged-identity_0_1_2" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "tagged-identity";
@@ -180291,7 +180441,6 @@ self: {
        homepage = "https://github.com/mrkkrp/tagged-identity";
        description = "Trivial monad transformer that allows identical monad stacks have different types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-list" = callPackage
@@ -180876,6 +181025,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tar-conduit_0_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit-combinators }:
+     mkDerivation {
+       pname = "tar-conduit";
+       version = "0.1.1";
+       sha256 = "189dy1j32c44mjr3waljcvch1hqlijnax7myp4jih7y12hji6i9r";
+       libraryHaskellDepends = [ base bytestring conduit-combinators ];
+       homepage = "https://github.com/snoyberg/tar-conduit#readme";
+       description = "Parse tar files using conduit for streaming";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tardis" = callPackage
     ({ mkDerivation, base, mmorph, mtl }:
      mkDerivation {
@@ -181344,6 +181506,8 @@ self: {
        pname = "tasty-jenkins-xml";
        version = "0.2.0.0";
        sha256 = "1r5dm87cxia1kwkm4rvjbbf9h02dlnzglds2wz0kszcd8ys8zy5m";
+       revision = "1";
+       editedCabalFile = "018wf2xa1x57z6vlrhs98ap1l6i7wgipxjj2ri7lz91rmppjx1c5";
        libraryHaskellDepends = [ base tasty tasty-ant-xml ];
        testHaskellDepends = [
          base bytestring directory hlint hspec io-capture mockery tasty
@@ -181893,33 +182057,6 @@ self: {
      }) {};
 
   "telegram-api" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath
-     , hjpath, hspec, http-api-data, http-client, http-client-tls
-     , http-media, http-types, mime-types, mtl, optparse-applicative
-     , servant, servant-client, string-conversions, text, transformers
-     , utf8-string
-     }:
-     mkDerivation {
-       pname = "telegram-api";
-       version = "0.6.1.1";
-       sha256 = "1cvyridi23vq52qyz6dc2j5b787v2q2rc93zzfb4b6mpr1l72404";
-       libraryHaskellDepends = [
-         aeson base bytestring http-api-data http-client http-media
-         http-types mime-types mtl servant servant-client string-conversions
-         text transformers
-       ];
-       testHaskellDepends = [
-         aeson ansi-wl-pprint base filepath hjpath hspec http-client
-         http-client-tls http-types optparse-applicative servant
-         servant-client text transformers utf8-string
-       ];
-       homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
-       description = "Telegram Bot API bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "telegram-api_0_6_3_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath
      , hjpath, hspec, http-api-data, http-client, http-client-tls
      , http-media, http-types, mime-types, mtl, optparse-applicative
@@ -181990,6 +182127,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "teleshell" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hashable, network
+     , pipes, primitive, QuickCheck, split, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "teleshell";
+       version = "0.1.0.0";
+       sha256 = "1fmhjjg2k81hc6lsbdnha0a8ma62xcaxkpmfdiygplnmf3gcl02g";
+       libraryHaskellDepends = [
+         attoparsec base bytestring hashable network pipes primitive text
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring pipes QuickCheck split tasty tasty-hunit
+         tasty-quickcheck vector
+       ];
+       homepage = "https://github.com/andrewthad/teleshell#readme";
+       description = "Telnet client and other things";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tellbot" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, containers
      , http-conduit, mtl, network, regex-pcre, split, tagsoup, text
@@ -184399,8 +184559,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
-       version = "0.1.2.1";
-       sha256 = "08wzlann9gpxdn6hkhj1qz0shqj9lwarczw1m9svjsxy90x2riiv";
+       version = "0.1.3.0";
+       sha256 = "0ycb91csldk5jynhj8ydy6jmvjppqrbzc0n4zw414z69drb9gqzx";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -184515,6 +184675,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-desugar_1_7" = callPackage
+    ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
+     , template-haskell, th-expand-syns, th-lift, th-orphans
+     }:
+     mkDerivation {
+       pname = "th-desugar";
+       version = "1.7";
+       sha256 = "1iqlqadax1ahgv9h1vdyddf55v2h4ghqrxfyqirrvk97iyk1rcsj";
+       libraryHaskellDepends = [
+         base containers mtl syb template-haskell th-expand-syns th-lift
+         th-orphans
+       ];
+       testHaskellDepends = [
+         base containers hspec HUnit mtl syb template-haskell th-expand-syns
+         th-lift th-orphans
+       ];
+       homepage = "https://github.com/goldfirere/th-desugar";
+       description = "Functions to desugar Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-expand-syns" = callPackage
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
@@ -187983,14 +188165,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "transient_0_5_4" = callPackage
+  "transient_0_5_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.5.4";
-       sha256 = "0pl523v5p8frcmmz4m5jqyakgmsvi1rmsadl61p60hxl8p5nac35";
+       version = "0.5.5";
+       sha256 = "06fpva9mydavc7dnmha735rc1mlz0hi33xagdf0hh7s0hplfpwd3";
        libraryHaskellDepends = [
          base bytestring containers directory mtl random stm time
          transformers
@@ -188031,7 +188213,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transient-universe_0_4_1" = callPackage
+  "transient-universe_0_4_4_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, filepath, hashable, HTTP, iproute, mtl, network
      , network-info, network-uri, process, random, stm, TCache, text
@@ -188039,8 +188221,8 @@ self: {
      }:
      mkDerivation {
        pname = "transient-universe";
-       version = "0.4.1";
-       sha256 = "1yynv15cm70gkjaccrb3zksgm3j03wzbmq2n53ha7pzmbmdq2010";
+       version = "0.4.4.1";
+       sha256 = "1v8b0q5drs6lpw3va9qn5yqfawhcaaypys00rl0pcci47xkvpxvj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -188056,7 +188238,7 @@ self: {
          stm TCache text time transformers transient vector websockets
        ];
        homepage = "http://www.fpcomplete.com/user/agocorona";
-       description = "Remote execution and map-reduce: distributed computing for Transient";
+       description = "Distributed computing with algebraic/monadic composability, map-reduce";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -189097,20 +189279,44 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.3.3";
-       sha256 = "07jd62b0m1a5g32rl3lgqcwhj8zk3s4gcnqy0c7yiqww7z8nz8c2";
+       version = "1.3.4";
+       sha256 = "0rkxic6v68dlzdvnqk0pfchl9zd1rjhmr0n5qwms3r0pq5z8vj57";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock directory foldl hostname
          managed optional-args optparse-applicative process semigroups stm
          system-fileio system-filepath temporary text time transformers unix
          unix-compat
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [ base doctest system-filepath temporary ];
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_3_5" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , criterion, directory, doctest, foldl, hostname, managed
+     , optional-args, optparse-applicative, process, semigroups, stm
+     , system-fileio, system-filepath, temporary, text, time
+     , transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.3.5";
+       sha256 = "0ry3d42s3g3hbdg8gjdlcadd0cfmf4harb30w4l2r6p94vj25453";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock directory foldl hostname
+         managed optional-args optparse-applicative process semigroups stm
+         system-fileio system-filepath temporary text time transformers unix
+         unix-compat
+       ];
+       testHaskellDepends = [ base doctest system-filepath temporary ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -190361,6 +190567,8 @@ self: {
        pname = "type-unary";
        version = "0.3.0";
        sha256 = "1s84bw7fxxsqixy03892zb1s261fc0c8h5srsifs5mzgvhxkn20l";
+       revision = "1";
+       editedCabalFile = "03lz4iprlfl2bnh4isa2k7ddv1wxz8mqb7x1nmhjqbx34apbqi11";
        libraryHaskellDepends = [
          applicative-numbers base constraints newtype ty vector-space
        ];
@@ -191333,24 +191541,6 @@ self: {
      }) {};
 
   "unfoldable" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
-     , random, transformers
-     }:
-     mkDerivation {
-       pname = "unfoldable";
-       version = "0.9.2";
-       sha256 = "010f3c3x933y6pxldrdsi334pnyxz7j4g8627g4ya7q2dmdyr4lm";
-       revision = "1";
-       editedCabalFile = "0kg9bfsfs61ickam0mfavgpy9dxlik5q2sv1b4ij7l71kx4v3s91";
-       libraryHaskellDepends = [
-         base containers ghc-prim one-liner QuickCheck random transformers
-       ];
-       homepage = "https://github.com/sjoerdvisscher/unfoldable";
-       description = "Class of data structures that can be unfolded";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unfoldable_0_9_3" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
      , random, transformers
      }:
@@ -191364,7 +191554,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -192152,8 +192341,8 @@ self: {
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.4.2";
-       sha256 = "1chyj0mrrfhzhd6wrj9wlxyil9jiyq6yvk27dvh6qzj7qrw2ilzz";
+       version = "0.4.3";
+       sha256 = "17rrikfid54z8h95qns5q7bdxadnnggv1pl2d9ilz9pz9hi7a9g6";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions ghc-prim hashable
          microlens microlens-mtl mtl safe stm text text-format transformers
@@ -192810,6 +192999,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring_0_2_3_2" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , containers, criterion, deepseq, deepseq-generics, generics-sop
+     , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, th-lift-instances
+     }:
+     mkDerivation {
+       pname = "uri-bytestring";
+       version = "0.2.3.2";
+       sha256 = "0slchhhgwcig8ifla49r9j96cg5l1jf5gy9zzpvmmds0x3d42qh4";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring containers
+         template-haskell th-lift-instances
+       ];
+       testHaskellDepends = [
+         attoparsec base blaze-builder bytestring containers generics-sop
+         HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq deepseq-generics
+         network-uri
+       ];
+       homepage = "https://github.com/Soostone/uri-bytestring";
+       description = "Haskell URI parsing as ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uri-bytestring-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
      mkDerivation {
@@ -194908,31 +195127,6 @@ self: {
      }) {};
 
   "vectortiles" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, criterion
-     , deepseq, hex, microlens, microlens-platform, protobuf, tasty
-     , tasty-hunit, text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "vectortiles";
-       version = "1.2.0.4";
-       sha256 = "1i63drcynk5b4i9dmbkhs67s6l3a2l643wx5rgasvxq2di6vf906";
-       libraryHaskellDepends = [
-         base bytestring cereal containers deepseq protobuf text
-         transformers vector
-       ];
-       testHaskellDepends = [
-         base bytestring cereal hex protobuf tasty tasty-hunit text vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring cereal containers criterion microlens
-         microlens-platform protobuf text
-       ];
-       homepage = "https://github.com/fosskers/vectortiles";
-       description = "GIS Vector Tiles, as defined by Mapbox";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "vectortiles_1_2_0_5" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, criterion
      , deepseq, hex, microlens, microlens-platform, protobuf, tasty
      , tasty-hunit, text, transformers, vector
@@ -194956,7 +195150,6 @@ self: {
        homepage = "https://github.com/fosskers/vectortiles";
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -195065,22 +195258,22 @@ self: {
      }:
      mkDerivation {
        pname = "versions";
-       version = "3.0.1.1";
-       sha256 = "02sjdbb1lpqmlra46l781wc2m7j7z6vnig0kip31bjh6849zkjrk";
+       version = "3.0.2";
+       sha256 = "1s33il4w94h51zsqbqylbzbhn9q5y7cjnscblhhkpglvgc2z61ii";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base microlens tasty tasty-hunit text ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "versions_3_0_2" = callPackage
+  "versions_3_0_2_1" = callPackage
     ({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit
      , text
      }:
      mkDerivation {
        pname = "versions";
-       version = "3.0.2";
-       sha256 = "1s33il4w94h51zsqbqylbzbhn9q5y7cjnscblhhkpglvgc2z61ii";
+       version = "3.0.2.1";
+       sha256 = "1vq2jypv6zsfcf13lnj2hfm19ajg86ld991kbaqbvbxkg1s800jp";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base microlens tasty tasty-hunit text ];
        description = "Types and parsers for software version numbers";
@@ -195720,43 +195913,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , deepseq, directory, filepath, hashable, HUnit, microlens
-     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
-     , quickcheck-assertions, random, smallcheck, stm, string-qq
-     , terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.15";
-       sha256 = "1xyphl595dvwrippg6gz7k4ks07mnfgss8gpw14149rc2fjhzgq3";
-       revision = "1";
-       editedCabalFile = "1gjwkw4swxsvm8gpdgiifmrxxyk0g7y1jiqdnxwgabz9qq54nj9k";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers deepseq directory filepath
-         hashable microlens microlens-mtl microlens-th mtl parallel parsec
-         stm terminfo text transformers unix utf8-string vector
-       ];
-       executableHaskellDepends = [
-         base containers microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers deepseq HUnit
-         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
-         smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       homepage = "https://github.com/jtdaugherty/vty";
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_15_1" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -195791,7 +195947,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -196814,6 +196969,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wai-middleware-json-errors" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, http-types, text
+     , wai
+     }:
+     mkDerivation {
+       pname = "wai-middleware-json-errors";
+       version = "0.1.1";
+       sha256 = "0704hyfzc8jqvdny9wz3j0b204vq7b07c1wwcin9ir9d6hha7aih";
+       libraryHaskellDepends = [
+         aeson base binary bytestring http-types text wai
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring http-types text wai
+       ];
+       homepage = "https://github.com/orbital/wai-middleware-json-errors#readme";
+       description = "Converts errors from plaintext to json";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-middleware-metrics" = callPackage
     ({ mkDerivation, base, bytestring, criterion, ekg-core, http-types
      , QuickCheck, scotty, tasty, tasty-hunit, tasty-quickcheck, text
@@ -197798,27 +197972,6 @@ self: {
      }) {};
 
   "wave" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers
-     , data-default-class, hspec, QuickCheck, temporary, transformers
-     }:
-     mkDerivation {
-       pname = "wave";
-       version = "0.1.4";
-       sha256 = "1g5nmqfk6p25v9ismwz4i66ay91bd1qh39xwj0hm4z6a5mw8frk8";
-       libraryHaskellDepends = [
-         base bytestring cereal containers data-default-class transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers data-default-class hspec QuickCheck
-         temporary
-       ];
-       homepage = "https://github.com/mrkkrp/wave";
-       description = "Work with WAVE and RF64 files";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "wave_0_1_5" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers
      , data-default-class, hspec, QuickCheck, temporary, transformers
      }:
@@ -197930,17 +198083,18 @@ self: {
 
   "weather-api" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, HTTP, network
-     , utf8-string, vector
+     , network-uri, utf8-string, vector
      }:
      mkDerivation {
        pname = "weather-api";
-       version = "0.4.3";
-       sha256 = "0wlh3p5z2vivhn9pgqzjhczrb7jyfzkz889fmwnvm7h87440jnyj";
+       version = "0.4.3.3";
+       sha256 = "01kbp2m95d8ckwyiimzxk6jjsyfbkv90ddjynflgx7s9i6xxxb17";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring HTTP network utf8-string vector
+         aeson attoparsec base bytestring HTTP network network-uri
+         utf8-string vector
        ];
-       homepage = "https://github.com/cvb/hs-weather-api.git";
-       description = "Weather api implemented in haskell";
+       homepage = "https://github.com/cvb/hs-weather-api#readme";
+       description = "Weather API implemented in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -198918,8 +199072,8 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "0.1.3";
-       sha256 = "15vqayanb9bs10wigpdrzjcwnmpnq8mai3j3bw5q72rl9m2qc6dj";
+       version = "0.1.4";
+       sha256 = "0n7zwyppjsiih0i3czb2m0a817jy592hpm6jhkr8hp1a1pa8qfcz";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -200481,8 +200635,8 @@ self: {
     ({ mkDerivation, base, mtl, text }:
      mkDerivation {
        pname = "wryte";
-       version = "0.1.1.0";
-       sha256 = "15ksy5dzi64fkjkgk5pmm8iclavp3aq8jz1c35458azdn1xi1qdj";
+       version = "0.2.0.0";
+       sha256 = "1hb7dh4sayy11whx25012pwc914g6v2dl8gldc2ipkzaa6wpycsh";
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/tdammers/wryte#readme";
@@ -201596,7 +201750,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "xlsx_0_5_0" = callPackage
+  "xlsx_0_6_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
      , conduit, containers, data-default, Diff, errors, extra, filepath
      , groom, lens, mtl, mtl-compat, network-uri, old-locale
@@ -201606,8 +201760,8 @@ self: {
      }:
      mkDerivation {
        pname = "xlsx";
-       version = "0.5.0";
-       sha256 = "0wmn5hz2pmajyg4q5lq4yp3rrwvaic15w4qglw3a2vb9cmx42n1a";
+       version = "0.6.0";
+       sha256 = "1a6xvk8b0lsqr3m712879vr3z84snkzcfb9ykikf2azz69kn7y4k";
        libraryHaskellDepends = [
          base base64-bytestring binary-search bytestring conduit containers
          data-default errors extra filepath lens mtl mtl-compat network-uri
@@ -202382,8 +202536,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.24.4";
-       sha256 = "1j5mcb9xasdv6ckql1i5ldivchv4yrqm0srb6jbc0mav9fy22kh5";
+       version = "0.24.5";
+       sha256 = "0sdzfj2wa4wpig1i2i5n9qpwm90jp88qifsmaa7j37yhhs6snfir";
        configureFlags = [ "-fall_extensions" ];
        isLibrary = false;
        isExecutable = true;
@@ -202593,8 +202747,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.1.0";
-       sha256 = "0fgl6j4mlx5pl03lqggwlxa3ny35x2s4jw3gr7lsx76nrawrfm3p";
+       version = "0.1.1.1";
+       sha256 = "0f322aqfav3hzv9hh0krl778q25jq0m83lqdwzbymbgm4yy585y2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -203007,29 +203161,6 @@ self: {
      }) {};
 
   "yahoo-finance-api" = callPackage
-    ({ mkDerivation, aeson, base, doctest, either, Glob, hspec
-     , http-api-data, http-client, http-client-tls, mtl, safe, servant
-     , servant-client, text, time, transformers, vector
-     }:
-     mkDerivation {
-       pname = "yahoo-finance-api";
-       version = "0.2.0.1";
-       sha256 = "15p4g5lx09zpvs3x7611zx7n0sva6yii08g8ciqqg1d2v1bfm7ij";
-       libraryHaskellDepends = [
-         aeson base either http-api-data http-client mtl servant
-         servant-client text time transformers vector
-       ];
-       testHaskellDepends = [
-         base doctest either Glob hspec http-client http-client-tls mtl safe
-         servant servant-client
-       ];
-       homepage = "https://github.com/cdepillabout/yahoo-finance-api";
-       description = "Read quotes from Yahoo Finance API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yahoo-finance-api_0_2_0_2" = callPackage
     ({ mkDerivation, aeson, base, doctest, either, Glob, hspec
      , http-api-data, http-client, http-client-tls, mtl, safe, servant
      , servant-client, text, time, transformers, vector
@@ -203137,37 +203268,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
-     , bytestring, conduit, containers, directory, filepath, hspec
-     , HUnit, libyaml, mockery, resourcet, scientific, semigroups
-     , template-haskell, temporary, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.8.22.1";
-       sha256 = "0svvh0dg9xmvrdmfzsh18zdw5jmr3dn7l5cvzp8zprs1lvjhlv6x";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         filepath resourcet scientific semigroups template-haskell text
-         transformers unordered-containers vector
-       ];
-       libraryPkgconfigDepends = [ libyaml ];
-       executableHaskellDepends = [ aeson base bytestring ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring conduit directory hspec
-         HUnit mockery resourcet temporary text transformers
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/snoyberg/yaml/";
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_23" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, filepath, hspec
      , HUnit, libyaml, mockery, resourcet, scientific, semigroups
@@ -203196,7 +203296,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-combinators" = callPackage
@@ -206825,33 +206924,6 @@ self: {
      }) {};
 
   "zip" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
-     , cereal, conduit, conduit-extra, containers, digest, exceptions
-     , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
-     , resourcet, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "zip";
-       version = "0.1.10";
-       sha256 = "03akf8qpssrlsrd3w1x45gh5h4vr0rz0v4aiz83rpz4zyhv1ghcf";
-       revision = "1";
-       editedCabalFile = "14n4mg8jncy5lisrd857iak9kcxgnza5bazcnh5by5q66w9vsmsp";
-       libraryHaskellDepends = [
-         base bytestring bzlib-conduit case-insensitive cereal conduit
-         conduit-extra containers digest exceptions filepath mtl path
-         path-io plan-b resourcet text time transformers
-       ];
-       testHaskellDepends = [
-         base bytestring conduit containers exceptions filepath hspec path
-         path-io QuickCheck text time transformers
-       ];
-       homepage = "https://github.com/mrkkrp/zip";
-       description = "Operations on zip archives";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "zip_0_1_11" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, containers, digest, exceptions
      , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
@@ -206873,7 +206945,7 @@ self: {
        homepage = "https://github.com/mrkkrp/zip";
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "zip-archive" = callPackage
-- 
GitLab


From f11d5c16307bf18a3ddfe03bd4874654187700fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 29 May 2017 13:16:02 +0200
Subject: [PATCH 0476/1490] haskell-doctest: fix build with ghc-7.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 111852ab34b..3b61b7bc065 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -80,6 +80,11 @@ self: super: {
   # Test suite won't compile.
   unix-time = dontCheck super.unix-time;
 
+  # The test suite depends on mockery, which pulls in logging-facade, which
+  # doesn't compile with this older version of base:
+  # https://github.com/sol/logging-facade/issues/14
+  doctest = dontCheck super.doctest;
+
   # Avoid depending on tasty-golden.
   monad-par = dontCheck super.monad-par;
 
-- 
GitLab


From aa8018103c75df14ff7e4f424c6b30f21df080cc Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 7 Jun 2017 18:00:58 -0300
Subject: [PATCH 0477/1490] nixos-artwork: add more wallpapers

Restructure the nixos-artwork to make it easy to selectively
incorporate other components from upstream without needing to download
the full package.

Until now only the Gnome_Dark wallpaper was included. Add other
wallpapers available in the package repository.
---
 .../services/x11/desktop-managers/gnome3.nix  |   4 +-
 .../services/x11/display-managers/lightdm.nix |   2 +-
 .../modules/system/boot/loader/grub/grub.nix  |   2 +-
 nixos/tests/installer.nix                     |   2 +-
 pkgs/data/misc/nixos-artwork/default.nix      |  24 +----
 pkgs/data/misc/nixos-artwork/wallpapers.nix   | 100 ++++++++++++++++++
 6 files changed, 108 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/data/misc/nixos-artwork/wallpapers.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 5f99c2bcf1f..c043884f8e0 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -35,10 +35,10 @@ let
      chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
      cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
        [org.gnome.desktop.background]
-       picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
+       picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png'
 
        [org.gnome.desktop.screensaver]
-       picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
+       picture-uri='${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png'
 
        ${cfg.extraGSettingsOverrides}
      EOF
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 256bfb9ce3f..1733f2fd39b 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -111,7 +111,7 @@ in
 
       background = mkOption {
         type = types.str;
-        default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
+        default = "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png";
         description = ''
           The background image or color to use.
         '';
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index cf47aed9fa9..57a4b63e4b8 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -489,7 +489,7 @@ in
           sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
         }
         # GRUB 1.97 doesn't support gzipped XPMs.
-        else "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png");
+        else "${pkgs.nixos-artwork.wallpapers.gnome-dark}/share/artwork/gnome/Gnome_Dark.png");
     }
 
     (mkIf cfg.enable {
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 6dce6f407cd..85d31334d6b 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -221,7 +221,7 @@ let
                 docbook5_xsl
                 unionfs-fuse
                 ntp
-                nixos-artwork
+                nixos-artwork.wallpapers.gnome-dark
                 perlPackages.XMLLibXML
                 perlPackages.ListCompare
 
diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix
index b35a96fff82..71fe32c1066 100644
--- a/pkgs/data/misc/nixos-artwork/default.nix
+++ b/pkgs/data/misc/nixos-artwork/default.nix
@@ -1,23 +1,5 @@
-{ stdenv, fetchurl }:
+{ callPackage }:
 
-stdenv.mkDerivation {
-  name = "nixos-artwork-2015-02-27";
-  # Remember to check the default lightdm wallpaper when updating
-
-  GnomeDark = fetchurl {
-    url = https://raw.githubusercontent.com/NixOS/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
-    sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";
-  };
-
-  unpackPhase = "true";
-
-  installPhase = ''
-    mkdir -p $out/share/artwork/gnome
-    ln -s $GnomeDark $out/share/artwork/gnome/Gnome_Dark.png
-  '';
-  
-  meta = with stdenv.lib; {
-    homepage = https://github.com/NixOS/nixos-artwork;
-    platforms = platforms.all;
-  };
+rec {
+  wallpapers = callPackage ./wallpapers.nix { };
 }
diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix
new file mode 100644
index 00000000000..28bf0d40b39
--- /dev/null
+++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix
@@ -0,0 +1,100 @@
+{ stdenv, fetchurl }:
+
+let
+  mkNixBackground = { name, src, description } @ attrs:
+
+    stdenv.mkDerivation {
+      inherit name src;
+
+      unpackPhase = "true";
+
+      installPhase = ''
+        mkdir -p $out/share/artwork/gnome
+        ln -s $src $out/share/artwork/gnome/
+      '';
+
+      meta = with stdenv.lib; {
+        inherit description;
+        homepage = https://github.com/NixOS/nixos-artwork;
+        license = licenses.free;
+        platforms = platforms.all;
+      };
+    };
+
+in
+
+{
+
+  gnome-dark = mkNixBackground {
+    name = "gnome-dark-2015-02-27";
+    description = "Gnome Dark background for Nix";
+    src = fetchurl {
+      url = https://raw.githubusercontent.com/Nix/nixos-artwork/7ece5356398db14b5513392be4b31f8aedbb85a2/gnome/Gnome_Dark.png;
+      sha256 = "0c7sl9k4zdjwvdz3nhlm8i4qv4cjr0qagalaa1a438jigixx27l7";
+    };
+  };
+
+  mosaic-blue = mkNixBackground {
+    name = "mosaic-blue-2016-02-19";
+    description = "Mosaic blue background for Nix";
+    src = fetchurl {
+      url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png;
+      sha256 = "1cbcssa8qi0giza0k240w5yy4yb2bhc1p1r7pw8qmziprcmwv5n5";
+    };
+  };
+
+  simple-blue = mkNixBackground {
+    name = "simple-blue-2016-02-19";
+    description = "Simple blue background for Nix";
+    src = fetchurl {
+      url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png;
+      sha256 = "1llr175m454aqixxwbp3kb5qml2hi1kn7ia6lm7829ny6y7xrnms";
+    };
+  };
+
+  simple-dark-gray = mkNixBackground {
+    name = "simple-dark-gray-2016-02-19";
+    description = "Simple dark gray background for Nix";
+    src = fetchurl {
+      url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png;
+      sha256 = "1282cnqc5qynp0q9gdll7bgpw23yp5bhvaqpar59ibkh3iscg8i5";
+    };
+  };
+
+  simple-light-gray = mkNixBackground {
+    name = "simple-light-gray-2016-02-19";
+    description = "Simple light gray background for Nix";
+    src = fetchurl {
+      url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png;
+      sha256 = "0i6d0xv1nzrv7na9hjrgzl3jrwn81vnprnq2pxyznlxbjcgkjnk2";
+    };
+  };
+
+  simple-red = mkNixBackground {
+    name = "simple-red-2016-02-19";
+    description = "Simple red background for Nix";
+    src = fetchurl {
+      url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png;
+      sha256 = "16drprsi3q8xbxx3bxp54yld04c4lq6jankw8ww1irg7z61a6wjs";
+    };
+  };
+
+  stripes-logo = mkNixBackground {
+    name = "stripes-logo-2016-02-19";
+    description = "Stripes logo background for Nix";
+    src = fetchurl {
+      url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png;
+      sha256 = "0cqjkgp30428c1yy8s4418k4qz0ycr6fzcg4rdi41wkh5g1hzjnl";
+    };
+  };
+
+  stripes = mkNixBackground {
+    name = "stripes-2016-02-19";
+    description = "Stripes background for Nix";
+    src = fetchurl {
+      url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png;
+      sha256 = "116337wv81xfg0g0bsylzzq2b7nbj6hjyh795jfc9mvzarnalwd3";
+    };
+  };
+
+}
-- 
GitLab


From 44a9f37ba89de61a09b40c990472a409845d0850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 7 Jun 2017 23:30:40 +0200
Subject: [PATCH 0478/1490] libretro: add parallel-n64 core

---
 pkgs/misc/emulators/retroarch/cores.nix | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 15 insertions(+)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 79dc382c92d..7256120aa92 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -249,6 +249,20 @@ in
     buildPhase = "cd libretro && make";
   };
 
+  parallel-n64 = (mkLibRetroCore rec {
+    core = "parallel-n64";
+    src = fetchRetro {
+      repo = core;
+      rev = "3276db27547bf7ca85896427f0b82d4658694d88";
+      sha256 = "19396v50azrb52ifjk298zgcbxn8dvfvp6zwrnzsk6mp8ff7qcqw";
+    };
+    description = "Parallel Mupen64plus rewrite for libretro.";
+
+    extraBuildInputs = [ mesa libpng ];
+  }).override {
+    buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}";
+  };
+
   picodrive = (mkLibRetroCore rec {
     core = "picodrive";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a6b76580ec..16f324c7669 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16471,6 +16471,7 @@ with pkgs;
       ++ optional (cfg.enableMGBA or false) mgba
       ++ optional (cfg.enableMupen64Plus or false) mupen64plus
       ++ optional (cfg.enableNestopia or false) nestopia
+      ++ optional (cfg.enableParallelN64 or false) parallel-n64
       ++ optional (cfg.enablePicodrive or false) picodrive
       ++ optional (cfg.enablePrboom or false) prboom
       ++ optional (cfg.enablePPSSPP or false) ppsspp
-- 
GitLab


From a997f4d2ba51e749257a193d82c2c88593f1b5ae Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 7 Jun 2017 18:47:39 -0300
Subject: [PATCH 0479/1490] flat-plat: 20170515 -> 20170605

---
 pkgs/misc/themes/flat-plat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix
index b858dfc2c5f..3c7882e8f94 100644
--- a/pkgs/misc/themes/flat-plat/default.nix
+++ b/pkgs/misc/themes/flat-plat/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "flat-plat-gtk-theme-${version}";
-  version = "20170515";
+  version = "20170605";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "Flat-Plat";
     rev = "v${version}";
-    sha256 = "0z0l9ch6symcjhbfkj1q5i46ajbn7l7slhjgrcjm0ppqh05xc4y7";
+    sha256 = "1vcd6mkkfk9a1n5hwpdigvsdsfd8df83kc94w53rs7gw9pqfygya";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 ];
-- 
GitLab


From 02aa3264f5f8301648ff5b0dc229b30f5c4221f3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 8 Jun 2017 01:44:31 +0200
Subject: [PATCH 0480/1490] slop: 4.1.16 -> 6.3.41

---
 pkgs/tools/misc/slop/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index 800fad3b564..b668b7af0d4 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -1,24 +1,28 @@
-{ stdenv, fetchurl, cmake, gengetopt, libX11, libXext, cppcheck}:
+{ stdenv, fetchFromGitHub, cmake
+, glm, mesa, gengetopt, libX11, libXext, libXrender, cppcheck}:
 
 stdenv.mkDerivation rec {
   name = "slop-${version}";
-  version = "4.1.16";
+  version = "6.3.41";
 
-  src = fetchurl {
-    url = "https://github.com/naelstrof/slop/archive/v${version}.tar.gz";
-    sha256 = "0679ax0jr97x91hmp9qrspdka8cvl3xa77z92k4qgicbnb6hr7y2";
+  src = fetchFromGitHub {
+    owner = "naelstrof";
+    repo = "slop";
+    rev = "v${version}";
+    sha256 = "051w2hcpz4qmvy7bmnzv7llxr2jbcpfxdadlzr2cidr323cann27";
   };
 
-  buildInputs = [ cmake gengetopt libX11 libXext ]
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ glm mesa gengetopt libX11 libXext libXrender ]
                 ++ stdenv.lib.optional doCheck cppcheck;
 
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/naelstrof/slop;
+    inherit (src.meta) homepage;
     description = "Queries a selection from the user and prints to stdout";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with maintainers; [ mbakke ];
+    maintainers = with maintainers; [ primeos mbakke ];
   };
 }
-- 
GitLab


From a7450098d405cc4ad60756b325f52ee960bcac22 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 8 Jun 2017 01:51:34 +0200
Subject: [PATCH 0481/1490] maim: 3.4.47 -> 5.4.63

---
 pkgs/tools/graphics/maim/default.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index fb674bc8d80..2a8255e3744 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, cmake, gengetopt, imlib2, libXrandr, libXfixes }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, zlib, libpng, libjpeg
+, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop }:
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "3.4.47";
+  version = "5.4.63";
 
-  src = fetchurl {
-    url = "https://github.com/naelstrof/maim/archive/v${version}.tar.gz";
-    sha256 = "0kfp7k55bxc5h6h0wv8bwmsc5ny66h9ra2z4dzs4yzszq16544pv";
+  src = fetchFromGitHub {
+    owner = "naelstrof";
+    repo = "maim";
+    rev = "v${version}";
+    sha256 = "16jl62hzrq1kciqwr9s3bxgcf9yz42kiwc5abkay1yd0vfcx200i";
   };
 
-  buildInputs = [ cmake gengetopt imlib2 libXrandr libXfixes ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs =
+    [ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr
+      libXcomposite slop ];
 
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/naelstrof/maim;
+    inherit (src.meta) homepage;
     description = "A command-line screenshot utility";
     longDescription = ''
       maim (make image) takes screenshots of your desktop. It has options to
@@ -23,6 +30,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with maintainers; [ mbakke ];
+    maintainers = with maintainers; [ primeos mbakke ];
   };
 }
-- 
GitLab


From 3ac67c148235a0f4a98e4ef68266a6c47fb9fc12 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Wed, 7 Jun 2017 17:53:20 -0700
Subject: [PATCH 0482/1490] fzf: 0.16.7 -> 0.16.8

---
 pkgs/tools/misc/fzf/default.nix |  4 +--
 pkgs/tools/misc/fzf/deps.nix    | 61 ++++++++++++++++++++++++++++-----
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index e1e998b7b56..55f36b5e446 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "fzf-${version}";
-  version = "0.16.7";
+  version = "0.16.8";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "11ka5n7mrm5pb9riah28zyshvfz2svm4wn6fbama39yp6sc01x23";
+    sha256 = "0d0fcv07pl2vvj9ql84rmy1kd0zg680chsfapm0iw3vssxqkm9zq";
   };
 
   outputs = [ "bin" "out" "man" ];
diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix
index 289ea9f11ae..7622a5f7b3b 100644
--- a/pkgs/tools/misc/fzf/deps.nix
+++ b/pkgs/tools/misc/fzf/deps.nix
@@ -1,28 +1,55 @@
 # This file was generated by go2nix.
 [
   {
-    goPackagePath = "github.com/junegunn/go-isatty";
+    goPackagePath = "github.com/gdamore/encoding";
     fetch = {
       type = "git";
-      url = "https://github.com/junegunn/go-isatty";
+      url = "https://github.com/gdamore/encoding";
+      rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
+      sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
+    };
+  }
+  {
+    goPackagePath = "github.com/gdamore/tcell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gdamore/tcell";
+      rev = "44772c121bb7838819d3ba4a7e84c0c2d617328e";
+      sha256 = "1l6yhy2bqckanjvixzvslz6qjjl5s0ciqf9hvk6625a7kfx030i6";
+    };
+  }
+  {
+    goPackagePath = "github.com/lucasb-eyer/go-colorful";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lucasb-eyer/go-colorful";
+      rev = "c900de9dbbc73129068f5af6a823068fc5f2308c";
+      sha256 = "0h6dkm5cvnlibngdhkqq7dh8ql8fjzfxn9xqpl3nv10rfwqdk80h";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
       rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
       sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
     };
   }
   {
-    goPackagePath = "github.com/junegunn/go-runewidth";
+    goPackagePath = "github.com/mattn/go-runewidth";
     fetch = {
       type = "git";
-      url = "https://github.com/junegunn/go-runewidth";
+      url = "https://github.com/mattn/go-runewidth";
       rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50";
       sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv";
     };
   }
   {
-    goPackagePath = "github.com/junegunn/go-shellwords";
+    goPackagePath = "github.com/mattn/go-shellwords";
     fetch = {
       type = "git";
-      url = "https://github.com/junegunn/go-shellwords";
+      url = "https://github.com/mattn/go-shellwords";
       rev = "02e3cf038dcea8290e44424da473dd12be796a8a";
       sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
     };
@@ -32,8 +59,26 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "abc5fa7ad02123a41f02bf1391c9760f7586e608";
-      sha256 = "1kdfbz46jnpm2hip79db6jvw5m4z4vh7x7rr798mzqdn6fsad7jb";
+      rev = "e1a4589e7d3ea14a3352255d04b6f1a418845e5e";
+      sha256 = "1w90z8r4v96rqx723shjgl8dis12bfmihila20fxid11m8digk5h";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "b90f89a1e7a9c1f6b918820b3daa7f08488c8594";
+      sha256 = "1bnvvk2z6wlmh39wza9cdf81nbyjfssdh86iywnnpxa7n9lg9dxq";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "4ee4af566555f5fbe026368b75596286a312663a";
+      sha256 = "1zybf6nd47fr9vb587yvmzhmkzf2p58g9q5bz4q5mzpnz22ski3a";
     };
   }
 ]
-- 
GitLab


From 4f4ba1186e05b95e452ef65ad73525dc83daefd9 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Thu, 8 Jun 2017 13:26:37 +0900
Subject: [PATCH 0483/1490] pythonPackages.Fabric: 1.10.2 -> 1.13.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b54f34b9133..55465ddc732 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6616,10 +6616,10 @@ in {
 
   Fabric = buildPythonPackage rec {
     name = "Fabric-${version}";
-    version = "1.10.2";
+    version = "1.13.2";
     src = pkgs.fetchurl {
       url = "mirror://pypi/F/Fabric/${name}.tar.gz";
-      sha256 = "0nikc05iz1fx2c9pvxrhrs819cpmg566azm99450yq2m8qmp1cpd";
+      sha256 = "0k944dxr41whw7ib6380q9x15wyskx7fqni656icdn8rzshn9bwq";
     };
     disabled = isPy3k;
     doCheck = (!isPyPy);  # https://github.com/fabric/fabric/issues/11891
-- 
GitLab


From a8b9b9b0d8e1bc62e5aac164f55a69e6d08db4d2 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Thu, 8 Jun 2017 14:16:40 +0900
Subject: [PATCH 0484/1490] pythonPackages.Theano: 0.8.1 -> 0.9.0

---
 .../python-modules/Theano/theano-without-cuda/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix
index 6efa945b0e6..90255407002 100644
--- a/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix
+++ b/pkgs/development/python-modules/Theano/theano-without-cuda/default.nix
@@ -12,13 +12,13 @@
 }:
 
 buildPythonPackage rec {
-  name = "Theano-0.8.2";
+  name = "Theano-0.9.0";
 
   disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
 
   src = fetchurl {
     url = "mirror://pypi/T/Theano/${name}.tar.gz";
-    sha256 = "7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930";
+    sha256 = "05xwg00da8smkvkh6ywbywqzj8dw7x840jr74wqhdy9icmqncpbl";
   };
 
   #preCheck = ''
-- 
GitLab


From 0576bda744c4d17eee26d8e056937529f7e04e04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20J=C3=A4ger?= <jger.tm@gmail.com>
Date: Wed, 7 Jun 2017 23:20:10 -0700
Subject: [PATCH 0485/1490] vagrant: against libffi (#26440)

* Link vagrant against libffi

Vagrant requires libffi to run
with (vagrant-fsnotify)[https://github.com/adrienkohlbecker/vagrant-fsnotify].

* vagrant: nitpick
---
 pkgs/development/tools/vagrant/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 557d1fde79d..8d86c96e4bf 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
-, libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }:
+, libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }:
 
 let
   version = "1.9.5";
@@ -96,8 +96,10 @@ in stdenv.mkDerivation rec {
     ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
 
     # ruby libs
-    rm -rf opt/vagrant/embedded/lib
-    ln -s ${ruby}/lib opt/vagrant/embedded/lib
+    rm -rf opt/vagrant/embedded/lib/*
+    for lib in ${ruby}/lib/*; do
+      ln -s $lib opt/vagrant/embedded/lib/''${lib##*/}
+    done
 
     # libiconv: iconv
     rm opt/vagrant/embedded/bin/iconv
@@ -114,6 +116,9 @@ in stdenv.mkDerivation rec {
     ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin
     ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin
 
+    # libffi
+    ln -s ${libffi}/lib/libffi.so.6 opt/vagrant/embedded/lib/libffi.so.6
+
     mkdir -p "$out"
     cp -r opt "$out"
     cp -r usr/bin "$out"
-- 
GitLab


From dffbe98dd696fe3579c9ce430524cce689d85508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 8 Jun 2017 08:36:59 +0100
Subject: [PATCH 0486/1490] buck: make propagatedBuildInputs runtime deps

---
 .../tools/build-managers/buck/default.nix     | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index 020750393cd..dadea794466 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -1,6 +1,8 @@
-  { stdenv, pkgs, fetchFromGitHub, fetchgit, jdk, ant, python2, watchman, unzip, bash }:
+{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, jre, makeWrapper }:
 
-stdenv.mkDerivation rec {
+
+let
+in stdenv.mkDerivation rec {
   name = "buck-${version}";
   version = "v2017.05.31.01";
 
@@ -14,27 +16,23 @@ stdenv.mkDerivation rec {
   patches = [ ./pex-mtime.patch ];
 
   postPatch = ''
-    for f in $(grep -l -r '/bin/bash'); do
-      substituteInPlace "$f" --replace '/bin/bash' '${bash}/bin/bash'
-    done
+    grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g"
   '';
 
-  buildInputs = [ jdk ant ];
-
-  propagatedBuildInputs = [ python2 watchman pkgs.python27Packages.pywatchman ];
+  buildInputs = [ jdk ant python2 watchman python2Packages.pywatchman ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  buildPhase =
-    ''
-      ant
-      ./bin/buck --version
-      ./bin/buck build buck
-    '';
+  buildPhase = ''
+    ant
+    ./bin/buck build buck
+  '';
 
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      cp  buck-out/gen/programs/buck.pex $out/bin/buck
-    '';
+  installPhase = ''
+    install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck
+    wrapProgram $out/bin/buck \
+      --prefix PYTHONPATH : $PYTHONPATH \
+      --prefix PATH : "${stdenv.lib.makeBinPath [jre watchman]}"
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://buckbuild.com/;
-- 
GitLab


From 96f4cac65901256c3a3388dbe491de30f65543c7 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sat, 3 Jun 2017 22:20:20 +0200
Subject: [PATCH 0487/1490] erlang: Move all BEAM packages into beam-packages.

This applies to Erlang, Elixir and LFE packages.

beam-packages provides interpreters and packages sets separately. This
is in preparation of generalizing BEAM interpreters definitions.
---
 pkgs/top-level/all-packages.nix  | 103 +++++--------------------------
 pkgs/top-level/beam-packages.nix |  99 +++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 87 deletions(-)
 create mode 100644 pkgs/top-level/beam-packages.nix

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcf644ac8dd..641fbb125b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5949,93 +5949,22 @@ with pkgs;
 
   clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
 
-  erlangR16 = callPackage ../development/interpreters/erlang/R16.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-  };
-  erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    odbcSupport = true;
-  };
-  erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-  };
-  erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    odbcSupport = true;
-  };
-  erlangR17 = callPackage ../development/interpreters/erlang/R17.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-  };
-  erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    odbcSupport = true;
-  };
-  erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    javacSupport = true;
-  };
-  erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    javacSupport = true; odbcSupport = true;
-  };
-  erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    wxGTK = wxGTK30;
-  };
-  erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    wxGTK = wxGTK30;
-    odbcSupport = true;
-  };
-  erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    wxGTK = wxGTK30;
-    javacSupport = true;
-  };
-  erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    wxGTK = wxGTK30;
-    javacSupport = true; odbcSupport = true;
-  };
-  erlangR19 = callPackage ../development/interpreters/erlang/R19.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    wxGTK = wxGTK30;
-  };
-  erlangR19_odbc = callPackage ../development/interpreters/erlang/R19.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    wxGTK = wxGTK30;
-    odbcSupport = true;
-  };
-  erlangR19_javac = callPackage ../development/interpreters/erlang/R19.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    wxGTK = wxGTK30;
-    javacSupport = true;
-  };
-  erlangR19_odbc_javac = callPackage ../development/interpreters/erlang/R19.nix {
-    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    wxGTK = wxGTK30;
-    javacSupport = true; odbcSupport = true;
-  };
-  erlang = erlangR18;
-  erlang_odbc = erlangR18_odbc;
-  erlang_javac = erlangR18_javac;
-  erlang_odbc_javac = erlangR18_odbc_javac;
-
-  rebar = callPackage ../development/tools/build-managers/rebar { };
-  rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; };
-  rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; };
-  hexRegistrySnapshot = callPackage ../development/beam-modules/hex-registry-snapshot.nix { };
-  fetchHex = callPackage ../development/beam-modules/fetch-hex.nix { };
-
-  beamPackages = callPackage ../development/beam-modules { };
-  hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { };
-  cuter = callPackage ../development/tools/erlang/cuter { };
-
-  relxExe = callPackage ../development/tools/erlang/relx-exe {};
-
-  elixir = callPackage ../development/interpreters/elixir { debugInfo = true; };
-
-  lfe = callPackage ../development/interpreters/lfe { };
+  beam = callPackage ./beam-packages.nix { };
+
+  inherit (beam.interpreters)
+    erlang erlang_odbc erlang_javac erlang_odbc_javac
+    elixir
+    lfe
+    erlangR16 erlangR16_odbc
+    erlang_basho_R16B02 erlang_basho_R16B02_odbc
+    erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac
+    erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac
+    erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac;
+
+  inherit (beam.packages)
+    rebar rebar3-open rebar3
+    hexRegistrySnapshot fetchHex beamPackages
+    hex2nix cuter relxExe;
 
   groovy = callPackage ../development/interpreters/groovy { };
 
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
new file mode 100644
index 00000000000..cd40192a3a5
--- /dev/null
+++ b/pkgs/top-level/beam-packages.nix
@@ -0,0 +1,99 @@
+{ pkgs, stdenv, callPackage, wxGTK30, darwin }:
+
+rec {
+
+  interpreters = rec {
+
+    erlang = erlangR18;
+    erlang_odbc = erlangR18_odbc;
+    erlang_javac = erlangR18_javac;
+    erlang_odbc_javac = erlangR18_odbc_javac;
+
+    erlangR16 = callPackage ../development/interpreters/erlang/R16.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    };
+
+    erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      odbcSupport = true;
+    };
+    erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    };
+    erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      odbcSupport = true;
+    };
+    erlangR17 = callPackage ../development/interpreters/erlang/R17.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    };
+    erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      odbcSupport = true;
+    };
+    erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      javacSupport = true;
+    };
+    erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      javacSupport = true; odbcSupport = true;
+    };
+    erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      wxGTK = wxGTK30;
+    };
+    erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      wxGTK = wxGTK30;
+      odbcSupport = true;
+    };
+    erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      wxGTK = wxGTK30;
+      javacSupport = true;
+    };
+    erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      wxGTK = wxGTK30;
+      javacSupport = true; odbcSupport = true;
+    };
+    erlangR19 = callPackage ../development/interpreters/erlang/R19.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      wxGTK = wxGTK30;
+    };
+    erlangR19_odbc = callPackage ../development/interpreters/erlang/R19.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      wxGTK = wxGTK30;
+      odbcSupport = true;
+    };
+    erlangR19_javac = callPackage ../development/interpreters/erlang/R19.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      wxGTK = wxGTK30;
+      javacSupport = true;
+    };
+    erlangR19_odbc_javac = callPackage ../development/interpreters/erlang/R19.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      wxGTK = wxGTK30;
+      javacSupport = true; odbcSupport = true;
+    };
+
+    elixir = callPackage ../development/interpreters/elixir { debugInfo = true; };
+
+    lfe = callPackage ../development/interpreters/lfe { };
+  };
+
+  packages = rec {
+    rebar = callPackage ../development/tools/build-managers/rebar { };
+    rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; };
+    rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; };
+    hexRegistrySnapshot = callPackage ../development/beam-modules/hex-registry-snapshot.nix { };
+    fetchHex = callPackage ../development/beam-modules/fetch-hex.nix { };
+
+    beamPackages = callPackage ../development/beam-modules { };
+    hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { };
+    cuter = callPackage ../development/tools/erlang/cuter { };
+
+    relxExe = callPackage ../development/tools/erlang/relx-exe {};
+  };
+}
-- 
GitLab


From 3426c88bff6988056163f147e06dcfac2556b588 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sun, 4 Jun 2017 20:26:37 +0200
Subject: [PATCH 0488/1490] erlang: Generalize Erlang/OTP derivations.

Switch official Erlang versions to use a common builder.
---
 pkgs/development/beam-modules/lib.nix         |  21 +++
 pkgs/development/interpreters/erlang/R16.nix  |  57 +-------
 .../interpreters/erlang/R16B02-8-basho.nix    |   4 +
 pkgs/development/interpreters/erlang/R17.nix  |  74 +---------
 pkgs/development/interpreters/erlang/R18.nix  | 103 +-------------
 pkgs/development/interpreters/erlang/R19.nix  |  99 +------------
 .../interpreters/erlang/generic-builder.nix   | 132 ++++++++++++++++++
 pkgs/top-level/beam-packages.nix              |  76 +++++-----
 8 files changed, 212 insertions(+), 354 deletions(-)
 create mode 100644 pkgs/development/beam-modules/lib.nix
 create mode 100644 pkgs/development/interpreters/erlang/generic-builder.nix

diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
new file mode 100644
index 00000000000..2d0eef09563
--- /dev/null
+++ b/pkgs/development/beam-modules/lib.nix
@@ -0,0 +1,21 @@
+{ pkgs }:
+
+rec {
+
+  /* Uses generic-builder to evaluate provided drv containing OTP-version specific data.
+
+  drv: package containing version-specific args;
+  builder: generic builder for all Erlang versions;
+  gargs: arguments passed to the generic-builder, used mostly to customize dependencies;
+  args: arguments merged into version-specific args, used mostly to enable/disable high-level OTP
+    features, like ODBC or WX support;
+
+  Please note that "mkDerivation" defined here is the one called from R16.nix and similar files.
+  */
+  callErlang = drv: gargs: args: pkgs.callPackage drv (
+    let builder = pkgs.callPackage ../../development/interpreters/erlang/generic-builder.nix gargs;
+    in {
+      mkDerivation = a: builder (a // args);
+    });
+
+}
diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix
index e2e0151de37..3ac37b5bde1 100644
--- a/pkgs/development/interpreters/erlang/R16.nix
+++ b/pkgs/development/interpreters/erlang/R16.nix
@@ -1,17 +1,6 @@
-{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
-, gnused, gawk, makeWrapper
-, odbcSupport ? false, unixODBC ? null
-, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null
-, enableDebugInfo ? false
-, Carbon ? null, Cocoa ? null }:
+{ mkDerivation, fetchurl }:
 
-assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
-assert odbcSupport -> unixODBC != null;
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}";
+mkDerivation rec {
   version = "16B03-1";
 
   src = fetchurl {
@@ -19,28 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "1rvyfh22g1fir1i4xn7v2md868wcmhajwhfsq97v7kn5kd2m7khp";
   };
 
-  debugInfo = enableDebugInfo;
-
-  buildInputs =
-    [ perl gnum4 ncurses openssl makeWrapper
-    ] ++ optionals wxSupport [ mesa wxGTK xorg.libX11 ]
-      ++ optional odbcSupport unixODBC
-      ++ optionals stdenv.isDarwin [ Carbon Cocoa ];
-
-  # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
   prePatch = ''
-    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
+    sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure
   '';
 
-  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
-
   preConfigure = ''
     export HOME=$PWD/../
     sed -e s@/bin/pwd@pwd@g -i otp_build
   '';
 
-  configureFlags= "--with-ssl=${openssl.dev} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}";
-
+  # Do not install docs, instead use prebuilt versions.
+  installTargets = "install";
   postInstall = let
     manpages = fetchurl {
       url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz";
@@ -55,29 +33,4 @@ stdenv.mkDerivation rec {
       ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
     done
   '';
-
-  # Some erlang bin/ scripts run sed and awk
-  postFixup = ''
-    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    homepage = "http://www.erlang.org/";
-    description = "Programming language used for massively scalable soft real-time systems";
-
-    longDescription = ''
-      Erlang is a programming language used to build massively scalable
-      soft real-time systems with requirements on high availability.
-      Some of its uses are in telecoms, banking, e-commerce, computer
-      telephony and instant messaging. Erlang's runtime system has
-      built-in support for concurrency, distribution and fault
-      tolerance.
-    '';
-
-    platforms = platforms.unix;
-    maintainers = [ maintainers.the-kenny ];
-  };
 }
diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
index 80f524019df..fe24ad64bf8 100644
--- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
+++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
@@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in '';
 
+  postPatch = ''
+    patchSheBangs make
+  '';
+
   preConfigure = ''
     export HOME=$PWD/../
     export LANG=C
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 0869285d496..3d78c6ee242 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -1,26 +1,6 @@
-{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
-, gnused, gawk, makeWrapper
-, Carbon, Cocoa
-, odbcSupport ? false, unixODBC ? null
-, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
-, javacSupport ? false, openjdk ? null
-, enableHipe ? true
-, enableDebugInfo ? false
-, enableDirtySchedulers ? false
-}:
+{ mkDerivation, fetchurl }:
 
-assert wxSupport -> (if stdenv.isDarwin
-  then wxmac != null
-  else mesa != null && wxGTK != null && xorg != null);
-
-assert odbcSupport -> unixODBC != null;
-assert javacSupport ->  openjdk != null;
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
-  + "${optionalString javacSupport "-javac"}";
+mkDerivation rec {
   version = "17.5";
 
   src = fetchurl {
@@ -28,36 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "0x34hj1a4j3rphqdaapdld7la4sqiqillamcz06wac0vk0684a1w";
   };
 
-  buildInputs =
-    [ perl gnum4 ncurses openssl makeWrapper
-    ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
-      ++ optional odbcSupport unixODBC
-      ++ optional javacSupport openjdk
-      ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
-
-  patchPhase = ''
-    # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
-    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
-
+  prePatch = ''
     sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure
   '';
 
-  debugInfo = enableDebugInfo;
-
   preConfigure = ''
     export HOME=$PWD/../
     sed -e s@/bin/pwd@pwd@g -i otp_build
   '';
 
-  configureFlags= [
-    "--with-ssl=${openssl.dev}"
-  ] ++ optional enableHipe "--enable-hipe"
-    ++ optional enableDirtySchedulers "--enable-dirty-schedulers"
-    ++ optional wxSupport "--enable-wx"
-    ++ optional odbcSupport "--with-odbc=${unixODBC}"
-    ++ optional javacSupport "--with-javac"
-    ++ optional stdenv.isDarwin "--enable-darwin-64bit";
-
+  # Do not install docs, instead use prebuilt versions.
+  installTargets = "install";
   postInstall = let
     manpages = fetchurl {
       url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz";
@@ -72,29 +33,4 @@ stdenv.mkDerivation rec {
       ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
     done
   '';
-
-  # Some erlang bin/ scripts run sed and awk
-  postFixup = ''
-    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    homepage = "http://www.erlang.org/";
-    description = "Programming language used for massively scalable soft real-time systems";
-
-    longDescription = ''
-      Erlang is a programming language used to build massively scalable
-      soft real-time systems with requirements on high availability.
-      Some of its uses are in telecoms, banking, e-commerce, computer
-      telephony and instant messaging. Erlang's runtime system has
-      built-in support for concurrency, distribution and fault
-      tolerance.
-    '';
-
-    platforms = platforms.unix;
-    maintainers = [ maintainers.the-kenny maintainers.sjmackenzie ];
-  };
 }
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index 1ed9bfbd70a..0d20ae662a5 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -1,113 +1,22 @@
-{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, perl, gnum4, ncurses, openssl
-, gnused, gawk, autoconf, libxslt, libxml2, makeWrapper
-, Carbon, Cocoa
-, odbcSupport ? false, unixODBC ? null
-, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
-, javacSupport ? false, openjdk ? null
-, enableHipe ? true
-, enableDebugInfo ? false
-, enableDirtySchedulers ? false
-}:
-
-assert wxSupport -> (if stdenv.isDarwin
-  then wxmac != null
-  else mesa != null && wxGTK != null && xorg != null);
-
-assert odbcSupport -> unixODBC != null;
-assert javacSupport ->  openjdk != null;
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
-  + "${optionalString javacSupport "-javac"}";
-  version = "18.3.4.4";
-
-  # Minor OTP releases are not always released as tarbals at
-  # http://erlang.org/download/ So we have to download from
-  # github. And for the same reason we can't use a prebuilt manpages
-  # tarball and need to build manpages ourselves.
-  src = fetchFromGitHub {
-    owner = "erlang";
-    repo = "otp";
-    rev = "OTP-${version}";
-    sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk";
-  };
-
-  buildInputs =
-    [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper
-    ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
-      ++ optional odbcSupport unixODBC
-      ++ optional javacSupport openjdk
-      ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
-
-  debugInfo = enableDebugInfo;
+{ mkDerivation, fetchurl }:
 
+let
   rmAndPwdPatch = fetchurl {
      url = "https://github.com/erlang/otp/commit/98b8650d22e94a5ff839170833f691294f6276d0.patch";
      sha256 = "0cd5pkqrigiqz6cyma5irqwzn0bi17k371k9vlg8ir31h3zmqfip";
   };
 
   envAndCpPatch = fetchurl {
-     url = "https://github.com/binarin/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch";
+     url = "https://github.com/erlang/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch";
      sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f";
   };
 
-  # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
-  prePatch = ''
-    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
-  '';
+in mkDerivation rec {
+  version = "18.3.4.4";
+  sha256 = "0wilm21yi9m3v6j26vc04hsa58cxca5z4q9yxx71hm81cbm1xbwk";
 
   patches = [
     rmAndPwdPatch
     envAndCpPatch
   ];
-
-  preConfigure = ''
-    ./otp_build autoconf
-  '';
-
-  configureFlags= [
-    "--with-ssl=${openssl.dev}"
-  ] ++ optional enableHipe "--enable-hipe"
-    ++ optional enableDirtySchedulers "--enable-dirty-schedulers"
-    ++ optional wxSupport "--enable-wx"
-    ++ optional odbcSupport "--with-odbc=${unixODBC}"
-    ++ optional javacSupport "--with-javac"
-    ++ optional stdenv.isDarwin "--enable-darwin-64bit";
-
-  # install-docs will generate and install manpages and html docs
-  # (PDFs are generated only when fop is available).
-  installTargets = "install install-docs";
-
-  postInstall = ''
-    ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
-  '';
-
-  # Some erlang bin/ scripts run sed and awk
-  postFixup = ''
-    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    homepage = "http://www.erlang.org/";
-    downloadPage = "http://www.erlang.org/download.html";
-    description = "Programming language used for massively scalable soft real-time systems";
-
-    longDescription = ''
-      Erlang is a programming language used to build massively scalable
-      soft real-time systems with requirements on high availability.
-      Some of its uses are in telecoms, banking, e-commerce, computer
-      telephony and instant messaging. Erlang's runtime system has
-      built-in support for concurrency, distribution and fault
-      tolerance.
-    '';
-
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ the-kenny sjmackenzie couchemar ];
-    license = licenses.asl20;
-  };
 }
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index 4b1e3f4cb2f..680111dbd77 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -1,101 +1,10 @@
-{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl
-, gnused, gawk, autoconf, libxslt, libxml2, makeWrapper
-, Carbon, Cocoa
-, odbcSupport ? false, unixODBC ? null
-, wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
-, javacSupport ? false, openjdk ? null
-, enableHipe ? true
-, enableDebugInfo ? false
-, enableDirtySchedulers ? false
-}:
+{ mkDerivation, fetchurl }:
 
-assert wxSupport -> (if stdenv.isDarwin
-  then wxmac != null
-  else mesa != null && wxGTK != null && xorg != null);
-
-assert odbcSupport -> unixODBC != null;
-assert javacSupport ->  openjdk != null;
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
-  + "${optionalString javacSupport "-javac"}";
+mkDerivation rec {
   version = "19.3";
-
-  # Minor OTP releases are not always released as tarbals at
-  # http://erlang.org/download/ So we have to download from
-  # github. And for the same reason we can't use a prebuilt manpages
-  # tarball and need to build manpages ourselves.
-  src = fetchFromGitHub {
-    owner = "erlang";
-    repo = "otp";
-    rev = "OTP-${version}";
-    sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86";
-  };
-
-  buildInputs =
-    [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper
-    ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
-      ++ optional odbcSupport unixODBC
-      ++ optional javacSupport openjdk
-      ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
-
-  debugInfo = enableDebugInfo;
+  sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86";
 
   prePatch = ''
-    substituteInPlace configure.in \
-      --replace '`sw_vers -productVersion`' '10.10'
-
-    # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
-    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
+    substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
   '';
-
-  preConfigure = ''
-    ./otp_build autoconf
-  '';
-
-  configureFlags= [
-    "--with-ssl=${openssl.dev}"
-  ] ++ optional enableHipe "--enable-hipe"
-    ++ optional enableDirtySchedulers "--enable-dirty-schedulers"
-    ++ optional wxSupport "--enable-wx"
-    ++ optional odbcSupport "--with-odbc=${unixODBC}"
-    ++ optional javacSupport "--with-javac"
-    ++ optional stdenv.isDarwin "--enable-darwin-64bit";
-
-  # install-docs will generate and install manpages and html docs
-  # (PDFs are generated only when fop is available).
-  installTargets = "install install-docs";
-
-  postInstall = ''
-    ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
-  '';
-
-  # Some erlang bin/ scripts run sed and awk
-  postFixup = ''
-    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    homepage = "http://www.erlang.org/";
-    downloadPage = "http://www.erlang.org/download.html";
-    description = "Programming language used for massively scalable soft real-time systems";
-
-    longDescription = ''
-      Erlang is a programming language used to build massively scalable
-      soft real-time systems with requirements on high availability.
-      Some of its uses are in telecoms, banking, e-commerce, computer
-      telephony and instant messaging. Erlang's runtime system has
-      built-in support for concurrency, distribution and fault
-      tolerance.
-    '';
-
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ yurrriq couchemar DerTim1 mdaiter ];
-    license = licenses.asl20;
-  };
 }
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
new file mode 100644
index 00000000000..0127bb933c4
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -0,0 +1,132 @@
+{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, autoconf, gawk, gnum4, gnused
+, libxml2, libxslt, ncurses, openssl, perl
+, openjdk ? null # javacSupport
+, unixODBC ? null # odbcSupport
+, mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
+}:
+
+{ version
+, sha256 ? null
+, rev ? "OTP-${version}"
+, src ? fetchFromGitHub { inherit rev sha256; owner = "erlang"; repo = "otp"; }
+, enableHipe ? true
+, enableDebugInfo ? false
+, javacSupport ? false, javacPackages ? [ openjdk ]
+, odbcSupport ? false, odbcPackages ? [ unixODBC ]
+, wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ]
+, preUnpack ? "", postUnpack ? ""
+, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
+, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""
+, buildPhase ? "", preBuild ? "", postBuild ? ""
+, installPhase ? "", preInstall ? "", postInstall ? ""
+, installTargets ? "install install-docs"
+, checkPhase ? "", preCheck ? "", postCheck ? ""
+, fixupPhase ? "", preFixup ? "", postFixup ? ""
+}:
+
+assert wxSupport -> (if stdenv.isDarwin
+  then wxmac != null
+  else mesa != null && wxGTK != null && xorg != null);
+
+assert odbcSupport -> unixODBC != null;
+assert javacSupport -> openjdk != null;
+
+let
+  inherit (stdenv.lib) optional optionals optionalAttrs optionalString;
+  wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;
+
+in stdenv.mkDerivation ({
+  name = "erlang-${version}"
+    + optionalString javacSupport "-javac"
+    + optionalString odbcSupport "-odbc";
+
+  inherit src version;
+
+  buildInputs = [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper ]
+    ++ optionals wxSupport wxPackages2
+    ++ optionals odbcSupport odbcPackages
+    ++ optionals javacSupport javacPackages
+    ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]);
+
+  debugInfo = enableDebugInfo;
+
+  # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
+  prePatch = ''
+    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
+
+    ${prePatch}
+  '';
+
+  postPatch = ''
+    patchShebangs make
+
+    ${postPatch}
+  '';
+
+  preConfigure = ''
+    ./otp_build autoconf
+  '';
+
+  configureFlags = [ "--with-ssl=${openssl.dev}" ]
+    ++ optional enableHipe "--enable-hipe"
+    ++ optional javacSupport "--with-javac"
+    ++ optional odbcSupport "--with-odbc=${unixODBC}"
+    ++ optional wxSupport "--enable-wx"
+    ++ optional stdenv.isDarwin "--enable-darwin-64bit";
+
+  # install-docs will generate and install manpages and html docs
+  # (PDFs are generated only when fop is available).
+
+  postInstall = ''
+    ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
+  '';
+
+  # Some erlang bin/ scripts run sed and awk
+  postFixup = ''
+    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
+    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.erlang.org/";
+    downloadPage = "http://www.erlang.org/download.html";
+    description = "Programming language used for massively scalable soft real-time systems";
+
+    longDescription = ''
+      Erlang is a programming language used to build massively scalable
+      soft real-time systems with requirements on high availability.
+      Some of its uses are in telecoms, banking, e-commerce, computer
+      telephony and instant messaging. Erlang's runtime system has
+      built-in support for concurrency, distribution and fault
+      tolerance.
+    '';
+
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ];
+    license = licenses.asl20;
+  };
+}
+// optionalAttrs (preUnpack != "")      { inherit preUnpack; }
+// optionalAttrs (postUnpack != "")     { inherit postUnpack; }
+// optionalAttrs (patches != [])        { inherit patches; }
+// optionalAttrs (patchPhase != "")     { inherit patchPhase; }
+// optionalAttrs (configureFlags != []) { inherit configureFlags; }
+// optionalAttrs (configurePhase != "") { inherit configurePhase; }
+// optionalAttrs (preConfigure != "")   { inherit preConfigure; }
+// optionalAttrs (postConfigure != "")  { inherit postConfigure; }
+// optionalAttrs (buildPhase != "")     { inherit buildPhase; }
+// optionalAttrs (preBuild != "")       { inherit preBuild; }
+// optionalAttrs (postBuild != "")      { inherit postBuild; }
+// optionalAttrs (checkPhase != "")     { inherit checkPhase; }
+// optionalAttrs (preCheck != "")       { inherit preCheck; }
+// optionalAttrs (postCheck != "")      { inherit postCheck; }
+// optionalAttrs (installPhase != "")   { inherit installPhase; }
+// optionalAttrs (installTargets != "") { inherit installTargets; }
+// optionalAttrs (preInstall != "")     { inherit preInstall; }
+// optionalAttrs (postInstall != "")    { inherit postInstall; }
+// optionalAttrs (fixupPhase != "")     { inherit fixupPhase; }
+// optionalAttrs (preFixup != "")       { inherit preFixup; }
+// optionalAttrs (postFixup != "")      { inherit postFixup; }
+)
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index cd40192a3a5..94f3028ddb3 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -1,85 +1,79 @@
 { pkgs, stdenv, callPackage, wxGTK30, darwin }:
 
 rec {
+  lib = import ../development/beam-modules/lib.nix { inherit pkgs; };
 
   interpreters = rec {
 
+    # R18 is the Default version.
     erlang = erlangR18;
     erlang_odbc = erlangR18_odbc;
     erlang_javac = erlangR18_javac;
     erlang_odbc_javac = erlangR18_odbc_javac;
 
-    erlangR16 = callPackage ../development/interpreters/erlang/R16.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    };
-
-    erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-      odbcSupport = true;
-    };
-    erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    };
-    erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    # These are standard Erlang versions, using the generic builder.
+    erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {} {};
+    erlangR16_odbc = lib.callErlang ../development/interpreters/erlang/R16.nix {} {
       odbcSupport = true;
     };
-    erlangR17 = callPackage ../development/interpreters/erlang/R17.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
-    };
-    erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {} {};
+    erlangR17_odbc = lib.callErlang ../development/interpreters/erlang/R17.nix {} {
       odbcSupport = true;
     };
-    erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlangR17_javac = lib.callErlang ../development/interpreters/erlang/R17.nix {} {
       javacSupport = true;
     };
-    erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlangR17_odbc_javac = lib.callErlang ../development/interpreters/erlang/R17.nix {} {
       javacSupport = true; odbcSupport = true;
     };
-    erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
       wxGTK = wxGTK30;
-    };
-    erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    } {};
+    erlangR18_odbc = lib.callErlang ../development/interpreters/erlang/R18.nix {
       wxGTK = wxGTK30;
+    } {
       odbcSupport = true;
     };
-    erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlangR18_javac = lib.callErlang ../development/interpreters/erlang/R18.nix {
       wxGTK = wxGTK30;
+    } {
       javacSupport = true;
     };
-    erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlangR18_odbc_javac = lib.callErlang ../development/interpreters/erlang/R18.nix {
       wxGTK = wxGTK30;
+    } {
       javacSupport = true; odbcSupport = true;
     };
-    erlangR19 = callPackage ../development/interpreters/erlang/R19.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
       wxGTK = wxGTK30;
-    };
-    erlangR19_odbc = callPackage ../development/interpreters/erlang/R19.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    } {};
+    erlangR19_odbc = lib.callErlang ../development/interpreters/erlang/R19.nix {
       wxGTK = wxGTK30;
+    } {
       odbcSupport = true;
     };
-    erlangR19_javac = callPackage ../development/interpreters/erlang/R19.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlangR19_javac = lib.callErlang ../development/interpreters/erlang/R19.nix {
       wxGTK = wxGTK30;
+    } {
       javacSupport = true;
     };
-    erlangR19_odbc_javac = callPackage ../development/interpreters/erlang/R19.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlangR19_odbc_javac = lib.callErlang ../development/interpreters/erlang/R19.nix {
       wxGTK = wxGTK30;
+    } {
       javacSupport = true; odbcSupport = true;
     };
 
-    elixir = callPackage ../development/interpreters/elixir { debugInfo = true; };
+    # Bash fork, using custom builder.
+    erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    };
+    erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
+      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+      odbcSupport = true;
+    };
 
+    # Other Beam languages.
+    elixir = callPackage ../development/interpreters/elixir { debugInfo = true; };
     lfe = callPackage ../development/interpreters/lfe { };
   };
 
-- 
GitLab


From 451de09f513aca784837902082729e4cc8eca4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 8 Jun 2017 12:10:44 +0100
Subject: [PATCH 0489/1490] autorandr: fix python shebang

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

diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix
index 8b0885eee07..b885b5ed09d 100644
--- a/pkgs/tools/misc/autorandr/default.nix
+++ b/pkgs/tools/misc/autorandr/default.nix
@@ -11,13 +11,11 @@ in
   stdenv.mkDerivation {
     name = "autorandr-${version}";
 
-    buildInputs = [ python wrapPython ];
-
-    phases = [ "unpackPhase" "installPhase" ];
+    buildInputs = [ python ];
 
     installPhase = ''
+      runHook preInstall
       make install TARGETS='autorandr' PREFIX=$out
-      wrapPythonProgramsIn $out/bin/autorandr $out
 
       make install TARGETS='bash_completion' DESTDIR=$out
 
@@ -35,6 +33,7 @@ in
         make install TARGETS='udev' PREFIX=$out DESTDIR=$out \
           UDEV_RULES_DIR=/etc/udev/rules.d
       ''}
+      runHook postInstall
     '';
 
     src = fetchFromGitHub {
-- 
GitLab


From a0afc4f0d19a0e5f18d2bb5729a40b4dd0d00da8 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 8 Jun 2017 15:33:24 +0200
Subject: [PATCH 0490/1490] firefox-*-bin: updates (#26462)

* firefox-beta-bin: 51.0b8 -> 54.0b13

* firefox-devedition-bin: init at 54.0b14

Firefox DevEdition became a new product of Mozilla and is "repackaged"
Firefox Beta with its own release channel and six weeks release cycle as
other channels. It is no longer being built on nightly basis

* updated the update.nix script to facilitata firefox-devedition-bin

* disabling automatic updates by pointing to non existing channel

* f firefoxWrapper looks for gtk3 attribute to wrap the executable gtk3 to wrap the binary with needed ``XDG_DATA_DIRS``
---
 .../browsers/firefox-bin/beta_sources.nix     | 758 +++++++-------
 .../browsers/firefox-bin/default.nix          |  14 +-
 .../firefox-bin/devedition_sources.nix        | 945 ++++++++++++++++++
 .../{sources.nix => release_sources.nix}      |   0
 .../browsers/firefox-bin/update.nix           |  17 +-
 pkgs/top-level/all-packages.nix               |  19 +
 6 files changed, 1376 insertions(+), 377 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
 rename pkgs/applications/networking/browsers/firefox-bin/{sources.nix => release_sources.nix} (100%)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index fec1665f8b7..0c4126a4add 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,925 +1,945 @@
 {
-  version = "51.0b8";
+  version = "54.0b13";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ach/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ach/firefox-54.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "c251fe3e50d7bb85a46e86afb9d041b161061e6718cbfe6114172a098f35eedaa2f221a3f7bcdb2ebe210a5ebb5cc33fb50b1dd04da5256cb32646678d722b28";
+      sha512 = "b76584a4027ae3c05b4350952bf231e1701c3f161355d86f028379a04cf7f3f1fcefd67736dfd2cbc02fffca670ea7e62b1729ba1647746da62dff30969d74dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/af/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/af/firefox-54.0b13.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "ff8af74fdf27e72169193a81e62b99ce831bc466e50ef2d843dda03894fe3cc764ba69021c839ee09ab48b7b3a6140f1ed01c045efb01f75342bcbc333158a49";
+      sha512 = "c8cfb40ba81947254a58dde6438a5e6eac9b4279701800353b8538ca74776fe09da4f6e5384d93a197bfbd3c88b30e3b56231aa4d9530c61da84a712d0ba0473";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/an/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/an/firefox-54.0b13.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "20b5965b70cc773eb2226608fef18efdc24fe22f2feea43f39fe9d09afcb89db15caa8149a908bbca3f26e8d6b4f3651d164fb97f2dd2ee67e33b8e43635871e";
+      sha512 = "072e89337c05b9dc4f82eb4746464cb19b897d3c4eda1f50c9d0c7d1d38e9c1b2301f9c0416ad26809c31e0bb5099872cc577540ce722ad5e54ca04ef3b7c003";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ar/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ar/firefox-54.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b1816f401757634f618e1d9929c2a341adfdfad42bcefa8673c7d8c511c46267054352558f3a83d399c68e7f80faa1c2cea519ac24618479828c37b4067f8e78";
+      sha512 = "4c63f391b072b5d33f61020dd2bd5f2fbaf644b0a411070297ecc31ea5c7059af373cc58d6b49e377ce6db239ef4df64f301612db0c45b118662178b750fb069";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/as/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/as/firefox-54.0b13.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "049a8f3782a34d8432204ef6119a2909ca4e6eba83f760c8f35f1be86595483e47823088e508a1389d68ee366e14431686db7edc44d1fd5934f887aaed85bc4d";
+      sha512 = "22e95dba78581460159f24130bda330557348516ea9442644055159a6c7cae3ad4529890676fdc43f8a8cd902d4a75fb06de50262db72fc1297e08d9e14e2d0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ast/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ast/firefox-54.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "b2c48f6009e01924e75d7671a819b4af51b87a3a08576812bc7f89b2273d047a3ca914147b519dcc50f1deb21acebeeebb05fc306fbbe016f12e3fbaa885bf16";
+      sha512 = "527ff1bd64649b475a863f3d3e40e900d40d5c1e5a404e0dcc2678e7708fd24dd0a68fa85f1f3cc8e23f12edac41530310d0f65e1eea390f5e01460c2ac90e0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/az/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/az/firefox-54.0b13.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "315e47d4e4d6d985f4390d8a40cb736ec871ecb30ab76db9235bb040eac9b73c3a1e709d783db2363c97f6ca91e3281c4c88e10c4d9fc62131fd8c105d7269ee";
+      sha512 = "c3184445a3a4cd205140a43adbd498571a0339175fc9ba05ebc2306fb37990095f4c66dba0eec1a121a7b5aafb6c3d6d5f5ff68485382ee61ad7ebfba190fd8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bg/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bg/firefox-54.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "b31bf59b6546741ab005c5ca11115f1557923f467e801f16049e83881deb8a8f6b775b425a8fc2a608b51170fa00a4b464c9e60e306267fb50b2144b23948613";
+      sha512 = "e1eb42e04be44f4b091fd6675af506c80098886a20be0b37eadbd907dc8925b1bbc0c99145417e16534d6a59f1f6ef718769819d9f79ebbfac22f05ba5ad95a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bn-BD/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bn-BD/firefox-54.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "5683955a4d1e678d9893554d9cc534a61f2cb0242e2ac068424eba238f1ce89e58692cdb35e43d58cdd71c0c0683a5d61920089ffd100416e6a2448ce43f2004";
+      sha512 = "9d09de31bb8207533a2e222a1fa8888f3a323046dbf8521f6cad0aaffc9d91ebe35b0ce766fa2b292d1058f370298f60479312a5f8c749bef5599c60e88777d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bn-IN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bn-IN/firefox-54.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "0220a226f53b7a99d123a1e72a6db88e726748c9d3e0ed46a51ab36b2ba5213dbf2cdef55b8a8892c97ee656905f01920563e344a412142993c719f15cb0bc43";
+      sha512 = "1656bdd3844c968d448fafffb7b1fa5994e8dc4a590f4b39965df095ca29a8914fa4f8dee1fea4a15b6c4716a6555841f4b9c72b432adc1b60b02f561cd3ef7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/br/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/br/firefox-54.0b13.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "046d7c42a294fe636cbdbd13da8fccb879595ebda6353ed91981ecae39f670f1650f33b1ce0d3705158a437a22a718d5d381bbc37583702253941abe25ebc477";
+      sha512 = "945f866e86a8ff5e6a8d2216abb3fef9a1a93b585599267f54a38b5acb0843c1cab5ecb4440f6277e7604fd4fe730b5d2b57b4708bc1639ad2adcc0e217ca716";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/bs/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bs/firefox-54.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "a2e0df77bdb46f501e2760df79589ebec8e1bfb85e07ddee1d89c797a34781efd57e1790127d6cb38199bbe01680e5b04208f2c06b22a9bc684c87042f825267";
+      sha512 = "cd555e3638139d6e36b59fbc72a53a4e233e33557c7000e9c308cc292d963d458261c0404d130353abd071e23927c11d8232add50b455063fb3c261faac35594";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ca/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ca/firefox-54.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "e8a4a37a55a882ce638e51ad5d4a08ac815fb5cd556d0e8db3982501ee2f9c0ec141132ffb0eebbdae47be78f74dec7fba730638c8ebe38ce82ecdcfb570adb6";
+      sha512 = "ffce1a6bba525cd67880f695f6c21b1078fe419ee32cb878519f5f36d4d403b5cd2dfc6f1d9ed02f4f38dd2f7404670f63b34484180137c6a597f407c24b638b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cak/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/cak/firefox-54.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "aefda93ce59fdf238c2b957e45463c6f75e511a4331596bafaa4e8a99139f17ad2facc22befcf2fbe105651e9b003447bb62c3c2c6ffe4681816baa400f68a6f";
+      sha512 = "e1d2750edd967f15a51af0daae4599f78add80211ddcfb13c7480ba696426e0e69da3bbd5331979aaf88ec6f611aa33c98f7924c1428e7cc37f2d9fb30c3ac6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cs/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/cs/firefox-54.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "9eeeab75b2963959db947165f46443f686760f655dedae4de3d174a340c88830fbfcc0fd1df23740e6abe6d7f4552f06630c93f28246ff907fe6eebc1437d943";
+      sha512 = "c8ca0cdea3742f5a18992c9743c994d9676bfd6765b458d0f13e03038f61a9add04b48f434c41fcacc67c303be2488e8833aaa8d8d68150e00e3ccd2affd6a0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/cy/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/cy/firefox-54.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "659ea6606bb307893448b0352c175761e6bae90246ce157eb2cb9373b923ffede18eb8526330391396f9998fdade7db135a54f8aa14c4f52daeb9cddc44f344e";
+      sha512 = "954ba8941fb42595fb05ee03ced136b1dfd3617c08d14042b63fc2e53984b71f490471e3e680bb67f2ee31ae72ca329198272b9c354681e1ad9fa6e12bd32b16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/da/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/da/firefox-54.0b13.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "22647561d07e92d82be5bcd2c5f2e7a08d6491ea582464f64a8ba686496b0267eab6c07db49ae189f996b8cac9d0c4c7789c3230003d05dbc5fa8319acabc4fb";
+      sha512 = "144d754470b59b95e3706516224e21c1c53b0d2260541cf4a4a2afdfc7af39dcd0ae97204e8558e29d627853e1667f2f0a337cd257d05409c355f96f9ffbb453";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/de/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/de/firefox-54.0b13.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "313446d8dd7764b98eba2284d71d8abb47568577f312718f02a73bdbee4938477ed407d3d638fee4dfacbb43d4125806c882e0c96cda43c9fc5b09e7fc6656d3";
+      sha512 = "1bbe368dc61546c4d2cfb09ba0d0b8414abbaff2a58ddc60e6961fc3f387a8d90a75a44c3b4736df1ee3d2777cc6732c02b42a897486bde9b9f030e8a599aabc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/dsb/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/dsb/firefox-54.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "4e0bec424f15dec37ed21a46c79f9672d380f9d59e3109afd4debbda2cfe58bf8b17f75d905babcbf7bce5cb8f7f3312bd938ad945e163d3e11be42b9dee2fca";
+      sha512 = "407728ddb4062f0961a856e34d7f4db5f137f9674b95a7cd509c57878813e4dd469487ceb91e3f0a182f08e2e95116348d7f9f12e23a6c45d5911f3c8af3c0bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/el/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/el/firefox-54.0b13.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "c10b58b13a85bc1cee23ed23ab8f62dc79247d025ead6efbc4165895568c6d369574fed7cd2d294bbbdec56e7673928ffa4db77720d871011b7757aa90789e18";
+      sha512 = "5473cb886a94aaf59065f65029c01e31e162d38e54e85b19109fa29929c97a7872149e802fa131ffdd1189ba5a20184f081f483cb783de90d287469f6300a0de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-GB/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/en-GB/firefox-54.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "1cfe32620ca3a3fc5cce03ba13c6acb174567f99879fac86705e10d0036eea35c912064827676fe5dd0ba3da5bbc624795c3f7bde7546f15246b1acc1cbfbcda";
+      sha512 = "8fb73d0a889c33fe2163f51847054c5d8dfd491ff4ae3c5e1333b93aada953a03d376b1f3afcf26189b3a333639a28dc380ff967cbfbb2a2f11a92c1750a59a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-US/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/en-US/firefox-54.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "c8504535fc15bad6fdcf5aeb11a54ef26ef56d14076ac6fe06cfb530c1952118b957fc3cc6ea2c046af3a5ca90dc87655ae67d7baf66e46064382ba529045362";
+      sha512 = "66b68bdb3043436548d057d435a065b896a815c4c0eaf7f4c072c306ee379de4e98aa750362175df822767786b2202744586fd6aacf789f987ee7528b6bae865";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/en-ZA/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/en-ZA/firefox-54.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "80b40ea103d5691cff9df8373231acb151e6bda0526d27d59bf226f24e8287eae335b1224429b61676c8c9f3021ba77a31cfd3bfc68948d6553978fc570ac6f0";
+      sha512 = "4f3917809ad8b62bdf6bfcae453b297d956e938c346b48613758c362d0c32be098d158fd660ec24ffd000a9f8f6be0cf026ea6533878c756e6b476135d0483a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/eo/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/eo/firefox-54.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "a9809ec0e031e7e127441c11003bc81d8dc701e3acc45f137e7e68bbf1ebdcb5cf40267e9f8e7431e62506678cac04f732e73978ad566cd51597a1cb45eb0ac7";
+      sha512 = "bc0682dfdb05432df784ae6abc1202f638e16c04e0deb53211118cd0890bfcc07608dd94feacbcd4e6abfb3f6403c9d1c1746579834ab1111e4870396bf0dd41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-AR/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-AR/firefox-54.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "18851295d00c2204b75c8e3d2d07a12ecdb9456d8ce41606178054b64ea5b7e9ebd3832db76412d2d5a26941494936c811084216525c56e4f017063734d7ca44";
+      sha512 = "b9490b0a0fa01e7e8e09b8af4d77ec42ab89a7859b70106e0c4294dc0a03df215de2a34854fe48f8e033138d9dc5b553e2a71b629c0e351712e1d66afc0aaeb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-CL/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-CL/firefox-54.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "9a7dabef38bb5f0909f033950f4e0424fc2c0119f4bbc0de85bf76f29413b2984e0d56522f900055cd9e79916397791f0597229a19d2d6fe0f8850c09f9bf3f2";
+      sha512 = "524a89e97ccd1919a86b2ba38beaaa42b6664af46d36e4da0f5f17f7d8f9b1c428be8fcd111a42c3fa951108724c139f54aa5e4f4a7577dd6f58895b3a3d99ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-ES/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-ES/firefox-54.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "52b87c75267dc27aa9acb9a49ce9e59bf989f76827c078acb8d9166f60f0d86f6a0e937aba324e8e9e9ab5e0c721f75f0330199e16540809d0e8e9c068826406";
+      sha512 = "58660dea649a468e97d12d054a59dce61d7abf33e4a5620c40f1c42eb30ec3411738aecec666f0334e46b3458a48caab97b5dd7e9e1b0699f5c16330401b5aac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/es-MX/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-MX/firefox-54.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "e57f22ee791acab3792cce3f52823d5fdcced5befb2808cc717d0da4a876a517d52b2e22f4558c33ecbbff01a799d70e2e67ead9140630a0111d73ffa5e54de9";
+      sha512 = "2c5cfc09b15daedf69ce16ecb12b07aab99cbd0b68d7ff5b65ac9116a59790d32aa1f0c3a931e9837b381c82d4e50f3e14237c39cb5c45e652d11310d0e01faa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/et/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/et/firefox-54.0b13.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "572a6f67b10f1a4981d7f0f131bfb9900a20a094f34cb3eee717d7694e3c1b2a949dbe262a10b6ed22cdc97c3a99ef885a4f34d15268c6aacdc7cd28ceb16f8a";
+      sha512 = "6301197a08de0912a9195b0d78d95df338f3c2ee2c90045108d220c9309edc8504a6ff6aa5f0c8db21df33d6bb0e624d713d59c6e49fceada3a510d22613d59f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/eu/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/eu/firefox-54.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "8ce7450a27a26954701585a2d55616d98658295c122071641209274a2555e0bd45e57e17be715cd69e00187169501f7c8fdf419a3e1626c4a1e5636f36be26b9";
+      sha512 = "2ca00edb210c879a48f1107137378818e6f4beeb2f3a2b1941d12a7da6f474bc164d07158ef3713cf9e79c222b4f2f9a243ce924b21802dfb4374f48c18954cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fa/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fa/firefox-54.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "f42a0effb6ff4210707371f6693e2bb25119f7535581c488760c237a3019e58fa270543f6981348f609c776bee54e76a220c449b7169d7032b2817ea1255eacf";
+      sha512 = "ded6f7d1daaaa417ca62dede3e6a0ae4acc66852dbbf6230e8b1ff5ad74ce4438369fe6c3280f9c8abd3a1c22fa05f2c9e36dee20531fb5d3eeae3c736984b63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ff/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ff/firefox-54.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "7718bb71ff031975bae785130c86c1fe007698177b04d55008a5175074f9ba33841e3939f80dd76034680d7409ba281162540757b4365c03e10fdc21317b3df4";
+      sha512 = "59c5c0604faf14bc0478cebdfe09982d0a184a5735c791458254b14ba1031fb9e18c09dcfada0e921a088fd7168d231cef52dd45eb703553a5e5624ca38b9363";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fi/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fi/firefox-54.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "9f5cb2d9ad20d788d715eae64406abc5fdf9229125f8a88f44de574c836af2943a7844ddbd96eb6770a5e011c5e239009aaf022ae6c0a14fc1c01dd2a9283b1f";
+      sha512 = "10e9aa82198338f1bb21c6fd5663a939b14d1db5b1a5b672d0c81aea26d910e9b6c8b53d7e40105e5dbd9e4b67bbaaa50803b323dd648ff85699cb88384c3c23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fr/firefox-54.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "d9098b1b61bdfa82db7acc0f24fdd8e248f9fc0ae1c044829a27c45ed99c933fe7e8eded84cce9d454dd544b0645b2e871a00f3677868aa4efc00bd82dbeaf5b";
+      sha512 = "b267baea7bf0c9fefab7bca2b32aee9dd0d6f9e435c477ecbdc622e9cb2a08ac4adc1c26db88e2f61b1ef55416c079e49d4af6a4366f2b893504fe814021b674";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/fy-NL/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fy-NL/firefox-54.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "146b24d3670822394130e270b851beb3a4017818004ad5d6699b8424ca5d4dda16788668addb7f42b21980a6dd39a2c3546bc36d5bf2298b831fa83e957beefb";
+      sha512 = "afaa720f4b935ee8674b61362972a90ed9aeabddac17e5768eb05f72eccb1b54ab6836524bb8a189e08cd06f6b24c8863208f9917d02d12f622b7a3c4b96ca8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ga-IE/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ga-IE/firefox-54.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "b1b38c876e9226abe24cc4379ae8a0d489db7f91f332560f922b3998d0c564f42730ab568277f4159bce95c1024634f20c918b97e84fa7915e4b841f9d0b760d";
+      sha512 = "c60fa858865ba80ca17fdfc29f2ae85c77528d570f8b4f43b890eb0316807ddb2049fbb4c6005fedfc0f05ed85b211901e88a6d06fa51f9cda214b2999b7de76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gd/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gd/firefox-54.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "e3b3191298f2a08ff52314aaf9ff9689e8ea83128f43010fa90ad8a24caf340e24223c8f5109fec2286a68c699bcfa98fbdca0c10f62956dfd768a473e0a77a6";
+      sha512 = "37d7f0b8159e7c23454b0f1a15902280fe5def086001befbed3d17d21e4e3684c40609a5888fef3cc22888bf57860302633a680a4d01ad1ad0e765ef14a3cce5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gl/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gl/firefox-54.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "024747e36d569e323964b9e0c3a3922563c94c5679774a9cfade272d8378dfed987c291bc55554b0e0273938a3cf65f48b5924549f6962dfffb51caeb053b64c";
+      sha512 = "2749dd7a2379c3eb2e2f52441717ef065d3bb07c6cc58aab02bcb3c050e3f1fc14310c479bd58da5bfe9a17a91fd0ca44d032aa81f2f098cec1bd2922876cdae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gn/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gn/firefox-54.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "e0487d5ac3730b09315f1b5b486fdd8359c78ed7a741ead18ab7d4951f9e079b80c1066a54f2b86988bcc8edab62971f0cc99e7d7cbaa97122d90e4fdc08298f";
+      sha512 = "28f3f810fe9e2ef555d5f72714284eda44750f5525a560f93b9e47bc56f5f2b83d2c73af3da8245b387260e4c82341272518034aa6b8c968665ef9ae0a201a9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/gu-IN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gu-IN/firefox-54.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e9ceb5eea20eb9881c87e47700dddca0060628c28f7a8bee4df1be45d7b0f9f7ced122e7bd1b16468853512f759691072a455c13ab98e642c94f2f8794ca6b3c";
+      sha512 = "76a246d75ac07afdf824307706b9834c2d7eb558448097c9b078e37b61973447fce723c3b697aa4ba464f93d584901bc174a635aaaf7bbc27efa21f923dd7452";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/he/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/he/firefox-54.0b13.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "68ef5903758f59df5e3bad14903734d470ee19cf7e3f34f112ff5be5d11b28e19cbb55331552a7437ba3bfea1d03d527690d0efecf0ca9e824c12fd2c5992269";
+      sha512 = "e0de309d1c0f1e9f3182eb95e91b0384bef6a52e26a921d47e896f16e9c58b270ef30b6c1b4e4007c1eb3b75fe41c12be5193a4fcf88d15bbd7f2892c0d5bb40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hi-IN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hi-IN/firefox-54.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "c0bb9bab0b5ff7571af336febf1ecb07427400ef72d6a49fed3958a48fdb63a5cc8174b4365fbbecc11d4f7b646ef32d2204241d2c17290dda4b99bb971a1dc7";
+      sha512 = "1b9e63cac216f3f043c17b8b4a701ea5e8fb5522a25f6e21d0b5ddee07210ab0ae1afcb8419b0e6018abdc25b989a5a3fe554d1d04f52c38f545172869d95e08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hr/firefox-54.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "16e07aaaf4bcbe83dbe40ab688e4f40d02792e3793afa1fdbc90be6d7cce87ca3c8ebce27585eb24e899348f6bfcf3b471c73a0f09d0007c62e224710bbdf538";
+      sha512 = "959a5760577f5ef026f3230a196ee26de93425a452ced9cf9770b5bff8f3f44c2dae2cdda7e01f68cba2297b320d2df299cb774e9fce2b68adaf986a1af26a09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hsb/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hsb/firefox-54.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "6968bcc314f05af065a7a8dff0723579c760d979db7186e0c6dd7a1ddd5c5135673ff940ec471b57f2eee550e5c357342115a2799f1dd48c2120d3404c5e0510";
+      sha512 = "50390a8d09b6a19fd8441f55a1d0310ca279fec250557124271e3791ad8869b1a4b361176c0ac95f8acfefb8a00c80095c2422314c5da557895a85bf194fc011";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hu/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hu/firefox-54.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "498823b2075e70459b71b60560ce7e458a8619e249fce237d91cdfa2a3992e279223586d82af35c2804eddb05544602f06925c8d24c76f9dc8aa37f8c5fa40b6";
+      sha512 = "8ca51f25ee3c06b918fb4a4c034ffaf493c30c67f1c3eebc0fc268f09ac6fe62ac163ad260f4a4ca592a7bdd80bcf3a916660ffbfc8681e46b40e416e3e7380b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/hy-AM/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hy-AM/firefox-54.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "3b86b1efc5b958b999303de303df07967d4a51f5b8853663bf3e07c19762cc273cb26c073d8bfafb873f09399e6299472a210148d6dca2494580f727fcb7ce35";
+      sha512 = "49da49d63b28110d98156df0d07528e6261a01f5db9aefcb1ba1f04dd1b45e812bb026b6bc183fa27bac57a9a735009278ac86394ad43c54ba5760b9d4a05de9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/id/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/id/firefox-54.0b13.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "27a7574ff31cb8bafec7d2882b19d944829ff1508810118dc4053c602313c7f5ead2dc6328c14313c8b687fb5bc369be0aa5bef78193251ade7461f178ed466b";
+      sha512 = "6cf45812cfd16071b12c3b87226a37e5353fd0f331b65a575a4fc094709b20f3b0fe00064af1a82bb4c9430caabf2d2c4361f90cb2e90b1d5385a57a171c5955";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/is/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/is/firefox-54.0b13.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "d990e47ddbfda4c4a22a1c9f60b0aee13cad35de496c50c13d6f33fb6624e948a0c94a1f883a8f6ab94f0310fd3d3db1554b502c4faed8e05844c06f84d7bc23";
+      sha512 = "db48948f72641b83078dc44354dc3bf6a0919695a69c155d836154f260a4d32b8d325c138d6db863006dcc80f75d6cefcde0f9e445eeed89d9d8f89a7aa5a048";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/it/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/it/firefox-54.0b13.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "faedb800d78be5cda15858df073099767d521bbd71915733cb8558deb2fe3a6e90a203ae946795ce6f55ad7a6d35fa0acd016c3466286548e3d198a499d24bd9";
+      sha512 = "2d63a2dd3d5b56c3c630b3badd764ca50e6bf4eb0ba551cb1207c849f0d3006de96781c59b8ba86ef93659487be74e2c5ce0621b3df921e3091debded91b6a56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ja/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ja/firefox-54.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "3063eb49a6076153cabf57d7006c6e41306c652573a4d037ccba721fc4069b9fe7a3ec1f65ac8b8f596a4b7493209b8b46f9338f4eb3141793caaa47dbf7e821";
+      sha512 = "f7bb1e8cc1cd72363f8be0d25173f8abca5383277c101585198e6941c4b4fddd222942fa6711f5ccdcb2dde97dcdf974229392ced1488d37bad30274987decac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ka/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ka/firefox-54.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "24defb6af2daaeb42c850d876feff49504e3e93ef2e1a4c3d1b85a8a86c4e8cedbfdb86693bf7bf7e4bd2e096f6ad53ea877b6c1505842b731ff2cfe7a75c134";
+      sha512 = "a36808e207a1277bada5793ac8431a381dddf11a600c795d077d0136997380d294a59f7606ed2a64643df53675b607ea249e6ac9518d57b91b2f905c76a2cb1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kab/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/kab/firefox-54.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "0c41c51f725e02e1fae284723547911cac5958352bf36f2382a8f293001d086e2667722e06fe7aa3ddfcdb24f60e6307b9f050eb15d4d58b7a9e0ef9e7a89b37";
+      sha512 = "498ac5ac757560c131e21a5b03e956e63e329a3ba9b3d7085d1448e722a78ef17c022cbe22a5786931c9190d79081806f408ecd79b3538b6c042e91f04baf65d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kk/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/kk/firefox-54.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "82cc8c6063359fa1a28d84a56500a0aea2fe7735dc695e0bb5c57445284e0d4a4b0cb76cd78e399023af83fbc00bfd20f0b17098a264aa6a230d925b5453112a";
+      sha512 = "2b3abe204415dc66119edf9d09dbeb26b026b89a9bbf06cdcc9d624281f96269f2e0cb39f8bdc0a21be373ab4b0cd41aa93f9db556dbc910dda58e44619c2f73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/km/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/km/firefox-54.0b13.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "a2a4d80aa6e9096cc8d11c101128e712079f3b6d3da9da3a9268e6e433274ebac4b0adb07da1fc63f57673dacf16ba91efce38bdfa3db9c4b4d1454fa4ecfb63";
+      sha512 = "27d3ca7572fea00b1bb6409b55262ac85fdbf8a0a3a49146fc158636780cea266bb2eb52885eee25d198a5b6484476532f6a4d6e9f1e0f2c479bfd0c82ce3943";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/kn/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/kn/firefox-54.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "5c202454bc5e221f14aa1ddcb04df9d489e1c036538a747315848b238ab8a8e569fa35b27e906bbbfa00b4502bb0f6a64d317744d5d3e82b430f2c0f28ee3d60";
+      sha512 = "d98e7a94cdb367ffa7c2f3453e7f2530acc09562a28139b431c17424c68973b27293a18cbdcdefd86bb9d3348fc37a4938502affc1b18e2f2e1e4c36fbea0d62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ko/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ko/firefox-54.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "88f96e25f721e005acd51512e5f5323eadaaeb0fed0bc5c0e919661109e8800c3b940ba131fc788a82a8e6a35be37f9c7111c189b2e9d1ed4ba1a5a3503748ad";
+      sha512 = "55eac7a2667f90789e148f0dff06492c80253ee6a7d65af2e9897a7fef5209a64c4a9a018c6d5b8e137ebed60780ffdd1932287d1d5e174462f9208dfd181581";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lij/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/lij/firefox-54.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "9b5bd55794df871bb7a622ded9bfe3b85d2edcff1a1a4bf5237f17dba98e3af53f70de48636c0bbcba68c5c19fac08873607094492d03bcfbd7550cbae9e4178";
+      sha512 = "e86ee02d85ab92f61544f590692bb00ea49fcdf3b1d0475dff6dc0fc003663582fc3e87f1ea03cda90e20fd073da9e2663795e620b9e6adae2ecd98f434ae9e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lt/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/lt/firefox-54.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "be075ac4bda511c2bd81e726003f4ee680f35022e84365fccae090305c45dcc586162428dad944bd59b7e3c1f836e8b07a2a78e5a28d0eabb6aa44877398650c";
+      sha512 = "57659b95a6421d0db8370dd17e5ee767433136eb939dd69ff5a29e7ee351c0c05a3339c70984d5146c198e6922f8c2f41a9d164dc1690b779a25d62d4e1b7edc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/lv/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/lv/firefox-54.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0bd623b3203c1403ca187a3b25abe0e438ddda0c6f5d4f947c0643ae3f492c649cf830002f7211853050b15e179a482677898ef0d93d32c5afe34ad6e7040cff";
+      sha512 = "ae547b8db7236199787cf455d2277d5dcfa7cbd88dcfc226b5f1552054313a4d56144d828ff1819aa341ecdcd84609e30e4c4ce22884493031fde62cc8d523d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mai/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/mai/firefox-54.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "b406ea5ddf4169961cb11104186a809ca7c8a69b124e85e796703326a37ee18473e4f0b430d5da2dfbbc38f7ec370951a5dd0c73be4f9bf48da771bb603bf38d";
+      sha512 = "61aeb8fe7c8af0b411435868f6ef540e575a5ad6ae353d2d40538c1d50f154534e8216c3d479f838f4eab4d76b07280a8d1a76d2e73ec6a8d32d99bf79f9f14c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mk/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/mk/firefox-54.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "ae182c6ffd7fcb3acd396e8d9f4b2baa65942d78498acf7a0f3efff69cce62812c2e60c937611c29116a45c5799625891f39e25ff499b7d3e4f453f790d8e8ce";
+      sha512 = "778ed9879a57b2e6a8e7fc48bfe109a3b60c4686163ede1b8df225a3daaa9e2a854af79caa3f83e2e756b32fd2d6f5177dd145eaad1d670c4420a4482a6c7baa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ml/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ml/firefox-54.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "9dfe1593bdbedb6262e7cf50857036a624a3ae13bfcc853dd91fd800d74f831665d8c89832b5727a9bd2bae3b4123104dbaaae1bdd39918f2c06be2fdf0a5c0e";
+      sha512 = "3a3058ac0a0dac34a601e82209482dbadd2cbfe9228ee64726fe1ec60d3e6c0029b6cedf243f0a82bbb57c8ffdaa17a14f3c75c8300c31ffa41a07a9c390c83a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/mr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/mr/firefox-54.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "2744d4fb88f2713b956efdb6d56fa1ef7e003013cb9a526ab2f9e8cfeb915fa3651978a3d863cc3c4dd62a447bb8cdde402483701b38cb206b99eff5fe5272c8";
+      sha512 = "a2218eae78eb1cd9e27af11dc578302e5ba47530cfb8e05b8518b3c9378eb0397e6409d093742e00708955144e4d6574366f70253ddc9753dbbad53230f27882";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ms/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ms/firefox-54.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "4a313418db320dff4f91f817cba054fb65b5e97a434a6150d4f3373bb788b18bc02b194fc8349e5f41e1b8ebee94f0874431759fe79ed32fe7f5645f25c4e297";
+      sha512 = "46c04289d100455e926c9e54d77ad9ee9f920bb7d928ab11dc346872bbc6fc888e3e4e8e66e1cc2e169b33a4aedb9fb7d0d205ccbb052d9846b14af9772f9679";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nb-NO/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/my/firefox-54.0b13.tar.bz2";
+      locale = "my";
+      arch = "linux-x86_64";
+      sha512 = "84e9fa1ae7ead0f9ed4240c4923fb6a4485f81d3a725793c490c644ac0b8bcbf8e2fc0b7675b3d146dbb3f14adae243f1e10fd0b95ff08a90d674166c3af72ad";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/nb-NO/firefox-54.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "41085294ea372990b058e61942de5f2c972511bb22a1719e92275e4258d6c0c0a71ada6ab21475c1b32021fddf5b149f1dccb469a948050d901b2ddfb91886f2";
+      sha512 = "0fea5208d74fc9d4b184413e3f6437130beb816cc21425555108ffbe1c15d2b5bfb4478fd81d81f5a57fb8ab2c90ec8efced100b9c022940b7ac6db701829088";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nl/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/nl/firefox-54.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "45ed2265c4d6a66142bfe117794bd950e56821d377a5437c9d0cb8405e7605de617cad3e92ec6aa71129117690591fc95ba5c4d9e662fafa408c3e018845e40e";
+      sha512 = "b125f32a93e2509e404cf0e7ae8f21d227d863586869f83fcdb577da76bcbc5c4457bd7c79ca4c1d51046aed6cf68c772c9dfd6447da139dd4abae1ffe97d952";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/nn-NO/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/nn-NO/firefox-54.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "1c981c33bea1ecea733db9c278d92ef42809a4dcc0ce8f9064e08b303a56970099b4f3591103fe262a777c4ded9948d9cedcca6d2046512851544c8da774a250";
+      sha512 = "155e45030d15bdd1db33cfb862df509cdadea5dd9425c8639bace7ec8bbca4265ed501c608911454001022ed01fd27600ad0b9c526e721b6faca9d30f30236c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/or/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/or/firefox-54.0b13.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "3c67ad9f3ae800cd2e0665f35cbe92f17337c5f2568b057b9c9baa7aa8c91ba4f5b1e7718f288a2cc982ecfa43241e992e35c798e833fa56c636f8c7296d5a55";
+      sha512 = "dc1590c5d3a51b2a1d3cead15d432df33f58a4de6ca57ca0ff207a10e239575d177f931c31e03294c6a5f6d4938de04dcbeb7e356c73f25a7b9a187481d0a8f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pa-IN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pa-IN/firefox-54.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "9778843430f504faae4f8e138490a92c14f5f0f1c47c642f7f1f81c90a37c4cdf0660ad5b134429d6a86f61bbbed0f285a41ba315b9c318799a90f3208cc4a3e";
+      sha512 = "c02641857f7742ee2eff502ce47cebc00548efd54521f73760c0afda0dbd59190a2364862f3589d2b5caacda451811bdc19bbf381ae849065fd5af4e715d72ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pl/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pl/firefox-54.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "336a3afddebd687f62753f0bfd6b7e57884cbcb4c536de2d2a85e9ab22a696bda55795d5511ce299d34eac20abe91032450ddac97fd2be9c4b8db6b4b0fe6c6e";
+      sha512 = "1baa6b00ee15366413a081172a67fc835eaead6b053268ed7bbfb093c6d3cd0ba4168f10f88d2a3451c3fdb421c3a91962b8ae2523d5b32c7ca6f774c3041419";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pt-BR/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pt-BR/firefox-54.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "1908080393d171ea86a05277a4a0d67c0c054fdbc60c5a9ba76fdc92071e45ffa57750bca8b1f56c65a4a45d296399c1cf3e9c0db8593ae57e7b8b53a6969171";
+      sha512 = "c74567b9c3ba8fdceb309b72c6dc267c8ae81fb5281e9903ddb19f45ca0c10b988b548fcbb7abe7ec67ed4cd314ce9c9d75ef11f1cc6ae3e411f807d8b9a5fbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/pt-PT/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pt-PT/firefox-54.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "eaec79b2cf363f613cefb2cbbeb3a5b607ab608d7e82ac21aaf4b591475a85374f49f34c912b569ae3fb8224f19b93d753298ef8f6db820fdb84a70b306b16d2";
+      sha512 = "aa7b19c3f40c376c82945ae4e3a7136127d0be75502e143bfd206e738be1def4edb9173d4defbe0cbcfef59c2c168bcf983a23d721ec61311fcccb4b3dc8ebf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/rm/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/rm/firefox-54.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "f6fa58d42c155552546b7500d6a0081b3c02c3cd300c0744e4a964b97970f1a87e9754e126de346880447b6af9853a91f157ef5285a2db1a8fd677c46cd0f347";
+      sha512 = "0f2452d45e213daefc3fdbf68f92f3ac9d4644dfa33f880f9a0e2597c58e93998011ce4e7a6b6d4add46ed205f5234f5ca7d5d0161336480ec0013bc33582815";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ro/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ro/firefox-54.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "876be7fb744a6887890671e00d84387c71e5c77ece611646e721eda3659654760094e39544a2bd3b6e80b075e7d24acfe1d7e86dcb4003efd867b2e7b81e3366";
+      sha512 = "7de63c520fa69a218bdd602ff17418e8f586343c676d5f0880fd5dbc7185e9272ce75b39bed5d949ecf4112b2787e72b02643c6be7fae2a87ec3124f2ecd71f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ru/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ru/firefox-54.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "52f58ee2af336e18640b1edeb54f2c632104a1cd40952509b512af5dc838deda531e850e0b56d605bfad046af34db1158dbd69bb25380b80a178f32083d148dd";
+      sha512 = "788a723a5fdadf2cf4149575c860d883858b798af34fb429b3d74d7542d230198c6ffdff20d07b224dd1f140ef84801dbc52962447a26dac9999c397b78da0d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/si/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/si/firefox-54.0b13.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "0b36230b9d214793cbd75f282f537e73e28ed37efc9f17e4aa0f5dbb3bdaee5b5569708d99f4cff772767e074a2b85a7079e48acf7aa31e955e6ae6658a779d6";
+      sha512 = "3ce0498800ffff07caf920dfb8bb32838f519d6111574a687c2c6e864d0e99d644c2f2c33d2f312560f0c0c3fc50b7b592b3bca8cdd87ed700503323d7398b92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sk/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sk/firefox-54.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "6595aa0a2601005b0488e8ad02f0f5a8b96c4419beaf9a88660e111bb6e932cc98dfa16e511e0af2622360635e2139a8007bea5fd61708f4558576ad54da17dc";
+      sha512 = "73966742be3916d1a9ff31d55071bf50fcb21bc8913d27109f75b3fe63849dd982bbe9329733e9f050d1c884468bd91ed0b8a47cb713dee79929cfc8c1417d96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sl/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sl/firefox-54.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "56fd9bb355c5dfc680a7a91a1686285a32e147b1b0a72787106fca5244277238948ce9635f97b7c3ccd59d7999c794d4224bf4172384bcf2a02e0aa9d4716633";
+      sha512 = "1550d741812085658fbfe82212b0a10408d5dc1ae23fc77441d4559bbc5fefdc54052fc62387aedd7fca0a81902de068a9fe24aeca9cfc338e64ba43e8513a51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/son/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/son/firefox-54.0b13.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "6475248c31a1d5199d6a4dcba9c98eb3a0c4bdd57ef37c5fb611ec68807658ff9de9056c0a5ad9e016e55d8ccc3ba7987948b2b2f47d6c3061e3f4d13051cf27";
+      sha512 = "25816528ca8907e502a7fe3533bbd3c8dd3448ad9fcb8149ceeac0c397fcb28c7f92965b76f1586e3a7be53575999c6e013064454f6dc2aaf1405b0633e68676";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sq/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sq/firefox-54.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "41b602396bf33e36974c97ec25f120ee7452df5d26caed74a10835f0fa7a9302aa87d0fe09fafc2e6670d8ce859a8757a7e7c70657b29a7154b1501e478510a5";
+      sha512 = "22980b382acae61fcd6cf5ba65fc0f969231a8e4d1cb3dc6d09d1773ebd23eda2b6bdb5da10e752f0f69991e45938046b0ecc0bddd377f7e458146f3de387dd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sr/firefox-54.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "dbc7df70483246003f27acd833c881b3ae6ddaa9e93c7e612334923e63a1a4bcf35c082d355d67425fcb72123039ee4b33a5ce5f75909ea6cc3990d76dc21c41";
+      sha512 = "db418099ecb1f34efe3fe3fecefcd40dd2ee720a8dc46da1c10ccca7eb27f3e062756a78c9b6c86314f66be641362e8a82cf344c18721300a432a792c9f71530";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/sv-SE/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sv-SE/firefox-54.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "082f21155e8c68f8e1f786a3bfc3f832637813bda06881f1b6ebe8a1be85bfeff03100d4a9f311ea8bd6ec802e55bbb674eddcd9551db6a26ae32a6a97535bd4";
+      sha512 = "8ae1fb40b7b2240a014d1f25547f8afb8dbcafaae62cdbb84b027887427fbec6111fc3ff1325d692341b3d9800bcfd8c9036ecfe32a9fc9146b511668c03d67e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/ta/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ta/firefox-54.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "51bf00c2014222e0d1b30d83a483882930d87d5f281d6b33712616769060dd4b1c5ffa92d30e0e61effe2392490dee43e1d49cd6e28c28bd3b94ef005b87846d";
+      sha512 = "2e22c50f9905aa744b2cef1fe087332cc17cc7ab51c144e34327153bca833cf5b5783f0adfe5315e2965f30c237729f2093f670c9a00e39a1db8659a94297528";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/te/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/te/firefox-54.0b13.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "83a879a6d9b96963e3370068961559cd530695cfd7db200fb8bff7d79ed01de0357e211454f9735b667a1c65ad7338da913646709d9c212704f2dad0486b3d24";
+      sha512 = "c2add5e606be0a210ed6af6c06c3e916905d3053dc63e282ae54e5d4209b800906ccfe0b23279ec2cce1e2eec7f40b6604cf21652fdf626dd0e261881552724b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/th/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/th/firefox-54.0b13.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "d49d76980c091d354638a2c887cef68e762ddcf9d2a7c1ef74d1d735791949928a6fafa270711a0f776e51410b35c9b396015288ceb5992969af88dd3dea990b";
+      sha512 = "2c5b5e170e75dd7ec9b4e98fdfb2cd6f228ca6aec0907b6ecf837855a2084b9d2e0ec6000e6f82d1bd9b7b09db23afba8ffa6e813060df3f69dae7a5f04d4907";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/tr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/tr/firefox-54.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "642a6be0577f16c0c4ede21a82cf6c3866011c3b663f7ce7c15961eec7f01133fca8bebd46dc2cb9b91116ab7cb1060f04e9b4e208eaf6a1ddb3e64219a2d5c0";
+      sha512 = "a16330055ddce9502e69b8ddd6381ac421836ad98d0002591cf0ad28ea199ee607ff747651228fd2e5528a9be773aa9fa6f0ac58e57d13996e104a0c2c6fcb34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/uk/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/uk/firefox-54.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "bd72d88ff7f82b195f6ce44ab8d9b7541e0564ae7b6cc6bb9676a38a9bb2a2e23561f07006749de5598da1c6aadc1e90d0ad2a5eb1be0f998b4d36534a075afb";
+      sha512 = "e9537030c06093d21230cf8e07913f05d9b02a89d31d952debf558c346d77b2cb95f3129a9ff6a249e3abfd769d41d0d67a57335d4dd39b1ca1c13eb9bd6cc9e";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ur/firefox-54.0b13.tar.bz2";
+      locale = "ur";
+      arch = "linux-x86_64";
+      sha512 = "754c986845dfc0d376fdaad04bef71498982259524a458cf1b89ab84439cfa4bd0ad6d7092e7499cc91e3eb45dcfed3f93a2fd1bbcde5f2b678d17fa4d62ee99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/uz/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/uz/firefox-54.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "242b5367c7e78f0c753ebf4f8a4b1d1fd42e236f7417a3dc441a9e72c071fbb9488b226214cc14991f5d12c514e53b35de3c903ddbe5fd4aad31e53f1a6516cb";
+      sha512 = "ced181d692de83928a297f18bc62391c9ad9c05b27d0d9e2db3b9f0c7d37d726eb4406837a4e223534e15358fce4daec1961fafe284ed032916c39e49c0880f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/vi/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/vi/firefox-54.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d2cf85b0592b3116de4848665c5726f40d3ee2e7b92c808a7a41f0760041fb5aee1d61b626d9fc427a8b0bbf697828ed86741a1d319e27694b51dde630afff8d";
+      sha512 = "ebd4bcacff95dcb7ac6a58da2ede2b4fa7d44598cc96761e870e49d65c827f89d5fb7b2b144252026475379b3dcc88801a46de8793a8b75f17997edd56f90679";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/xh/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/xh/firefox-54.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c865f0b18d427aa364f512b0e5cf02c126f156bffc4db2ab50f32fe9d28a949644fc672fae9a651a28ce6119191b6b0cbf7dfef3e102266b790fd0290d3ecdcf";
+      sha512 = "80d32cc0d735e54691b1c4cd59cc1a46b187dbe4e2b2dc3d3738b66b5355324313c7c5e61c778ad058b236e48dbd8238a1bb796cff6185398515a9fe5ca42385";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/zh-CN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/zh-CN/firefox-54.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "20fb7a5ed74e3badb56038ef16064b1fb92c6bf274341db0aed52427e313558846f34372cd019730ba0593439e6fb127241ec02906a76b5a7139c7ac45960783";
+      sha512 = "c63f0fc1174d40dbd2c1c57d92cf02d594c1a64ff12e90b5a58b28d7ea991fcb615a0e8029f96ebad12c59ef1fcea39575ac58b69eb25f31ec4d5c9de5cf72b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-x86_64/zh-TW/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/zh-TW/firefox-54.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "955bc613dfe9a968bd298b6cf038bf7db615ce456de31da656fb54c7f3e8126391154b49b1948a95871ddec04d03a51b543b9248498b661a998d40249f6e8bd0";
+      sha512 = "54fed20629960f34306e290eb60fddb7cdf20dd7b95a21a632557a41c99ca24cfa03215924138debe7c6aab9772197a0680f6afa3f35da841ae8df553349ea18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ach/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ach/firefox-54.0b13.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "cbceeff2ef8fa20f18ae5106a6cec638bb064c7b32fdd9bca83776bd58f3a579babd2a6e933e0cee9d0ff2e553358e136ea478b629317a1892f62c4c52f47e22";
+      sha512 = "baf49f88f15e62a5b2a60c8c09f1cdf8e414083dd816403df8ccc4fd760e74e66b2b86cbed075ee78a504e03cf6de5e90d92a0228fe0b3e889ea301758c8e95b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/af/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/af/firefox-54.0b13.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "76c6eff9a98743a64d387f3a58830b7583510444fff7bcec5daac6fbe56f068925491fb2c8114302f862ddee3d4bce7df4a1dfd1057a918f584de4774da7ebc5";
+      sha512 = "39d3f8fe582222fdcb2e2435cc02806bd34637deb2377276faac5dc30a7df0bccaba1636e9d04e86ff1ee4f376e7da4eab2d63cdaf00c4a20e7c048c76a39e38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/an/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/an/firefox-54.0b13.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "6152904cf2cb33e6fe63b3c573bfabed1915b538d028be9fcf7ad3c169c98899becee772bb803a2b6830457a0d93bbacd49e8c0b962fd1898e8225463387e092";
+      sha512 = "3045e008ec29253728d6dd9fe99f220aa00555c721747dd684a6806bc87d60539e79c7b547fee0d3b740df09ebb8febec9e44961369d8f614b9fb34b8d04f1e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ar/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ar/firefox-54.0b13.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a83ab8633fa7658669daf271db339ed5812d0a85a9eaf313165671f11ae6d50ac92cdd8414945dc6b374a8a46b68df241812e8c8396e9256521ab81949969b6a";
+      sha512 = "c4b147f35e18d3ae864d641b686af9dfe25d5ed58e1b84df16c2ed0f4574039549f71b019d2102bfe60a5c84f2bef9ec20bcb4f56d914ec69b5d91910e7b6378";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/as/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/as/firefox-54.0b13.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "2a76a7eb0b3015eced2a4a83965d314753e44232bc333cccdacc8a0c207b5113aeb7b97fa972dfdaf6e79eda03d8e18f4d8daa6ae3f8059d75e1245ff5618173";
+      sha512 = "3f8b2001af4064b4273dfd543f4df1f6b534df9b5b56fa6f3ba2eda0f924757b4ccd567295ff5874e463e330be1669ef4d5850f33a1e081b0f077b571fd90dd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ast/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ast/firefox-54.0b13.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "91d8801a2fffaadee3635643a813d588650b318d9e074ce3284f97795408a9d513ccdc573fb083e523959470095ffabb8023f250e7b3abf7f94853f126ff42d7";
+      sha512 = "20575f29d9409afb7c9cbc78b1f2a16e975b9844fa9d47946fc36fc3d9cec14c340b97643147a6d021a53daea07b22e0d9b791caa954686ecf573c98136176c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/az/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/az/firefox-54.0b13.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "abdaf4dcaf3ed2813b389fb91adee89f796d30152374110bab10b6aa1b328a406cf9e572b2d41b5ad9827928f8d5249c9d6abaea5b0698ff2840f66ffb71b656";
+      sha512 = "29f374dddf442ae9abcce6be49a234a45b95987dc547e76eb9d3ff7e48781a58bf00303b72cf13624ebda702d9dfdda70ed594f17d59d1573783b643b54f2241";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bg/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bg/firefox-54.0b13.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "65a76933c06f7d8bb71ab24e28f6e755090f8eef8cb7ac741d37c8532d20aa35eb119dcc0f7e28a97dec34a3720b79f869f8adda079b49dd270227bdc081d1ae";
+      sha512 = "a2126b3a3875ae62b21eb2a0ec840f0b5f0ccf8c81c945b0b6f80fc0ff5e2aca3cb6cb9554bcc8737b85d65fc6494fd80effe9fbff277f6f5a7fbbe4b8eb6477";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bn-BD/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bn-BD/firefox-54.0b13.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "e6cb0cf7469a125da031b2e9bb4d2dfa90df169e6a61f03d482e44e9beb19744a038eb1922ac31812732d0e72419211894bd5029e16091741aaf45c00e72c14b";
+      sha512 = "7bd043b9bb24fffb8f2a8a288ccd67195d36ef5e3908ce83b559efd37278c2d7275a85341c03edb42763cddfe2c95b917387f536738b7f8b54c743361045a2f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bn-IN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bn-IN/firefox-54.0b13.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "4018dd322a92660780cd4e9ef9c8631593c34717d2d1ccee1a340e34c8465ea7a5fb196f39292c3f502f7458bd4790971a443cd9c16f28e1112417c8eed35bed";
+      sha512 = "62218d525722f55e1ed9ebe86961311573e53a08eb87f8a459d44e08f2a2e627fd0bb8b67c4a8de1b63fa14aebede187428bd728ffa68caaa8390c46d5bf148d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/br/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/br/firefox-54.0b13.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "31f75272fa7a747031697505505f8362589f46986f840fc8325fb95c0009356d4fbeccd33e20e923c49df91d7af40c948ebdbf35e6d2d48b734055e33b1a19de";
+      sha512 = "1638a7b3091f243adcbbb87566eaa8d95c5a6c315b8c67263181e33d5e014342e3f062da4a749972dc36da029d15cf10a4762ed607cccff934c19a9acc3d6e72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/bs/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bs/firefox-54.0b13.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "888c6b2e2d79071710d580da39e33dbfa4392b9995bdfbe16a7c4377f54e7b9c81cdd4864fdd05d2f376e1d6650dcfb5dc94fe67e3bbbca55471ce2f62cc4589";
+      sha512 = "e577bf44f0f0cafb96a33f8aae0a2b538ebf46d6bf3be51e4bd59e77261b4022f45619ae098c66c11546dcfe6baf4b596f1d9ae7f4bd1266c3786310567a0487";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ca/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ca/firefox-54.0b13.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "87971a8c4bcf96a67fc370778274e2c35356b6239db4104740c16b281a45d45b03e4c8627c14f1c6f3ac5702784134c743f07998f3db2b2a8d4a2e6cf9c0b97b";
+      sha512 = "dc0dbc0b86ab3079863dc37d62851fdeda415728546bc0a2799c9c0546df258de0ea47968ef2b941e443ee4110cc8aec632eefd6879b4e76be905f66981d0290";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cak/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/cak/firefox-54.0b13.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "047e10a19ac8fae5474820ae26429711efff76e84d9f58b0f4b8a36d7f5c45fad6c46402448c454c32b3466de3618e2b2a392bd186361466f7e87717fcda4108";
+      sha512 = "c1c02e89db0421c9f1355c618cf2831ab54eac9fdc8bd61efa5aadc37999b28e2cb91c56edef23748141becc36c4e315a9670856323ab7abf64fa5b37432add0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cs/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/cs/firefox-54.0b13.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "7d7b4583e3c6c4e906cde2cea8cb7bda2ce4cd007640b3e681608651e6f414675b7039c1ff13678947d617607cef407382feefd44ec1fe1534b9abb0b1dd0d7e";
+      sha512 = "8d8d2f7cb0f352c70681b2deff30b23caaee1247e11e0b6ff977fe4f12352db8a3fcf2f4c9463ccd8c3a8631be7432295fd82f74aa2ade8a67bdb89916e5c57a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/cy/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/cy/firefox-54.0b13.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "768429d9772d8e39d4230fac01c4bc6fbe20c7c2efd326e78cdcdf74382e3a38bee9bda90a1d97b61035cb35b5be8f337fd80d15d4f185a6a668f68afd3b67af";
+      sha512 = "9ec90347d3ec2a1d23db120f309bb6a5266b8c6cf85004a97cef798c7ce14169e28f752dcd6d89bccce7947cf0be04457c8e96a8cdee6cd2e4bfbfc84193fd4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/da/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/da/firefox-54.0b13.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "a6e435be5ac73d683ade3dc29bd6d5e0c4ebea30f8521036650981b510d4df014891f8eb65a5a6a39855fcf5e45d1b393617d7c16071812952c635725bf206ee";
+      sha512 = "ad20e0ca46c567d8cd27a44af43c7c8855be4cb50905f7697a102af7378009449ad940cbb66e24b9326136ec98b90782fd569ee411951b5313c9444a516a4184";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/de/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/de/firefox-54.0b13.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "7ea17df3c926546f1eb7ec0880f7b0b63cc8201044b444280b31d2646999ad36ac10ce74e19794ba7c1a026f860c79e83ce6ead339865fe31a021bccd85f04b9";
+      sha512 = "21d414a1c906675cc8eab081f499438c5b01fa1b535a048ca0538815403f18226fe8c7fda818afeb05128497dbe1c53d17868418c1e0efb92dd41bb112496ec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/dsb/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/dsb/firefox-54.0b13.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "0e75929ba5879fbbc269d1fe8e18627ba54c5f74edd3179360998c9aefbf21d1f3c3cb0860990e7b1b0a5f5037ce9a4779c3edb64912f4f13c80501e579cfa3b";
+      sha512 = "d7472be94b33967a8f65764e5afcf6ffc8762d507d6fdebdc87aaddba28bf0aaf1b31a546c69adca4e53effa0a349f5795ba2ac52d51f2726094a4901263a042";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/el/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/el/firefox-54.0b13.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "b682e47f225a270ab421b3642f7c28085d9f2f1de1e68867ba09e69fed3d9b5908909be46bfaac6e9d0d1243eaad3cfe2bbeeeae6a5b9696b0ffb901a98db50b";
+      sha512 = "ea5e5520cf1559e92bbd0b94f5c7f8451e1fd53c09b92d5aaf2ee2e48c1693cd9b22abdf418ee1bb1551768a7ebc220903c1b0476935fbd95cf9476b7b6e5a30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-GB/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/en-GB/firefox-54.0b13.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "aeac6a542c1a4f91ee6bf01d4c916f8da4628b36550d80a166dc46c5c9b1a010b5201c87613e4d59640bdf9d2f9d029d0112bf8b62c7707e99b928c4ec18babe";
+      sha512 = "3e685d42bf1156dd736622b6ecba811dd4b3333f6be268ec616961088b2784eefda7ea0fae8440d9ddbc2a54507e90f33a801aa885baa70bbd82f0d2e0b206da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-US/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/en-US/firefox-54.0b13.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "1315208cd55f48ee05fcfc98c92891307442dc0bb34bb636e14a88701a1fef2229a62a0e8eb00e8028f460518c95c1369a198666cf67c4b09a0e69c2b76c75b9";
+      sha512 = "f9fce327dc51338160dfcfa22733f299df0598e4f2f2d0f86b7376e7582d10a183bc8eaece746bd7b598ebf0f07efa35f61ce1c5996e35d4d4d60a891a14d01f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/en-ZA/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/en-ZA/firefox-54.0b13.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "891b4a076239132976a4cc51a3a374fe244b6a9119f76303253d6ec9d62b8230ac9c04b657bc741b13ca291a9b75a7b38a4aa25471e4faa6f34f06000a7f2fb8";
+      sha512 = "1c6378b8c5ec23b8988b9232175213151adcf6b60c9d7d8f36874e21bdac58b55d788d588ca99ac7dbb235de619cd62fdd66f607f467fd681dc0c0dfc48e4a0a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/eo/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/eo/firefox-54.0b13.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "f805e9bb3d2241a366026354433670c2792c16c74ab2f5d3691081f682639b23c4e6d1e91e5e81719601c571e74270d8b5bc4f24e7babfc77ee435c6a2125ba2";
+      sha512 = "8f991d8e5a85e7890d868cdd5683f24ebd5fea2ddd01de9efdaeb1d8978c81ef36084603e76f487fc844a4261d65a467471bf30910ac9b0c33dad874cd1a5094";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-AR/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-AR/firefox-54.0b13.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "df78b4626f41afaba10331cc8921dc8f196aa2c8669366ae286a75e8850a647e7288964a8a323c742926d7661aa122072dcad592654dead9f57b8c008b61f7e6";
+      sha512 = "65c1099c7fd660ad90d12a0297729c6212336b9e06f96128fbfe7c52e419869d8db443cc19f4b61e86e4f7ad275952a7e7d570361e7829927d4507e20b95a964";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-CL/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-CL/firefox-54.0b13.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "71a340f8b004f3907eb763bcd817338be19955ef447241a6a680381823591324df9b9771425255693b49513a8f4475fa1ed8558e5a510bcd370bd225469a5f69";
+      sha512 = "ffc3863b8e25fcbcebbe01fa0ba28070bb97813f87a5f4f80eb25c7bc96df133140ed9a646438618ab297749890d0860c65ea77284ca101903b064b975a5e2a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-ES/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-ES/firefox-54.0b13.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "a34dc5ceef8875bd5d15c61ed9ada2f62b52cbe42636675cfb6a3df694a0fcbbb3b0dd61c3a0ed5b18e7ec427dfbf58887b91a0ada596dca04b3d2cd066123a9";
+      sha512 = "6cb1a2b2c1da715733ca83e9a1af5e20c313887b1973010b1871be3e5b1faa35ef81c4e3c1c0084d23bbfb2b9151cc684179fc285852115cf3f79fc3538e93ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/es-MX/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-MX/firefox-54.0b13.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a178599eb6454eb9a463fea5704b49c720cd2f9df033bd6f271322c75a5f2f52e82661c82f9ff9097af28ba617e2393979b28209758df3710ecdf72d0304c5f9";
+      sha512 = "f54c7a2da3a00cbe3c744e0234ff8f258a37f67590f92a271df313a87de1f15c05387b83525dc01029fcfa2db536809ce24cce1d067c765441d6fe6909aa6eca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/et/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/et/firefox-54.0b13.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "20e3af6d1f7fb7f154e366ee5e031889f3f24e04691a3d2915f4405f33e7220dae91e6e635ae98451048c254b7a08900851f013e7979c013f84b643635ecfebd";
+      sha512 = "af3ec37d2edf1d0f0f7da6de779923b0bc446a066443484241783b8a76fd96a8b2ae7044967b3d4854349fc6f0bd18b2032a50272ffbebb1a53f851ec3d2ef19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/eu/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/eu/firefox-54.0b13.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "d13833a0eeb5b4c37baf6d1f85adcb3502b67219aef6ac5b5d25914fae90cf78284830acba0e8d6c76d8ceef7fbe3332d673be125325b9bf53f24d4b070e6998";
+      sha512 = "504764ad92b0250b203bcf8b42c6c2eaf0ddf4ac0b5a3419b9c4d84f4ef4e50e3275079514aa89595a3127162c139078262bc90e0b998922bd2c06f8a90f9f7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fa/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fa/firefox-54.0b13.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "fc4a1d2c1e635de2094a8fdf3b082c0407bb937f089ae33c0f429e0c0bb41a7c0cc3158fdd1d01e81cbd01213b452301e2ba83a9dce1810c8d7c8adb035ba903";
+      sha512 = "8c632dc5b05a2b0711e917a4d3599775bdbb59aba448f408660e7df02f3aa21313301b4ff8b4237ab7ef9c6e61c5b3331860d79413abfe447dfd262ca4d817f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ff/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ff/firefox-54.0b13.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "1e4626d053e7abf236fc795f59e7dfd8053048fa1d0d8f4585efe7ea872a99511f9053e9bd6a1ae1af22cb3ff399d16d33c1b45a7b3c6557bda49062d1c672cf";
+      sha512 = "b37986236fa7467d513b643534e0b4fb7e9676dda8856b6600ee2287b671cef974c4fd781ea1254e20ae66445168e2fdf2fff1e761f489e2a0fd6d0138adcdaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fi/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fi/firefox-54.0b13.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "dd8ea8dea6f76f3c5dee63abdc187f69e949e0b6b11126d4219b38d1314ba6ac77cc789e0923fe9efb26167200187cb236a783f7aadde64f20798d44839236ef";
+      sha512 = "57164b97daf88d76e7e3fe73463d1b583893165dcd79ddaf824e76e0e8fc182f9e4c168ba5a78091d5f2cc7af0b36bf538b056d5837a5dbf1d53d0c29c0de5b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fr/firefox-54.0b13.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "9124a3c541879fa6f886555c93b1e07f431eef0d0b864cf414d2bf5d3cd749e30c65db4fb85a16072260f656598066cb8957d667aebf07f9067646e11fa09ad1";
+      sha512 = "5e29ce0a9890cd6679a0f7b2b074f27d8a0f4c0df00c0bf15fb07dc5ae7d4d5147a3a21412d7916c00c67befee21febc8399045ef90f9c776d77853488551d1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/fy-NL/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fy-NL/firefox-54.0b13.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "2ff6aed7c4b172b5dd801d180a7b7e945a4f39b8b8001e673bfb16b868a2079a2c741ea1a0b44c6588468546e883c6057fc4787eac64ca9b10860b7d538fd72f";
+      sha512 = "023e82bd8d6fd4378d88f063b28b92254440c9eea4306fa046b1abf31ea91d43259ed55c330f788cd686d152e17c1f94626eb05ffd0cb27857070ddb8d546298";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ga-IE/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ga-IE/firefox-54.0b13.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "163994a889e92bc84999e0c827f7ed0d162b43b1046a0391a851bd826730ce1199fa54a0e5dd549b3f30e197a8535ac5b4e1cb99f7f7a8706f7ecdd5bc125cff";
+      sha512 = "249f6f582f5cf7adc8cd755e26c44a3d48712b10f65a436cbb43332dc7a72b3d11ad20c4d456c7c685d174243166ef1ca11a834c155f691249bb1de4a157b996";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gd/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gd/firefox-54.0b13.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "324c856b4f0505bf5481ee57a2549594739dcec8b2a57ff32156c724adc001dfaaa2202b0b66a30565061f4ad8719bebb382ac5961c960f4991e9ab6488f2195";
+      sha512 = "447a9ecb093576cad7dd24f9c9d8656d31d4b23db33f76ac35325bdd8cacbf0d64625734aaee4d5849b9f450dc7f4300af8ea284ccb0fdf9d1532cfa74556613";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gl/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gl/firefox-54.0b13.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "1b055c927c318d09ade13b64e50cb6ed03e10676535c9171ff3867200e8c79bd175b08b89377a4ef86f92f91977cd8a6cbeb48ac8beaf6576707d14743299227";
+      sha512 = "cd0ad5f227caa5bd3213ac35b9cb73c315b23d9eba789a192ae21265a81ad85a5718ab088c1ab9ef7242df5c3e03271be333a59c40db55744de1b5be3e066e33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gn/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gn/firefox-54.0b13.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "7ef12effe16f92e87d98c71cde4f3f7303674b124a41d174e57a9a4bbca0c6cd33cf8f39bbf72fc693355b5a054fc8c6ef15228751eef52a1599b280c9a17801";
+      sha512 = "918afbfa4fb7cb8a553cea7638f0ae26ed6cd360e5d1dde81c2699e4d9de24583a126cd75ebde7a6b4a42cd9b220ac1472a1b96d9c63ce5c53f241f6008a2264";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/gu-IN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gu-IN/firefox-54.0b13.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "6437e9fc0e171f48c335fc7c6b7ba327dd9419dcd293449ecabef1a6a6546dc70c38099abdd42e5f087290a256362170fec02ca53ee33e8883f4c654c9382e29";
+      sha512 = "d680af2d9e62d7460d1c683bd17ca079022e3641b14d2c51ab1deb226c6f68a9f0228a0a394b683d4adf27268cb68af87122725f4b3e6556a61f231a1472f2e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/he/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/he/firefox-54.0b13.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "ed8e6b961458652c273e443a29f4640b230044ca03d6da22a374704c800bbf8df4f7e984e9d3ec936153263cf29ee066c4fb6578ffdecf9955b7f65f10c26828";
+      sha512 = "a2e79d3e819c6f161d9d03b3c2614968de2d7ae266c56ef928051a8682e3edae2cb76f850de3a33e475757570f79d2c6cb580781424c03f1453d9f82c558e7fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hi-IN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hi-IN/firefox-54.0b13.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "091595a3b68c6951357f1a8e417a8ebed56c41fc1548c8aabe846980c4e3a769795fc0fc7e4cb1af47be2f4bf77b691269018d8ac2052f5acc5111b752fbafb0";
+      sha512 = "7a4b6a513e70b0645a9b96d2b08dacee9f14ab2d6209b82937fe4bbb7b08b4af64e513921baa17384e66a5f61c18f5fb20c4f70a99afd878cbfa1f42a33befc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hr/firefox-54.0b13.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "4dd4646bedeffd0219e1577e61f4e17f5c2b67b78cd8f8001d033dd7d4f906d0ac8d3e6d5500fa8a4aa049be0f7aeed967909d6cfa13b97fd1b9f93ac7d7b687";
+      sha512 = "102726454dbed95a25e17a5bc438fa5c78f3c17fac6cb91537007c58e3d12199e0341e6726c16dbc899a6bed37efcb9acafba6ab1b73347a7efbbd7b9e049143";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hsb/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hsb/firefox-54.0b13.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "8cc10487146e89e1728529271b6a9e3e6ce6260d495ad0a013c5489da06425ff9adb88bb521ce8bb90c0ac5e21ba126147d23cefe716b2708bf084d39d70c800";
+      sha512 = "6aa930b7658d9347b2f17acd829d71791e289aade826614d6515ff5f8596ed9a95fce0a63df18a98ca28e1dec7bc15661f2f55905241e698c27ba4ae20303fa9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hu/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hu/firefox-54.0b13.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "5c15c474ce885c88d863f1f22e73d300e0defeaf61009b939ea6c2e62f16a6fb3693a3dafdf264e83c618263153d3dd81bfcacbe5c9f701a28530d17b38d8189";
+      sha512 = "c4db23836c13f371027145bcc1e6c9e8096c8299c0007fac948ddf46ce2099f7c1a5f0d8415d6cf42ca83cb08cb61f86fd3927f07a974055517e8bbec72a7894";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/hy-AM/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hy-AM/firefox-54.0b13.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "fdd30dbeeb08a07822de29eb0e6ccb9df895675546054c75b4bfb0cf1f427488cfad9e2a1f541894cf366ddd1bb03e8eb4a75c318a1f80b2cc967a5b4ded8b39";
+      sha512 = "b66112e99b41c2c357d285789f636b9f6f4da848ba4ca013c7d24f7338b1f724f6f81651faa9f82bb082a9182ff9d4fab442eae581117d2d02493f215bca621e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/id/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/id/firefox-54.0b13.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "54734428db8860a7ae9c1543c341a5dd53f6e966f290a176e69f4fa66c2a4bcdd25075c5ec5f311adc033abb85e525b2b7426e113743632ebed07abaf31dba4c";
+      sha512 = "d0d9b990e145730396a8b88bacbecbd320f3ab9f2e07bc9f56493900b93693ea7ca04ffd077229e488c847014de8cf16d481ec078a4b30058eef73903c5dff9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/is/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/is/firefox-54.0b13.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "6ee38f9506403f3cb57c6b7f971c599ea1a2e77cbd5424bae209390a20b322f0b527ea4a0be93bac8976cadb5080d22e262d6797b4e9257aec232e768909c235";
+      sha512 = "a23c64f8dbfa1c5a6bb2e31fe2fbc80d02485abeebe57e091cf101355e07532fa2e1d75ba91f4c5a0cb112dd941440f8f2b83cbeceb17eea026f29bfcaa37779";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/it/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/it/firefox-54.0b13.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "71a1d593554466db36e09aed429d07ac9ed563af33959c899319e96e7d757e8dfe912a8d18b52cc198a0c4a1c45226406bb56996bc199b67f79c6a3aaea7f6b9";
+      sha512 = "e7084183c5bcadad2eab62db7276c1342522da64996f442eb9ea0dfb3354c5f75f19acb53d937d055d8723b68b4445580b7bcb8328a063abd601614cff501542";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ja/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ja/firefox-54.0b13.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "7d38e749f69ee99bcb546291b09a0a2b51b969bd4fcea50dc4f386cb951ab8a025c2ae8746c9e1d6398024d7904b63497421fc16f4f061babd0efafd17ea52af";
+      sha512 = "0f8e6cdb01c5aef004ea12b63bf24797276676ec4ef0a3bd63b596552322a33cd8905efb075259955189ff5952c99738a1017cfab8dde90ffe90d978182f193e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ka/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ka/firefox-54.0b13.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "813069de2be9e1b299bbead6e2078d86d3a382bf6d502c5f96a9c10c9571f4dc79127b450760d994e8fe41b3afd966fc70cea60e798432c7b8aa900d3d715bb6";
+      sha512 = "6e1556802092f186cd57edc995ce53b596ebcc70fbf37dfde19fc8884441b5f84431e9c8b023c93578c538ac14d5d17caec96cbb6178f330f6105f21133fa07c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kab/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/kab/firefox-54.0b13.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "e1c562cf189a60b15c94fdd681007b4a64fe3e275900c3c78d492854fa28eb61ff30ab65ce7d3537170f28d51ad543e1b306b94d1ef6280b0b03b466fae9edf3";
+      sha512 = "9e25fcd718b65c66c8e99a5d63d06603e120f518c36cabe47cbea3ba9d2b4b61d9baa805a13c7860cb22405d8a5c2978fb2fee1e911dbd2d3d87ed2d25b4aa95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kk/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/kk/firefox-54.0b13.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "be54a4085ecccf9d2dbb8894872d73d3d261a8a75c755fbb91ac4c1d8bd3ab696b95a25c87f0d509ab250b53470b20aad3255d128296928c591d45b2786c1cf3";
+      sha512 = "0411b45af993bc0df101640db9c13b8a041f9e73712b3b41ce8c3b92e0174d366279e8e61a286982ba0214ed2dbbd6b23bc940a2f06947bfa534d8fa9f3574f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/km/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/km/firefox-54.0b13.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "6369eb361d1ee31d33b9780072c1c49926fc4314168e5883ca71cf864765d7758d51db55f5ccda231e24ed4b65d2665b5fde7a3fcb1524a04e7057490e8b2308";
+      sha512 = "621de21c64bb7a10aaae1bf277d2a869a2897270f6075dce9c543b6864be03221d278aae9b6ce7d67af5024fd9c5ce807e7f6c9e9c5b9eb8206c5ada0460fc70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/kn/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/kn/firefox-54.0b13.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "671165858cedd7f4ba9173cabe9532f08de780c967f6af085e73e3ac97f156b39000b3b672bb690cc40691d3b9b6b9d20c08883a1f2a1da689a71093096642a1";
+      sha512 = "f446dbacccb0bb89c48137166aaeb2ecb781f11441b6610508cf3119759cc8a1c12ea713e231e6c05ea4001c2e7a750d2880765ba09315d3c593975a7bec8035";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ko/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ko/firefox-54.0b13.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "04cd3b277dc483cddcf6fbb79687b3ec170d33b0eee46717d645358df0f224c86f36723442e4d28e4460e663b3357f3d3c7a7aa1ec594013a8d91d030e08313a";
+      sha512 = "2d941257c88db0617c230e877a48fa54a6753cb1c46897b92c752159e9ccb0300cd7916d9854e7671688394d2e147330fa97e16a716ce1133b0f0c37727a1553";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lij/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/lij/firefox-54.0b13.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "e62b1481001d5d63b65e07b527dbfc29b435f659db7237b411105711a601d9117d62f71dd93849b5ebb8dd0dd4e5981ffe9f318aff2e74485580471f672d5b6c";
+      sha512 = "6705fa1ad8aa7fb4a463561a2c91c8f6a70d491418877d3dc6a9d98c903f3367e649d66a6f1b7b1ad417fa65b0cb44a792a49db479842eda27ab5bc5791bef5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lt/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/lt/firefox-54.0b13.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "f7cb9819f955f7b32439a7ffaf0cb57351bc25be579646d00f945f04152f64c9174bb49c99ec49b2d5c053634c73872a5b4a9615fd66744d0b5c650c9bbc67d9";
+      sha512 = "246416023a4a2c8231ac60a5339c3164301f2d51a2ed6bb23f58f0715b6eb834f874b992268639e7d2000ec41a404b61c5ad191a218a3fe68f09244bc8fd8b3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/lv/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/lv/firefox-54.0b13.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "e7cfab908f9ea12c77ff0a76d2283e205c9b3751eb16a5dc06171e2cc3315193c6010faca943341e1a6496b48b3d90520308c53d85677cc18014fb8560f7714a";
+      sha512 = "e47f984c68e98927e15d66b62588f8a159c012bbfbff931625e297e28c8a1b2ca06eaea60a13d62392d8fd5285b2fb0cc42c9e4d68c1123dedf87964401d39de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mai/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/mai/firefox-54.0b13.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "6088910c06e1310097d09c6bd582e20928de56fddec03d7338faa9b9651900919315c15cffc601a0e4878ef7c8821d40d5e4d7e6998786b1cd50f21ca0e2dfc6";
+      sha512 = "7bb51a53327f85883b3aeb58a00cd78a5921fd6746f2110a22eccd38d735262c05d97cdd84dac1dfa29502bbfe333ff365d7ca163ed4f6c946156df11dd5d9ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mk/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/mk/firefox-54.0b13.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "d4ab8618c7945843cd0c9234ffa68dc61adfc3759a99bd174f66456038614497e3b389b0af452b3958c12e9b2755ddbed33e098c9e4c07110daf0bc5c4b874cb";
+      sha512 = "e94346e4b53c26523f2de965f4e0de11b835cba2dc19553a3a58cb789b9b1bcd146f37fb932184b9fef6d991db04f7dffdb9b838db758e159f654f6c24beb196";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ml/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ml/firefox-54.0b13.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "05d3de5e0565316ccad5ad407299f6c31071d48edf1ec44492e61b8764040f22a6b23230b74f256554f313575084c9d79504d3ef85451c9f73c12edd663c57a4";
+      sha512 = "1c2aabf2587e312ef071acd5e97a508ad2c5d61f3bed5ea36eaf47758ff60d5f46f9966e09954c15a0bd389d2351f3cc4fd36ccbbdf8fdfcb1cff92d8832e56d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/mr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/mr/firefox-54.0b13.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "1ba2e3529f379c8e77941ce42a0100cef1f2daab31d8b1a0b23bed898ce0bdc4cb3a873aae71c1c3f5789f35edf7ffd88e11902154a3aa4f3117ba1ba782b0c6";
+      sha512 = "0f04e81a05c37ef0919dc03787ec069a78de21154fc167ebde8c256738cbe23bfe2585e0c76eb8a4687b6d17bf69efa6fc142de27b30c519aa446e34ff6c52e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ms/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ms/firefox-54.0b13.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "7fe116ab0d79e7de3faeeebcdaedebbfba94ce6320b563ad79de7f3d5459cc113a1f10b6b2fb3c3b074d4a027f0cff9106e078c2945a62e5f3b828459c1e8d83";
+      sha512 = "82c95552769bbde10239ceed7c5f37d3d2dca19c7ca4556404e5340253f8396e66f88577b475f7f0d6a367a6ab1df556bcdfb1859ac9b673604555a396e391b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nb-NO/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/my/firefox-54.0b13.tar.bz2";
+      locale = "my";
+      arch = "linux-i686";
+      sha512 = "af03cfbcfd4594129a6e8812136c5984a62ac09aae238432ae69e825e767ab22c720005350fad22a0d3b774bf58e460f567c7d4438d32bfd6370b44f5fc19869";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/nb-NO/firefox-54.0b13.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "9625821a4ce710ba5f1b5f7416086d4e33c67037e40dc0ad9a5d57049b4fd5bef9fd1b1c4c02cf6910465c641242a5ab9e596c962f5f4ace66b07cf4f0f85405";
+      sha512 = "33216bfcff1cbdcbd1aa656614d442a1dde16e033954065f7cbabf5ef065cf9f1722f4ce17989c3dbb822aa7b2e21818b9e7b25e0ea0da9bdfe157d6e7713547";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nl/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/nl/firefox-54.0b13.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "5ff420c38ec644f622aed733c599a505498bde48f2a573492d647745d7f7c5cee44b009eaccb8de458af813260bd19f9baa7f9f1e2dd946cde48f09510a885cf";
+      sha512 = "520e225e72413a9649ac0025a1c3fb9b58a2bbda0d28aad15c2608feba53e53e61dbc7f06ef22e655c3c2b77c0b1be853a79057cb08afc75900bd852ae8077f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/nn-NO/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/nn-NO/firefox-54.0b13.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "12ccce434da504753b38449959c97952767fa5af7aa2b0f58777f8775e4dac94d55d67e8d575f68e55e084bc65cdae101ad92b4654bcf345782bbe914d01f655";
+      sha512 = "c564b555844d104a82d6b02e35349778fd0afdc7dad20d8560713a1f32614557fe3009bed29bcabc16da245825cc6a4281a64ee0bc82a78d4b45b21a887e8d23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/or/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/or/firefox-54.0b13.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "3b456b222d39b5a69761da7cd33504fc64ee76d5d8e6e4ca26be158f562bad27a3322604a6542195aed1181f578a650b05200b1ba75d5d8a05e400014bf25660";
+      sha512 = "1ee6ca370ab28f36fd379daa2ba4259e715d6dd5905c72ae6ba05eef5eafd4ce08511c4c4134ccf640834e053d1993bee85688c108ee4cbe89ea5f8acad11f9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pa-IN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pa-IN/firefox-54.0b13.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "3472c5eb75dd40b68995bfed8542546a9f35e04ca8a7fe17465a99a94846ea696d1cfedcca2d59a47082de6d2261f1701950be3295f063e69846cc90d531f5e0";
+      sha512 = "d66120b15473b145f8b5429a1a683950eb5766372f5f1a98c3a3ed69c68b9220f5dc45e5d114a6bea83851dc9b4941ea735c75ac45ceb661e601c6069d9d7534";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pl/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pl/firefox-54.0b13.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "0a883e16dc997c748a6d76e32455473ffea6612dcb88446f331e43f9d247f01ae93e49827b1e222a2990e54e201c58aed2150e800080fa47b222daaa69154bd9";
+      sha512 = "4b6f5155e5b763a7a19cd230cb37a6864beb07b29e4181aaaf5cfbb9fc7bf9fc67cdb8bcd9b0a35780b40a7dc8744ba04fc73acebeba49e32bbf53250a78d395";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pt-BR/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pt-BR/firefox-54.0b13.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "34e6870557e30a75838bcac1e268796f670b8f5dc4e49cdbcc6e34cab5f8c3e4996cc73149d13a5178ebadd1f052ac5c2eaecbaaf0d3f4245080e71f8b86c856";
+      sha512 = "1b74ef30b836d7490b155b194ea6a9b1e4461d955f5f16ff0afaf1c1f1980dc1e7f60b600c2ceab1e655038e84574e4408c15fe0c7cf48ac99c0961e8a04b135";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/pt-PT/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pt-PT/firefox-54.0b13.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "932291baa2091d12d9832483d14a6e05568fa8d1d1c41f42d066c5efc13d7e511afcb953945334b9e7a573776bd2263c9e38a64f73cb44f4f8a32509e5fe5119";
+      sha512 = "3c5a2881d06820a3f54d3a2e73be720d1c0f06233114766196ac344f5f9f0ddaf0f9056367b5f2a7199ce7852e81ad77f5c55dafa3626afbda92a4bfdbf5db47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/rm/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/rm/firefox-54.0b13.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "7258b1c4a865d593e820220f5b48bfd1a8b9c4a7bdeac9b15208f5060ca501e03b72914b2b53b65164d2db606b092252f0abd6fd83f781ef0f330d4bb487dbb5";
+      sha512 = "d8b5fa46c953746a7feabf4dc0fd7526128f3268cc3fb92962d67d2c03afb61088cd82d7e5054ff14a4f8e0ea411e0734af8745f743412cad1368414593e0162";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ro/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ro/firefox-54.0b13.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "5fedc4a3dee59bcd804eee04ba07ee4b862e6ea8198d1a5c3383cf36667e2f15ef728f21138868b84c15f59c7b11760fb5fe293e8545840d1e5c98945f404eb7";
+      sha512 = "070ad441190f46741ac49c15d72264ac81d9a0576d382f5696e940482f6de6634bd5f8bdc1855d3e3da6040b632100d333cc06058414eb7f25acb12914de5e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ru/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ru/firefox-54.0b13.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "8e6a4f786d5db808ac5c63d4abbe4a53b941845a48fe2fb8dfbefb46e01e1053d591aa8bda63ee83785ef3cdc481593c86c804e4683455a2e27fe594b96a650b";
+      sha512 = "935cbe5dd97db312ecf7045bd38d8d3ac84e812da507256e9c5abe465e5111bd20131373c6aa43bcc8b6848dfb6d77e72df60b19d6378d808a6f8a095eeb1b03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/si/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/si/firefox-54.0b13.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "39c0c3487242a54287af42c9457ebe8882112954dec168630b8914896e3900e9799691bb88147927328c4c5f4b2078bf68e623e09ca2f62a4b7efb4e625bb283";
+      sha512 = "a4db271cf567f9010fb8c3ac1bd859c4bad8772dd26a068eed1c5f7c048fa969b5492f0b4e12ee221da6be9581790348253ae8838b4e21a8824718efb14b6ec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sk/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sk/firefox-54.0b13.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "e87215632b5f0264a04fefd631def717c3f6bdfe31817dbe855d7c6195b4f340af043bf613fa9f89ca4af4893cc6effb876eb51555a089880970315f7ad15e2f";
+      sha512 = "a617d8bd5cd8827f7858dc4a881c4da326e7909caa9dc20194f4a150340897bbb07e397918057265573f35c6cbda269b857cec31b90a9c41535d65f8c2e5f22c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sl/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sl/firefox-54.0b13.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "7cb036e5926b2ce9a03b27f37359b640f824f32a918ad8e9959683114755949ad7d2069f02e0206c2d67633ec9763ea612ec3e3e44dc5e881d4e275d1767cf30";
+      sha512 = "3ef4245014e3eebb31207e084d9c50b39ebfe16408f6b96bf0ddf66c9c69e9d717266152c643e2412358bef30d517f84ec482ffc57bc826a9d1a9474848fac7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/son/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/son/firefox-54.0b13.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "e74ea45d6b5dab67229472ab524abc805c5e1c91b7ba627d95f0fb5eb1310aacfcd73a4a5fbfe8d7d5546aba9d254297494b34efe81aecc7e261cce23b9e0de1";
+      sha512 = "2bbfcbd5945be669b779e58c0ac925b4d83836a3117732d5c85f9cc009cd87302e8ea5793d286951ec830ee4b8996413b3fb004b9d48eeca506cb289b99efa6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sq/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sq/firefox-54.0b13.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "8321933b4eec21e9297e446d62f63b4a7c69eef3952d99aa32828b76776c34efc9cc174ded4637c586a383558eebd2ce43a63dcb7608ea0a2568c03fa363e0aa";
+      sha512 = "c59ab2f574e605528d90ff4c25b67f1815e778458aac7ca4a7ed105668d8f59daa9ee4e4df33e62c359ce3818c4d717a520d99cb367c84f329321357083e1ae6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sr/firefox-54.0b13.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "a81dcf72785936754c04fe2e549795f612af671e360a653860dec811a65ad8e19cb6cba5fb205ee5925f364e49a358d459c354e26b23746a2e5deba41374115a";
+      sha512 = "80e49c1e72e12f63dabb6a73b3e05de635aa63f8523251a38d9762dd80aacc0ce2db7a37b8e4ba8cb804c2f41540fb5c9790279dd6a02c06bb1a7a1ff944b75d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/sv-SE/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sv-SE/firefox-54.0b13.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "1835da3f930b9daa37dc14785feb0d145aa9640278a4119b2a8f6168bb5bb385187914a625fcf3d88c3822ea62f338c2376c08831a2c4d8203a4b6c0bacb2d7a";
+      sha512 = "47569b272c2b42c0149790fc008894dcadf35dd82d64cfefb07146a75dba85e8052524151d7baf8cc929879342c4af7a8161d6df02aec7582bc3df4cc99e1c57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/ta/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ta/firefox-54.0b13.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "0a7f219eece161bb3ae9ef280457e94470d1929770123a9197c08eb320ca2119aac66cd7fc5181e4c0c1359514d0338d306db1322435abea70538f9c55d5d7a2";
+      sha512 = "1c64a7ace3abedcbcaec3d3ca884538aca70bed9c9c736a721152bb3dfa7c7b0a1f12305fb54ca2ba7658ce9c2f42bc2c87049e3e792b8548091bfe4e10824b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/te/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/te/firefox-54.0b13.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "10a412a83c75b8a7d4adc800c858d9f0adbbf7b2c08cf8a3d5dc494ecf38cf8a83cd3a462eda7eabdec73e194264b698f40a705458fb0916829b783c511fd3aa";
+      sha512 = "2a55a67577d2de5dee7b526a716b5061fc4bcbc670db5286cf8290629139d72325f086217689bc55a5d260f3d30b572360d62b01370685028acd9825ae748fc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/th/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/th/firefox-54.0b13.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "d5bd9c86174be82336f711d50dc75e6f252a468083354c0a1dff99f4c72469a1a789144ffab2beba65d3e43a2e8812955176f426b560bb000607bb683eed81ac";
+      sha512 = "22c796f3d0bfa8ca93654ac73a8e1be30b7d2d02a1700008243d98c4cd367b4b5e5712a2def5fd8b3a40d7deb3e638cdb4edc7e609d37bf7726b9fad69f9225d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/tr/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/tr/firefox-54.0b13.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "7ec4d2419a1afd9b23351ed896c92ba7812f4aac083e72242d21e0608c32dd5ac157c8d08a89991fd051f6fa0cc56507739b49cc94731a4aa83219d9c76cfc85";
+      sha512 = "8c50483a7bf1b8016349e9c9a088efac8750bb51bde35d3af78b82827f0ddf951a1605a193b3a1ebf6e03af1224defc48f9d0decfa317f3e1c507e20b1c552b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/uk/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/uk/firefox-54.0b13.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "eaebff23162685126416f9974ca6d4d20a8dfa320818c76716e695c6d9984e4591620185fc5bb4ea97c2ab0d042864525f9704d7c3e0fd222db3eb60fbbc63cd";
+      sha512 = "2dbcf145a1ec46a2239f0340e881228f887e8ada2c8cfdd4f77a0229440f3de7c4e7f40706973dde6171ccf45e2da41e77c1e5fc4375d857e4a2a74722dd9d10";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ur/firefox-54.0b13.tar.bz2";
+      locale = "ur";
+      arch = "linux-i686";
+      sha512 = "69acb4094d4a302c4c62328dcfeac0733576188b3e4548dfcd3ca9d3cf7e49379771122090bf99acf6e47624d2216a790b3593dec4d4a578b346139027e9d619";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/uz/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/uz/firefox-54.0b13.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "5cc21748974536c0f2e73dbd486e2bba1e5d44b4c198d94a6a4d8c3c0be925e89264a7201031903e1c4a41e4bd2c9fb558117ace9acb8f52051224c35b3558ec";
+      sha512 = "287dc219c456f2bd60cd4a1552d42f7656f6321780cfe11ef7b67772601d55c03eb8cc83d239b90e45a47869e5104a1c1aab77131c788693aad8bc86c61ec53e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/vi/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/vi/firefox-54.0b13.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "42ad1640ffd4c1f35addf69156992f87e1cf5925c8e5d5a1ee49a34835d28117918d3c7cc7087e258726f83e16e3e8fae14f6b8530d308b29606105c8a2f337d";
+      sha512 = "8cc0f6c83328a67cbad2dc3427678a985fb74863b0f7baf4bf65074771c1e5a18576e274f725d65901c1627d0a9a0b6ae1d815d28dcaf5c4b9b6d830dbf3c245";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/xh/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/xh/firefox-54.0b13.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "14f18ee698bf639d4e51c13f58257af6a4a87e912e14dce51b2052351005f66df501e5b28408079d6d6221e2419da55675d298859c65b6c40b94108a7406f5c2";
+      sha512 = "28d803a22ec0d5061edd6a8185638842e55ba5748b0f1ed5fca85ea9e7ceac33319e9d5b282b308f092c2583e747ed981dd731a0f375eb826d878eecd31f65a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/zh-CN/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/zh-CN/firefox-54.0b13.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "66ee019ea1694d8e16e16a39799fa0bf1b6fca66a39ed5435865c7d3fd9ebd93496d20c37d750a1e70006e11672ae1a603ea81781146a10086604dbe39c3f2d4";
+      sha512 = "0fd9414050a69c8731e1ca8fc8f1a5f721d7aad48114a9680550b133b149da043bf550d42102c6fc066392a5463697afd55d3f08a5f94cc755d961bb29e261d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0b8/linux-i686/zh-TW/firefox-51.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/zh-TW/firefox-54.0b13.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "2575b4111e6061f941237392f23254eabbe7bf7c29a5113fcd61780238fb22f5b9d8ca9df0243f29d40b69f65ab5fa59d8ed83fdaff96ebab0b0e648f9adc0ad";
+      sha512 = "3e460f2eae2ee0c40dc32138d6102aea4b47471f320dad3cff9884efa6e3bd23dba1c5b825a7a907ff6f7f7a08f145854de3d82bbe9bb85d518538822918c547";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index b6e8ac10fc9..dcb25dc1343 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -37,7 +37,8 @@
 , libheimdal
 , libpulseaudio
 , systemd
-, generated ? import ./sources.nix
+, channel
+, generated
 , writeScript
 , xidel
 , coreutils
@@ -68,7 +69,7 @@ let
 
   source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
 
-  name = "firefox-bin-unwrapped-${version}";
+  name = "firefox-${channel}-bin-unwrapped-${version}";
 
 in
 
@@ -124,6 +125,8 @@ stdenv.mkDerivation {
       stdenv.cc.cc
     ];
 
+  inherit gtk3;
+
   buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ];
 
   # "strip" after "patchelf" may break binaries.
@@ -131,6 +134,11 @@ stdenv.mkDerivation {
   dontStrip = true;
   dontPatchELF = true;
 
+  patchPhase = ''
+    sed -i -e '/^pref("app.update.channel",/d' defaults/pref/channel-prefs.js
+    echo 'pref("app.update.channel", "non-existing-channel")' >> defaults/pref/channel-prefs.js
+  '';
+
   installPhase =
     ''
       mkdir -p "$prefix/usr/lib/firefox-bin-${version}"
@@ -161,7 +169,7 @@ stdenv.mkDerivation {
 
   passthru.ffmpegSupport = true;
   passthru.updateScript = import ./update.nix {
-    inherit name writeScript xidel coreutils gnused gnugrep gnupg curl;
+    inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
   };
   meta = with stdenv.lib; {
     description = "Mozilla Firefox, free web browser (binary package)";
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
new file mode 100644
index 00000000000..cab4d330f43
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -0,0 +1,945 @@
+{
+  version = "54.0b14";
+  sources = [
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ach/firefox-54.0b14.tar.bz2";
+      locale = "ach";
+      arch = "linux-x86_64";
+      sha512 = "8f19c1210c95d5dbb845caa05ceb90bfee3dbc8e7ee630849766fea2e06b5eb20660d1c7387a89112daeb4b11bc6a05e274429bf48dfd9b6c010700c6998da14";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/af/firefox-54.0b14.tar.bz2";
+      locale = "af";
+      arch = "linux-x86_64";
+      sha512 = "daade55b9ed5a4390ec65498680b600fb1ee0ad9f73f73066236a376c8b86687480f11cd5c97c254681d3b227759e84ed292b3050ee368337514338ba918a688";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/an/firefox-54.0b14.tar.bz2";
+      locale = "an";
+      arch = "linux-x86_64";
+      sha512 = "41836c83842fb5429938964faca59a763a7bf7fc1d38611274d7bfc559ac9f167841d1b43deddfd9494508bdce515e2842684482bb808b2509ca27eb5a4937d1";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ar/firefox-54.0b14.tar.bz2";
+      locale = "ar";
+      arch = "linux-x86_64";
+      sha512 = "b97e47a261bee9e512ea2478c4c1447de4144928adc84ab251b951a650c20774b9c42fae2da4d033120a7830129e2c9196ee960a8de58a112c06704dee2e8451";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/as/firefox-54.0b14.tar.bz2";
+      locale = "as";
+      arch = "linux-x86_64";
+      sha512 = "c60ffa06a01ea84f28bbeb5a48ce4c60a95332fb90534465bb6a66d9aeac99d23ca7f8b8c38aea706b245f5abc482829365e7cc20dd683534e93dca14d89b3d3";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ast/firefox-54.0b14.tar.bz2";
+      locale = "ast";
+      arch = "linux-x86_64";
+      sha512 = "e0d798c61111c7fa8ec59ca54bdff1375576d83c94063edd2fd9a2fb9f15603e864f2daef85e760578305574f69e475930a7d276c1f4ce5cf2fc82af338fb276";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/az/firefox-54.0b14.tar.bz2";
+      locale = "az";
+      arch = "linux-x86_64";
+      sha512 = "262a818ff21e88763626ee9d1bff84308efd3fa06695b3f011007f808657ddca8b4b7de82542e43a4e4264beae88885923dee7571a542c9bcaf1a1a1be782242";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bg/firefox-54.0b14.tar.bz2";
+      locale = "bg";
+      arch = "linux-x86_64";
+      sha512 = "43a5df2c83b731e5983938a69f636ee3cf0977de21cffe57792313f30740dba696a71a8e93c8addf5d13ae1402d83a8bf4eb20fb18d174e5777fbfbddffc2ffe";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bn-BD/firefox-54.0b14.tar.bz2";
+      locale = "bn-BD";
+      arch = "linux-x86_64";
+      sha512 = "6797547ba2d94a14d0b5409e51104b8622aca1b6ec988a16deff7e8528b4a77b571484bf2f92a72716f565bbf707c4c72fbb59d67476e22ffabf23c7db1e7b96";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bn-IN/firefox-54.0b14.tar.bz2";
+      locale = "bn-IN";
+      arch = "linux-x86_64";
+      sha512 = "733c9889f7dc782656846bba3cadc0b0197c03233428b966f638ef3c8ad64881379e78742c2afbd4f9fc14f42de77145a24e26d4742294b589d2011f8cb65aa3";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/br/firefox-54.0b14.tar.bz2";
+      locale = "br";
+      arch = "linux-x86_64";
+      sha512 = "c3baa5e4f44c8e7fae99323494d0364b933231b67d164cfc5eb3bbe919e2cbeceb0d9d9838922def26639becdeadde5101bcb514250b8335d1fdd0081158cde4";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bs/firefox-54.0b14.tar.bz2";
+      locale = "bs";
+      arch = "linux-x86_64";
+      sha512 = "2fb80dec95921067a879cf836bd2b191d6f628122d813f22b242f1d6a0e605d71f74dece30c51c18bbbf35e64b20df4ad3fe11e8812f11f44fd98ced49fbd792";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ca/firefox-54.0b14.tar.bz2";
+      locale = "ca";
+      arch = "linux-x86_64";
+      sha512 = "276a1b0ff9df2606d6626203de6e22d3eab41f853e29dc87d478825cab41e0c8a93feef4dced6b731025135103922140b3e7c5f9e1fe49f02a1a3e09f3f3351c";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/cak/firefox-54.0b14.tar.bz2";
+      locale = "cak";
+      arch = "linux-x86_64";
+      sha512 = "a20244e8aa7a7d935fc948eb474f265a3695b23dac6dfbf585d782ab1c224f4a922de43c52317966ffa735e3dd38d0b4742f6a3b87edd545bbb8608fa0827ca8";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/cs/firefox-54.0b14.tar.bz2";
+      locale = "cs";
+      arch = "linux-x86_64";
+      sha512 = "a2bfb5f97fb367e16c2737f60ee269447a9ee92a9b2917183053d602713fece31706e7f1c64742893496c881d11b62c34e594eb5fd17b92bd41082a0f09cb7f5";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/cy/firefox-54.0b14.tar.bz2";
+      locale = "cy";
+      arch = "linux-x86_64";
+      sha512 = "336c46fdb5a8dab5dbcd6b75c3f82805defb0f8be45465ade68f5d3c5ebf0b080fb0694a220efaf9f7e5e1265c1e0cb151066f53542f8534c29260efd2e4e2b2";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/da/firefox-54.0b14.tar.bz2";
+      locale = "da";
+      arch = "linux-x86_64";
+      sha512 = "c3bbcaf4ac2dc38a2903d48596ee5c836baab94bdba016074eb8138c1f22e0d30281de862abd6823b0c4918660226e66abcb8946a26c30156f47efc946f860a2";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/de/firefox-54.0b14.tar.bz2";
+      locale = "de";
+      arch = "linux-x86_64";
+      sha512 = "f871bbc4cce559fad162d4579c46623a81c8a9faec2b0328f5f3e9492bfcdb64d5311cc8aa75ec3e8ebb2c0f2823193fff163a345e3cca43e70df0bd355e998a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/dsb/firefox-54.0b14.tar.bz2";
+      locale = "dsb";
+      arch = "linux-x86_64";
+      sha512 = "29b063bd654d9704a999c27265a79dd75dedab388b1b4ec3c52ca89a8d99e82de59a7f552f7ab0eac6b03b1469cf8882a70e439806be97bf3e0e70b3e34df950";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/el/firefox-54.0b14.tar.bz2";
+      locale = "el";
+      arch = "linux-x86_64";
+      sha512 = "a11b8d9bf8ea151d62a33bc0630570098babc02a09bb355d0f0c3ac0d316ebfcd9dcc786115ef1cc36e447f3697fec57511f77e678b401d2c75294429a4c66c4";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/en-GB/firefox-54.0b14.tar.bz2";
+      locale = "en-GB";
+      arch = "linux-x86_64";
+      sha512 = "9ddeaa9e89c08ef7e918d5d480e35e34df5feeaeeff2500c2a8a48bf5bb685fd29d74ee1aafdc4c3ff8dba0da7baad20ef0fcd522f14ab9a9e6eb739f8d1fb26";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/en-US/firefox-54.0b14.tar.bz2";
+      locale = "en-US";
+      arch = "linux-x86_64";
+      sha512 = "ad39e7bd5164c754d596c15eb14a07f32985dc86486774bf76fbc60f8eda4a9690df37295b1cb99411e2bd1c83af89498b133404c7180fe5819befcc194b517e";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/en-ZA/firefox-54.0b14.tar.bz2";
+      locale = "en-ZA";
+      arch = "linux-x86_64";
+      sha512 = "2a80bec8e181242482d5dd4f28b41a3290a473ca380f7a85138eca7814192fff70b8ee24c6f613fce201d5eacbbd221ba3dbac571801586af2a5c771a1a3d992";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/eo/firefox-54.0b14.tar.bz2";
+      locale = "eo";
+      arch = "linux-x86_64";
+      sha512 = "6b47ecbc39d16e1d142440ef58aa375f7987284e5b85cf7edb802405127dff89e3fcdffcc47a23148daa925e58af17f538c3f5520347d0ca8391ed6ef51a5a96";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-AR/firefox-54.0b14.tar.bz2";
+      locale = "es-AR";
+      arch = "linux-x86_64";
+      sha512 = "67e0fd7cd860951656b6dcf60450dc9ed5439afc0be8d6be0c549521c6f92bb90fbb2f941a8f9d1d96cfdbd6d1ba9ca3590a8866a4b48062f878917a570913eb";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-CL/firefox-54.0b14.tar.bz2";
+      locale = "es-CL";
+      arch = "linux-x86_64";
+      sha512 = "90ec508d87a799c3e3b6a26582cd1c6b6b81923d715ff6e2cb2b6cc7a88c4db78bcee0b5e53f27513aa763ca7368f5a23093e62a5be2b41289b4631464179a50";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-ES/firefox-54.0b14.tar.bz2";
+      locale = "es-ES";
+      arch = "linux-x86_64";
+      sha512 = "cae140a83a1be44b0e1d42e37d9718dde01ed3f9241cf98c62fce2319a9c73c724d94c65f6eb6f066bff644ad591111334ccaf32986c0d79f01194066ccaf6f2";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-MX/firefox-54.0b14.tar.bz2";
+      locale = "es-MX";
+      arch = "linux-x86_64";
+      sha512 = "778abfde377ec538ce3e1cf6bf65a30de7c5d6f5a1748f6e587bff5a182419577bb305dedcaa01a650c4c8cd1f078279e192d9a4c807f7afd38f4dfbacc55071";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/et/firefox-54.0b14.tar.bz2";
+      locale = "et";
+      arch = "linux-x86_64";
+      sha512 = "2a832ab5fde11c3728d4ab8f4802413f5da0aec9faabe3dfc58b1558f741182d093ba351f8b6c7cca846a014132770eb13775d9d7f345f57c7f4f817e2877fd8";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/eu/firefox-54.0b14.tar.bz2";
+      locale = "eu";
+      arch = "linux-x86_64";
+      sha512 = "ee0af554a7bab3a6661424b42360cd7ed85e68fa1436c893fd5796a54b0eaf01b86af77b6b33d3ce722ad897fc403187a55da3557c0ad767e70488a24f4c5b7c";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fa/firefox-54.0b14.tar.bz2";
+      locale = "fa";
+      arch = "linux-x86_64";
+      sha512 = "11944b7afe0df66d929760ad2bb7af3d1058573083c2f710ce52a1ddf607b6b4b28926a7c140044135fd7cbecffd338be08a94991b08a81edbbcfbf8e5b00ac0";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ff/firefox-54.0b14.tar.bz2";
+      locale = "ff";
+      arch = "linux-x86_64";
+      sha512 = "ae4b81503613f9ca69de12e86131bc507d7eb6c10a26ee5ec702fc7a98e22aae6254f04fb8a11c553cf1b0836c1112ac41797920a54988a2753c91f2d1f7ab87";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fi/firefox-54.0b14.tar.bz2";
+      locale = "fi";
+      arch = "linux-x86_64";
+      sha512 = "3049f77695c0eda7f77f4c6a785b5d5a70a6d961618f99ff4364e062efeb8629e966e222e4fdcb1f85b652358854cd7ef859e7e7d9f657c7157a43911fbd00c3";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fr/firefox-54.0b14.tar.bz2";
+      locale = "fr";
+      arch = "linux-x86_64";
+      sha512 = "d45cbecd191b05d219e71ca77a190a43b3f4ea2acaad12e442e960ce1df3fa3552378f5e5c8cfceca5b0cbba66eb6f7652986d4c907db8cd662f45d91b1216be";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fy-NL/firefox-54.0b14.tar.bz2";
+      locale = "fy-NL";
+      arch = "linux-x86_64";
+      sha512 = "701271caa493338d73a6a6fbafd0f48c8d6b548ea400146339155aaf723e8f28c3a3e4154cb79cb7a9aac3a77c6fcbc4aa155793a27a8f46a58a43ab6443f1b0";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ga-IE/firefox-54.0b14.tar.bz2";
+      locale = "ga-IE";
+      arch = "linux-x86_64";
+      sha512 = "0dfa071841e5609302dee5525788fe37e705b7c4ee78c05b718356eacdf48870a00cda237c78a5eff6c55d403ed0688cf64ba3895b7e687f87fe86d0f2e223dd";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gd/firefox-54.0b14.tar.bz2";
+      locale = "gd";
+      arch = "linux-x86_64";
+      sha512 = "03a29bf45820adeb9bb792e599dbbe8fdcfeefc7ffd2003d5fd9516951e8f19fd340fb0c0d05beb026de880806b206e3805184a6b5976848235ed97b110a05ef";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gl/firefox-54.0b14.tar.bz2";
+      locale = "gl";
+      arch = "linux-x86_64";
+      sha512 = "0f479c94f552c72c20581913bbaf2c0b832765f8cef3fa18e649940c5e4a4678dfb82e6fa61fc5dd70295c3de68556b671fa66238fe0b1de9afc4725c353689d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gn/firefox-54.0b14.tar.bz2";
+      locale = "gn";
+      arch = "linux-x86_64";
+      sha512 = "23290b9d07bc7ebf6b0ad4977fc1ce8a2314867c240f3f139acb43e7bb2fd44e127cc89dc338ca960096605db72667fc40a31824e8e915ec9ea6d89012d334fb";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gu-IN/firefox-54.0b14.tar.bz2";
+      locale = "gu-IN";
+      arch = "linux-x86_64";
+      sha512 = "52479a691379fa2793932380ad54f14019818158653e4a6e00e63298cf7eee489eb8fcfb62999d90c726e990a8df95b190cd59c7ddb54bf2eb04ec3181839054";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/he/firefox-54.0b14.tar.bz2";
+      locale = "he";
+      arch = "linux-x86_64";
+      sha512 = "e440421111559ba38dae4c1b2a5a02b551050426b8d294405a4cdc1f8e05ee226c0959ee1fcce894398eb3f9b146bb8cdbdaa44f57cfb4ef921f720864f74e75";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hi-IN/firefox-54.0b14.tar.bz2";
+      locale = "hi-IN";
+      arch = "linux-x86_64";
+      sha512 = "a911950fd9299543a95391fe280a0fa88147aabb0ed8cb1ada320537d3b02bd77c2528c018480039653be44a9a18878dd6cd0b91266ed30be0190dd365fff890";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hr/firefox-54.0b14.tar.bz2";
+      locale = "hr";
+      arch = "linux-x86_64";
+      sha512 = "085277f8e4949a6f3484f2e374ff82ff215d91772357e2f91327334f9045d97f42bea3e7cdb2eb8a0d25655d4a5001c3ae287134329fec209add20d24fe9a1f6";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hsb/firefox-54.0b14.tar.bz2";
+      locale = "hsb";
+      arch = "linux-x86_64";
+      sha512 = "02b9a28af54c9abf5f6bc0bed73e9ea6e14bc12bb23c3bd92673fa5422b4f77263690ba5f83a45cde0d6edb1cb67007f951b13b5bbf6f5c6bc7cecc43830f3e5";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hu/firefox-54.0b14.tar.bz2";
+      locale = "hu";
+      arch = "linux-x86_64";
+      sha512 = "6760b7e056e61e25f439cb6aba0de3e3624693097578e392c8f4b3a2fe3a0447cdeade3aed421bd6693059d9d6d52ba4df183e77edb499ff5bb1b440fbd95b9b";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hy-AM/firefox-54.0b14.tar.bz2";
+      locale = "hy-AM";
+      arch = "linux-x86_64";
+      sha512 = "4a5b0c868a2ae6ea6b1b133182c8c147dc10995f69b31e83517f05d150616d3c2c92daeee767ee44d22a691446683d6729de786efbd37429e52038ffc3b08910";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/id/firefox-54.0b14.tar.bz2";
+      locale = "id";
+      arch = "linux-x86_64";
+      sha512 = "245a1856af9fd7345e4925c560de1efa8b786483415431ec3a7bd22a7216296cb6d74756d8300d06d5b1c86ce1fa04eb807c050698d4777e9c9fd58308823ced";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/is/firefox-54.0b14.tar.bz2";
+      locale = "is";
+      arch = "linux-x86_64";
+      sha512 = "63e14be658c33020dc32bc974578f4b329fcfba60ed070e11c833135c25ebf8039f6fe968fcd3ee2a5d33b13f1ba8c23bb3e268eae20d86f56b9cfe83bb34a3a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/it/firefox-54.0b14.tar.bz2";
+      locale = "it";
+      arch = "linux-x86_64";
+      sha512 = "992610d09e22da69f6425b4a427181a2c69ef9bca7f94aaec8175d9f2e35885f03852f45d4b692ee780c470f3304e66696c33ea4f2abac6c4c928f1919280773";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ja/firefox-54.0b14.tar.bz2";
+      locale = "ja";
+      arch = "linux-x86_64";
+      sha512 = "c26f7772fb0b5f45b9aa5cfa8f1d7b34bdc97e7e7bc3e841ee39614cc5f345d6c45b5053827b5fd4f62180a36b1229034570d23e3f4734d276ff33916d8fb68d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ka/firefox-54.0b14.tar.bz2";
+      locale = "ka";
+      arch = "linux-x86_64";
+      sha512 = "4d6b1b599ec6006fe1f5d4365c4ccab4b3d496ef412986a9afc1a646d596ed2269b2d67f4c42af95afcbaeeaa4b8d5f4eaece649a22097484bf0971b8e90ddf2";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/kab/firefox-54.0b14.tar.bz2";
+      locale = "kab";
+      arch = "linux-x86_64";
+      sha512 = "0e1d510b7f1e7e345d119c41f31f8ded78ac61c6a05258bf6c6671aca1b4dddb16508e1baa68c130bdbe959f038a9add353c58fe3b1d02e76cd1630b87324897";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/kk/firefox-54.0b14.tar.bz2";
+      locale = "kk";
+      arch = "linux-x86_64";
+      sha512 = "61ee97413139b6e794fcfe1d318cca08f4b726dcb3f0ea21c7f9cb6cda16957d24db360f6cd547a2e0e6a6e031d1a200f4c8bcb9afaaf7e297fd80aec10d0f9e";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/km/firefox-54.0b14.tar.bz2";
+      locale = "km";
+      arch = "linux-x86_64";
+      sha512 = "e6ff303470ccd2f5f98b722746b191d0a60cf53569e37f6d8f62366d975a1e7f71bcee51afd47766566561c1869956e81feaa7040add09bb512c0578714283e8";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/kn/firefox-54.0b14.tar.bz2";
+      locale = "kn";
+      arch = "linux-x86_64";
+      sha512 = "be552d120b3a39241ab90c64673974f27ac10576328448f7b23c4b4d395190ce32f4f215336e86450f07f5a222492467b7b481a55e7bd9aed6c131e23c09f756";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ko/firefox-54.0b14.tar.bz2";
+      locale = "ko";
+      arch = "linux-x86_64";
+      sha512 = "cfa83333a94c0227b97a7fc0381894d97afef80aaa0808031d95b12d79acfc144de525350c1b29a7f53d10fbcf53ecf0029c9203c7d4511af071ab0c93e55127";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/lij/firefox-54.0b14.tar.bz2";
+      locale = "lij";
+      arch = "linux-x86_64";
+      sha512 = "8332db66b531b2d685e9d9a3349f1d82c4185c0fdd79bf3383112b38cfddcf24c2379031443eba19dc5cd51e602fd9a508c09c7622b92f4423376393163c5824";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/lt/firefox-54.0b14.tar.bz2";
+      locale = "lt";
+      arch = "linux-x86_64";
+      sha512 = "00cc56db7b2711b8f8c91459b9e1cb19bc158b09566d9218663411adb084f967d7ca2f312fa023e26da31a2d016168ca748ad7fa7a81eefc1444474babbe338d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/lv/firefox-54.0b14.tar.bz2";
+      locale = "lv";
+      arch = "linux-x86_64";
+      sha512 = "2eeb912b4b787f82d0b997646d13e019dd8762b08ccde5d2823358df0515fd05855caf991ededc17aa9cef1c3524d59cf651f14a4c592c70fecf44f3b2fb0f1b";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/mai/firefox-54.0b14.tar.bz2";
+      locale = "mai";
+      arch = "linux-x86_64";
+      sha512 = "4e61c996041804cfac7c62c410fe0315f153e592cb423b57ac9b96070bda7d37cdad02e3e047319951c4a2c7fe1b41f06b98af0f71f876949611f7a52cff3c72";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/mk/firefox-54.0b14.tar.bz2";
+      locale = "mk";
+      arch = "linux-x86_64";
+      sha512 = "338d4b3fc0ec34edb5acb3a4e86b9e8b64d16c470303f0ed127d060c1d38b176bd51251eccb3ab3df19c140007d44ab6649983c0c9aab8daa5ea348f5b34dfde";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ml/firefox-54.0b14.tar.bz2";
+      locale = "ml";
+      arch = "linux-x86_64";
+      sha512 = "1c7f8fcf9a0cb5a8a18a21ef5c258d6edd26cf0b6b847eb64b0c4d8bb963b4814df06be0b9adaf4ebe1d384afbe76c9bb60609c9f9773e466ad8fdf36e4e5d88";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/mr/firefox-54.0b14.tar.bz2";
+      locale = "mr";
+      arch = "linux-x86_64";
+      sha512 = "ceeccd3c53a1bf3d3cff32cbdc8a3845db7c383e98b7666fbab71ee748ea57b8f103ab337e8cc08cc25a0b5c28c57748864ed098259ceff167faf4cf5e3bff8f";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ms/firefox-54.0b14.tar.bz2";
+      locale = "ms";
+      arch = "linux-x86_64";
+      sha512 = "d08fff37dfc1ab4ad2a629562a3294aeca275a4f86110e9a21839653849cdce9ab709228bea30e33b3b1695cf7a84fc0cacd1b068a060c5ad1cbb39553eb1299";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/my/firefox-54.0b14.tar.bz2";
+      locale = "my";
+      arch = "linux-x86_64";
+      sha512 = "fd5cad2fe03a2029b1cb63fff9807cdeb5555ce7b3e84f0a8ef334a41ee15f2d499221e1280c68fdb846393bc5aee86e2dbb1a5373873e4c50cda495cbac3475";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/nb-NO/firefox-54.0b14.tar.bz2";
+      locale = "nb-NO";
+      arch = "linux-x86_64";
+      sha512 = "baef1e2bded7e56a4fb3d1104548ca5e9b9a8a9ab5650c39ebf822199feafd960d24859bd24cdf652edaac8276a7b235110d1e3a7ef6219f6152d6e0a6c48e7b";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/nl/firefox-54.0b14.tar.bz2";
+      locale = "nl";
+      arch = "linux-x86_64";
+      sha512 = "ea47b33ab1b2b7de0d461f50d0784157ed3ff0eef3ce6753d9ba5c11372d182b887cb521afdd8697ade0c077c9a329ac0c47dae928aae68dc6e49b45071d45d5";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/nn-NO/firefox-54.0b14.tar.bz2";
+      locale = "nn-NO";
+      arch = "linux-x86_64";
+      sha512 = "54df10b892ff31a6decc0c4d3dda5687499512e21f42d69ea68823ee99dcf41e8f1f1aa99cb210f6d3e01bc07aff5b0a7b6e55b2b6a41627e654efc02645a461";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/or/firefox-54.0b14.tar.bz2";
+      locale = "or";
+      arch = "linux-x86_64";
+      sha512 = "eac033a46ab0de8deddd1a4ee88c8c4eb7d814ce559862b92fdc7a2f8a0549913208d4ba151a1a746acaff3d627916e6d09bafe2ad6d78ad54f01aa691be75c1";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pa-IN/firefox-54.0b14.tar.bz2";
+      locale = "pa-IN";
+      arch = "linux-x86_64";
+      sha512 = "cd6f0d6f30627d50011e0f193754815256b45200fe743e820b6bb6b98120a29936cfeb84676e92e9d90ec8f71774d8bebd57dd68860d4bd77339bea154cdf28d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pl/firefox-54.0b14.tar.bz2";
+      locale = "pl";
+      arch = "linux-x86_64";
+      sha512 = "749592aea4e2c18472981ee9d7b6d3cfdbe9c41fe2c0566c3e7eb62c0d910104a6301dfdefb19ac2972edfa65aac509ff485af7ecb73aed365d1a0b052ae63c0";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pt-BR/firefox-54.0b14.tar.bz2";
+      locale = "pt-BR";
+      arch = "linux-x86_64";
+      sha512 = "d6e8ce82e79368c9fde059e8763bc9a5b4b6927672f503f52f525a86eec4e39829790d63a009477d1cb4f27be7ef5624c9ee3b2ad58603d76eb5400a8a758754";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pt-PT/firefox-54.0b14.tar.bz2";
+      locale = "pt-PT";
+      arch = "linux-x86_64";
+      sha512 = "d3ec8279b1c4ce984cfc57b4b9dd67b923aa73314c21b87f5800e9c1d64d4d23ec8077dc571bdad068e9ce6ce7aeca2b358cf1b12cc6a05c24a58fb876630a4f";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/rm/firefox-54.0b14.tar.bz2";
+      locale = "rm";
+      arch = "linux-x86_64";
+      sha512 = "49310bc21921933c4daeb096c059730d69c22696121af66a4db8b305376fa2cdba73ac58201c12b8afffa751ac30e0f7668d6fbd811077bde055baebfe106bf1";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ro/firefox-54.0b14.tar.bz2";
+      locale = "ro";
+      arch = "linux-x86_64";
+      sha512 = "44bb06eb3de9dc5ba0b6446c782335a50ac058bfdd0dbe69801c7e1b2b55af8ce1a846527baa65afa251c062ad4e325403970b04e939aa9b25ae317b6354ac8f";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ru/firefox-54.0b14.tar.bz2";
+      locale = "ru";
+      arch = "linux-x86_64";
+      sha512 = "1278da77065621c5738a66bd7c8bf8fc361f6bfc8ae7b2d47a454bee53bb3ce47118b490ef0219f9fb56cd956d34f9b24ecb50ef2b5290f8731192b64cbcf413";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/si/firefox-54.0b14.tar.bz2";
+      locale = "si";
+      arch = "linux-x86_64";
+      sha512 = "5537d26bff86ee2d7249809cd47d093f980a4b882e72dbe0d97dab3c368000c2e25b6fbb762bcbf7249524c7fa40e65c9fc15a79004825cbc09be4ed62ee54a0";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sk/firefox-54.0b14.tar.bz2";
+      locale = "sk";
+      arch = "linux-x86_64";
+      sha512 = "85a544edb4948f0d828908da796f0d6bed5ee0370cba310acd31adc5adc3786f639bc86563904194302e9198f61c9d266aeebd48cf3a2b7d6a96f7dcfa35a75d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sl/firefox-54.0b14.tar.bz2";
+      locale = "sl";
+      arch = "linux-x86_64";
+      sha512 = "aac17e2a1ef5166aacabe96933d7179165a185da27da11d1810bec8ce15f9c738eebd3b1e079f03fea30b7079602e110a7c1d536a91ecc513cecbd20cebffc44";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/son/firefox-54.0b14.tar.bz2";
+      locale = "son";
+      arch = "linux-x86_64";
+      sha512 = "23dfa3759617bc04758c779b47323edf9a96f3d3fa655b72c6f2cd885fc9e6b19b1b34ba39ec8ad6a4395a6d502d8689fdcefbe489cc0673ca3df8bf9b64cb64";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sq/firefox-54.0b14.tar.bz2";
+      locale = "sq";
+      arch = "linux-x86_64";
+      sha512 = "bc7bc6da2111e0a211a75aa3f37736b7ee6d4c2193f7c884d0ce1b5b0d88019b24de9f7cdc2da1eb4649ac3ee7d06b3c4a580c4f6797ecaf65067178fca7a63d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sr/firefox-54.0b14.tar.bz2";
+      locale = "sr";
+      arch = "linux-x86_64";
+      sha512 = "50a6875b26453414dcb61860f6f595ea46e7563cc9231d00e1df97b6a940570a0bc370c99a76ef97d03dddf75b75842102b3d63062aad989b3620426c880978d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sv-SE/firefox-54.0b14.tar.bz2";
+      locale = "sv-SE";
+      arch = "linux-x86_64";
+      sha512 = "e8c400e7250e1d4f03072c674762d7eba488f6e9526139657ac4bae7ceedb6eb85b070acf7b94c609492bdc74534f4d1fa2404dadf3ec3c0732804afbd6d6d11";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ta/firefox-54.0b14.tar.bz2";
+      locale = "ta";
+      arch = "linux-x86_64";
+      sha512 = "7896fda2249da5444d3dcbb4dc6381005c79c9e93e2275261ee46f8b9b7a586250ac8722acccf1e4a0d5a4ef8a0c3d7b4cea1518e4dd9ff3d99ba49e9f9a99db";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/te/firefox-54.0b14.tar.bz2";
+      locale = "te";
+      arch = "linux-x86_64";
+      sha512 = "0868096328171e221db7a5ec57121682dbe0134300da0b520b68379e23a88e88817b2480673d508b76d61a91b010ea2daeefe711444c931352775d96b51e7e67";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/th/firefox-54.0b14.tar.bz2";
+      locale = "th";
+      arch = "linux-x86_64";
+      sha512 = "8bbdba7486615b3591bf396b0997c74e0bb3da0547d4f9aa40a1c2274d7eee6f11a866a1176167e38614d9f182c853f2ed884d982dc2219069a4051f7b41ca35";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/tr/firefox-54.0b14.tar.bz2";
+      locale = "tr";
+      arch = "linux-x86_64";
+      sha512 = "948888566da0b04eadc9135989f8c4940c6fe8edf25e3f093fcf81e39bd09b730e105f07c461844ab72a69e7782b6dfa24996768caa99fdf4dfe5082f1613583";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/uk/firefox-54.0b14.tar.bz2";
+      locale = "uk";
+      arch = "linux-x86_64";
+      sha512 = "d12e0c53ea756b4406e650f1b11010ec6c0682afcf6edc7eec4732322e82e0e2e4904aa5b3587f87b5124f98a3712bfcf60adab62ea0c8309e03f80e83d7ba19";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ur/firefox-54.0b14.tar.bz2";
+      locale = "ur";
+      arch = "linux-x86_64";
+      sha512 = "648267564541e466291a055180d2aed657931be70674e51c204f46c9effd5133d4bc35064902692194e433d609b727822d9bc9a0221aed0e538371acf6343032";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/uz/firefox-54.0b14.tar.bz2";
+      locale = "uz";
+      arch = "linux-x86_64";
+      sha512 = "afbc0b0af8882b8f14a965475ee9b4421b315dfea064b3d00bce51879448d8a22f64af95991e4290a545a2db77dccc97ea6beeb22ac10298ab71d9f423011467";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/vi/firefox-54.0b14.tar.bz2";
+      locale = "vi";
+      arch = "linux-x86_64";
+      sha512 = "1caddc6f94250d9142d99b9ba221f52f157e252b7b36bfce253b0ed1de68e38d859c6afd0be23e642c9aa7d51a82f04ff0ad1d63397bbcb6bf47b918a6d7826f";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/xh/firefox-54.0b14.tar.bz2";
+      locale = "xh";
+      arch = "linux-x86_64";
+      sha512 = "c03d230edc7078a3efa322d359e10b45b129689702704c8ec6ed869c7db1cf99b7f57d50442e2ff64b730ed5c72f39ced56efd9ac2ba65654b3a735f3a381866";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/zh-CN/firefox-54.0b14.tar.bz2";
+      locale = "zh-CN";
+      arch = "linux-x86_64";
+      sha512 = "0ee7ab138d09638b9ef34c7e5dd155c4bfcc13414fe91696ccba38bc0df3ec7cbbedc39f02c790448d9b0079a20b49c3ec47b02c29469ee6a1d53fcc7b9046a1";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/zh-TW/firefox-54.0b14.tar.bz2";
+      locale = "zh-TW";
+      arch = "linux-x86_64";
+      sha512 = "0dd312831aaa9801246e0124d80f239b4e7311a64d64823111e32a93b3165401fb27f484d0023751af87b204df22e4a7961db0f37787025babe195f185ac920e";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ach/firefox-54.0b14.tar.bz2";
+      locale = "ach";
+      arch = "linux-i686";
+      sha512 = "a97800319c06e5433e3b31ea80c153d03f203804c9013eff166b57b7dba3edbab74ae565a57565c36371f609d53a76ac2657965d8e2da936ee753d614ceb6de8";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/af/firefox-54.0b14.tar.bz2";
+      locale = "af";
+      arch = "linux-i686";
+      sha512 = "50ba89db1ba882fb84be61875caf147d29e0c7c64402088a95293b58f98065d49228d47fcedf0a2ecee9cf5d994303c2b8576cfa9fe1939eaf9ac2ae5ff89266";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/an/firefox-54.0b14.tar.bz2";
+      locale = "an";
+      arch = "linux-i686";
+      sha512 = "fa33fb132888398d38d1ce923c2740b0976f3f87f661c1c30b016a8e8cd60fa8b57d3f53e20b008fc6b6adfcd6b5c632f0550361b078248495dea8ccacccd274";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ar/firefox-54.0b14.tar.bz2";
+      locale = "ar";
+      arch = "linux-i686";
+      sha512 = "463593d809774306e88fcc3484aae8dc329580e5327f48f463f487493b3cfdc73ae6b943bc301227244d12869acf0c766c234868981b38c63bea673dec204b36";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/as/firefox-54.0b14.tar.bz2";
+      locale = "as";
+      arch = "linux-i686";
+      sha512 = "7d804ad62497a7fa22e418826677db500dd59bd6583729c8c1ff8d49fd13eb8979e35749055b707c0d9ef98af3c78a7e80f3b0609cbd34868efbe0bf7c7f166e";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ast/firefox-54.0b14.tar.bz2";
+      locale = "ast";
+      arch = "linux-i686";
+      sha512 = "bbc13a6cf87e047243a6aa17bda1ecb13aafb00f3c8baf84cd5e64db0cd0fb2dfc679cc8f1dcd1d877c7bf42503d716049c5fec163a946dc47f1ff72f495ab7b";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/az/firefox-54.0b14.tar.bz2";
+      locale = "az";
+      arch = "linux-i686";
+      sha512 = "b9357217c5f1ebe06fb6c1a399ac94637388e8866a291ad6bdcbdd0c6d2820bb2beb8b66d6e1c6557abd87835e857b50f01a45f8fe21aa8c053d44417b8466fa";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bg/firefox-54.0b14.tar.bz2";
+      locale = "bg";
+      arch = "linux-i686";
+      sha512 = "bb94f0186705cf5a0d9b377b1ed9b465cbf6632a0528dc6fb9697409a85ea1963f53b5517cc97fc16db13022da69d8bc43682dc80b54fb7b4bbb8650d8723935";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bn-BD/firefox-54.0b14.tar.bz2";
+      locale = "bn-BD";
+      arch = "linux-i686";
+      sha512 = "c25f755fe5a82a2bad51c8060e6c152a4e66901e9c2adb53b79e08f64bf2e673b83aead21ef83b28390b9506b65685a8c373b62ba1002f3f8ba59ecdcd530b73";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bn-IN/firefox-54.0b14.tar.bz2";
+      locale = "bn-IN";
+      arch = "linux-i686";
+      sha512 = "7291294306a82b9c6ebd2861715a9954169192909e096391ca342d7b82cf7b45855b1f9315e2f447749209b0c3979ea1545532b61b52ccefd68031028473f0a4";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/br/firefox-54.0b14.tar.bz2";
+      locale = "br";
+      arch = "linux-i686";
+      sha512 = "1c14ef7d74da4c9925b1891a60480e7cae632f95ed46180c77eae8706aeb3e778a6a131f670abeb2b2d4640edb265da4d3b848d993d17f604cc0fe6d3e322c29";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bs/firefox-54.0b14.tar.bz2";
+      locale = "bs";
+      arch = "linux-i686";
+      sha512 = "426384268d285b1c4e4ef14edc348cc2e6be1bd27abbdfd1eb1ac4cd4a9cf36c2e0af269ec778a36d413da40186adeaeede3aed6695fc7fc9699fbc57a48b956";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ca/firefox-54.0b14.tar.bz2";
+      locale = "ca";
+      arch = "linux-i686";
+      sha512 = "6c20671af78f50aee715e9d9583923c9df086232e9fbb6dcb7211ad2a2c605671fb1d5484a9b1fc35062bf568aae2d15c79af26e9d56692ed3ec51eee0584254";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/cak/firefox-54.0b14.tar.bz2";
+      locale = "cak";
+      arch = "linux-i686";
+      sha512 = "d4c5b4e344caf327a261e06fb0aff1d8071ec2ee61fb77ce2008eacb0ce4937b53d91bfd8e0369979de996c9db665302fec8278e6d024857fabe975b3f01b4d6";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/cs/firefox-54.0b14.tar.bz2";
+      locale = "cs";
+      arch = "linux-i686";
+      sha512 = "c0e10ef87dcf787a337f7f5dd14eaf1f327d248cf3cf2cc0b42b5e9fa426a19c65fcd83cf6ad5898b84f1d8cb70390aafc8e3b7b5cbf2880d9713e854f070b9f";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/cy/firefox-54.0b14.tar.bz2";
+      locale = "cy";
+      arch = "linux-i686";
+      sha512 = "b9d8bcd6e05d9a975fe9947d766012150fe504e26384b4cf42591b009201cb1d035ba1157eeaf8dde4c08e7d37814b7177eb46df0f4fb5cc775a62ccbccb06b4";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/da/firefox-54.0b14.tar.bz2";
+      locale = "da";
+      arch = "linux-i686";
+      sha512 = "3676798548d36ddb1ae0e9b17c970e21572882ec75d81f78d4d63d6ee6581338f75a934b257764c3d43129d139fc8d9be585568d105550b61b5c1146aedb3071";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/de/firefox-54.0b14.tar.bz2";
+      locale = "de";
+      arch = "linux-i686";
+      sha512 = "f42a2d8acdd380157bf145ba5341b574f5b065705e3ca536f99b23784ff4763c16decc784b62c6d0c6a98ffe088526cbbd6b07cc97c5e0a62268f073c8b8945b";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/dsb/firefox-54.0b14.tar.bz2";
+      locale = "dsb";
+      arch = "linux-i686";
+      sha512 = "80bcfed6c5788919b2ddd85942dd47ba4a0de1de33840fcc2a7b4ed18dff748c2665d12dcbf3a68ae09f9199292a466be02cf141478e303912c2efed4aab3f33";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/el/firefox-54.0b14.tar.bz2";
+      locale = "el";
+      arch = "linux-i686";
+      sha512 = "42bc0ce9c2b9a8e5d9655b921009820c1e0e05a48ff104e68533df9cd4e17e9acd19c8d9bd88d4dff48f851c9532f4e58bdc175f8c0cd14d1b98bedcb96fec17";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/en-GB/firefox-54.0b14.tar.bz2";
+      locale = "en-GB";
+      arch = "linux-i686";
+      sha512 = "cc4ae041a4595d6386a1dd24ca83440497e04f552d748566d4fcc1a17aeecc63771a130ac212d2f5a12f2691128c201f673edc3ca3ea76c808a44bb0a771c8f3";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/en-US/firefox-54.0b14.tar.bz2";
+      locale = "en-US";
+      arch = "linux-i686";
+      sha512 = "dcdc0828e37d46046c4793440d1ce236b53b67426bb9395f4134700d78027d01670b0948fc668f7ba38c2daa3f1909882441d056f1f8f4216773ff4151f2cb56";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/en-ZA/firefox-54.0b14.tar.bz2";
+      locale = "en-ZA";
+      arch = "linux-i686";
+      sha512 = "f8f1629e0824f14dad1d315e0a02356cc6581fb09cbfc89899071e376a5fc359820bf5c0fefad003cf714c344a4fdbcbfa6117e618e9d01fbdb6bce4ec2b0cd7";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/eo/firefox-54.0b14.tar.bz2";
+      locale = "eo";
+      arch = "linux-i686";
+      sha512 = "5360d73ea0fb4bf9ac0312a9f636ff3c350bf3332e1051a24b69b9f2abea038c9924055ff6b1b8ead926e20d6f4a56349312184bdb6d8977b3e8325a76e8491b";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-AR/firefox-54.0b14.tar.bz2";
+      locale = "es-AR";
+      arch = "linux-i686";
+      sha512 = "242cf9863fdeac1bce45d307ea666b3c1903778704f0e417f39a37afc22395d3ce231f4dd33b6e4e9ac31d256d3ad8926bee3ae2c22f062a981061443607b2d2";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-CL/firefox-54.0b14.tar.bz2";
+      locale = "es-CL";
+      arch = "linux-i686";
+      sha512 = "4978958d499534a8c6f330dfd56e1ef40c0a92bfa27115019855d8630d9c1b1bd4f26fecfd5fec866e44f7c93f8dbf93feb7e1247af5285c62562ff7e449cbb1";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-ES/firefox-54.0b14.tar.bz2";
+      locale = "es-ES";
+      arch = "linux-i686";
+      sha512 = "e321bf3bdac860f2bd2e163e05fecbbd002fdd5f7ac068ece7bf2352aa5a5efee184d47b0d4b95c2323cd786cc874ef81fcb772cc585b0bc217886e6cf588791";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-MX/firefox-54.0b14.tar.bz2";
+      locale = "es-MX";
+      arch = "linux-i686";
+      sha512 = "3a38e786861f16a6c228ea5416d2bd0ba643f27fa02bcc0621f705db537ba6e89eeae1f1c191bee6b499e4c6a1ef9af66df80979f32598b54db118bfe963ec79";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/et/firefox-54.0b14.tar.bz2";
+      locale = "et";
+      arch = "linux-i686";
+      sha512 = "d452515192a70bc20640d3cb6443c91dcd878ca354288d825426c6b395a8a299ee18b781da1f210acca58799ef34f6c6149f4fb758609ae7264dcc698e810d76";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/eu/firefox-54.0b14.tar.bz2";
+      locale = "eu";
+      arch = "linux-i686";
+      sha512 = "41939bc714c4cf0ee9a58ec99851329495a6eebfb8d6e7b3429a246497d7e917457958eecb273e2d4adc65d70a018534ed5692a1b2b6d018b0a03bf5d3babbe1";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fa/firefox-54.0b14.tar.bz2";
+      locale = "fa";
+      arch = "linux-i686";
+      sha512 = "7834266f460d0a98a4f863f03f77770a1a76a107dd9bd3cc44e5e26c40a310a08cbc51518aac8db989dc843ddd31f0bf342b58ee065565a06e00d81470d8eb13";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ff/firefox-54.0b14.tar.bz2";
+      locale = "ff";
+      arch = "linux-i686";
+      sha512 = "f89b33dbc852913b44658691c558a98881c5b9a6dde0a60caa7dcaf9cf7d833bb841216f9217616be8ef0f4343d5221cdf64bccca4960bb39430d2629ad4f592";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fi/firefox-54.0b14.tar.bz2";
+      locale = "fi";
+      arch = "linux-i686";
+      sha512 = "2bf12c99f929224dccb1937ca241610a741af9ff5af92fa06752c27857cbb7e3c6f9bee5cd453d7e88e9cdbe2dd57940a6b00069a2f795447fce943eca84a15d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fr/firefox-54.0b14.tar.bz2";
+      locale = "fr";
+      arch = "linux-i686";
+      sha512 = "a14d18ee73bb8665d86b603c8806391ab937f3571808034216d69aa2f8ab1a6b97d52d47c34f44ca0f6eecd48e5ae58142d25e840a6c14721f8948c387795c37";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fy-NL/firefox-54.0b14.tar.bz2";
+      locale = "fy-NL";
+      arch = "linux-i686";
+      sha512 = "6cffe5d50a37469b7a1f2ca62b9e05d8c2f2e5d9686a07ac365e34357c2827d95c767044a7f5f5fe1124e38690560cd99adf8b733df9d76275049032196a1af1";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ga-IE/firefox-54.0b14.tar.bz2";
+      locale = "ga-IE";
+      arch = "linux-i686";
+      sha512 = "619489d201b72f96d23be570e8b02654f851f4eac81cccc65e978b0ee69d4af5b205dcda42d95e3b2539959fd697807a0519a1da64acb3784830aeb53e263469";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gd/firefox-54.0b14.tar.bz2";
+      locale = "gd";
+      arch = "linux-i686";
+      sha512 = "9e198c4392396379057570a5200e41eb44ecf8c7b427a4cf9d307404d58d23ab440aa1f29798b38887959beea217bf3ab12a80012da66479260438ce45bb12dd";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gl/firefox-54.0b14.tar.bz2";
+      locale = "gl";
+      arch = "linux-i686";
+      sha512 = "6a8439062f17c97e76a7f660ce9d25461e92089494bd8b12857e08bd712e9c4ef300252fb6145335884dcae8ef867e562f0e4cb901f07c8a037eb7f03615d562";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gn/firefox-54.0b14.tar.bz2";
+      locale = "gn";
+      arch = "linux-i686";
+      sha512 = "6be9a7cf4c3727aa603747476a2033b24be6e848ab2e5f8ea834fa07e96af05774b7a06d8e004be975f6ffd83ded606486a996d0b7132e7759f81da43bf5f003";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gu-IN/firefox-54.0b14.tar.bz2";
+      locale = "gu-IN";
+      arch = "linux-i686";
+      sha512 = "c97c4ac9a0359a040d07e3a62fe0200c7eb767d4f4748801241a0aeaed930761ea306dad1789c8c6cbbea75a90e55a4f00e04c450a528e8242a3821af803a19a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/he/firefox-54.0b14.tar.bz2";
+      locale = "he";
+      arch = "linux-i686";
+      sha512 = "27597aa4743b1bc4dfc8c26e79d5ccdccab812b576ed8d2a1d6cdd5c6971fffe00dd10f69fe13e00cb972ca78ddf47822485c1e053e81c179d2a187c9b46590b";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hi-IN/firefox-54.0b14.tar.bz2";
+      locale = "hi-IN";
+      arch = "linux-i686";
+      sha512 = "5e9e484fded08a42b2499417327b2373e92d2321cc3550cec25e4f0462c7c4e22a1490c972f6b31c30776b858faf50345a03ee52c6a67e2e0da062837c07d245";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hr/firefox-54.0b14.tar.bz2";
+      locale = "hr";
+      arch = "linux-i686";
+      sha512 = "44a49025664ff4e5fb34a5d8d02e1dd7dbe581b0aa5d014c2c9e9c052be9957bb04d6d9bfaa0aab15963b2eafda2f2e414fcabe826c73d9286923eb5e8ce1300";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hsb/firefox-54.0b14.tar.bz2";
+      locale = "hsb";
+      arch = "linux-i686";
+      sha512 = "6a71f8e721270d1c450c19c627ed1212f56a7f4d1b3f3cfb5e72609c58f6e040d76aea4e57f8f15c912c5f35c7f7e91c604f2355b51551808399593548724b24";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hu/firefox-54.0b14.tar.bz2";
+      locale = "hu";
+      arch = "linux-i686";
+      sha512 = "8ac3c4c1b078daf9a671f22cb77f7bd056175b11d20606e710017b1cf564ed648264d3ce23c9e28ee507ff0c0f5bf78cf897a62df03c5ab5e25571c1c04d546f";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hy-AM/firefox-54.0b14.tar.bz2";
+      locale = "hy-AM";
+      arch = "linux-i686";
+      sha512 = "6a97cc2fbbf92050d1055dc288ccd5346284ff6927b05aa0467bb369dfdb1a2b54c0b57f3356add342e1221c391a7d381d2fa895bb0aded5d82cb85071582a76";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/id/firefox-54.0b14.tar.bz2";
+      locale = "id";
+      arch = "linux-i686";
+      sha512 = "19c32f612c53bf98bfc108f02adfd6345ba3d7c544d1ae93168f57d95e9360718fb57fffd8f205550417fb237639dc4e21e098f2a95bccf8598a11b464497a2a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/is/firefox-54.0b14.tar.bz2";
+      locale = "is";
+      arch = "linux-i686";
+      sha512 = "570c0832f57f46b398b6370a3f80439d3ea5bad1877af242f6c57b9a35f6bb148946b13475ef95c60a920cb51505887c09b6e2530fa2c802d09e4a1967847d1f";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/it/firefox-54.0b14.tar.bz2";
+      locale = "it";
+      arch = "linux-i686";
+      sha512 = "54e6f03f1e8473d407ac31267378eb5432ba7c366a309a646076ca2d02e342cc586ded7dbadc83117bd71a24d1654cfae63ee5b1b1ecda2cbafcdbca8009ab94";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ja/firefox-54.0b14.tar.bz2";
+      locale = "ja";
+      arch = "linux-i686";
+      sha512 = "e73625a90586b9b845f9a2870838a3ac4f1b194fd04202b60d00805506102f65fd1ab69a3781e86f5db5580c881b7570c1d611c3933c271c43d32e15c3214db7";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ka/firefox-54.0b14.tar.bz2";
+      locale = "ka";
+      arch = "linux-i686";
+      sha512 = "72c070a815511e483eba416ba4172f6ad4d026f2469d1b2b0beaa07cb49f219275b7612e3eb39140601c7d9aa55b0fa687f768ed358a3245c1d467100b6c0cd5";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/kab/firefox-54.0b14.tar.bz2";
+      locale = "kab";
+      arch = "linux-i686";
+      sha512 = "15a2566f74412625329444b2b95fa3c8d0873da9b40a0305b9d2add6a9494574e9350860e87ede63daed36f3347d617b0901aecfe7c3c20a8fe0e44e2117c085";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/kk/firefox-54.0b14.tar.bz2";
+      locale = "kk";
+      arch = "linux-i686";
+      sha512 = "f56ffefb3278b3cf580fd6506a1d1b69fe5a693f259cf630a33f0fab8ec413fbb49f1dc118ff389ec513288f346cbebf379dd4c6da6475c740de3133e5b53130";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/km/firefox-54.0b14.tar.bz2";
+      locale = "km";
+      arch = "linux-i686";
+      sha512 = "bb26a6a7a90cd0925f0e809ae904e7d81f9bbdb5a0e56b084f5c5bf22647ea19ef8d445917a03d5924ae551affae375eb2706c83efc930e7027f0753db168638";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/kn/firefox-54.0b14.tar.bz2";
+      locale = "kn";
+      arch = "linux-i686";
+      sha512 = "b500573653885e3452aa4e05a4dbf7bc9631fc9751b62e23dea013fc4f845a4e370848b53b999d416552c44a176304187ec2333bb51b2c4231fb52b6fcf3d429";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ko/firefox-54.0b14.tar.bz2";
+      locale = "ko";
+      arch = "linux-i686";
+      sha512 = "51e6ff26f2721d8750e230aac93def8579c9fbf066413977c8c8216b435c77ee45e597864b778b2e79ba01dfc9e994578920a75e67269c379f767f662bafcdcc";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/lij/firefox-54.0b14.tar.bz2";
+      locale = "lij";
+      arch = "linux-i686";
+      sha512 = "8cbf424675d8289648d77b3a4b3b37150762647b08941ca7f78fc67e2a5d6a96e800985f8861d5515d6d5339008962066dd5bd5fb16a04789a9101a158fb6d4a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/lt/firefox-54.0b14.tar.bz2";
+      locale = "lt";
+      arch = "linux-i686";
+      sha512 = "0344d94606aa384757bbfd07982762a66683cc27ea446c16ec3206fa2c0b299fab06462cc203a25cd0db5070e160daeda11047b2dcb8b4af2bcae130b6a1ed2e";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/lv/firefox-54.0b14.tar.bz2";
+      locale = "lv";
+      arch = "linux-i686";
+      sha512 = "8b80056b0d6897cca46fbcd3836096cfdc3c4824154b71837573eec75b5f4ee1d0e82cdf0dd1d73a651707aad7888d2413505154bffb0e56beabb379f5b96105";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/mai/firefox-54.0b14.tar.bz2";
+      locale = "mai";
+      arch = "linux-i686";
+      sha512 = "365cc9a52dae47e9391c95dcd84230d0667816266e561b5a26dec8e21b1b82fa891acb851cfcc70a162a852d2ce21492701fa277d3fe98d6dcd6f3cad1c704f4";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/mk/firefox-54.0b14.tar.bz2";
+      locale = "mk";
+      arch = "linux-i686";
+      sha512 = "2ee12219fcee798550da2dccebe800fc67b81a41ca7aa543d0a39cdc10fcc4db5d2503a9053fb2f46e76c34e3300a1c025aa87a639f74a2b14e8585487b7f949";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ml/firefox-54.0b14.tar.bz2";
+      locale = "ml";
+      arch = "linux-i686";
+      sha512 = "38bab91c0e1019369f9aaf84abf145045810a3f89b1f437dd3851fc2267524f1b23daa0668f60740678ed659e5ae1990d2e6798944e7f81621cccfcce60b0da0";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/mr/firefox-54.0b14.tar.bz2";
+      locale = "mr";
+      arch = "linux-i686";
+      sha512 = "011868a403e71693274139de118051dbd0d0c6771a5c780406672f373e5b7470183836bcc0c6aa67c3e9369d401e919def3d6889d0e1758ff2b5152a8f118bca";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ms/firefox-54.0b14.tar.bz2";
+      locale = "ms";
+      arch = "linux-i686";
+      sha512 = "d4a4891090b122f5ed2462c9c42f148f431c9b9eaad831698479ac1eb15ae41fa4355740f3fb44d7367a34e552c3313a44f43c76ebd2889990a546ba2ed5d61a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/my/firefox-54.0b14.tar.bz2";
+      locale = "my";
+      arch = "linux-i686";
+      sha512 = "ec14ee7fdef28210a232fc7a0fa4ab3e891d1bf59be498a1842fae465b1ea8738bb6bf24297ffe8b77e043772be3c5a4bdfeea4ef13ace543b050a25418544ff";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/nb-NO/firefox-54.0b14.tar.bz2";
+      locale = "nb-NO";
+      arch = "linux-i686";
+      sha512 = "7cea11945a09933f75efb1385224f49ff08f395669ef3b6cab296b02ac2e597e9b424c6ff7c08180b0cd3763b2772a7c288e9cc9c42dbe27e1eb285d209a62d3";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/nl/firefox-54.0b14.tar.bz2";
+      locale = "nl";
+      arch = "linux-i686";
+      sha512 = "25418b1377a9ed0a0389f5d4a04099197a2e364e7337368ca8c096f30b249a16d4988f3bdf941661f548bb7c478be5a74169dca9fd5d4800c56af5a6c93b9728";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/nn-NO/firefox-54.0b14.tar.bz2";
+      locale = "nn-NO";
+      arch = "linux-i686";
+      sha512 = "eaad38fae776a49f53448bd9e652f75299946b19839f440ba470afe5aa813c5e8230ce62388d923b411f662011c72cdc5d6a0c400024677b92183d13aa3af585";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/or/firefox-54.0b14.tar.bz2";
+      locale = "or";
+      arch = "linux-i686";
+      sha512 = "a055a1bba667fb338c55f015e5380fdea48bcb7a6311060412171a7dc573c76c087b74108d505b35b7738998516632df54143ddb5949946ffced477d408d3f99";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pa-IN/firefox-54.0b14.tar.bz2";
+      locale = "pa-IN";
+      arch = "linux-i686";
+      sha512 = "d93f23ac36daef173869ca9a0ab32d986b1acfeda96b2d277a6a555fda14f501c4f3c98f4dc8e77905098a0d20073e801f83e245b2654aa6c4e6519fd1ce3be1";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pl/firefox-54.0b14.tar.bz2";
+      locale = "pl";
+      arch = "linux-i686";
+      sha512 = "586a4162866ba6f4b0851278cc987389aeb5f4f2582241fae9337cb00a62fd909348046f57492af9872e0a41f0e3167698f80cb7e37ef98a8dc7cb8c13fecd66";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pt-BR/firefox-54.0b14.tar.bz2";
+      locale = "pt-BR";
+      arch = "linux-i686";
+      sha512 = "69ef7b9bc482bd073471383258b15e8bec77a4513502ae797bd1428e618525c8d2e037eca4ee957f6537ef4f3fd261d1a0e9c14d8597bd354652c482f315ab7f";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pt-PT/firefox-54.0b14.tar.bz2";
+      locale = "pt-PT";
+      arch = "linux-i686";
+      sha512 = "ad7bb1f211b5167c3a091f832248ff14c5f9d197e7065bd962245f8c2e1e54c0835d148f63b2760fdfb2e6720f4ac3f64c6f154267b5fae29683bf9d88a7d232";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/rm/firefox-54.0b14.tar.bz2";
+      locale = "rm";
+      arch = "linux-i686";
+      sha512 = "e25b7a201fa2a77f6f8b9dbe815e59548c598218cab74919d726281e27a8cd4b1dce0a89beff79ac21ff0bcd5c1faea3f436acea5405dd1a899e66fb5a7a7754";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ro/firefox-54.0b14.tar.bz2";
+      locale = "ro";
+      arch = "linux-i686";
+      sha512 = "12419f032ccbc2a7bd54f1f04de77d5318531426b6ed0030076b52d4330037ca606f1319606831f485ab994d0bbeec50455a770b0448c24c1731e137f9cae51a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ru/firefox-54.0b14.tar.bz2";
+      locale = "ru";
+      arch = "linux-i686";
+      sha512 = "79a76a1d54d4449031755a2298efeb60d94290f77a003263dea2d771975bcfd66a7a81e1eaab298f9c72eafc1cdf28060554a901a01bdf26ca8f39b1b927d375";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/si/firefox-54.0b14.tar.bz2";
+      locale = "si";
+      arch = "linux-i686";
+      sha512 = "d93baf7dc43228f94f2e38e9884f37ac638f69fe367998b86c75f5cd735f012b408b270cc86a78b18f86ba344739baef22ee022dcb8397d83dd341e8da63be05";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sk/firefox-54.0b14.tar.bz2";
+      locale = "sk";
+      arch = "linux-i686";
+      sha512 = "61e6388daa5f1ce30a313d2d93378bdd8119ae0c3d84b60f1b7caf5e78033e30602a808b0a1169d4017d581daab2e905dd03c202ef394ae765b083518b45a890";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sl/firefox-54.0b14.tar.bz2";
+      locale = "sl";
+      arch = "linux-i686";
+      sha512 = "3d72f18632eb1142da5ea6b9423a7832b030d246af261cd46516810c721bc9024cc147cfd5fbc7c3cfbbd8fbf920b543d23c203325baaac024e726a040715809";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/son/firefox-54.0b14.tar.bz2";
+      locale = "son";
+      arch = "linux-i686";
+      sha512 = "6a7a960468213dad0970e6793716aa4882f82c3dae1cc24c875190dcbd93953fe89a862d6141744d1cf7fafc6aae723c3d271094242b82d4fe76738aaaeeacd3";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sq/firefox-54.0b14.tar.bz2";
+      locale = "sq";
+      arch = "linux-i686";
+      sha512 = "170b0ff5fcd665c50dd33cc05ef5ba79d4b6b7b66c04c0e679c294e03395aac07ff8b47b7178f2b7075aee4e42e9398e911c670671cdf15f1f1a465f57c95ef9";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sr/firefox-54.0b14.tar.bz2";
+      locale = "sr";
+      arch = "linux-i686";
+      sha512 = "3f57ec3fe394f1a39bb4cf2f7017b52680d3d13b3147c6385edcf36885afdec0a0613919c27c276994fe30fd1f28b53ffdee99ed0701688b65cb6a0ce4ec6010";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sv-SE/firefox-54.0b14.tar.bz2";
+      locale = "sv-SE";
+      arch = "linux-i686";
+      sha512 = "021ecd06e900dfe961a527d7ac80e02d74cbe12daaa79db293b3c88d638fa46407523a5e80de193d6f9733954c8c309ec51337abf30c6f3679d54443c6f8247d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ta/firefox-54.0b14.tar.bz2";
+      locale = "ta";
+      arch = "linux-i686";
+      sha512 = "f5d624139725c96dea05a2bed5430f004da09c5e6cde7e82226589889ed6a6bbf5cde458cda787463eb7a71366678213fb04ca75f05c10385d9ae7c3e2144f39";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/te/firefox-54.0b14.tar.bz2";
+      locale = "te";
+      arch = "linux-i686";
+      sha512 = "d024a530ad5adffab0077644f119d0bd6fe538d9849ef2db4fedf0af299375de4b0035926041288957367d77ed868c85f95fba426e2c5d8a3021865d603204ff";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/th/firefox-54.0b14.tar.bz2";
+      locale = "th";
+      arch = "linux-i686";
+      sha512 = "37e4be8ecff2e594778710c4ee1f779a4e53ccce4fe38644122850f55071f9be025346ac3efd74dd8d7789a6772638cfa6d0e32028025269a8b1de1c4c39127a";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/tr/firefox-54.0b14.tar.bz2";
+      locale = "tr";
+      arch = "linux-i686";
+      sha512 = "a7897a83625bd5b7d0121ea62bb97bd0e6f802e6e010d27ef2f535438c62a7aafbb91b0a1194571e9bd35a673aea1527949b5da0ddafb721c82662ecd1f8db59";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/uk/firefox-54.0b14.tar.bz2";
+      locale = "uk";
+      arch = "linux-i686";
+      sha512 = "a4f133b7184d8a80777b0032012007ef12edb3fc9ffece00774deea31836e0b4ff9d8f372454db3c2d9a167298e304055fe59488996a2f3fcfd93aef77715f8e";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ur/firefox-54.0b14.tar.bz2";
+      locale = "ur";
+      arch = "linux-i686";
+      sha512 = "71d75174c843d68cb677676b318b2239b6f2e295b8014c13f2be5ef5d050d91182f5c60d95491e6e1afc25df98b431f6eee0b058607289baf14e28ea60716938";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/uz/firefox-54.0b14.tar.bz2";
+      locale = "uz";
+      arch = "linux-i686";
+      sha512 = "fd317b715c9a2eaf995ab95293652f61984f63b47e487e7e0c4e226d65163ee26ef13725d29357beab6555015fae0a6bb9dd273996bcbc0d60463cfee9b2af0d";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/vi/firefox-54.0b14.tar.bz2";
+      locale = "vi";
+      arch = "linux-i686";
+      sha512 = "a964992502ef7f2e32c9a525fdede156a5e9e0eb88224b9112541f706bb9162b5ba68dab049c99206b5afa3bf232489e8cf25149e012f42f9d299176e48ab990";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/xh/firefox-54.0b14.tar.bz2";
+      locale = "xh";
+      arch = "linux-i686";
+      sha512 = "ae4d335ceaa94e4b95a2fd6223d08087d20ddc666253bdbae17290f50fa0d425243aefab62d25362f2efee1dbf2abd7df4cf6acb5704ba487395e139060df6ef";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/zh-CN/firefox-54.0b14.tar.bz2";
+      locale = "zh-CN";
+      arch = "linux-i686";
+      sha512 = "c4975f9645aa875df6d948d9f89a00a1758843b7ec706814b6632d5e2b5f8ef272f25ba48ba9ea0b4b00e41d5d2fb7094aa1c7e2d1dd8b5e0715c51adbdd6e6b";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/zh-TW/firefox-54.0b14.tar.bz2";
+      locale = "zh-TW";
+      arch = "linux-i686";
+      sha512 = "ce2050031406d912f6c812ed6b29a07d0c41c1569eb28a4e4280544ba286fa088967b16113181ef5d2be14e00ac84c89d0bfa9b4c25c700874d1b514493260cb";
+    }
+    ];
+}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/firefox-bin/sources.nix
rename to pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index a6cf8c1c1e0..9c29d1288d1 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -1,4 +1,5 @@
 { name
+, channel
 , writeScript
 , xidel
 , coreutils
@@ -8,13 +9,19 @@
 , gnupg
 , baseName ? "firefox"
 , basePath ? "pkgs/applications/networking/browsers/firefox-bin"
-, baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
 }:
 
 let
-  version = (builtins.parseDrvName name).version;
-  isBeta = builtins.stringLength version + 1 == builtins.stringLength (builtins.replaceStrings ["b"] ["bb"] version);
-in writeScript "update-${baseName}-bin" ''
+
+  baseUrl =
+    if channel == "devedition"
+      then "http://archive.mozilla.org/pub/devedition/releases/"
+      else "http://archive.mozilla.org/pub/firefox/releases/";
+
+  isBeta =
+    channel != "release";
+
+in writeScript "update-${name}" ''
   PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
   set -eux
   pushd ${basePath}
@@ -80,7 +87,7 @@ in writeScript "update-${baseName}-bin" ''
   }
   EOF
 
-  mv $tmpfile ${if isBeta then "beta_" else ""}sources.nix
+  mv $tmpfile ${channel}_sources.nix
 
   popd
 ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16f324c7669..2f05fa6c42e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14047,6 +14047,8 @@ with pkgs;
   firefox-esr = wrapFirefox firefox-esr-unwrapped { };
 
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
+    channel = "release";
+    generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix;
     gconf = pkgs.gnome2.GConf;
     inherit (pkgs.gnome2) libgnome libgnomeui;
     inherit (pkgs.gnome3) defaultIconTheme;
@@ -14060,6 +14062,7 @@ with pkgs;
   };
 
   firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
+    channel = "beta";
     generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
     gconf = pkgs.gnome2.GConf;
     inherit (pkgs.gnome2) libgnome libgnomeui;
@@ -14073,6 +14076,22 @@ with pkgs;
     desktopName = "Firefox Beta";
   };
 
+  firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
+    channel = "devedition";
+    generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix;
+    gconf = pkgs.gnome2.GConf;
+    inherit (pkgs.gnome2) libgnome libgnomeui;
+    inherit (pkgs.gnome3) defaultIconTheme;
+  };
+
+  firefox-devedition-bin = self.wrapFirefox firefox-devedition-bin-unwrapped {
+    browserName = "firefox";
+    nameSuffix = "-devedition";
+    name = "firefox-devedition-bin-" +
+      (builtins.parseDrvName firefox-devedition-bin-unwrapped.name).version;
+    desktopName = "Firefox DevEdition";
+  };
+
   firestr = libsForQt5.callPackage ../applications/networking/p2p/firestr
     { boost = boost155;
     };
-- 
GitLab


From 3cb5d52dacba10121f7a20dbbd18a856f849a3a7 Mon Sep 17 00:00:00 2001
From: James Kent <jameschristopherkent@gmail.com>
Date: Wed, 7 Jun 2017 17:02:42 +0200
Subject: [PATCH 0491/1490] pkgs.python.astropy: init at 1.3.3

---
 lib/maintainers.nix                           |  1 +
 .../python-modules/astropy/default.nix        | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/astropy/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7bf7b43df65..b9508d529a2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -269,6 +269,7 @@
   kaiha = "Kai Harries <kai.harries@gmail.com>";
   kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
   kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>";
+  kentjames = "James Kent <jameschristopherkent@gmail.com";
   kevincox = "Kevin Cox <kevincox@kevincox.ca>";
   khumba = "Bryan Gardiner <bog@khumba.net>";
   KibaFox = "Kiba Fox <kiba.fox@foxypossibilities.com>";
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
new file mode 100644
index 00000000000..6e3e66167f1
--- /dev/null
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, numpy
+, cython
+, h5py
+, scipy }:
+
+buildPythonPackage rec {
+  
+  pname = "astropy";
+  version = "1.3.3";
+
+  name = "${pname}-${version}";
+  doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99";
+  };
+  propagatedBuildInputs = [ numpy cython h5py scipy ];
+
+
+  meta = {
+    description = "Astronomy/Astrophysics library for Python";
+    homepage = "http://www.astropy.org";
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ kentjames ];
+  };
+}
+
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55465ddc732..70eb2542146 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -141,6 +141,8 @@ in {
 
   asn1crypto = callPackage ../development/python-modules/asn1crypto { };
 
+  astropy = callPackage ../development/python-modules/astropy {  };
+
   automat = callPackage ../development/python-modules/automat { };
 
   # packages defined elsewhere
-- 
GitLab


From b5fc15610aba2d6313de513bf9ecab5de236c811 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 8 Jun 2017 14:57:22 -0300
Subject: [PATCH 0492/1490] colordiff: 1.0.16 -> 1.0.18

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

diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index b22a1da2264..7661db22cc1 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl /*, xmlto */}:
 
 stdenv.mkDerivation rec {
-  name = "colordiff-1.0.16";
+  name = "colordiff-1.0.18";
 
   src = fetchurl {
     urls = [
       "http://www.colordiff.org/${name}.tar.gz"
       "http://www.colordiff.org/archive/${name}.tar.gz"
     ];
-    sha256 = "12qkkw13261dra8pg7mzx4r8p9pb0ajb090bib9j1s6hgphwzwga";
+    sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9";
   };
 
   buildInputs = [ perl /* xmlto */ ];
-- 
GitLab


From 146ac9c77153521553f0beb5e26193800e052a0e Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 8 Jun 2017 15:07:12 -0300
Subject: [PATCH 0493/1490] qt5ct: 0.32 -> 0.33

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

diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index dd62fe461c6..016e9726ad9 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
-  version = "0.32";
+  version = "0.33";
 
   src = fetchurl {
     url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2";
-    sha256 = "0gzmqx6j8g8vgdg5sazfw31h825jdsjbkj8lk167msvahxgrf0fm";
+    sha256 = "0by0wz40rl9gxvwbd85j0y5xy9mjab1cya96rv48x677v95lhm9f";
   };
 
   nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ];
-- 
GitLab


From 7a134572532323900a6661e5f1fea09b6dea3479 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 8 Jun 2017 12:12:48 -0400
Subject: [PATCH 0494/1490] gcc 7: Remove `cross` arguments and don't use
 stdenv.is*

These changes were already done for the older GCCs, but 7 slipped
through the cracks.
---
 pkgs/development/compilers/gcc/7/default.nix | 71 ++++++++++----------
 pkgs/top-level/all-packages.nix              |  4 --
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index a14fc0ce246..5d3126ea0e9 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langFortran ? false
-, langObjC ? stdenv.isDarwin
-, langObjCpp ? stdenv.isDarwin
+, langObjC ? targetPlatform.isDarwin
+, langObjCpp ? targetPlatform.isDarwin
 , langJava ? false
 , langAda ? false
 , langVhdl ? false
@@ -25,7 +25,6 @@
 , enableMultilib ? false
 , enablePlugin ? true             # whether to support user-supplied plug-ins
 , name ? "gcc"
-, cross ? null
 , libcCross ? null
 , crossStageStatic ? true
 , gnat ? null
@@ -49,10 +48,10 @@ assert langVhdl     -> gnat != null;
 assert libelf != null -> zlib != null;
 
 # Make sure we get GNU sed.
-assert stdenv.isDarwin -> gnused != null;
+assert hostPlatform.isDarwin -> gnused != null;
 
 # Need c++filt on darwin
-assert stdenv.isDarwin -> binutils != null;
+assert hostPlatform.isDarwin -> binutils != null;
 
 # The go frontend is written in c++
 assert langGo -> langCC;
@@ -63,13 +62,13 @@ with builtins;
 let version = "7.1.0";
 
     # Whether building a cross-compiler for GNU/Hurd.
-    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
 
     enableParallelBuilding = true;
 
     patches =
       [ ]
-      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
@@ -122,8 +121,8 @@ let version = "7.1.0";
         withMode;
 
     /* Cross-gcc settings */
-    crossMingw = cross != null && cross.libc == "msvcrt";
-    crossDarwin = cross != null && cross.libc == "libSystem";
+    crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+    crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
     crossConfigureFlags = let
         gccArch = targetPlatform.gcc.arch or null;
         gccCpu = targetPlatform.gcc.cpu or null;
@@ -138,7 +137,7 @@ let version = "7.1.0";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${cross.config}" +
+        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -146,8 +145,8 @@ let version = "7.1.0";
         withFloat +
         withMode +
         # Ensure that -print-prog-name is able to find the correct programs.
-        " --with-as=${binutils}/bin/${cross.config}-as" +
-        " --with-ld=${binutils}/bin/${cross.config}-ld" +
+        " --with-as=${binutils}/bin/${targetPlatform.config}-as" +
+        " --with-ld=${binutils}/bin/${targetPlatform.config}-ld" +
         (if crossMingw && crossStageStatic then
           " --with-headers=${libcCross}/include" +
           " --with-gcc" +
@@ -188,7 +187,7 @@ let version = "7.1.0";
             " --disable-shared" +
             # To keep ABI compatibility with upstream mingw-w64
             " --enable-fully-dynamic-string"
-            else (if cross.libc == "uclibc" then
+            else (if targetPlatform.libc == "uclibc" then
               # libsanitizer requires netrom/netrom.h which is not
               # available in uclibc.
               " --disable-libsanitizer" +
@@ -200,9 +199,9 @@ let version = "7.1.0";
             " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
           );
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
 
-  bootstrap = cross == null;
+  bootstrap = targetPlatform == hostPlatform;
 
 in
 
@@ -230,7 +229,7 @@ stdenv.mkDerivation ({
   hardeningDisable = [ "format" ];
 
   postPatch =
-    if (stdenv.isHurd
+    if (hostPlatform.isHurd
         || (libcCross != null                  # e.g., building `gcc.crossDrv'
             && libcCross ? crossConfig
             && libcCross.crossConfig == "i586-pc-gnu")
@@ -266,7 +265,7 @@ stdenv.mkDerivation ({
            sed -i "${gnu_h}" \
                -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
         ''
-    else if cross != null || stdenv.cc.libc != null then
+    else if targetPlatform != hostPlatform || stdenv.cc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
@@ -295,19 +294,19 @@ stdenv.mkDerivation ({
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
-    ++ (optionals (cross != null) [binutils])
+    ++ (optionals (targetPlatform != hostPlatform) [binutils])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
     # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
-    ++ (optional stdenv.isDarwin gnused)
-    ++ (optional stdenv.isDarwin binutils)
+    ++ (optional hostPlatform.isDarwin gnused)
+    ++ (optional hostPlatform.isDarwin binutils)
     ;
 
-  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
+  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
 
-  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
     export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
     export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
     export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
@@ -317,7 +316,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   configureFlags = "
-    ${if stdenv.isSunOS then
+    ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
       # On Illumos/Solaris GNU as is preferred
       " --with-gnu-as --without-gnu-ld "
@@ -361,19 +360,19 @@ stdenv.mkDerivation ({
         )
       )
     }
-    ${if cross == null
-      then if stdenv.isDarwin
+    ${if targetPlatform == hostPlatform
+      then if hostPlatform.isDarwin
         then " --with-native-system-header-dir=${darwin.usr-include}"
         else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
-    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
-    ${if cross != null then crossConfigureFlags else ""}
+    ${if targetPlatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
+    ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
     ${if !bootstrap then "--disable-bootstrap" else ""}
-    ${if cross == null then platformFlags else ""}
+    ${if targetPlatform == hostPlatform then platformFlags else ""}
   ";
 
-  targetConfig = if cross != null then cross.config else null;
+  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
   buildFlags = if bootstrap then
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
@@ -405,8 +404,8 @@ stdenv.mkDerivation ({
     CC_FOR_TARGET = "${targetPlatform.config}-gcc";
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
-    # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    # If we are making a cross compiler, targetPlatform != hostPlatform
+    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
@@ -482,7 +481,7 @@ stdenv.mkDerivation ({
     ++ optional (libpthread != null) libpthread);
 
   EXTRA_TARGET_CFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-idirafter ${getDev libcCross}/include"
       ]
       ++ optionals (! crossStageStatic) [
@@ -491,7 +490,7 @@ stdenv.mkDerivation ({
     else null;
 
   EXTRA_TARGET_LDFLAGS =
-    if cross != null && libcCross != null then [
+    if targetPlatform != hostPlatform && libcCross != null then [
         "-Wl,-L${libcCross.out}/lib"
       ]
       ++ (if crossStageStatic then [
@@ -539,13 +538,13 @@ stdenv.mkDerivation ({
   };
 }
 
-// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence cross != null)
-// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
+// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
 
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8d0d2cc7f9..4abafcac452 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5245,10 +5245,6 @@ with pkgs;
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
     profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
 
-    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
-    # and host != build), `cross' must be null but the cross-libc must still
-    # be passed.
-    cross = null;
     libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_17 else null;
-- 
GitLab


From 926f3eada8f2a45345781a7074f33fe5f25f2402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20J=C3=A4ger?= <jger.tm@gmail.com>
Date: Thu, 8 Jun 2017 11:26:42 -0700
Subject: [PATCH 0495/1490] buck: cleanup

---
 .../tools/build-managers/buck/default.nix     |  8 +++-----
 .../tools/build-managers/buck/pex-mtime.patch | 20 ++++++-------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index dadea794466..bb21d34c957 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, jre, makeWrapper }:
+{ stdenv, fetchFromGitHub, jdk, ant, python2, python2Packages, watchman, unzip, bash, makeWrapper }:
 
-
-let
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "buck-${version}";
   version = "v2017.05.31.01";
 
@@ -31,7 +29,7 @@ in stdenv.mkDerivation rec {
     install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck
     wrapProgram $out/bin/buck \
       --prefix PYTHONPATH : $PYTHONPATH \
-      --prefix PATH : "${stdenv.lib.makeBinPath [jre watchman]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/build-managers/buck/pex-mtime.patch b/pkgs/development/tools/build-managers/buck/pex-mtime.patch
index 01640f342ae..b8726e64a60 100644
--- a/pkgs/development/tools/build-managers/buck/pex-mtime.patch
+++ b/pkgs/development/tools/build-managers/buck/pex-mtime.patch
@@ -1,21 +1,13 @@
 diff --git a/third-party/py/pex/pex/common.py b/third-party/py/pex/pex/common.py
-index 76459ce23..491dcfc0b 100644
+index 76459ce23..eff411b20 100644
 --- a/third-party/py/pex/pex/common.py
 +++ b/third-party/py/pex/pex/common.py
-@@ -12,6 +12,7 @@ import stat
- import sys
- import tempfile
- import threading
-+import time
- import zipfile
- from collections import defaultdict
- from uuid import uuid4
-@@ -328,4 +329,7 @@ class Chroot(object):
+@@ -328,4 +328,7 @@ class Chroot(object):
    def zip(self, filename, mode='wb'):
      with contextlib.closing(zipfile.ZipFile(filename, mode)) as zf:
        for f in sorted(self.files()):
 -        zf.write(os.path.join(self.chroot, f), arcname=f, compress_type=zipfile.ZIP_DEFLATED)
-+        file = os.path.join(self.chroot, f)
-+        instant = 315532800
-+        os.utime(file, (instant, instant))
-+        zf.write(file, arcname=f, compress_type=zipfile.ZIP_DEFLATED)
++        path = os.path.join(self.chroot, f)
++        instant = 615532801
++        os.utime(path, (instant, instant))
++        zf.write(path, arcname=f, compress_type=zipfile.ZIP_DEFLATED)
-- 
GitLab


From 10f9fb63f14fbe27dc9b516cca1eb2f72956f141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 Jun 2017 20:43:04 +0200
Subject: [PATCH 0496/1490] nfs-utils: fixup setuid/setgid build problems,
 hopefully

---
 pkgs/os-specific/linux/nfs-utils/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 81ce7babba1..0db6c4ec67e 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -39,6 +39,9 @@ in stdenv.mkDerivation rec {
       sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd
 
       configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags"
+
+      substituteInPlace utils/mount/Makefile.in \
+        --replace "chmod 4511" "chmod 0511"
     '';
 
   makeFlags = [
-- 
GitLab


From e2197465c16a3c04935eb892d6485b7551dd65f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 8 Jun 2017 19:00:40 +0100
Subject: [PATCH 0497/1490] cc-wrapper: externalize default_cxx_stdlib_compile

This value is require to get c++ std include path for libclang based tools (vim plugins in my case).
I currently extract it this with this rather command:

```
eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile')
```

it did not trigger any recompilation on my system.
---
 pkgs/build-support/cc-wrapper/default.nix            | 12 ++++++------
 pkgs/misc/vim-plugins/default.nix                    |  7 +++++++
 .../vim2nix/additional-nix-code/clang_complete       |  7 +++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 95c6bee3cc7..e56f1f9a7d4 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -34,6 +34,9 @@ let
   binutils_bin = if nativeTools then "" else getBin binutils;
   # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
   coreutils_bin = if nativeTools then "" else getBin coreutils;
+
+  default_cxx_stdlib_compile=optionalString (stdenv.isLinux && !(cc.isGNU or false))
+    "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
 in
 
 stdenv.mkDerivation {
@@ -46,8 +49,9 @@ stdenv.mkDerivation {
   inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
   gnugrep_bin = if nativeTools then "" else gnugrep;
 
+
   passthru = {
-    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang;
+    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
@@ -189,11 +193,7 @@ stdenv.mkDerivation {
 
       export real_cc=cc
       export real_cxx=c++
-      export default_cxx_stdlib_compile="${
-        if stdenv.isLinux && !(cc.isGNU or false)
-          then "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"
-          else ""
-      }"
+      export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}"
 
       if [ -e $ccPath/gcc ]; then
         wrap gcc ${./cc-wrapper.sh} $ccPath/gcc
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 09e4d365f17..416262f9e1e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -293,6 +293,13 @@ rec {
       sha256 = "19zs03giv8h5xmv18y9zn85sxr8akphvbscclrqhs4cf88285cgl";
     };
     dependencies = [];
+    # In addition to the arguments you pass to your compiler, you also need to
+    # specify the path of the C++ std header (if you are using C++).
+    # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
+    # The linked ruby code shows generates the required '.clang_complete' for cmake based projects
+    # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144
+    # as an alternative you can execute the following command:
+    # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile')
     preFixup = ''
       substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
         --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
index 64e064e2a46..ed88e08742e 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
@@ -1,3 +1,10 @@
+    # In addition to the arguments you pass to your compiler, you also need to
+    # specify the path of the C++ std header (if you are using C++).
+    # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper).
+    # The linked ruby code shows generates the required '.clang_complete' for cmake based projects
+    # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144
+    # as an alternative you can execute the following command:
+    # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile')
     preFixup = ''
       substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
         --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'"
-- 
GitLab


From 8b49936ad4db7499050aa6f57ce89d606c7382fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 Jun 2017 20:53:20 +0200
Subject: [PATCH 0498/1490] vboot_reference: fix evaluation after 1aac1fe5dd

---
 pkgs/tools/system/vboot_reference/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index 3d4f99fc1f0..a9a034ebde9 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -12,11 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc";
   };
 
-  buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] ++
-                (if libuuid == null
-                 then []
-                 else [ (stdenv.lib.overrideDerivation libuuid
-                          (args: { configureFlags = args.configureFlags + " --enable-static"; })) ]);
+  buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ]
+    ++ stdenv.lib.optional (libuuid != null)
+         (libuuid.overrideAttrs (attrs:
+           { configureFlags = attrs.configureFlags ++ [ "--enable-static" ]; }));
 
   arch = if stdenv.system == "x86_64-linux" then "x86_64"
     else if stdenv.system == "i686-linux" then "x86"
-- 
GitLab


From b57a14810b7a5540879782ccafa705d49268f065 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 8 Jun 2017 15:54:51 -0300
Subject: [PATCH 0499/1490] jetbrains.clion: 2017.1.1 -> 2017.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 284100cc2c3..d71ecc99a69 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -185,12 +185,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2017.1.1";
+    version = "2017.1.3";
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "1bh92gakxqrg65rfhg8984ca338ff0y17kdjkpr6rbh1i39npgcs";
+      sha256 = "045pkbbf4ypk9qkhldz08i7hbc6vaq68a8v9axnpndnvcrf0vf7g";
     };
     wmClass = "jetbrains-clion";
   };
-- 
GitLab


From bc1f59fb4f46e94a8d3ff9bc6d49fe76c0c99f4d Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 8 Jun 2017 16:45:14 -0300
Subject: [PATCH 0500/1490] jetbrains.idea-ultimate: 2017.1.3 -> 2017.1.4

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index d71ecc99a69..5e98fd8021c 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -269,12 +269,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2017.1.3";
+    version = "2017.1.4";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "1gl62zrs3yxakgwbm29bv9z68jgy5ixc28zcagydx2h4j2b1fb19";
+      sha256 = "0byrsbsscpzb0syamzpavny879src5dlclnissa7173rh8hgkna4";
     };
     wmClass = "jetbrains-idea";
   };
-- 
GitLab


From 277b562324395cc786fc6a2f13431f48c82a388a Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 8 Jun 2017 16:57:50 -0300
Subject: [PATCH 0501/1490] jetbrains.idea-community: 2017.1.3 -> 2017.1.4

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 5e98fd8021c..7eb34b47c76 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -233,12 +233,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2017.1.3";
+    version = "2017.1.4";
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "0ag70z4cark69hzhvx5j75qa8dglwzfaqrzi8pim3asd161fwxrx";
+      sha256 = "1w1knq969dl8rxlkhr9mw8cr2vszn384acwhspimrd3zs9825r45";
     };
     wmClass = "jetbrains-idea-ce";
   };
-- 
GitLab


From 399afc13e4c69ef03432c5d76e5a53a65b7bcb67 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 8 Jun 2017 20:40:02 +0300
Subject: [PATCH 0502/1490] afl: 2.41b -> 2.42b

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

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 252be087675..4fa200e5bbd 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "2.41b";
+  version = "2.42b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "13wnjk0rklcjglj7dmpahv67vig9azifxgnggj56hki66lrb2w06";
+    sha256 = "16ckgi4rh48rdmqcyxgabzcsmkfq77jjaghbxw9smkkm4sbx3yhk";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup
-- 
GitLab


From 9e41ba6e96c08f6b4af8597149694c92fc30e7df Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 8 Jun 2017 20:40:12 +0300
Subject: [PATCH 0503/1490] bastet: 0.43.1 -> 0.43.2

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

diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix
index 682756c7787..4c55d571bd5 100644
--- a/pkgs/games/bastet/default.nix
+++ b/pkgs/games/bastet/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "bastet-${version}";
-  version = "0.43.1";
+  version = "0.43.2";
   buildInputs = [ ncurses boost ];
 
   src = fetchFromGitHub {
     owner = "fph";
     repo = "bastet";
     rev = version;
-    sha256 = "14ymdarx30zqxyixvb17h4hs57y6zfx0lrdvc200crllz8zzdx5z";
+    sha256 = "09kamxapm9jw9przpsgjfg33n9k94bccv65w95dakj0br33a75wn";
   };
 
   installPhase = ''
-- 
GitLab


From cd46df3a1e992c28104b83efdcc3520cc525cb6e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 8 Jun 2017 20:41:00 +0300
Subject: [PATCH 0504/1490] fio: 2.19 -> 2.20

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

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 50c8862bc34..c4e0724dddc 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
 let
-  version = "2.19";
-  sha256 = "1rfnisb8hqwx76rjmgaagvs3k0808z27ll9i3w5ifzysi1c1l6r9";
+  version = "2.20";
+  sha256 = "06sn9ll75xbr2rr7zn8xzdy1v705kqfxv6q1zx6ysvxwri0sxrfx";
 in
 
 stdenv.mkDerivation rec {
-- 
GitLab


From 97d29ffbfd821adba0e80e1b1ff70e73a28df25f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 8 Jun 2017 20:41:29 +0300
Subject: [PATCH 0505/1490] nano: 2.8.3 -> 2.8.4

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

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 78d3953a96b..29e76f7d23a 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.8.3";
+  version = "2.8.4";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "0m8g1f1c09kjmy7w6dxq30yw373nsv1ylj7986xyv4a0jddybf32";
+    sha256 = "04bvmimrw40cbcnm3xm5l5lir0qy7cncfkmwrlzg8jiy1x7jdky7";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
-- 
GitLab


From 211c55b247f8c5721d8eb6641b82c11ffd86c731 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 8 Jun 2017 20:41:55 +0300
Subject: [PATCH 0506/1490] strace: 4.16 -> 4.17

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

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index ab5934ed58c..549872646cb 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "strace-${version}";
-  version = "4.16";
+  version = "4.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/strace/${name}.tar.xz";
-    sha256 = "1vzhmpcy989i4k12q4cc438yal2ghhm6x7ychscjbhcf2yspqj4q";
+    sha256 = "06bl4dld5fk4a3iiq4pyrkm6sh63599ah8dmds0glg5vbw45pww1";
   };
 
   nativeBuildInputs = [ perl ];
-- 
GitLab


From 69901f16c906c79e69939607631944ff5643152b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 8 Jun 2017 20:42:06 +0300
Subject: [PATCH 0507/1490] yle-dl: 2.15 -> 2.16

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

diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 600b2c49758..1de8f8c9a10 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "yle-dl-${version}";
-  version = "2.15";
+  version = "2.16";
 
   src = fetchFromGitHub {
     owner = "aajanki";
     repo = "yle-dl";
     rev = version;
-    sha256 = "1mvgw8ppv33j04mjsyb5rxg358v3i2zfgazwm7nc3ysc5yl091j5";
+    sha256 = "1ahv7b3r52mvi2b5ji77l62hy543b6pdmq8hnd9xxvnxai463k35";
   };
 
   patchPhase = ''
-- 
GitLab


From e88a89ad330743c6be885fef415307c9ff9197cc Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 8 Jun 2017 01:39:17 +0200
Subject: [PATCH 0508/1490] erlang: use makeOverridable for customizations

---
 pkgs/development/beam-modules/lib.nix | 36 +++++++++++++------
 pkgs/top-level/beam-packages.nix      | 50 +++++++--------------------
 2 files changed, 38 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index 2d0eef09563..ae2705613f0 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -2,20 +2,36 @@
 
 rec {
 
-  /* Uses generic-builder to evaluate provided drv containing OTP-version specific data.
+  /* Similar to callPackageWith/callPackage, but without makeOverridable
+  */
+  callPackageWith = autoArgs: fn: args:
+    let
+      f = if builtins.isFunction fn then fn else import fn;
+      auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs;
+    in f (auto // args);
+
+  callPackage = callPackageWith pkgs;
+
+  /* Uses generic-builder to evaluate provided drv containing OTP-version
+  specific data.
 
   drv: package containing version-specific args;
   builder: generic builder for all Erlang versions;
-  gargs: arguments passed to the generic-builder, used mostly to customize dependencies;
-  args: arguments merged into version-specific args, used mostly to enable/disable high-level OTP
-    features, like ODBC or WX support;
+  args: arguments merged into version-specific args, used mostly to customize
+        dependencies;
+
+  Arguments passed to the generic-builder are overridable, used to
+  enable/disable high-level OTP features, like ODBC or WX support;
 
-  Please note that "mkDerivation" defined here is the one called from R16.nix and similar files.
+  Please note that "mkDerivation" defined here is the one called from R16.nix
+  and similar files.
   */
-  callErlang = drv: gargs: args: pkgs.callPackage drv (
-    let builder = pkgs.callPackage ../../development/interpreters/erlang/generic-builder.nix gargs;
-    in {
-      mkDerivation = a: builder (a // args);
-    });
+  callErlang = drv: args:
+    let
+      builder = callPackage ../../development/interpreters/erlang/generic-builder.nix args;
+    in
+      callPackage drv {
+        mkDerivation = pkgs.makeOverridable builder;
+      };
 
 }
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 94f3028ddb3..547e650a636 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -12,54 +12,28 @@ rec {
     erlang_odbc_javac = erlangR18_odbc_javac;
 
     # These are standard Erlang versions, using the generic builder.
-    erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {} {};
-    erlangR16_odbc = lib.callErlang ../development/interpreters/erlang/R16.nix {} {
-      odbcSupport = true;
-    };
-    erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {} {};
-    erlangR17_odbc = lib.callErlang ../development/interpreters/erlang/R17.nix {} {
-      odbcSupport = true;
-    };
-    erlangR17_javac = lib.callErlang ../development/interpreters/erlang/R17.nix {} {
-      javacSupport = true;
-    };
-    erlangR17_odbc_javac = lib.callErlang ../development/interpreters/erlang/R17.nix {} {
+    erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {};
+    erlangR16_odbc = erlangR16.override { odbcSupport = true; };
+    erlangR17 = lib.callErlang ../development/interpreters/erlang/R17.nix {};
+    erlangR17_odbc = erlangR17.override { odbcSupport = true; };
+    erlangR17_javac = erlangR17.override { javacSupport = true; };
+    erlangR17_odbc_javac = erlangR17.override {
       javacSupport = true; odbcSupport = true;
     };
     erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
       wxGTK = wxGTK30;
-    } {};
-    erlangR18_odbc = lib.callErlang ../development/interpreters/erlang/R18.nix {
-      wxGTK = wxGTK30;
-    } {
-      odbcSupport = true;
     };
-    erlangR18_javac = lib.callErlang ../development/interpreters/erlang/R18.nix {
-      wxGTK = wxGTK30;
-    } {
-      javacSupport = true;
-    };
-    erlangR18_odbc_javac = lib.callErlang ../development/interpreters/erlang/R18.nix {
-      wxGTK = wxGTK30;
-    } {
+    erlangR18_odbc = erlangR18.override { odbcSupport = true; };
+    erlangR18_javac = erlangR18.override { javacSupport = true; };
+    erlangR18_odbc_javac = erlangR18.override {
       javacSupport = true; odbcSupport = true;
     };
     erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
       wxGTK = wxGTK30;
-    } {};
-    erlangR19_odbc = lib.callErlang ../development/interpreters/erlang/R19.nix {
-      wxGTK = wxGTK30;
-    } {
-      odbcSupport = true;
     };
-    erlangR19_javac = lib.callErlang ../development/interpreters/erlang/R19.nix {
-      wxGTK = wxGTK30;
-    } {
-      javacSupport = true;
-    };
-    erlangR19_odbc_javac = lib.callErlang ../development/interpreters/erlang/R19.nix {
-      wxGTK = wxGTK30;
-    } {
+    erlangR19_odbc = erlangR19.override { odbcSupport = true; };
+    erlangR19_javac = erlangR19.override { javacSupport = true; };
+    erlangR19_odbc_javac = erlangR19.override {
       javacSupport = true; odbcSupport = true;
     };
 
-- 
GitLab


From 9540cc464526a20a57b7de681186368aa7a67345 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Thu, 8 Jun 2017 22:15:57 +0200
Subject: [PATCH 0509/1490] nodejs: 8.0.0 -> 8.1.0

---
 pkgs/development/web/nodejs/v8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index bee323176d8..273eb014180 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -10,11 +10,11 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "8.0.0";
+    version = "8.1.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "072g2zv58aa5zxs8fs9bdsi3mqklf2yj9mf58yjg5frbcfikm395";
+      sha256 = "1z3pcyxni8qmxljz6vbghm8242sr63l0dbc7x22ywbbqkfv21zzj";
     };
 
     patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
-- 
GitLab


From 55f0f9e1a4818074c52d6e11e65240fbfdd36890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Thu, 8 Jun 2017 22:42:58 +0200
Subject: [PATCH 0510/1490] profanity: enable tray icon support

Profanity can show a tray icon, e.g. showing that messages were received.
This enables support for the feature.
---
 .../networking/instant-messengers/profanity/default.nix      | 5 ++++-
 pkgs/top-level/all-packages.nix                              | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 32f4f8f32b3..e1a068393b1 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -3,10 +3,12 @@
 
 , autoAwaySupport ? false, libXScrnSaver ? null, libX11 ? null
 , notifySupport ? false,   libnotify ? null, gdk_pixbuf ? null
+, traySupport ? false,     gnome2 ? null
 }:
 
 assert autoAwaySupport -> libXScrnSaver != null && libX11 != null;
 assert notifySupport   -> libnotify != null && gdk_pixbuf != null;
+assert traySupport     -> gnome2 != null;
 
 with stdenv.lib;
 
@@ -23,7 +25,8 @@ stdenv.mkDerivation rec {
     pkgconfig readline libuuid libmesode
     glib openssl expat ncurses libotr curl
   ] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
-    ++ optionals notifySupport   [ libnotify gdk_pixbuf ];
+    ++ optionals notifySupport   [ libnotify gdk_pixbuf ]
+    ++ optionals traySupport     [ gnome2.gtk ];
 
   meta = {
     description = "A console based XMPP client";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4962e3fa482..9d30f4c5a3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15482,6 +15482,7 @@ with pkgs;
 
   profanity = callPackage ../applications/networking/instant-messengers/profanity {
     notifySupport   = config.profanity.notifySupport   or true;
+    traySupport     = config.profanity.traySupport     or true;
     autoAwaySupport = config.profanity.autoAwaySupport or true;
   };
 
-- 
GitLab


From cfe23e19ab550b981db32ccf1f2fa876fdcc9611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20J=C3=A4ger?= <jger.tm@gmail.com>
Date: Thu, 8 Jun 2017 15:36:30 -0700
Subject: [PATCH 0511/1490] buck: build buckd as well

buck tries to launch buckd to run in the background. While not neccessary, it
does speed up builds.
---
 .../tools/build-managers/buck/default.nix       | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix
index bb21d34c957..cddb1a90765 100644
--- a/pkgs/development/tools/build-managers/buck/default.nix
+++ b/pkgs/development/tools/build-managers/buck/default.nix
@@ -20,16 +20,23 @@ stdenv.mkDerivation rec {
   buildInputs = [ jdk ant python2 watchman python2Packages.pywatchman ];
   nativeBuildInputs = [ makeWrapper ];
 
+  targets = [ "buck" "buckd" ];
+
   buildPhase = ''
     ant
-    ./bin/buck build buck
+
+    for exe in ${toString targets}; do
+      ./bin/buck build //programs:$exe
+    done
   '';
 
   installPhase = ''
-    install -D -m755 buck-out/gen/programs/buck.pex $out/bin/buck
-    wrapProgram $out/bin/buck \
-      --prefix PYTHONPATH : $PYTHONPATH \
-      --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}"
+    for exe in ${toString targets}; do
+      install -D -m755 buck-out/gen/programs/$exe.pex $out/bin/$exe
+      wrapProgram $out/bin/$exe \
+        --prefix PYTHONPATH : $PYTHONPATH \
+        --prefix PATH : "${stdenv.lib.makeBinPath [jdk watchman]}"
+    done
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 8e706b051e7bcdb149eca52075046116dcdbb256 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 9 Jun 2017 00:36:53 +0200
Subject: [PATCH 0512/1490] tor: 0.3.0.7 -> 0.3.0.8

Of particular note are fixes for hidden service crashing bugs
(TROVE-2017-004 and TROVE-2017-005).

See https://blog.torproject.org/blog/tor-0308-released-fix-hidden-services-also-are-02429-02514-02612-0278-02814-and-02911
---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 6eea70797ab..05dbe6b7d84 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.3.0.7";
+  name = "tor-0.3.0.8";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "00kxa83bn0axh7479fynp6r8znq5wy26kvb8ghixgjpkir2c8h4n";
+    sha256 = "0j0dhq1zp6w6zy7y4kiw7zg1imbgv8nsl7imlzwc0951p2kknfk6";
   };
 
   outputs = [ "out" "geoip" ];
-- 
GitLab


From 2bfc977b6eafb0be0af131e05a878bceee141324 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 9 Jun 2017 01:56:50 +0300
Subject: [PATCH 0513/1490] ethtool: 4.10 -> 4.11

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

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index eba2e82911b..ae6ea6e3f53 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ethtool-${version}";
-  version = "4.10";
+  version = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "1fklbjwr41cvd5b7d1qvpl3bqzc4aak732r3m2wjhhgkxhk9f07h";
+    sha256 = "1cp132kk2xd2cwn1ysjv0cl8i9lnq3n4zi4wy676p5k4h2mfvn0j";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 292f121fb239e9fe89b79988a23b0adf0f0d2ccc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 9 Jun 2017 12:03:56 +0800
Subject: [PATCH 0514/1490] mpc: 0.27 -> 0.28

Upstream has also moved to github
---
 pkgs/applications/audio/mpc/default.nix | 27 +++++++++++++++----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index f37585d3dec..59adb7cde49 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -1,27 +1,32 @@
-{ stdenv, fetchurl, mpd_clientlib }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mpd_clientlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.27";
   name = "mpc-${version}";
+  version = "0.28";
 
-  src = fetchurl {
-    url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz";
-    sha256 = "0r10wsqxsi07gns6mfnicvpci0sbwwj4qa9iyr1ysrgadl5bx8j5";
+  src = fetchFromGitHub {
+    owner  = "MusicPlayerDaemon";
+    repo   = "mpc";
+    rev    = "v${version}";
+    sha256 = "1g8i4q5xsqdhidyjpvj6hzbhxacv27cb47ndv9k68whd80c5f9n9";
   };
 
   buildInputs = [ mpd_clientlib ];
 
-  preConfigure =
-    ''
-      export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion}
-      export LIBMPDCLIENT_CFLAGS=${mpd_clientlib}
-    '';
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion}
+    export LIBMPDCLIENT_CFLAGS=${mpd_clientlib}
+  '';
 
   meta = with stdenv.lib; {
     description = "A minimalist command line interface to MPD";
     homepage = http://www.musicpd.org/clients/mpc/;
     license = licenses.gpl2;
-    maintainers = [ maintainers.algorith ];
+    maintainers = with maintainers; [ algorith ];
     platforms = with platforms; linux ++ darwin;
   };
 }
-- 
GitLab


From c87f03497730b04c870d39c08e4ae4462709a443 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 9 Jun 2017 12:04:23 +0800
Subject: [PATCH 0515/1490] mpd: 0.20.6 -> 0.20.9

Upstream has also moved to github.
---
 pkgs/servers/mpd/default.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 1883764e24f..b7eb0b5397d 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, systemd, boost, darwin
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, glib, systemd, boost, darwin
 , alsaSupport ? true, alsaLib
 , avahiSupport ? true, avahi, dbus
 , flacSupport ? true, flac
@@ -33,18 +33,22 @@ let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.20";
-  minor = "6";
+  minor = "9";
 
 in stdenv.mkDerivation rec {
-  name = "mpd-${major}${if minor == "" then "" else "." + minor}";
-  src = fetchurl {
-    url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
-    sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl";
+  name = "mpd-${version}";
+  version = "${major}${if minor == "" then "" else "." + minor}";
+
+  src = fetchFromGitHub {
+    owner  = "MusicPlayerDaemon";
+    repo   = "MPD";
+    rev    = "v${version}";
+    sha256 = "17ly30syrlw5274washifr0nddll3g1zb4rr4f9sfnlxz9wz73p1";
   };
 
   patches = [ ./x86.patch ];
 
-  buildInputs = [ pkgconfig glib boost ]
+  buildInputs = [ glib boost ]
     ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit
     ++ opt stdenv.isLinux systemd
     ++ opt (stdenv.isLinux && alsaSupport) alsaLib
@@ -77,6 +81,10 @@ in stdenv.mkDerivation rec {
     ++ opt opusSupport libopus
     ++ opt soundcloudSupport yajl;
 
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  enableParallelBuilding = true;
+
   configureFlags =
     [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
       (mkFlag flacSupport "flac")
-- 
GitLab


From 207ac3c7b8186d2b20066baa837a1ebf4845be33 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 9 Jun 2017 12:54:29 +0800
Subject: [PATCH 0516/1490] mpd_clientlib: 2.10 -> 2.11

Upstream has moved to github as well.
---
 pkgs/servers/mpd/clientlib.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index 82d18091050..5c72ac97bc0 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -1,19 +1,23 @@
-{ stdenv, fetchurl, doxygen }:
+{ stdenv, fetchFromGitHub, autoreconfHook, doxygen }:
 
 stdenv.mkDerivation rec {
   version = "${passthru.majorVersion}.${passthru.minorVersion}";
   name = "libmpdclient-${version}";
 
-  src = fetchurl {
-    url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.xz";
-    sha256 = "10pzs9z815a8hgbbbiliapyiw82bnplsccj5irgqjw5f5plcs22g";
+  src = fetchFromGitHub {
+    owner  = "MusicPlayerDaemon";
+    repo   = "libmpdclient";
+    rev    = "v${version}";
+    sha256 = "06rv2j8rw9v9l4nwpvbh28nad8bbg368hzd8s58znbr5pgb8dihd";
   };
 
-  buildInputs = [ doxygen ];
+  nativeBuildInputs = [ autoreconfHook doxygen ];
+
+  enableParallelBuilding = true;
 
   passthru = {
     majorVersion = "2";
-    minorVersion = "10";
+    minorVersion = "11";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From bcf9af560a86caf88d36257d349099a0786f1fb4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 9 Jun 2017 12:54:56 +0800
Subject: [PATCH 0517/1490] ncmpc: 0.24 -> 0.27

Upstream has moved to github as well.
---
 pkgs/applications/audio/ncmpc/default.nix | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index 31185c0d0c2..e43120a715d 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  version = "0.24";
   name = "ncmpc-${version}";
+  version = "0.27";
 
-  src = fetchurl {
-    url = "http://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz";
-    sha256 = "1sf3nirs3mcx0r5i7acm9bsvzqzlh730m0yjg6jcyj8ln6r7cvqf";
+  src = fetchFromGitHub {
+    owner  = "MusicPlayerDaemon";
+    repo   = "ncmpc";
+    rev    = "v${version}";
+    sha256 = "0sfal3wadqvy6yas4xzhw35awdylikci8kbdcmgm4l2afpmc1lrr";
   };
 
-  buildInputs = [ pkgconfig glib ncurses mpd_clientlib ]
-    ++ libintlOrEmpty;
+  buildInputs = [ glib ncurses mpd_clientlib ];
+    # ++ libintlOrEmpty;
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
+  # without this, po/Makefile.in.in is not being created
+  preAutoreconf = ''
+    ./autogen.sh
+  '';
+
   configureFlags = [
     "--enable-colors"
     "--enable-lyrics-screen"
-- 
GitLab


From 965668903adb00fcc7f39531e977ad1048853d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= <michal.palka@chalmers.se>
Date: Fri, 9 Jun 2017 06:17:51 +0000
Subject: [PATCH 0518/1490] xen: fix pygrub by making sure it is wrapped

Recent commit #c10af9e744c91dff1ccc07a52a0b57d1e4d339f3 changed the
behaviour of wrapPythonPrograms, which caused pygrub to no longer
being wrapped. This commit fixes this.
---
 pkgs/applications/virtualization/xen/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index bfce2cd6ae4..b0b353c5fa2 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -204,6 +204,8 @@ stdenv.mkDerivation (rec {
       --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\"
 
     wrapPythonPrograms
+    # We also need to wrap pygrub, which lies in lib
+    wrapPythonProgramsIn "$out/lib" "$out $pythonPath"
 
     shopt -s extglob
     for i in $out/etc/xen/scripts/!(*.sh); do
-- 
GitLab


From d6138238e3e9b1563db8cab7d9b10ac32c903f02 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Fri, 9 Jun 2017 09:21:17 +0200
Subject: [PATCH 0519/1490] add package for lbreakout2, a breakout clone from
 the popular lgames series

---
 lib/maintainers.nix               |  1 +
 pkgs/games/lbreakout2/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/games/lbreakout2/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b9508d529a2..f83b887ba97 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -99,6 +99,7 @@
   chris-martin = "Chris Martin <ch.martin@gmail.com>";
   chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
+  ciil = "Simon Lackerbauer <simon@lackerbauer.com>";
   ckampka = "Christian Kampka <christian@kampka.net>";
   cko = "Christine Koppelt <christine.koppelt@gmail.com>";
   cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
new file mode 100644
index 00000000000..68af5bf5857
--- /dev/null
+++ b/pkgs/games/lbreakout2/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, gcc }:
+
+stdenv.mkDerivation rec {
+  name = "lbreakout2-${version}";
+  version = "2.6.5";
+  buildInputs = [ SDL SDL_mixer zlib libpng gcc ];
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/lgames/${name}.tar.gz";
+    sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Breakout clone from the LGames series";
+    homepage = http://lgames.sourceforge.net/LBreakout2/;
+    license = licenses.gpl;
+    maintainers = [ maintainers.ciil ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 100f9f9c36f..e2af723792f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2644,6 +2644,8 @@ with pkgs;
 
   kytea = callPackage ../tools/text/kytea { };
 
+  lbreakout2 = callPackage ../games/lbreakout2 { };
+
   leocad = callPackage ../applications/graphics/leocad { };
 
   less = callPackage ../tools/misc/less { };
-- 
GitLab


From fbb5b2ef016a2dfc35f5d81664e78d84ac08d1f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Jun 2017 09:23:04 +0200
Subject: [PATCH 0520/1490] multi-ghc-travis: update to latest git version

---
 .../tools/haskell/multi-ghc-travis/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 90b61ec4124..81707a6bfc3 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "multi-ghc-travis-${version}";
-  version = "git-2017-05-18";
+  version = "git-2017-05-24";
 
   buildInputs = [ ghc ];
 
   src = fetchFromGitHub {
     owner = "hvr";
     repo = "multi-ghc-travis";
-    rev = "3e1b3847583020f0e83c97fcf4bcfb7c90b78259";
-    sha256 = "0hnwp9gsv2rnkxqiw4cg1vdi7wccajx0i9ryhw4lfr8nhkizbsww";
+    rev = "c1dcbcbcd3eadcc63adeac65d63497885b422a44";
+    sha256 = "12xss8wgsqs2fghrfl4h6g5wli6wn274zmdsq5zdcib2m7da5yw2";
   };
 
   installPhase = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Generate .travis.yml for multiple ghc versions";
     homepage = "https://github.com/hvr/multi-ghc-travis";
     license = licenses.bsd3;
-    platforms = platforms.all;
+    platforms = ghc.meta.platforms;
     maintainers = with maintainers; [ jb55 ];
   };
 }
-- 
GitLab


From 63e967a33a65ab1b207707f135c79741134ceefb Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Fri, 9 Jun 2017 09:21:17 +0200
Subject: [PATCH 0521/1490] lbreakout2: init at 2.6.5

---
 lib/maintainers.nix               |  1 +
 pkgs/games/lbreakout2/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/games/lbreakout2/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index b9508d529a2..f83b887ba97 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -99,6 +99,7 @@
   chris-martin = "Chris Martin <ch.martin@gmail.com>";
   chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
+  ciil = "Simon Lackerbauer <simon@lackerbauer.com>";
   ckampka = "Christian Kampka <christian@kampka.net>";
   cko = "Christine Koppelt <christine.koppelt@gmail.com>";
   cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
new file mode 100644
index 00000000000..68af5bf5857
--- /dev/null
+++ b/pkgs/games/lbreakout2/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, gcc }:
+
+stdenv.mkDerivation rec {
+  name = "lbreakout2-${version}";
+  version = "2.6.5";
+  buildInputs = [ SDL SDL_mixer zlib libpng gcc ];
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/lgames/${name}.tar.gz";
+    sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Breakout clone from the LGames series";
+    homepage = http://lgames.sourceforge.net/LBreakout2/;
+    license = licenses.gpl;
+    maintainers = [ maintainers.ciil ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 100f9f9c36f..e2af723792f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2644,6 +2644,8 @@ with pkgs;
 
   kytea = callPackage ../tools/text/kytea { };
 
+  lbreakout2 = callPackage ../games/lbreakout2 { };
+
   leocad = callPackage ../applications/graphics/leocad { };
 
   less = callPackage ../tools/misc/less { };
-- 
GitLab


From 0f93270aba539722526a7b8faeafb1418e8198aa Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Thu, 8 Jun 2017 17:21:37 +0900
Subject: [PATCH 0522/1490] gtkd: init at 3.6.5

---
 pkgs/development/libraries/gtkd/default.nix |  98 ++++++++++++++
 pkgs/development/libraries/gtkd/paths.d     | 142 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |   2 +
 3 files changed, 242 insertions(+)
 create mode 100644 pkgs/development/libraries/gtkd/default.nix
 create mode 100644 pkgs/development/libraries/gtkd/paths.d

diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
new file mode 100644
index 00000000000..85550b5d528
--- /dev/null
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -0,0 +1,98 @@
+{ stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
+, pango, pkgconfig, substituteAll, which }:
+
+stdenv.mkDerivation rec {
+  name = "gtkd-${version}";
+  version = "3.6.5";
+
+  src = fetchzip {
+    url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
+    sha256 = "1ypxxqklad5wwyvc39wnphnqp5y4q5zbf9j5mxb3bg9vnls48vx1";
+    stripRoot = false;
+  };
+
+  nativeBuildInputs = [ dmd pkgconfig which ];
+  propagatedBuildInputs = [
+    atk cairo gdk_pixbuf glib gstreamer gst_plugins_base gtk3 gtksourceview
+    libgda libpeas librsvg pango vte
+  ];
+
+  prePatch = ''
+    substituteAll ${./paths.d} generated/gtkd/gtkd/paths.d
+    substituteInPlace src/cairo/gtkc/cairo-compiletime.d \
+      --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
+      --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
+    substituteInPlace src/cairo/gtkc/cairo-runtime.d \
+      --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
+      --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
+    substituteInPlace generated/gtkd/gtkc/gdkpixbuf.d \
+      --replace libgdk_pixbuf-2.0.so.0 ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
+      --replace libgdk_pixbuf-2.0.0.dylib ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
+    substituteInPlace generated/gtkd/gtkc/atk.d \
+      --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \
+      --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib
+    substituteInPlace generated/gtkd/gtkc/pango.d \
+      --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 \
+      --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \
+      --replace libpango-1.0.0.dylib ${pango.out}/lib/libpango-1.0.0.dylib \
+      --replace libpangocairo-1.0.0.dylib ${pango.out}/lib/libpangocairo-1.0.0.dylib
+    substituteInPlace generated/gtkd/gtkc/gobject.d \
+      --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
+      --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
+    substituteInPlace generated/gtkd/gtkc/rsvg.d \
+      --replace librsvg-2.so.2 ${librsvg}/lib/librsvg-2.so.2 \
+      --replace librsvg-2.2.dylib ${librsvg}/lib/librsvg-2.2.dylib
+    substituteInPlace generated/gtkd/gtkc/cairo.d \
+      --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
+      --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
+    substituteInPlace generated/gtkd/gtkc/gdk.d \
+      --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
+      --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib
+    substituteInPlace generated/peas/peasc/peas.d \
+      --replace libpeas-1.0.so.0 ${libpeas}/lib/libpeas-1.0.so.0 \
+      --replace libpeas-gtk-1.0.so.0 ${libpeas}/lib/libpeas-gtk-1.0.so.0 \
+      --replace libpeas-1.0.0.dylib ${libpeas}/lib/libpeas-1.0.0.dylib \
+      --replace gtk-1.0.0.dylib ${libpeas}/lib/gtk-1.0.0.dylib
+    substituteInPlace generated/vte/vtec/vte.d \
+      --replace libvte-2.91.so.0 ${vte}/lib/libvte-2.91.so.0 \
+      --replace libvte-2.91.0.dylib ${vte}/lib/libvte-2.91.0.dylib
+    substituteInPlace generated/gstreamer/gstreamerc/gstinterfaces.d \
+      --replace libgstvideo-1.0.so.0 ${gst_plugins_base}/lib/libgstvideo-1.0.so.0 \
+      --replace libgstvideo-1.0.0.dylib ${gst_plugins_base}/lib/libgstvideo-1.0.0.dylib
+    substituteInPlace generated/sourceview/gsvc/gsv.d \
+      --replace libgtksourceview-3.0.so.1 ${gtksourceview}/lib/libgtksourceview-3.0.so.1 \
+      --replace libgtksourceview-3.0.1.dylib ${gtksourceview}/lib/libgtksourceview-3.0.1.dylib
+    substituteInPlace generated/gtkd/gtkc/glib.d \
+      --replace libglib-2.0.so.0 ${glib}/lib/libglib-2.0.so.0 \
+      --replace libgmodule-2.0.so.0 ${glib}/lib/libgmodule-2.0.so.0 \
+      --replace libgobject-2.0.so.0 ${glib}/lib/libgobject-2.0.so.0 \
+      --replace libglib-2.0.0.dylib ${glib}/lib/libglib-2.0.0.dylib \
+      --replace libgmodule-2.0.0.dylib ${glib}/lib/libgmodule-2.0.0.dylib \
+      --replace libgobject-2.0.0.dylib ${glib}/lib/libgobject-2.0.0.dylib
+    substituteInPlace generated/gtkd/gtkc/gio.d \
+      --replace libgio-2.0.so.0 ${glib}/lib/libgio-2.0.so.0 \
+      --replace libgio-2.0.0.dylib ${glib}/lib/libgio-2.0.0.dylib
+    substituteInPlace generated/gstreamer/gstreamerc/gstreamer.d \
+      --replace libgstreamer-1.0.so.0 ${gstreamer}/lib/libgstreamer-1.0.so.0 \
+      --replace libgstreamer-1.0.0.dylib ${gstreamer}/lib/libgstreamer-1.0.0.dylib
+    substituteInPlace generated/gtkd/gtkc/gtk.d \
+      --replace libgdk-3.so.0 ${gtk3}/lib/libgdk-3.so.0 \
+      --replace libgtk-3.so.0 ${gtk3}/lib/libgtk-3.so.0 \
+      --replace libgdk-3.0.dylib ${gtk3}/lib/libgdk-3.0.dylib \
+      --replace libgtk-3.0.dylib ${gtk3}/lib/libgtk-3.0.dylib
+  '';
+
+  installFlags = "prefix=$(out)";
+
+  inherit atk cairo gdk_pixbuf librsvg pango;
+  inherit (gnome3) glib gtk3 gtksourceview libgda libpeas vte;
+  inherit (gst_all_1) gstreamer;
+  gst_plugins_base = gst_all_1.gst-plugins-base;
+
+  meta = with stdenv.lib; {
+    description = "D binding and OO wrapper for GTK+";
+    homepage = "https://gtkd.org";
+    licence = licenses.lgpl3Plus;
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/libraries/gtkd/paths.d b/pkgs/development/libraries/gtkd/paths.d
new file mode 100644
index 00000000000..0f857136499
--- /dev/null
+++ b/pkgs/development/libraries/gtkd/paths.d
@@ -0,0 +1,142 @@
+/*
+ * gtkD is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version, with
+ * some exceptions, please read the COPYING file.
+ *
+ * gtkD is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with gtkD; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
+ *
+ * paths.d  -- list of libraries that will be dynamically linked with gtkD
+ *
+ * Added:	John Reimer	-- 2004-12-20
+ * Updated: 2005-02-21 changed names; added version(linux)
+ * Updated: 2005-05-05 updated Linux support
+ * Updated: 2008-02-16 Tango support
+ */
+
+module gtkd.paths;
+
+/*
+ * Define the Libraries that gtkD will be using.
+ *   This is a growable list, as long as the programmer
+ *   also adds to the importLibs list.
+ */
+
+enum LIBRARY
+{
+	ATK,
+	CAIRO,
+	GDK,
+	GDKPIXBUF,
+	GLIB,
+	GMODULE,
+	GOBJECT,
+	GIO,
+	GTHREAD,
+	GTK,
+	PANGO,
+	PANGOCAIRO,
+	GLGDK,
+	GLGTK,
+	GDA,
+	GSV,
+	GSV1,
+	GSTREAMER,
+	GSTINTERFACES,
+	VTE,
+	PEAS,
+	RSVG,
+}
+
+version (Windows)
+{
+	const string[LIBRARY.max+1] importLibs =
+	[
+		LIBRARY.ATK:           "libatk-1.0-0.dll",
+		LIBRARY.CAIRO:         "libcairo-2.dll",
+		LIBRARY.GDK:           "libgdk-3-0.dll",
+		LIBRARY.GDKPIXBUF:     "libgdk_pixbuf-2.0-0.dll",
+		LIBRARY.GLIB:          "libglib-2.0-0.dll",
+		LIBRARY.GMODULE:       "libgmodule-2.0-0.dll",
+		LIBRARY.GOBJECT:       "libgobject-2.0-0.dll",
+		LIBRARY.GIO:           "libgio-2.0-0.dll",
+		LIBRARY.GTHREAD:       "libgthread-2.0-0.dll",
+		LIBRARY.GTK:           "libgtk-3-0.dll",
+		LIBRARY.PANGO:         "libpango-1.0-0.dll",
+		LIBRARY.PANGOCAIRO:    "libpangocairo-1.0-0.dll",
+		LIBRARY.GLGDK:         "libgdkglext-3.0-0.dll",
+		LIBRARY.GLGTK:         "libgtkglext-3.0-0.dll",
+		LIBRARY.GDA:           "libgda-4.0-4.dll",
+		LIBRARY.GSV:           "libgtksourceview-3.0-0.dll",
+		LIBRARY.GSV1:          "libgtksourceview-3.0-1.dll",
+		LIBRARY.GSTREAMER:     "libgstreamer-1.0.dll",
+		LIBRARY.GSTINTERFACES: "libgstvideo-1.0.dll",
+		LIBRARY.VTE:           "libvte-2.91.dll",
+		LIBRARY.PEAS:          "libpeas-1.0.dll",
+		LIBRARY.RSVG:          "librsvg-2-2.dll",
+	];
+}
+else version(darwin)
+{
+	const string[LIBRARY.max+1] importLibs =
+	[
+		LIBRARY.ATK:           "@atk@/lib/libatk-1.0.dylib",
+		LIBRARY.CAIRO:         "@cairo@/lib/libcairo.dylib",
+		LIBRARY.GDK:           "@gtk3@/lib/libgdk-3.0.dylib",
+		LIBRARY.GDKPIXBUF:     "@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.dylib",
+		LIBRARY.GLIB:          "@glib@/lib/libglib-2.0.dylib",
+		LIBRARY.GMODULE:       "@glib@/lib/libgmodule-2.0.dylib",
+		LIBRARY.GOBJECT:       "@glib@/lib/libgobject-2.0.dylib",
+		LIBRARY.GIO:           "@glib@/lib/libgio-2.0.dylib",
+		LIBRARY.GTHREAD:       "@glib@/lib/libgthread-2.0.dylib",
+		LIBRARY.GTK:           "@gtk3@/lib/libgtk-3.0.dylib",
+		LIBRARY.PANGO:         "@pango@/lib/libpango-1.0.dylib",
+		LIBRARY.PANGOCAIRO:    "@pango@/lib/libpangocairo-1.0.dylib",
+		LIBRARY.GLGDK:         "libgdkglext-3.0.dylib",
+		LIBRARY.GLGTK:         "libgtkglext-3.0.dylib",
+		LIBRARY.GDA:           "@libgda@/lib/libgda-2.dylib",
+		LIBRARY.GSV:           "@gtksourceview@/lib/libgtksourceview-3.0.dylib",
+		LIBRARY.GSV1:          "@gtksourceview@/lib/libgtksourceview-3.0.dylib",
+		LIBRARY.GSTREAMER:     "@gstreamer@/lib/libgstreamer-1.0.dylib",
+		LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.dylib",
+		LIBRARY.VTE:           "@vte@/lib/libvte-2.91.dylib",
+		LIBRARY.PEAS:          "@libpeas@/lib/libpeas-1.0.dylib",
+		LIBRARY.RSVG:          "@librsvg@/lib/librsvg-2.dylib",
+	];
+}
+else
+{
+	const string[LIBRARY.max+1] importLibs =
+	[
+		LIBRARY.ATK:           "@atk@/lib/libatk-1.0.so.0",
+		LIBRARY.CAIRO:         "@cairo@/lib/libcairo.so.2",
+		LIBRARY.GDK:           "@gtk3@/lib/libgdk-3.so.0",
+		LIBRARY.GDKPIXBUF:     "@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0",
+		LIBRARY.GLIB:          "@glib@/lib/libglib-2.0.so.0",
+		LIBRARY.GMODULE:       "@glib@/lib/libgmodule-2.0.so.0",
+		LIBRARY.GOBJECT:       "@glib@/lib/libgobject-2.0.so.0",
+		LIBRARY.GIO:           "@glib@/lib/libgio-2.0.so.0",
+		LIBRARY.GTHREAD:       "@glib@/lib/libgthread-2.0.so.0",
+		LIBRARY.GTK:           "@gtk3@/lib/libgtk-3.so.0",
+		LIBRARY.PANGO:         "@pango@/lib/libpango-1.0.so.0",
+		LIBRARY.PANGOCAIRO:    "@pango@/lib/libpangocairo-1.0.so.0",
+		LIBRARY.GLGDK:         "libgdkglext-3.0.so.0",
+		LIBRARY.GLGTK:         "libgtkglext-3.0.so.0",
+		LIBRARY.GDA:           "@libgda@/lib/libgda-4.0.so.4",
+		LIBRARY.GSV:           "@gtksourceview@/lib/libgtksourceview-3.0.so.0",
+		LIBRARY.GSV1:          "@gtksourceview@/lib/libgtksourceview-3.0.so.1",
+		LIBRARY.GSTREAMER:     "@gstreamer@/lib/libgstreamer-1.0.so.0",
+		LIBRARY.GSTINTERFACES: "@gst_plugins_base@/lib/libgstvideo-1.0.so.0",
+		LIBRARY.VTE:           "@vte@/lib/libvte-2.91.so.0",
+		LIBRARY.PEAS:          "@libpeas@/lib/libpeas-1.0.so.0",
+		LIBRARY.RSVG:          "@librsvg@/lib/librsvg-2.so.2",
+	];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bca3cee890..3070eb7a0f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2263,6 +2263,8 @@ with pkgs;
 
   gtdialog = callPackage ../development/libraries/gtdialog {};
 
+  gtkd = callPackage ../development/libraries/gtkd { };
+
   gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };
 
   gtkvnc = callPackage ../tools/admin/gtk-vnc {};
-- 
GitLab


From 54b23e605c338be644f7d8bb868ae15308057d42 Mon Sep 17 00:00:00 2001
From: midchildan <midchildan+git@gmail.com>
Date: Thu, 8 Jun 2017 17:22:21 +0900
Subject: [PATCH 0523/1490] tilix: init at 1.6.1

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

diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
new file mode 100644
index 00000000000..df253b3b4ce
--- /dev/null
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, dmd, gnome3, dbus
+, gsettings_desktop_schemas, libsecret, desktop_file_utils, gettext, gtkd
+, perlPackages, wrapGAppsHook, xdg_utils }:
+
+stdenv.mkDerivation rec {
+  name = "tilix-${version}";
+  version = "1.6.1";
+
+  src = fetchFromGitHub {
+    owner = "gnunn1";
+    repo = "tilix";
+    rev = "${version}";
+    sha256 = "10nw3q6s941dm44bkfryl1xclr1xy1vjr2n8w7g6kfahpcazf8f8";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook dmd desktop_file_utils perlPackages.Po4a pkgconfig xdg_utils
+    wrapGAppsHook
+  ];
+  buildInputs = [ gnome3.dconf gettext gsettings_desktop_schemas gtkd dbus ];
+
+  preBuild = ''
+    makeFlagsArray=(PERL5LIB="${perlPackages.Po4a}/lib/perl5")
+  '';
+
+  postInstall = with gnome3; ''
+    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+
+
+  preFixup = ''
+    substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \
+      --replace "Exec=tilix" "Exec=$out/bin/tilix"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tiling terminal emulator following the Gnome Human Interface Guidelines.";
+    homepage = "https://gnunn1.github.io/tilix-web";
+    licence = licenses.mpl20;
+    maintainer = with maintainers; [ midchildan ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3070eb7a0f4..bbbdc32f154 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4340,6 +4340,8 @@ with pkgs;
 
   tie = callPackage ../development/tools/misc/tie { };
 
+  tilix = callPackage ../applications/misc/tilix { };
+
   tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
 
   tiny8086 = callPackage ../applications/virtualization/8086tiny { };
-- 
GitLab


From f2e075a241bbf24a2d03c11c6516bac8d52cadf3 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 8 Jun 2017 21:12:22 -0300
Subject: [PATCH 0524/1490] mkvtoolnix: 11.0.0 -> 12.0.0

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index c3f54fcaf46..8650142f8b4 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "11.0.0";
+  version = "12.0.0";
 
   src = fetchFromGitHub {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "1qqa8ss2mfjzj984l9vc1fnk7czbvhbmmq53m87gnrc65351gkir";
+    sha256 = "1xn24f9046q2lr1xbl02cpmqa4fhhxqjc14j14c9r6qfc4ix4n9w";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
-- 
GitLab


From b1f0af7ef67260724c914a823e87ea2b4516b7e9 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 9 Jun 2017 12:14:54 +0200
Subject: [PATCH 0525/1490] linuxPackages.evdi: specify minimum kernel version,
 per upstream

Upstream says 3.16 is the oldest supported kernel.  No versions prior to
3.18 build on Hydra. See e.g., https://hydra.nixos.org/build/53599831.
---
 pkgs/os-specific/linux/evdi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index d1e8a466953..150534c9b95 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2;
     homepage = "http://www.displaylink.com/";
+    broken = !versionAtLeast kernel.version "3.16";
   };
 }
-- 
GitLab


From 39f7530e4715d1bf84b1ed8cabf6c196efe5e7ec Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 9 Jun 2017 12:51:42 +0200
Subject: [PATCH 0526/1490] tinycc: 0.9.27pre-20170527 -> 0.9.27pre-20170605

Contains further fix to x86_64 codegen (and some less relevant Windows
stuff).
---
 pkgs/development/compilers/tinycc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index fcad6045dbf..c7e3c4b3c67 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,10 +2,10 @@
 with stdenv.lib;
 
 let
-  date = "20170527";
+  date = "20170605";
   version = "0.9.27pre-${date}";
-  rev = "53c5fc2246270e0242903de0152a9a5d40f3d679";
-  sha256 = "0z5ayz0kdn5xqm84k730hmd7r9cq0zxxf45g5phgqppdfajrmswz";
+  rev = "3e4b7693bfd5b76570b35558c83a935326513eff";
+  sha256 = "0m5k1df73kakvg9xz06y3nlac4mwfccni6hdijaf4w8fyy3zz4bg";
 in
 
 stdenv.mkDerivation rec {
-- 
GitLab


From cc9a72a286e83124abfbfc427bbdcb539341e138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 9 Jun 2017 13:09:21 +0200
Subject: [PATCH 0527/1490] virtualboxGuestAdditions: don't install
 setuid/setgid

---
 .../virtualization/virtualbox/guest-additions/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index df59f3e0e2e..38f452efe6c 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -97,7 +97,7 @@ stdenv.mkDerivation {
     sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all
 
     # Install binaries
-    install -D -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf
+    install -D -m 755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf
     install -D -m 755 sbin/VBoxService $out/bin/VBoxService
 
     mkdir -p $out/bin
-- 
GitLab


From 44681c53d68f212e7da33e0d27b6352a0103a863 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 9 Jun 2017 09:30:20 -0300
Subject: [PATCH 0528/1490] jwm: 1582 -> 1594

---
 pkgs/applications/window-managers/jwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 2082f48d257..40050a69025 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1582";
+  version = "1594";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "1z6cxf18n69sjd20bbyxrnd19hhy955ddvakgpfyhiprpfjkkv70";
+    sha256 = "1608ws3867xipcbdl2gw6ybcxzk14vq24sr62m9l65m4g4m3wbd2";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];
-- 
GitLab


From dd3dcceb239915f6929e09fcaf27e0b119f021c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= <michal.palka@chalmers.se>
Date: Fri, 9 Jun 2017 13:08:07 +0000
Subject: [PATCH 0529/1490] xen: patch for XSAs: 206, 211, 212, 213, 214 and
 215

XSA-206 Issue Description:

> xenstored supports transactions, such that if writes which would
> invalidate assumptions of a transaction occur, the entire transaction
> fails.  Typical response on a failed transaction is to simply retry
> the transaction until it succeeds.
>
> Unprivileged domains may issue writes to xenstore which conflict with
> transactions either of the toolstack or of backends such as the driver
> domain. Depending on the exact timing, repeated writes may cause
> transactions made by these entities to fail indefinitely.

More: https://xenbits.xen.org/xsa/advisory-206.html

XSA-211 Issue Description:

> When a graphics update command gets passed to the VGA emulator, there
> are 3 possible modes that can be used to update the display:
>
> * blank - Clears the display
> * text - Treats the display as showing text
> * graph - Treats the display as showing graphics
>
> After the display geometry gets changed (i.e., after the CIRRUS VGA
> emulation has resized the display), the VGA emulator will resize the
> console during the next update command. However, when a blank mode is
> also selected during an update, this resize doesn't happen. The resize
> will be properly handled during the next time a non-blank mode is
> selected during an update.
>
> However, other console components - such as the VNC emulation - will
> operate as though this resize had happened. When the display is
> resized to be larger than before, this can result in a heap overflow
> as console components will expect the display buffer to be larger than
> it is currently allocated.

More: https://xenbits.xen.org/xsa/advisory-211.html

XSA-212 Issue Description:

> The XSA-29 fix introduced an insufficient check on XENMEM_exchange
> input, allowing the caller to drive hypervisor memory accesses outside
> of the guest provided input/output arrays.

More: https://xenbits.xen.org/xsa/advisory-212.html

XSA-213 Issue Description:

> 64-bit PV guests typically use separate (root) page tables for their
> kernel and user modes.  Hypercalls are accessible to guest kernel
> context only, which certain hypercall handlers make assumptions on.
> The IRET hypercall (replacing the identically name CPU instruction)
> is used by guest kernels to transfer control from kernel mode to user
> mode.  If such an IRET hypercall is placed in the middle of a multicall
> batch, subsequent operations invoked by the same multicall batch may
> wrongly assume the guest to still be in kernel mode.  If one or more of
> these subsequent operations involve operations on page tables, they may
> be using the wrong root page table, confusing internal accounting.  As
> a result the guest may gain writable access to some of its page tables.

More: https://xenbits.xen.org/xsa/advisory-213.html

XSA-214 Issue Description:

> The GNTTABOP_transfer operation allows one guest to transfer a page to
> another guest.  The internal processing of this, however, does not
> include zapping the previous type of the page being transferred.  This
> makes it possible for a PV guest to transfer a page previously used as
> part of a segment descriptor table to another guest while retaining the
> "contains segment descriptors" property.
>
> If the destination guest is a PV one of different bitness, it may gain
> access to segment descriptors it is not normally allowed to have, like
> 64-bit code segments in a 32-bit PV guest.
>
> If the destination guest is a HVM one, that guest may freely alter the
> page contents and then hand the page back to the same or another PV
> guest.
>
> In either case, if the destination PV guest then inserts that page into
> one of its own descriptor tables, the page still having the designated
> type results in validation of its contents being skipped.

More: https://xenbits.xen.org/xsa/advisory-214.html

XSA-215 Issue Description:

> Under certain special conditions Xen reports an exception resulting
> from returning to guest mode not via ordinary exception entry points,
> but via a so call failsafe callback.  This callback, unlike exception
> handlers, takes 4 extra arguments on the stack (the saved data
> selectors DS, ES, FS, and GS).  Prior to placing exception or failsafe
> callback frames on the guest kernel stack, Xen checks the linear
> address range to not overlap with hypervisor space.  The range spanned
> by that check was mistakenly not covering these extra 4 slots.

More: https://xenbits.xen.org/xsa/advisory-215.html
---
 pkgs/applications/virtualization/xen/4.5.nix | 120 +++++++++++++++++++
 1 file changed, 120 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index 3fbdee981c4..c6aa1522160 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -67,6 +67,10 @@ callPackage (import ./generic.nix (rec {
           name = "209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput";
           sha256 = "0avxqs9922qjfsxxlk7bh10432a526j2yyykhags8dk1bzxkpxwv";
         })
+        (xsaPatch {
+          name = "211-qemuu-4.6";
+          sha256 = "1g090xs8ca8676vyi78b99z5yjdliw6mxkr521b8kimhf8crx4yg";
+        })
       ];
       meta.description = "Xen's fork of upstream Qemu";
     };
@@ -95,6 +99,10 @@ callPackage (import ./generic.nix (rec {
           name = "209-qemut";
           sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r";
         })
+        (xsaPatch {
+          name = "211-qemut-4.5";
+          sha256 = "1z3phabvqmxv4b5923fx63hwdg4v1fnl15zbl88873ybqn0hp50f";
+        })
       ];
       postPatch = ''
         substituteInPlace xen-hooks.mak \
@@ -218,10 +226,122 @@ callPackage (import ./generic.nix (rec {
         name = "204-4.5";
         sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
       })
+      (xsaPatch {
+        name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit";
+        sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4";
+      })
+      (xsaPatch {
+        name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-";
+        sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx";
+      })
+      (xsaPatch {
+        name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire";
+        sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s";
+      })
+      (xsaPatch {
+        name = "206-4.5/0004-oxenstored-remove-some-unused-parameters";
+        sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk";
+      })
+      (xsaPatch {
+        name = "206-4.5/0005-oxenstored-refactor-request-processing";
+        sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv";
+      })
+      (xsaPatch {
+        name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio";
+        sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg";
+      })
+      (xsaPatch {
+        name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat";
+        sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz";
+      })
+      (xsaPatch {
+        name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict";
+        sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g";
+      })
+      (xsaPatch {
+        name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti";
+        sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b";
+      })
+      (xsaPatch {
+        name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0";
+        sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj";
+      })
+      (xsaPatch {
+        name = "206-4.5/0011-oxenstored-comments-explaining-some-variables";
+        sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p";
+      })
+      (xsaPatch {
+        name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit";
+        sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8";
+      })
+      (xsaPatch {
+        name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit";
+        sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl";
+      })
+      (xsaPatch {
+        name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-";
+        sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb";
+      })
+      (xsaPatch {
+        name = "206-4.5/0015-oxenstored-support-commit-history-tracking";
+        sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj";
+      })
+      (xsaPatch {
+        name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-";
+        sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy";
+      })
+      (xsaPatch {
+        name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end";
+        sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps";
+      })
+      (xsaPatch {
+        name = "206-4.5/0018-oxenstored-track-commit-history";
+        sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd";
+      })
+      (xsaPatch {
+        name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa";
+        sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h";
+      })
+      (xsaPatch {
+        name = "206-4.5/0020-oxenstored-allow-self-conflicts";
+        sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy";
+      })
+      (xsaPatch {
+        name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions";
+        sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8";
+      })
+      (xsaPatch {
+        name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit";
+        sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy";
+      })
+      (xsaPatch {
+        name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging";
+        sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7";
+      })
+      (xsaPatch {
+        name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function";
+        sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8";
+      })
       (xsaPatch {
         name = "207";
         sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
       })
+      (xsaPatch {
+        name = "212";
+        sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d";
+      })
+      (xsaPatch {
+        name = "213-4.5";
+        sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm";
+      })
+      (xsaPatch {
+        name = "214";
+        sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
+      })
+      (xsaPatch {
+        name = "215";
+        sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs";
+      })
     ];
 
   # Fix build on Glibc 2.24.
-- 
GitLab


From 97f3009bf86c4db9188e7e6f6443e9ce7bf165b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 9 Jun 2017 15:20:41 +0200
Subject: [PATCH 0530/1490] pycairo: fix #26475 - a dead patch download

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

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index c1ca9d4c02c..dc6d55ea1de 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -3,7 +3,7 @@
 if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else let
 
   patch_waf = fetchpatch {
-    url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch;
+    url = http://www.linuxfromscratch.org/patches/blfs/8.0/pycairo-1.10.0-waf_python_3_4-1.patch;
     sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4";
   };
   patch_waf-py3_5 = ./waf-py3_5.patch;
-- 
GitLab


From 762aa2b819a856b2c99f7319a75726a8aef11d98 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Fri, 9 Jun 2017 16:31:36 +0200
Subject: [PATCH 0531/1490] lbreakout2: init at 2.6.5

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

diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
index 68af5bf5857..e2994d89e35 100644
--- a/pkgs/games/lbreakout2/default.nix
+++ b/pkgs/games/lbreakout2/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, gcc }:
+{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng }:
 
 stdenv.mkDerivation rec {
   name = "lbreakout2-${version}";
   version = "2.6.5";
-  buildInputs = [ SDL SDL_mixer zlib libpng gcc ];
+  buildInputs = [ SDL SDL_mixer zlib libpng ];
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/lgames/${name}.tar.gz";
+    url = "mirror://sourceforge/lgames/${name}.tar.gz";
     sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i";
   };
 
-- 
GitLab


From 55ca2cf495174dc490d702ded2b48187e32091d4 Mon Sep 17 00:00:00 2001
From: ikervagyok <ikervagyok@gmail.com>
Date: Fri, 9 Jun 2017 18:07:31 +0200
Subject: [PATCH 0532/1490] minecraft-server: 1.11.2 -> 1.12 (#26458)

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

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index fd944bb7611..1e8ec2b8a6a 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "minecraft-server-${version}";
-  version = "1.11.2";
+  version = "1.12";
 
   src  = fetchurl {
     url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
-    sha256 = "12nqcj6skwjfcywm3ah4jb1qn4r558ng9cchdc3hbz99nhv7vi6y";
+    sha256 = "02fwlg4c9kqckmdi9wxi64jdqynj5myp0995aabc07746hwgzszy";
   };
 
   preferLocalBuild = true;
-- 
GitLab


From b615c2e9929e840e95408b511db7f03dbdd71143 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 9 Jun 2017 18:38:20 +0200
Subject: [PATCH 0533/1490] android-studio: 2.3.2.0 -> 2.3.3.0

---
 pkgs/applications/editors/android-studio/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index d54c0168704..0ba89099eb3 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -33,8 +33,8 @@
 
 let
 
-  version = "2.3.2.0";
-  build = "162.3934792";
+  version = "2.3.3.0";
+  build = "162.4069837";
 
   androidStudio = stdenv.mkDerivation {
     name = "android-studio";
@@ -98,13 +98,14 @@ let
     '';
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
-      sha256 = "19wmbvmiqa9znvnslmp0xmkq4avpmgpzmyaai1fa28388qra4cvf";
+      sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
     };
-    meta = {
+    meta = with stdenv.lib; {
       description = "The Official IDE for Android";
       homepage = https://developer.android.com/studio/index.html;
-      license = stdenv.lib.licenses.asl20;
+      license = licenses.asl20;
       platforms = [ "x86_64-linux" ];
+      maintainers = with maintainers; [ primeos ];
     };
   };
 
-- 
GitLab


From 00892b7e4ed2e8eb52227db8e8312a06bd1d6699 Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Fri, 9 Jun 2017 10:04:34 -0700
Subject: [PATCH 0534/1490] generic-builder.nix: Update doHaddock

By default, `ghcjs` haddocks are precluded from being built. I see no reason to disallow building haddocks on projects built with `ghc` and `ghcjs` (someone can correct me here). `HaLVM` currently does not support `haddock` since it's a Stage 1 `GHC`. https://github.com/GaloisInc/HaLVM/blob/master/src/misc/build.mk.in#L20

Currently, building `haddocks` for `ghcjs` projects requires altering the derivation, which doesn't allow users to take advantage of the cache. This change will relieve that.
---
 pkgs/development/haskell-modules/generic-builder.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 7d21996fe1c..9516aca5366 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -34,8 +34,7 @@
 , license
 , maintainers ? []
 , doCoverage ? false
-# TODO Do we care about haddock when cross-compiling?
-, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8")
+, doHaddock ? (!ghc.isHaLVM or true)
 , passthru ? {}
 , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
-- 
GitLab


From 7d87d234d390ef2c90027f01fe89a77ce66cf02f Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Fri, 9 Jun 2017 19:23:40 +0200
Subject: [PATCH 0535/1490] lbreakout2: init at 2.6.5

---
 pkgs/games/lbreakout2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
index e2994d89e35..363b133243b 100644
--- a/pkgs/games/lbreakout2/default.nix
+++ b/pkgs/games/lbreakout2/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Breakout clone from the LGames series";
     homepage = http://lgames.sourceforge.net/LBreakout2/;
-    license = licenses.gpl;
+    license = licenses.gpl2;
     maintainers = [ maintainers.ciil ];
     platforms = platforms.linux;
   };
-- 
GitLab


From 7a0e958b972f61b23f93a8e39fee5590aec47348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 7 Jun 2017 21:38:01 +0200
Subject: [PATCH 0536/1490] nixos/acme: support "full.pem" (for lighttpd)

* Create "full.pem" from selfsigned certificate
* Tell simp_le to create "full.pem"
* Inject service dependency between lighttpd and the generation of certificates

Side note: According to the internet these servers also use the
"full.pem" format: pound, ejabberd, pure-ftpd.
---
 nixos/modules/security/acme.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 321b9f7f375..dba858c00e0 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -65,11 +65,12 @@ let
           "cert.der" "cert.pem" "chain.pem" "external.sh"
           "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json"
         ]);
-        default = [ "fullchain.pem" "key.pem" "account_key.json" ];
+        default = [ "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
         description = ''
           Plugins to enable. With default settings simp_le will
-          store public certificate bundle in <filename>fullchain.pem</filename>
-          and private key in <filename>key.pem</filename> in its state directory.
+          store public certificate bundle in <filename>fullchain.pem</filename>,
+          private key in <filename>key.pem</filename> and those two previous
+          files combined in <filename>full.pem</filename> in its state directory.
         '';
       };
 
@@ -238,6 +239,9 @@ in
                       mv $workdir/server.key ${cpath}/key.pem
                       mv $workdir/server.crt ${cpath}/fullchain.pem
 
+                      # Create full.pem for e.g. lighttpd (same format as "simp_le ... -f full.pem" creates)
+                      cat "${cpath}/key.pem" "${cpath}/fullchain.pem" > "${cpath}/full.pem"
+
                       # Clean up working directory
                       rm $workdir/server.csr
                       rm $workdir/server.pass.key
@@ -247,6 +251,8 @@ in
                       chown '${data.user}:${data.group}' '${cpath}/key.pem'
                       chmod ${rights} '${cpath}/fullchain.pem'
                       chown '${data.user}:${data.group}' '${cpath}/fullchain.pem'
+                      chmod ${rights} '${cpath}/full.pem'
+                      chown '${data.user}:${data.group}' '${cpath}/full.pem'
                     '';
                   serviceConfig = {
                     Type = "oneshot";
@@ -275,15 +281,14 @@ in
                 )
               );
           servicesAttr = listToAttrs services;
-          nginxAttr = {
-            nginx = {
-              after = [ "acme-selfsigned-certificates.target" ];
-              wants = [ "acme-selfsigned-certificates.target" "acme-certificates.target" ];
-            };
+          injectServiceDep = {
+            after = [ "acme-selfsigned-certificates.target" ];
+            wants = [ "acme-selfsigned-certificates.target" "acme-certificates.target" ];
           };
         in
           servicesAttr //
-          (if config.services.nginx.enable then nginxAttr else {});
+          (if config.services.nginx.enable then { nginx = injectServiceDep; } else {}) //
+          (if config.services.lighttpd.enable then { lighttpd = injectServiceDep; } else {});
 
       systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair
         ("acme-${cert}")
-- 
GitLab


From 6a55fda61e899092a7c73b6b004783bbf1a73773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 8 Jun 2017 08:46:40 +0200
Subject: [PATCH 0537/1490] nixos/acme: improve documentation

* Use literalExample for better readability
* Clarify a bit wrt. 'webroot' and 'allowKeysForGroup'
---
 nixos/modules/security/acme.nix | 41 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index dba858c00e0..a40c5ef9ebe 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -13,7 +13,7 @@ let
         description = ''
           Where the webroot of the HTTP vhost is located.
           <filename>.well-known/acme-challenge/</filename> directory
-          will be created automatically if it doesn't exist.
+          will be created below the webroot if it doesn't exist.
           <literal>http://example.org/.well-known/acme-challenge/</literal> must also
           be available (notice unencrypted HTTP).
         '';
@@ -46,7 +46,10 @@ let
       allowKeysForGroup = mkOption {
         type = types.bool;
         default = false;
-        description = "Give read permissions to the specified group to read SSL private certificates.";
+        description = ''
+          Give read permissions to the specified group
+          (<option>security.acme.group</option>) to read SSL private certificates.
+        '';
       };
 
       postRun = mkOption {
@@ -77,10 +80,12 @@ let
       extraDomains = mkOption {
         type = types.attrsOf (types.nullOr types.str);
         default = {};
-        example = {
-          "example.org" = "/srv/http/nginx";
-          "mydomain.org" = null;
-        };
+        example = literalExample ''
+          {
+            "example.org" = "/srv/http/nginx";
+            "mydomain.org" = null;
+          }
+        '';
         description = ''
           Extra domain names for which certificates are to be issued, with their
           own server roots if needed.
@@ -140,17 +145,19 @@ in
         description = ''
           Attribute set of certificates to get signed and renewed.
         '';
-        example = {
-          "example.com" = {
-            webroot = "/var/www/challenges/";
-            email = "foo@example.com";
-            extraDomains = { "www.example.com" = null; "foo.example.com" = "/var/www/foo/"; };
-          };
-          "bar.example.com" = {
-            webroot = "/var/www/challenges/";
-            email = "bar@example.com";
-          };
-        };
+        example = literalExample ''
+          {
+            "example.com" = {
+              webroot = "/var/www/challenges/";
+              email = "foo@example.com";
+              extraDomains = { "www.example.com" = null; "foo.example.com" = "/var/www/foo/"; };
+            };
+            "bar.example.com" = {
+              webroot = "/var/www/challenges/";
+              email = "bar@example.com";
+            };
+          }
+        '';
       };
     };
   };
-- 
GitLab


From a6dc11e81e2cf26c0c309d90a6d2d4ee2baf0b34 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 9 Jun 2017 19:54:39 +0200
Subject: [PATCH 0538/1490] tmux: fix hash, looks like the upstream tag was
 moved

--- a/configure.ac       1970-01-01 01:00:01.000000000 +0100
+++ b/configure.ac       1970-01-01 01:00:01.000000000 +0100
@@ -1,6 +1,6 @@
 # configure.ac

-AC_INIT(tmux, 2.5-rc)
+AC_INIT(tmux, 2.5)
 AC_PREREQ([2.60])

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

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index ac564de0ea6..a749f250c11 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "tmux";
     repo = "tmux";
     rev = version;
-    sha256 = "0h0c6rwp4bjifqx9wpx7y0bmayvrvvgh9211rdk4nsf81j17n6vx";
+    sha256 = "0zwjngfaqrlwwbzicc5pq5pyws8f1qghcajvj0hwkipj51hqyswf";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-- 
GitLab


From a66a9ae8e8ef037265cbc7a20ee6df15e8fc5409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 9 Jun 2017 20:40:12 +0200
Subject: [PATCH 0539/1490] kodi-retroarch-advanced-launchers: ensure sound has
 been released

---
 .../misc/emulators/retroarch/kodi-advanced-launchers.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
index 38b8e27db7d..6b708cccc8f 100644
--- a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
+++ b/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix
@@ -8,8 +8,9 @@ let
 
   script = exec: ''
     #!${stdenv.shell}
-    nohup sh -c "sleep 1 && pkill -SIGSTOP kodi" &
-    nohup sh -c "${exec} '$@' -f;pkill -SIGCONT kodi"
+    nohup sh -c "pkill -SIGTSTP kodi" &
+    # https://forum.kodi.tv/showthread.php?tid=185074&pid=1622750#pid1622750
+    nohup sh -c "sleep 10 && ${exec} '$@' -f;pkill -SIGCONT kodi"
   '';
   scriptSh = exec: pkgs.writeScript ("kodi-"+exec.name) (script exec.path);
   execs = map (core: rec { name = core.core; path = core+"/bin/retroarch-"+name;}) cores;
@@ -31,8 +32,8 @@ stdenv.mkDerivation rec {
     description = "Kodi retroarch advanced launchers";
     longDescription = ''
       These retroarch launchers are intended to be used with
-      anglescry advanced launcher for Kodi since device input is
-      caught by both Kodi and the retroarch process.
+      advanced (emulation) launcher for Kodi since device input is
+      otherwise caught by both Kodi and the retroarch process.
     '';
     license = stdenv.lib.licenses.gpl3;
   };
-- 
GitLab


From d12497a23bf6d97c09631f50bc4712dffd37269f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 9 Jun 2017 21:57:35 +0200
Subject: [PATCH 0540/1490] pycairo: fix #26475 - another dead patch download

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

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index dc6d55ea1de..284736fd475 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -26,7 +26,7 @@ in buildPythonPackage rec {
 
   patches = [
     (fetchpatch {
-      url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch;
+      url = http://www.linuxfromscratch.org/patches/blfs/8.0/pycairo-1.10.0-waf_unpack-1.patch;
       sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd";
     })
   ];
-- 
GitLab


From c0e14c084dd6205304c78cf9a081fdbf15565d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 9 Jun 2017 21:44:34 +0100
Subject: [PATCH 0541/1490] metasploit: add missing update deps to shell.nix

---
 pkgs/tools/security/metasploit/shell.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix
index 7d1b66ba419..cd7a01214c6 100644
--- a/pkgs/tools/security/metasploit/shell.nix
+++ b/pkgs/tools/security/metasploit/shell.nix
@@ -3,6 +3,8 @@ with import <nixpkgs> {};
 stdenv.mkDerivation {
   name = "env";
   buildInputs = [
+    ruby.devEnv
+    git
     sqlite
     libpcap
     postgresql
-- 
GitLab


From 11623c5fca98788ba0158e67a55f256d1832714f Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 9 Jun 2017 17:57:39 -0300
Subject: [PATCH 0542/1490] lxappearance: add variant for Gtk+-3

lxappearance supports both Gtk+-2 and Gtk+-3. The current `lxappearance'
package continues to be for Gtk+-2. Add `lxappearance-gtk3' for Gtk+-3.

A patch is needed in order to look for themes in system data dirs with
Gtk+-3.
---
 .../lxde/core/lxappearance/default.nix        |  8 ++++--
 ...ppearance-0.6.3-xdg.system.data.dirs.patch | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch

diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix
index b6b63e31615..9793ff9c250 100644
--- a/pkgs/desktops/lxde/core/lxappearance/default.nix
+++ b/pkgs/desktops/lxde/core/lxappearance/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }:
+{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2, withGtk3 ? false, gtk3 }:
 
 stdenv.mkDerivation rec {
   name = "lxappearance-0.6.3";
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  buildInputs = [ libX11 gtk2 ];
+  buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) ];
+
+  patches = [ ./lxappearance-0.6.3-xdg.system.data.dirs.patch ];
+
+  configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
 
   meta = {
     description = "A lightweight program for configuring the theme and fonts of gtk applications";
diff --git a/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch b/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch
new file mode 100644
index 00000000000..a63882aa2a7
--- /dev/null
+++ b/pkgs/desktops/lxde/core/lxappearance/lxappearance-0.6.3-xdg.system.data.dirs.patch
@@ -0,0 +1,27 @@
+--- lxappearance-0.6.3/src/widget-theme.c.orig	2016-02-20 20:48:38.000000000 -0200
++++ lxappearance-0.6.3/src/widget-theme.c	2017-06-09 17:37:53.369555085 -0300
+@@ -66,6 +66,7 @@
+ static void load_themes()
+ {
+     char* dir;
++    const gchar * const * dirs;
+     GSList* themes = NULL, *l;
+     GtkTreeIter sel_it = {0};
+     GtkTreeSelection* tree_sel;
+@@ -85,6 +86,16 @@
+     themes = load_themes_in_dir(dir, themes);
+     g_free(dir);
+ 
++    /* load from sharedata theme dirs */
++    dirs = g_get_system_data_dirs();
++    while (*dirs != NULL)
++    {
++        dir = g_build_filename(*dirs, "themes", NULL);
++        themes = load_themes_in_dir(dir, themes);
++        g_free(dir);
++        dirs++;
++    }
++
+     themes = g_slist_sort(themes, (GCompareFunc)strcmp);
+     for(l = themes; l; l=l->next)
+     {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 100f9f9c36f..f6a573c762c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6053,6 +6053,10 @@ with pkgs;
     gtk2 = gtk2-x11;
   };
 
+  lxappearance-gtk3 = callPackage ../desktops/lxde/core/lxappearance {
+    withGtk3 = true;
+  };
+
   lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
 
   lxpanel = callPackage ../desktops/lxde/core/lxpanel {
-- 
GitLab


From c1135333d14642c85deffeb7c4d49775c7e6d8d7 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 9 Jun 2017 23:09:22 +0200
Subject: [PATCH 0543/1490] metasploit: 4.14.17 -> 4.14.25

---
 pkgs/tools/security/metasploit/Gemfile      |  2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 35 +++++++------
 pkgs/tools/security/metasploit/default.nix  |  6 +--
 pkgs/tools/security/metasploit/gemset.nix   | 56 ++++++++++++---------
 4 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 52987d4bf8c..de44760bde7 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/4.14.17"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/4.14.25"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index f19dc8b068e..d3a88a50aec 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,12 +1,13 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: fd3da8f3350d6cf7f0449bf0ead4d51747525c0a
-  ref: refs/tags/4.14.17
+  revision: 8a194207f07c2b8c91c1a72e57c25683d4e9f744
+  ref: refs/tags/4.14.25
   specs:
-    metasploit-framework (4.14.17)
+    metasploit-framework (4.14.25)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
+      backports
       bcrypt
       bit-struct
       filesize
@@ -16,7 +17,7 @@ GIT
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.2.29)
+      metasploit-payloads (= 1.2.32)
       metasploit_data_models
       metasploit_payloads-mettle (= 0.1.9)
       msgpack
@@ -36,7 +37,7 @@ GIT
       rb-readline
       recog
       redcarpet
-      rex-arch (= 0.1.4)
+      rex-arch
       rex-bin_tools
       rex-core
       rex-encoder
@@ -96,8 +97,9 @@ GEM
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.4)
-    arel-helpers (2.3.0)
+    arel-helpers (2.4.0)
       activerecord (>= 3.1.0, < 6)
+    backports (3.8.0)
     bcrypt (3.1.11)
     bindata (2.4.0)
     bit-struct (0.16)
@@ -106,7 +108,7 @@ GEM
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     filesize (0.1.1)
-    i18n (0.8.1)
+    i18n (0.8.4)
     jsobfu (0.4.2)
       rkelly-remix
     json (2.1.0)
@@ -117,19 +119,20 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-credential (2.0.9)
+    metasploit-credential (2.0.10)
       metasploit-concern
       metasploit-model
       metasploit_data_models
       pg
       railties
+      rex-socket
       rubyntlm
       rubyzip
     metasploit-model (2.0.4)
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.2.29)
+    metasploit-payloads (1.2.32)
     metasploit_data_models (2.0.14)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -141,7 +144,7 @@ GEM
       railties (~> 4.2.6)
       recog (~> 2.0)
     metasploit_payloads-mettle (0.1.9)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.2.0)
     minitest (5.10.2)
     msgpack (1.1.0)
     multipart-post (2.0.0)
@@ -149,8 +152,8 @@ GEM
     net-ssh (4.1.0)
     network_interface (0.0.1)
     nexpose (6.0.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.1)
@@ -166,7 +169,7 @@ GEM
       arel (>= 4.0.1)
       pg_array_parser (~> 0.0.9)
     public_suffix (2.0.5)
-    rack (1.6.6)
+    rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
@@ -184,10 +187,10 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
     rb-readline (0.5.4)
-    recog (2.1.6)
+    recog (2.1.8)
       nokogiri
     redcarpet (3.4.0)
-    rex-arch (0.1.4)
+    rex-arch (0.1.8)
       rex-text
     rex-bin_tools (0.1.3)
       metasm
@@ -234,7 +237,7 @@ GEM
       rex-text
     rkelly-remix (0.0.7)
     robots (0.10.1)
-    ruby_smb (0.0.12)
+    ruby_smb (0.0.18)
       bindata
       rubyntlm
       windows_error
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 5e21996caac..4cc287c40f2 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv, ncurses }:
+{ stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv }:
 
 # Maintainer notes for updating:
 # 1. increment version number in expression and in Gemfile
@@ -13,13 +13,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "metasploit-framework-${version}";
-  version = "4.14.17";
+  version = "4.14.25";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "0g666lxin9f0v9vhfh3s913ym8fnh32rpfl1rpj8d8n1azch5fn0";
+    sha256 = "0cp1ybq29a0r7kabg4p2yj0qm90hjvr4xxp0pynb2g406sbyycjm";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index f4e4b91fcd9..ff3e4d5d832 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -58,10 +58,18 @@
   arel-helpers = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0k8hqa2505b2s3w6gajh2lvi2mn832yqldiy2z4c55phzkmr08sr";
+      sha256 = "1sx4qbzhld3a99175p2krz3hv1npc42rv3sd8x4awzkgplg3zy9c";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
+  };
+  backports = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17pcz0z6jms5jydr1r95kf1bpk3ms618hgr26c62h34icy9i1dpm";
+      type = "gem";
+    };
+    version = "3.8.0";
   };
   bcrypt = {
     source = {
@@ -122,10 +130,10 @@
   i18n = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s6971zmjxszdrp59vybns9gzxpdxzdklakc5lp8nl4fx5kpxkbp";
+      sha256 = "1j491wrfzham4nk8q4bifah3lx7nr8wp9ahfb7vd3hxn71v7kic7";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.8.4";
   };
   jsobfu = {
     source = {
@@ -170,20 +178,20 @@
   metasploit-credential = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y36f1f4nw0imhfbckl213ah7qgfldrkv2fpv2acslb6iqiaa3gk";
+      sha256 = "1zblyy2yv31zap6dzf3lpkhvnafkwbzdvr6nsqmyh95ci8yy1q6r";
       type = "gem";
     };
-    version = "2.0.9";
+    version = "2.0.10";
   };
   metasploit-framework = {
     source = {
       fetchSubmodules = false;
-      rev = "fd3da8f3350d6cf7f0449bf0ead4d51747525c0a";
-      sha256 = "1r04drq34qfbhmhp0mqnm13vrycr7dcq670zk8xqiif5rhbij6qv";
+      rev = "8a194207f07c2b8c91c1a72e57c25683d4e9f744";
+      sha256 = "0q7iv9wd65ji1cay6am4dskrlibvp3wyn66gvld8p1nfnnvn5vmq";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "4.14.17";
+    version = "4.14.25";
   };
   metasploit-model = {
     source = {
@@ -196,10 +204,10 @@
   metasploit-payloads = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0c6wvnxgwdiryz5skzrp2wcfbxp57icaclckjcaxlw63v09wgjii";
+      sha256 = "1dqnyzp60da6f8kgnbpjmv5xsg1hvyyd2jkkzbh69sgwp4nw3i9g";
       type = "gem";
     };
-    version = "1.2.29";
+    version = "1.2.32";
   };
   metasploit_data_models = {
     source = {
@@ -220,10 +228,10 @@
   mini_portile2 = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
+      sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.2.0";
   };
   minitest = {
     source = {
@@ -284,10 +292,10 @@
   nokogiri = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jd8q3pr5rkrxx1vklvhcqcgl8kmfv5c8ny36ni3z5mirw6cm70c";
+      sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
       type = "gem";
     };
-    version = "1.7.2";
+    version = "1.8.0";
   };
   octokit = {
     source = {
@@ -372,10 +380,10 @@
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "073d6rjgqfb4xjhbshyrflqgbdvxqvx4b907j2d4mi5qgbv8y2ax";
+      sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza";
       type = "gem";
     };
-    version = "1.6.6";
+    version = "1.6.8";
   };
   rack-test = {
     source = {
@@ -436,10 +444,10 @@
   recog = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08ypzrn40jbjbzwdbbjkcqdm74zlsc0yr2iqs0yn479fa5k8ajw4";
+      sha256 = "0d12889rx9ylm0jybg9n5sqx0v413hy9zjqs9rd9qjd1kjva7y87";
       type = "gem";
     };
-    version = "2.1.6";
+    version = "2.1.8";
   };
   redcarpet = {
     source = {
@@ -452,10 +460,10 @@
   rex-arch = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y2mzv6wkqgclxl1x65mdq4d0lcgbbny4r1v24c16gi4jg9nsnc1";
+      sha256 = "13dyic499iblhddmy7w01ajr5l5rm6szagy6vz7sx138y21d1y6f";
       type = "gem";
     };
-    version = "0.1.4";
+    version = "0.1.8";
   };
   rex-bin_tools = {
     source = {
@@ -612,10 +620,10 @@
   ruby_smb = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v2acyx6csndb08sidb1pbixn2dlx9s75cpnjv4riwj0qlp8blli";
+      sha256 = "1jby5wlppxhc2jlqldic05aqd5l57171lsxqv86702grk665n612";
       type = "gem";
     };
-    version = "0.0.12";
+    version = "0.0.18";
   };
   rubyntlm = {
     source = {
@@ -705,4 +713,4 @@
     };
     version = "0.3.0";
   };
-}
+}
\ No newline at end of file
-- 
GitLab


From 0cab4cac1271e74dae32cf8ae34e98ee2d9b80c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 9 Jun 2017 21:44:34 +0100
Subject: [PATCH 0544/1490] metasploit: add missing update deps to shell.nix

---
 pkgs/tools/security/metasploit/shell.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/metasploit/shell.nix b/pkgs/tools/security/metasploit/shell.nix
index 7d1b66ba419..cd7a01214c6 100644
--- a/pkgs/tools/security/metasploit/shell.nix
+++ b/pkgs/tools/security/metasploit/shell.nix
@@ -3,6 +3,8 @@ with import <nixpkgs> {};
 stdenv.mkDerivation {
   name = "env";
   buildInputs = [
+    ruby.devEnv
+    git
     sqlite
     libpcap
     postgresql
-- 
GitLab


From 95f733e0aac09aae00f0c9f87acf511c0d02b46b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 9 Jun 2017 22:37:36 +0100
Subject: [PATCH 0545/1490] bundix: 2.1.0 -> 2.2.0

---
 pkgs/development/ruby-modules/bundix/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index 42d6ee04b59..919b4b00319 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -1,13 +1,18 @@
-{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-git }:
+{ buildRubyGem, fetchFromGitHub, lib, bundler, ruby, nix, nix-prefetch-git }:
 
 buildRubyGem rec {
   inherit ruby;
 
   name = "${gemName}-${version}";
   gemName = "bundix";
-  version = "2.1.0";
+  version = "2.2.0";
 
-  sha256 = "5a073c59dfc7e2367c47e6513fc8914d27e11c08f82bc1103c4793dfb2837bef";
+  src = fetchFromGitHub {
+    owner = "manveru";
+    repo = "bundix";
+    rev = version;
+    sha256 = "0lnzkwxprdz73axk54y5p5xkw56n3lra9v2dsvqjfw0ab66ld0iy";
+  };
 
   buildInputs = [bundler];
 
-- 
GitLab


From cfe2b12fe465664b79bce444f8613f02d1756365 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 9 Jun 2017 23:30:10 +0200
Subject: [PATCH 0546/1490] lib-tests: fix test for isStorePath

---
 lib/tests/misc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index f55f3d71272..22557bdfeef 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -90,7 +90,7 @@ runTests {
   testIsStorePath =  {
     expr =
       let goodPath =
-            "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11";
+            "${builtins.storeDir}/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11";
       in {
         storePath = isStorePath goodPath;
         storePathAppendix = isStorePath
-- 
GitLab


From c2c775d047fdbeefd9db7bfcd519636498c6679d Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Sat, 10 Jun 2017 08:29:36 +0900
Subject: [PATCH 0547/1490] rictydiminished-with-firacode: init at 0.0.1
 (#26485)

---
 .../rictydiminished-with-firacode/default.nix | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/data/fonts/rictydiminished-with-firacode/default.nix

diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
new file mode 100644
index 00000000000..074fceeac94
--- /dev/null
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, fontforge, pythonFull }:
+
+stdenv.mkDerivation rec {
+  name = "rictydiminished-with-firacode-${version}";
+  version = "0.0.1";
+  src = fetchgit {
+    url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
+    rev = "refs/tags/${version}";
+    sha256 = "12lhb0k4d8p4lzw9k6hlsxpfpc15zfshz1h5cbaa88sb8n5jh360";
+    fetchSubmodules = true;
+  };
+
+  buildPhase = ''
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/rictydiminished-with-firacode
+    cp *.ttf $out/share/fonts/rictydiminished-with-firacode
+  '';
+
+  nativeBuildInputs = [
+    fontforge
+    (pythonFull.withPackages (ps: [
+      ps.jinja2
+      ps."3to2"
+      ps.fonttools
+    ]))
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode;
+    description = "The best Japanese programming font meets the awesone ligatures of Firacode";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ mt-caret ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2af723792f..c8cd658e88f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12947,6 +12947,8 @@ with pkgs;
 
   raleway = callPackage ../data/fonts/raleway { };
 
+  rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { };
+
   roboto = callPackage ../data/fonts/roboto { };
 
   roboto-mono = callPackage ../data/fonts/roboto-mono { };
-- 
GitLab


From fb26e5c8b68b46d978dc70dc5c86a16bbe40a2ff Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 10 Jun 2017 02:25:55 +0200
Subject: [PATCH 0548/1490] androidenv: Update all packages using fetch.sh

Platforms:
- Update platform_25 (r02 -> r03)
- Add platform_26

Sources:
- Add source_25
---
 pkgs/development/mobile/androidenv/addon.xml  | 118 ++++---
 .../mobile/androidenv/generate-platforms.xsl  |   2 +-
 .../mobile/androidenv/platforms-linux.nix     |  16 +-
 .../mobile/androidenv/platforms-macosx.nix    |  16 +-
 .../mobile/androidenv/repository-11.xml       | 312 ++++++++++++++----
 .../development/mobile/androidenv/sources.nix |  11 +
 .../development/mobile/androidenv/sys-img.xml |  38 +--
 7 files changed, 372 insertions(+), 141 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml
index 538b7622df7..d9b47826648 100644
--- a/pkgs/development/mobile/androidenv/addon.xml
+++ b/pkgs/development/mobile/androidenv/addon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2016-11-23 16:51:44.011243 with ADRT.-->
+	<!--Generated on 2017-06-07 21:05:03.785544 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -1118,6 +1118,39 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 			</sdk:lib>
 		</sdk:libs>
 	</sdk:add-on>
+	<sdk:add-on>
+		<!--Generated from bid:3756122, branch:git_nyc-mr1-emu-release-->
+		<sdk:revision>1</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Tue Apr 25 23:37:40 2017.-->
+				<sdk:size>154871</sdk:size>
+				<sdk:checksum type="sha1">550e83eea9513ab11c44919ac6da54b36084a9f3</sdk:checksum>
+				<sdk:url>google_apis-25_r1.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:vendor-id>google</sdk:vendor-id>
+		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
+		<sdk:name-id>google_apis</sdk:name-id>
+		<sdk:name-display>Google APIs</sdk:name-display>
+		<sdk:api-level>23</sdk:api-level>
+		<sdk:description>Android + Google APIs</sdk:description>
+		<sdk:libs>
+			<sdk:lib>
+				<sdk:name>com.google.android.maps</sdk:name>
+				<sdk:description>API for Google Maps</sdk:description>
+			</sdk:lib>
+			<sdk:lib>
+				<sdk:name>com.android.future.usb.accessory</sdk:name>
+				<sdk:description>API for USB Accessories</sdk:description>
+			</sdk:lib>
+			<sdk:lib>
+				<sdk:name>com.google.android.media.effects</sdk:name>
+				<sdk:description>Collection of video effects</sdk:description>
+			</sdk:lib>
+		</sdk:libs>
+	</sdk:add-on>
 	<sdk:add-on>
 		<!--Generated from bid:77907680, branch:perforce-->
 		<sdk:revision>1</sdk:revision>
@@ -1262,18 +1295,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:libs/>
 	</sdk:add-on>
 	<sdk:extra>
-		<!--Generated from bid:3453458, branch:git_nyc-support-release-->
+		<!--Generated from bid:3841166, branch:git_nyc-support-release-->
 		<sdk:revision>
-			<sdk:major>40</sdk:major>
+			<sdk:major>47</sdk:major>
 			<sdk:minor>0</sdk:minor>
 			<sdk:micro>0</sdk:micro>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Nov  9 14:52:17 2016.-->
-				<sdk:size>305545706</sdk:size>
-				<sdk:checksum type="sha1">782e7233f18c890463e8602571d304e680ce354c</sdk:checksum>
-				<sdk:url>android_m2repository_r40.zip</sdk:url>
+				<!--Built on: Wed Mar 22 18:05:52 2017.-->
+				<sdk:size>355529608</sdk:size>
+				<sdk:checksum type="sha1">a0d22beacc106a6977321f2b07d692ce4979e96a</sdk:checksum>
+				<sdk:url>android_m2repository_r47.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1284,40 +1317,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>m2repository</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:116899064, branch:perforce-->
-		<sdk:obsolete/>
-		<sdk:revision>
-			<sdk:major>23</sdk:major>
-			<sdk:minor>2</sdk:minor>
-			<sdk:micro>1</sdk:micro>
-		</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Tue Apr  5 11:38:38 2016.-->
-				<sdk:size>10850402</sdk:size>
-				<sdk:checksum type="sha1">41121bbc412c2fce0be170d589d20cfa3e78e857</sdk:checksum>
-				<sdk:url>support_r23.2.1.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-license"/>
-		<sdk:vendor-id>android</sdk:vendor-id>
-		<sdk:vendor-display>Android</sdk:vendor-display>
-		<sdk:description></sdk:description>
-		<sdk:name-display>Android Support Library</sdk:name-display>
-		<sdk:path>support</sdk:path>
-		<sdk:old-paths>compatibility</sdk:old-paths>
-	</sdk:extra>
-	<sdk:extra>
-		<!--Generated from bid:140037564, branch:perforce-->
+		<!--Generated from bid:158324354, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>40</sdk:major>
+			<sdk:major>53</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Nov 23 09:14:40 2016.-->
-				<sdk:size>152633821</sdk:size>
-				<sdk:checksum type="sha1">0f599f7f35fba49b9277ef9e1394c5c82d8bd369</sdk:checksum>
-				<sdk:url>google_m2repository_gms_v8_rc42_wear_2a3.zip</sdk:url>
+				<!--Built on: Wed Jun  7 15:15:19 2017.-->
+				<sdk:size>194148491</sdk:size>
+				<sdk:checksum type="sha1">9008082eb1e6ff5a78d32a1fed6915f266fc5013</sdk:checksum>
+				<sdk:url>google_m2repository_gms_v11_1_rc16_wear_2_0_3_rc1.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1392,16 +1401,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:path>google_play_services_froyo</sdk:path>
 	</sdk:extra>
 	<sdk:extra>
-		<!--Generated from bid:139489718, branch:perforce-->
+		<!--Generated from bid:158051086, branch:perforce-->
 		<sdk:revision>
-			<sdk:major>38</sdk:major>
+			<sdk:major>41</sdk:major>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Nov 18 10:26:20 2016.-->
-				<sdk:size>12351978</sdk:size>
-				<sdk:checksum type="sha1">7a50dec81ba9c9b51d7778c19ca05002498209e8</sdk:checksum>
-				<sdk:url>google_play_services_v8_rc41.zip</sdk:url>
+				<!--Built on: Tue Jun  6 11:50:00 2017.-->
+				<sdk:size>13165315</sdk:size>
+				<sdk:checksum type="sha1">55be81c50041f6a8f62947418f74f683369c971f</sdk:checksum>
+				<sdk:url>google_play_services_v11_rc16.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -1601,4 +1610,27 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&
 		<sdk:name-display>Android Auto Desktop Head Unit emulator</sdk:name-display>
 		<sdk:path>auto</sdk:path>
 	</sdk:extra>
+	<sdk:extra>
+		<!--Generated from bid:155747253, branch:perforce-->
+		<sdk:revision>
+			<sdk:major>1</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>0</sdk:micro>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Thu May 11 08:10:37 2017.-->
+				<sdk:size>450468876</sdk:size>
+				<sdk:checksum type="sha1">50074a0f0312ee1d0d81d2cddc3d84a8a9e97a53</sdk:checksum>
+				<sdk:url>aiasdk-1.0.0.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:vendor-id>google</sdk:vendor-id>
+		<sdk:vendor-display>Google Inc.</sdk:vendor-display>
+		<sdk:description>Android Instant Apps Development SDK</sdk:description>
+		<sdk:desc-url>https://developer.android.com/topic/instant-apps/index.html</sdk:desc-url>
+		<sdk:name-display>Instant Apps Development SDK</sdk:name-display>
+		<sdk:path>instantapps</sdk:path>
+	</sdk:extra>
 </sdk:sdk-addon>
diff --git a/pkgs/development/mobile/androidenv/generate-platforms.xsl b/pkgs/development/mobile/androidenv/generate-platforms.xsl
index d195511cdb3..54a165d21e4 100644
--- a/pkgs/development/mobile/androidenv/generate-platforms.xsl
+++ b/pkgs/development/mobile/androidenv/generate-platforms.xsl
@@ -45,7 +45,7 @@ in
     };
     meta = {
       description = "<xsl:value-of select="sdk:description" />";
-<xsl:for-each select="sdk:desc-url">      url = <xsl:value-of select="." />;</xsl:for-each>
+<xsl:for-each select="sdk:desc-url">      homepage = <xsl:value-of select="." />;</xsl:for-each>
     };
   };
 </xsl:for-each>
diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix
index bdf3f545480..1caa6cebb14 100644
--- a/pkgs/development/mobile/androidenv/platforms-linux.nix
+++ b/pkgs/development/mobile/androidenv/platforms-linux.nix
@@ -295,8 +295,8 @@ in
   platform_25 = buildPlatform {
     name = "android-platform-7.1.1";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-25_r02.zip;
-      sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
+      url = https://dl.google.com/android/repository/platform-25_r03.zip;
+      sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
     };
     meta = {
       description = "Android SDK Platform 25";
@@ -304,4 +304,16 @@ in
     };
   };
 
+  platform_26 = buildPlatform {
+    name = "android-platform-8.0.0";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/platform-26_r01.zip;
+      sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a";
+    };
+    meta = {
+      description = "Android SDK Platform 26";
+      homepage = http://developer.android.com/sdk/;
+    };
+  };
+
 }
diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix
index 7bcc5f40769..a4903cd0d40 100644
--- a/pkgs/development/mobile/androidenv/platforms-macosx.nix
+++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix
@@ -295,8 +295,8 @@ in
   platform_25 = buildPlatform {
     name = "android-platform-7.1.1";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/platform-25_r02.zip;
-      sha1 = "6057e54a04f1d141f36a2c8d20f2962b41a3183f";
+      url = https://dl.google.com/android/repository/platform-25_r03.zip;
+      sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8";
     };
     meta = {
       description = "Android SDK Platform 25";
@@ -304,4 +304,16 @@ in
     };
   };
 
+  platform_26 = buildPlatform {
+    name = "android-platform-8.0.0";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/platform-26_r01.zip;
+      sha1 = "33a4f9788bfd7123e712906b2d7e5d54a729e14a";
+    };
+    meta = {
+      description = "Android SDK Platform 26";
+      homepage = http://developer.android.com/sdk/;
+    };
+  };
+
 }
diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml
index e115f674790..9f46af93a88 100644
--- a/pkgs/development/mobile/androidenv/repository-11.xml
+++ b/pkgs/development/mobile/androidenv/repository-11.xml
@@ -15,7 +15,7 @@
  * limitations under the License.
 -->
 <sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2016-11-23 16:51:35.129300 with ADRT.-->
+	<!--Generated on 2017-06-07 21:04:43.441919 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -296,39 +296,39 @@ This is the Android SDK Preview License Agreement (the &quot;License Agreement&q
 
 June 2014.</sdk:license>
 	<sdk:ndk>
-		<!--Generated from bid:3345770, branch:aosp-ndk-r13-release-->
+		<!--Generated from bid:4075724, branch:aosp-ndk-r15-release-->
 		<sdk:description>NDK</sdk:description>
-		<sdk:revision>13</sdk:revision>
+		<sdk:revision>15</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Wed Oct 12 22:27:26 2016.-->
-				<sdk:size>665967997</sdk:size>
-				<sdk:checksum type="sha1">71fe653a7bf5db08c3af154735b6ccbc12f0add5</sdk:checksum>
-				<sdk:url>android-ndk-r13b-darwin-x86_64.zip</sdk:url>
+				<!--Built on: Wed Jun  7 14:50:43 2017.-->
+				<sdk:size>959176682</sdk:size>
+				<sdk:checksum type="sha1">9dd0ff18d177ec75797b021a3ebd294362e8a41e</sdk:checksum>
+				<sdk:url>android-ndk-r15-darwin-x86_64.zip</sdk:url>
 				<sdk:host-os>macosx</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Oct 12 22:27:48 2016.-->
-				<sdk:size>687311866</sdk:size>
-				<sdk:checksum type="sha1">0600157c4ddf50ec15b8a037cfc474143f718fd0</sdk:checksum>
-				<sdk:url>android-ndk-r13b-linux-x86_64.zip</sdk:url>
+				<!--Built on: Wed Jun  7 14:51:08 2017.-->
+				<sdk:size>973898016</sdk:size>
+				<sdk:checksum type="sha1">32b3115357ed798a8a48d7d589ffcb901693c745</sdk:checksum>
+				<sdk:url>android-ndk-r15-linux-x86_64.zip</sdk:url>
 				<sdk:host-os>linux</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Oct 12 22:26:38 2016.-->
-				<sdk:size>620461544</sdk:size>
-				<sdk:checksum type="sha1">4eb1288b1d4134a9d6474eb247f0448808d52408</sdk:checksum>
-				<sdk:url>android-ndk-r13b-windows-x86.zip</sdk:url>
+				<!--Built on: Wed Jun  7 14:49:52 2017.-->
+				<sdk:size>783705009</sdk:size>
+				<sdk:checksum type="sha1">bf869b624f6d4778065d5d4703815b0c689069e1</sdk:checksum>
+				<sdk:url>android-ndk-r15-windows-x86.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>32</sdk:host-bits>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Wed Oct 12 22:27:04 2016.-->
-				<sdk:size>681320123</sdk:size>
-				<sdk:checksum type="sha1">649d306559435c244cec5881b880318bb3dee53a</sdk:checksum>
-				<sdk:url>android-ndk-r13b-windows-x86_64.zip</sdk:url>
+				<!--Built on: Wed Jun  7 14:50:17 2017.-->
+				<sdk:size>848657615</sdk:size>
+				<sdk:checksum type="sha1">45d310443ceb5ff19a0dde139ee9b3404908c178</sdk:checksum>
+				<sdk:url>android-ndk-r15-windows-x86_64.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 				<sdk:host-bits>64</sdk:host-bits>
 			</sdk:archive>
@@ -336,17 +336,41 @@ June 2014.</sdk:license>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:ndk>
 	<sdk:platform>
-		<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
+		<!--Generated from bid:4062713, branch:git_oc-preview3-sdk-->
+		<sdk:version>8.0.0</sdk:version>
+		<sdk:api-level>26</sdk:api-level>
+		<sdk:description>Android SDK Platform 26</sdk:description>
+		<sdk:revision>1</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Fri Jun  2 13:22:35 2017.-->
+				<sdk:size>63467872</sdk:size>
+				<sdk:checksum type="sha1">33a4f9788bfd7123e712906b2d7e5d54a729e14a</sdk:checksum>
+				<sdk:url>platform-26_r01.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+		<sdk:min-tools-rev>
+			<sdk:major>22</sdk:major>
+		</sdk:min-tools-rev>
+		<sdk:desc-url>http://developer.android.com/sdk/</sdk:desc-url>
+		<sdk:layoutlib>
+			<sdk:api>15</sdk:api>
+			<sdk:revision>1</sdk:revision>
+		</sdk:layoutlib>
+	</sdk:platform>
+	<sdk:platform>
+		<!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev-->
 		<sdk:version>7.1.1</sdk:version>
 		<sdk:api-level>25</sdk:api-level>
 		<sdk:description>Android SDK Platform 25</sdk:description>
-		<sdk:revision>2</sdk:revision>
+		<sdk:revision>3</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Nov 14 23:49:40 2016.-->
-				<sdk:size>85434042</sdk:size>
-				<sdk:checksum type="sha1">6057e54a04f1d141f36a2c8d20f2962b41a3183f</sdk:checksum>
-				<sdk:url>platform-25_r02.zip</sdk:url>
+				<!--Built on: Mon Dec  5 10:12:38 2016.-->
+				<sdk:size>85424763</sdk:size>
+				<sdk:checksum type="sha1">00c2c5765e8988504be10a1eb66ed71fcdbd7fe8</sdk:checksum>
+				<sdk:url>platform-25_r03.zip</sdk:url>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
@@ -976,6 +1000,20 @@ June 2014.</sdk:license>
 			<sdk:api>4</sdk:api>
 		</sdk:layoutlib>
 	</sdk:platform>
+	<sdk:source>
+		<!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev-->
+		<sdk:api-level>25</sdk:api-level>
+		<sdk:revision>1</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Mon Dec  5 10:12:27 2016.-->
+				<sdk:size>30822685</sdk:size>
+				<sdk:checksum type="sha1">bbc72efd1a9bad87cc507e308f0d29aad438c52c</sdk:checksum>
+				<sdk:url>sources-25_r01.zip</sdk:url>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+	</sdk:source>
 	<sdk:source>
 		<!--Generated from bid:3209611, branch:git_nyc-sdk-dev-->
 		<sdk:api-level>24</sdk:api-level>
@@ -1131,6 +1169,168 @@ June 2014.</sdk:license>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:source>
+	<sdk:build-tool>
+		<!--Generated from bid:4062713, branch:git_oc-preview3-sdk-->
+		<sdk:revision>
+			<sdk:major>26</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>0</sdk:micro>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Fri Jun  2 13:22:18 2017.-->
+				<sdk:size>53854197</sdk:size>
+				<sdk:checksum type="sha1">1cbe72929876f8a872ab1f1b1040a9f720261f59</sdk:checksum>
+				<sdk:url>build-tools_r26-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Fri Jun  2 13:22:15 2017.-->
+				<sdk:size>53010814</sdk:size>
+				<sdk:checksum type="sha1">d01a1aeca03747245f1f5936b3cb01759c66d086</sdk:checksum>
+				<sdk:url>build-tools_r26-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Fri Jun  2 13:22:13 2017.-->
+				<sdk:size>54681641</sdk:size>
+				<sdk:checksum type="sha1">896ebd31117c09db220f7a3116cc0e5121c78b9d</sdk:checksum>
+				<sdk:url>build-tools_r26-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+	</sdk:build-tool>
+	<sdk:build-tool>
+		<!--Generated from bid:4004883, branch:git_oc-preview2-sdk-->
+		<sdk:revision>
+			<sdk:major>26</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>0</sdk:micro>
+			<sdk:preview>2</sdk:preview>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Fri May 12 23:05:09 2017.-->
+				<sdk:size>53847560</sdk:size>
+				<sdk:checksum type="sha1">629bbd8d2e415bf64871fb0b4c0540fd6d0347a0</sdk:checksum>
+				<sdk:url>build-tools_r26-rc2-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Fri May 12 23:05:07 2017.-->
+				<sdk:size>53003874</sdk:size>
+				<sdk:checksum type="sha1">cb1eb738a1f7003025af267a9b8cc2d259533c70</sdk:checksum>
+				<sdk:url>build-tools_r26-rc2-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Fri May 12 23:05:05 2017.-->
+				<sdk:size>54678375</sdk:size>
+				<sdk:checksum type="sha1">ddaba77db0557a98f6330fbd579ad0bd12cbb152</sdk:checksum>
+				<sdk:url>build-tools_r26-rc2-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-preview-license"/>
+	</sdk:build-tool>
+	<sdk:build-tool>
+		<!--Generated from bid:3821161, branch:git_oc-preview-release-->
+		<sdk:revision>
+			<sdk:major>26</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>0</sdk:micro>
+			<sdk:preview>1</sdk:preview>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Tue Mar 21 10:10:45 2017.-->
+				<sdk:size>53648603</sdk:size>
+				<sdk:checksum type="sha1">8cd6388dc96db2d7a49d06159cf990d3bbc78d04</sdk:checksum>
+				<sdk:url>build-tools_r26-rc1-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Tue Mar 21 10:10:34 2017.-->
+				<sdk:size>52821129</sdk:size>
+				<sdk:checksum type="sha1">5c5a1de7d5f4f000d36ae349229fe0be846d6137</sdk:checksum>
+				<sdk:url>build-tools_r26-rc1-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Tue Mar 21 10:10:25 2017.-->
+				<sdk:size>54379108</sdk:size>
+				<sdk:checksum type="sha1">43c2ddad3b67a5c33712ae14331a60673e69be91</sdk:checksum>
+				<sdk:url>build-tools_r26-rc1-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-preview-license"/>
+	</sdk:build-tool>
+	<sdk:build-tool>
+		<!--Generated from bid:3907386, branch:git_nyc-mr1-sdk-dev-->
+		<sdk:revision>
+			<sdk:major>25</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>3</sdk:micro>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Thu Apr 13 13:27:23 2017.-->
+				<sdk:size>50757258</sdk:size>
+				<sdk:checksum type="sha1">db95f3a0ae376534d4d69f4cdb6fad20649f3509</sdk:checksum>
+				<sdk:url>build-tools_r25.0.3-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Thu Apr 13 13:27:21 2017.-->
+				<sdk:size>50545085</sdk:size>
+				<sdk:checksum type="sha1">160d2fefb5ce68e443427fc30a793a703b63e26e</sdk:checksum>
+				<sdk:url>build-tools_r25.0.3-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Thu Apr 13 13:27:19 2017.-->
+				<sdk:size>51337442</sdk:size>
+				<sdk:checksum type="sha1">1edcb109ae5133aebfed573cf0bc84e0c353c28d</sdk:checksum>
+				<sdk:url>build-tools_r25.0.3-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+	</sdk:build-tool>
+	<sdk:build-tool>
+		<!--Generated from bid:3544217, branch:git_nyc-mr1-sdk-dev-->
+		<sdk:revision>
+			<sdk:major>25</sdk:major>
+			<sdk:minor>0</sdk:minor>
+			<sdk:micro>2</sdk:micro>
+		</sdk:revision>
+		<sdk:archives>
+			<sdk:archive>
+				<!--Built on: Mon Dec  5 10:11:59 2016.-->
+				<sdk:size>49880329</sdk:size>
+				<sdk:checksum type="sha1">ff953c0177e317618fda40516f3e9d95fd43c7ae</sdk:checksum>
+				<sdk:url>build-tools_r25.0.2-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Mon Dec  5 10:11:57 2016.-->
+				<sdk:size>49667185</sdk:size>
+				<sdk:checksum type="sha1">12a5204bb3b6e39437535469fde7ddf42da46b16</sdk:checksum>
+				<sdk:url>build-tools_r25.0.2-macosx.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
+			</sdk:archive>
+			<sdk:archive>
+				<!--Built on: Mon Dec  5 10:11:55 2016.-->
+				<sdk:size>50458908</sdk:size>
+				<sdk:checksum type="sha1">2fee3c0704d6ecc480570450d8b8069b2c4a2dd4</sdk:checksum>
+				<sdk:url>build-tools_r25.0.2-windows.zip</sdk:url>
+				<sdk:host-os>windows</sdk:host-os>
+			</sdk:archive>
+		</sdk:archives>
+		<sdk:uses-license ref="android-sdk-license"/>
+	</sdk:build-tool>
 	<sdk:build-tool>
 		<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
 		<sdk:revision>
@@ -2043,64 +2243,64 @@ June 2014.</sdk:license>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:build-tool>
 	<sdk:platform-tool>
-		<!--Generated from bid:3485210, branch:git_nyc-mr1-sdk-dev-->
+		<!--Generated from bid:4062713a, branch:git_oc-preview3-sdk-->
 		<sdk:revision>
-			<sdk:major>25</sdk:major>
+			<sdk:major>26</sdk:major>
 			<sdk:minor>0</sdk:minor>
-			<sdk:micro>1</sdk:micro>
+			<sdk:micro>0</sdk:micro>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Mon Nov 14 23:49:26 2016.-->
-				<sdk:size>3916151</sdk:size>
-				<sdk:checksum type="sha1">8e461a2c76717824d1d8e91af68216c9f230a373</sdk:checksum>
-				<sdk:url>platform-tools_r25.0.1-linux.zip</sdk:url>
-				<sdk:host-os>linux</sdk:host-os>
+				<!--Built on: Fri Jun  2 13:22:20 2017.-->
+				<sdk:size>7771750</sdk:size>
+				<sdk:checksum type="sha1">e75b6137dc444f777eb02f44a6d9819b3aabff82</sdk:checksum>
+				<sdk:url>platform-tools_r26.0.0-darwin.zip</sdk:url>
+				<sdk:host-os>macosx</sdk:host-os>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Mon Nov 14 23:49:25 2016.-->
-				<sdk:size>3732924</sdk:size>
-				<sdk:checksum type="sha1">96abc8638bf9f65435bc0ab641cc4a3ff753eed5</sdk:checksum>
-				<sdk:url>platform-tools_r25.0.1-macosx.zip</sdk:url>
-				<sdk:host-os>macosx</sdk:host-os>
+				<!--Built on: Fri Jun  2 13:22:19 2017.-->
+				<sdk:size>7859155</sdk:size>
+				<sdk:checksum type="sha1">00de8a6631405b617c10f68cd11ff2e1cd528e23</sdk:checksum>
+				<sdk:url>platform-tools_r26.0.0-linux.zip</sdk:url>
+				<sdk:host-os>linux</sdk:host-os>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Mon Nov 14 23:49:25 2016.-->
-				<sdk:size>3573485</sdk:size>
-				<sdk:checksum type="sha1">75249224c12528329a151dfbc591509168ef6efd</sdk:checksum>
-				<sdk:url>platform-tools_r25.0.1-windows.zip</sdk:url>
+				<!--Built on: Fri Jun  2 13:22:20 2017.-->
+				<sdk:size>7511554</sdk:size>
+				<sdk:checksum type="sha1">a4128ebc3d1b6372d981810920e3fa01637f891a</sdk:checksum>
+				<sdk:url>platform-tools_r26.0.0-windows.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 			</sdk:archive>
 		</sdk:archives>
 		<sdk:uses-license ref="android-sdk-license"/>
 	</sdk:platform-tool>
 	<sdk:tool>
-		<!--Generated from bid:3470232, branch:aosp-emu-2.2-release-->
+		<!--Generated from bid:3567187, branch:aosp-emu-2.2-release-->
 		<sdk:revision>
 			<sdk:major>25</sdk:major>
 			<sdk:minor>2</sdk:minor>
-			<sdk:micro>3</sdk:micro>
+			<sdk:micro>5</sdk:micro>
 		</sdk:revision>
 		<sdk:archives>
 			<sdk:archive>
-				<!--Built on: Fri Nov 11 08:51:34 2016.-->
-				<sdk:size>277861433</sdk:size>
-				<sdk:checksum type="sha1">aafe7f28ac51549784efc2f3bdfc620be8a08213</sdk:checksum>
-				<sdk:url>tools_r25.2.3-linux.zip</sdk:url>
+				<!--Built on: Mon Dec 12 17:20:14 2016.-->
+				<sdk:size>277894900</sdk:size>
+				<sdk:checksum type="sha1">72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1</sdk:checksum>
+				<sdk:url>tools_r25.2.5-linux.zip</sdk:url>
 				<sdk:host-os>linux</sdk:host-os>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Fri Nov 11 08:51:29 2016.-->
-				<sdk:size>200496727</sdk:size>
-				<sdk:checksum type="sha1">0e88c0bdb8f8ee85cce248580173e033a1bbc9cb</sdk:checksum>
-				<sdk:url>tools_r25.2.3-macosx.zip</sdk:url>
+				<!--Built on: Mon Dec 12 17:20:09 2016.-->
+				<sdk:size>200529982</sdk:size>
+				<sdk:checksum type="sha1">d2168d963ac5b616e3d3ddaf21511d084baf3659</sdk:checksum>
+				<sdk:url>tools_r25.2.5-macosx.zip</sdk:url>
 				<sdk:host-os>macosx</sdk:host-os>
 			</sdk:archive>
 			<sdk:archive>
-				<!--Built on: Fri Nov 11 08:51:26 2016.-->
-				<sdk:size>306745639</sdk:size>
-				<sdk:checksum type="sha1">b965decb234ed793eb9574bad8791c50ca574173</sdk:checksum>
-				<sdk:url>tools_r25.2.3-windows.zip</sdk:url>
+				<!--Built on: Mon Dec 12 17:20:05 2016.-->
+				<sdk:size>306785944</sdk:size>
+				<sdk:checksum type="sha1">a7f7ebeae1c8d8f62d3a8466e9c81baee7cc31ca</sdk:checksum>
+				<sdk:url>tools_r25.2.5-windows.zip</sdk:url>
 				<sdk:host-os>windows</sdk:host-os>
 			</sdk:archive>
 		</sdk:archives>
diff --git a/pkgs/development/mobile/androidenv/sources.nix b/pkgs/development/mobile/androidenv/sources.nix
index 5bb7409c2c4..e4fe3cf0ff5 100644
--- a/pkgs/development/mobile/androidenv/sources.nix
+++ b/pkgs/development/mobile/androidenv/sources.nix
@@ -137,4 +137,15 @@ in
     };
   };
 
+  source_25 = buildSource {
+    name = "android-source-25";
+    src = fetchurl {
+      url = https://dl.google.com/android/repository/sources-25_r01.zip;
+      sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c";
+    };
+    meta = {
+      description = "Source code for Android API 25";
+    };
+  };
+
 }
diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml
index 807d4976296..8ea0cfb5b80 100644
--- a/pkgs/development/mobile/androidenv/sys-img.xml
+++ b/pkgs/development/mobile/androidenv/sys-img.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <sdk:sdk-sys-img xmlns:sdk="http://schemas.android.com/sdk/android/sys-img/3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<!--Generated on 2016-11-23 16:51:35.431708 with ADRT.-->
+	<!--Generated on 2017-06-07 21:04:43.770481 with ADRT.-->
 	<sdk:license id="android-sdk-license" type="text">Terms and Conditions
 
 This is the Android Software Development Kit License Agreement
@@ -830,24 +830,6 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:abi>x86</sdk:abi>
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3479480, branch:git_nyc-preview-release-->
-		<sdk:api-level>25</sdk:api-level>
-		<sdk:description>Google APIs Intel x86 Atom System Image</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Nov 14 16:41:48 2016.-->
-				<sdk:size>703131759</sdk:size>
-				<sdk:checksum type="sha1">7dd19cfee4e43a1f60e0f5f058404d92d9544b33</sdk:checksum>
-				<sdk:url>x86-25_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-preview-license"/>
-		<sdk:abi>x86</sdk:abi>
-		<sdk:tag-id>google_apis</sdk:tag-id>
-		<sdk:tag-display>Google APIs</sdk:tag-display>
-	</sdk:system-image>
 	<sdk:system-image>
 		<!--Generated from bid:3079185, branch:git_lmp-emu-release-->
 		<sdk:api-level>21</sdk:api-level>
@@ -916,22 +898,4 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS
 		<sdk:abi>x86_64</sdk:abi>
 		<sdk:tag-id>default</sdk:tag-id>
 	</sdk:system-image>
-	<sdk:system-image>
-		<!--Generated from bid:3479480, branch:git_nyc-preview-release-->
-		<sdk:api-level>25</sdk:api-level>
-		<sdk:description>Google APIs Intel x86 Atom_64 System Image</sdk:description>
-		<sdk:revision>3</sdk:revision>
-		<sdk:archives>
-			<sdk:archive>
-				<!--Built on: Mon Nov 14 16:42:52 2016.-->
-				<sdk:size>912938750</sdk:size>
-				<sdk:checksum type="sha1">4593ee04811df21c339f3374fc5917843db06f8d</sdk:checksum>
-				<sdk:url>x86_64-25_r03.zip</sdk:url>
-			</sdk:archive>
-		</sdk:archives>
-		<sdk:uses-license ref="android-sdk-preview-license"/>
-		<sdk:abi>x86_64</sdk:abi>
-		<sdk:tag-id>google_apis</sdk:tag-id>
-		<sdk:tag-display>Google APIs</sdk:tag-display>
-	</sdk:system-image>
 </sdk:sdk-sys-img>
-- 
GitLab


From 8237294f64e1c80665da287c35449a76cba2aac7 Mon Sep 17 00:00:00 2001
From: Changlin Li <mail@changlinli.com>
Date: Fri, 9 Jun 2017 03:05:21 -0400
Subject: [PATCH 0549/1490] Add Unicode Arphic CJK fonts

These are a couple of CJK fonts that are on most other Linux distributions
that aren't on NixOS
---
 lib/licenses.nix                   |  5 +++
 pkgs/data/fonts/arphic/default.nix | 69 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  3 ++
 3 files changed, 77 insertions(+)
 create mode 100644 pkgs/data/fonts/arphic/default.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 0919699b41e..8dd1c210b7f 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -45,6 +45,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Apple Public Source License 2.0";
   };
 
+  arphicpl = {
+    fullName = "Arphic Public License";
+    url = https://www.freedesktop.org/wiki/Arphic_Public_License/;
+  };
+
   artistic1 = spdx {
     spdxId = "Artistic-1.0";
     fullName = "Artistic License 1.0";
diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix
new file mode 100644
index 00000000000..40f5480c086
--- /dev/null
+++ b/pkgs/data/fonts/arphic/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, mkfontscale, mkfontdir }:
+
+{
+  arphic-ukai = stdenv.mkDerivation rec {
+    name = "arphic-ukai-${version}";
+
+    version = "0.2.20080216.2";
+
+    src = fetchurl {
+      url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
+      sha256 = "1lp3i9m6x5wrqjkh1a8vpyhmsrhvsa2znj2mx13qfkwza5rqv5ml";
+    };
+
+    buildInputs = [ mkfontscale mkfontdir ];
+
+    phases = [ "unpackPhase" "installPhase" ];
+
+    installPhase =
+      ''
+      mkdir -p $out/share/fonts $out/share/fonts/truetype
+      cp -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
+      cd $out/share/fonts
+      mkfontdir
+      mkfontscale
+      '';
+
+    meta = with stdenv.lib; {
+      description = "CJK Unicode font Kai style";
+      homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
+
+      license = licenses.arphicpl;
+      maintainers = [ maintainers.changlinli ];
+      platforms = platforms.all;
+    };
+  };
+
+  arphic-uming = stdenv.mkDerivation rec {
+    name = "arphic-uming-${version}";
+
+    version = "0.2.20080216.2";
+
+    src = fetchurl {
+      url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
+      sha256 = "1ny11n380vn7sryvy1g3a83y3ll4h0jf9wgnrx55nmksx829xhg3";
+    };
+
+    buildInputs = [ mkfontscale mkfontdir ];
+
+    phases = [ "unpackPhase" "installPhase" ];
+
+    installPhase =
+      ''
+      mkdir -p $out/share/fonts $out/share/fonts/truetype
+      cp -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
+      cd $out/share/fonts
+      mkfontdir
+      mkfontscale
+      '';
+
+    meta = with stdenv.lib; {
+      description = "CJK Unicode font Ming style";
+      homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
+
+      license = licenses.arphicpl;
+      maintainers = [ maintainers.changlinli ];
+      platforms = platforms.all;
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 100f9f9c36f..b25db850cda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -474,6 +474,9 @@ with pkgs;
 
   arp-scan = callPackage ../tools/misc/arp-scan { };
 
+  inherit (callPackages ../data/fonts/arphic {})
+    arphic-ukai arphic-uming;
+
   artyFX = callPackage ../applications/audio/artyFX {};
 
   as31 = callPackage ../development/compilers/as31 {};
-- 
GitLab


From d17bcfc5f088d487da65d4ec9a2dc1990c912319 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 10 Jun 2017 03:32:25 +0200
Subject: [PATCH 0550/1490] androidenv: Manually update missing packages

Improvement: Use nix-shell for fetch.sh

androidsdk{,_extras}:
- Update to 7.1.1

google_apis_25 is missing after fetch.sh due to an error in addon.xml
(upsteam bug).

Addons:
- Add google_apis_25
- Update google_play_services (v8_rc41 -> v11_rc16)
---
 pkgs/development/mobile/androidenv/addons.nix  | 17 +++++++++++++++--
 pkgs/development/mobile/androidenv/default.nix | 14 ++++++++++++++
 pkgs/development/mobile/androidenv/fetch.sh    |  3 ++-
 pkgs/top-level/all-packages.nix                | 18 +++++++++---------
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index 7ddd203d4bf..06be6515ee5 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -268,6 +268,18 @@ in
       };
     };
 
+  google_apis_25 = buildGoogleApis {
+    name = "google_apis-25";
+      src = fetchurl {
+        url = https://dl.google.com/android/repository/google_apis-25_r1.zip;
+        sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3";
+      };
+      meta = {
+        description = "Android + Google APIs";
+
+      };
+    };
+
   android_support_extra = buildGoogleApis {
     name = "android_support_extra";
     src = fetchurl {
@@ -280,11 +292,12 @@ in
     };
   };
 
+
   google_play_services = buildGoogleApis {
     name = "google_play_services";
     src = fetchurl {
-      url = https://dl.google.com/android/repository/google_play_services_v8_rc41.zip;
-      sha1 = "7a50dec81ba9c9b51d7778c19ca05002498209e8";
+      url = https://dl.google.com/android/repository/google_play_services_v11_rc16.zip;
+      sha1 = "55be81c50041f6a8f62947418f74f683369c971f";
     };
     meta = {
       description = "Google Play services client library and sample code";
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 7ecb82ce406..a233333986a 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -181,6 +181,20 @@ rec {
     useGooglePlayServices = true;
   };
 
+  androidsdk_7_1_1 = androidsdk {
+    platformVersions = [ "25" ];
+    abiVersions = [ "x86" "x86_64"];
+    useGoogleAPIs = true;
+  };
+
+  androidsdk_7_1_1_extras = androidsdk {
+    platformVersions = [ "25" ];
+    abiVersions = [ "x86" "x86_64"];
+    useGoogleAPIs = true;
+    useExtraSupportLibs = true;
+    useGooglePlayServices = true;
+  };
+
   androidndk = import ./androidndk.nix {
     inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
     inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh
index cd9f29a4c24..2edbe6bf489 100755
--- a/pkgs/development/mobile/androidenv/fetch.sh
+++ b/pkgs/development/mobile/androidenv/fetch.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash --pure -p androidsdk curl libxslt
 
 # this shows a list of available xmls
 android list sdk | grep 'Parse XML:' | cut -f8- -d\  # | xargs -n 1 curl -O
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8cd658e88f..6a545ae65df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -525,12 +525,6 @@ with pkgs;
     client = true;
   });
 
-  androidenv = callPackage ../development/mobile/androidenv {
-    pkgs_i686 = pkgsi686Linux;
-  };
-
-  adb-sync = callPackage ../development/mobile/adb-sync { };
-
   apg = callPackage ../tools/security/apg { };
 
   autorevision = callPackage ../tools/misc/autorevision { };
@@ -589,11 +583,17 @@ with pkgs;
     pkgs_i686 = pkgsi686Linux;
   };
 
-  inherit (androidenv) androidsdk_4_4 androidndk;
+  adb-sync = callPackage ../development/mobile/adb-sync { };
+
+  androidenv = callPackage ../development/mobile/androidenv {
+    pkgs_i686 = pkgsi686Linux;
+  };
+
+  inherit (androidenv) androidndk;
 
-  androidsdk = androidenv.androidsdk_7_0;
+  androidsdk = androidenv.androidsdk_7_1_1;
 
-  androidsdk_extras = self.androidenv.androidsdk_7_0_extras;
+  androidsdk_extras = self.androidenv.androidsdk_7_1_1_extras;
 
   arc-theme = callPackage ../misc/themes/arc { };
 
-- 
GitLab


From 6736ec318a08464e53046c3900b55fc5265103f7 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Fri, 9 Jun 2017 22:17:23 -0400
Subject: [PATCH 0551/1490] vscode: 1.12.2 -> 1.13.0

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 47fb24ca2cc..50103de4d05 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile }:
 
 let
-  version = "1.12.2";
+  version = "1.13.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0221s8vx32haqr31wkkm637gya3vljbkim59i7a2hhwxh2gcs2fk";
-    "x86_64-linux" = "0p6ck2lc9lln96lib5r5yfbrd04rgsbzhvf1lx2kykn428ddxi9s";
-    "x86_64-darwin" = "1s7hyr245v4z2g357m7ajnh8y1cqixricpkx329xls4292qb7rh4";
+    "i686-linux" = "069pv0w8yhsv50glpcxzypsjc7mxmrcrv25c75rnv43yiyamjvyi";
+    "x86_64-linux" = "0cjkkvd5rs82yji0kpnbvzgwz5qvh9x6bmjd51rrvjz84dbwhgzq";
+    "x86_64-darwin" = "1qbxv5drqrx9k835a6zj3kkbh4sga5r9y0gf9bq16g3gf0dd9bwq";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
-- 
GitLab


From 507c2079580d51c5a48c6267c3ad2ca6febd2fe9 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sat, 10 Jun 2017 09:35:35 +0200
Subject: [PATCH 0552/1490] spamassassin: major service fixes -> added more
 perl packages to spamassassin and abstracted service to not use
 /etc/spamassassin, also running sa-update as spamd user periodically (#26470)

thanks @grahamc for IRC comments
---
 nixos/modules/services/mail/spamassassin.nix  | 164 ++++++++++++++++--
 pkgs/servers/mail/spamassassin/default.nix    |  23 +--
 .../sa-update_add--siteconfigpath.patch       |  59 +++++++
 pkgs/top-level/perl-packages.nix              | 107 +++++++++++-
 4 files changed, 324 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch

diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
index 08953134b3b..fc8396cd85e 100644
--- a/nixos/modules/services/mail/spamassassin.nix
+++ b/nixos/modules/services/mail/spamassassin.nix
@@ -3,43 +3,129 @@
 with lib;
 
 let
-
   cfg = config.services.spamassassin;
+  spamassassin-local-cf = pkgs.writeText "local.cf" cfg.config;
+  spamassassin-init-pre = pkgs.writeText "init.pre" cfg.initPreConf;
+
+  spamdEnv = pkgs.buildEnv {
+    name = "spamd-env";
+    paths = [];
+    postBuild = ''
+      ln -sf ${spamassassin-init-pre} $out/init.pre
+      ln -sf ${spamassassin-local-cf} $out/local.cf
+    '';
+  };
 
 in
 
 {
-
-  ###### interface
-
   options = {
 
     services.spamassassin = {
-
       enable = mkOption {
         default = false;
-        description = "Whether to run the SpamAssassin daemon.";
+        description = "Whether to run the SpamAssassin daemon";
       };
 
       debug = mkOption {
         default = false;
-        description = "Whether to run the SpamAssassin daemon in debug mode.";
+        description = "Whether to run the SpamAssassin daemon in debug mode";
       };
 
-    };
+      config = mkOption {
+        type = types.lines;
+        description = ''
+          The SpamAssassin local.cf config
+
+          If you are using this configuration:
+            add_header all Status _YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_
+
+          Then you can Use this sieve filter:
+            require ["fileinto", "reject", "envelope"];
+            
+            if header :contains "X-Spam-Flag" "YES" {
+              fileinto "spam";
+            }
+
+          Or this procmail filter:
+            :0:
+            * ^X-Spam-Flag: YES
+            /var/vpopmail/domains/lastlog.de/js/.maildir/.spam/new
+
+          To filter your messages based on the additional mail headers added by spamassassin.
+        '';
+        example = ''
+          #rewrite_header Subject [***** SPAM _SCORE_ *****]
+          required_score          5.0
+          use_bayes               1
+          bayes_auto_learn        1
+          add_header all Status _YESNO_, score=_SCORE_ required=_REQD_ tests=_TESTS_ autolearn=_AUTOLEARN_ version=_VERSION_
+        '';
+        default = "";
+      };
 
+      initPreConf = mkOption {
+        type = types.str;
+        description = "The SpamAssassin init.pre config.";
+        default = 
+        ''          
+          #
+          # to update this list, run this command in the rules directory:
+          # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq     
+          #
+
+          #loadplugin Mail::SpamAssassin::Plugin::AccessDB
+          #loadplugin Mail::SpamAssassin::Plugin::AntiVirus
+          loadplugin Mail::SpamAssassin::Plugin::AskDNS
+          # loadplugin Mail::SpamAssassin::Plugin::ASN
+          loadplugin Mail::SpamAssassin::Plugin::AutoLearnThreshold
+          #loadplugin Mail::SpamAssassin::Plugin::AWL
+          loadplugin Mail::SpamAssassin::Plugin::Bayes
+          loadplugin Mail::SpamAssassin::Plugin::BodyEval
+          loadplugin Mail::SpamAssassin::Plugin::Check
+          #loadplugin Mail::SpamAssassin::Plugin::DCC
+          loadplugin Mail::SpamAssassin::Plugin::DKIM
+          loadplugin Mail::SpamAssassin::Plugin::DNSEval
+          loadplugin Mail::SpamAssassin::Plugin::FreeMail
+          loadplugin Mail::SpamAssassin::Plugin::Hashcash
+          loadplugin Mail::SpamAssassin::Plugin::HeaderEval
+          loadplugin Mail::SpamAssassin::Plugin::HTMLEval
+          loadplugin Mail::SpamAssassin::Plugin::HTTPSMismatch
+          loadplugin Mail::SpamAssassin::Plugin::ImageInfo
+          loadplugin Mail::SpamAssassin::Plugin::MIMEEval
+          loadplugin Mail::SpamAssassin::Plugin::MIMEHeader
+          # loadplugin Mail::SpamAssassin::Plugin::PDFInfo
+          #loadplugin Mail::SpamAssassin::Plugin::PhishTag
+          loadplugin Mail::SpamAssassin::Plugin::Pyzor
+          loadplugin Mail::SpamAssassin::Plugin::Razor2
+          # loadplugin Mail::SpamAssassin::Plugin::RelayCountry
+          loadplugin Mail::SpamAssassin::Plugin::RelayEval
+          loadplugin Mail::SpamAssassin::Plugin::ReplaceTags
+          # loadplugin Mail::SpamAssassin::Plugin::Rule2XSBody
+          # loadplugin Mail::SpamAssassin::Plugin::Shortcircuit
+          loadplugin Mail::SpamAssassin::Plugin::SpamCop
+          loadplugin Mail::SpamAssassin::Plugin::SPF
+          #loadplugin Mail::SpamAssassin::Plugin::TextCat
+          # loadplugin Mail::SpamAssassin::Plugin::TxRep
+          loadplugin Mail::SpamAssassin::Plugin::URIDetail
+          loadplugin Mail::SpamAssassin::Plugin::URIDNSBL
+          loadplugin Mail::SpamAssassin::Plugin::URIEval
+          # loadplugin Mail::SpamAssassin::Plugin::URILocalBL
+          loadplugin Mail::SpamAssassin::Plugin::VBounce
+          loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+          loadplugin Mail::SpamAssassin::Plugin::WLBLEval
+        '';
+      };
+    };
   };
 
-
-  ###### implementation
-
   config = mkIf cfg.enable {
 
     # Allow users to run 'spamc'.
     environment.systemPackages = [ pkgs.spamassassin ];
 
     users.extraUsers = singleton {
-    name = "spamd";
+      name = "spamd";
       description = "Spam Assassin Daemon";
       uid = config.ids.uids.spamd;
       group = "spamd";
@@ -50,13 +136,65 @@ in
       gid = config.ids.gids.spamd;
     };
 
+    systemd.services.sa-update = {
+      script = ''
+        set +e 
+        ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd
+
+        v=$?
+        set -e
+        if [ $v -gt 1 ]; then
+          echo "sa-update execution error"
+          exit $v
+        fi
+        if [ $v -eq 0 ]; then
+          systemctl reload spamd.service
+        fi
+      '';
+    };
+
+    systemd.timers.sa-update = { 
+      description = "sa-update-service";
+      partOf      = [ "sa-update.service" ];
+      wantedBy    = [ "timers.target" ];
+      timerConfig = {
+        OnCalendar = "1:*";
+        Persistent = true;
+      };
+    };
+
     systemd.services.spamd = {
       description = "Spam Assassin Server";
 
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
-      script = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --nouser-config --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid";
+      serviceConfig = {
+        ExecStart = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --siteconfigpath=${spamdEnv} --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+      };
+
+      # 0 and 1 no error, exitcode > 1 means error:
+      # https://spamassassin.apache.org/full/3.1.x/doc/sa-update.html#exit_codes
+      preStart = ''
+        # this abstraction requires no centralized config at all
+        if [ -d /etc/spamassassin ]; then
+          echo "This spamassassin does not support global '/etc/spamassassin' folder for configuration as this would be impure. Merge your configs into 'services.spamassassin' and remove the '/etc/spamassassin' folder to make this service work. Also see 'https://github.com/NixOS/nixpkgs/pull/26470'."; 
+          exit 1
+        fi
+        echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'"
+        mkdir -p /var/lib/spamassassin
+        chown spamd:spamd /var/lib/spamassassin -R
+        set +e 
+        ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd
+        v=$?
+        set -e
+        if [ $v -gt 1 ]; then
+          echo "sa-update execution error"
+          exit $v
+        fi
+        chown spamd:spamd /var/lib/spamassassin -R
+      '';
     };
   };
 }
diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix
index 14149713ee8..f4ab6a02995 100644
--- a/pkgs/servers/mail/spamassassin/default.nix
+++ b/pkgs/servers/mail/spamassassin/default.nix
@@ -1,17 +1,7 @@
-{ stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile
+{ stdenv, fetchurl, buildPerlPackage, perl, perlPackages, HTMLParser, NetDNS, NetAddrIP, DBFile
 , HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1
 }:
 
-# TODO: Add the Perl modules ...
-#
-#   DBI
-#   Encode::Detect
-#   IP::Country::Fast
-#   Mail::SPF
-#   Net::Ident
-#   Razor2::Client::Agent
-#
-
 buildPerlPackage rec {
   name = "SpamAssassin-3.4.1";
 
@@ -20,14 +10,17 @@ buildPerlPackage rec {
     sha256 = "0la6s5ilamf9129kyjckcma8cr6fpb6b5f2fb64v7106iy0ckhd0";
   };
 
-  buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
-    LWP IOSocketSSL ];
+  # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434
+  patches = [ ./sa-update_add--siteconfigpath.patch ];
+
+  buildInputs = with perlPackages; [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM
+    LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable ];
 
   # Enabling 'taint' mode is desirable, but that flag disables support
   # for the PERL5LIB environment variable. Needs further investigation.
   makeFlags = "PERL_BIN=${perl}/bin/perl PERL_TAINT=no";
 
-  makeMakerFlags = "CONFDIR=/etc/spamassassin LOCALSTATEDIR=/var/lib/spamassassin";
+  makeMakerFlags = "CONFDIR=/homeless/shelter LOCALSTATEDIR=/var/lib/spamassassin";
 
   doCheck = false;
 
@@ -45,6 +38,6 @@ buildPerlPackage rec {
     description = "Open-Source Spam Filter";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    maintainers = with stdenv.lib.maintainers; [ peti qknight ];
   };
 }
diff --git a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch b/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch
new file mode 100644
index 00000000000..3264aefc072
--- /dev/null
+++ b/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch
@@ -0,0 +1,59 @@
+From 60abf3ee8864980a95b32e2d6cf60e26b49654c0 Mon Sep 17 00:00:00 2001
+From: joachim schiele <js@lastlog.de>
+Date: Wed, 7 Jun 2017 22:15:39 +0200
+Subject: [PATCH 2/2] Adding --siteconfigpath to not be forced to use global /etc/spamasassin configuration directory but to provide an alternative location.
+
+---
+ sa-update.raw | 5 +++++
+ lib/Mail/SpamAssassin/PerMsgStatus.pm | 2 +
+ 2 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/sa-update.raw b/sa-update.raw
+index bb7396d..39f681f 100755
+--- a/sa-update.raw
++++ b/sa-update.raw
+@@ -196,6 +196,7 @@ GetOptions(
+   'gpgkeyfile=s'			=> \$opt{'gpgkeyfile'},
+   'channelfile=s'			=> \$opt{'channelfile'},
+   'updatedir=s'				=> \$opt{'updatedir'},
++  'siteconfigpath=s'                           => \$opt{'siteconfigpath'},
+   'gpg!'				=> \$GPG_ENABLED,
+ 
+   '4'                                   => sub { $opt{'force_pf'} = 'inet' },
+@@ -267,6 +268,9 @@ else {
+   $opt{'updatedir'} = $SA->sed_path('__local_state_dir__/__version__');
+ }
+ 
++if (defined $opt{'siteconfigpath'}) {
++  $LOCAL_RULES_DIR = untaint_file_path($opt{'siteconfigpath'});
++}
+ 
+ # check only disabled gpg
+ # https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5854
+@@ -1808,6 +1812,7 @@ Options:
+   --updatedir path        Directory to place updates, defaults to the
+                           SpamAssassin site rules directory
+                           (default: @@LOCAL_STATE_DIR@@/@@VERSION@@)
++  --siteconfigpath=path   Path for site configs
+   --refreshmirrors        Force the MIRRORED.BY file to be updated
+   -D, --debug [area=n,...]  Print debugging messages
+   -v, --verbose           Be verbose, like print updated channel names;
+-- 
+diff --git a/lib/Mail/SpamAssassin/PerMsgStatus.pm b/lib/Mail/SpamAssassin/PerMsgStatus.pm
+index 6d8beaa..6ad87dc 100644
+--- a/lib/Mail/SpamAssassin/PerMsgStatus.pm
++++ b/lib/Mail/SpamAssassin/PerMsgStatus.pm
+@@ -389,7 +389,8 @@ sub check_timed {
+     if (!$self->{main}->have_plugin("check_main")) {
+       die "check: no loaded plugin implements 'check_main': cannot scan!\n".
+             "Check that the necessary '.pre' files are in the config directory.\n".
+-              "At a minimum, v320.pre loads the Check plugin which is required.\n";
++              "At a minimum, v320.pre loads the Check plugin which is required.\n".
++              "NixOS: Since there is no '/etc/spamassassin' simply restart 'spamd.service' which on its behalf will run 'sa-learn --siteconfigpath=/nix/store/l4hr4yxk8mb4wbkha6vm6rh92pj19rj6-spamd-env ...' to update the /var/lib/spamassassin configs.\n";
+     }
+   }
+ 
+-- 
+
+2.12.2
+
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 14d47410857..8b2d0cdb373 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4650,6 +4650,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  EncodeDetect = buildPerlPackage rec {
+    name = "Encode-Detect-1.01";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JG/JGMYERS/${name}.tar.gz";
+      sha256 = "834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1";
+    };
+    propagatedBuildInputs = [ ModuleBuild ];
+    meta = {
+      description = "An Encode::Encoding subclass that detects the encoding of data";
+      license = stdenv.lib.licenses.free;
+    };
+  };
+
+
   EncodeEUCJPASCII = buildPerlPackage {
     name = "Encode-EUCJPASCII-0.03";
     src = fetchurl {
@@ -4747,7 +4761,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1vzpz6syb82ir8svp2wjh95x6lpf01lgkxn2xy60ixrszc24zdya";
     };
   };
-
+ 
   EV = buildPerlPackage rec {
     name = "EV-4.22";
     src = fetchurl {
@@ -7039,6 +7053,32 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  IPCountry = buildPerlPackage rec {
+    name = "IP-Country-2.28";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NW/NWETTERS/${name}.tar.gz";
+      sha256 = "88db833a5ab22ed06cb53d6f205725e3b5371b254596053738885e91fa105f75";
+    };
+    propagatedBuildInputs = [ GeographyCountries ];
+    meta = {
+      description = "Fast lookup of country codes from IP addresses";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
+  GeographyCountries = buildPerlPackage rec {
+    name = "Geography-Countries-2009041301";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AB/ABIGAIL/${name}.tar.gz";
+      sha256 = "48c42e40e8281ba7c981743a854c48e6def2d51eb0925ea6c96e25c74497f20f";
+    };
+    meta = {
+      description = "2-letter, 3-letter, and numerical codes for countries";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
+
   IPCRun = buildPerlPackage {
     name = "IPC-Run-0.92";
     src = fetchurl {
@@ -8061,6 +8101,28 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  MailSPF = buildPerlPackage rec {
+    name = "Mail-SPF-v2.9.0";
+    #src = /root/nixops/Mail-SPF-v2.9.0;
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JM/JMEHNLE/mail-spf/${name}.tar.gz";
+      sha256 = "61cb5915f1c7acc7a931ffc1bfc1291bdfac555e2a46eb2391b995ea9ecb6162";
+    };
+    # remove this patch patches = [ ../development/perl-modules/Mail-SPF.patch ];
+
+    buildInputs = [ ModuleBuild NetDNSResolverProgrammable ];
+    propagatedBuildInputs = [ Error NetAddrIP NetDNS URI ];
+
+    buildPhase = "perl Build.PL --install_base=$out --install_path=\"sbin=$out/bin\"; ./Build build ";
+
+    doCheck = false; # The main test performs network access
+    meta = {
+      description = "An object-oriented implementation of Sender Policy Framework";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
+
+
   MailTools = buildPerlPackage rec {
     name = "MailTools-2.14";
     src = fetchurl {
@@ -9727,6 +9789,19 @@ let self = _self // overrides; _self = with self; {
   # Deprecated.
   NamespaceClean = self.namespaceclean;
 
+  NetIdent = buildPerlPackage rec {
+    name = "Net-Ident-1.24";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz";
+      sha256 = "5f5f1142185a67b87406a3fb31f221564f61838a70ef4c07284a66c55e82ad05";
+    };
+    meta = {
+      homepage = http://wiki.github.com/toddr/Net-Ident/;
+      description = "Lookup the username on the remote end of a TCP/IP connection";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   NetAddrIP = buildPerlPackage rec {
     name = "NetAddr-IP-4.079";
     src = fetchurl {
@@ -10017,6 +10092,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NetDNSResolverProgrammable = buildPerlPackage rec {
+    name = "Net-DNS-Resolver-Programmable-v0.003";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JM/JMEHNLE/net-dns-resolver-programmable/${name}.tar.gz";
+      sha256 = "8d402260941f259c83bf1b2564408e75288df028f604136c29da11a9a6a076ec";
+    };
+    buildInputs = [ ModuleBuild ];
+    propagatedBuildInputs = [ NetDNS ];
+    meta = {
+      description = "Programmable DNS resolver class for offline emulation of DNS";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
+
   NetServer = buildPerlPackage {
     name = "Net-Server-2.007";
     src = fetchurl {
@@ -11286,6 +11376,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Razor2ClientAgent = buildPerlPackage rec {
+    name = "Razor2-Client-Agent-2.84";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/T/TO/TODDR/${name}.tar.gz";
+      sha256 = "d7c2ed7f347a673b1425e4da7656073d6c52847bc7403bf57e3a404b52f7e501";
+    };
+    propagatedBuildInputs = [ DigestSHA1 URI ];
+    meta = {
+      homepage = http://razor.sourceforge.net/;
+      description = "Collaborative, content-based spam filtering network agent";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
+
   Readonly = buildPerlModule rec {
     name = "Readonly-2.05";
     src = fetchurl {
-- 
GitLab


From 2d64e1b7d05dc31fb6a899092c99c693b169dd55 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 10 Jun 2017 07:43:45 +0000
Subject: [PATCH 0553/1490] lbreakout2: fix build on Darwin

---
 pkgs/games/lbreakout2/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix
index 363b133243b..eb9bed9e1d9 100644
--- a/pkgs/games/lbreakout2/default.nix
+++ b/pkgs/games/lbreakout2/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng }:
+{ stdenv, fetchurl, SDL, SDL_mixer, zlib, libpng, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = "lbreakout2-${version}";
   version = "2.6.5";
-  buildInputs = [ SDL SDL_mixer zlib libpng ];
+  buildInputs = [ SDL SDL_mixer zlib libpng ] ++ libintlOrEmpty;
 
   src = fetchurl {
     url = "mirror://sourceforge/lgames/${name}.tar.gz";
     sha256 = "0vwdlyvh7c4y80q5vp7fyfpzbqk9lq3w8pvavi139njkalbxc14i";
   };
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
   meta = with stdenv.lib; {
     description = "Breakout clone from the LGames series";
     homepage = http://lgames.sourceforge.net/LBreakout2/;
     license = licenses.gpl2;
     maintainers = [ maintainers.ciil ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
-
-- 
GitLab


From dc073726927f749116d2a7c0e8257723a76cf603 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sat, 10 Jun 2017 00:20:40 -0400
Subject: [PATCH 0554/1490] kdenlive : patch CMakeLists.txt to find Concurrent
 module.

---
 .../kde/kdenlive-cmake-concurrent-module.patch       | 12 ++++++++++++
 pkgs/applications/kde/kdenlive.nix                   |  3 +++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch

diff --git a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
new file mode 100644
index 00000000000..ea2af2b0950
--- /dev/null
+++ b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
@@ -0,0 +1,12 @@
+diff -Naur kdenlive-17.04.1-upstream/CMakeLists.txt kdenlive-17.04.1/CMakeLists.txt
+--- kdenlive-17.04.1-upstream/CMakeLists.txt	2017-06-10 00:06:44.773146595 -0400
++++ kdenlive-17.04.1/CMakeLists.txt	2017-06-10 00:07:35.766596566 -0400
+@@ -79,7 +79,7 @@
+ check_include_files(malloc.h HAVE_MALLOC_H)
+ check_include_files(pthread.h HAVE_PTHREAD_H)
+ 
+-find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick )
++find_package(Qt5 REQUIRED COMPONENTS Core Concurrent DBus Widgets Script Svg Quick )
+ find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
+ 
+ find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 3c18772f039..e543a3d84bf 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -34,6 +34,9 @@
 let
 unwrapped = kdeApp {
   name = "kdenlive";
+  patches = [
+    ./kdenlive-cmake-concurrent-module.patch
+  ];
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-- 
GitLab


From 6e604ec68c2f849dad045194bf3701202c0ed4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 10 Jun 2017 09:31:20 +0100
Subject: [PATCH 0555/1490] arphic: style fixes

---
 pkgs/data/fonts/arphic/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix
index 40f5480c086..b392ac79b2d 100644
--- a/pkgs/data/fonts/arphic/default.nix
+++ b/pkgs/data/fonts/arphic/default.nix
@@ -15,14 +15,12 @@
 
     phases = [ "unpackPhase" "installPhase" ];
 
-    installPhase =
-      ''
-      mkdir -p $out/share/fonts $out/share/fonts/truetype
-      cp -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
+    installPhase = ''
+      install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
       cd $out/share/fonts
       mkfontdir
       mkfontscale
-      '';
+    '';
 
     meta = with stdenv.lib; {
       description = "CJK Unicode font Kai style";
@@ -48,14 +46,12 @@
 
     phases = [ "unpackPhase" "installPhase" ];
 
-    installPhase =
-      ''
-      mkdir -p $out/share/fonts $out/share/fonts/truetype
-      cp -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
+    installPhase = ''
+      install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
       cd $out/share/fonts
       mkfontdir
       mkfontscale
-      '';
+    '';
 
     meta = with stdenv.lib; {
       description = "CJK Unicode font Ming style";
-- 
GitLab


From 0c54a292fbf7b00dedfdc497515b149be5b6fb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20J=C3=A4ger?= <jger.tm@gmail.com>
Date: Sat, 10 Jun 2017 02:04:33 -0700
Subject: [PATCH 0556/1490] hplip: introduce nettools dependency (#26439)

* hplip: introduce nettools dependency

Some HP printers (notably a HP MFP M477fnw) need to run `hostname` as part of
the printing process. This executable is provided by the "nettools" package.

* hplip: prepend nettools to PATH
---
 pkgs/misc/drivers/hplip/default.nix | 32 +++++++++++++++--------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 62f94ae6fc9..6adc2a765c7 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, substituteAll
 , pkgconfig
+, makeWrapper
 , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
-, net_snmp, openssl, polkit
+, net_snmp, openssl, polkit, nettools
 , bash, coreutils, utillinux
 , qtSupport ? true
 , withPlugin ? false
@@ -22,20 +23,17 @@ let
     sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg";
   };
 
-  hplipState =
-    substituteAll
-      {
-        inherit version;
-        src = ./hplip.state;
-      };
-
-  hplipPlatforms =
-    {
-      "i686-linux"   = "x86_32";
-      "x86_64-linux" = "x86_64";
-      "armv6l-linux" = "arm32";
-      "armv7l-linux" = "arm32";
-    };
+  hplipState = substituteAll {
+    inherit version;
+    src = ./hplip.state;
+  };
+
+  hplipPlatforms = {
+    "i686-linux"   = "x86_32";
+    "x86_64-linux" = "x86_64";
+    "armv6l-linux" = "arm32";
+    "armv7l-linux" = "arm32";
+  };
 
   hplipArch = hplipPlatforms."${stdenv.system}"
     or (throw "HPLIP not supported on ${stdenv.system}");
@@ -63,6 +61,7 @@ pythonPackages.buildPythonApplication {
 
   nativeBuildInputs = [
     pkgconfig
+    makeWrapper
   ];
 
   propagatedBuildInputs = with pythonPackages; [
@@ -146,6 +145,9 @@ pythonPackages.buildPythonApplication {
   '';
 
   postFixup = ''
+    wrapProgram $out/lib/cups/filter/hpps \
+      --prefix PATH : "${nettools}/bin"
+
     substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
   '' + stdenv.lib.optionalString (!withPlugin) ''
     # A udev rule to notify users that they need the binary plugin.
-- 
GitLab


From 26abdb81c8331797ca4655b73c7a1d4ebfe2d020 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 10 Jun 2017 09:44:23 +0000
Subject: [PATCH 0557/1490] xfce4-dockbarx-plugin: fix unwrapped python scripts

---
 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
index 42f155f39e2..fbc841db1fc 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
 
   installPhase = "python waf install";
 
-  postFixup = "wrapPythonPrograms";
+  postFixup = ''
+    wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/TiZ-EX1/xfce4-dockbarx-plugin;
-- 
GitLab


From 333dc53433b2dadad6a05b04a9314c460a06d7d5 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 10 Jun 2017 09:03:18 +0000
Subject: [PATCH 0558/1490] clickhouse: 1.1.54190 -> 1.1.54236

---
 pkgs/servers/clickhouse/default.nix  |  6 +++---
 pkgs/servers/clickhouse/prefix.patch | 30 ----------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/servers/clickhouse/prefix.patch

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index fc35dfdda47..58141a4cf0e 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -3,16 +3,16 @@
 stdenv.mkDerivation rec {
   name = "clickhouse-${version}";
 
-  version = "1.1.54190";
+  version = "1.1.54236";
 
   src = fetchFromGitHub {
     owner = "yandex";
     repo = "ClickHouse";
     rev = "v${version}-stable";
-    sha256 = "03snzrhz3ai66fqy3rh89cgmpiaskg3077zflkwzqxwx69jkmqix";
+    sha256 = "1mfjr1yzvf810vbb35c2rknvqnc4mkncl56ja48myn7hc9p457d7";
   };
 
-  patches = [ ./prefix.patch ./termcap.patch ];
+  patches = [ ./termcap.patch ];
 
   nativeBuildInputs = [ cmake libtool ];
 
diff --git a/pkgs/servers/clickhouse/prefix.patch b/pkgs/servers/clickhouse/prefix.patch
deleted file mode 100644
index a311bf83dd9..00000000000
--- a/pkgs/servers/clickhouse/prefix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ccc3596aa3ca041f457bf44d3437d935f56e82a4 Mon Sep 17 00:00:00 2001
-From: Orivej Desh <orivej@gmx.fr>
-Date: Sun, 26 Mar 2017 23:57:32 +0000
-Subject: [PATCH] Do not override CMAKE_INSTALL_PREFIX
-
----
- CMakeLists.txt | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 517b25e..6d8ced2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,12 +141,7 @@ if (ENABLE_TESTS)
- endif (ENABLE_TESTS)
- 
- # Installation prefix
--if (NOT CMAKE_SYSTEM MATCHES "FreeBSD")
--	set (CMAKE_INSTALL_PREFIX /usr)
--	set (CLICKHOUSE_ETC_DIR /etc)
--else ()
--	set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc)
--endif ()
-+set (CLICKHOUSE_ETC_DIR ${CMAKE_INSTALL_PREFIX}/etc)
- 
- 
- option (UNBUNDLED "Try find all libraries in system (if fail - use bundled from contrib/)" OFF)
--- 
-2.12.0
-
-- 
GitLab


From 7116da8018e9015220c19fc8e3702f02834c6aeb Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@gmail.com>
Date: Sat, 10 Jun 2017 12:18:10 +0200
Subject: [PATCH 0559/1490] Python docs: Add example for overlays

---
 doc/languages-frameworks/python.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index c17739825bc..3c9df2e6e82 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -923,6 +923,28 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
 
 If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`). 
 
+### How to override a Python package using overlays?
+
+To alter a python package using overlays, you would use the following approach:
+
+```nix
+self: super:
+rec {
+  python = super.python.override {
+    packageOverrides = python-self: python-super: {
+      bepasty-server = python-super.bepasty-server.overrideAttrs ( oldAttrs: {
+        src = self.pkgs.fetchgit {
+          url = "https://github.com/bepasty/bepasty-server";
+          sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps";
+          rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d";
+        };
+      });
+    };
+  };
+  pythonPackages = python.pkgs;
+}
+```
+
 ## Contributing
 
 ### Contributing guidelines
-- 
GitLab


From bb6cf349ffd5c15e364d551bcabec20c9e675bdc Mon Sep 17 00:00:00 2001
From: David Tulig <david.tulig@gmail.com>
Date: Sat, 10 Jun 2017 04:19:07 -0600
Subject: [PATCH 0560/1490] bind service: add listen-on options (#26430)

This adds configuration options for the bind package so that the
interfaces that bind listens on can be configured rather than just
hardcoded as any. The default values preserve the old behavior to be
backwards compatible.
---
 nixos/modules/services/networking/bind.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 0272b6ceff2..ca375c935e8 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -14,8 +14,8 @@ let
       acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
 
       options {
-        listen-on {any;};
-        listen-on-v6 {any;};
+        listen-on { ${concatMapStrings (entry: " ${entry}; ") cfg.listenOn} };
+        listen-on-v6 { ${concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} };
         allow-query { cachenetworks; };
         blackhole { badnetworks; };
         forward first;
@@ -96,6 +96,22 @@ in
         ";
       };
 
+      listenOn = mkOption {
+        default = ["any"];
+        type = types.listOf types.str;
+        description = "
+          Interfaces to listen on.
+        ";
+      };
+
+      listenOnIpv6 = mkOption {
+        default = ["any"];
+        type = types.listOf types.str;
+        description = "
+          Ipv6 interfaces to listen on.
+        ";
+      };
+
       zones = mkOption {
         default = [];
         description = "
-- 
GitLab


From 1fe951816c144a8ed3a900357c539e28818f8b41 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 10 Jun 2017 13:34:29 +0200
Subject: [PATCH 0561/1490] ipmiview: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index 11ef001ef54..f9078475994 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -4,12 +4,12 @@ assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
    name = "IPMIView-${version}";
-   version = "2.12.0";
-   buildVersion = "160804";
+   version = "2.13.0";
+   buildVersion = "170504";
 
    src = fetchurl {
     url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz";
-    sha256 = "787a060413451a4a5993c31805f55a221087b7199bbaf20e9fe1254e2a76db42";
+    sha256 = "1hfw5g6lxg3vqg0nc3g2sv2h6bn8za35bxxms0ri0sgb9v3xg1y6";
   };
 
    buildInputs = [ patchelf makeWrapper ];
-- 
GitLab


From 700e22f7bf8ca96741c2eb8fe13cf15bc6e67daa Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 10 Jun 2017 09:53:24 -0400
Subject: [PATCH 0562/1490] nixos: Add support for scalable fonts in Grub menus
 (#26227)

The default font is unreadably small on some hidpi displays. This
makes it possible to specify a TrueType or OpenType font at any point
size, and it will automatically be converted to the format the Grub
uses.
---
 .../modules/system/boot/loader/grub/grub.nix  | 30 ++++++++++++++++++-
 .../system/boot/loader/grub/install-grub.pl   |  6 +++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index cf47aed9fa9..1681439a728 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -64,11 +64,21 @@ let
       )) + ":" + (makeSearchPathOutput "bin" "sbin" [
         pkgs.mdadm pkgs.utillinux
       ]);
+      font = if lib.last (lib.splitString "." cfg.font) == "pf2"
+             then cfg.font
+             else "${convertedFont}";
     });
 
   bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {}
     (concatMap (args: args.devices) cfg.mirroredBoots);
 
+  convertedFont = (pkgs.runCommand "grub-font-converted.pf2" {}
+           (builtins.concatStringsSep " "
+             ([ "${realGrub}/bin/grub-mkfont"
+               cfg.font
+               "--output" "$out"
+             ] ++ (optional (cfg.fontSize!=null) "--size ${toString cfg.fontSize}")))
+         );
 in
 
 {
@@ -276,7 +286,7 @@ in
       extraInitrd = mkOption {
         type = types.nullOr types.path;
         default = null;
-        example = "/boot/extra_initrafms.gz";
+        example = "/boot/extra_initramfs.gz";
         description = ''
           The path to a second initramfs to be supplied to the kernel.
           This ramfs will not be copied to the store, so that it can
@@ -305,6 +315,24 @@ in
         '';
       };
 
+      font = mkOption {
+        type = types.nullOr types.path;
+        default = "${realGrub}/share/grub/unicode.pf2";
+        description = ''
+          Path to a TrueType, OpenType, or pf2 font to be used by Grub.
+        '';
+      };
+
+      fontSize = mkOption {
+        type = types.nullOr types.int;
+        example = literalExample 16;
+        default = null;
+        description = ''
+          Font size for the grub menu. Ignored unless <literal>font</literal>
+          is set to a ttf or otf font.
+        '';
+      };
+
       gfxmodeEfi = mkOption {
         default = "auto";
         example = "1024x768";
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 5fcac5c8c6a..1edb9e0d229 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -67,6 +67,7 @@ my $gfxmodeEfi = get("gfxmodeEfi");
 my $gfxmodeBios = get("gfxmodeBios");
 my $bootloaderId = get("bootloaderId");
 my $forceInstall = get("forceInstall");
+my $font = get("font");
 $ENV{'PATH'} = get("path");
 
 die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2;
@@ -281,7 +282,7 @@ else {
           insmod vbe
         fi
         insmod font
-        if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then
+        if loadfont " . $grubBoot->path . "/converted-font.pf2; then
           insmod gfxterm
           if [ \"\${grub_platform}\" = \"efi\" ]; then
             set gfxmode=$gfxmodeEfi
@@ -294,6 +295,9 @@ else {
         fi
     ";
 
+    if ($font) {
+        copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n";
+    }
     if ($splashImage) {
         # FIXME: GRUB 1.97 doesn't resize the background image if it
         # doesn't match the video resolution.
-- 
GitLab


From 0a6dd6d07b6a20b12baef4e79913833f4ba32afb Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sat, 10 Jun 2017 16:33:11 +0200
Subject: [PATCH 0563/1490] idea.gogland: 171.4424.55 -> 171.4694.35

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/applications/editors/jetbrains/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 7eb34b47c76..c4e9e0798b8 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -209,12 +209,12 @@ in
 
   gogland = buildGogland rec {
     name = "gogland-${version}";
-    version = "171.4424.55";
+    version = "171.4694.35";
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "0l5pn2wj541v1xc58bpipkl483zrhwjr37grkwiwx2j4iygrikq7";
+      sha256 = "0q2f8bi2i49j0xcpn824sihz2015jhn338cjaqy0jd988nxik6jk";
     };
     wmClass = "jetbrains-gogland";
   };
-- 
GitLab


From f12b0a2179585d443bf0abab3ac1cfccebc24512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 1 Jun 2017 22:17:47 +0200
Subject: [PATCH 0564/1490] bcache-tools: add name to the source store path

So that

 $ nix-build -A bcache-tools.src

gives

 /nix/store/HASH-bcache-tools-1.0.7.tar.gz

instead of

 /nix/store/HASH-v1.0.7.tar.gz
---
 pkgs/tools/filesystems/bcache-tools/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index 288cd14c16b..e1a2f7d5bf7 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -5,6 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.0.7";
 
   src = fetchurl {
+    name = "${name}.tar.gz";
     url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
     sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
   };
-- 
GitLab


From 581226cfb456b4c116594f1b79f45945703a4a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 1 Jun 2017 22:35:40 +0200
Subject: [PATCH 0565/1490] nixos/bcache: /bin/sh -> ${bash}/bin/sh

Or else `services.udev.packages = [ bcache-tools ]` cannot be used.

To not break bcache in the initrd I'm modifying this in stage-1.nix:

  -  --replace /bin/sh ${extraUtils}/bin/sh
  +  --replace ${bash}/bin/sh ${extraUtils}/bin/sh

Reasoning behind that change:

* If not modifying the /bin/sh pattern in any way, it will also match
  ${bash}/bin/sh, creating a broken path like
  /nix/store/HASH-bash/nix/store/HASH-bash/bin/sh in the udev rule file.

* The addition of /bin/sh was done in 775f381a9e34
  ("stage-1: add bcache support"). It seems somewhat plausible that
  no new users have appeared since then and we can take this opportunity
  to back out of this change without much fear of regressions.

  If there _are_ regressions, they should be in the form of build time
  errors, not runtime (boot), due to how the udev rule output is checked
  for invalid path references. So low risk, IMHO.

* An alternative approach could be to copy the /bin/sh substitute rule
  over to the non-initrd udev rules implementation in NixOS, but I think
  this way is better:
  - The rules file comes with a working path out of the box.
  - We can use more precise pattern matching when modifying the udev
    rules for the initrd.
---
 nixos/modules/system/boot/stage-1.nix           | 2 +-
 pkgs/tools/filesystems/bcache-tools/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index e3a3b6f88cf..73608a0e27f 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -167,7 +167,7 @@ let
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
             --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm \
-            --replace /bin/sh ${extraUtils}/bin/sh \
+            --replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \
             --replace /usr/bin/readlink ${extraUtils}/bin/readlink \
             --replace /usr/bin/basename ${extraUtils}/bin/basename \
             --replace ${udev}/bin/udevadm ${extraUtils}/bin/udevadm
diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix
index e1a2f7d5bf7..1eedff5c011 100644
--- a/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, utillinux }:
+{ stdenv, fetchurl, pkgconfig, utillinux, bash }:
 
 stdenv.mkDerivation rec {
   name = "bcache-tools-${version}";
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\"";
+    sed -e "s|/bin/sh|${bash}/bin/sh|" -i *.rules
   '';
 
   preInstall = ''
-- 
GitLab


From 5b48368386864af78658b7c18608df57f8e8a386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 1 Jun 2017 22:45:41 +0200
Subject: [PATCH 0566/1490] nixos/bcache: add services.udev.packages = [
 bcache-tools ]

Adds /dev/disk/by-{id,label}/* symlinks for bcache device nodes, in the
final rootfs.

Symlinks will only be created for bcache devices that contain
filesystems. So if you have a blank bcache device or run LVM on top of
bcache you will not get this kind of symlink.
---
 nixos/modules/tasks/bcache.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix
index f988ec02af7..3bfdf89e0cf 100644
--- a/nixos/modules/tasks/bcache.nix
+++ b/nixos/modules/tasks/bcache.nix
@@ -4,6 +4,8 @@
 
   environment.systemPackages = [ pkgs.bcache-tools ];
 
+  services.udev.packages = [ pkgs.bcache-tools ];
+
   boot.initrd.extraUdevRulesCommands = ''
     cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/
   ''; 
-- 
GitLab


From 46b00e0b15e93607a7e797408e08fe3ca441e765 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sat, 10 Jun 2017 18:05:57 +0200
Subject: [PATCH 0567/1490] Update runc to 1.0.0-rc3

- Fix compilation problems
- Remove patches as those are included in the sources now

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../virtualization/runc/default.nix           | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 3ce183d90e2..3c7480e5181 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -5,30 +5,15 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "runc-${version}";
-  version = "1.0.0-rc2";
+  version = "1.0.0-rc3";
 
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
     rev = "v${version}";
-    sha256 = "06bxc4g3frh4i1lkzvwdcwmzmr0i52rz4a4pij39s15zaigm79wk";
+    sha256 = "14hdhnni0rz3g0bhcaq95zn2zrhyds0mq2pm2padbamg4bgq4r1c";
   };
 
-  patches = [
-    # Two patches to fix CVE-2016-9962
-    # From https://bugzilla.suse.com/show_bug.cgi?id=1012568
-    (fetchpatch {
-      name = "0001-libcontainer-nsenter-set-init-processes-as-non-dumpa.patch";
-      url = "https://bugzilla.suse.com/attachment.cgi?id=709048&action=diff&context=patch&collapsed=&headers=1&format=raw";
-      sha256 = "1cfsmsyhc45a2929825mdaql0mrhhbrgdm54ly0957j2f46072ck";
-    })
-    (fetchpatch {
-      name = "0002-libcontainer-init-only-pass-stateDirFd-when-creating.patch";
-      url = "https://bugzilla.suse.com/attachment.cgi?id=709049&action=diff&context=patch&collapsed=&headers=1&format=raw";
-      sha256 = "1ykwg1mbvsxsnsrk9a8i4iadma1g0rgdmaj19dvif457hsnn31wl";
-    })
-  ];
-
   outputs = [ "out" "man" ];
 
   hardeningDisable = ["fortify"];
@@ -37,7 +22,16 @@ stdenv.mkDerivation rec {
 
   makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
 
+  preConfigure = ''
+    # Extract the source
+    cd "$NIX_BUILD_TOP"
+    mkdir -p "go/src/github.com/opencontainers"
+    mv "$sourceRoot" "go/src/github.com/opencontainers/runc"
+    export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
+  '';
+
   preBuild = ''
+    cd go/src/github.com/opencontainers/runc
     patchShebangs .
     substituteInPlace libcontainer/apparmor/apparmor.go \
       --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser
-- 
GitLab


From a24960d2146e3c15eb56401293605ca3cbc45047 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Tue, 23 May 2017 13:23:01 -0400
Subject: [PATCH 0568/1490] autotrace: init at 0.31.1

Add ApplicationServices for Darwin build

Clean up comments
---
 .../graphics/autotrace/autofig.nix            | 10 +++
 .../graphics/autotrace/default.nix            | 61 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 73 insertions(+)
 create mode 100644 pkgs/applications/graphics/autotrace/autofig.nix
 create mode 100644 pkgs/applications/graphics/autotrace/default.nix

diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/applications/graphics/autotrace/autofig.nix
new file mode 100644
index 00000000000..31ee0ff0d07
--- /dev/null
+++ b/pkgs/applications/graphics/autotrace/autofig.nix
@@ -0,0 +1,10 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "autofig-0.1";
+
+  src = fetchurl {
+    url = "http://autotrace.sourceforge.net/tools/autofig.tar.gz";
+    sha256 = "11cs9hdbgcl3aamcs3149i8kvyyldmnjf6yq81kbcf8fdmfk2zdq";
+  };
+}
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
new file mode 100644
index 00000000000..f5f81a262f3
--- /dev/null
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, callPackage, libpng12, imagemagick,
+  autoreconfHook, glib, pstoedit, pkgconfig, gettext, darwin }:
+
+# TODO: Solve that it cannot find pstoedit (as it is unable to find
+# pstoedit-config)
+
+# TODO: Figure out why the resultant binary is somehow linked against
+# libpng16.so.16 rather than libpng12.
+
+stdenv.mkDerivation rec {
+  name = "autotrace-${version}";
+  version = "0.31.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${name}.tar.gz";
+    sha256 = "1xmgja5fv48mdbsa51inf7ksz36nqd6bsaybrk5xgprm6cy946js";
+  };
+
+  # The below commented out part is for an identically-named project
+  # on GitHub which appears to derive somehow from the Sourceforge
+  # version, but I have no idea what the lineage is of this project.
+  # It will build, but it segfaults when I attempt to run -centerline.
+  # Someone may need this for some reason, so I've left it here.
+  #
+  #src = fetchFromGitHub {
+  #  owner = "autotrace";
+  #  repo = "autotrace";
+  #  rev = "b3ac8818d86943102cb4f13734e0b527c42dc45a";
+  #  sha256 = "0z5h2mvxwckk2msi361zk1nc9fdcvxyimyc2hlyqd6h8k3p7zdi4";
+  #};
+  #postConfigure = ''
+  #  sed -i -e "s/at_string/gchar */g" *.c
+  #  sed -i -e "s/at_address/gpointer/g" *.c
+  #  sed -i -e "s/at_bitmap_type/struct _at_bitmap/g" *.c
+  #  sed -i -e "s/AT_BITMAP_BITS(bitmap)/AT_BITMAP_BITS(\&bitmap)/g" input-magick.c
+  #'';
+
+  autofig = callPackage ./autofig.nix {};
+  nativeBuildInputs = [ autoreconfHook glib autofig pkgconfig gettext ];
+  buildInputs = [ libpng12 imagemagick pstoedit ]
+    ++ stdenv.lib.optionals stdenv.isDarwin
+       (with darwin.apple_sdk.frameworks; [ApplicationServices]);
+    
+  postUnpack = ''
+    pushd $sourceRoot
+    autofig autotrace-config.af
+    popd
+  '';
+
+  # This complains about various m4 files, but it appears to not be an
+  # actual error.
+  preConfigure = "glib-gettextize --copy --force";
+
+  meta = with stdenv.lib; {
+    homepage = http://autotrace.sourceforge.net/;
+    description = "Utility for converting bitmap into vector graphics";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ hodapp ];
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d666b87626..827ee2bfb63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13181,6 +13181,8 @@ with pkgs;
 
   audio-recorder = callPackage ../applications/audio/audio-recorder { };
 
+  autotrace = callPackage ../applications/graphics/autotrace {};
+  
   milkytracker = callPackage ../applications/audio/milkytracker { };
 
   schismtracker = callPackage ../applications/audio/schismtracker { };
-- 
GitLab


From d402df022f62752055deceafeffc6d5cbe22161a Mon Sep 17 00:00:00 2001
From: Martin Wohlert <martin@b-root-force.de>
Date: Sat, 10 Jun 2017 19:49:52 +0200
Subject: [PATCH 0569/1490] ffmpeg{,-full}: 3.3.1 -> 3.3.2

https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/6d7192bcb7bbab17dc194e8dbb56c208bced0a92:/Changelog
---
 pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/3.3.nix          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 848cae09ed4..d5b2632a371 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -230,11 +230,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
-    sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp";
+    sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r";
   };
 
   patchPhase = ''patchShebangs .
diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix
index d6380b795af..34213755313 100644
--- a/pkgs/development/libraries/ffmpeg/3.3.nix
+++ b/pkgs/development/libraries/ffmpeg/3.3.nix
@@ -6,7 +6,7 @@
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}";
-  branch = "3.3.1";
-  sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw";
+  branch = "3.3.2";
+  sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91";
   darwinFrameworks = [ Cocoa CoreMedia ];
 })
-- 
GitLab


From 73a1307a02bcd87c2d4df6ccd3d216373d2e59c3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 10 Jun 2017 23:21:17 +0300
Subject: [PATCH 0570/1490] U-Boot: Add A20 OLinuXino Lime build

Yet another Allwinner board working out-of-the-box, no surprises.
---
 pkgs/misc/uboot/default.nix     | 6 ++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 4c14581e331..07ccd419f4b 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -69,6 +69,12 @@ in rec {
     filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"];
   };
 
+  ubootA20OlinuxinoLime = buildUBoot rec {
+    defconfig = "A20-OLinuXino-Lime_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootBananaPi = buildUBoot rec {
     defconfig = "Bananapi_defconfig";
     targetPlatforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d666b87626..8844fdd3f8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12485,6 +12485,7 @@ with pkgs;
   inherit (callPackage ../misc/uboot {})
     buildUBoot
     ubootTools
+    ubootA20OlinuxinoLime
     ubootBananaPi
     ubootBeagleboneBlack
     ubootJetsonTK1
-- 
GitLab


From 0cec85d0eb0bc7716dc2114a10f49884cdf61082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 10 Jun 2017 21:43:25 +0100
Subject: [PATCH 0571/1490] jetbrains.clion: fix bundled tools

---
 .../editors/jetbrains/default.nix             | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 7eb34b47c76..71f0a56afb3 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,17 +1,19 @@
 { lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
 , coreutils, gnugrep, which, git, python, unzip, p7zip
-, androidsdk, jdk
+, androidsdk, jdk, cmake, libxml2, zlib, python2, ncurses
 }:
 
 assert stdenv.isLinux;
 
+with stdenv.lib;
+
 let
   mkJetBrainsProduct = callPackage ./common.nix { };
 
   # Sorted alphabetically
 
   buildClion = { name, version, src, license, description, wmClass }:
-    (mkJetBrainsProduct rec {
+    lib.overrideDerivation (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "CLion";
       meta = with stdenv.lib; {
@@ -21,9 +23,35 @@ let
           Enhancing productivity for every C and C++
           developer on Linux, OS X and Windows.
         '';
-        maintainers = with maintainers; [ edwtjo ];
+        maintainers = with maintainers; [ edwtjo mic92 ];
         platforms = platforms.linux;
       };
+    }) (attrs: {
+      postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) ''
+        (
+          cd $out/clion-${version}
+          # bundled cmake does not find libc
+          rm -rf bin/cmake
+          ln -s ${cmake} bin/cmake
+
+          lldbLibPath=$out/clion-${version}/bin/lldb/lib
+          interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
+          ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5
+
+          patchelf --set-interpreter $interp \
+            --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \
+            bin/lldb/bin/lldb-server
+          patchelf --set-interpreter $interp \
+            --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
+            bin/lldb/LLDBFrontend
+          patchelf \
+            --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python2 ]}:$lldbLibPath" \
+            bin/lldb/lib/liblldb.so
+
+          patchelf --set-interpreter $interp bin/gdb/bin/gdb
+          patchelf --set-interpreter $interp bin/gdb/bin/gdbserver
+        )
+      '';
     });
 
   buildDataGrip = { name, version, src, license, description, wmClass }:
-- 
GitLab


From 386706f9a3d91b2349f0559d2f2fe798738b2497 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 Jun 2017 22:09:10 +0200
Subject: [PATCH 0572/1490] LTS Haskell 8.17

---
 .../configuration-hackage2nix.yaml            | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3bcb3e708ec..a54c0e16e2e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 8.16
+  # LTS Haskell 8.17
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -161,7 +161,7 @@ default-package-overrides:
   - amqp ==0.14.1
   - annotated-wl-pprint ==0.7.0
   - anonymous-sums ==0.6.0.0
-  - ansi-terminal ==0.6.3
+  - ansi-terminal ==0.6.3.1
   - ansi-wl-pprint ==0.6.7.3
   - ansigraph ==0.3.0.2
   - app-settings ==0.2.0.11
@@ -182,7 +182,7 @@ default-package-overrides:
   - async-extra ==0.1.0.0
   - async-refresh ==0.2.0
   - async-refresh-tokens ==0.1.0
-  - atom-basic ==0.2.4
+  - atom-basic ==0.2.5
   - atom-conduit ==0.4.0.1
   - atomic-primops ==0.8.0.4
   - atomic-write ==0.2.0.5
@@ -645,7 +645,7 @@ default-package-overrides:
   - exhaustive ==1.1.4
   - exp-pairs ==0.1.5.2
   - expiring-cache-map ==0.0.6.1
-  - explicit-exception ==0.1.8
+  - explicit-exception ==0.1.9
   - extensible ==0.3.7
   - extensible-effects ==1.11.0.4
   - extensible-exceptions ==0.1.1.4
@@ -697,7 +697,7 @@ default-package-overrides:
   - fold-debounce ==0.2.0.5
   - fold-debounce-conduit ==0.1.0.5
   - foldl ==1.2.5
-  - foldl-statistics ==0.1.4.3
+  - foldl-statistics ==0.1.4.4
   - folds ==0.7.3
   - FontyFruity ==0.5.3.2
   - force-layout ==0.4.0.6
@@ -942,8 +942,8 @@ default-package-overrides:
   - hashmap ==1.3.2
   - hashtables ==1.2.1.1
   - haskeline ==0.7.4.0
-  - haskell-gi ==0.20.1
-  - haskell-gi-base ==0.20.2
+  - haskell-gi ==0.20.2
+  - haskell-gi-base ==0.20.3
   - haskell-import-graph ==1.0.1
   - haskell-lexer ==1.0.1
   - haskell-names ==0.8.0
@@ -1104,7 +1104,7 @@ default-package-overrides:
   - http-api-data ==0.3.7.1
   - http-client ==0.5.7.0
   - http-client-openssl ==0.2.0.5
-  - http-client-tls ==0.3.4.2
+  - http-client-tls ==0.3.5
   - http-common ==0.8.2.0
   - http-conduit ==2.2.3.1
   - http-date ==0.0.6.1
@@ -1465,7 +1465,7 @@ default-package-overrides:
   - netwire ==5.0.2
   - netwire-input ==0.0.6
   - netwire-input-glfw ==0.0.6
-  - network ==2.6.3.1
+  - network ==2.6.3.2
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
@@ -1599,7 +1599,7 @@ default-package-overrides:
   - pipes-category ==0.2.0.1
   - pipes-concurrency ==2.0.7
   - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.9
+  - pipes-extras ==1.0.10
   - pipes-fluid ==0.5.0.3
   - pipes-group ==1.0.6
   - pipes-misc ==0.2.5.0
@@ -1747,7 +1747,7 @@ default-package-overrides:
   - reform-happstack ==0.2.5.1
   - reform-hsp ==0.2.7.1
   - RefSerialize ==0.4.0
-  - regex ==1.0.0.0
+  - regex ==1.0.1.0
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.93.2
@@ -1755,9 +1755,11 @@ default-package-overrides:
   - regex-compat-tdfa ==0.95.1.4
   - regex-pcre ==0.94.4
   - regex-pcre-builtin ==0.94.4.8.8.35
+  - regex-pcre-text ==0.94.0.1
   - regex-posix ==0.95.2
   - regex-tdfa ==1.2.2
   - regex-tdfa-text ==1.0.0.3
+  - regex-with-pcre ==1.0.1.0
   - reinterpret-cast ==0.1.0
   - relational-query ==0.8.4.0
   - relational-query-HDBC ==0.6.0.3
@@ -1876,7 +1878,7 @@ default-package-overrides:
   - shelly ==1.6.8.3
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
-  - show-prettyprint ==0.1.2
+  - show-prettyprint ==0.1.2.1
   - sibe ==0.2.0.5
   - signal ==0.1.0.3
   - silently ==1.2.5
@@ -1913,6 +1915,7 @@ default-package-overrides:
   - socks ==0.5.5
   - solga ==0.1.0.2
   - solga-swagger ==0.1.0.2
+  - sort ==1.0.0.0
   - sorted-list ==0.2.0.0
   - sourcemap ==0.1.6
   - sparkle ==0.4.0.2
@@ -2014,7 +2017,7 @@ default-package-overrides:
   - system-posix-redirect ==1.1.0.1
   - syz ==0.2.0.0
   - tabular ==0.2.2.7
-  - tagchup ==0.4.0.5
+  - tagchup ==0.4.1
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.0
   - tagged-identity ==0.1.2
@@ -2024,7 +2027,7 @@ default-package-overrides:
   - tagsoup ==0.14.1
   - tagstream-conduit ==0.5.5.3
   - tar ==0.5.0.3
-  - tar-conduit ==0.1.0
+  - tar-conduit ==0.1.1
   - tardis ==0.4.1.0
   - tasty ==0.11.2.1
   - tasty-ant-xml ==1.0.5
@@ -2061,7 +2064,7 @@ default-package-overrides:
   - terminal-progress-bar ==0.1.1
   - terminal-size ==0.3.2.1
   - terminfo ==0.4.1.0
-  - test-fixture ==0.5.0.0
+  - test-fixture ==0.5.0.1
   - test-framework ==0.8.1.1
   - test-framework-hunit ==0.3.0.2
   - test-framework-quickcheck2 ==0.3.0.3
@@ -2146,7 +2149,7 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuple-th ==0.2.5
   - tuples-homogenous-h98 ==0.1.1.0
-  - turtle ==1.3.4
+  - turtle ==1.3.5
   - turtle-options ==0.1.0.4
   - twitter-feed ==0.2.0.11
   - twitter-types ==0.7.2.2
@@ -2205,7 +2208,7 @@ default-package-overrides:
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.8.0
   - unsafe ==0.0
-  - uri-bytestring ==0.2.3.1
+  - uri-bytestring ==0.2.3.2
   - uri-encode ==1.5.0.5
   - uri-templater ==0.2.1.0
   - url ==2.1.3
@@ -2216,7 +2219,7 @@ default-package-overrides:
   - users-test ==0.5.0.1
   - utf8-light ==0.4.2
   - utf8-string ==1.0.1.1
-  - utility-ht ==0.0.13
+  - utility-ht ==0.0.14
   - uu-interleaved ==0.2.0.0
   - uu-parsinglib ==2.9.1.1
   - uuid ==1.3.13
@@ -2240,7 +2243,7 @@ default-package-overrides:
   - vector-th-unbox ==0.2.1.6
   - vectortiles ==1.2.0.5
   - verbosity ==0.2.3.0
-  - versions ==3.0.2
+  - versions ==3.0.2.1
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.2
   - viewprof ==0.0.0.1
@@ -2350,7 +2353,7 @@ default-package-overrides:
   - xlsx ==0.4.3
   - xlsx-tabular ==0.2.2
   - xml ==1.3.14
-  - xml-basic ==0.1.1.3
+  - xml-basic ==0.1.2
   - xml-conduit ==1.4.0.4
   - xml-conduit-parse ==0.3.1.0
   - xml-conduit-writer ==0.1.1.1
-- 
GitLab


From 7a67c9da33ebdf158a8291bbed09120f4dd7e29f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 8 Jun 2017 23:11:22 +0200
Subject: [PATCH 0573/1490] hackage2nix: fix inverted logic error in the first
 section of dont-distribute-packages

This change addresses https://github.com/LambdaHack/LambdaHack/issues/103.
---
 .../configuration-hackage2nix.yaml            | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a54c0e16e2e..b487ada7bab 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2514,34 +2514,34 @@ package-maintainers:
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
-  alsa-mixer:                                   [ i686-linux, x86_64-linux ]
-  alsa-pcm:                                     [ i686-linux, x86_64-linux ]
-  alsa-seq:                                     [ i686-linux, x86_64-linux ]
+  alsa-mixer:                                   [ x86_64-darwin ]
+  alsa-pcm:                                     [ x86_64-darwin ]
+  alsa-seq:                                     [ x86_64-darwin ]
   AWin32Console:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-directfb:                            [ i686-linux, x86_64-linux ]
+  bindings-directfb:                            [ x86_64-darwin ]
   d3d11binding:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   DirectSound:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9base:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9d3d:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dx9d3dx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freenect:                                     [ i686-linux, x86_64-linux ]
-  FTGL:                                         [ i686-linux, x86_64-linux ]
-  gi-ostree:                                    [ i686-linux, x86_64-linux ]
-  hcwiid:                                       [ i686-linux, x86_64-linux ]
-  hfsevents:                                    [ i686-linux, x86_64-linux ]
-  HFuse:                                        [ i686-linux, x86_64-linux ]
+  freenect:                                     [ x86_64-darwin ]
+  FTGL:                                         [ x86_64-darwin ]
+  gi-ostree:                                    [ x86_64-darwin ]
+  hcwiid:                                       [ x86_64-darwin ]
+  hfsevents:                                    [ x86_64-darwin ]
+  HFuse:                                        [ x86_64-darwin ]
   hommage-ds:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lio-fs:                                       [ i686-linux, x86_64-linux ]
-  midi-alsa:                                    [ i686-linux, x86_64-linux ]
-  pam:                                          [ i686-linux, x86_64-linux ]
-  PortMidi:                                     [ i686-linux, x86_64-linux ]
-  Raincat:                                      [ i686-linux, x86_64-linux ]
+  lio-fs:                                       [ x86_64-darwin ]
+  midi-alsa:                                    [ x86_64-darwin ]
+  pam:                                          [ x86_64-darwin ]
+  PortMidi:                                     [ x86_64-darwin ]
+  Raincat:                                      [ x86_64-darwin ]
   reactivity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rtlsdr:                                       [ i686-linux, x86_64-linux ]
-  rubberband:                                   [ i686-linux, x86_64-linux ]
-  sdl2-mixer:                                   [ i686-linux, x86_64-linux ]
-  sdl2-ttf:                                     [ i686-linux, x86_64-linux ]
-  tokyotyrant-haskell:                          [ i686-linux, x86_64-linux ]
+  rtlsdr:                                       [ x86_64-darwin ]
+  rubberband:                                   [ x86_64-darwin ]
+  sdl2-mixer:                                   [ x86_64-darwin ]
+  sdl2-ttf:                                     [ x86_64-darwin ]
+  tokyotyrant-haskell:                          [ x86_64-darwin ]
   Win32-console:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-dhcp-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2552,9 +2552,9 @@ dont-distribute-packages:
   Win32-security:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-services:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Win32-services-wrapper:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xattr:                                        [ i686-linux, x86_64-linux ]
+  xattr:                                        [ x86_64-darwin ]
   XInput:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmobar:                                       [ i686-linux, x86_64-linux ]
+  xmobar:                                       [ x86_64-darwin ]
 
   # Depens on shine, which is a ghcjs project.
   shine-varying:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From fd36209f238cf73337a647245e805b7f8bdc6b17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 8 Jun 2017 23:21:07 +0200
Subject: [PATCH 0574/1490] hackage2nix: enable builds for LambdaHack and
 Allure again

Closes https://github.com/LambdaHack/LambdaHack/issues/103.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b487ada7bab..9b017cad114 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2696,7 +2696,6 @@ dont-distribute-packages:
   al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   align-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Allure:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alphachar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5908,7 +5907,6 @@ dont-distribute-packages:
   lambdacube-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-devs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaFeed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaHack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaINet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lambdajudge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaLit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From 8a9a74a48193454c9b0ab3b57ebc6a7df05c3c3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 7 Jun 2017 22:10:56 +0200
Subject: [PATCH 0575/1490] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-9-gd15c465 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/4e0abeed5f84b295cdfb58c15ef4efbb1a028a2a.
---
 .../haskell-modules/hackage-packages.nix      | 2384 +++++++++++++----
 1 file changed, 1889 insertions(+), 495 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 093dc45ddd8..057df5adf58 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -860,7 +860,6 @@ self: {
        homepage = "http://allureofthestars.com";
        description = "Near-future Sci-Fi roguelike and tactical squad game";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -1377,8 +1376,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.1.6";
-       sha256 = "0id4lnxff5a774yzhwfhj0gxk5qxgxa8z8igv1z4n7s981lc2xxm";
+       version = "1.2.0";
+       sha256 = "1mrk5w10601gvfghmmrkmxvnr5jcwnlnk05q1bfb8akiyc2d4pbh";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -5048,7 +5047,7 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
@@ -7175,8 +7174,8 @@ self: {
      }:
      mkDerivation {
        pname = "HFitUI";
-       version = "0.1.0.0";
-       sha256 = "0g3isg6cacwkx0xmwnxpck7j1z58pykdzq9lqgzl4279an4j7vwx";
+       version = "0.1.1.0";
+       sha256 = "03v03adcqyf0ppbhx8jxmp1f4pzmqs5s43as21add2yl13rkwzm7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7220,7 +7219,7 @@ self: {
        homepage = "https://github.com/m15k/hfuse";
        description = "HFuse is a binding for the Linux FUSE library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fuse;};
 
   "HGE2D" = callPackage
@@ -8675,8 +8674,8 @@ self: {
        pname = "HaRe";
        version = "0.8.4.0";
        sha256 = "1yqm2vwai3ss5r4brfgmx90kqifwvy5m8jrldb49b88aix3p4ckk";
-       revision = "1";
-       editedCabalFile = "0l303mkjls5m3dx0g3wlwdc97pi6av2xlpabq21mmamgb5whasx2";
+       revision = "2";
+       editedCabalFile = "1hwajkfskbnh3cn7jgiqp83vpfinnfn4pfzwkl6cwqi63iwy944p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -9749,6 +9748,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "HsOpenSSL_0_11_4_9" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
+     , openssl, time
+     }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.4.9";
+       sha256 = "0y5khy8a1anisa8s1zysz763yg29mr6c9zcx4bjszaba5axyj3za";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         base bytestring integer-gmp network time
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/vshabanov/HsOpenSSL";
+       description = "Partial OpenSSL binding for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
@@ -10949,7 +10968,6 @@ self: {
        homepage = "https://lambdahack.github.io";
        description = "A game engine library for roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaINet" = callPackage
@@ -14138,7 +14156,7 @@ self: {
        homepage = "http://github.com/ninegua/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
@@ -14884,6 +14902,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "RSA_2_3_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, crypto-api
+     , crypto-pubkey-types, DRBG, QuickCheck, SHA, tagged
+     , test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "RSA";
+       version = "2.3.0";
+       sha256 = "0csk933gb2ayijxx6ar110lmsbvgyn7p5bqln3g2qbfxz73nvrzf";
+       libraryHaskellDepends = [
+         base binary bytestring crypto-api crypto-pubkey-types SHA
+       ];
+       testHaskellDepends = [
+         base binary bytestring crypto-api crypto-pubkey-types DRBG
+         QuickCheck SHA tagged test-framework test-framework-quickcheck2
+       ];
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Raincat" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl
      , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time
@@ -14901,7 +14940,7 @@ self: {
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Random123" = callPackage
@@ -17205,8 +17244,8 @@ self: {
        pname = "TestExplode";
        version = "0.1.0.0";
        sha256 = "0r4nwzwdila9p05g5y99rp06dbh1k2yl5jsc6yn6dwvxkvvdjcs1";
-       revision = "3";
-       editedCabalFile = "0158f7h9panmpsymc8bwaflbd23zc2d0ndb0pdarqglh06x8wa4c";
+       revision = "4";
+       editedCabalFile = "04qpbdcpfayghrc4hgy9bacg3s5cqfhjgmbmdba00wmqlja0yz8d";
        libraryHaskellDepends = [
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
@@ -20731,6 +20770,8 @@ self: {
        pname = "adler32";
        version = "0.1.1.0";
        sha256 = "1v18d4xfbgqflx957xy6wiv7zhkgimpy85fy49d91p2ifkmbk32p";
+       revision = "1";
+       editedCabalFile = "087fykdlay78g9zg1w6a36xwd4pizcyi5wqzvj7cw5sh6gq493km";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        testHaskellDepends = [ base bytestring hspec ];
@@ -21033,6 +21074,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-compat_0_3_7" = callPackage
+    ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
+     , base-compat, base-orphans, bytestring, containers, exceptions
+     , hashable, nats, QuickCheck, quickcheck-instances, scientific
+     , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-compat";
+       version = "0.3.7";
+       sha256 = "053wa7j82pymr633vakpdandrddg083zcmv76g9sbawcsfiw5whv";
+       libraryHaskellDepends = [
+         aeson attoparsec attoparsec-iso8601 base base-compat bytestring
+         containers exceptions hashable nats scientific semigroups tagged
+         text time time-locale-compat unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base-compat base-orphans bytestring
+         containers exceptions hashable nats QuickCheck quickcheck-instances
+         scientific semigroups tagged tasty tasty-hunit tasty-quickcheck
+         text time time-locale-compat unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/aeson-compat#readme";
+       description = "Compatibility layer for aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-diff" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
@@ -21645,8 +21714,10 @@ self: {
      }:
      mkDerivation {
        pname = "agda-snippets";
-       version = "2.5.1";
-       sha256 = "1mjn415halclsqph57s2a577w52d79jmwqcnmzvfdy3x0zzdbllx";
+       version = "2.5.2";
+       sha256 = "1bfjbxgmy0nxfjcsqqp4snshmx3ka7rjij4pdw46ax6jlsap2w1f";
+       revision = "1";
+       editedCabalFile = "1lyagh0psry89lh7j8r7gq9ar1a4zgs75mdfrm40wym9h3hcwm1d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21665,8 +21736,8 @@ self: {
      }:
      mkDerivation {
        pname = "agda-snippets-hakyll";
-       version = "0.1.2.1";
-       sha256 = "1kxnsciaqrv58vl6335fcn3gf5a98r85q9f83knsxl62nxr2x6wz";
+       version = "0.1.2.2";
+       sha256 = "1bwia22d78wjm33vhsxrx5jchcjvqwl95d1ikkhm9dhraba38z1h";
        libraryHaskellDepends = [
          agda-snippets base directory filepath hakyll network-uri pandoc
          pandoc-types
@@ -22094,6 +22165,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "alerta" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, containers
+     , data-default, http-api-data, http-client, servant, servant-client
+     , servant-server, text, time
+     }:
+     mkDerivation {
+       pname = "alerta";
+       version = "0.1.0.3";
+       sha256 = "0phw1l11v1dhim7njc5rrxlkacmk5wwm2vw9jcvkyh2j1bz5gx5g";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base containers data-default http-api-data
+         http-client servant servant-client servant-server text time
+       ];
+       homepage = "https://github.com/mjhopkins/alerta-client";
+       description = "Bindings to the alerta REST API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "alex" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, directory
      , filepath, happy, process, QuickCheck
@@ -22590,7 +22679,7 @@ self: {
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -22611,7 +22700,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
@@ -22647,7 +22736,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
@@ -24141,7 +24230,7 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
-  "amazonka-s3-streaming_0_2_0_2" = callPackage
+  "amazonka-s3-streaming_0_2_0_3" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
      , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions
      , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet
@@ -24149,8 +24238,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3-streaming";
-       version = "0.2.0.2";
-       sha256 = "0bhr141kjwrrk0cd6052np1q0y6jw2yd1wxrpgkrk41wl26makrr";
+       version = "0.2.0.3";
+       sha256 = "1pndy65mk3kjl51jr75k1dk182wsbzfd2q9zsvcxpalfs0nsaf30";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -25027,8 +25116,8 @@ self: {
        pname = "ansi-pretty";
        version = "0.1.2.1";
        sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h";
-       revision = "2";
-       editedCabalFile = "0rds13k27ycmm3vcg503fc32ddwdn078hxlb2fa274sxc3wd443x";
+       revision = "3";
+       editedCabalFile = "046w5nybk8fyhicw5wy7qchbx9k4sib189afj2gysrsblj0ki864";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -25040,20 +25129,6 @@ self: {
      }) {};
 
   "ansi-terminal" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "ansi-terminal";
-       version = "0.6.3";
-       sha256 = "1m9s5h8cj5gh23ybkl1kim3slmlprmk3clrbrnnb078afamlwg6s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/feuerbach/ansi-terminal";
-       description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ansi-terminal_0_6_3_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ansi-terminal";
@@ -25065,7 +25140,6 @@ self: {
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ansi-wl-pprint" = callPackage
@@ -27655,8 +27729,8 @@ self: {
      }:
      mkDerivation {
        pname = "atom-basic";
-       version = "0.2.4";
-       sha256 = "1sr9slv3gdjab9ipzwn3iksp733np6r5r0c6cn74mzvqgdsvjzxk";
+       version = "0.2.5";
+       sha256 = "1vkm5wfsgprs42qjzxchgrpxj3xalpg2zd79n9isvlxsp1krdgi4";
        libraryHaskellDepends = [
          base base64-bytestring bytestring network network-uri text time
        ];
@@ -28137,6 +28211,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "attoparsec-uri" = callPackage
+    ({ mkDerivation, attoparsec, base, bytedump, n-tuple, strict, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "attoparsec-uri";
+       version = "0.0.1";
+       sha256 = "0bjfk1ljm16kzb3415973w5z3zhjbb2yyphwr6v3givszgwryq6g";
+       libraryHaskellDepends = [
+         attoparsec base bytedump n-tuple strict text vector
+       ];
+       homepage = "https://github.com/athanclark/attoparsec-uri#readme";
+       description = "URI parser / printer using attoparsec";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "attosplit" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -28342,6 +28432,8 @@ self: {
        pname = "authenticate-oauth";
        version = "1.6";
        sha256 = "0xc37yql79r9idjfdhzg85syrwwgaxggcv86myi6zq2pzl89yvfj";
+       revision = "1";
+       editedCabalFile = "1fxwn8bn6qs8dhxq0q04psq7zp1qvw1b6g3vmsclgyj9p7kr77ms";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring crypto-pubkey-types
          data-default http-client http-types random RSA SHA time
@@ -30061,10 +30153,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-feature-macros";
-       version = "0.1";
-       sha256 = "1arr3mb5axmy4aq8h1706hq62qzxcg9msy31n3smhddy0zia06xy";
-       revision = "1";
-       editedCabalFile = "1risd4pq9vyvi1xgdx1yb46wwn600ldlsl2qrcw97bkr05c748fr";
+       version = "0.1.0.1";
+       sha256 = "1v4a0jmjjqirfxvwim7gsrn5vj0p6la6fncy6k4v2va0p8xaggmp";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        description = "Semantic CPP feature macros for base";
@@ -30760,6 +30850,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "beeminder-api" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , conduit, containers, data-default-class
+     , data-default-instances-base, http-conduit, http-types, lens
+     , monad-control, mtl, resourcet, scientific, text, time
+     , transformers, transformers-base, universe, universe-base
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "beeminder-api";
+       version = "1.0";
+       sha256 = "0yvk51s7pajndzh3sy6jsq1yg2myvn7i211b0g50n1afh96mf84j";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder bytestring conduit containers
+         data-default-class data-default-instances-base http-conduit
+         http-types lens monad-control mtl resourcet scientific text time
+         transformers transformers-base universe universe-base
+         unordered-containers vector
+       ];
+       description = "Bindings to the beeminder.com JSON API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bein" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible, Crypto
      , directory, filepath, happstack-server, happstack-util, hdaemonize
@@ -32168,7 +32281,7 @@ self: {
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
@@ -32614,7 +32727,7 @@ self: {
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {saneBackends = null;};
+     }) {inherit (pkgs) saneBackends;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -40867,10 +40980,25 @@ self: {
        pname = "choice";
        version = "0.2.0";
        sha256 = "0bppl551b384c28fqzww73lddzhfdgs10qcf2wd8xk2awna0i9w9";
+       revision = "1";
+       editedCabalFile = "1bv77nhabm33jfaqhpl77jdcbfl7zxz4daphsmqb0pi6z85man7p";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mboes/choice#readme";
+       description = "A solution to boolean blindness";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
+  "choice_0_2_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "choice";
+       version = "0.2.1";
+       sha256 = "163p6ji6gsr0lgxvldnz0rmcbckfk75wpq0xn1n41fbhxzchr2gi";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mboes/choice#readme";
        description = "A solution to boolean blindness";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "choose" = callPackage
@@ -42757,14 +42885,14 @@ self: {
      }:
      mkDerivation {
        pname = "cloudi";
-       version = "1.7.0";
-       sha256 = "0j46jzrvdfxmy1hbb6p9bmf1jhws9s3463dlyrjz86cszv075lv6";
+       version = "1.7.1";
+       sha256 = "12kk359wfkwsc62bb6f0ak5gzkwdw4gmcfmj9ryqrjcc2irlnbk1";
        libraryHaskellDepends = [
          array base binary bytestring containers network time unix zlib
        ];
        homepage = "https://github.com/CloudI/cloudi_api_haskell";
        description = "Haskell CloudI API";
-       license = stdenv.lib.licenses.bsdOriginal;
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -45066,25 +45194,25 @@ self: {
      }) {};
 
   "concrete-haskell" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , hashable, megaparsec, mtl, optparse-applicative, process
-     , QuickCheck, tar, text, thrift, time, unordered-containers, uuid
-     , vector, zlib
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , directory, filepath, hashable, megaparsec, mtl
+     , optparse-applicative, process, QuickCheck, scientific, tar, text
+     , thrift, time, unordered-containers, uuid, vector, zlib
      }:
      mkDerivation {
        pname = "concrete-haskell";
-       version = "0.1.0.6";
-       sha256 = "12faqwdsc1zy18qnqdl5chysib65q749n9cfaai9j759n32l6xia";
+       version = "0.1.0.7";
+       sha256 = "1v076bi2fk6a5sm4bjrxlah8hglbgbr2gcbsh3017h2hkkhl8gdv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers directory filepath hashable process
-         QuickCheck tar text thrift time unordered-containers uuid vector
-         zlib
+         attoparsec base bytestring containers directory filepath hashable
+         megaparsec mtl process QuickCheck scientific tar text thrift time
+         unordered-containers uuid vector zlib
        ];
        executableHaskellDepends = [
-         base bytestring containers directory filepath megaparsec mtl
-         optparse-applicative process text vector zlib
+         base bytestring containers directory filepath optparse-applicative
+         process text vector zlib
        ];
        homepage = "https://github.com/hltcoe";
        description = "Library for the Concrete data format";
@@ -45149,14 +45277,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "concurrency_1_1_2_0" = callPackage
+  "concurrency_1_1_2_1" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
      mkDerivation {
        pname = "concurrency";
-       version = "1.1.2.0";
-       sha256 = "0k3vyfyq8jlsh0rf3rn4arl1qlcwz7bzxazwaggzxlyhv89vycqx";
+       version = "1.1.2.1";
+       sha256 = "0gadbm9z9qbm208md5f811hz9f2ljw0z9dyldpgklqvic1n8w5xi";
        libraryHaskellDepends = [
          array atomic-primops base exceptions monad-control mtl stm
          transformers
@@ -45490,6 +45618,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit_1_2_11" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, exceptions
+     , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
+     , mwc-random, primitive, QuickCheck, resourcet, safe, split
+     , transformers, transformers-base, vector
+     }:
+     mkDerivation {
+       pname = "conduit";
+       version = "1.2.11";
+       sha256 = "1xx8vj2azbzr2skcrpcy02hgnik01i6hcx01h0mjd4fr0hzl4rhb";
+       libraryHaskellDepends = [
+         base exceptions lifted-base mmorph monad-control mtl primitive
+         resourcet transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck resourcet safe
+         split transformers
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hspec kan-extensions mwc-random
+         transformers vector
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Streaming data processing library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-audio" = callPackage
     ({ mkDerivation, base, conduit, vector }:
      mkDerivation {
@@ -45894,8 +46050,8 @@ self: {
      }:
      mkDerivation {
        pname = "config-schema";
-       version = "0.4.1.0";
-       sha256 = "03ikwswgjc1in7qln15ssh1bxm8x1ycz4g0lhma7dcqhaq1ml7xs";
+       version = "0.5.0.0";
+       sha256 = "108gjzafzc5hv1vilnxagf65bh2xia2rfwxcjw6axzzhw5lszgli";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -46232,6 +46388,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "console-prompt" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "console-prompt";
+       version = "0.1";
+       sha256 = "07s4p41hjsalbaayxq2j973f3wnk8d7aybvl84fww7sz6mj7kvhw";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/jlamothe/console-prompt";
+       description = "console user prompts";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "console-style" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -50341,8 +50509,8 @@ self: {
      }:
      mkDerivation {
        pname = "d-bus";
-       version = "0.1.6";
-       sha256 = "0qrvpjl7hj6npq1h96c0fsakv2yrsqm3qr76l193vnkyd4i3s8hn";
+       version = "0.1.7";
+       sha256 = "00bd001hxh68cwrv2597qg8rpcdz0n96nn31qkqgyhbc4lni72af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52006,6 +52174,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-msgpack_0_0_10" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck
+     , text, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "data-msgpack";
+       version = "0.0.10";
+       sha256 = "0vpv4l6phsa9b3l0wxk798w9kzkc454v2kk554rcmz94wq3k6n61";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 deepseq
+         hashable QuickCheck text unordered-containers vector void
+       ];
+       executableHaskellDepends = [ base bytestring groom ];
+       testHaskellDepends = [
+         base bytestring containers hashable hspec QuickCheck text
+         unordered-containers vector void
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq QuickCheck
+       ];
+       homepage = "http://msgpack.org/";
+       description = "A Haskell implementation of MessagePack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-msgpack-types" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , QuickCheck, text, unordered-containers, vector, void
@@ -54069,18 +54266,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_0_6_0_0" = callPackage
+  "dejafu_0_7_0_1" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , monad-loops, mtl, random, ref-fd, semigroups, transformers
-     , transformers-base
+     , leancheck, monad-loops, mtl, random, ref-fd, semigroups
+     , transformers, transformers-base
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.6.0.0";
-       sha256 = "07l1i8kfmblyc76qgw1db339b9w8nrgf5h5c38nnr79cbjdz9n60";
+       version = "0.7.0.1";
+       sha256 = "0cdkf5qgcwy4sapvingi0s37s0k9d5v8crskaj5wjy1pwl9vs8kq";
        libraryHaskellDepends = [
-         base concurrency containers deepseq exceptions monad-loops mtl
-         random ref-fd semigroups transformers transformers-base
+         base concurrency containers deepseq exceptions leancheck
+         monad-loops mtl random ref-fd semigroups transformers
+         transformers-base
        ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Systematic testing for Haskell concurrency";
@@ -55304,6 +55502,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-lib_1_4_1_1" = callPackage
+    ({ mkDerivation, active, adjunctions, array, base, bytestring
+     , cereal, colour, containers, criterion, data-default-class
+     , deepseq, diagrams-core, diagrams-solve, directory, distributive
+     , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable
+     , intervals, JuicyPixels, lens, linear, monoid-extras, mtl
+     , numeric-extras, optparse-applicative, process, profunctors
+     , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-lib";
+       version = "1.4.1.1";
+       sha256 = "1sgpmxs8n05bl9cq4fmbgwyqra5kr69di2ngwlc2vqf1fpymis9a";
+       libraryHaskellDepends = [
+         active adjunctions array base bytestring cereal colour containers
+         data-default-class diagrams-core diagrams-solve directory
+         distributive dual-tree exceptions filepath fingertree fsnotify
+         hashable intervals JuicyPixels lens linear monoid-extras mtl
+         optparse-applicative process profunctors semigroups tagged text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base deepseq diagrams-solve distributive lens numeric-extras tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion diagrams-core ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Embedded domain-specific language for declarative graphics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-pandoc" = callPackage
     ({ mkDerivation, base, diagrams-builder, diagrams-cairo
      , diagrams-lib, directory, filepath, linear, optparse-applicative
@@ -60966,6 +61197,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elm-bridge_0_4_1" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "elm-bridge";
+       version = "0.4.1";
+       sha256 = "1wp813l6bdw5x7vpiq098v1gbxzvv3129n2rl4div9mrj53a3i2l";
+       revision = "1";
+       editedCabalFile = "05kk6lsh10ligdgj4dw0iyhvv0blnrcvmk94hn27qq70bpv8xcqz";
+       libraryHaskellDepends = [ aeson base template-haskell ];
+       testHaskellDepends = [
+         aeson base containers hspec QuickCheck text
+       ];
+       homepage = "https://github.com/agrafix/elm-bridge";
+       description = "Derive Elm types and Json code from Haskell types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "elm-build-lib" = callPackage
     ({ mkDerivation, base, bytestring, containers, elm-compiler
      , elm-core-sources, file-embed, template-haskell
@@ -62940,7 +63191,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ether_0_5_0_0" = callPackage
+  "ether_0_5_1_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim
      , lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged
      , tasty, tasty-quickcheck, template-haskell, transformers
@@ -62948,10 +63199,8 @@ self: {
      }:
      mkDerivation {
        pname = "ether";
-       version = "0.5.0.0";
-       sha256 = "0ypji3blmdha1lcsw09985hbqys793kj4c2m0vlnpr3xd4ypvqnf";
-       revision = "1";
-       editedCabalFile = "0l3bsf1l2kkni9rsdl45wb8w9jlfpg24mxmsqia00k2lbry573m5";
+       version = "0.5.1.0";
+       sha256 = "1180l4z2cdgc6zj9pcr2c0lj28ka85kbk8sxd42fis65k2ahr61n";
        libraryHaskellDepends = [
          base exceptions mmorph monad-control mtl reflection tagged
          template-haskell transformers transformers-base transformers-lift
@@ -64276,8 +64525,8 @@ self: {
     ({ mkDerivation, base, deepseq, transformers }:
      mkDerivation {
        pname = "explicit-exception";
-       version = "0.1.8";
-       sha256 = "0vyi9k0rx083qs3yizcm89pvp38823akbrkr43w3ng6vh4vpmvkz";
+       version = "0.1.9";
+       sha256 = "1kxx42kzm3r0mji7756yblpr7ys3lhx937jixgm8q1zsyg36m2hz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq transformers ];
@@ -65262,8 +65511,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "0r4ac76mn7dykva0dz6ar2zfcij2kiz8kjfcywpgdg40g75zhvn4";
-       revision = "6";
-       editedCabalFile = "1zss528kggb1072lv68zh13l8a2n1bmrv6ga7dhmchnd6faz9411";
+       revision = "7";
+       editedCabalFile = "07iqrpg2hga3n8m08aq2zizvq27v8hyqzvx5sfz497whjxr9h358";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65557,8 +65806,8 @@ self: {
        pname = "fclabels";
        version = "2.0.3.2";
        sha256 = "1c42f420bih3azhis9hhcdk6ijm10wp9rqa2kh763g68qgzq6pad";
-       revision = "2";
-       editedCabalFile = "0fjxcs8c5b01mz9h5jfihvnxdh486mjxqr7fpzz53r1zxh880gcr";
+       revision = "3";
+       editedCabalFile = "19gd2jwjpfrmq80gpjk05djhn42vvj88fgka5yr7yaq6mfx103by";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
@@ -68251,31 +68500,6 @@ self: {
      }) {};
 
   "foldl-statistics" = callPackage
-    ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
-     , profunctors, quickcheck-instances, semigroups, statistics, tasty
-     , tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "foldl-statistics";
-       version = "0.1.4.3";
-       sha256 = "0f8gkdy3zwkj7cqmydgll3r18f104n5bpryd6fsr2hqn9cdmf463";
-       libraryHaskellDepends = [
-         base foldl math-functions profunctors semigroups
-       ];
-       testHaskellDepends = [
-         base foldl profunctors quickcheck-instances semigroups statistics
-         tasty tasty-quickcheck vector
-       ];
-       benchmarkHaskellDepends = [
-         base criterion foldl mwc-random statistics vector
-       ];
-       homepage = "http://github.com/Data61/foldl-statistics#readme";
-       description = "Statistical functions from the statistics package implemented as Folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "foldl-statistics_0_1_4_4" = callPackage
     ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
      , profunctors, quickcheck-instances, semigroups, statistics, tasty
      , tasty-quickcheck, vector
@@ -68297,7 +68521,7 @@ self: {
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "foldl-transduce" = callPackage
@@ -69025,12 +69249,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "foundation_0_0_10" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "foundation";
+       version = "0.0.10";
+       sha256 = "0ihrdgsn4ivpyhck0qqcfqx2xza1spqv81sd071i151yfyvl1a5p";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [
+         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/haskell-foundation/foundation";
+       description = "Alternative prelude with batteries and no dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foundation-edge" = callPackage
     ({ mkDerivation, bytestring, foundation, text }:
      mkDerivation {
        pname = "foundation-edge";
        version = "0.0.2";
        sha256 = "1ddcw4a8gmlcb6pgy2sysp6inpm19i7j1cg9ix3z5fwkpxg2kr71";
+       revision = "1";
+       editedCabalFile = "01w5bjjavfq76s43c2f0wbna6rn6yilivsq7s8ws5i1kqav9yffx";
        libraryHaskellDepends = [ bytestring foundation text ];
        homepage = "https://github.com/haskell-foundation/foundation-edge";
        description = "foundation's edge with the conventional set of packages";
@@ -69590,7 +69835,7 @@ self: {
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freenect; freenect_sync = null; 
          libfreenect = null;};
 
@@ -71673,8 +71918,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "generic-records";
-       version = "0.1.0.0";
-       sha256 = "0m14fb687crwg6bsfrharcgqqxk60h7yzg9rgjvl0xjk5w6b0dri";
+       version = "0.2.0.0";
+       sha256 = "0xga8vm89xjgzmnz5032kqyq1q8nhbf01n55xjgda4kfjzkx1yr0";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kcsongor/generic-records";
        description = "Magic record operations using generics";
@@ -73648,8 +73893,8 @@ self: {
     ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }:
      mkDerivation {
        pname = "ghcjs-dom";
-       version = "0.8.0.0";
-       sha256 = "0sh20vnh9yfaafdy9w24j9izj39lmf4bnc7cxjdxngwc1kp51x38";
+       version = "0.9.0.0";
+       sha256 = "0z55qfvnyq5z22ynmnrxdymq6jgcs7ps04bznqna4fbcvlqy0zm9";
        libraryHaskellDepends = [
          base ghcjs-dom-jsaddle text transformers
        ];
@@ -73683,8 +73928,8 @@ self: {
     ({ mkDerivation, jsaddle-dom }:
      mkDerivation {
        pname = "ghcjs-dom-jsaddle";
-       version = "0.8.0.0";
-       sha256 = "0k3pb1chrip60yymdj80wb10kj0dh8hgp85qyn58q37fnb53w04a";
+       version = "0.9.0.0";
+       sha256 = "0ghk8nvfhwm5zwwiws2621gk08x73w11v0cab5nsdpyz1qn0dl5j";
        libraryHaskellDepends = [ jsaddle-dom ];
        doHaddock = false;
        description = "DOM library that supports both GHCJS and GHC using jsaddle";
@@ -73696,8 +73941,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "ghcjs-dom-jsffi";
-       version = "0.8.0.0";
-       sha256 = "1qpkgv67nkmnhd9zwfb5cynsnk0wlrgrqzgdlq8i9q2c16pwh7sw";
+       version = "0.9.0.0";
+       sha256 = "1q04gibg5jlqs287vwig43bxyi9gpy951mfpmv17qky8b50sxkmc";
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74217,6 +74462,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
+  "gi-gtk_3_0_15" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+     , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gtk";
+       version = "3.0.15";
+       sha256 = "176hvvrl2w71dy096irazr83v07qd8nixl6gsihn2i9caaxn4scb";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Gtk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {gtk3 = pkgs.gnome3.gtk;};
+
   "gi-gtk-hs" = callPackage
     ({ mkDerivation, base, base-compat, containers, gi-gdk
      , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl
@@ -74365,7 +74633,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "OSTree bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ostree;};
 
   "gi-pango" = callPackage
@@ -74641,26 +74909,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ginger_0_5_1_2" = callPackage
+  "ginger_0_5_1_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
      , tasty-quickcheck, text, time, transformers, unordered-containers
-     , utf8-string, vector
+     , utf8-string, vector, wryte
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.5.1.2";
-       sha256 = "0xr0r3wwyhksa9b6qg39akd2kqgwdqpc21sn81yj422lw0j79szn";
+       version = "0.5.1.3";
+       sha256 = "06dywl7wi2qy2apc9gwcf5j9mxckyjbjpqddqdqgnj47wbssrmiz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath http-types mtl parsec
          safe scientific text time transformers unordered-containers
-         utf8-string vector
+         utf8-string vector wryte
        ];
        executableHaskellDepends = [
          aeson base bytestring data-default text transformers
-         unordered-containers
+         unordered-containers wryte
        ];
        testHaskellDepends = [
          aeson base bytestring data-default mtl tasty tasty-hunit
@@ -76170,8 +76438,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.21.1";
-       sha256 = "12ivc4pbqq3564q0g0dz2h731r8dnlxkq471vfk03lrhvjyf8sak";
+       version = "2.22";
+       sha256 = "02kfxarddlb7yjj17slvn28pz49m27l7ag06milxjg0k157dxkpi";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -79833,14 +80101,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "google-oauth2-jwt_0_2_1" = callPackage
+  "google-oauth2-jwt_0_2_2" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL
      , RSA, text, unix-time
      }:
      mkDerivation {
        pname = "google-oauth2-jwt";
-       version = "0.2.1";
-       sha256 = "0fmqcwvn4rf4l8hzvwhnkfc22akkdbnbv3hw70r4akfplay0nc9g";
+       version = "0.2.2";
+       sha256 = "0alvq0sxmzi1mxc7bahwxydbgmhp8hva0w8p9h6cb1fh2vam5p1q";
        libraryHaskellDepends = [
          base base64-bytestring bytestring HsOpenSSL RSA text unix-time
        ];
@@ -84501,6 +84769,50 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) utillinux;};
 
+  "hakyll_4_9_6_0" = callPackage
+    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
+     , containers, cryptohash, data-default, deepseq, directory
+     , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
+     , network, network-uri, optparse-applicative, pandoc
+     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
+     , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , time-locale-compat, unordered-containers, utillinux, vector, wai
+     , wai-app-static, warp, yaml
+     }:
+     mkDerivation {
+       pname = "hakyll";
+       version = "4.9.6.0";
+       sha256 = "0qkwa8fs5wpqg4gvk19cg5jsjhwyirvwbah1hk7a5b8yfrbsm08c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types lrucache mtl network network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process random
+         regex-base regex-tdfa resourcet scientific system-filepath tagsoup
+         text time time-locale-compat unordered-containers vector wai
+         wai-app-static warp yaml
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types lrucache mtl network network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process
+         QuickCheck random regex-base regex-tdfa resourcet scientific
+         system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
+         time time-locale-compat unordered-containers vector wai
+         wai-app-static warp yaml
+       ];
+       testToolDepends = [ utillinux ];
+       homepage = "http://jaspervdj.be/hakyll";
+       description = "A static website compiler library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) utillinux;};
+
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
      }:
@@ -86709,8 +87021,8 @@ self: {
        pname = "hashabler";
        version = "2.0.0";
        sha256 = "1wrwjbpvdf4yimcshw396a1crl76mr9wabspz6z3pdwg4d8dfava";
-       revision = "1";
-       editedCabalFile = "111jik2b8vyp1ap5i1flnxbrrv0nyiba8canwyrilimw5wz0qsn8";
+       revision = "2";
+       editedCabalFile = "0plq6sfzplpg7lc9s2jsnj3l53z1v614h4ni3fvnw4hxj0n4cykv";
        libraryHaskellDepends = [
          array base bytestring ghc-prim integer-gmp primitive
          template-haskell text
@@ -87448,6 +87760,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-gettext" = callPackage
+    ({ mkDerivation, base, binary, bytestring, bytestring-trie
+     , containers, filepath, haskell-src-exts, mtl, old-locale, parsec
+     , text, time, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-gettext";
+       version = "0.1.1.0";
+       sha256 = "1kfqrm90my0h15f1x6n4fzzf9fvyicg87fqwbal37hj888jb0gv8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring bytestring-trie containers mtl parsec text
+         time transformers
+       ];
+       executableHaskellDepends = [
+         base filepath haskell-src-exts old-locale time uniplate
+       ];
+       description = "GetText runtime library implementation in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-gi" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
      , directory, doctest, filepath, glib, gobjectIntrospection
@@ -87456,8 +87790,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.20.1";
-       sha256 = "04ndhi4w88vmc3h4jk95z8i9j83aif99k9c8qwr6nv1q05zxbwbz";
+       version = "0.20.2";
+       sha256 = "1dnavj0qpcljakmb5jnv0hqds8a0zqn5ycn0xq5fls20fmw9j5gh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87479,8 +87813,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.20.2";
-       sha256 = "05jr33kvj2iafsp7g5b8z3m33pf7law9q6rjzq969c5cc586pvp7";
+       version = "0.20.3";
+       sha256 = "07ggfmbr9s4c1ql4cyyk64fbig5k2mpc25371zrrj44yc6ai2xz1";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        homepage = "https://github.com/haskell-gi/haskell-gi-base";
@@ -91192,7 +91526,7 @@ self: {
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize" = callPackage
@@ -92766,6 +93100,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "heterocephalus_1_0_5_0" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
+     , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "heterocephalus";
+       version = "1.0.5.0";
+       sha256 = "1qhm8vq8dncmqd9mjqghw1b327brjc9ij9pxjbkpk0lppx3pgsnw";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup containers dlist mtl parsec
+         shakespeare template-haskell text transformers
+       ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/heterocephalus#readme";
+       description = "A type-safe template engine for working with popular front end development tools";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heterolist" = callPackage
     ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata
      }:
@@ -93291,6 +93645,7 @@ self: {
        description = "File/folder watching for OS X";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; 
          inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;};
 
@@ -96186,17 +96541,17 @@ self: {
      , conduit-combinators, conduit-extra, containers, criterion
      , deepseq, directory, hspec, hspec-attoparsec, hspec-core
      , hspec-expectations, ip, optparse-applicative, permute, random
-     , resourcet, text, time, word8, yaml
+     , resourcet, text, time, unordered-containers, word8, yaml
      }:
      mkDerivation {
        pname = "hnormalise";
-       version = "0.3.2.0";
-       sha256 = "1dyin8ffwzwbkljfvs4n1a0h2ria99i81c5qy1dg7bzgw2bnb6xv";
+       version = "0.3.3.0";
+       sha256 = "1rrriy9i6bfh1l6q9iwsc9zfcaif3d3f1vmkzm353gprf7vg8fnk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring
-         containers directory ip permute text time yaml
+         containers directory ip permute text time unordered-containers yaml
        ];
        executableHaskellDepends = [
          aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring
@@ -96447,6 +96802,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hoggl" = callPackage
+    ({ mkDerivation, aeson, base, base64-string, either, formatting
+     , hashable, http-client, http-client-tls, mtl, optparse-applicative
+     , servant, servant-client, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "hoggl";
+       version = "0.2.0.0";
+       sha256 = "0kblkirivnw3ylaifdpa8acy2armxxkl9hbqymg2qfiiwnbgg2wh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-string either formatting hashable http-client
+         http-client-tls mtl servant servant-client text time transformers
+         unordered-containers
+       ];
+       executableHaskellDepends = [
+         base either http-client http-client-tls optparse-applicative
+         servant-client text time transformers
+       ];
+       description = "Bindings to the Toggl.com REST API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hogre" = callPackage
     ({ mkDerivation, base, cgen, cgen-hs, grgen, OGRE, OgreMain }:
      mkDerivation {
@@ -97238,8 +97618,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-docs";
-       version = "0.3.1";
-       sha256 = "15lvxsdd2ayd94mr9bxzcxrwkb22yflnby1r5ch8wmyymwvbv55y";
+       version = "0.3.2";
+       sha256 = "04ah438igxykyspzlhpa5y50z1accrb9sxhv2sn8riqfhdz2sych";
        libraryHaskellDepends = [
          base haskell-src hoppy-generator hoppy-runtime
        ];
@@ -97255,8 +97635,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-generator";
-       version = "0.3.2";
-       sha256 = "1sv76yfbp4r2dda17crng7g39wz2fy77jc246w6749hd9s3izx7a";
+       version = "0.3.3";
+       sha256 = "18n48kkf6pcmcwb85a74kqh84aadpm1s9jv1r56b43rya8ra3mgw";
        libraryHaskellDepends = [
          base containers directory filepath haskell-src mtl
        ];
@@ -97267,12 +97647,14 @@ self: {
      }) {};
 
   "hoppy-runtime" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
        pname = "hoppy-runtime";
-       version = "0.3.0";
-       sha256 = "1nd9mgzqnak420dcifldq09c7sph7mf8llrsfagphq9aqhw3lij4";
-       libraryHaskellDepends = [ base containers ];
+       version = "0.3.1";
+       sha256 = "0cbnhpwy3m0l7gcarg7xr1f5y6nwdnfa269vvza0fm4fhf3lz6g5";
+       libraryHaskellDepends = [
+         base Cabal containers directory filepath
+       ];
        homepage = "http://khumba.net/projects/hoppy";
        description = "C++ FFI generator - Runtime support";
        license = stdenv.lib.licenses.asl20;
@@ -97718,8 +98100,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.17.0";
-       sha256 = "0r3lcp217i9nqavymhn02wnyg5qplhayp09aqcj58brh3b58lmyj";
+       version = "0.17.1";
+       sha256 = "0lxpjv5j3bg725n1kqjgpcq3rb3s7zc1w3j5snc92ayk8fxpbd3n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102442,6 +102824,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "htlset" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "htlset";
+       version = "0.1.0.0";
+       sha256 = "18wbw6zfb424xq3m05hjxypiiaqc75nd365y9l8035dvi29mfbnf";
+       libraryHaskellDepends = [ base containers ];
+       homepage = "https://github.com/kelemzol/htlset";
+       description = "Heterogenous Set";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "html" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -102992,29 +103386,6 @@ self: {
      }) {};
 
   "http-client-tls" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, connection
-     , containers, criterion, cryptonite, data-default-class, exceptions
-     , hspec, http-client, http-types, memory, network, network-uri
-     , text, tls, transformers
-     }:
-     mkDerivation {
-       pname = "http-client-tls";
-       version = "0.3.4.2";
-       sha256 = "0jzxzncm8i00l2sdayizxj7g98ahp4pi9zr5rh1dhsrw18rq5gz8";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive connection containers cryptonite
-         data-default-class exceptions http-client http-types memory network
-         network-uri text tls transformers
-       ];
-       testHaskellDepends = [ base hspec http-client http-types ];
-       benchmarkHaskellDepends = [ base criterion http-client ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "http-client backend using the connection package and tls library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-tls_0_3_5" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
      , containers, criterion, cryptonite, data-default-class, exceptions
      , hspec, http-client, http-types, memory, network, network-uri
@@ -103035,7 +103406,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-common" = callPackage
@@ -104038,12 +104408,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_0_5_0_0" = callPackage
+  "hunit-dejafu_0_6_0_0" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "0.5.0.0";
-       sha256 = "05l8sm7r2n17a0dd3xhdcnrf6vaz4mv82im39r0iykh284hjcpnh";
+       version = "0.6.0.0";
+       sha256 = "0nw906gq8jzn6kr7iq40qna3r3q1s0dvfyxz84xfp5452g56a1ah";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
@@ -108402,6 +108772,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) R;};
 
+  "inliterate" = callPackage
+    ({ mkDerivation, base, blaze-html, cheapskate, containers
+     , haskell-src-exts, lucid, lucid-extras, plotlyhs, text, time
+     }:
+     mkDerivation {
+       pname = "inliterate";
+       version = "0.1.0";
+       sha256 = "17z3s5w49x8j57v6myz2r6i0knnm60ydg3y8d0v008xrwdjcr5id";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html cheapskate containers haskell-src-exts lucid
+         lucid-extras plotlyhs text time
+       ];
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [ base text ];
+       homepage = "https://github.com/diffusionkinetics/open/inliterate";
+       description = "Interactive literate programming";
+       license = stdenv.lib.licenses.mit;
+       broken = true;
+     }) {lucid-extras = null;};
+
   "inquire" = callPackage
     ({ mkDerivation, aether, base, text }:
      mkDerivation {
@@ -109947,8 +110339,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "2.2.1";
-       sha256 = "1q2j9c2bahdkb4g1sydaz6yyyj98hndyvpxk1q3bf0v20zr7aqpc";
+       version = "2.3.0";
+       sha256 = "08nbdnszdakbam1x0fps3n3ziqv21d8ndhmrc7za69pm97wkicjf";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -111894,8 +112286,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.8.3.2";
-       sha256 = "0xdgqwmjzx47l8rhxdvlwfzfb04bw5j6mahs02cwjdfb1h11m7m4";
+       version = "0.9.0.0";
+       sha256 = "1g61chx063m8n3yvs4z6awmdksvkr0yp5vwd4ffkhl94yczqh0q8";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          deepseq filepath ghc-prim http-types lens primitive process ref-tf
@@ -111906,14 +112298,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jsaddle-clib" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, jsaddle
+     , text
+     }:
+     mkDerivation {
+       pname = "jsaddle-clib";
+       version = "0.9.0.0";
+       sha256 = "10ycmp3pnkh18d8xv44gj392h7xzfmnyl0qkfv0qx0p7pn9vn6zz";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default jsaddle text
+       ];
+       description = "Interface for JavaScript that works with GHCJS and GHC";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "jsaddle-dom" = callPackage
     ({ mkDerivation, base, base-compat, jsaddle, lens, text
      , transformers
      }:
      mkDerivation {
        pname = "jsaddle-dom";
-       version = "0.8.0.0";
-       sha256 = "0l6n6wsy9bqxdh2gjgkp4wvmxdikjziqi748690vz33gdc5qdgi7";
+       version = "0.9.0.0";
+       sha256 = "0yc5m80n3k3l2m429p5icfwk50c6qdfs5h273rgdr9pjb2if5cmm";
        libraryHaskellDepends = [
          base base-compat jsaddle lens text transformers
        ];
@@ -111941,15 +112348,16 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , doctest, filepath, ghc-prim, http-types, jsaddle, lens, network
      , primitive, process, QuickCheck, ref-tf, stm, text, time
-     , transformers, wai, wai-websockets, warp, webdriver, websockets
+     , transformers, uuid, uuid-types, wai, wai-websockets, warp
+     , webdriver, websockets
      }:
      mkDerivation {
        pname = "jsaddle-warp";
-       version = "0.8.3.1";
-       sha256 = "1ylpqyifxinqd23sypxxkqcwigqfcpz8jc8y770qbqy56wjz9nr1";
+       version = "0.9.1.0";
+       sha256 = "0d7q3dr05j81zx13qvl0kxhdmkk9bpka4cc2db8ck4wfnv7nj3yq";
        libraryHaskellDepends = [
-         aeson base containers http-types jsaddle stm text time transformers
-         wai wai-websockets warp websockets
+         aeson base bytestring containers http-types jsaddle stm text time
+         transformers uuid uuid-types wai wai-websockets warp websockets
        ];
        testHaskellDepends = [
          aeson base bytestring containers deepseq doctest filepath ghc-prim
@@ -111969,8 +112377,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkit2gtk";
-       version = "0.8.3.1";
-       sha256 = "0kdr69m1j5dvn2pbjkxx52q9jjcrs4ssn1lwqcf8myb1hrj2rjw3";
+       version = "0.9.0.0";
+       sha256 = "1qrrvfr9ha5v43940ppdf3ngrig1s324482aaxsnpj2s7jxmqsa6";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-gio gi-glib gi-gtk
          gi-javascriptcore gi-webkit2 haskell-gi-base jsaddle text unix
@@ -111988,8 +112396,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle-webkitgtk";
-       version = "0.8.3.1";
-       sha256 = "1a4b4dbgkzlhz1vl1bhqjaz20cazfs7jcfqddfcb6adb72jnay0d";
+       version = "0.9.0.0";
+       sha256 = "036k7ni5ki1p6f3hxkzyq2nskqxjbdg4kp9j5r2jzphp1cr8r9li";
        libraryHaskellDepends = [
          aeson base bytestring directory gi-glib gi-gtk gi-javascriptcore
          gi-webkit haskell-gi-base jsaddle text unix
@@ -112001,12 +112409,16 @@ self: {
      }) {};
 
   "jsaddle-wkwebview" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, jsaddle }:
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , jsaddle
+     }:
      mkDerivation {
        pname = "jsaddle-wkwebview";
-       version = "0.8.3.2";
-       sha256 = "0a65w5svvj5ncd5dy62zqk520bsf6zmajq7dvsr7gdlfn8s2r59k";
-       libraryHaskellDepends = [ aeson base bytestring jsaddle ];
+       version = "0.9.0.0";
+       sha256 = "1yy7m60h6kcqb97qwhrh3kbxrz981njff2f23x1axfrb2jc3mby4";
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default jsaddle
+       ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113606,6 +114018,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "katip_0_3_1_5" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , bytestring, containers, criterion, deepseq, directory, either
+     , exceptions, hostname, microlens, microlens-th, monad-control, mtl
+     , old-locale, quickcheck-instances, regex-tdfa, resourcet
+     , semigroups, string-conv, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, time
+     , time-locale-compat, transformers, transformers-base
+     , transformers-compat, unagi-chan, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "katip";
+       version = "0.3.1.5";
+       sha256 = "1mnrs6ji7bqh9lrb9bzcxb4c1a60mzf8xkzgk6yi8ijxxv5ch8zn";
+       libraryHaskellDepends = [
+         aeson async auto-update base bytestring containers either
+         exceptions hostname microlens microlens-th monad-control mtl
+         old-locale resourcet semigroups string-conv template-haskell text
+         time transformers transformers-base transformers-compat unagi-chan
+         unix unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory microlens quickcheck-instances
+         regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
+         template-haskell text time time-locale-compat unordered-containers
+       ];
+       benchmarkHaskellDepends = [
+         aeson async base blaze-builder criterion deepseq text time
+         transformers unix
+       ];
+       homepage = "https://github.com/Soostone/katip";
+       description = "A structured logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "katip-elasticsearch" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, containers
      , criterion, deepseq, enclosed-exceptions, exceptions, http-client
@@ -116440,6 +116888,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-javascript_0_6_0_10" = callPackage
+    ({ mkDerivation, alex, array, base, blaze-builder, bytestring
+     , Cabal, containers, happy, hspec, mtl, QuickCheck, text
+     , utf8-light, utf8-string
+     }:
+     mkDerivation {
+       pname = "language-javascript";
+       version = "0.6.0.10";
+       sha256 = "0m1yk0v4myzjjv3czhavwlsgzp8ffpmbkwks97d3yipl1d0lrwfa";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring containers mtl text utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         array base blaze-builder bytestring Cabal containers hspec mtl
+         QuickCheck utf8-light utf8-string
+       ];
+       homepage = "https://github.com/erikd/language-javascript";
+       description = "Parser for JavaScript";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-kort" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, QuickCheck
      , random, razom-text-util, regex-applicative, smaoin, text
@@ -116988,8 +117459,8 @@ self: {
      }:
      mkDerivation {
        pname = "latex-formulae-hakyll";
-       version = "0.2.0.2";
-       sha256 = "0rdv74y5wlhw28kv8l09p1dvhbkgxz5v9fa9hgnlx1h9miz3lwl2";
+       version = "0.2.0.3";
+       sha256 = "0mdfisdcsbr4q74h6zkrs6pacc2pxhq0dwh31jahpix5p8a07psn";
        libraryHaskellDepends = [
          base hakyll latex-formulae-image latex-formulae-pandoc lrucache
          pandoc-types
@@ -117006,8 +117477,8 @@ self: {
      }:
      mkDerivation {
        pname = "latex-formulae-image";
-       version = "0.1.1.2";
-       sha256 = "03czy9sbj5r04758jzlxy0zycnb81hjgmsfadwm9kxzf6crgmwcj";
+       version = "0.1.1.3";
+       sha256 = "0qf4906n0vs231hiyq6lxck5h5k0gkp9fsn3b0apx94akhr6v0zh";
        libraryHaskellDepends = [
          base directory errors filepath JuicyPixels process temporary
          transformers
@@ -117024,8 +117495,8 @@ self: {
      }:
      mkDerivation {
        pname = "latex-formulae-pandoc";
-       version = "0.2.0.4";
-       sha256 = "0cl3xk8cbvwb44w71q56p2rvqw2akdwjdh27qcd67wdryjlkn0bn";
+       version = "0.2.0.5";
+       sha256 = "023l02qlzhxkxkccbqlkhfipgis0657vpn8h6c6hdbc0cnl7cpg6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117856,7 +118327,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens_4_15_2" = callPackage
+  "lens_4_15_3" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , Cabal, cabal-doctest, comonad, containers, contravariant
      , criterion, deepseq, directory, distributive, doctest, exceptions
@@ -117864,20 +118335,22 @@ self: {
      , HUnit, kan-extensions, mtl, nats, parallel, profunctors
      , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
      , tagged, template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text, transformers
-     , transformers-compat, unordered-containers, vector, void
+     , test-framework-quickcheck2, test-framework-th, text
+     , th-abstraction, transformers, transformers-compat
+     , unordered-containers, vector, void
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.15.2";
-       sha256 = "0anpihgq8sk07raryskwy9lc83wy61gjzhvvrg50bkkj0mjmc5av";
+       version = "4.15.3";
+       sha256 = "0znd63nkpdndpdgpvcwnqm31v4w2d1ipkj8lnnbsabbrhywknqd2";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
          hashable kan-extensions mtl parallel profunctors reflection
-         semigroupoids semigroups tagged template-haskell text transformers
-         transformers-compat unordered-containers vector void
+         semigroupoids semigroups tagged template-haskell text
+         th-abstraction transformers transformers-compat
+         unordered-containers vector void
        ];
        testHaskellDepends = [
          base bytestring containers deepseq directory doctest filepath
@@ -120299,7 +120772,7 @@ self: {
        ];
        description = "Labeled File System interface for LIO";
        license = "GPL";
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lio-simple" = callPackage
@@ -120837,6 +121310,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "liveplot" = callPackage
+    ({ mkDerivation, andromeda, base, bytestring, containers, directory
+     , filepath, GLFW-b, GLUtil, lens, linear, mvc, OpenGL, pipes
+     , pipes-extras, pipes-misc, stm, time, transformers, Vec, vector
+     , vinyl, vinyl-gl
+     }:
+     mkDerivation {
+       pname = "liveplot";
+       version = "0.0.1";
+       sha256 = "1gqbw6r0vpj18ks7xhzcalkfcl13cjx50s3w5p5f3kn63wihh197";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         andromeda base bytestring containers directory filepath GLFW-b
+         GLUtil lens linear mvc OpenGL pipes pipes-extras pipes-misc stm
+         time transformers Vec vector vinyl vinyl-gl
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Liveplotting";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {andromeda = null;};
+
   "ll-picosat" = callPackage
     ({ mkDerivation, base, picosat }:
      mkDerivation {
@@ -121510,8 +122006,8 @@ self: {
     ({ mkDerivation, base, monad-logger, text }:
      mkDerivation {
        pname = "located-monad-logger";
-       version = "0.1.0.0";
-       sha256 = "07azkz4zw0a8x3mld185knyg2rl0hz2zx67sgj0mpnh3m57q1dds";
+       version = "0.1.1.0";
+       sha256 = "1xkckg3qgqrqmkli9d6cbzqf5aanqpbxchy650yflpjygwapn4xn";
        libraryHaskellDepends = [ base monad-logger text ];
        homepage = "https://github.com/MailOnline/located-monad-logger#readme";
        description = "Location-aware logging without Template Haskell";
@@ -122655,6 +123151,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "loup" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
+     , conduit, lifted-async, monad-control, optparse-generic, preamble
+     , shakers, time, turtle, uuid, yaml
+     }:
+     mkDerivation {
+       pname = "loup";
+       version = "0.0.2";
+       sha256 = "1lfa20m67zncn9dpbbrdjq3qbv6qn2h1qb1iy0b5npan9sd85r5z";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-swf base bytestring conduit lifted-async
+         monad-control preamble time turtle uuid yaml
+       ];
+       executableHaskellDepends = [ base optparse-generic shakers ];
+       homepage = "https://github.com/swift-nav/loup";
+       description = "Amazon Simple Workflow Service Wrapper for Work Pools";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lowgl" = callPackage
     ({ mkDerivation, base, gl, linear, vector }:
      mkDerivation {
@@ -123588,6 +124105,17 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "machines-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, machines }:
+     mkDerivation {
+       pname = "machines-bytestring";
+       version = "0.1.0.0";
+       sha256 = "1rlc5pr70z899zjs2q5p7qy5pm9gjpnm9pww934cxmlwrp1sck9b";
+       libraryHaskellDepends = [ base bytestring machines ];
+       description = "ByteString support for machines";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "machines-directory" = callPackage
     ({ mkDerivation, base, directory, filepath, machines, machines-io
      , transformers
@@ -123924,8 +124452,8 @@ self: {
      }:
      mkDerivation {
        pname = "mailchimp";
-       version = "0.2.1";
-       sha256 = "0hwgxqcwk677497pnhxl2z8d8vgw8b6v53ydkik6sapv10xqr5z2";
+       version = "0.3.0";
+       sha256 = "0s5v75mcvhbki7kl60cpwlxfzcjbc65lxdasm7zwb6agywyx5080";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring generics-sop http-client
          http-client-tls servant servant-client text transformers
@@ -126667,6 +127195,8 @@ self: {
        pname = "memory";
        version = "0.14.5";
        sha256 = "01d1bg8pkhw9mpyd7nm5zzpqv9kh9cj2fkd2ywvkay7np2r14820";
+       revision = "1";
+       editedCabalFile = "01g68h3r1h15rrbfsbbk0195fyn93x256j8xwzlb11074sdwr0gy";
        libraryHaskellDepends = [
          base bytestring deepseq foundation ghc-prim
        ];
@@ -126676,6 +127206,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memory_0_14_6" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "memory";
+       version = "0.14.6";
+       sha256 = "0q61zxdlgcw7wg244hb3c11qm5agrmnmln0h61sz2mj72xqc1pn7";
+       libraryHaskellDepends = [
+         base bytestring deepseq foundation ghc-prim
+       ];
+       testHaskellDepends = [
+         base foundation tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/vincenthz/hs-memory";
+       description = "memory and related abstraction stuff";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "memorypool" = callPackage
     ({ mkDerivation, base, containers, transformers, unsafe, vector }:
      mkDerivation {
@@ -126704,6 +127254,31 @@ self: {
        license = "GPL";
      }) {};
 
+  "mercury-api" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory
+     , hashable, HUnit, optparse-applicative, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "mercury-api";
+       version = "0.1.0.0";
+       sha256 = "0pyrfwl0jzm8v25aviqflfw4q95hlkq9n6ps44shzb9l0bm5zls1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring clock hashable text
+         unordered-containers
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base bytestring directory HUnit optparse-applicative text
+       ];
+       homepage = "https://github.com/ppelleti/hs-mercury-api";
+       description = "Haskell binding to Mercury API for ThingMagic RFID readers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "merge-bash-history" = callPackage
     ({ mkDerivation, attoparsec, base, data-ordlist, errors
      , optparse-applicative, text
@@ -127368,7 +127943,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midi-music-box" = callPackage
@@ -128313,6 +128888,8 @@ self: {
        pname = "mmorph";
        version = "1.1.0";
        sha256 = "1pklvg28hjfsq5r66x4igjrxbdq0l74g6lirrvsh6ckmc1av9g61";
+       revision = "1";
+       editedCabalFile = "0ppf6icblgrmiaa09s2plg1m2818pp2l9rd7c821q0zq266v79wi";
        libraryHaskellDepends = [
          base mtl transformers transformers-compat
        ];
@@ -130332,6 +130909,8 @@ self: {
        pname = "monoid-subclasses";
        version = "0.4.3.1";
        sha256 = "1kc34w94w59vd3s4ird0mwksv9gqwmb4d4m2gld6155n2rwx0w51";
+       revision = "1";
+       editedCabalFile = "1fplps682kir8phq2fkzrnbp8qf9i29rgikg47wc5diw70g2wy26";
        libraryHaskellDepends = [
          base bytestring containers primes text vector
        ];
@@ -132958,6 +133537,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "n-tuple" = callPackage
+    ({ mkDerivation, base, singletons, vector }:
+     mkDerivation {
+       pname = "n-tuple";
+       version = "0.0.1.1";
+       sha256 = "1pwz4rs0bbanhlwcm7v06s4dkwr3h41w203kab1s7k201na7j9r1";
+       libraryHaskellDepends = [ base singletons vector ];
+       homepage = "https://github.com/athanclark/n-tuple#readme";
+       description = "Homogeneous tuples of arbitrary length";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nagios-check" = callPackage
     ({ mkDerivation, base, bifunctors, exceptions, hspec, mtl
      , QuickCheck, text
@@ -134304,23 +134895,6 @@ self: {
      }) {};
 
   "network" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
-     , test-framework-hunit, unix
-     }:
-     mkDerivation {
-       pname = "network";
-       version = "2.6.3.1";
-       sha256 = "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p";
-       libraryHaskellDepends = [ base bytestring unix ];
-       testHaskellDepends = [
-         base bytestring doctest HUnit test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/haskell/network";
-       description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network_2_6_3_2" = callPackage
     ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
      , test-framework-hunit, unix
      }:
@@ -134337,7 +134911,6 @@ self: {
        homepage = "https://github.com/haskell/network";
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-address" = callPackage
@@ -135178,6 +135751,8 @@ self: {
        pname = "network-uri";
        version = "2.6.1.0";
        sha256 = "1w27zkvn39kjr9lmw9421y8w43h572ycsfafsb7kyvr3a4ihlgj2";
+       revision = "1";
+       editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32";
        libraryHaskellDepends = [ base deepseq parsec ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -135614,6 +136189,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nice-html" = callPackage
+    ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup
+     , bytestring, criterion, data-default-class, deepseq, free, lucid
+     , pretty-show, recursion-schemes, template-haskell, text
+     , transformers, vector, weigh
+     }:
+     mkDerivation {
+       pname = "nice-html";
+       version = "0.2.0";
+       sha256 = "0lkqqfp6x3w9lxh1jgm6c07pyfz1yr7drkr15s1m9vwvdh7mj24v";
+       libraryHaskellDepends = [
+         base bifunctors blaze-markup bytestring data-default-class deepseq
+         free recursion-schemes template-haskell text transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html blaze-markup bytestring criterion lucid pretty-show
+         text weigh
+       ];
+       homepage = "https://github.com/mikeplus64/nice-html#readme";
+       description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "nicify" = callPackage
     ({ mkDerivation, base, nicify-lib }:
      mkDerivation {
@@ -136153,8 +136751,8 @@ self: {
     ({ mkDerivation, base, checkers, QuickCheck }:
      mkDerivation {
        pname = "non-empty-zipper";
-       version = "0.1.0.7";
-       sha256 = "1zl1l3yjkwbk693p5y6svgv6hrpbipphcmjb5lxbyig0zfc0r13b";
+       version = "0.1.0.8";
+       sha256 = "0fyq9x0x04pv45v73mkc273ih5kd9ac40psr00zva58n352f9az9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
@@ -136292,6 +136890,8 @@ self: {
        pname = "normalization-insensitive";
        version = "2.0.0.1";
        sha256 = "178hipiqlkqjp88wivid1jyg718mb38i5731zggfp9misbpj5y8p";
+       revision = "1";
+       editedCabalFile = "0hp6v44slmxa3i6cs68ffa5wlkd4bj695l1fh058mhi64bhvql8x";
        libraryHaskellDepends = [
          base bytestring deepseq hashable text unicode-transforms
        ];
@@ -138781,6 +139381,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "openweathermap" = callPackage
+    ({ mkDerivation, aeson, base, directory, http-client
+     , optparse-applicative, servant, servant-client, xdg-basedir
+     }:
+     mkDerivation {
+       pname = "openweathermap";
+       version = "0.0.0";
+       sha256 = "1ndd54pwbgkk10ah6125hgs8gn6l2bzz2r0mkc2f30y90m8mr7ll";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base http-client servant servant-client
+       ];
+       executableHaskellDepends = [
+         base directory optparse-applicative xdg-basedir
+       ];
+       description = "Access data at OpenWeatherMap";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "operate-do" = callPackage
     ({ mkDerivation, base, charset, doctest, filemanip
      , haskell-src-meta, hspec, QuickCheck, template-haskell
@@ -139090,6 +139710,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optparse-applicative_0_14_0_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
+     , QuickCheck, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "optparse-applicative";
+       version = "0.14.0.0";
+       sha256 = "06iwp1qsq0gjhnhxwyhdhldwvhlgcik6lx5jxpbb40fispyk4nxm";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base process transformers transformers-compat
+       ];
+       testHaskellDepends = [ base bytestring QuickCheck ];
+       homepage = "https://github.com/pcapriotti/optparse-applicative";
+       description = "Utilities and combinators for parsing command line options";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "optparse-applicative-simple" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-data, base-prelude
      , optparse-applicative, rerebase, text
@@ -139912,6 +140550,8 @@ self: {
        pname = "packunused";
        version = "0.1.2";
        sha256 = "0ijlpdmsjb4rh94rcamxdg69xrza0s5clv3ipf2h3rgnidbgznfk";
+       revision = "1";
+       editedCabalFile = "1mzjb3bkxxfy19zwcpdh96n8c28vb1ml19zjpgvyirf0qi6rz6m7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -140113,7 +140753,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) pam;};
 
   "panda" = callPackage
@@ -140223,6 +140863,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_10_5_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hs-bibutils, mtl
+     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.10.5.1";
+       sha256 = "10x7rpz48611696fw7h9m62qm1y9qxzvrc2jk0b9h840mn08n0s9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath mtl pandoc pandoc-types
+         process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -141699,6 +142373,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parsers_0_12_5" = callPackage
+    ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal
+     , cabal-doctest, charset, containers, directory, doctest, filepath
+     , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "parsers";
+       version = "0.12.5";
+       sha256 = "1azwy5wfjv75kjwcyrglq70dmc8f6a091bgyv0wsls4f5zv0qb3k";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         attoparsec base base-orphans charset containers mtl parsec
+         scientific text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers directory doctest filepath
+         parsec QuickCheck quickcheck-instances
+       ];
+       homepage = "http://github.com/ekmett/parsers/";
+       description = "Parsing combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parsestar" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, bytestring-mmap
      , bytestring-nums, bytestring-show, containers, deepseq, derive
@@ -142068,6 +142767,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path-io_1_3_0" = callPackage
+    ({ mkDerivation, base, containers, directory, exceptions, filepath
+     , hspec, path, temporary, time, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "1.3.0";
+       sha256 = "1s3rkhfqcrnb3yalwlzd6ldvqlvwgf0h8yzc85l5gld8mwjs2lif";
+       libraryHaskellDepends = [
+         base containers directory exceptions filepath path temporary time
+         transformers unix-compat
+       ];
+       testHaskellDepends = [
+         base exceptions hspec path transformers unix-compat
+       ];
+       homepage = "https://github.com/mrkkrp/path-io";
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-pieces" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -144601,6 +145321,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pinch_0_3_2_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "pinch";
+       version = "0.3.2.0";
+       sha256 = "0r0pxdhzlmfg8h13fi10bvy1wxvsk1ckzzlcxbpg6zrly9n0z4m1";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq ghc-prim hashable text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec hspec-discover QuickCheck text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/abhinav/pinch#readme";
+       description = "An alternative implementation of Thrift for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinchot" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, pretty-show
      , semigroups, template-haskell, transformers
@@ -145075,22 +145818,6 @@ self: {
      }) {};
 
   "pipes-extras" = callPackage
-    ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
-     , test-framework-hunit, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-extras";
-       version = "1.0.9";
-       sha256 = "0irdf86i83nprymc276jcc7zng1c8nqzf7ksnd1jmrsp6v2r488h";
-       libraryHaskellDepends = [ base foldl pipes transformers ];
-       testHaskellDepends = [
-         base HUnit pipes test-framework test-framework-hunit transformers
-       ];
-       description = "Extra utilities for pipes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-extras_1_0_10" = callPackage
     ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
      , test-framework-hunit, transformers
      }:
@@ -145104,7 +145831,6 @@ self: {
        ];
        description = "Extra utilities for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-fastx" = callPackage
@@ -149060,27 +149786,24 @@ self: {
   "prettyprinter" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, criterion
      , doctest, mtl, pgp-wordlist, QuickCheck, random, tasty
-     , tasty-quickcheck, template-haskell, text, transformers
+     , tasty-hunit, tasty-quickcheck, text, transformers
      }:
      mkDerivation {
        pname = "prettyprinter";
-       version = "1";
-       sha256 = "00l4ax9h7b761474vvb2fv3mqs3nfy752ypzhmv8pnqzqb3mhlrf";
-       revision = "1";
-       editedCabalFile = "19rdsvym1kch6v7jfgn4358fd1k28smpi1sd21lhi61561rcb727";
+       version = "1.1";
+       sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
-       executableHaskellDepends = [ base template-haskell text ];
        testHaskellDepends = [
-         base bytestring doctest pgp-wordlist QuickCheck tasty
+         base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit
          tasty-quickcheck text
        ];
        benchmarkHaskellDepends = [
          ansi-wl-pprint base criterion mtl random text transformers
        ];
        homepage = "http://github.com/quchen/prettyprinter";
-       description = "A modern, extensible and well-documented prettyprinter";
+       description = "A modern, easy to use, well-documented, extensible prettyprinter";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
@@ -149089,14 +149812,14 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter-ansi-terminal";
-       version = "1";
-       sha256 = "0amsc1cdk7h53b3xvrsx79j6w0b64bcih13rriclizk6kqkidjcd";
+       version = "1.0.1";
+       sha256 = "03vdnkvrwmny0y8p7bkw43l8x6a3b39nw20ii87pys4jr7aadd7c";
        revision = "1";
-       editedCabalFile = "0sdgi3sc2nljfdpb9i6l579yjz1blxjl7bw78wf0x1407xmbzkh9";
+       editedCabalFile = "1yc598kz1p4w0whhl7h7b62fx4lcsyph908anscq299w89xp40lh";
        libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
        testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/quchen/prettyprinter";
-       description = "ANSI terminal backend for the modern, extensible and well-documented prettyprinter";
+       description = "ANSI terminal backend for the »prettyprinter« package";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
@@ -149106,8 +149829,8 @@ self: {
        pname = "prettyprinter-compat-annotated-wl-pprint";
        version = "1";
        sha256 = "0zpmpbpnyxqswfb7gdj0kwz7hw606fj1iwkpl1qv0xcxk6n9n99c";
-       revision = "1";
-       editedCabalFile = "17r1vqpri6031q7l5gvl4v0r5yrjmb0c44l6rwwg1xnvlsa81x1x";
+       revision = "2";
+       editedCabalFile = "175bchsbx8vws1gx83z9f0l30p95353l0gyds5b0k5b5sj4fzw13";
        libraryHaskellDepends = [ base prettyprinter text ];
        homepage = "http://github.com/quchen/prettyprinter";
        description = "Prettyprinter compatibility module for previous users of the annotated-wl-pprint package";
@@ -149122,8 +149845,8 @@ self: {
        pname = "prettyprinter-compat-ansi-wl-pprint";
        version = "1";
        sha256 = "1w84df99n1fwzwyflfjh6bsbrv03yzdsq8b42ziqcb3m1mq5hf1v";
-       revision = "1";
-       editedCabalFile = "09igfp6q9lgiaspwmkfm09jvc4d9vwwayfynklq3q5mg87w9lmaf";
+       revision = "2";
+       editedCabalFile = "1bcj2y4b4pj028lllljpj52m622h6rv0qngfyq2xc8jzn7pls5ca";
        libraryHaskellDepends = [
          base prettyprinter prettyprinter-ansi-terminal text
        ];
@@ -149138,14 +149861,25 @@ self: {
        pname = "prettyprinter-compat-wl-pprint";
        version = "1.0.0.1";
        sha256 = "17jj8m9s3cp1s1szpy67g7wni9ssid78jqksh3aym7p6ci81y8km";
-       revision = "1";
-       editedCabalFile = "0dycsmi7pcp3m7qzc6b6r5w9gzj5byb5sxk6x6rciq1bhh1n6bz6";
+       revision = "2";
+       editedCabalFile = "0j495j9crv6qi7rq044x6bx8688zqybx5w02cbv54w208ii1pzcl";
        libraryHaskellDepends = [ base prettyprinter text ];
        homepage = "http://github.com/quchen/prettyprinter";
        description = "Prettyprinter compatibility module for previous users of the wl-pprint package";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "prettyprinter-vty" = callPackage
+    ({ mkDerivation, base, prettyprinter, vty }:
+     mkDerivation {
+       pname = "prettyprinter-vty";
+       version = "0.1.0.0";
+       sha256 = "12nj0v9p5bjbhwmkknc2ybdw52m5hngnf7c53qfi3crbrx4maxrd";
+       libraryHaskellDepends = [ base prettyprinter vty ];
+       description = "prettyprinter backend for vty";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "prim-spoon" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck
      , spoon
@@ -149860,6 +150594,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "profiterole" = callPackage
+    ({ mkDerivation, base, containers, directory, extra, filepath
+     , ghc-prof, hashable, scientific, text
+     }:
+     mkDerivation {
+       pname = "profiterole";
+       version = "0.1";
+       sha256 = "1wfj8rmcablya94shhrnx2dbk3pfbhvdv6mk6946fyjfy32di266";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers directory extra filepath ghc-prof hashable
+         scientific text
+       ];
+       homepage = "https://github.com/ndmitchell/profiterole#readme";
+       description = "Restructure GHC profile reports";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "profiteur" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , ghc-prof, js-jquery, scientific, text, unordered-containers
@@ -150246,25 +150999,25 @@ self: {
 
   "propellor" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , directory, exceptions, filepath, hslogger, IfElse, MissingH, mtl
-     , network, process, stm, text, time, transformers, unix
+     , directory, exceptions, filepath, hashable, hslogger, IfElse, mtl
+     , network, process, split, stm, text, time, transformers, unix
      , unix-compat
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.0.3";
-       sha256 = "15p0jv777dgsljp8qb2nz7flhavk9ycbhxxv0nnrsj3ksjdmpldk";
+       version = "4.0.4";
+       sha256 = "0h69g079zrv9rnq0rb6d1j323rb310qmal109ma8ss50m5f4gyiq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal async base bytestring containers directory exceptions
-         filepath hslogger IfElse MissingH mtl network process stm text time
-         transformers unix unix-compat
+         filepath hashable hslogger IfElse mtl network process split stm
+         text time transformers unix unix-compat
        ];
        executableHaskellDepends = [
          ansi-terminal async base bytestring containers directory exceptions
-         filepath hslogger IfElse MissingH mtl network process stm text time
-         transformers unix unix-compat
+         filepath hashable hslogger IfElse mtl network process split stm
+         text time transformers unix unix-compat
        ];
        homepage = "https://propellor.branchable.com/";
        description = "property-based host configuration management in haskell";
@@ -150384,6 +151137,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens_0_2_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default-class, lens-family, parsec, pretty, text
+     , transformers, void
+     }:
+     mkDerivation {
+       pname = "proto-lens";
+       version = "0.2.1.0";
+       sha256 = "1nibz7cqlwj0vp350km80df10330s2hqvhwr36liiqc92ghphvzg";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers data-default-class
+         lens-family parsec pretty text transformers void
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "A lens-based implementation of protocol buffers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-arbitrary" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
@@ -150424,6 +151196,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-combinators_0_1_0_7" = callPackage
+    ({ mkDerivation, base, Cabal, data-default-class, HUnit
+     , lens-family, lens-family-core, proto-lens, proto-lens-protoc
+     , test-framework, test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "proto-lens-combinators";
+       version = "0.1.0.7";
+       sha256 = "0c00ipxpyqizzgd3fg0hfqs1bqypah90zysjb0c4pl5hhaqi9bak";
+       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       libraryHaskellDepends = [
+         base data-default-class lens-family proto-lens proto-lens-protoc
+         transformers
+       ];
+       testHaskellDepends = [
+         base HUnit lens-family lens-family-core proto-lens
+         proto-lens-protoc test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Utilities functions to proto-lens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-descriptors" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , lens-family, lens-labels, proto-lens, text
@@ -150440,6 +151236,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-descriptors_0_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , lens-family, lens-labels, proto-lens, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-descriptors";
+       version = "0.2.1.0";
+       sha256 = "1qaprwdxck8h06wha6hp94kia5m247bc73973rz870c7hk2pdh6s";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class lens-family
+         lens-labels proto-lens text
+       ];
+       description = "Protocol buffers for describing the definitions of messages";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-optparse" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
@@ -150455,6 +151268,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-protobuf-types" = callPackage
+    ({ mkDerivation, base, Cabal, proto-lens-protoc }:
+     mkDerivation {
+       pname = "proto-lens-protobuf-types";
+       version = "0.2.1.0";
+       sha256 = "1x548hpl7yaqx9y2hdw5p8fc6lmxihlv2wam2x7c03zjkibb04y9";
+       setupHaskellDepends = [ base Cabal proto-lens-protoc ];
+       libraryHaskellDepends = [ proto-lens-protoc ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Basic protocol buffer message types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "proto-lens-protoc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, directory, filepath, haskell-src-exts
@@ -150481,6 +151307,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-protoc_0_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers
+     , data-default-class, directory, filepath, haskell-src-exts
+     , lens-family, lens-labels, process, proto-lens
+     , proto-lens-descriptors, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-protoc";
+       version = "0.2.1.0";
+       sha256 = "0ywjn4px6sj82h53yzx466gsa42cgfg47w5vzvxfbdzqk4bskfdd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers data-default-class directory
+         filepath haskell-src-exts lens-family lens-labels process
+         proto-lens proto-lens-descriptors text
+       ];
+       executableHaskellDepends = [
+         base bytestring containers data-default-class filepath
+         haskell-src-exts lens-family proto-lens proto-lens-descriptors text
+       ];
+       description = "Protocol buffer compiler for the proto-lens library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protobuf" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
      , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
@@ -151370,14 +152222,15 @@ self: {
      , monad-control, monad-logger, mtl, network, optparse-applicative
      , parallel, parsec, pattern-arrows, pipes, pipes-http, process
      , protolude, regex-tdfa, safe, scientific, semigroups, silently
-     , sourcemap, spdx, split, stm, syb, text, time, transformers
-     , transformers-base, transformers-compat, unordered-containers
-     , utf8-string, vector, wai, wai-websockets, warp, websockets
+     , sourcemap, spdx, split, stm, stringsearch, syb, text, time
+     , transformers, transformers-base, transformers-compat
+     , unordered-containers, utf8-string, vector, wai, wai-websockets
+     , warp, websockets
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.11.4";
-       sha256 = "014dmfaw79bqypmp8kdnhv4zrdhlj37xmd1pldv52r1r3108vpwq";
+       version = "0.11.5";
+       sha256 = "1yqfgmxb8210dzffg4img8f2nzfvys3g583j2948lj03y9q170y1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -151387,8 +152240,8 @@ self: {
          fsnotify Glob haskeline http-client http-types language-javascript
          lens lifted-base monad-control monad-logger mtl parallel parsec
          pattern-arrows pipes pipes-http process protolude regex-tdfa safe
-         scientific semigroups sourcemap spdx split stm syb text time
-         transformers transformers-base transformers-compat
+         scientific semigroups sourcemap spdx split stm stringsearch syb
+         text time transformers transformers-base transformers-compat
          unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
@@ -151399,8 +152252,8 @@ self: {
          http-types language-javascript lens lifted-base monad-control
          monad-logger mtl network optparse-applicative parallel parsec
          pattern-arrows pipes pipes-http process protolude regex-tdfa safe
-         scientific semigroups sourcemap spdx split stm syb text time
-         transformers transformers-base transformers-compat
+         scientific semigroups sourcemap spdx split stm stringsearch syb
+         text time transformers transformers-base transformers-compat
          unordered-containers utf8-string vector wai wai-websockets warp
          websockets
        ];
@@ -151412,7 +152265,7 @@ self: {
          HUnit language-javascript lens lifted-base monad-control
          monad-logger mtl parallel parsec pattern-arrows pipes pipes-http
          process protolude regex-tdfa safe scientific semigroups silently
-         sourcemap spdx split stm syb text time transformers
+         sourcemap spdx split stm stringsearch syb text time transformers
          transformers-base transformers-compat unordered-containers
          utf8-string vector
        ];
@@ -152599,6 +153452,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-instances_0_3_14" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive
+     , containers, hashable, old-time, QuickCheck, scientific, tagged
+     , text, time, unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "quickcheck-instances";
+       version = "0.3.14";
+       sha256 = "1mq9zg7d0h275lhwqjq5z2hs4ql4v13q7c8x5n6rhp47rr07pcgr";
+       revision = "1";
+       editedCabalFile = "107xlrf2r0d11c4ig33p5rg3hr8di0mbhnzzvkw0q7ys1ik5v0qn";
+       libraryHaskellDepends = [
+         array base bytestring case-insensitive containers hashable old-time
+         QuickCheck scientific tagged text time unordered-containers
+         uuid-types vector
+       ];
+       testHaskellDepends = [
+         base containers QuickCheck tagged uuid-types
+       ];
+       homepage = "https://github.com/phadej/qc-instances";
+       description = "Common quickcheck instances";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-io" = callPackage
     ({ mkDerivation, base, HUnit, QuickCheck }:
      mkDerivation {
@@ -152771,6 +153649,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickcheck-state-machine" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, constraints, containers
+     , hspec, mtl, parallel-io, QuickCheck, random, singletons, stm
+     }:
+     mkDerivation {
+       pname = "quickcheck-state-machine";
+       version = "0.0.0";
+       sha256 = "0022zqwncc263dcvcck06faqxqyqq2vj57zbnqk63hjpikghkk9d";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base constraints containers mtl parallel-io
+         QuickCheck random singletons stm
+       ];
+       testHaskellDepends = [ base hspec mtl QuickCheck random ];
+       homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme";
+       description = "Test monadic programs using state machine based models";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quickcheck-string-random" = callPackage
     ({ mkDerivation, base, QuickCheck, string-random, tasty
      , tasty-quickcheck, text
@@ -156518,8 +157414,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex";
-       version = "1.0.0.0";
-       sha256 = "0rl7dkynr42y43akd2r4nf1gzj5vr9alv85n1ii0pw8wpij9a0lp";
+       version = "1.0.1.0";
+       sha256 = "1kh4bh1yvpclx5f903pig034b2sjkvm3ijsrwmdh94ws9h0fdc9p";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable regex-base
          regex-tdfa regex-tdfa-text template-haskell text time
@@ -156531,6 +157427,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "regex_1_0_1_3" = callPackage
+    ({ mkDerivation, array, base, base-compat, bytestring, containers
+     , hashable, regex-base, regex-pcre-builtin, regex-tdfa
+     , regex-tdfa-text, template-haskell, text, time, time-locale-compat
+     , transformers, unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "regex";
+       version = "1.0.1.3";
+       sha256 = "1sjkpkgv4phy5b5v2lr89x4vx4dh44pj0sbvlsp6n86w9v6v4jwb";
+       libraryHaskellDepends = [
+         array base base-compat bytestring containers hashable regex-base
+         regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
+         time time-locale-compat transformers unordered-containers
+         utf8-string
+       ];
+       homepage = "http://regex.uk";
+       description = "Toolkit for regex-base";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "regex-applicative" = callPackage
     ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
@@ -156667,32 +157585,35 @@ self: {
      }) {};
 
   "regex-examples" = callPackage
-    ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , directory, filepath, hashable, heredoc, http-conduit, regex
-     , regex-base, regex-pcre-builtin, regex-tdfa, regex-tdfa-text
-     , regex-with-pcre, shelly, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, template-haskell, text, time
+    ({ mkDerivation, array, base, base-compat, blaze-html, bytestring
+     , containers, data-default, directory, filepath, hashable, heredoc
+     , http-conduit, regex, regex-base, regex-pcre-builtin, regex-tdfa
+     , regex-tdfa-text, regex-with-pcre, shelly, smallcheck, tasty
+     , tasty-hunit, tasty-smallcheck, template-haskell, text, time
      , time-locale-compat, transformers, unordered-containers
+     , utf8-string
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "1.0.0.0";
-       sha256 = "035yb8pxxhfxlr23b6fg4ls7vr23hc4ja1hms8crx5mq8fj97al8";
+       version = "1.0.1.3";
+       sha256 = "0hmpq8w08n0vslnzqn6zsxp622dipg0ma42b4d47rjnv9ihl0jad";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base base-compat bytestring containers directory filepath
-         hashable heredoc http-conduit regex regex-base regex-pcre-builtin
-         regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty
-         tasty-hunit tasty-smallcheck template-haskell text time
-         time-locale-compat transformers unordered-containers
+         array base base-compat blaze-html bytestring containers
+         data-default directory filepath hashable heredoc http-conduit regex
+         regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
+         regex-with-pcre shelly smallcheck tasty tasty-hunit
+         tasty-smallcheck template-haskell text time time-locale-compat
+         transformers unordered-containers utf8-string
        ];
        testHaskellDepends = [
-         array base base-compat bytestring containers directory filepath
-         hashable heredoc http-conduit regex regex-base regex-pcre-builtin
-         regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty
-         tasty-hunit tasty-smallcheck template-haskell text time
-         time-locale-compat transformers unordered-containers
+         array base base-compat blaze-html bytestring containers
+         data-default directory filepath hashable heredoc http-conduit regex
+         regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
+         regex-with-pcre shelly smallcheck tasty tasty-hunit
+         tasty-smallcheck template-haskell text time time-locale-compat
+         transformers unordered-containers utf8-string
        ];
        homepage = "http://regex.uk";
        description = "Tutorial, tests and example programs for regex";
@@ -156764,6 +157685,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-pcre-text" = callPackage
+    ({ mkDerivation, array, base, bytestring, regex-base
+     , regex-pcre-builtin, regex-tdfa-text, text
+     }:
+     mkDerivation {
+       pname = "regex-pcre-text";
+       version = "0.94.0.1";
+       sha256 = "1gg9v3q05j2wdp93iragg7y5414ydz0zmkm0xyrcz98dn3bix68p";
+       libraryHaskellDepends = [
+         array base bytestring regex-base regex-pcre-builtin regex-tdfa-text
+         text
+       ];
+       homepage = "https://github.com/cdornan/regex-pcre-text";
+       description = "Text-based PCRE API for regex-base";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-pderiv" = callPackage
     ({ mkDerivation, base, bitset, bytestring, containers, deepseq
      , ghc-prim, mtl, parallel, parsec, regex-base
@@ -156950,17 +157888,37 @@ self: {
 
   "regex-with-pcre" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, regex
-     , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell
-     , transformers, unordered-containers
+     , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa
+     , template-haskell, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "regex-with-pcre";
-       version = "1.0.0.0";
-       sha256 = "1dggagagy7c8gkl7bmfpfyvkgsp5f5g7df028a9lrgxky54jdfv7";
+       version = "1.0.1.0";
+       sha256 = "0r7fqh9mkbjdf21m9m1j9s21h27c1cm2xcmb3j1ai9ga7jhl4864";
        libraryHaskellDepends = [
          base base-compat bytestring containers regex regex-base
-         regex-pcre-builtin regex-tdfa template-haskell transformers
-         unordered-containers
+         regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
+         transformers unordered-containers
+       ];
+       homepage = "http://regex.uk";
+       description = "Toolkit for regex-base";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "regex-with-pcre_1_0_1_3" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, containers, regex
+     , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa
+     , template-haskell, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "regex-with-pcre";
+       version = "1.0.1.3";
+       sha256 = "17pq70wiyq97rh6ba1zsl6rzifi8k5mykn6kwwxcvjqqs9n2nzh9";
+       libraryHaskellDepends = [
+         base base-compat bytestring containers regex regex-base
+         regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
+         transformers unordered-containers
        ];
        homepage = "http://regex.uk";
        description = "Toolkit for regex-base";
@@ -160835,7 +161793,7 @@ self: {
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rtl-sdr;};
 
   "rtnetlink" = callPackage
@@ -160936,7 +161894,7 @@ self: {
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -162814,6 +163772,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_4_15" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
+     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.4.15";
+       sha256 = "1gsmpn3563k90nrai0jdjfvkxjjaxs7bxxsfbdpmw4xvbp2lmp9n";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq ghc-prim hashable
+         integer-gmp integer-logarithms text vector
+       ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/basvandijk/scientific";
+       description = "Numbers represented using scientific notation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scion" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -163547,7 +164530,7 @@ self: {
        executableHaskellDepends = [ base data-default-class sdl2 vector ];
        description = "Bindings to SDL2_mixer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2_mixer;};
 
   "sdl2-ttf" = callPackage
@@ -163566,15 +164549,15 @@ self: {
        executableHaskellDepends = [ base linear sdl2 ];
        description = "Binding to libSDL2-ttf";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
        pname = "sdnv";
-       version = "0.1.0.0";
-       sha256 = "07d7989v4a8dz5jqrhz56ki9wkngaf1d0153271lylj015y00rmc";
+       version = "0.1.1";
+       sha256 = "1hckjr6fprw2y7wb4zz035rnhqj6xs7djnlkhdyzmir9g5xa3cr6";
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Self-delimiting numeric values encoding library";
        license = stdenv.lib.licenses.bsd2;
@@ -164440,8 +165423,8 @@ self: {
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.0.0";
-       sha256 = "0i10wbnyg7bilfb3a1d2p8zzj8yvwljrbll2xwgla5mpcnym9pg9";
+       version = "0.1.1";
+       sha256 = "0gcwwb8w0rr0kjhp13afsszsb81qvnryb5qnhskyr9wpx8vvm9bk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -165174,8 +166157,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-server";
-       version = "0.2.8.0";
-       sha256 = "18z7894nkav1l95mjp9a9xjl5x4v5safg5m88rbnzfg81i16szg7";
+       version = "0.3.0.0";
+       sha256 = "1rs51w929hlwsgrg5ajcv3cp09hnk37p1n5s2ydmja22m4ba93ak";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165311,17 +166294,17 @@ self: {
 
   "servant-auth-token-persistent" = callPackage
     ({ mkDerivation, aeson-injector, base, bytestring, containers
-     , ghc-prim, monad-control, mtl, persistent, persistent-template
+     , monad-control, mtl, persistent, persistent-template
      , servant-auth-token, servant-auth-token-api, servant-server, text
      , time, transformers, transformers-base, uuid
      }:
      mkDerivation {
        pname = "servant-auth-token-persistent";
-       version = "0.5.0.0";
-       sha256 = "1rfl4hv5d6hz18j0yyyrq1i97d30pgngagal9zrmi4l26xsk9li0";
+       version = "0.5.1.0";
+       sha256 = "0kvhk4wd8qdiaqjgs3k8s8jlxhph9jddpgq8caf7yldw6wz2kqi2";
        libraryHaskellDepends = [
-         aeson-injector base bytestring containers ghc-prim monad-control
-         mtl persistent persistent-template servant-auth-token
+         aeson-injector base bytestring containers monad-control mtl
+         persistent persistent-template servant-auth-token
          servant-auth-token-api servant-server text time transformers
          transformers-base uuid
        ];
@@ -166553,6 +167536,88 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-zeppelin" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "servant-zeppelin";
+       version = "0.1.0.3";
+       sha256 = "1pga7l2akxqhkfq6gqaiiz6svvhzb83dbc5bw487kkrs3vriyyc3";
+       libraryHaskellDepends = [ base singletons ];
+       homepage = "https://github.com/martyall/servant-zeppelin#readme";
+       description = "Types and definitions of servant-zeppelin combinators";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-zeppelin-client" = callPackage
+    ({ mkDerivation, aeson, base, data-default-class, hspec
+     , http-client, mtl, QuickCheck, servant, servant-client
+     , servant-server, servant-zeppelin, servant-zeppelin-server
+     , singletons, string-conversions, text, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "servant-zeppelin-client";
+       version = "0.1.0.3";
+       sha256 = "0rycpbwnxnjcf5j0ipy2sf66l4nj1fml16hyd6ga4wd6hcf5277q";
+       libraryHaskellDepends = [
+         aeson base servant servant-client servant-zeppelin singletons text
+       ];
+       testHaskellDepends = [
+         aeson base data-default-class hspec http-client mtl QuickCheck
+         servant servant-client servant-server servant-zeppelin
+         servant-zeppelin-server singletons string-conversions wai-extra
+         warp
+       ];
+       homepage = "https://github.com/martyall/servant-zeppelin#readme";
+       description = "Client library for servant-zeppelin combinators";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-zeppelin-server" = callPackage
+    ({ mkDerivation, aeson, base, hspec, http-client, http-types, lens
+     , lens-aeson, mtl, QuickCheck, servant, servant-server
+     , servant-zeppelin, singletons, string-conversions, text, wai, warp
+     , wreq
+     }:
+     mkDerivation {
+       pname = "servant-zeppelin-server";
+       version = "0.1.0.3";
+       sha256 = "1fq9cac0mxpgj6cbgchd28djai0p1sdxgnbzpi6mn5l3hpfqyxnm";
+       libraryHaskellDepends = [
+         aeson base http-types servant servant-server servant-zeppelin
+         singletons text wai
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-client http-types lens lens-aeson mtl
+         QuickCheck servant servant-server servant-zeppelin
+         string-conversions warp wreq
+       ];
+       homepage = "https://github.com/martyall/servant-zeppelin#readme";
+       description = "Server library for servant-zeppelin combinators";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-zeppelin-swagger" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec
+     , insert-ordered-containers, lens, servant, servant-swagger
+     , servant-zeppelin, singletons, swagger2, text
+     }:
+     mkDerivation {
+       pname = "servant-zeppelin-swagger";
+       version = "0.1.0.3";
+       sha256 = "0minwzmavsbksn0qh25lcbmdy496zi5lq6jrg4n203pdvnlhsyah";
+       libraryHaskellDepends = [
+         aeson base insert-ordered-containers lens servant servant-swagger
+         servant-zeppelin singletons swagger2 text
+       ];
+       testHaskellDepends = [
+         aeson base containers hspec insert-ordered-containers lens servant
+         servant-swagger servant-zeppelin swagger2
+       ];
+       homepage = "https://github.com/martyall/servant-zeppelin#readme";
+       description = "Swagger instances for servant-zeppelin combinators";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "server-generic" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-types, mtl, text
      , void, wai, warp
@@ -168259,8 +169324,8 @@ self: {
     ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }:
      mkDerivation {
        pname = "show-prettyprint";
-       version = "0.1.2";
-       sha256 = "19p78rs2llq98wr6r49nxs985w45l1723krg7cfwkwciiv2977jv";
+       version = "0.1.2.1";
+       sha256 = "1zwvaa91r4scfxxlbqzfi335bqb3jrgbkkq38dysny52fg6mn565";
        libraryHaskellDepends = [ ansi-wl-pprint base trifecta ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/quchen/show-prettyprint#readme";
@@ -168276,6 +169341,8 @@ self: {
        pname = "show-prettyprint";
        version = "0.2";
        sha256 = "14yjffqjkadmb0aw3zf2n1v525vn293rinhmbwby71ch76nij42w";
+       revision = "1";
+       editedCabalFile = "1hkfq59kpx3p4rgka49l3hvim80xlqf5h3q8f1xb4arysrq3pvi4";
        libraryHaskellDepends = [
          ansi-wl-pprint base prettyprinter trifecta
        ];
@@ -169601,6 +170668,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singleton-dict" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "singleton-dict";
+       version = "0.1.0.0";
+       sha256 = "125mb6j4gf3qcgmvjf6zibnzl7sw8jcmrh60nig16ahk55cjczic";
+       libraryHaskellDepends = [ base singletons ];
+       homepage = "https://github.com/amiddelk/singleton-dict#readme";
+       description = "Typelevel balanced search trees via a singletonized Data.Map";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "singleton-nats" = callPackage
     ({ mkDerivation, base, singletons }:
      mkDerivation {
@@ -172221,8 +173300,8 @@ self: {
     ({ mkDerivation, base, containers, pandoc, process }:
      mkDerivation {
        pname = "snipcheck";
-       version = "0.1.0.1";
-       sha256 = "1kc3yzah4xss479lhzyb083qm0sfnkix7h03pd4da35i1q30k0w0";
+       version = "0.1.0.2";
+       sha256 = "15n6dwkkbr7yh1xvl0xj1kba5s3qy4s8zq01px552fm1qqa8wdzk";
        libraryHaskellDepends = [ base containers pandoc process ];
        homepage = "https://github.com/nmattia/snipcheck#readme";
        description = "Markdown tester";
@@ -172831,8 +173910,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "sort";
-       version = "0.1.0.0";
-       sha256 = "0wqzl413pdaqs1674smgr65kqdwv3msq834xflxq01jd4p872j7l";
+       version = "1.0.0.0";
+       sha256 = "03bpyn0mimfyilfjs26b9c8sclbzsbardjhy6d822jybg548kqyf";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/cdornan/sort";
        description = "A Haskell sorting toolkit";
@@ -173118,21 +174197,20 @@ self: {
      }) {};
 
   "spake2" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite
-     , memory, optparse-applicative, protolude, QuickCheck, tasty
-     , tasty-hspec
+    ({ mkDerivation, base, bytestring, cryptonite, memory
+     , optparse-applicative, protolude, QuickCheck, tasty, tasty-hspec
      }:
      mkDerivation {
        pname = "spake2";
-       version = "0.1.0";
-       sha256 = "08g8n99zdpl8f2wlhvjl16zrnnazp6swvg3688l1bfma5igs9zsy";
+       version = "0.2.0";
+       sha256 = "16yqr9kvhf71iajn6mld8y4svq0l5yz5ljpjmajnfw6lw8fbjrim";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cryptonite memory protolude
        ];
        executableHaskellDepends = [
-         base base16-bytestring cryptonite optparse-applicative protolude
+         base cryptonite memory optparse-applicative protolude
        ];
        testHaskellDepends = [
          base cryptonite protolude QuickCheck tasty tasty-hspec
@@ -176197,10 +177275,8 @@ self: {
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "stm-lifted";
-       version = "0.1.0.0";
-       sha256 = "1x3yxxyik0vyh3p530msxh2a1aylmh8zab05qpq7nfl5m9v6v090";
-       revision = "1";
-       editedCabalFile = "0m3cvhz16z06s560j45dpi7wiy6398pm98f34p3wrryq64d744yk";
+       version = "0.1.1.0";
+       sha256 = "1xp3cfpkhkhpva170vwwrwqm0spwm2g778s98gwbil24icx0p32c";
        libraryHaskellDepends = [ base stm transformers ];
        description = "Software Transactional Memory lifted to MonadIO";
        license = stdenv.lib.licenses.bsd3;
@@ -177018,6 +178094,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "streaming-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, hspec, streaming
+     , streaming-bytestring, transformers
+     }:
+     mkDerivation {
+       pname = "streaming-conduit";
+       version = "0.1.1.0";
+       sha256 = "1cj2p3c6rs5cbz0jdj7k8mxfnslk96966dshfhjxi56mrpjxmzjy";
+       libraryHaskellDepends = [
+         base bytestring conduit streaming streaming-bytestring transformers
+       ];
+       testHaskellDepends = [ base conduit hspec streaming ];
+       description = "Bidirectional support between the streaming and conduit libraries";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "streaming-eversion" = callPackage
     ({ mkDerivation, base, doctest, foldl, microlens, pipes
      , pipes-bytestring, pipes-text, streaming, tasty, tasty-hunit
@@ -179862,14 +180954,12 @@ self: {
      }) {};
 
   "system-locale" = callPackage
-    ({ mkDerivation, base, hspec, megaparsec, process, time }:
+    ({ mkDerivation, attoparsec, base, hspec, process, text, time }:
      mkDerivation {
        pname = "system-locale";
-       version = "0.1.0.0";
-       sha256 = "1avgd19yd5wzg44546vhl285lrcm6lng54q3iig8fpdm4maq3xqd";
-       revision = "1";
-       editedCabalFile = "196g511hi9vj82q7pny41hqndhkbrdf7y0r9hcr3gdkc90f6k09n";
-       libraryHaskellDepends = [ base megaparsec process time ];
+       version = "0.2.0.0";
+       sha256 = "1mvzcnqybdv30xrpfp87l61kcdss2wgqsbgpdl2gl9nz62hyd5z5";
+       libraryHaskellDepends = [ attoparsec base process text time ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/cocreature/system-locale";
        description = "Get system locales";
@@ -180366,17 +181456,18 @@ self: {
 
   "tagchup" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
-     , explicit-exception, old-time, transformers, utility-ht, xml-basic
+     , explicit-exception, non-empty, old-time, transformers, utility-ht
+     , xml-basic
      }:
      mkDerivation {
        pname = "tagchup";
-       version = "0.4.0.5";
-       sha256 = "0dgsl0ig2kc6f9dnb22pgl4c1nx8x3d7wp0nxffpd9v2qpp2xhf0";
+       version = "0.4.1";
+       sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
-         transformers utility-ht xml-basic
+         non-empty transformers utility-ht xml-basic
        ];
        testHaskellDepends = [ base xml-basic ];
        benchmarkHaskellDepends = [
@@ -181014,18 +182105,6 @@ self: {
      }) {};
 
   "tar-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit-combinators }:
-     mkDerivation {
-       pname = "tar-conduit";
-       version = "0.1.0";
-       sha256 = "0bwfhxvw0dz2s5a3mzzrv4546dh9kqgqsg4yacza9cvjs2l8xkb4";
-       libraryHaskellDepends = [ base bytestring conduit-combinators ];
-       homepage = "https://github.com/snoyberg/tar-conduit#readme";
-       description = "Parse tar files using conduit for streaming";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tar-conduit_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit-combinators }:
      mkDerivation {
        pname = "tar-conduit";
@@ -181035,7 +182114,6 @@ self: {
        homepage = "https://github.com/snoyberg/tar-conduit#readme";
        description = "Parse tar files using conduit for streaming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tardis" = callPackage
@@ -181278,12 +182356,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_0_5_0_0" = callPackage
+  "tasty-dejafu_0_6_0_0" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "0.5.0.0";
-       sha256 = "0pqrii4qd9a0sjbz21rscdn6yz3hns7z9wnz0f40f05qmslxggav";
+       version = "0.6.0.0";
+       sha256 = "0qcfypb69052rdrfvssy3py2im86i71rmlv7w954y9rmbby1kl4n";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
@@ -181313,20 +182391,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tasty-discover_2_0_3" = callPackage
-    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+  "tasty-discover_3_0_2" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, tasty
+     , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck
      }:
      mkDerivation {
        pname = "tasty-discover";
-       version = "2.0.3";
-       sha256 = "1qa37iimg66fq1gzjllcrq1rncip26pcw6bax75jmsk1vfczw38j";
+       version = "3.0.2";
+       sha256 = "1bd37d5gppi3lmc244bixv8jpzfx4m14cbqklnwmjhhqviic79h2";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
+       libraryHaskellDepends = [ base containers directory filepath ];
+       executableHaskellDepends = [ base containers directory filepath ];
        testHaskellDepends = [
-         base directory filepath tasty tasty-hspec tasty-hunit
+         base containers directory filepath tasty tasty-hspec tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
        homepage = "https://github.com/lwm/tasty-discover#readme";
@@ -182947,21 +184025,20 @@ self: {
      }) {};
 
   "test-fixture" = callPackage
-    ({ mkDerivation, base, data-default, haskell-src-exts
+    ({ mkDerivation, base, data-default-class, haskell-src-exts
      , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell
-     , th-orphans, th-to-exp, transformers
+     , th-orphans, transformers
      }:
      mkDerivation {
        pname = "test-fixture";
-       version = "0.5.0.0";
-       sha256 = "0bbplvnygnz2z04064hccl070lgmv1yra7k6zfmjr3c7fzvpfj08";
+       version = "0.5.0.1";
+       sha256 = "0gnvz4paxr2wamdp01fnflhifbmsgxpmhg6l3a8nqmi32wgrwy6m";
        libraryHaskellDepends = [
-         base data-default haskell-src-exts haskell-src-meta mtl
+         base data-default-class haskell-src-exts haskell-src-meta mtl
          template-haskell th-orphans
        ];
        testHaskellDepends = [
-         base hspec hspec-discover mtl template-haskell th-to-exp
-         transformers
+         base hspec hspec-discover mtl template-haskell transformers
        ];
        homepage = "http://github.com/cjdev/test-fixture#readme";
        description = "Test monadic side-effects";
@@ -183698,6 +184775,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-format-heavy" = callPackage
+    ({ mkDerivation, base, containers, data-default, parsec, text, time
+     }:
+     mkDerivation {
+       pname = "text-format-heavy";
+       version = "0.1.1.0";
+       sha256 = "082j0dzmy5d8lpjxhg9k7qhnjykg851a0yllszf43kx09hk0kmb1";
+       libraryHaskellDepends = [
+         base containers data-default parsec text time
+       ];
+       description = "Full-weight string formatting library, analog of Python's string.format";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "text-format-simple" = callPackage
     ({ mkDerivation, base, MissingH }:
      mkDerivation {
@@ -184196,6 +185287,8 @@ self: {
        pname = "text-show-instances";
        version = "3.5";
        sha256 = "0hh3d52wkq7vbbikn9sznv2i4k23b4vsnxw7s3h0nij2cxpbyz8c";
+       revision = "1";
+       editedCabalFile = "1jbqpmphh4zrbdbqrazqls099gd73zmri1maf1qssvm4drz0ffgn";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
@@ -184217,7 +185310,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-show-instances_3_6" = callPackage
+  "text-show-instances_3_6_1" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
      , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
@@ -184228,8 +185321,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "3.6";
-       sha256 = "111s9sw9j3pq0wdv6f4wbpf4wff6iiyj8ysq3k1d527f5ln7idmi";
+       version = "3.6.1";
+       sha256 = "1ws5gkmb7y21aw6lrakjq760lgg7j8r5rfm45sdfalhgasxh54lz";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
@@ -184559,8 +185652,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
-       version = "0.1.3.0";
-       sha256 = "0ycb91csldk5jynhj8ydy6jmvjppqrbzc0n4zw414z69drb9gqzx";
+       version = "0.2.1.0";
+       sha256 = "08kn5siadiz4zv1p03bcys1yzsdaac10l2rh017g2sxrb40hnffk";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -186124,8 +187217,8 @@ self: {
      }:
      mkDerivation {
        pname = "time-qq";
-       version = "0.0.0.2";
-       sha256 = "0zpgs5xmjq4fk5djg438fpyh3582v22rjrpqhdr3qy81gcqbgaz7";
+       version = "0.0.1.0";
+       sha256 = "11sch73355fpwqgvg8cq0br0108mj9ph085vycnyq1jndrd0wvxd";
        libraryHaskellDepends = [
          base template-haskell time time-locale-compat
        ];
@@ -186621,14 +187714,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timezone-olson_0_1_8" = callPackage
+    ({ mkDerivation, base, binary, bytestring, extensible-exceptions
+     , time, timezone-series
+     }:
+     mkDerivation {
+       pname = "timezone-olson";
+       version = "0.1.8";
+       sha256 = "0irpvmqpiw4j2wq4rn3jrndgn2jg10yvrnxvsrb1l6g5b80h2sxr";
+       libraryHaskellDepends = [
+         base binary bytestring extensible-exceptions time timezone-series
+       ];
+       homepage = "http://projects.haskell.org/time-ng/";
+       description = "A pure Haskell parser and renderer for binary Olson timezone files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "timezone-olson-th" = callPackage
     ({ mkDerivation, base, template-haskell, time, timezone-olson
      , timezone-series
      }:
      mkDerivation {
        pname = "timezone-olson-th";
-       version = "0.1.0.2";
-       sha256 = "0xmd8c0hs8592p3va4r8wfzy1chld5yq51gcl51bcwzcrvd5102w";
+       version = "0.1.0.3";
+       sha256 = "0jagq78mp09x8zhy3ygdd0pw2ms12c72qi9r7gqaird09rggs44w";
        libraryHaskellDepends = [
          base template-haskell time timezone-olson timezone-series
        ];
@@ -186649,6 +187759,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timezone-series_0_1_8" = callPackage
+    ({ mkDerivation, base, deepseq, time }:
+     mkDerivation {
+       pname = "timezone-series";
+       version = "0.1.8";
+       sha256 = "1xndlg0n46qjdh5yjzkkg285x3k76073aaizx1ibdzbq9q7dj6c1";
+       libraryHaskellDepends = [ base deepseq time ];
+       homepage = "http://projects.haskell.org/time-ng/";
+       description = "Enhanced timezone handling for Data.Time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "timezone-unix" = callPackage
     ({ mkDerivation, base, directory, filepath, leapseconds, tasty
      , tasty-golden, tasty-hunit, time, timezone-olson, timezone-series
@@ -187355,7 +188478,7 @@ self: {
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -188165,18 +189288,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "transient_0_5_5" = callPackage
+  "transient_0_5_6" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.5.5";
-       sha256 = "06fpva9mydavc7dnmha735rc1mlz0hi33xagdf0hh7s0hplfpwd3";
+       version = "0.5.6";
+       sha256 = "01r0mw35h3k7yry91gir64gkb6d3x9i5awnacmk8l8anffhvvayc";
        libraryHaskellDepends = [
          base bytestring containers directory mtl random stm time
          transformers
        ];
+       testHaskellDepends = [
+         base bytestring containers directory mtl random stm time
+         transformers
+       ];
        homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "composing programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.mit;
@@ -188213,7 +189340,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transient-universe_0_4_4_1" = callPackage
+  "transient-universe_0_4_5" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, filepath, hashable, HTTP, iproute, mtl, network
      , network-info, network-uri, process, random, stm, TCache, text
@@ -188221,8 +189348,8 @@ self: {
      }:
      mkDerivation {
        pname = "transient-universe";
-       version = "0.4.4.1";
-       sha256 = "1v8b0q5drs6lpw3va9qn5yqfawhcaaypys00rl0pcci47xkvpxvj";
+       version = "0.4.5";
+       sha256 = "0imyapqzdl2rz4gdykkcf3vr3r5d22qdnm9n0rg0gkl63b4lvv60";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -188231,14 +189358,18 @@ self: {
          random stm TCache text time transformers transient vector
          websockets
        ];
-       executableHaskellDepends = [ base transformers transient ];
+       executableHaskellDepends = [
+         base bytestring case-insensitive containers directory filepath
+         hashable HTTP mtl network network-info network-uri process random
+         stm TCache text time transformers transient vector websockets
+       ];
        testHaskellDepends = [
          base bytestring case-insensitive containers directory filepath
          hashable HTTP mtl network network-info network-uri process random
          stm TCache text time transformers transient vector websockets
        ];
        homepage = "http://www.fpcomplete.com/user/agocorona";
-       description = "Distributed computing with algebraic/monadic composability, map-reduce";
+       description = "Remote execution and map-reduce: distributed computing for Transient";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -188615,6 +189746,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "trifecta_1_7" = callPackage
+    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base
+     , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal
+     , cabal-doctest, charset, comonad, containers, deepseq, doctest
+     , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors
+     , QuickCheck, reducers, semigroups, transformers
+     , unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "trifecta";
+       version = "1.7";
+       sha256 = "0hsm6k0af5hrx768kq4nww56x7hmvp993659asck6r00i9gyk0pq";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
+         blaze-markup bytestring charset comonad containers deepseq
+         fingertree ghc-prim hashable lens mtl parsers profunctors reducers
+         semigroups transformers unordered-containers utf8-string
+       ];
+       testHaskellDepends = [ base doctest parsers QuickCheck ];
+       homepage = "http://github.com/ekmett/trifecta/";
+       description = "A modern parser combinator library with convenient diagnostics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "trimpolya" = callPackage
     ({ mkDerivation, base, bio, bytestring, simpleargs }:
      mkDerivation {
@@ -189018,6 +190175,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tttool_1_7_0_3" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , directory, executable-path, filepath, hashable, haskeline, HPDF
+     , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
+     , process, random, split, spool, template-haskell, time, vector
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "tttool";
+       version = "1.7.0.3";
+       sha256 = "0r8ha8wgzlf2ymyxylj16hfshf8w5dl13cwmdkl6ih2niwkzk9ch";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base binary bytestring containers directory executable-path
+         filepath hashable haskeline HPDF JuicyPixels mtl natural-sort
+         optparse-applicative parsec process random split spool
+         template-haskell time vector yaml zlib
+       ];
+       homepage = "https://github.com/entropia/tip-toi-reveng";
+       description = "Working with files for the Tiptoi® pen";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tubes" = callPackage
     ({ mkDerivation, base, comonad, contravariant, free, mtl
      , profunctors, semigroups, transformers
@@ -189271,29 +190453,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , criterion, directory, doctest, foldl, hostname, managed
-     , optional-args, optparse-applicative, process, semigroups, stm
-     , system-fileio, system-filepath, temporary, text, time
-     , transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.3.4";
-       sha256 = "0rkxic6v68dlzdvnqk0pfchl9zd1rjhmr0n5qwms3r0pq5z8vj57";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock directory foldl hostname
-         managed optional-args optparse-applicative process semigroups stm
-         system-fileio system-filepath temporary text time transformers unix
-         unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_3_5" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , criterion, directory, doctest, foldl, hostname, managed
      , optional-args, optparse-applicative, process, semigroups, stm
@@ -189314,7 +190473,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -190843,8 +192001,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.3.0.0";
-       sha256 = "1cl12bymyzrcx5jsjp106csap30x28ws58dx5qp6008wdsdbm4j2";
+       version = "0.3.1.1";
+       sha256 = "1pf5ha4r015yc359c5f7jy2qwx1j9i9w62xjlfhm9amx81cw42if";
        libraryHaskellDepends = [
          autoexporter base dlist monad-skeleton template-haskell
          th-data-compat
@@ -192979,8 +194137,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.2.3.1";
-       sha256 = "0vdiy6z9r5idml6rjbf6h2y24as97j34spcrrwpvgj3nraw18a0x";
+       version = "0.2.3.2";
+       sha256 = "0slchhhgwcig8ifla49r9j96cg5l1jf5gy9zzpvmmds0x3d42qh4";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers
          template-haskell th-lift-instances
@@ -192999,25 +194157,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "uri-bytestring_0_2_3_2" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, criterion, deepseq, deepseq-generics, generics-sop
-     , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, th-lift-instances
+  "uri-bytestring_0_2_3_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, blaze-builder
+     , bytestring, containers, criterion, deepseq, deepseq-generics
+     , generics-sop, HUnit, network-uri, QuickCheck
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, th-lift-instances
+     , transformers
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.2.3.2";
-       sha256 = "0slchhhgwcig8ifla49r9j96cg5l1jf5gy9zzpvmmds0x3d42qh4";
+       version = "0.2.3.3";
+       sha256 = "050bimfsc912dh5sb2kjvvdd80ggjhakqq1dbn46cnp98zr8p0rx";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers
          template-haskell th-lift-instances
        ];
        testHaskellDepends = [
-         attoparsec base blaze-builder bytestring containers generics-sop
-         HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
-         tasty-hunit tasty-quickcheck
+         attoparsec base base-compat blaze-builder bytestring containers
+         generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck transformers
        ];
        benchmarkHaskellDepends = [
          base blaze-builder bytestring criterion deepseq deepseq-generics
@@ -193436,6 +194595,8 @@ self: {
        pname = "users";
        version = "0.5.0.0";
        sha256 = "1m2k3vq938whv9577k3jrgx99hwr272s0fc22p2i6k0dgf9sqqb7";
+       revision = "1";
+       editedCabalFile = "1x26g7k6kmq2vng9y5qkz82z06rs322s2y8bs9y6r4vayvg07q9v";
        libraryHaskellDepends = [
          aeson base bcrypt path-pieces text time
        ];
@@ -193591,8 +194752,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "utility-ht";
-       version = "0.0.13";
-       sha256 = "1gjcz5bkwjj9lw9nx4qy8ys3ns9h1vndxqk17z52wzqpc3q7fawm";
+       version = "0.0.14";
+       sha256 = "1a7bgk7wv7sqbxbiv7kankiimr3wij7zdm7s83zwsf886ghyxhk9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
@@ -195258,22 +196419,22 @@ self: {
      }:
      mkDerivation {
        pname = "versions";
-       version = "3.0.2";
-       sha256 = "1s33il4w94h51zsqbqylbzbhn9q5y7cjnscblhhkpglvgc2z61ii";
+       version = "3.0.2.1";
+       sha256 = "1vq2jypv6zsfcf13lnj2hfm19ajg86ld991kbaqbvbxkg1s800jp";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base microlens tasty tasty-hunit text ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "versions_3_0_2_1" = callPackage
+  "versions_3_1_0_1" = callPackage
     ({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit
      , text
      }:
      mkDerivation {
        pname = "versions";
-       version = "3.0.2.1";
-       sha256 = "1vq2jypv6zsfcf13lnj2hfm19ajg86ld991kbaqbvbxkg1s800jp";
+       version = "3.1.0.1";
+       sha256 = "0r6dzf27bw2d0d0p48rv2vqkiw4dagdk6ka0hhisxz5ii4x6lvl7";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base microlens tasty tasty-hunit text ];
        description = "Types and parsers for software version numbers";
@@ -197904,8 +199065,10 @@ self: {
     ({ mkDerivation, base, mtl, time }:
      mkDerivation {
        pname = "watchdog";
-       version = "0.2.3";
-       sha256 = "18x0y0pnbbhfl1yjjdlf34fkl76rj702kdq4bqvnap25067hmgdm";
+       version = "0.3";
+       sha256 = "0v8jbrnqg48x5ksdacsd0xazpxqv64ggzihg6k2y6pljqznrhn1i";
+       revision = "1";
+       editedCabalFile = "1hmjlva0pbvbbl3vcngqlqrisx32qzlc9pl96zh2rb6m25riisdg";
        libraryHaskellDepends = [ base mtl time ];
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
@@ -199072,8 +200235,8 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "0.1.4";
-       sha256 = "0n7zwyppjsiih0i3czb2m0a817jy592hpm6jhkr8hp1a1pa8qfcz";
+       version = "0.1.5";
+       sha256 = "0jnfg68828qdk14lpa0ql4x6cj7ap2njrwpgdqwkpm2hkgw21363";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -199971,24 +201134,21 @@ self: {
      }) {};
 
   "wolf" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
-     , amazonka-swf, base, bytestring, conduit, conduit-combinators
-     , conduit-extra, directory, exceptions, filemanip, filepath
-     , http-types, lifted-async, monad-control, optparse-applicative
-     , optparse-generic, preamble, process, resourcet, shakers, text
-     , time, uuid, yaml
+    ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
+     , conduit, directory, exceptions, filemanip, filepath, http-types
+     , lifted-async, lifted-base, monad-control, optparse-generic
+     , preamble, process, resourcet, shakers, time, uuid, yaml
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.14";
-       sha256 = "1dbkk0v99jwag8926vjn6fmxpanwds7mfrf1lgd13slxppri8f32";
+       version = "0.3.18";
+       sha256 = "08wpjp1m6szx2sp4g7h03ks7r2ryadzz3a3apchd2vymhlb1qaxb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-s3 amazonka-swf base
-         bytestring conduit conduit-combinators conduit-extra directory
-         exceptions filemanip filepath http-types lifted-async monad-control
-         optparse-applicative preamble process resourcet text time uuid yaml
+         aeson amazonka amazonka-swf base bytestring conduit directory
+         exceptions filemanip filepath http-types lifted-async lifted-base
+         monad-control preamble process resourcet time uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
        homepage = "https://github.com/swift-nav/wolf";
@@ -201202,7 +202362,7 @@ self: {
        ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
@@ -201834,12 +202994,11 @@ self: {
      }:
      mkDerivation {
        pname = "xml-basic";
-       version = "0.1.1.3";
-       sha256 = "0m3pwg8b9pvqh9559p7nq39vnkklmf9gcay8vpvrkh17p8n14z6c";
+       version = "0.1.2";
+       sha256 = "1s8415gj65zm6mbbrmkav92zkwi0q8mf892ajc2qz9hfmhxab27q";
        libraryHaskellDepends = [
          base containers data-accessor explicit-exception utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/XML-Basic";
        description = "Basics for XML/HTML representation and processing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202553,7 +203712,7 @@ self: {
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" ];
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;};
 
@@ -203422,21 +204581,28 @@ self: {
      }) {};
 
   "yaml-union" = callPackage
-    ({ mkDerivation, base, bytestring, optparse-applicative
-     , unordered-containers, yaml
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , hspec, optparse-applicative, QuickCheck, quickcheck-instances
+     , scientific, text, unix, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "yaml-union";
-       version = "0.0.1";
-       sha256 = "11dxisgr8blzahw9y78rk9sc39nmmfj33klbcbjpi9qawnhjbbxk";
+       version = "0.0.2";
+       sha256 = "1lmlrf3x4icx0ikl02k00hv1wibvy0n3lmxdgjrh0vbq89sbx55a";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base unordered-containers yaml ];
+       libraryHaskellDepends = [
+         aeson base bytestring directory filepath text unix
+         unordered-containers vector yaml
+       ];
        executableHaskellDepends = [
-         base bytestring optparse-applicative yaml
+         base bytestring directory optparse-applicative yaml
        ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/michelk/yaml-overrides.hs";
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances scientific text
+         unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/michelk/yaml-union.hs";
        description = "Read multiple yaml-files and override fields recursively";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203899,6 +205065,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_4_17_2" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptonite, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, memory
+     , mime-mail, network-uri, nonce, persistent, persistent-template
+     , random, resourcet, safe, shakespeare, template-haskell, text
+     , time, transformers, unordered-containers, wai, yesod-core
+     , yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.17.2";
+       sha256 = "10wrl6g5q06mf751rwc8wclb5i5wajp30vhr7ggpvfylmqzjg933";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptonite data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base memory
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -204431,6 +205627,52 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_4_35" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , criterion, data-default, deepseq, deepseq-generics, directory
+     , exceptions, fast-logger, hspec, hspec-expectations, http-types
+     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
+     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
+     , random, resourcet, safe, semigroups, shakespeare
+     , streaming-commons, template-haskell, text, time, transformers
+     , transformers-base, unix-compat, unordered-containers, vector, wai
+     , wai-extra, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.35";
+       sha256 = "1wawpd2pwqn535zrs5wz43jvi0bca0q2kinml6waw5d4s7m0npby";
+       revision = "1";
+       editedCabalFile = "1cgizphqsjd6qmz7xa1flcg064rg5543shybqx6l2npyr21h67yk";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq
+         deepseq-generics directory exceptions fast-logger http-types
+         lifted-base monad-control monad-logger mtl mwc-random old-locale
+         parsec path-pieces primitive random resourcet safe semigroups
+         shakespeare template-haskell text time transformers
+         transformers-base unix-compat unordered-containers vector wai
+         wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion shakespeare text transformers
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -205436,6 +206678,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-static_1_5_3" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptohash, cryptohash-conduit, css-text
+     , data-default, directory, exceptions, file-embed, filepath
+     , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time
+     , process, resourcet, template-haskell, text, transformers
+     , unix-compat, unordered-containers, wai, wai-app-static, wai-extra
+     , yesod-core, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-static";
+       version = "1.5.3";
+       sha256 = "0raxbnr1xpxgirh2fhs3m277yzbklf6k3dijrrx4kh2bnaiax1ml";
+       libraryHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder byteable
+         bytestring conduit conduit-extra containers cryptohash
+         cryptohash-conduit css-text data-default directory exceptions
+         file-embed filepath hashable hjsmin http-types mime-types old-time
+         process resourcet template-haskell text transformers unix-compat
+         unordered-containers wai wai-app-static yesod-core
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring byteable bytestring conduit
+         conduit-extra containers cryptohash cryptohash-conduit data-default
+         directory exceptions file-embed filepath hjsmin hspec http-types
+         HUnit mime-types old-time process resourcet template-haskell text
+         transformers unix-compat unordered-containers wai wai-app-static
+         wai-extra yesod-core yesod-test
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Static file serving subsite for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-static-angular" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
@@ -205517,6 +206795,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_5_6" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, containers, cookie
+     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
+     , monad-control, network, persistent, pretty-show, text, time
+     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
+     , yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.5.6";
+       sha256 = "1zb3zm6id0nnsbpic8643b1p0x6yx1in8x1c7n36wbp9crinr0h3";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive containers cookie hspec-core html-conduit
+         http-types HUnit monad-control network persistent pretty-show text
+         time transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit
+         lifted-base text wai xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -206637,8 +207943,8 @@ self: {
      }:
      mkDerivation {
        pname = "zerobin";
-       version = "1.5.1";
-       sha256 = "16lfkjzmfmhqran2ax6x78g2llblzz0j0i6jsiv4qd2i3iyliwz0";
+       version = "1.5.2";
+       sha256 = "0lwrwaydayklbcs6msdzfc187fr1mqbf64yq0lcw5v04a3papyw0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -206714,6 +208020,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zeromq;};
 
+  "zeromq4-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, lifted-base
+     , monad-control, mtl, resourcet, semigroups, transformers
+     , transformers-base, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "zeromq4-conduit";
+       version = "0.1.0.0";
+       sha256 = "1qyk0ha21afa7hi1hpl6qk3bhcrs0a0kg0160hfrf6aw7l24dgi2";
+       libraryHaskellDepends = [
+         base bytestring conduit lifted-base monad-control mtl resourcet
+         semigroups transformers transformers-base zeromq4-haskell
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/itkovian/zeromq4-conduit#readme";
+       description = "Conduit wrapper around zeromq4-haskell";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {};
+
   "zeromq4-haskell" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, exceptions
      , monad-control, QuickCheck, semigroups, tasty, tasty-hunit
@@ -206787,14 +208112,14 @@ self: {
 
   "zifter-cabal" = callPackage
     ({ mkDerivation, base, directory, filepath, path, path-io, process
-     , zifter
+     , safe, zifter
      }:
      mkDerivation {
        pname = "zifter-cabal";
-       version = "0.0.0.1";
-       sha256 = "0ca82bprk2zxv06jllhdpfp2ajcmd943pkggyhs3v31v71mg4c3d";
+       version = "0.0.0.2";
+       sha256 = "009vhy3x5hb24n1ylr31hvgfk2bic1r9yy8nk78ym1yhjb4vrrj5";
        libraryHaskellDepends = [
-         base directory filepath path path-io process zifter
+         base directory filepath path path-io process safe zifter
        ];
        homepage = "http://cs-syd.eu";
        description = "zifter-cabal";
@@ -206869,14 +208194,14 @@ self: {
 
   "zifter-stack" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, path, path-io
-     , process, zifter
+     , process, safe, zifter
      }:
      mkDerivation {
        pname = "zifter-stack";
-       version = "0.0.0.2";
-       sha256 = "1mxaxflisrial3rhzij57vbbc4bf3g02byaz6xqa54jnawp1bwdl";
+       version = "0.0.0.4";
+       sha256 = "0vgklhbq846xh020n4mp4j96zbpc2asnsn1zk716pfnkgvk9syqn";
        libraryHaskellDepends = [
-         base Cabal directory filepath path path-io process zifter
+         base Cabal directory filepath path path-io process safe zifter
        ];
        homepage = "http://cs-syd.eu";
        description = "zifter-stack";
@@ -206973,6 +208298,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zip;};
 
+  "zip-archive_0_3_1" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , digest, directory, filepath, HUnit, mtl, old-time, pretty
+     , process, temporary, text, time, unix, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.3.1";
+       sha256 = "0ywy6isvyizs5d27lh108y6k4qnwmbcdmvzsrm3r45bwcj1nii5f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers digest directory filepath
+         mtl old-time pretty text time unix zlib
+       ];
+       testHaskellDepends = [
+         base bytestring directory HUnit old-time process temporary time
+         unix
+       ];
+       homepage = "http://github.com/jgm/zip-archive";
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl
@@ -207122,6 +208472,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ziptastic-client_0_3_0_3" = callPackage
+    ({ mkDerivation, base, base-compat, hspec, http-client
+     , http-client-tls, http-types, iso3166-country-codes, servant
+     , servant-client, text, ziptastic-core
+     }:
+     mkDerivation {
+       pname = "ziptastic-client";
+       version = "0.3.0.3";
+       sha256 = "0phw247dbm68bbb9k9z4jiva0gz9yhirggcnsrvm697kzya9s25g";
+       libraryHaskellDepends = [
+         base base-compat http-client iso3166-country-codes servant
+         servant-client text ziptastic-core
+       ];
+       testHaskellDepends = [
+         base base-compat hspec http-client http-client-tls http-types
+         iso3166-country-codes servant-client
+       ];
+       homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
+       description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ziptastic-core" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec
      , http-api-data, iso3166-country-codes, servant, text, tz
@@ -207142,6 +208515,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ziptastic-core_0_2_0_3" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec
+     , http-api-data, iso3166-country-codes, servant, text, tz
+     }:
+     mkDerivation {
+       pname = "ziptastic-core";
+       version = "0.2.0.3";
+       sha256 = "1c2ahblhqk4dq3105w3qd0j7isn3r0m7vvm5drd5g1ian37ywqwf";
+       libraryHaskellDepends = [
+         aeson base base-compat bytestring http-api-data
+         iso3166-country-codes servant text tz
+       ];
+       testHaskellDepends = [
+         aeson base base-compat here hspec iso3166-country-codes text tz
+       ];
+       homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
+       description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zlib_0_5_4_2" = callPackage
     ({ mkDerivation, base, bytestring, zlib }:
      mkDerivation {
-- 
GitLab


From 1e0866e06483087059af91b7f296e0c5610f8848 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Tue, 30 May 2017 20:48:06 +0700
Subject: [PATCH 0576/1490] rust: 1.15.0 -> 1.17.0

Also updates beta, nightly, nightlyBin, and bootstrap compilers.
Also updates the registry.
Also consolidates logic between bootstrap and nightlyBin compilers.
Also contains some miscellaneous cleanups.
Also patches firefox to build with the newer cargo
---
 .../browsers/firefox/cargo-fix.patch          | 33 +++++++
 .../networking/browsers/firefox/packages.nix  |  2 +
 pkgs/development/compilers/rust/beta.nix      | 73 +++++---------
 .../compilers/rust/binaryBuild.nix            | 99 +++++++++++++++++++
 pkgs/development/compilers/rust/bootstrap.nix | 78 +++------------
 pkgs/development/compilers/rust/default.nix   | 28 +++---
 pkgs/development/compilers/rust/nightly.nix   | 70 +++++--------
 .../development/compilers/rust/nightlyBin.nix | 78 ++-------------
 .../compilers/rust/print-hashes.sh            | 19 +++-
 pkgs/development/compilers/rust/rustc.nix     | 68 ++++++-------
 pkgs/top-level/all-packages.nix               | 15 ++-
 pkgs/top-level/rust-packages.nix              |  6 +-
 12 files changed, 279 insertions(+), 290 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox/cargo-fix.patch
 create mode 100644 pkgs/development/compilers/rust/binaryBuild.nix

diff --git a/pkgs/applications/networking/browsers/firefox/cargo-fix.patch b/pkgs/applications/networking/browsers/firefox/cargo-fix.patch
new file mode 100644
index 00000000000..bb19e9e45a3
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/cargo-fix.patch
@@ -0,0 +1,33 @@
+diff --git a/media/libstagefright/binding/mp4parse-cargo.patch b/media/libstagefright/binding/mp4parse-cargo.patch
+index 1dd13d2..f98b722 100644
+--- a/media/libstagefright/binding/mp4parse-cargo.patch
++++ b/media/libstagefright/binding/mp4parse-cargo.patch
+@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libst
+ index aeeebc65..5c0836a 100644
+ --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+ +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+-@@ -18,18 +18,10 @@ exclude = [
++@@ -18,17 +18,12 @@ exclude = [
+    "*.mp4",
+  ]
+  
+ -build = "build.rs"
+--
+++build = false
+++
+  [dependencies]
+  byteorder = "1.0.0"
+  "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
+diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+index aee7ee9..d7e3f55 100644
+--- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
++++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
+@@ -18,6 +18,8 @@ exclude = [
+   "*.mp4",
+ ]
+ 
++build = false
++
+ [dependencies]
+ byteorder = "1.0.0"
+ "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index c15e070fefb..8f117e1416b 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -12,6 +12,8 @@ rec {
       sha512 = "cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118";
     };
 
+    patches = [ ./cargo-fix.patch ];
+
     meta = {
       description = "A web browser built from Firefox source tree";
       homepage = http://www.mozilla.com/en-US/firefox/;
diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix
index 5205c8fc93f..93aaeb9e16e 100644
--- a/pkgs/development/compilers/rust/beta.nix
+++ b/pkgs/development/compilers/rust/beta.nix
@@ -1,56 +1,37 @@
-{ stdenv, callPackage, rustPlatform, cacert, gdb,
-  targets ? [], targetToolchains ? [], targetPatches ? [] }:
+{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
+, targets ? []
+, targetToolchains ? []
+, targetPatches ? []
+}:
 
+let
+  rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
+in
 rec {
-  rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix {
-    shortVersion = "beta-2017-01-07";
-    forceBundledLLVM = true; # TODO: figure out why linking fails without this
+  rustc = callPackage ./rustc.nix {
+    inherit llvm targets targetPatches targetToolchains rustPlatform;
+
+    version = "beta-2017-05-27";
+
     configureFlags = [ "--release-channel=beta" ];
-    srcRev = "a035041ba450ce3061d78a2bdb9c446eb5321d0d";
-    srcSha = "12xsm0yp1y39fvf9j218gxv73j8hhahc53jyv3q58kiriyqvfc1s";
+
+    src = fetchurl {
+      url = "https://static.rust-lang.org/dist/2017-05-27/rustc-beta-src.tar.gz";
+      sha256 = "9f3f92efef7fb2b4bf38e57e4ff1f416dc221880b90841c4bdaee350801c0b57";
+    };
+
     patches = [
-     ./patches/disable-lockfile-check-nightly.patch
+      ./patches/darwin-disable-fragile-tcp-tests.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-    inherit targets;
-    inherit targetPatches;
-    inherit targetToolchains;
-    inherit rustPlatform;
-  }) (oldAttrs: {
-    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ];
-    postUnpack = ''
-      export CARGO_HOME="$(realpath deps)"
-      export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-    '';
-    postPatch = ''
-      ${oldAttrs.postPatch}
-
-      # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596
-      rm -vr src/test/debuginfo/borrowed-enum.rs || true
-      rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true
-      rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true
-      rm -vr src/test/debuginfo/packed-struct.rs || true
-      rm -vr src/test/debuginfo/recursive-struct.rs || true
-      rm -vr src/test/debuginfo/struct-in-enum.rs || true
-      rm -vr src/test/debuginfo/struct-style-enum.rs || true
-      rm -vr src/test/debuginfo/tuple-style-enum.rs || true
-      rm -vr src/test/debuginfo/union-smoke.rs || true
-      rm -vr src/test/debuginfo/unique-enum.rs || true
-
-      # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed
-      sed -i "s#    def cargo(self):#    def cargo(self):\n        return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py
-      substituteInPlace \
-        src/bootstrap/config.rs \
-        --replace \
-        'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \
-        ''$'self.cargo = Some(\n                        "${rustPlatform.rust.cargo}\\\n                        /bin/cargo".into());'
-    '';
-  });
+
+    doCheck = false;
+  };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "beta-2017-01-10";
-    srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0";
-    srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj";
-    depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp";
+    version = "0.18.0";
+    srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666";
+    srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
+    depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
new file mode 100644
index 00000000000..37b06555bdb
--- /dev/null
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -0,0 +1,99 @@
+{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl
+, version
+, src
+, platform
+, versionType
+}:
+
+let
+  inherit (stdenv.lib) optionalString;
+
+  needsPatchelf = stdenv.isLinux;
+
+  bootstrapping = versionType == "bootstrap";
+
+  installComponents
+    = "rustc,rust-std-${platform}"
+    + (optionalString bootstrapping ",rust-docs,cargo")
+    ;
+in
+
+rec {
+  inherit buildRustPackage;
+
+  rustc = stdenv.mkDerivation rec {
+    name = "rustc-${versionType}-${version}";
+
+    inherit version;
+    inherit src;
+
+    meta = with stdenv.lib; {
+      homepage = http://www.rust-lang.org/;
+      description = "A safe, concurrent, practical language";
+      maintainers = with maintainers; [ qknight ];
+      license = [ licenses.mit licenses.asl20 ];
+    };
+
+    phases = ["unpackPhase" "installPhase"];
+
+    installPhase = ''
+      ./install.sh --prefix=$out \
+        --components=${installComponents}
+
+      ${optionalString (needsPatchelf && bootstrapping) ''
+        patchelf \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          "$out/bin/rustdoc"
+        patchelf \
+          --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          "$out/bin/cargo"
+      ''}
+
+      ${optionalString needsPatchelf ''
+        patchelf \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          "$out/bin/rustc"
+
+      # 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
+      # are very hard to track dow. For details, see
+      # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
+      ''}
+    '';
+
+  };
+
+  cargo = stdenv.mkDerivation rec {
+    name = "cargo-${versionType}-${version}";
+
+    inherit version;
+    inherit src;
+
+    meta = with stdenv.lib; {
+      homepage = http://www.rust-lang.org/;
+      description = "A safe, concurrent, practical language";
+      maintainers = with maintainers; [ qknight ];
+      license = [ licenses.mit licenses.asl20 ];
+    };
+
+    buildInputs = [ makeWrapper ];
+    phases = ["unpackPhase" "installPhase"];
+
+    installPhase = ''
+      ./install.sh --prefix=$out \
+        --components=cargo
+
+      ${optionalString needsPatchelf ''
+        patchelf \
+          --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          "$out/bin/cargo"
+      ''}
+
+      wrapProgram "$out/bin/cargo" \
+        --suffix PATH : "${rustc}/bin"
+    '';
+  };
+}
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 91660dcc5b3..409bf465630 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, makeWrapper, cacert, zlib }:
+{ stdenv, fetchurl, makeWrapper, cacert, zlib, curl }:
 
 let
-  inherit (stdenv.lib) optionalString;
-
   platform =
     if stdenv.system == "i686-linux"
     then "i686-unknown-linux-gnu"
@@ -14,77 +12,27 @@ let
     then "x86_64-apple-darwin"
     else throw "missing bootstrap url for platform ${stdenv.system}";
 
-  # fetch hashes by running `print-hashes.sh 1.14.0`
+  # fetch hashes by running `print-hashes.sh 1.17.0`
   bootstrapHash =
     if stdenv.system == "i686-linux"
-    then "8d5c75728b44468216f99651dfae9d60ae0696a77105dd2b02942d75f3256840"
+    then "39d16ce0f618ba37ee1024b83e4822a2d38e6ba9f341ff2020d34df94c7a6beb"
     else if stdenv.system == "x86_64-linux"
-    then "c71325cfea1b6f0bdc5189fa4c50ff96f828096ff3f7b5056367f9685d6a4d04"
+    then "bbb0e249a7a3e8143b569706c7d2e7e5f51932c753b7fd26c58ccd2015b02c6b"
     else if stdenv.system == "i686-darwin"
-    then "fe1b3d67329a22d67e3b8db8858a43022e2e746dde60ef4a2db3f2cac16ea9bd"
+    then "308132b33d4002f95a725c2d31b975ff37905e3644894ed86e614b03ded70265"
     else if stdenv.system == "x86_64-darwin"
-    then "3381341524b0184da5ed2cdcddc2a25e2e335e87f1cf676f64d98ee5e6479f20"
+    then "1689060c07ec727e9756f19c9373045668471ab56fd8f53e92701150bbe2032b"
     else throw "missing bootstrap hash for platform ${stdenv.system}";
 
-  needsPatchelf = stdenv.isLinux;
-
   src = fetchurl {
      url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
      sha256 = bootstrapHash;
   };
 
-  version = "1.14.0";
-in
-
-rec {
-  rustc = stdenv.mkDerivation rec {
-    name = "rustc-bootstrap-${version}";
-
-    inherit version;
-    inherit src;
-
-    buildInputs = [ makeWrapper ];
-    phases = ["unpackPhase" "installPhase"];
-
-    installPhase = ''
-      ./install.sh --prefix=$out \
-        --components=rustc,rust-std-${platform},rust-docs
-
-      ${optionalString needsPatchelf ''
-        patchelf \
-          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-          "$out/bin/rustc"
-      ''}
-
-      # 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
-      # are very hard to track dow. For details, see
-      # https://github.com/rust-lang/rust/issues/34722#issuecomment-232164943
-    '';
-  };
-
-  cargo = stdenv.mkDerivation rec {
-    name = "cargo-bootstrap-${version}";
-
-    inherit version;
-    inherit src;
-
-    buildInputs = [ makeWrapper zlib rustc ];
-    phases = ["unpackPhase" "installPhase"];
-
-    installPhase = ''
-      ./install.sh --prefix=$out \
-        --components=cargo
-
-      ${optionalString needsPatchelf ''
-        patchelf \
-          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-          "$out/bin/cargo"
-      ''}
-
-      wrapProgram "$out/bin/cargo" \
-        --suffix PATH : "${rustc}/bin"
-    '';
-  };
-}
+  version = "1.17.0";
+in import ./binaryBuild.nix
+  { inherit stdenv fetchurl makeWrapper cacert zlib curl;
+    buildRustPackage = null;
+    inherit version src platform;
+    versionType = "bootstrap";
+  }
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index afab703ae5b..0d7e26e06f4 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm
+{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm, fetchurl
 , targets ? []
 , targetToolchains ? []
 , targetPatches ? []
@@ -6,32 +6,30 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
+  version = "1.17.0";
 in
 rec {
   rustc = callPackage ./rustc.nix {
-    shortVersion = "1.15.1";
-    isRelease = true;
-    forceBundledLLVM = false;
+    inherit llvm targets targetPatches targetToolchains rustPlatform version;
+
     configureFlags = [ "--release-channel=stable" ];
-    srcRev = "021bd294c039bd54aa5c4aa85bcdffb0d24bc892";
-    srcSha = "1dp7cjxj8nv960jxkq3p18agh9bpfb69ac14x284jmhwyksim3y7";
+
+    src = fetchurl {
+      url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
+      sha256 = "4baba3895b75f2492df6ce5a28a916307ecd1c088dc1fd02dbfa8a8e86174f87";
+    };
 
     patches = [
       ./patches/darwin-disable-fragile-tcp-tests.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 
-    inherit llvm;
-    inherit targets;
-    inherit targetPatches;
-    inherit targetToolchains;
-    inherit rustPlatform;
   };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "0.16.0";
-    srcRev = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420";
-    srcSha = "117ivvs9wz848mwf8bw797n10qpn77agd353z8b0hxgbxhpribya";
-    depsSha256 = "11s2xpgfhl4mb4wa2nk4mzsypr7m9daxxc7l0vraiz5cr77gk7qq";
+    version = "0.18.0";
+    srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666";
+    srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
+    depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/nightly.nix b/pkgs/development/compilers/rust/nightly.nix
index d9ae8c140ab..b69dffbd8b3 100644
--- a/pkgs/development/compilers/rust/nightly.nix
+++ b/pkgs/development/compilers/rust/nightly.nix
@@ -1,56 +1,34 @@
-{ stdenv, callPackage, rustPlatform, cacert, gdb,
-  targets ? [], targetToolchains ? [], targetPatches ? [] }:
+{ stdenv, callPackage, rustPlatform, llvm, fetchurl
+, targets ? []
+, targetToolchains ? []
+, targetPatches ? []
+}:
 
 rec {
-  rustc = stdenv.lib.overrideDerivation (callPackage ./rustc.nix {
-    shortVersion = "nightly-2017-01-10";
-    forceBundledLLVM = true; # TODO: figure out why linking fails without this
+  rustc = callPackage ./rustc.nix {
+    inherit llvm targets targetPatches targetToolchains rustPlatform;
+
+    version = "nightly-2017-05-30";
+
     configureFlags = [ "--release-channel=nightly" ];
-    srcRev = "7bffede97cf58f7159e261eac592f9cf88ce209d";
-    srcSha = "1784jvsf9g03cglwask1zhjmba4ghycbin3rw0hmhb41cz2y4q8v";
+
+    src = fetchurl {
+      url = "https://static.rust-lang.org/dist/2017-05-30/rustc-nightly-src.tar.gz";
+      sha256 = "90ce76db56a93f1b4532f2e62bbf12c243c4d156662b0d80c25319211ee7d0e0";
+    };
+
     patches = [
-     ./patches/disable-lockfile-check-nightly.patch
+      ./patches/darwin-disable-fragile-tcp-tests.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-    inherit targets;
-    inherit targetPatches;
-    inherit targetToolchains;
-    inherit rustPlatform;
-  }) (oldAttrs: {
-    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ gdb rustPlatform.rust.cargo ];
-    postUnpack = ''
-      export CARGO_HOME="$(realpath deps)"
-      export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-    '';
-    postPatch = ''
-      ${oldAttrs.postPatch}
-
-      # Remove failing debuginfo tests because of old gdb version: https://github.com/rust-lang/rust/issues/38948#issuecomment-271443596
-      rm -vr src/test/debuginfo/borrowed-enum.rs || true
-      rm -vr src/test/debuginfo/generic-struct-style-enum.rs || true
-      rm -vr src/test/debuginfo/generic-tuple-style-enum.rs || true
-      rm -vr src/test/debuginfo/packed-struct.rs || true
-      rm -vr src/test/debuginfo/recursive-struct.rs || true
-      rm -vr src/test/debuginfo/struct-in-enum.rs || true
-      rm -vr src/test/debuginfo/struct-style-enum.rs || true
-      rm -vr src/test/debuginfo/tuple-style-enum.rs || true
-      rm -vr src/test/debuginfo/union-smoke.rs || true
-      rm -vr src/test/debuginfo/unique-enum.rs || true
-
-      # make external cargo work until https://github.com/rust-lang/rust/issues/38950 is fixed
-      sed -i "s#    def cargo(self):#    def cargo(self):\n        return \"${rustPlatform.rust.cargo}/bin/cargo\"#g" src/bootstrap/bootstrap.py
-      substituteInPlace \
-        src/bootstrap/config.rs \
-        --replace \
-        'self.cargo = Some(push_exe_path(path, &["bin", "cargo"]));' \
-        ''$'self.cargo = Some(\n                        "${rustPlatform.rust.cargo}\\\n                        /bin/cargo".into());'
-    '';
-  });
+
+    doCheck = false;
+  };
 
   cargo = callPackage ./cargo.nix rec {
-    version = "nightly-2017-01-10";
-    srcRev = "6dd4ff0f5b59fff524762c4a7b65882adda713c0";
-    srcSha = "1x6d42qq2zhr1iaw0m0nslhv6c1w6x6schmd96max0p9xb47l9zj";
-    depsSha256 = "1sywnhzgambmqsjs2xlnzracfv7vjljha55hgf8wca2marafr5dp";
+    version = "0.18.0";
+    srcRev = "fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666";
+    srcSha = "164iywv1l3v87b0pznf5kkzxigd6w19myv9d7ka4c65zgrk9n9px";
+    depsSha256 = "1mrgd8ib48vxxbhkvsqqq4p19sc6b74x3cd8p6lhhlm6plrajrvm";
 
     inherit rustc; # the rustc that will be wrapped by cargo
     inherit rustPlatform; # used to build cargo
diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index d8d0681a0c2..bdb11bd5b52 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -1,87 +1,23 @@
 { stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl }:
 
 let
-  inherit (stdenv.lib) optionalString;
-
   platform = if stdenv.system == "x86_64-linux"
     then "x86_64-unknown-linux-gnu"
     else throw "missing bootstrap url for platform ${stdenv.system}";
 
   bootstrapHash =
     if stdenv.system == "x86_64-linux"
-    then "1d5h34dkm1r1ff562szygn9xk2qll1pjryvypl0lazzanxdh5gv5"
+    then "21f38f46bf16373d3240a38b775e1acff9bb429f1570a4d4da8b3000315d0085"
     else throw "missing bootstrap hash for platform ${stdenv.system}";
 
-  needsPatchelf = stdenv.isLinux;
-
   src = fetchurl {
      url = "https://static.rust-lang.org/dist/${version}/rust-nightly-${platform}.tar.gz";
      sha256 = bootstrapHash;
   };
 
-  version = "2017-03-16";
-in
-
-rec {
-  inherit buildRustPackage;
-
-  rustc = stdenv.mkDerivation rec {
-    name = "rustc-nightly-${version}";
-
-    inherit version;
-    inherit src;
-
-    meta = with stdenv.lib; {
-      homepage = http://www.rust-lang.org/;
-      description = "A safe, concurrent, practical language";
-      maintainers = with maintainers; [ qknight ];
-      license = [ licenses.mit licenses.asl20 ];
-    };
-
-    buildInputs = [ makeWrapper ];
-    phases = ["unpackPhase" "installPhase"];
-
-    installPhase = ''
-      ./install.sh --prefix=$out \
-        --components=rustc,rust-std-x86_64-unknown-linux-gnu
-
-      ${optionalString needsPatchelf ''
-        patchelf \
-          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-          "$out/bin/rustc"
-        patchelf \
-          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-          "$out/bin/rustdoc"
-      ''}
-    '';
-
-  };
-  cargo = stdenv.mkDerivation rec {
-    name = "cargo-nightly-${version}";
-
-    inherit version;
-    inherit src;
-
-    meta = with stdenv.lib; {
-      homepage = http://www.rust-lang.org/;
-      description = "A safe, concurrent, practical language";
-      maintainers = with maintainers; [ qknight ];
-      license = [ licenses.mit licenses.asl20 ];
-    };
-
-    buildInputs = [ makeWrapper curl ];
-    phases = ["unpackPhase" "installPhase"];
-
-    installPhase = ''
-      ./install.sh --prefix=$out \
-        --components=cargo
-
-      ${optionalString needsPatchelf ''
-        patchelf \
-          --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \
-          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-          "$out/bin/cargo"
-      ''}
-    '';
-  };
-}
+  version = "2017-05-30";
+in import ./binaryBuild.nix
+  { inherit stdenv fetchurl makeWrapper cacert zlib buildRustPackage curl;
+    inherit version src platform;
+    versionType = "nightly";
+  }
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index 4d1d20066b8..da52ac37ab3 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -1,8 +1,21 @@
-#!/bin/sh
+#!/usr/bin/env bash
+
+# All rust-related downloads can be found at
+# https://static.rust-lang.org/dist/index.html.  To find the date on
+# which a particular thing was last updated, look for the *-date.txt
+# file, e.g.
+# https://static.rust-lang.org/dist/channel-rust-beta-date.txt
 
 PLATFORMS="i686-unknown-linux-gnu x86_64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin"
 BASEURL="https://static.rust-lang.org/dist"
-VERSION=$1
+DATE=$1
+VERSION=$2
+
+if [[ -z  $DATE ]]
+then
+    echo "No date supplied"
+    exit -1
+fi
 
 if [[ -z  $VERSION ]]
 then
@@ -12,6 +25,6 @@ fi
 
 for PLATFORM in $PLATFORMS
 do
-    URL="$BASEURL/rust-$VERSION-$PLATFORM.tar.gz.sha256"
+    URL="$BASEURL/$DATE/rust-$VERSION-$PLATFORM.tar.gz.sha256"
     curl $URL
 done
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index a693afb8b59..b05d0448588 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,25 +1,20 @@
 { stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
 , llvm, jemalloc, ncurses, darwin, binutils, rustPlatform, git, cmake, curl
-
-, isRelease ? false
-, shortVersion
+, which, libffi, gdb
+, version
 , forceBundledLLVM ? false
-, srcSha, srcRev
+, src
 , configureFlags ? []
 , patches
 , targets
 , targetPatches
 , targetToolchains
+, doCheck ? true
 } @ args:
 
 let
   inherit (stdenv.lib) optional optionalString;
 
-  version = if isRelease then
-      "${shortVersion}"
-    else
-      "${shortVersion}-g${builtins.substring 0 7 srcRev}";
-
   procps = if stdenv.isDarwin then darwin.ps else args.procps;
 
   llvmShared = llvm.override { enableSharedLibraries = true; };
@@ -32,6 +27,8 @@ stdenv.mkDerivation {
   name = "rustc-${version}";
   inherit version;
 
+  inherit src;
+
   __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];
 
   NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
@@ -45,19 +42,13 @@ stdenv.mkDerivation {
   # Increase codegen units to introduce parallelism within the compiler.
   RUSTFLAGS = "-Ccodegen-units=10";
 
-  src = fetchgit {
-    url = https://github.com/rust-lang/rust;
-    rev = srcRev;
-    sha256 = srcSha;
-  };
-
   # We need rust to build rust. If we don't provide it, configure will try to download it.
   configureFlags = configureFlags
                 ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
+                ++ [ "--enable-vendor" "--disable-locked-deps" ]
+                ++ [ "--enable-llvm-link-shared" ]
                 # ++ [ "--jemalloc-root=${jemalloc}/lib"
                 ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ]
-                # TODO: Remove when fixed build with rustbuild
-                ++ [ "--disable-rustbuild" ]
                 ++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
                 ++ optional (targets != []) "--target=${target}"
                 ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
@@ -67,17 +58,8 @@ stdenv.mkDerivation {
   passthru.target = target;
 
   postPatch = ''
-    substituteInPlace src/rust-installer/gen-install-script.sh \
-      --replace /bin/echo "$(type -P echo)"
-    substituteInPlace src/rust-installer/gen-installer.sh \
-      --replace /bin/echo "$(type -P echo)"
-
-    # Workaround for NixOS/nixpkgs#8676
-    substituteInPlace mk/rustllvm.mk \
-      --replace "\$\$(subst  /,//," "\$\$(subst /,/,"
-
     # Fix dynamic linking against llvm
-    ${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
+    #${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
 
     # Fix the configure script to not require curl as we won't use it
     sed -i configure \
@@ -98,15 +80,25 @@ stdenv.mkDerivation {
     # https://reviews.llvm.org/rL281650
     rm -vr src/test/run-pass/issue-36474.rs || true
 
+    # Disable some failing gdb tests. Try re-enabling these when gdb
+    # is updated past version 7.12.
+    rm src/test/debuginfo/basic-types-globals.rs
+    rm src/test/debuginfo/basic-types-mut-globals.rs
+    rm src/test/debuginfo/c-style-enum.rs
+    rm src/test/debuginfo/lexical-scopes-in-block-expression.rs
+    rm src/test/debuginfo/limited-debuginfo.rs
+    rm src/test/debuginfo/simple-struct.rs
+    rm src/test/debuginfo/simple-tuple.rs
+    rm src/test/debuginfo/vec-slices.rs
+    rm src/test/debuginfo/vec.rs
+
+    # this can probably be removed when rust is updated beyond 1.17
+    # fixes a warning in the test harness (I think?) which fails the build due
+    # to strict warnings
+    sed -i '/static_in_const/d' src/tools/compiletest/src/main.rs
+
     # Useful debugging parameter
     # export VERBOSE=1
-  '' +
-  # In src/compiler-rt/cmake/config-ix.cmake, the cmake build falls
-  # back to darwin 10.4. This causes the OS name to be recorded as
-  # "10.4" rather than the expected "osx". But mk/rt.mk expects the
-  # built library name to have an "_osx" suffix on darwin.
-  optionalString stdenv.isDarwin ''
-    substituteInPlace mk/rt.mk --replace "_osx" "_10.4"
   '';
 
   preConfigure = ''
@@ -120,7 +112,8 @@ stdenv.mkDerivation {
   dontUseCmakeConfigure = true;
 
   # ps is needed for one of the test cases
-  nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git cmake ];
+  nativeBuildInputs = [ file python2 procps rustPlatform.rust.rustc git cmake
+    which libffi gdb ];
 
   buildInputs = [ ncurses ] ++ targetToolchains
     ++ optional (!forceBundledLLVM) llvmShared;
@@ -141,7 +134,8 @@ stdenv.mkDerivation {
     sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs
   '';
 
-  doCheck = true;
+  inherit doCheck;
+
   dontSetConfigureCross = true;
 
   # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764
@@ -151,7 +145,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = http://www.rust-lang.org/;
     description = "A safe, concurrent, practical language";
-    maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ];
+    maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ];
     license = [ licenses.mit licenses.asl20 ];
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a4864faa6d..d807c5e36e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5724,12 +5724,19 @@ with pkgs;
 
   rust = rustStable;
   rustStable = callPackage ../development/compilers/rust {
-    inherit (llvmPackages_39) llvm;
+    inherit (llvmPackages_4) llvm;
   };
   rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {}));
-  rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix {
-    rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
-  }));
+
+  rustNightly = rustBeta;
+
+  # rust support in nixpkgs isn't yet well maintained enough for us to
+  # pretend to support nightlies in a meaningful way.
+
+  # rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix {
+  #   rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
+  # }));
+
   rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {
      buildRustPackage = callPackage ../build-support/rust {
        rust = rustNightlyBin;
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index db147fa9ca9..2fa9ac926d7 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2017-05-15";
-  rev = "c73d61e84a623168a1a9bfff9c71defcc3416631";
-  sha256 = "0c2f4f48bacx0lq33bjw806fq5r4nvbrxvl74n7gd2y44ldafnir";
+  version = "2017-05-31";
+  rev = "d85037df75a945b5a368d6ceaa7e030b67473a51";
+  sha256 = "0567lfjxvbn4pb39557yfdq1nm4ssgbvzvzkrdqnx9sx5xyx7n4s";
 
   src = fetchFromGitHub {
       inherit rev;
-- 
GitLab


From 6bdebf252c48cd60694c8f8c786d6d54ee5e1712 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 10 Jun 2017 15:37:40 -0700
Subject: [PATCH 0577/1490] musl: 1.1.15 -> 1.1.16

---
 pkgs/os-specific/linux/musl/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 54d6dbcb1ca..e37a2b9f55e 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
-  version = "1.1.15";
+  version = "1.1.16";
 
   src = fetchurl {
     url    = "http://www.musl-libc.org/releases/${name}.tar.gz";
-    sha256 = "1ymhxkskivzph0q34zadwfglc5gyahqajm7chqqn2zraxv3lgr4p";
+    sha256 = "048h0w4yjyza4h05bkc6dpwg3hq6l03na46g0q1ha8fpwnjqawck";
   };
 
   enableParallelBuilding = true;
@@ -24,13 +24,7 @@ stdenv.mkDerivation rec {
     "--enable-static"
   ];
 
-  patches = [
-    # CVE-2016-8859: http://www.openwall.com/lists/oss-security/2016/10/19/1
-    (fetchpatch {
-      url = "https://git.musl-libc.org/cgit/musl/patch/?id=c3edc06d1e1360f3570db9155d6b318ae0d0f0f7";
-      sha256 = "15ih0aj27lz4sgq8r5jndc3qy5gz3ciraavrqpp0vw8h5wjcsb9v";
-    })
-  ];
+  patches = [];
 
   dontDisableStatic = true;
 
-- 
GitLab


From 219bb1c80c33b02c739b3a7cd206543efad8fe92 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 10 Jun 2017 19:36:14 -0400
Subject: [PATCH 0578/1490] Add packageSourceOverrides function to haskell
 package sets

---
 .../development/haskell-modules/make-package-set.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index e599b56545d..52988dc4cbb 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -116,6 +116,18 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     # Creates a Haskell package from a source package by calling cabal2nix on the source.
     callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; });
 
+    # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet
+    # Given a set whose values are either paths or version strings, produces
+    # a package override set (i.e. (self: super: { etc. })) that sets
+    # the packages named in the input set to the corresponding versions
+    packageSourceOverrides =
+      overrides: self: super: pkgs.lib.mapAttrs (name: src:
+        let isPath = x: builtins.substring 0 1 (toString x) == "/";
+            generateExprs = if isPath src
+                               then self.callCabal2nix
+                               else self.callHackage;
+        in generateExprs name src {}) overrides;
+
     ghcWithPackages = selectFrom: withPackages (selectFrom self);
 
     ghcWithHoogle = selectFrom:
-- 
GitLab


From 01e047d0887ae4be165823109ebd095cd8025813 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 10 Jun 2017 20:04:46 -0400
Subject: [PATCH 0579/1490] Add haskellPackages.developPackage for local
 development default.nixes

---
 pkgs/development/haskell-modules/default.nix      | 12 +++++++-----
 .../haskell-modules/make-package-set.nix          | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8e7d19e089f..6b5812cd07f 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -12,17 +12,19 @@ let
 
   haskellPackages = makePackageSet {
     package-set = initialPackages;
-    inherit ghc;
+    inherit ghc extensible-self;
   };
 
   commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
   nixConfiguration = import ./configuration-nix.nix { inherit pkgs; };
 
-in
-
-  makeExtensible
+  extensible-self = makeExtensible
     (extends overrides
       (extends packageSetConfig
         (extends compilerConfig
           (extends commonConfiguration
-            (extends nixConfiguration haskellPackages)))))
+            (extends nixConfiguration haskellPackages)))));
+
+in
+
+  extensible-self
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 52988dc4cbb..f933d6ebfeb 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -7,7 +7,8 @@
 # arguments:
 #  * ghc package to use
 #  * package-set: a function that takes { pkgs, stdenv, callPackage } as first arg and `self` as second
-{ ghc, package-set }:
+#  * extensible-self: the final, fully overriden package set usable with the nixpkgs fixpoint overriding functionality
+{ ghc, package-set, extensible-self }:
 
 # return value: a function from self to the package set
 self: let
@@ -128,6 +129,18 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
                                else self.callHackage;
         in generateExprs name src {}) overrides;
 
+    # : { root : Path, source-overrides : Defaulted (Either Path VersionNumber } -> NixShellAwareDerivation
+    # Given a path to a haskell package directory whose cabal file is
+    # named the same as the directory name, and an optional set of
+    # source overrides as appropriate for the 'packageSourceOverrides'
+    # function, return a derivation appropriate for nix-build or nix-shell
+    # to build that package.
+    developPackage = { root, source-overrides ? {} }:
+      let name = builtins.baseNameOf root;
+          drv =
+            (extensible-self.extend (self.packageSourceOverrides source-overrides)).callCabal2nix name root {};
+      in if pkgs.lib.inNixShell then drv.env else drv;
+
     ghcWithPackages = selectFrom: withPackages (selectFrom self);
 
     ghcWithHoogle = selectFrom:
-- 
GitLab


From 1545229fa7424568af89e2830d6bb7ceabaa5092 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 04:37:24 +0300
Subject: [PATCH 0580/1490] biosdevname: Broken on aarch64

Uses inline x86 asm:
https://nix-cache.s3.amazonaws.com/log/lqpnvr2xch5vv4zk2n0v4nlji8c88129-biosdevname-0.7.2.drv
---
 pkgs/tools/networking/biosdevname/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix
index 906e3eda3a6..ae36980a60d 100644
--- a/pkgs/tools/networking/biosdevname/default.nix
+++ b/pkgs/tools/networking/biosdevname/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Udev helper for naming devices per BIOS names";
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = ["x86_64-linux" "i686-linux"];
     maintainers = with maintainers; [ cstrahan ];
   };
 }
-- 
GitLab


From 94fd91742a32f7ea8e79337744c6e2e3f24f5bb9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 04:39:57 +0300
Subject: [PATCH 0581/1490] bristol: Broken on aarch64

https://nix-cache.s3.amazonaws.com/log/lidml6isyxw55aly6p8q40y2ga64ay01-bristol-0.60.11.drv
---
 pkgs/applications/audio/bristol/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index 3b94235889c..28155fd2317 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation  rec {
     description = "A range of synthesiser, electric piano and organ emulations";
     homepage = http://bristol.sourceforge.net;
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = ["x86_64-linux" "i686-linux"];
     maintainers = [ maintainers.goibhniu ];
   };
 }
-- 
GitLab


From 6e3499efc521cf1381819f14fa3bc81f43bbee5f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 04:41:47 +0300
Subject: [PATCH 0582/1490] botan: Broken on aarch64

https://nix-cache.s3.amazonaws.com/log/2vjsb2fs5z9nkr4h4sjwvgy0vflbq4hg-botan-1.10.15.drv
---
 pkgs/development/libraries/botan/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix
index b37fd6079b9..2580b959bf2 100644
--- a/pkgs/development/libraries/botan/generic.nix
+++ b/pkgs/development/libraries/botan/generic.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Cryptographic algorithms library";
     maintainers = with maintainers; [ raskin ];
-    platforms = platforms.unix;
+    platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
     license = licenses.bsd2;
   };
   passthru.updateInfo.downloadPage = "http://files.randombit.net/botan/";
-- 
GitLab


From fa67cf5dab5604b589bd92aaee4fb4104862836f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 04:43:15 +0300
Subject: [PATCH 0583/1490] chmlib: Broken on aarch64

https://nix-cache.s3.amazonaws.com/log/dynpb96qlcgk0bgx5x1kmghv2qwfjcfk-chmlib-0.40.drv
---
 pkgs/development/libraries/chmlib/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index e572db68e83..fbefee48d5b 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "chmlib-0.40";
-  
+
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.bz2";
     sha256 = "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l";
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.jedrea.com/chmlib;
-    license = "LGPL";
+    license = stdenv.lib.licenses.lgpl2;
     description = "A library for dealing with Microsoft ITSS/CHM format files";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
   };
 }
-- 
GitLab


From d373b7b61af6ad727e5ce40ecd2aacd997271a86 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 04:45:44 +0300
Subject: [PATCH 0584/1490] pixie: Broken on aarch64

https://nix-cache.s3.amazonaws.com/log/m7r1nzz080wvgrbph7ss145aiwgs24dh-pixie-0-r1356-jit.drv
---
 pkgs/development/interpreters/pixie/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index 7cb2a356f95..f4f52ec4ed3 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -79,7 +79,7 @@ let
       description = "A clojure-like lisp, built with the pypy vm toolkit";
       homepage = "https://github.com/pixie-lang/pixie";
       license = stdenv.lib.licenses.lgpl3;
-      platforms = stdenv.lib.platforms.linux;
+      platforms = ["x86_64-linux" "i686-linux"];
     };
   };
 in build (builtins.getAttr variant variants)
-- 
GitLab


From f6072d7b6ee8b96554cba0920bc1768e4c92adba Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 11 Jun 2017 08:51:47 +0200
Subject: [PATCH 0585/1490] rustc: disable lldb tests on darwin

---
 pkgs/development/compilers/rust/rustc.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index b05d0448588..f4004c01df2 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -99,6 +99,11 @@ stdenv.mkDerivation {
 
     # Useful debugging parameter
     # export VERBOSE=1
+  ''
+  + optionalString stdenv.isDarwin ''
+    # Disable all lldb tests.
+    # error: Can't run LLDB test because LLDB's python path is not set
+    rm -vr src/test/debuginfo/*
   '';
 
   preConfigure = ''
-- 
GitLab


From a38b0d000c9001f6b9bc791c06ab8f5dc8595b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Jun 2017 09:45:54 +0200
Subject: [PATCH 0586/1490] mesa: maintenance 17.1.1 -> 17.1.2

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 130f75ae91b..d606fcd1548 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.1.1";
+  version = "17.1.2";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef";
+    sha256 = "0937804f43746339b1f9540d8f9c8b4a1bb3d3eec0e4020eac283b8799798239";
   };
 
   prePatch = "patchShebangs .";
-- 
GitLab


From 403b3c2dddceefac7d34af6cc69d63b759f2ed1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Jun 2017 09:46:12 +0200
Subject: [PATCH 0587/1490] xkeyboard-config: 2.20 -> 2.21

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 452f5081a20..eb08986e702 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2254,11 +2254,11 @@ let
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
-    name = "xkeyboard-config-2.20";
+    name = "xkeyboard-config-2.21";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2;
-      sha256 = "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi";
+      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2;
+      sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h";
     };
     buildInputs = [pkgconfig libX11 xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 46c07f291ac..8d9b66f21ae 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -177,7 +177,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
 mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2
 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
-mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2
 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
-- 
GitLab


From caec2fcdd07b10fbdc4111aa3ffb11a646393f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 11 Jun 2017 12:08:26 +0100
Subject: [PATCH 0588/1490] vimPlugins.ensime-vim: make additional nix code
 persistent

---
 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim

diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim
new file mode 100644
index 00000000000..7d6267e9515
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/ensime-vim
@@ -0,0 +1 @@
+    pythonDependencies = with pythonPackages; [ sexpdata websocket_client ];
-- 
GitLab


From 425bc07d435face36888b2f4d244e93370081156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 11 Jun 2017 12:09:29 +0100
Subject: [PATCH 0589/1490] vimPlugins: update source

---
 pkgs/misc/vim-plugins/default.nix | 315 +++++++++++++++---------------
 1 file changed, 161 insertions(+), 154 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 416262f9e1e..a56f21f31e6 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -113,8 +113,6 @@ rec {
 
   # --- generated packages bellow this line ---
 
-
-
   CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "CSApprox-2013-07-26";
     src = fetchgit {
@@ -182,11 +180,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2017-05-15";
+    name = "Syntastic-2017-05-30";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "5efeecece3f512076513e8ee1e7444157a16a77b";
-      sha256 = "1dzhgmgbfh9dda72y3d5gb7zjjm2k55wd4z3wy8ixip3cp4mkiqx";
+      rev = "159900a1a2d3db2c4d3757f1085f377c6e59ac02";
+      sha256 = "1bq3di4kr855sma0qp6gyrrphy23hy2mn9ws5knnzicxmq5fixqb";
     };
     dependencies = [];
 
@@ -204,11 +202,11 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2017-02-18";
+    name = "Tagbar-2017-06-05";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "959f48798136bfd4ce60075d3c86c580fcf5e5c5";
-      sha256 = "02v30744w2jcavwk9cjdy51ldpqylj6pgg6zavj4dni7knbnq3jm";
+      rev = "87a1263f5d8b3623bee5e6036254480e668b5f74";
+      sha256 = "1s6727vwrcikv9dmkl6s1c2r2r107p733j8sjjxshl68bi62ms8z";
     };
     dependencies = [];
 
@@ -226,11 +224,11 @@ rec {
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-05-20";
+    name = "The_NERD_tree-2017-06-05";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "0b84d458d607f0326b7718c92ba20f2627f63342";
-      sha256 = "0gyqaz29ps9hidgnllcpwz91qac9r4xfqb43azgrydzv3j8m7lya";
+      rev = "a9ab90198be0581fe961125bba3f282a666ef7ff";
+      sha256 = "0qf2xjr2hyz08xalgv6yjr5rrrcxgv76sshr7d62sygg6qfsnbgw";
     };
     dependencies = [];
 
@@ -286,11 +284,11 @@ rec {
   };
 
   clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clang_complete-2017-02-16";
+    name = "clang_complete-2017-06-03";
     src = fetchgit {
       url = "git://github.com/Rip-Rip/clang_complete";
-      rev = "b1a507fbc27ef581c966b035f52eafae773a6f32";
-      sha256 = "19zs03giv8h5xmv18y9zn85sxr8akphvbscclrqhs4cf88285cgl";
+      rev = "c963df1cd10463166e1245445bff27f28e89f9f7";
+      sha256 = "1y7zx3ywir86mxgg86kb8z7xmxadcmv8ycc2i1y8s7jz6pv2v40l";
     };
     dependencies = [];
     # In addition to the arguments you pass to your compiler, you also need to
@@ -377,11 +375,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2017-05-19";
+    name = "fugitive-2017-06-08";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "d6e7e20123ef3892c041e4d9fbaf67a68b144a94";
-      sha256 = "1fq3159pqwmf8z954r6vi0im790idnmgjrgh7raq8walcni72g78";
+      rev = "be2ff98db543990d7e59a90189733d7a779788fd";
+      sha256 = "1lkdypibsw2p45wrdcc8ambynszdcwiqyh50zhflf2slpd98iz3m";
     };
     dependencies = [];
 
@@ -410,11 +408,11 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2017-05-18";
+    name = "vim-autoformat-2017-06-02";
     src = fetchgit {
       url = "https://github.com/Chiel92/vim-autoformat";
-      rev = "31c2de23982973737d624e6a473098af100928a2";
-      sha256 = "140nl41pcac3xbw3scj9fmyrlsga4adnsgwn840nmcj1wcc287qh";
+      rev = "41d1c14de27f76f400c51d45b1617319266d9f4a";
+      sha256 = "0myhs5fjq9lr0ag49scdhchsifhc7djmyrx88nhsing33l4nbjzk";
     };
     dependencies = [];
 
@@ -432,22 +430,22 @@ rec {
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-05-21";
+    name = "tsuquyomi-2017-05-31";
     src = fetchgit {
       url = "https://github.com/Quramy/tsuquyomi";
-      rev = "cdae8ecde529019d50bdf2f25b782e9ee408a7c0";
-      sha256 = "07hadplv29pm6kv3ay6w7a6nwzrmxiwn3fmllgl2vfrnqx82fknx";
+      rev = "46dfcd72b9701a52331349ba0d5c7596167093ab";
+      sha256 = "12rvkc3wf959siijrgld56xvfhgacglxb69z4q567fsjv3ynqnrv";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-05-20";
+    name = "deoplete-nvim-2017-06-06";
     src = fetchgit {
       url = "https://github.com/Shougo/deoplete.nvim";
-      rev = "493a97d151b6b89993194b442ca5f6d5e969e9f8";
-      sha256 = "1k5ziaqciqif7as4fk2hnc0r8kva3bgvx5zi11k9qg541ixz29s2";
+      rev = "8bd63b7e4f9bb3cf2040724dd71cff195564166a";
+      sha256 = "1jf6l5li7m4m2ijfndqgm95mpw9c188vfbsggnzp2ivcxc7bd8bv";
     };
     dependencies = [];
 
@@ -487,11 +485,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-04-26";
+    name = "clighter8-2017-06-10";
     src = fetchgit {
       url = "https://github.com/bbchung/clighter8";
-      rev = "8b892435fda7cb32378c7e49a2064126dbb6b9af";
-      sha256 = "1ixqs1id9q24wwdw1izmznz8yk68pm74336ixhs8lbj9rn8my5gn";
+      rev = "c83091b35c0d09cee0d6850c91824f72a0d8c513";
+      sha256 = "105a4c753n57svyz8abs5w0v2747pyfly7dzjyh6i5yraaq2g7bx";
     };
     dependencies = [];
     preFixup = ''
@@ -501,11 +499,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-05-22";
+    name = "neomake-2017-06-10";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "4979ef24fdc061a550b013daab5ef779517e29ce";
-      sha256 = "0q81ig92kd3xrlh8l2gnx26s84cnb221jcqjl0fyvi09d99mfil1";
+      rev = "cc916f35fa3d131b2d6529d0e47bde141d99b7c3";
+      sha256 = "00kz9ny3z4j6nhgzxarj8d072k6sf4qiwgfj4ckmllq5fyb2ik4l";
     };
     dependencies = [];
 
@@ -545,11 +543,11 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2017-02-26";
+    name = "vim-tmux-navigator-2017-06-01";
     src = fetchgit {
       url = "https://github.com/christoomey/vim-tmux-navigator";
-      rev = "2fc1ed42ab580ab47c506ab0bef09f1dbb9ff04d";
-      sha256 = "1mw0x3kcxvhfypzd7yj6bcknp6c5bh4zb4r9b16n1r7gplvwv8jn";
+      rev = "b93e176b7150942d9f0556347d1c8f6d0b690124";
+      sha256 = "1xjvx4svv1kdqmv114ghx7cfrb5kmbljlwac8bsw36rq3kyknwrn";
     };
     dependencies = [];
 
@@ -567,11 +565,11 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2017-04-28";
+    name = "ctrlp-vim-2017-06-04";
     src = fetchgit {
       url = "https://github.com/ctrlpvim/ctrlp.vim";
-      rev = "cbd52e3bdd388afd7accaba6e0aea754f32da271";
-      sha256 = "08d6zrwsdrpjm9az5zdzdx8c27dmnc9flvsfp3ig6yz6jinvwc1x";
+      rev = "019f20a6f280b875b3812ea4d03a4cf1647cd0d9";
+      sha256 = "1zyl140ykjc1g7kc306f03q7xcxjzx757hphdgcb63ksql2k1f33";
     };
     dependencies = [];
 
@@ -622,11 +620,11 @@ rec {
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2017-05-21";
+    name = "vim-2017-05-24";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "7a4798a6d049905a71d9cb82aaf0db5d2e116f7d";
-      sha256 = "1h5r85pv7mcyhczc6ijbfv46xjzxrw3lbbfsxlycx0hx8b8jfpql";
+      rev = "6a5bf34193927c70b6c21dcbe1c130d2ab0951d6";
+      sha256 = "1mmqrc52k133ddpxcs0mxjph4n4b856r5wbs17bgcpk95cfbspb1";
     };
     dependencies = [];
 
@@ -717,7 +715,7 @@ rec {
       sha256 = "194qwj3glw3l9yxvd26vn10kl06v1sykqx2cznskqa3vj3z8jb01";
     };
     dependencies = ["vimproc" "vimshell" "self" "forms"];
-
+    pythonDependencies = with pythonPackages; [ sexpdata websocket_client ];
   };
 
   YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@@ -732,11 +730,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-05-22";
+    name = "vim-go-2017-06-10";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "05efdfe80f433538932af82c1f168b1af4d30b7f";
-      sha256 = "19nyclwigrcxs4hzjkyj971ifm8r0q9991vcs0a4n860c66l9xhs";
+      rev = "7b93bae4b08091c4d6243dafc2e040a84ea91d1d";
+      sha256 = "0hrzgxlkqvlh45pvli2aqnzx58vyjhmcz6rr28cm7x8b0wf20r00";
     };
     dependencies = [];
 
@@ -765,11 +763,11 @@ rec {
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2017-05-22";
+    name = "psc-ide-vim-2017-06-10";
     src = fetchgit {
       url = "https://github.com/frigoeu/psc-ide-vim";
-      rev = "b97523df5e31d1a86cb52fb0188b87a72aa7633d";
-      sha256 = "09ibx86wq24vyk8cpzlfqbwcygnr3y4qvscfjyrj8pzg4mlfpw0j";
+      rev = "f5fc6aadf805ec0186efc63cbf294f251c1b2056";
+      sha256 = "0syrvkbbrcxmss07sppgsg43j241fm6yqj8ii54fm51vss02qxp8";
     };
     dependencies = [];
 
@@ -809,33 +807,33 @@ rec {
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2017-05-07";
+    name = "idris-vim-2017-06-05";
     src = fetchgit {
       url = "https://github.com/idris-hackers/idris-vim";
-      rev = "7aeb9fc143730a4a52f2635248b5658c64696831";
-      sha256 = "0pg6q16z00g3imnb7d9pb0qv8jvnjipr0shqvlmqy0917rkhlapx";
+      rev = "0709927e689f4f4158661d4eb8ac6ce310cd7548";
+      sha256 = "05fiamb92l7d08kxv1jk5xpqvkxphr9vqi3bfa203mjkvymd3x34";
     };
     dependencies = [];
 
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2017-05-19";
+    name = "calendar-vim-2017-05-28";
     src = fetchgit {
       url = "https://github.com/itchyny/calendar.vim";
-      rev = "7571c1792b445cce5e98fd7df53b20b98ef28593";
-      sha256 = "08jxdyjy6jsrlmi7d3bwfpd1kmbaz0n7lh8cvmxh99kyymqlpn1m";
+      rev = "12c06ba87f32002b3c9f34fe881bcbaf3ab1721b";
+      sha256 = "02ss39227c8jfn95hqwwpgn1rvrgwib8h5h0j9rvl6x491jj98wg";
     };
     dependencies = [];
 
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2017-04-21";
+    name = "lightline-vim-2017-05-30";
     src = fetchgit {
       url = "https://github.com/itchyny/lightline.vim";
-      rev = "6034e639e871cb33a436508a6c6ccbe3e236de4c";
-      sha256 = "0w37l1i8bfpcs6wx0h98c5b2f4kgi6b4357c0lhfmwprajh4pw7n";
+      rev = "ff74d6561487d220ed9d878172d8b55a79a4c17e";
+      sha256 = "0j8pn42vfc1ka6hjnfsanl98vlk2839am5d4ynz9p1j1hichiqzv";
     };
     dependencies = [];
 
@@ -963,11 +961,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2017-05-22";
+    name = "fzf-vim-2017-06-10";
     src = fetchgit {
       url = "https://github.com/junegunn/fzf.vim";
-      rev = "990834ab6cb86961e61c55a8e012eb542ceff10e";
-      sha256 = "17f4vlahap3bycgl3b78drq58rdlwi8kkl3z7l9jhsxvzvdvccl1";
+      rev = "cf60e546476f73514a326416916b6a98f88d8abd";
+      sha256 = "11cls65zfv9gzz8qmg44q0i03hmwhqb8i53lb42vdz2bzicdasv3";
     };
     dependencies = [];
 
@@ -1040,11 +1038,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-05-22";
+    name = "vimtex-2017-06-09";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "11bcdc95ba4f201f93f9857362cfea0d99e0a0db";
-      sha256 = "0qszla7x1zxm1v6l3iz14cvw5hcmb8yja6d01dr9fhlpx968xgwr";
+      rev = "0ae4e776cb78ce0c18635fecd6f518e3f40e5f80";
+      sha256 = "1iz87nr89wamxpg4whfqdfhp6qmfff6jjp58sjzh5q32lzzmi48s";
     };
     dependencies = [];
 
@@ -1110,11 +1108,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-05-07";
+    name = "vim-startify-2017-06-05";
     src = fetchgit {
       url = "https://github.com/mhinz/vim-startify";
-      rev = "1e251fb749640b2f4e6ccb812fccf5ad3ab9fd27";
-      sha256 = "178v9sqfdh51zfdm3wd4njgfm6d99ics6fa5bvm1v7gnj44zjxbj";
+      rev = "53c53b24440d14d7886484ad662549fc78550c40";
+      sha256 = "1w3kxvydnd7rh2fp3ra677dw11rsnmnm9bav92j3dkkb5afhmj3v";
     };
     dependencies = [];
 
@@ -1253,11 +1251,11 @@ rec {
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2017-03-09";
+    name = "python-mode-2017-06-09";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "73620c44c4cd036a8133f77e2f56ca8995640cff";
-      sha256 = "0d2f8lcpjsrj3i21yinsncm9aigp024vi7mfy2hxhii7jcdmh8q5";
+      rev = "4c426b98c2f9094f44bdbe02f43e44badfa61724";
+      sha256 = "0lpd5k2j22r5wx5x5wh97mdsfyspfxf23kh241l7zbfm573r4jy0";
     };
     dependencies = [];
 
@@ -1308,22 +1306,33 @@ rec {
   };
 
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "rust-vim-2017-01-01";
+    name = "rust-vim-2017-06-01";
     src = fetchgit {
       url = "https://github.com/rust-lang/rust.vim";
-      rev = "732b5fcb3652f81726d5f0f5b97c9027c01f057a";
-      sha256 = "0yrg0wlpc9nj5zf25vgr9zd1kwapds3f10njr0dw0wgxr7g204dz";
+      rev = "b77ac8ecbd4baaa23cca612e1c9b3df5ea23da9b";
+      sha256 = "07qkyils4dgl81lqifx0pr075m3mdpzifp1w5d0zw4zkpvb0v8nk";
     };
     dependencies = [];
 
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-05-14";
+    name = "neoformat-2017-06-09";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "269e644661655d82765ae6c0259bbf084fa1f83b";
-      sha256 = "08r0hjz8dykn19rkprnh8jimj6g1p2pz0gqcj6bal84xk4qky2xb";
+      rev = "a52b155f6cc2f401afb04f865b2198d47b393ddd";
+      sha256 = "1a0j1k3bm9mp9d622m4kh5n9r2q4330kd0n3n9n60kmy3bnpa5w1";
+    };
+    dependencies = [];
+
+  };
+
+  deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-rust-2017-05-30";
+    src = fetchgit {
+      url = "https://github.com/sebastianmarkow/deoplete-rust";
+      rev = "5447ee448d3d63cda4681e6309b1c18c493e1cd1";
+      sha256 = "1dr95vnp11zzia7vnwdhhrmkslnak77nps4zr447f34lxk185v5d";
     };
     dependencies = [];
 
@@ -1352,44 +1361,44 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-04-30";
+    name = "neocomplete-vim-2017-05-27";
     src = fetchgit {
       url = "https://github.com/shougo/neocomplete.vim";
-      rev = "0dbc6e4594db2e7fdd4c71b93e67b51e26c9c258";
-      sha256 = "182hyi43sqy3y37vyjiapv2knz9n4f42x9dr4p10rmgpigp23axg";
+      rev = "4fd73faa262f5e3063422d9fc244c65f1b758cf3";
+      sha256 = "0hl5incxkxb491vnf3j2hndv4x31ic6dgj7wqka1bfqjcl53wjfl";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2017-03-29";
+    name = "neosnippet-snippets-2017-06-11";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "2a9487bacb924d8e870612b6b0a2afb34deea0ae";
-      sha256 = "0917zlh7fin2172jmlbzkszb1dqafx6l0sgxf1nm1b0k083c9bjz";
+      rev = "0507e9c200a904a21fa5d15ee66a1ea9fe07bb01";
+      sha256 = "1rc67yqfhzqxq15sl258kdwgk8r55w470s0vcd1ax2h8yd4s7sc7";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-04-23";
+    name = "neosnippet-vim-2017-06-11";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "9996520d6bf1aaee21f66b5eb561c9f0b306216c";
-      sha256 = "0j7z05br2cjdssdks3mac51xmr7js192gy30811nzjizwm2hhcwk";
+      rev = "6f87e27d4e20ea8b71821df06f71818716a13cf3";
+      sha256 = "0wfbicqblz91w5rzndy8zirzf819abmjv1az8yd26q1bbh3j0jpb";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2017-05-22";
+    name = "unite-vim-2017-05-27";
     src = fetchgit {
       url = "https://github.com/shougo/unite.vim";
-      rev = "39dbd776f304d3a5f20483298be80991ed8fbd09";
-      sha256 = "0snrg3nbr25qkk3nskygzy68qwgf9si1llryxpi6h28ixkn8n3n0";
+      rev = "ada33d888934d8a9e60aa8ff828b651aaedb6457";
+      sha256 = "0f4vnp3avpy7ns5ndr29ibff9d8hazji95y6m5idvziswywzpwsy";
     };
     dependencies = [];
 
@@ -1502,22 +1511,22 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2017-04-23";
+    name = "vim-dispatch-2017-06-06";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "64ae8a26b9d8869aab9bef5b92602c8da541c7b7";
-      sha256 = "090qq295iwd8aaggffjysmc37xx9nad25da51dgdhm5jxqv469gp";
+      rev = "1beee74e5ae75c46fd3f1255cce2543769102dc0";
+      sha256 = "0jvcxr22i3yqcfvshl97939kki9ng9mvmf79qph3y9x2h0fhzikm";
     };
     dependencies = [];
 
   };
 
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2017-03-08";
+    name = "vim-eunuch-2017-06-08";
     src = fetchgit {
       url = "https://github.com/tpope/vim-eunuch";
-      rev = "dcd29a00eb708be211d856afd3fddfbff7bc6208";
-      sha256 = "1vq1qwhm27zmnp8xda1z27fhx835kni6ifcyix644shpd8mq8bi4";
+      rev = "b536b887072ff3cc382842ce9f675ec222302f4f";
+      sha256 = "0vp037kb12mawy186cm384m5hl0p051rihhm1jr2qck0vwaps58p";
     };
     dependencies = [];
 
@@ -1535,11 +1544,11 @@ rec {
   };
 
   vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-speeddating-2015-01-24";
+    name = "vim-speeddating-2017-05-24";
     src = fetchgit {
       url = "https://github.com/tpope/vim-speeddating";
-      rev = "426c792e479f6e1650a6996c683943a09344c21e";
-      sha256 = "1i8pndds1lk5afxl6nwsnl4vzszh0qxgqx7x11fp3vqw27c5bwn8";
+      rev = "a418667791f03694065948342f2d6c5cca8d0f32";
+      sha256 = "1wm33izawazh0dy70zjk6rkg30yrlldba5r1gypnr4barps702gw";
     };
     dependencies = [];
 
@@ -1568,11 +1577,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-05-19";
+    name = "youcompleteme-2017-06-05";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "263bd88bd54278dba94c4d6c43ad5fcde2fcd3bb";
-      sha256 = "1gggbigv7h21di7vxvpk252djhjfhppvjd26dqyhk885d5ddm4m6";
+      rev = "b20809332c3298cb954cff20006cb52955b54b2d";
+      sha256 = "19a9lyc2xx1qp39dgyyi74bnslh6vhdi4y55b61li07b5qa4sh20";
     };
     dependencies = [];
     buildPhase = ''
@@ -1594,11 +1603,11 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2017-05-14";
+    name = "vim-airline-themes-2017-05-24";
     src = fetchgit {
       url = "https://github.com/vim-airline/vim-airline-themes";
-      rev = "3a39c85598aae19052aa0e2fe0512c8b228c0136";
-      sha256 = "04bm0civzhvwx059q8hcd4zvg2qzy6qpzq41b86li4hzly32m5yn";
+      rev = "43fe3927b884dcf722f9109e39801db110186dab";
+      sha256 = "1rl4im3pllkfvc5z3shmwblzvp4s3lri3clzpirzqmywa027d0p8";
     };
     dependencies = [];
 
@@ -1748,22 +1757,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2017-05-18";
+    name = "vim-wakatime-2017-06-08";
     src = fetchgit {
       url = "https://github.com/wakatime/vim-wakatime";
-      rev = "00443e2b580314b0cdb2bc2be746c44e75030074";
-      sha256 = "0af34wc0fqhn1pb4dcm6ba5gnav7kg3wfchlciymv6pb8zvaqvfb";
+      rev = "a96180dd0e694e9a5dadfb65e4c3465a9184840f";
+      sha256 = "0wf108myrfjslf56xqiwsl2mkaqz7qn5k7ggvcfwmhp91lzl5aan";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2017-03-02";
+    name = "command-t-2017-06-08";
     src = fetchgit {
       url = "https://github.com/wincent/command-t";
-      rev = "5a19460ea0eab0ca617a8dbf405f7a506eca4ff6";
-      sha256 = "0vzw5cvlsw0cs2jp52qbc7nghw4jsbldrbkynbx8g7nrh36847my";
+      rev = "3f0d21a06d9b936bcd79970c1b2301b05dd297bc";
+      sha256 = "15wil973sqfgvix9li15qk49kv9l3rn8zqis2cl71k6xh1xvd9ff";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1798,11 +1807,11 @@ rec {
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2017-03-21";
+    name = "deoplete-go-2017-05-26";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-go";
-      rev = "7990da5c8c89a47e0ccd3b7e60a836a6f115641a";
-      sha256 = "0ybd9sg4x8pczvl0hz5azzs2sn4nyc7la9890xh373dv3lyb6gk7";
+      rev = "aef73fdf275053a6fb00c3f66d1f18821bc74bd3";
+      sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq";
     };
     dependencies = [];
     buildInputs = [ python3 ];
@@ -1815,22 +1824,22 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-04-26";
+    name = "deoplete-jedi-2017-06-11";
     src = fetchgit {
       url = "https://github.com/zchee/deoplete-jedi";
-      rev = "58354e749d81a55cc7e591beb4b4628b5e3cbd9e";
-      sha256 = "1j5vp6yspnjqnrrfqvhz0xwhc4v1z73y0170nxpxw7xlb80bi05m";
+      rev = "b7e789ef8b45b207650adb1af5e2e7f188053fe1";
+      sha256 = "0xv7ggwyl332yr93rqmf1li0zz8rzhgb10cvd78jssdvlazi3mc8";
     };
     dependencies = [];
 
   };
 
   goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "goyo-2017-04-02";
+    name = "goyo-2017-06-01";
     src = fetchgit {
       url = "git://github.com/junegunn/goyo.vim";
-      rev = "64e750f726d8758c493931938a17c50f75e6f823";
-      sha256 = "0g1kark21kljrk7i0ig8gfdh5kva8vj80cvi4jbph4rmrbxwjc7x";
+      rev = "5b8bd0378758c1d9550d8429bef24b3d6d78b592";
+      sha256 = "0jh2gyf6v1vl12hygzwylzsj1ivx7r6xrd75k2wfsy91b2pm9srj";
     };
     dependencies = [];
 
@@ -1870,11 +1879,11 @@ rec {
   };
 
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2017-05-22";
+    name = "pathogen-2017-05-27";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
-      rev = "379b8f70822c4a89370575c3967f33cb116087ea";
-      sha256 = "0j7cixmqllp3wwhsmwfcjj6rslx90lwrssi64mk3whm303x1qxvq";
+      rev = "ddfb1f14d7597e6aedc749be06b559a673c437ab";
+      sha256 = "0fdd88gj75bzq6ifaddz3sl71w8ljnnci9npm04jmyvf048gnjg8";
     };
     dependencies = [];
 
@@ -1925,11 +1934,11 @@ rec {
   };
 
   sleuth = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sleuth-2017-05-04";
+    name = "sleuth-2017-05-28";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sleuth";
-      rev = "0ffa819630678e442fc695c51a75ced640c8a95f";
-      sha256 = "0izyaggk6qx8k1297ki6fan4534hvnnk95hhqy8jngshrq1a46w0";
+      rev = "fc5cf44466d50fada784530de933af80c6448db5";
+      sha256 = "10l6ins66g1wxwzgjcpwim0295yz9ni282f8n7vjafd5v486fxnw";
     };
     dependencies = [];
 
@@ -2254,11 +2263,11 @@ rec {
   };
 
   vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2017-02-08";
+    name = "vim-easy-align-2017-06-03";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
-      rev = "3b395bd5bafbdfb1f93190fa3f259b7ad2e40eb9";
-      sha256 = "0nqvzxr2i9jsyx1qhspf636q0j4b0d8y98yqhxklcpq18ap442zp";
+      rev = "1cd724dc239c3a0f7a12e0fac85945cc3dbe07b0";
+      sha256 = "0bqk1sdqamfgagh31a60c7gvvsvjpg1xys7ivqh62iqlny5i9774";
     };
     dependencies = [];
 
@@ -2276,11 +2285,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2017-04-28";
+    name = "vim-gitgutter-2017-06-08";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "b803a28f47b26d16f5fe9e747850992c9985c667";
-      sha256 = "024sw99h3s9p3xsg9ih8p4v6m0hkahgl4jgq2jxyd62sc1nhpwbh";
+      rev = "dcac1f74ee5c26125363dca164463bde6657c838";
+      sha256 = "0knkdv0sbdwf4p82g438l7pylwzxfbxcj44np3v15wr97w95wmlv";
     };
     dependencies = [];
 
@@ -2308,13 +2317,12 @@ rec {
 
   };
 
-
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2017-04-29";
+    name = "vim-multiple-cursors-2017-06-02";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "92d0b8dc446e91984cc4a9722b767f5a28504d47";
-      sha256 = "1a291sswkxv608rfsdpkv6l1b4vqc487jhzwcvgvjbf9x2w0simb";
+      rev = "3afc475cc64479a406ce73d3333df1f67db3c73f";
+      sha256 = "04dijb4hgidypppphcy83bacmfrd9ikyjc761hqq6bl4kc49f5kc";
     };
     dependencies = [];
 
@@ -2332,33 +2340,33 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-04-21";
+    name = "vim-signify-2017-06-06";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "6e8c4b190078030f9cb979ce26274a79c0ac313c";
-      sha256 = "1wch8pas15z5afw71i814z4cxl8l411kdizhwljx69ghvbwkmkpg";
+      rev = "d9918a69bcff382569ddf5bda030aff412bfd790";
+      sha256 = "1kc7q8xsvg0hl9b3z5a6phfndx7a5pcfy1d3q7i02aaa8dw4ga7j";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2017-05-22";
+    name = "vim-snippets-2017-06-09";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "8a0f865950d70d6de1e39cec20ad4d52b611bd8f";
-      sha256 = "1czs9zqjdb86fdb6lldzv4fjyc8yw2adhhbdzzj631hfcvi1a2r3";
+      rev = "d21f43c210ac7b04ec1bcda39f10b03a934a9ae8";
+      sha256 = "1vv7kpin3aqzz47937b5w5q2hcr9gldz0x39i6z3wa3q4x2sg366";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2017-05-07";
+    name = "vim-webdevicons-2017-05-29";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "4a77915b43120e8fade8f40f961a96831a5732bd";
-      sha256 = "02svpilb8vqvd5a8lfbb4ppwaicibb9hcjcq8415vi6dipmj1s7x";
+      rev = "153266275acc4f4615407a18e90f58780ebaef92";
+      sha256 = "1zjrra0q5c7lmgxzlz7ddd7vi6k2vhz69fdy2s7d873nnmmd7kgn";
     };
     dependencies = [];
 
@@ -2375,37 +2383,36 @@ rec {
 
   };
 
-  vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-04-15";
+  vimproc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimproc-2016-08-06";
     src = fetchgit {
-      url = "git://github.com/vimwiki/vimwiki";
-      rev = "8cdc1c15388cc7f4edb827ff15dbc31d592a79af";
-      sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h";
+      url = "git://github.com/Shougo/vimproc";
+      rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0";
+      sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20";
     };
     dependencies = [];
 
   };
 
   vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vinegar-2017-05-10";
+    name = "vinegar-2017-05-23";
     src = fetchgit {
       url = "git://github.com/tpope/vim-vinegar";
-      rev = "1ed01e2135b0b8158ba289e03c54f63dad9865be";
-      sha256 = "128sdiaxdvjxz67iy0sgaqi54r8sfd5881m1mrp58wc1zgafgfb5";
+      rev = "9abe956acc14444c0fda75eb98c8e31cf81b4c26";
+      sha256 = "16a85lk20v50krl899w0i9zl6gp7478f4pd6mqz8519d76vbmy99";
     };
     dependencies = [];
 
   };
 
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2017-04-02";
+    name = "vundle-2017-06-08";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
-      rev = "6497e37694cd2134ccc3e2526818447ee8f20f92";
-      sha256 = "0mphybh0mwh5km2q0awmn8hdgvq3g45yyqpjird7kxybri6aw0kn";
+      rev = "6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87";
+      sha256 = "13k194g0rs5hz7ci0ys4gml71jily5hdd0yljzmmn8qjiq88v6p4";
     };
     dependencies = [];
 
   };
-
 }
-- 
GitLab


From 74fd4de95679bddaae7c1c6c58432c5bc207fc41 Mon Sep 17 00:00:00 2001
From: Nicolas Truessel <ntruessel@njsm.de>
Date: Sun, 11 Jun 2017 10:10:56 +0200
Subject: [PATCH 0590/1490] chromium: 58.0.3029.110 -> 59.0.3071.86

---
 .../networking/browsers/chromium/common.nix    | 10 +++-------
 .../chromium/patches/fix-bootstrap-gn.patch    | 12 ------------
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 3 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index f36f28ac880..e747db6a8b7 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -3,7 +3,7 @@
 # default dependencies
 , bzip2, flac, speex, libopus
 , libevent, expat, libjpeg, snappy
-, libpng, libxml2, libxslt, libcap
+, libpng, libcap
 , xdg_utils, yasm, minizip, libwebp
 , libusb1, pciutils, nss, re2, zlib, libvpx
 
@@ -57,7 +57,7 @@ let
     in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
 
   gnSystemLibraries = [
-    "flac" "libwebp" "libxml" "libxslt" "snappy" "yasm"
+    "flac" "libwebp" "snappy" "yasm"
   ];
 
   opusWithCustomModes = libopus.override {
@@ -67,7 +67,7 @@ let
   defaultDependencies = [
     bzip2 flac speex opusWithCustomModes
     libevent expat libjpeg snappy
-    libpng libxml2 libxslt libcap
+    libpng libcap
     xdg_utils yasm minizip libwebp
     libusb1 re2 zlib
   ];
@@ -105,7 +105,6 @@ let
 
     patches = [
       ./patches/nix_plugin_paths_52.patch
-      ./patches/fix-bootstrap-gn.patch
     ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
       ++ optional enableWideVine ./patches/widevine.patch;
 
@@ -134,9 +133,6 @@ let
       # use our own nodejs
       mkdir -p third_party/node/linux/node-linux-x64/bin
       ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node
-    '' + optionalString (versionAtLeast version "52.0.0.0") ''
-      sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \
-        third_party/pdfium/xfa/fxbarcode/utils.h
     '';
 
     gnFlags = mkGnFlags ({
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch
deleted file mode 100644
index 34efb4f7a45..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 3148ccf..38cfb11 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options):
-       'base/base_switches.cc',
-       'base/build_time.cc',
-       'base/callback_internal.cc',
-+      'base/callback_helpers.cc',
-       'base/command_line.cc',
-       'base/debug/activity_tracker.cc',
-       'base/debug/alias.cc',
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 7ee28c7fc27..0cc53a0c31e 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1dcad79kfayagqiv85ycla3iv3gc99k0rvnvnpar9hd6x1iv8cfl";
-    sha256bin64 = "0ywf50rfzv1kkfpld62fi5g0kz33an0p03xqf7wkcqi7hild607v";
-    version = "59.0.3071.47";
+    sha256 = "151a7w2gqrv1svabhzmalrjr2pdbb9ys8zhrfz02779rjhzfz916";
+    sha256bin64 = "1957q2wdkymibxqzpcq71fj3q6gca888r7gr621z0c03p0izlb7z";
+    version = "60.0.3112.24";
   };
   dev = {
-    sha256 = "05kxl938mh41341lh5xsxcqxv9hhx8yn6nkawgg241sfwdx72db8";
-    sha256bin64 = "1mr2615r30zjxa55mdcbfi0k2grgyykzawslmg41aw0jy5hfamal";
-    version = "60.0.3095.5";
+    sha256 = "15642f0nalx3zqdlr5ldcbrpxnadav3z6sl3imvzj2ssv3nbh25m";
+    sha256bin64 = "0lbma509m3ppy3hg34r10ijhw3m92qxm147qhw0k4lpwdcmm6fnm";
+    version = "60.0.3112.20";
   };
   stable = {
-    sha256 = "1zvqim75mlqckvf7awrbyggis71dlkz4gjpfrmfdvydcs8yyyk7j";
-    sha256bin64 = "0vfx2m5zqfvfb6sgd3dg1sji72dzjcd1sf4r6qwhnz38wadys7id";
-    version = "58.0.3029.110";
+    sha256 = "1rxc555l3bxczg9vigr2p0y7j1gswy99gs5yhkbj3raakym32563";
+    sha256bin64 = "1bvkibhvxdcszbh44x77cynnaqhrm5ngf79fp7rdljfhlflvsnw9";
+    version = "59.0.3071.86";
   };
 }
-- 
GitLab


From c9cb6403d3c72b01aeccc537d1cbe7954aecf29b Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Wed, 7 Jun 2017 23:21:14 +0200
Subject: [PATCH 0591/1490] erlang: move erlang_basho_R16B02 to Erlang's
 general builder.

---
 pkgs/development/interpreters/erlang/R16.nix  |  1 -
 .../interpreters/erlang/R16B02-8-basho.nix    | 74 ++++---------------
 pkgs/development/interpreters/erlang/R17.nix  |  1 -
 .../interpreters/erlang/generic-builder.nix   | 28 +++++--
 pkgs/top-level/beam-packages.nix              |  6 +-
 5 files changed, 36 insertions(+), 74 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix
index 3ac37b5bde1..123d813fc77 100644
--- a/pkgs/development/interpreters/erlang/R16.nix
+++ b/pkgs/development/interpreters/erlang/R16.nix
@@ -25,7 +25,6 @@ mkDerivation rec {
       sha256 = "17f3k5j17rdsah18gywjngip6cbfgp6nb9di6il4pahmf9yvqc8g";
     };
   in ''
-    ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
     tar xf "${manpages}" -C "$out/lib/erlang"
     for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
       prefix="''${i%/*}"
diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
index fe24ad64bf8..89c97f5a0eb 100644
--- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
+++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
@@ -1,76 +1,38 @@
-{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl, autoconf264, gcc, erlang
-, gnused, gawk, makeWrapper
-, odbcSupport ? false, unixODBC ? null
-, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null
-, enableDebugInfo ? false
-, Carbon ? null, Cocoa ? null }:
+{ pkgs, mkDerivation }:
 
-assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
-assert odbcSupport -> unixODBC != null;
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "erlang-basho-" + version + "${optionalString odbcSupport "-odbc"}";
+mkDerivation rec {
+  baseName = "erlang";
   version = "16B02";
 
-  src = fetchFromGitHub {
+  src = pkgs.fetchFromGitHub {
     owner = "basho";
     repo = "otp";
     rev = "OTP_R16B02_basho8";
     sha256 = "1w0hbm0axxxa45v3kl6bywc9ayir5vwqxjpnjlzc616ldszb2m0x";
   };
 
-  debugInfo = enableDebugInfo;
-
-  buildInputs =
-    [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc
-    ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
-      ++ optional odbcSupport [ unixODBC ]
-      ++ optionals stdenv.isDarwin [ Carbon Cocoa ];
-
-  # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
-  prePatch = ''
-    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
-  '';
-
-  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in '';
-
-  postPatch = ''
-    patchSheBangs make
-  '';
-
   preConfigure = ''
     export HOME=$PWD/../
     export LANG=C
     export ERL_TOP=$(pwd)
     sed -e s@/bin/pwd@pwd@g -i otp_build
-    sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc
-  '';
+    sed -e s@"/usr/bin/env escript"@$(pwd)/bootstrap/bin/escript@g -i lib/diameter/bin/diameterc
 
-  configureFlags= [
-    "--with-ssl=${openssl.dev}"
-    "--enable-smp-support"
-    "--enable-threads"
-    "--enable-kernel-poll"
-    "--disable-hipe"
-    "${optionalString odbcSupport "--with-odbc=${unixODBC}"}"
-    "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"
-    "${optionalString stdenv.isLinux "--enable-m64-build"}"
-  ];
-
-  buildPhase = ''
     ./otp_build autoconf
-    ./otp_build setup -a --prefix=$out $configureFlags
   '';
 
+  enableHipe = false;
+
+  # Do not install docs, instead use prebuilt versions.
+  installTargets = "install";
   postInstall = let
-    manpages = fetchurl {
+    manpages = pkgs.fetchurl {
       url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz";
       sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p";
     };
   in ''
-    ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
+    sed -e s@$(pwd)/bootstrap/bin/escript@$out/bin/escript@g -i $out/lib/erlang/lib/diameter-1.4.3/bin/diameterc
+
     tar xf "${manpages}" -C "$out/lib/erlang"
     for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
       prefix="''${i%/*}"
@@ -79,14 +41,6 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  # Some erlang bin/ scripts run sed and awk
-  postFixup = ''
-    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
   meta = {
     homepage = "https://github.com/basho/otp/";
     description = "Programming language used for massively scalable soft real-time systems, Basho fork";
@@ -103,7 +57,7 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = ["x86_64-linux" "x86_64-darwin"];
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with maintainers; [ mdaiter ];
+    license = pkgs.stdenv.lib.licenses.asl20;
+    maintainers = with pkgs.stdenv.lib.maintainers; [ mdaiter ];
   };
 }
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 3d78c6ee242..02d7513331e 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -25,7 +25,6 @@ mkDerivation rec {
       sha256 = "1hspm285bl7i9a0d4r6j6lm5yk4sb5d9xzpia3simh0z06hv5cc5";
     };
   in ''
-    ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
     tar xf "${manpages}" -C "$out/lib/erlang"
     for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
       prefix="''${i%/*}"
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 0127bb933c4..3434603f302 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -1,16 +1,20 @@
-{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, autoconf, gawk, gnum4, gnused
-, libxml2, libxslt, ncurses, openssl, perl
+{ pkgs, stdenv, fetchurl, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
+, libxml2, libxslt, ncurses, openssl, perl, gcc, autoreconfHook
 , openjdk ? null # javacSupport
 , unixODBC ? null # odbcSupport
 , mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
 }:
 
-{ version
+{ baseName ? "erlang"
+, version
 , sha256 ? null
 , rev ? "OTP-${version}"
 , src ? fetchFromGitHub { inherit rev sha256; owner = "erlang"; repo = "otp"; }
 , enableHipe ? true
 , enableDebugInfo ? false
+, enableThreads ? true
+, enableSmpSupport ? true
+, enableKernelPoll ? true
 , javacSupport ? false, javacPackages ? [ openjdk ]
 , odbcSupport ? false, odbcPackages ? [ unixODBC ]
 , wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ]
@@ -22,6 +26,7 @@
 , installTargets ? "install install-docs"
 , checkPhase ? "", preCheck ? "", postCheck ? ""
 , fixupPhase ? "", preFixup ? "", postFixup ? ""
+, meta ? null
 }:
 
 assert wxSupport -> (if stdenv.isDarwin
@@ -36,13 +41,15 @@ let
   wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;
 
 in stdenv.mkDerivation ({
-  name = "erlang-${version}"
+  name = "${baseName}-${version}"
     + optionalString javacSupport "-javac"
     + optionalString odbcSupport "-odbc";
 
   inherit src version;
 
-  buildInputs = [ perl gnum4 ncurses openssl autoconf libxslt libxml2 makeWrapper ]
+  buildInputs =
+   [ perl gnum4 ncurses openssl autoreconfHook libxslt libxml2 makeWrapper gcc
+   ]
     ++ optionals wxSupport wxPackages2
     ++ optionals odbcSupport odbcPackages
     ++ optionals javacSupport javacPackages
@@ -58,9 +65,9 @@ in stdenv.mkDerivation ({
   '';
 
   postPatch = ''
-    patchShebangs make
-
     ${postPatch}
+
+    patchShebangs make
   '';
 
   preConfigure = ''
@@ -68,6 +75,9 @@ in stdenv.mkDerivation ({
   '';
 
   configureFlags = [ "--with-ssl=${openssl.dev}" ]
+    ++ optional enableThreads "--enable-threads"
+    ++ optional enableSmpSupport "--enable-smp-support"
+    ++ optional enableKernelPoll "--enable-kernel-poll"
     ++ optional enableHipe "--enable-hipe"
     ++ optional javacSupport "--with-javac"
     ++ optional odbcSupport "--with-odbc=${unixODBC}"
@@ -78,6 +88,8 @@ in stdenv.mkDerivation ({
   # (PDFs are generated only when fop is available).
 
   postInstall = ''
+    ${postInstall}
+
     ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call
   '';
 
@@ -125,8 +137,8 @@ in stdenv.mkDerivation ({
 // optionalAttrs (installPhase != "")   { inherit installPhase; }
 // optionalAttrs (installTargets != "") { inherit installTargets; }
 // optionalAttrs (preInstall != "")     { inherit preInstall; }
-// optionalAttrs (postInstall != "")    { inherit postInstall; }
 // optionalAttrs (fixupPhase != "")     { inherit fixupPhase; }
 // optionalAttrs (preFixup != "")       { inherit preFixup; }
 // optionalAttrs (postFixup != "")      { inherit postFixup; }
+// optionalAttrs (meta != null)         { inherit meta; }
 )
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 547e650a636..3451816c0c5 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -38,11 +38,9 @@ rec {
     };
 
     # Bash fork, using custom builder.
-    erlang_basho_R16B02 = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix {
     };
-    erlang_basho_R16B02_odbc = callPackage ../development/interpreters/erlang/R16B02-8-basho.nix {
-      inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    erlang_basho_R16B02_odbc = erlang_basho_R16B02.override {
       odbcSupport = true;
     };
 
-- 
GitLab


From ca490a62906fa566e1f30504cd0f29d04ee48c4a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 11 Jun 2017 11:34:17 +0200
Subject: [PATCH 0592/1490] gdb: disable format warnings

Fixes #26145
---
 pkgs/development/tools/misc/gdb/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index e6dcc3057d1..1e9cf910857 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
   # darwin build fails with format hardening since v7.12
   hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
+
   configureFlags = with stdenv.lib; [
     "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline"
     "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}"
-- 
GitLab


From 29049d07f9fcf2755a2755dcda078891445da67b Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 11 Jun 2017 14:48:21 +0200
Subject: [PATCH 0593/1490] vim-plugins: fix evaluation

---
 pkgs/misc/vim-plugins/default.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index a56f21f31e6..87d57e44182 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2383,17 +2383,6 @@ rec {
 
   };
 
-  vimproc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-2016-08-06";
-    src = fetchgit {
-      url = "git://github.com/Shougo/vimproc";
-      rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0";
-      sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20";
-    };
-    dependencies = [];
-
-  };
-
   vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vinegar-2017-05-23";
     src = fetchgit {
-- 
GitLab


From d3d036d8648956e1b9039d075890a221d4edaa28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Jun 2017 15:05:32 +0200
Subject: [PATCH 0594/1490] harfbuzz: 1.4.5 -> 1.4.6

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 81b3c558f0b..191d3365d6c 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.4.5";
+  version = "1.4.6";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711";
+    sha256 = "21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From cc67a41b4ac24bf3d992a0778207185569dfa8fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Jun 2017 15:08:43 +0200
Subject: [PATCH 0595/1490] at-spi2-core: 2.22.1 -> 2.24.1

at-spi2-* was lagging a bit behind in nixpkgs.
---
 pkgs/development/libraries/at-spi2-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 85ab3f35fe7..4d496932f66 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -2,14 +2,14 @@
 , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.22";
+  versionMajor = "2.24";
   versionMinor = "1";
   moduleName   = "at-spi2-core";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "6f8f39f091bfe2c57870cb8bfbb02edac4fc85cda69665e6967937daf7201c42";
+    sha256 = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From c997a7feb5b4360c16d7f5417012f2ef86546c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Jun 2017 15:10:42 +0200
Subject: [PATCH 0596/1490] at-spi2-atk: 2.22.0 -> 2.24.1

---
 pkgs/development/libraries/at-spi2-atk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index a6f2b1371e5..30fe8173e86 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -2,14 +2,14 @@
 , intltool, dbus_glib, at_spi2_core, libSM }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "2.22";
-  versionMinor = "0";
+  versionMajor = "2.24";
+  versionMinor = "1";
   moduleName   = "at-spi2-atk";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1";
+    sha256 = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d";
   };
 
   buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi
-- 
GitLab


From 3d601f6a8a4bcbd686011251f2a01e9c17595be8 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 11 Jun 2017 15:11:46 +0200
Subject: [PATCH 0597/1490] rustc: disable another gdb test

---
 pkgs/development/compilers/rust/rustc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index f4004c01df2..a8ba933b52f 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -89,6 +89,7 @@ stdenv.mkDerivation {
     rm src/test/debuginfo/limited-debuginfo.rs
     rm src/test/debuginfo/simple-struct.rs
     rm src/test/debuginfo/simple-tuple.rs
+    rm src/test/debuginfo/union-smoke.rs
     rm src/test/debuginfo/vec-slices.rs
     rm src/test/debuginfo/vec.rs
 
-- 
GitLab


From d95862bbdeac2e10b2cf684895eb8e88f9064bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Jun 2017 15:13:49 +0200
Subject: [PATCH 0598/1490] pango: maintenance 1.40.5 -> 1.40.6

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

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index d8420f69101..9b396261fcc 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -6,14 +6,14 @@ with stdenv.lib;
 
 let
   ver_maj = "1.40";
-  ver_min = "5";
+  ver_min = "6";
 in
 stdenv.mkDerivation rec {
   name = "pango-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-    sha256 = "24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9";
+    sha256 = "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573";
   };
 
   outputs = [ "bin" "dev" "out" "devdoc" ];
-- 
GitLab


From 8779c108d4636367186ac6984ed88ed29bc40ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Jun 2017 15:14:09 +0200
Subject: [PATCH 0599/1490] gkt3: bugfix 3.22.12 -> 3.22.15

---
 pkgs/development/libraries/gtk+/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index f27cccfa27a..8fbe2ba8dc9 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 
 let
   ver_maj = "3.22";
-  ver_min = "12";
+  ver_min = "15";
   version = "${ver_maj}.${ver_min}";
 in
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
-    sha256 = "84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c";
+    sha256 = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From c95f3a36cd2ab9c2565bfc9fd88eae57023146a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 7 Feb 2017 21:55:45 +0100
Subject: [PATCH 0600/1490] sdcc: 3.5.0 -> 3.6.0

* requires texinfo
* --std=c99 unneeded, fixed upstream
* can build with nixpkgs default boost (v1.62), so let's do that
---
 pkgs/development/compilers/sdcc/default.nix | 10 ++++------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix
index a246a413f50..7383f39f6cb 100644
--- a/pkgs/development/compilers/sdcc/default.nix
+++ b/pkgs/development/compilers/sdcc/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchurl, bison, flex, boost, gputils ? null }:
+{ stdenv, fetchurl, bison, flex, boost, texinfo, gputils ? null }:
 
 stdenv.mkDerivation rec {
-  version = "3.5.0";
+  version = "3.6.0";
   name = "sdcc-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2";
-    sha256 = "1aazz0yynr694q0rich7r03qls0zvsjc00il14pb4i22c78phagq";
+    sha256 = "0x53gh5yrrfjvlnkk29mjn8hq4v52alrsf7c8nsyzzq13sqwwpg8";
   };
 
   # TODO: remove this comment when gputils != null is tested
-  buildInputs = [ bison flex boost gputils ];
+  buildInputs = [ bison flex boost texinfo gputils ];
 
   configureFlags = ''
     ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""}
   '';
 
-  NIX_CFLAGS_COMPILE = "--std=c99"; # http://sourceforge.net/p/sdcc/code/9106/
-
   meta = with stdenv.lib; {
     description = "Small Device C Compiler";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 959f7f6ea03..9e3998bb152 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5808,7 +5808,7 @@ with pkgs;
 
   scalafmt = callPackage ../development/tools/scalafmt { };
 
-  sdcc = callPackage ../development/compilers/sdcc { boost = boost159; };
+  sdcc = callPackage ../development/compilers/sdcc { };
 
   serpent = callPackage ../development/compilers/serpent { };
 
-- 
GitLab


From 46e2c1398f5ae44717dd00cd5846e54d02980ae0 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 7 Jun 2017 22:28:12 +0200
Subject: [PATCH 0601/1490] nextcloud: 11.0.2 -> 12.0.0

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 4bbff8b86ad..03c8463f9ea 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "11.0.2";
+  version = "12.0.0";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "0047kfl73720w7y2r7ivzj2gqg84rcfp98svq130nd0ziyfz27jx";
+    sha256 = "0gr47bwwni7y33qz3l8g3sjrqridykxiid2jlmjdaz35bvq9r78v";
   };
 
   installPhase = ''
-- 
GitLab


From e19cdd3b34a81f7807a539974dd97bb091648cde Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 17:42:48 +0300
Subject: [PATCH 0602/1490] icu: Fix ARM patch

Broken by fad6fc3dae16b5161895165bf275e329e20860d6.
Let's do it in a cleaner way.
---
 .../0001-Disable-LDFLAGSICUDT-for-Linux.patch | 28 -------------------
 pkgs/development/libraries/icu/default.nix    |  9 +++---
 2 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch

diff --git a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
deleted file mode 100644
index 72d3f67d3bc..00000000000
--- a/pkgs/development/libraries/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 15 Feb 2014 21:06:42 +0000
-Subject: [PATCH] Disable LDFLAGSICUDT for Linux
-
-Upstream-Status: Inappropriate [ OE Configuration ]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- source/config/mh-linux |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/config/mh-linux b/source/config/mh-linux
-index 366f0cc..2689aab 100644
---- a/source/config/mh-linux
-+++ b/source/config/mh-linux
-@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
- LD_RPATH_PRE = -Wl,-rpath,
- 
- ## These are the library specific LDFLAGS
--LDFLAGSICUDT=-nodefaultlibs -nostdlib
-+# LDFLAGSICUDT=-nodefaultlibs -nostdlib
- 
- ## Compiler switch to embed a library name
- # The initial tab in the next line is to prevent icu-config from reading it.
--- 
-1.7.10.4
-
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index fdf1c6dffe9..173c9bb58ad 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -12,7 +12,7 @@ let
     sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
   };
 in
-stdenv.mkDerivation ({
+stdenv.mkDerivation {
   name = pname + "-" + version;
 
   src = fetchurl {
@@ -39,6 +39,9 @@ stdenv.mkDerivation ({
 
   preConfigure = ''
     sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
+  '' + stdenv.lib.optionalString stdenv.isArm ''
+    # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch
+    sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
   '';
 
   configureFlags = "--disable-debug" +
@@ -59,6 +62,4 @@ stdenv.mkDerivation ({
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.all;
   };
-} // (if stdenv.isArm then {
-  patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ];
-} else {}))
+}
-- 
GitLab


From 86da6d441f7a248b02d545ac1b2c90ef27f42d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Jun 2017 17:08:58 +0200
Subject: [PATCH 0603/1490] lyx: maintenance 2.2.2 -> 2.2.3

In particular, they claim some fixes related to Qt-5.8,
so I switched back to using the default Qt (=5.8 ATM).

Tested just briefly.
---
 pkgs/applications/misc/lyx/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 0da6e8eb34a..0d5ee979087 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.2";
+  version = "2.2.3";
   name = "lyx-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${name}.tar.xz";
-    sha256 = "0s2mma8fkj5mi8qzc0j67589mbj854bypx2s3y59y1n429s3sp58";
+    sha256 = "0mrbr24xbdg25gd7w8g76gpmy0a10nrnz0mz47mdjwi441yfpjjg";
   };
 
   # LaTeX is used from $PATH, as people often want to have it with extra pkgs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e3998bb152..a3e1ec79583 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14870,7 +14870,7 @@ with pkgs;
 
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
-  lyx = libsForQt56.callPackage ../applications/misc/lyx { };
+  lyx = libsForQt5.callPackage ../applications/misc/lyx { };
 
   mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {};
 
-- 
GitLab


From d74d871f52512a1f827d2dc165db685f499ce5f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Jun 2017 15:27:33 +0200
Subject: [PATCH 0604/1490] cmake: 3.7.2 -> 3.8.2

Tested several cmake-built packages, and all seems OK;
hopefully there won't be many problems.
---
 .../development/tools/build-managers/cmake/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index d0a34603835..13c404374b0 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig
-, bzip2, curl, expat, libarchive, xz, zlib, libuv
+, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
 # darwin attributes
 , ps
 , isBootstrap ? false
@@ -12,7 +12,7 @@ with stdenv.lib;
 
 let
   os = stdenv.lib.optionalString;
-  majorVersion = "3.7";
+  majorVersion = "3.8";
   minorVersion = "2";
   version = "${majorVersion}.${minorVersion}";
 in
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    # from https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt
-    sha256 = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0";
+    # from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
+    sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d";
   };
 
   prePatch = optionalString (!useSharedLibraries) ''
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ setupHook pkgconfig ]
-    ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv ]
+    ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
-- 
GitLab


From 370ace4cf03b31eedcf1e635ed5d52272b774526 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 19:33:24 +0300
Subject: [PATCH 0605/1490] kernel: Don't build self-test modules

---
 .../linux/kernel/common-config.nix            | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 1dc161cca54..a0d4f8dbb5c 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -36,7 +36,6 @@ with stdenv.lib;
   DEBUG_DEVRES n
   DEBUG_STACK_USAGE n
   DEBUG_STACKOVERFLOW n
-  RCU_TORTURE_TEST n
   SCHEDSTATS n
   DETECT_HUNG_TASK y
 
@@ -589,6 +588,46 @@ with stdenv.lib;
   # Disable the firmware helper fallback, udev doesn't implement it any more
   FW_LOADER_USER_HELPER_FALLBACK? n
 
+  # Disable various self-test modules that have no use in a production system
+  ARM_KPROBES_TEST? n
+  ASYNC_RAID6_TEST? n
+  ATOMIC64_SELFTEST? n
+  BACKTRACE_SELF_TEST? n
+  CRC32_SELFTEST? n
+  CRYPTO_TEST? n
+  DRM_DEBUG_MM_SELFTEST? n
+  EFI_TEST? n
+  GLOB_SELFTEST? n
+  INTERVAL_TREE_TEST? n
+  LNET_SELFTEST? n
+  LOCK_TORTURE_TEST? n
+  MTD_TESTS? n
+  NOTIFIER_ERROR_INJECTION? n
+  PERCPU_TEST? n
+  RBTREE_TEST? n
+  RCU_PERF_TEST? n
+  RCU_TORTURE_TEST? n
+  TEST_ASYNC_DRIVER_PROBE? n
+  TEST_BITMAP? n
+  TEST_BPF? n
+  TEST_FIRMWARE? n
+  TEST_HASH? n
+  TEST_HEXDUMP? n
+  TEST_KSTRTOX? n
+  TEST_LIST_SORT? n
+  TEST_LKM? n
+  TEST_PARMAN? n
+  TEST_PRINTF? n
+  TEST_RHASHTABLE? n
+  TEST_SORT? n
+  TEST_STATIC_KEYS? n
+  TEST_STRING_HELPERS? n
+  TEST_UDELAY? n
+  TEST_USER_COPY? n
+  TEST_UUID? n
+  WW_MUTEX_SELFTEST? n
+  XZ_DEC_TEST? n
+
   # ChromiumOS support
   ${optionalString (features.chromiumos or false) ''
     CHROME_PLATFORMS y
-- 
GitLab


From f1d8069ee86dd861489da7c782080d3ce1707f9c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 19:35:29 +0300
Subject: [PATCH 0606/1490] file: 5.30 -> 5.31

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

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 68e4210ad41..232eb68c8a6 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "file-${version}";
-  version = "5.30";
+  version = "5.31";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
       "https://distfiles.macports.org/file/${name}.tar.gz"
     ];
-    sha256 = "694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214";
+    sha256 = "1vp4zihaxkhi85chkjgd4r4zdg4k2wa3c6pmajhbmx6gr7d8ii89";
   };
 
   buildInputs = [ zlib ];
-- 
GitLab


From fbea1265d5618b79aa79be755d896cf7c5d80007 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 19:45:59 +0300
Subject: [PATCH 0607/1490] audit: 2.6.6 -> 2.7.6

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

diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 4decc8c7a32..5d1f14bfec6 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -5,11 +5,11 @@
 assert enablePython -> python != null;
 
 stdenv.mkDerivation rec {
-  name = "audit-2.6.6";
+  name = "audit-2.7.6";
 
   src = fetchurl {
     url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
-    sha256 = "0jwrww1vn7yqxmb84n6y4p58z34gga0ic4rs2msvpzc2x1hxrn31";
+    sha256 = "1rqlj15kbyfw4z88z8whf1q2rcg17vs439fvzdds55fwzyf2hrgs";
   };
 
   outputs = [ "bin" "dev" "out" "man" "plugins" ];
-- 
GitLab


From 54e060763001e2f8019d54d0cf808772ab806d7d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 20:20:13 +0300
Subject: [PATCH 0608/1490] libatomic_ops: Cleanup

---
 .../libraries/libatomic_ops/default.nix       | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 174c633bf0d..7f3c03995d8 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -1,32 +1,22 @@
 { stdenv, fetchurl, autoconf, automake, libtool }:
-let
-  s = # Generated upstream information
-  rec {
-    baseName="libatomic_ops";
-    version="7.4.4";
-    name="${baseName}-${version}";
-    hash="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
-    url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.4.tar.gz";
-    sha256="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
-  };
-  
-  buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
 
-in stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
+stdenv.mkDerivation rec {
+  name = "libatomic_ops-${version}";
+  version = "7.4.4";
 
   src = fetchurl {
-    inherit (s) url sha256;
+    url = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz";
+    sha256 ="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
   };
 
-  preConfigure = if stdenv.isCygwin then ''
-      sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
-      ./autogen.sh
-  '' else null;
+  nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
+
+  preConfigure = stdenv.lib.optionalString stdenv.isCygwin ''
+    sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
+    ./autogen.sh
+  '';
 
   meta = {
-    inherit (s) version;
     description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
-- 
GitLab


From 4182fc36b6dba891099c51ecc27748a975c5c373 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 11 Jun 2017 20:20:32 +0300
Subject: [PATCH 0609/1490] libatomic_ops: 7.4.4 -> 7.6.0

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

diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 7f3c03995d8..33209f2fd44 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libatomic_ops-${version}";
-  version = "7.4.4";
+  version = "7.6.0";
 
   src = fetchurl {
     url = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz";
-    sha256 ="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
+    sha256 ="03ylfr29g9zc0r6b6axz3i68alj5qmxgzknxwam3jlx0sz8hcb4f";
   };
 
   nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
-- 
GitLab


From d45aff53276d263ff1df73c001873f0ed64bffd3 Mon Sep 17 00:00:00 2001
From: Lukasz Czyzykowski <lukasz.czyzykowski@gmail.com>
Date: Sun, 11 Jun 2017 21:52:41 +0200
Subject: [PATCH 0610/1490] Adds ghc version to the patch file

---
 pkgs/development/compilers/ghc/8.0.2.nix                        | 2 +-
 .../{no-cpp-warnings.patch => ghc-8.0.2-no-cpp-warnings.patch}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/compilers/ghc/{no-cpp-warnings.patch => ghc-8.0.2-no-cpp-warnings.patch} (100%)

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 7463eb91e7a..cc0b1d4eadd 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   patches = []
     ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
-    ++ stdenv.lib.optional stdenv.isDarwin ./no-cpp-warnings.patch;
+    ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch;
 
   buildInputs = [ ghc perl hscolour sphinx ];
 
diff --git a/pkgs/development/compilers/ghc/no-cpp-warnings.patch b/pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch
similarity index 100%
rename from pkgs/development/compilers/ghc/no-cpp-warnings.patch
rename to pkgs/development/compilers/ghc/ghc-8.0.2-no-cpp-warnings.patch
-- 
GitLab


From e35f3c0679cafb8de84274433159e1b393dca46d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Jun 2017 22:12:59 +0200
Subject: [PATCH 0611/1490] doc: Fix some typos

---
 doc/configuration.xml                                |  2 +-
 doc/functions.xml                                    |  2 +-
 doc/overlays.xml                                     |  2 +-
 doc/reviewing-contributions.xml                      |  2 +-
 doc/stdenv.xml                                       | 12 ++++++------
 .../manual/administration/imperative-containers.xml  |  2 +-
 nixos/doc/manual/development/option-declarations.xml |  2 +-
 nixos/doc/manual/development/option-types.xml        |  2 +-
 nixos/doc/manual/release-notes/rl-1509.xml           |  2 +-
 nixos/doc/manual/release-notes/rl-1603.xml           |  2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/configuration.xml b/doc/configuration.xml
index 56950e07ab5..ea3acf4e575 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -227,7 +227,7 @@ packages via <literal>packageOverrides</literal></title>
 
 <para>You can define a function called
 <varname>packageOverrides</varname> in your local
-<filename>~/.config/nixpkgs/config.nix</filename> to overide nix packages.  It
+<filename>~/.config/nixpkgs/config.nix</filename> to override nix packages.  It
 must be a function that takes pkgs as an argument and return modified
 set of packages.
 
diff --git a/doc/functions.xml b/doc/functions.xml
index 4e7159638ca..4a9015602af 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -70,7 +70,7 @@
 
     <para>
       In the above example, the <varname>separateDebugInfo</varname> attribute is
-      overriden to be true, thus building debug info for
+      overridden to be true, thus building debug info for
       <varname>helloWithDebug</varname>, while all other attributes will be
       retained from the original <varname>hello</varname> package.
     </para>
diff --git a/doc/overlays.xml b/doc/overlays.xml
index 4b95f3e7288..f8f554bb556 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -78,7 +78,7 @@ self: super:
 <para>The first argument, usually named <varname>self</varname>, corresponds to the final package
 set. You should use this set for the dependencies of all packages specified in your
 overlay. For example, all the dependencies of <varname>rr</varname> in the example above come
-from <varname>self</varname>, as well as the overriden dependencies used in the
+from <varname>self</varname>, as well as the overridden dependencies used in the
 <varname>boost</varname> override.</para>
 
 <para>The second argument, usually named <varname>super</varname>,
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index f86928bcd5d..0813e0968e8 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -18,7 +18,7 @@
 <para>The high change rate of nixpkgs make any pull request that is open for 
   long enough subject to conflicts that will require extra work from the 
   submitter or the merger. Reviewing pull requests in a timely manner and being 
-  responsive to the comments is the key to avoid these. Github provides sort 
+  responsive to the comments is the key to avoid these. GitHub provides sort 
   filters that can be used to see the <link 
     xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most 
     recently</link> and the <link 
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index a2530e102ca..19bacd08f1e 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1156,7 +1156,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
             <term><option>--replace</option>
             <replaceable>s1</replaceable>
             <replaceable>s2</replaceable></term>
-            <listitem><para>Replace every occurence of the string
+            <listitem><para>Replace every occurrence of the string
             <replaceable>s1</replaceable> by
             <replaceable>s2</replaceable>.</para></listitem>
           </varlistentry>
@@ -1164,7 +1164,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
           <varlistentry>
             <term><option>--subst-var</option>
             <replaceable>varName</replaceable></term>
-            <listitem><para>Replace every occurence of
+            <listitem><para>Replace every occurrence of
             <literal>@<replaceable>varName</replaceable>@</literal> by
             the contents of the environment variable
             <replaceable>varName</replaceable>.  This is useful for
@@ -1177,7 +1177,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
             <term><option>--subst-var-by</option>
             <replaceable>varName</replaceable>
             <replaceable>s</replaceable></term>
-            <listitem><para>Replace every occurence of
+            <listitem><para>Replace every occurrence of
             <literal>@<replaceable>varName</replaceable>@</literal> by
             the string <replaceable>s</replaceable>.</para></listitem>
           </varlistentry>
@@ -1225,7 +1225,7 @@ substitute ./foo.in ./foo.out \
     <term><function>substituteAll</function>
     <replaceable>infile</replaceable>
     <replaceable>outfile</replaceable></term>
-    <listitem><para>Replaces every occurence of
+    <listitem><para>Replaces every occurrence of
     <literal>@<replaceable>varName</replaceable>@</literal>, where
     <replaceable>varName</replaceable> is any environment variable, in
     <replaceable>infile</replaceable>, writing the result to
@@ -1528,7 +1528,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup':
     depends on such a format string, it will need to be worked around.
     </para>
 
-    <para>Addtionally, some warnings are enabled which might trigger build
+    <para>Additionally, some warnings are enabled which might trigger build
     failures if compiler warnings are treated as errors in the package build.
     In this case, set <option>NIX_CFLAGS_COMPILE</option> to
     <option>-Wno-error=warning-type</option>.</para>
@@ -1558,7 +1558,7 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro
     <term><varname>pic</varname></term>
     <listitem>
     <para>Adds the <option>-fPIC</option> compiler options. This options adds
-    support for position independant code in shared libraries and thus making
+    support for position independent code in shared libraries and thus making
     ASLR possible.</para>
     <para>Most notably, the Linux kernel, kernel modules and other code
     not running in an operating system environment like boot loaders won't
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index 9851eb08afb..d5d8140e076 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -57,7 +57,7 @@ Thus, if something went wrong, you can get status info using
 
 </para>
 
-<para>If the container has started succesfully, you can log in as
+<para>If the container has started successfully, you can log in as
 root using the <command>root-login</command> operation:
 
 <screen>
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index e322b6458a1..d20c2d1aa2e 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -96,7 +96,7 @@ options = {
   </itemizedlist>
   </para>
 
-  <para>Both approachs have problems.</para>
+  <para>Both approaches have problems.</para>
 
   <para>Making backends independent can quickly become hard to manage. For
     display managers, there can be only one enabled at a time, but the type
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index e928c557087..441393c9827 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -396,7 +396,7 @@ code before creating a new type.</para>
     <listitem><para>For composed types that can take a submodule as type 
         parameter, this function can be used to substitute the parameter of a 
         submodule type. It takes a module as parameter and return the type with 
-        the submodule options substituted. It is usally defined as a type 
+        the submodule options substituted. It is usually defined as a type 
         function call with a recursive call to 
         <literal>substSubModules</literal>, e.g for a type 
         <literal>composedType</literal> that take an <literal>elemtype</literal> 
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index e0271485c36..967fbcf869d 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -342,7 +342,7 @@ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.pandoc
 
 <listitem>
   <para>
-    Python 2.6 has been marked as broken (as it no longer recieves
+    Python 2.6 has been marked as broken (as it no longer receives
     security updates from upstream).
   </para>
 </listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index f460e00e836..7279dd05827 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -362,7 +362,7 @@ services.syncthing = {
   <listitem>
     <para>
       <literal>networking.firewall.allowPing</literal> is now enabled by
-      default. Users are encourarged to configure an approiate rate limit for
+      default. Users are encouraged to configure an appropriate rate limit for
       their machines using the Kernel interface at
       <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and
       <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the
-- 
GitLab


From 5fbab5dfb3e4ef5ca35603bbe347e3fc6bda6111 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 11 Jun 2017 21:37:46 -0400
Subject: [PATCH 0612/1490] linux: 4.12-rc4 -> 4.12-rc5

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index c9dc44ba753..c56a25c3c26 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12-rc4";
-  modDirVersion = "4.12.0-rc4";
+  version = "4.12-rc5";
+  modDirVersion = "4.12.0-rc5";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "05sdyf9vs3cmcfpgn7bwmz59bpdpz65ly755lknxm5nms5vg7ph3";
+    sha256 = "0d3lpf429fqrf6i529y0pjdwnpq2v82agn3xhw4jwkriib9i425x";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From a12ae6171b372ffe66c65585c7d7864c4aaed612 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Mon, 12 Jun 2017 09:50:04 +0200
Subject: [PATCH 0613/1490] pythonPackages.boto: 2.45 -> 2.47

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87c469c937f..b33596dbf9a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2969,11 +2969,11 @@ in {
 
   boto = buildPythonPackage rec {
     name = "boto-${version}";
-    version = "2.45.0";
+    version = "2.47.0";
 
     src = pkgs.fetchurl {
       url = "https://github.com/boto/boto/archive/${version}.tar.gz";
-      sha256 = "18z5nacnbdpw3pmzc56didhy4sfik8riap204px24350g9xlgz7i";
+      sha256 = "051gq8z9m2cir03jhc00qs36bnpla7zkqm9xqiqcqvdknmi2ndbq";
     };
 
     checkPhase = ''
-- 
GitLab


From 798e256dcd195addcf6babf8bdcd0c2579337ceb Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 12 Jun 2017 11:19:40 +0200
Subject: [PATCH 0614/1490] cups-filters: fix path to pdftops

This is hardcoded to /usr/bin/pdftops by default.
---
 pkgs/misc/cups/filters.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 6d6fab265b1..fec0634ba68 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -25,6 +25,7 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-pdftops=pdftops"
+    "--with-pdftops-path=${poppler_utils}/bin/pdftops"
     "--enable-imagefilters"
     "--with-rcdir=no"
     "--with-shell=${stdenv.shell}"
-- 
GitLab


From 63e9d1c51ec0ad41c3ef729851442f199ce06a25 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 12 Jun 2017 13:19:42 +0200
Subject: [PATCH 0615/1490] perf: Fix perf annotate

This command requires objdump, so make sure it can find it.
---
 .../linux/kernel/perf-binutils-path.patch           | 12 ++++++++++++
 pkgs/os-specific/linux/kernel/perf.nix              | 13 +++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/perf-binutils-path.patch

diff --git a/pkgs/os-specific/linux/kernel/perf-binutils-path.patch b/pkgs/os-specific/linux/kernel/perf-binutils-path.patch
new file mode 100644
index 00000000000..d20f2296ea3
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/perf-binutils-path.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' linux-4.9.31-orig/tools/perf/util/annotate.c linux-4.9.31/tools/perf/util/annotate.c
+--- linux-4.9.31-orig/tools/perf/util/annotate.c	2017-06-07 12:08:04.000000000 +0200
++++ linux-4.9.31/tools/perf/util/annotate.c	2017-06-12 13:10:08.811079574 +0200
+@@ -1350,7 +1350,7 @@
+ 		 "%s %s%s --start-address=0x%016" PRIx64
+ 		 " --stop-address=0x%016" PRIx64
+ 		 " -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand",
+-		 objdump_path ? objdump_path : "objdump",
++		 objdump_path ? objdump_path : OBJDUMP_PATH,
+ 		 disassembler_style ? "-M " : "",
+ 		 disassembler_style ? disassembler_style : "",
+ 		 map__rip_2objdump(map, sym->start),
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index fa4ac3b513d..0a3b4070be1 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -11,7 +11,9 @@ assert versionAtLeast kernel.version "3.12";
 stdenv.mkDerivation {
   name = "perf-linux-${kernel.version}";
 
-  inherit (kernel) src patches;
+  inherit (kernel) src;
+
+  patches = kernel.patches ++ [ ./perf-binutils-path.patch ];
 
   preConfigure = ''
     cd tools/perf
@@ -30,9 +32,12 @@ stdenv.mkDerivation {
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
-  NIX_CFLAGS_COMPILE = [
-    "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations"
-  ]
+  NIX_CFLAGS_COMPILE =
+    [ "-Wno-error=cpp"
+      "-Wno-error=bool-compare"
+      "-Wno-error=deprecated-declarations"
+      "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\""
+    ]
     # gcc before 6 doesn't know these options
     ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [
       "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
-- 
GitLab


From 1951578395eacc6cdb697080f3328561ba95d2fa Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Wed, 7 Jun 2017 10:24:44 +0200
Subject: [PATCH 0616/1490] =?UTF-8?q?pijul:=C2=A00.4.4=20->=200.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../version-management/pijul/default.nix             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index b9848f45aab..d72c2945239 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -4,21 +4,21 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "pijul-${version}";
-  version = "0.4.4";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "https://pijul.org/releases/${name}.tar.gz";
-    sha256 = "8f133b7e14bfa84156c103126d53b12c6dfb996dcdebcf1091199ff9c77f3713";
+    sha256 = "a6b066b49b25d1083320c5ab23941deee795e1fcbe1faa951e95189fd594cdb3";
   };
 
-  sourceRoot = "${name}/pijul";
+  sourceRoot = "pijul";
 
-  buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin
     (with darwin.apple_sdk.frameworks; [ Security ]);
 
   doCheck = false;
-  
-  depsSha256 = "1zdvnarg182spgydmqwxxr929j44d771zkq7gyh152173i0xqb20";
+
+  depsSha256 = "0raim0ahqg6fkidb6picfzircdzwdbsdmmv8in70r5hw770bv67r";
 
   meta = with stdenv.lib; {
     description = "A distributed version control system";
-- 
GitLab


From 0e532a3ede6ee3c3abe8447b0447d501b8c9228d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 7 Jun 2017 13:37:15 -0400
Subject: [PATCH 0617/1490] elpa-packages: 2017-06-12

---
 .../editors/emacs-modes/elpa-generated.nix    | 65 +++++++++++++++----
 1 file changed, 53 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 44e9a83e872..9bf51fc0904 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -561,6 +561,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "dired-du";
+        version = "0.5";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/dired-du-0.5.tar";
+          sha256 = "09yj37p2fa5f81fqrzwghjkyy2ydsf4rbkfwpn2yyvzd5nd97bpl";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dired-du.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "dismal";
@@ -630,10 +644,10 @@
       }) {};
     ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "ediprolog";
-        version = "1.1";
+        version = "1.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ediprolog-1.1.el";
-          sha256 = "19qaciwhzr7k624z455fi8i0v5kl10587ha2mfx1bdsym7y376yd";
+          url = "https://elpa.gnu.org/packages/ediprolog-1.2.el";
+          sha256 = "039ffvp7c810mjyargmgw1i87g0z8qs8qicq826sd9aiz9hprfaz";
         };
         packageRequires = [];
         meta = {
@@ -804,6 +818,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "gited";
+        version = "0.2.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/gited-0.2.2.tar";
+          sha256 = "0ncxcrmiqhfzy18ssfkvbzmzwjbmr41ac1x7fpykrgihqiqglzfq";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/gited.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "gnome-c-style";
         version = "0.1";
@@ -1031,6 +1059,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "kmb";
+        version = "0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/kmb-0.1.el";
+          sha256 = "1wjfk28illfd5bkka3rlhhq59r0pad9zik1njlxym0ha8kbhzsj8";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/kmb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     landmark = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "landmark";
         version = "1.0";
@@ -1312,10 +1353,10 @@
       }) {};
     nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "nlinum";
-        version = "1.6";
+        version = "1.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nlinum-1.6.el";
-          sha256 = "1hr5waxbq0fcys8x2nfdl84mp2v8v9qi08f1kqdray2hzmnmipcw";
+          url = "https://elpa.gnu.org/packages/nlinum-1.7.el";
+          sha256 = "0ql1dbad29sdv3wmv65985g8ibl2176m2hqhjfrppgg34h3w51lz";
         };
         packageRequires = [];
         meta = {
@@ -1404,10 +1445,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170515";
+        version = "20170606";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170515.tar";
-          sha256 = "0lfapcxil69x1a63cszgq72lqks1z3gpyxw7vcllqlgi7n7a4y6f";
+          url = "https://elpa.gnu.org/packages/org-20170606.tar";
+          sha256 = "0m2gln3wz9v3aflyxxy2317808yy05rrzrjx35spw2d90d10hmkz";
         };
         packageRequires = [];
         meta = {
@@ -2061,10 +2102,10 @@
       }) {};
     websocket = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "websocket";
-        version = "1.6";
+        version = "1.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/websocket-1.6.tar";
-          sha256 = "09im218c1gkq1lg356rcqqpkydnpxs5qzdqkwk95pwndswb40a5a";
+          url = "https://elpa.gnu.org/packages/websocket-1.8.tar";
+          sha256 = "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9";
         };
         packageRequires = [];
         meta = {
-- 
GitLab


From beb18e135058a4fe2c87ff718690ea42f03425a8 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 7 Jun 2017 13:37:30 -0400
Subject: [PATCH 0618/1490] org-packages: 2017-06-12

---
 .../editors/emacs-modes/org-generated.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 024ae63f205..31d116fa2cb 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170515";
+        version = "20170606";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170515.tar";
-          sha256 = "04kpi7q1q4r9w4km941cy70q3k9azspw1wdr71if4f8am6frj3d4";
+          url = "http://orgmode.org/elpa/org-20170606.tar";
+          sha256 = "11x6s30j6k0y3jfzcp16qyqn48mki9j18iblnpl5dr1bk8kyvd0x";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170515";
+        version = "20170606";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170515.tar";
-          sha256 = "0jdcxir8wvmdxi0rxnljbhy31yh83n4p0l8jp85fxf5sx0kcc32p";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170606.tar";
+          sha256 = "0r6a5spzdbx6qdz5aziycmhjxm392v7iifv7mnln4s5lgnsswb1h";
         };
         packageRequires = [];
         meta = {
-- 
GitLab


From 76082b63e82a61ce754072cc8a8e58d97dc907b3 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 7 Jun 2017 13:37:59 -0400
Subject: [PATCH 0619/1490] melpa-stable-packages: 2017-06-12

---
 .../emacs-modes/melpa-stable-generated.nix    | 386 ++++++++++++------
 1 file changed, 257 insertions(+), 129 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 9491122a7ad..f156494b83f 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -212,12 +212,12 @@
     ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
     melpaBuild {
         pname = "ac-clang";
-        version = "1.9.0";
+        version = "1.9.2";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "ac-clang";
-          rev = "c4aab21df64011916039e18094e189533018e115";
-          sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms";
+          rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686";
+          sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -3688,22 +3688,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ceylon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ceylon-mode";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "lucaswerkmeister";
           repo = "ceylon-mode";
-          rev = "5817a8ff2189a8dd0ee77b8ff23353ca81ee4f38";
-          sha256 = "0n0kz0s2w82lbhzxmh8pq9xqnmc60ni0srvbwjbsinakwgkispf6";
+          rev = "00f790b3ed5ec48e2461e20a4d466ba45c634e13";
+          sha256 = "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
           sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4";
           name = "ceylon-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/ceylon-mode";
           license = lib.licenses.free;
@@ -3814,6 +3814,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cheat-sh";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "cheat-sh.el";
+          rev = "760cff945839a8397d44ac95aeec94cc28a51691";
+          sha256 = "10rr4bnhq2rjd6bx2r0d3cxa7ixk4la58agg5a83y3z52a673rqv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
+          sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80";
+          name = "cheat-sh";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/cheat-sh";
+          license = lib.licenses.free;
+        };
+      }) {};
     checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "checkbox";
@@ -4171,15 +4192,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
+    clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "2.2.0";
+        version = "2.3.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "531a09fda51c9043efe18fd1f288be21ced3f3d1";
-          sha256 = "0qjj40h8ryrs02rj73hkyhcjxdz926qxgvnjidav3sw2ggn8vdl3";
+          rev = "9005de31ed05122d3db9f503fbc69722abf3634b";
+          sha256 = "1pvxwvx36fl971j9dfhfk33sqg70nsw57brsi6kgphq7dgzmv7dk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -4188,7 +4209,7 @@
         };
         packageRequires = [
           cider
-          dash
+          clojure-mode
           edn
           emacs
           hydra
@@ -4196,6 +4217,7 @@
           multiple-cursors
           paredit
           s
+          seq
           yasnippet
         ];
         meta = {
@@ -4437,12 +4459,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.8.1";
+        version = "3.9.0pre2";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "8bd6af0d6386d1e0b26ff594b7d42621d67b5985";
-          sha256 = "10rij858aq3hdkdpackhmpmqj3zlfahc3jbfjffk2yicnwmnkb6s";
+          rev = "010b50fda71feaff3abec4d13910f4a4bd1f13b0";
+          sha256 = "0b77hm5l18fbzphg3wcdzrblbhh65wx7c1b98driky1634kn9j10";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5325,12 +5347,12 @@
     concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "concurrent";
-        version = "0.5.0";
+        version = "0.5.1";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "9668749635472a63e7a9282e2124325405199b79";
-          sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
+          rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
+          sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
@@ -5430,12 +5452,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "0.0.5";
+        version = "0.0.6";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "161feb918b104e87f1a284f5c4e5e507e0c177f8";
-          sha256 = "0y1j6f9xs877r4bv6dmcl2jsl27v0n6rsmpml719id2cfnh9sn4g";
+          rev = "fba9fe57a310a71c5aac90a26434df4c08214833";
+          sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -6056,7 +6078,6 @@
           homepage = "https://melpa.org/#/darcula-theme";
           license = lib.licenses.free;
         };
-      }) {};
     darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
@@ -6078,6 +6099,7 @@
           license = lib.licenses.free;
         };
       }) {};
+      }) {};
     dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dart-mode";
@@ -6312,12 +6334,12 @@
     deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "deferred";
-        version = "0.5.0";
+        version = "0.5.1";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "9668749635472a63e7a9282e2124325405199b79";
-          sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
+          rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
+          sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred";
@@ -7181,13 +7203,13 @@
         version = "1.2.5";
         src = fetchFromGitHub {
           owner = "hlissner";
-          repo = "emacs-doom-theme";
+          repo = "emacs-doom-themes";
           rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728";
           sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
-          sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
+          sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs";
           name = "doom-themes";
         };
         packageRequires = [ all-the-icons cl-lib emacs ];
@@ -7576,12 +7598,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "0.9.7";
+        version = "0.9.9";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "708bea9516812c6641ef8fc6f42dc087036addd8";
-          sha256 = "0yz0q3qvv9qxvwvjqd9zjqrrg6qxag092ni16vpni1mihw5803b8";
+          rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62";
+          sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -7933,12 +7955,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "0.7.9";
+        version = "0.7.10";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "b86a4b3a696328faaa37a808abeed54561d19385";
-          sha256 = "0ak5rw3y9cqggyclf9qddqrg9kzl50r5ynk9f99xjmsn2mpw6dwj";
+          rev = "1543835ce00412c3cd34a61497af5f68ead250a6";
+          sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -8075,22 +8097,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ cl-generic, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "0.12.5";
+        version = "0.12.7";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "9b4b9e28e307368568560a4290b278bc480e4173";
-          sha256 = "0hgg6wckxlmwg45jsl35zxxd08apsk0csi1sp9jhy72alah2mflp";
+          rev = "334bb4600051d96d5eb82655e6e2c2ef926e701e";
+          sha256 = "07h3za6cwznmgwm5854yyc3paidbjlpwsj71ii7qlga7j00b7ak2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
           sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
           name = "ein";
         };
-        packageRequires = [ cl-generic dash request websocket ];
+        packageRequires = [ cl-generic dash deferred request websocket ];
         meta = {
           homepage = "https://melpa.org/#/ein";
           license = lib.licenses.free;
@@ -9549,12 +9571,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20.0pre1";
+        version = "20.0pre2";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "4f03eba5294f1c1bc922b07f1267e6b0099fd4b5";
-          sha256 = "0ryi6r4ahh5dsl04nqgqhzymzm9krxr0kf4r3v3xg1yzw6d4g2a8";
+          rev = "d106c5fffb3832fffbdf99cca905390fe15d489f";
+          sha256 = "14hgl356fjkbx056fqhjif4kjs05ih08r9mi9qj58k0hxpva2l8c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -10621,14 +10643,14 @@
         pname = "evil-surround";
         version = "1.0.0";
         src = fetchFromGitHub {
-          owner = "timcharper";
+          owner = "emacs-evil";
           repo = "evil-surround";
           rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839";
           sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround";
-          sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
+          sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1";
           name = "evil-surround";
         };
         packageRequires = [ evil ];
@@ -11269,12 +11291,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "5.3.1";
+        version = "5.3.2";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "d84263bdac55501e05662caffcb0642bb8bb4a53";
-          sha256 = "0f133fpa53sqrx9a4hycvqzi3sbaswxdbma25isfrr0g9kf7j7db";
+          rev = "99801cd730d579ed3b05d084ad254b6a73b259aa";
+          sha256 = "0pqg6iib5ns6k5is0bv8riwficadi64dinzdjibk94h8i7cmp54h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -13061,12 +13083,12 @@
     fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "1.9.6";
+        version = "1.9.7";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "c2acdaaf36176d36ccadfe73c2593362ef930ebd";
-          sha256 = "00am42hl5icvbw5d7kpbdcl9sr8flsgl1pqmcxqpcz30yw6f4pr2";
+          rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e";
+          sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -13613,12 +13635,12 @@
     gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
     melpaBuild {
         pname = "gist";
-        version = "1.3.1";
+        version = "1.4.0";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "gist.el";
-          rev = "144280f5353bceb902d5278fa64078337e99fa4d";
-          sha256 = "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8";
+          rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2";
+          sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist";
@@ -13862,22 +13884,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "0.4.5";
+        version = "0.5.1";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "efd2a9a40b07e93cd5030d8b409d380c77fca88b";
-          sha256 = "0yhk4r5fdlmiw7n0cpdbjqcsm2vkm37qwwvkb7xz9046mkdag6gy";
+          rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf";
+          sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/git-link";
           license = lib.licenses.free;
@@ -14093,6 +14115,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "github-notifier";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "github-notifier.el";
+          rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987";
+          sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier";
+          sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw";
+          name = "github-notifier";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/github-notifier";
+          license = lib.licenses.free;
+        };
+      }) {};
     github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "github-search";
@@ -16012,6 +16055,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-company";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "Sodel-the-Vociferous";
+          repo = "helm-company";
+          rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048";
+          sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
+          sha256 = "1wl1mzm1h9ig351y77yascdv4z0cka1gayi8cnnlayk763is7q34";
+          name = "helm-company";
+        };
+        packageRequires = [ company helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-company";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
@@ -17296,12 +17360,12 @@
     hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hierarchy";
-        version = "0.4.0";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "ca919a4c71c187e1fbbad7e814aac1cf662ec51a";
-          sha256 = "0rrrj44ml2ymvxmg8igpn2irdhihv3djy5dfm6p6499cm64mawai";
+          rev = "a6a01cd4688fc9264fd36c279c0249f16704132b";
+          sha256 = "0b6g9j76zd5wdqg4xkw34a6sijf8jsdvnnr7hbix7zf8cxrr2gqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -20611,12 +20675,12 @@
     lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lfe-mode";
-        version = "1.2.1";
+        version = "1.3";
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "d722d3662b191b61310dc9bba78f9a77f512b742";
-          sha256 = "0j5gjlsk92y14kxgvd80q9vwyhmjkphpzadcswyjxikgahwg1avz";
+          rev = "af14b1439097850ffa39935419ed83f5bcaa6d09";
+          sha256 = "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -20933,12 +20997,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "2.15.0";
+        version = "2.16.0";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "f5603fb6bcfbae1e6950da7f91c3a15cf5250bb1";
-          sha256 = "1zzk3rc86xrkys3rcqiz61mnp00jkvb05f8p21av52h19axm4nn8";
+          rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674";
+          sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -22018,12 +22082,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.7.10";
+        version = "0.7.12";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76";
-          sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp";
+          rev = "31c68839bd1de8e79fe7bce6bdeade4bacdbc737";
+          sha256 = "1hm8w04d0cyy21dnciblz4gg15k5axfvaxx788hfz2pmbp435yni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22752,12 +22816,12 @@
     mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mowedline";
-        version = "3.1.1";
+        version = "3.2.0";
         src = fetchFromGitHub {
           owner = "retroj";
           repo = "mowedline";
-          rev = "5c848d79c9eba921df77879bb7b3e6b97b9bccb2";
-          sha256 = "1dmfks09yd4y7p1sidr39a9c6gxby47vdv8pwy1hwi11kxd6zbwf";
+          rev = "832e81b7f90f6c2e753f89737c0b57a260544424";
+          sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -22857,12 +22921,12 @@
     msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "msvc";
-        version = "1.3.1";
+        version = "1.3.5";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "msvc";
-          rev = "ffc7974f1cafb5e03bae2765afc6a984ffcb0f7e";
-          sha256 = "155bgayysdyr5a9wpx78azpipd11s3k8ijgw4mpvbmkk5j7fi6a8";
+          rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577";
+          sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -23424,12 +23488,12 @@
     nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nginx-mode";
-        version = "1.1.8";
+        version = "1.1.9";
         src = fetchFromGitHub {
           owner = "ajc";
           repo = "nginx-mode";
-          rev = "9e25e1f696087c412a45fe004b98b9345f610767";
-          sha256 = "0hjvbjwsk64aw63k4wcizpqiqq6d8s4qwzfvvsdbm3rx743zgzsz";
+          rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005";
+          sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
@@ -23652,11 +23716,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.24.1";
+        version = "0.24.2";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "e64fdf889d0f78543557f5b72ebca1571caf497e";
-          sha256 = "0vappcyidhzka2za6zqlcygn90a1xm9xrhpr9gvdp258m8qhz6d1";
+          rev = "2e86a4da55c29e0751d950839cdcbe40234ca8ba";
+          sha256 = "1g75k365cdl0670bs38bvf391hsiv7rwxbmwz53x03fyz4gl58by";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -24281,12 +24345,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "3.9";
+        version = "4.0";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "59aa5ac1957b4875e13f52885255293608a960f4";
-          sha256 = "1jjhksrp3ljl4pqkclyvdwbj0dzn1alnxdz42f4xmlx4kn93w8bs";
+          rev = "7ca20bb808dd51adbd83e0c18885c4300548d032";
+          sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -25084,15 +25148,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
+    org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "0.9.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "b6c6ae209d31caf71b158d6357780d74f6d08f19";
-          sha256 = "18zzzh5aifbdbd2lw69fn7scvhalgxhzfz3f3cscjjkvzhkkya8j";
+          rev = "785765d575ef4c28581f6790e9814d75eaeec4ab";
+          sha256 = "18f5fppipandbirhhs5jlrk4gl7jxyrswfwr36859433x2wkfj70";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -25108,6 +25172,7 @@
           hydra
           ivy
           key-chord
+          pdf-tools
           s
         ];
         meta = {
@@ -27736,12 +27801,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "0.14.0";
+        version = "0.15.0";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "fb28fc8710b614e9ab535788ee58f9a9070561f1";
-          sha256 = "0v7ddlk8mzqa8gvxrrcvd15klap5m31df8vn14z99s3ybj3zk0yb";
+          rev = "19e3dc1236377de86147df8f3635fbbfe7558b2e";
+          sha256 = "0n61npfg7hvybakn4nvsqyv2gmrwvf0jqwrh0nwzg9xg5hkbfmir";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -27964,22 +28029,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psysh";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "psysh.el";
-          rev = "6932f03447c3d821e4c03e99f1630928f0979452";
-          sha256 = "00dssrdsdvwdg6a6fwl3wv0y94axcd4jb3b3ndd1p3bcr56fxq49";
+          rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa";
+          sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh";
           sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
           name = "psysh";
         };
-        packageRequires = [];
+        packageRequires = [ emacs f s ];
         meta = {
           homepage = "https://melpa.org/#/psysh";
           license = lib.licenses.free;
@@ -29437,12 +29502,12 @@
     robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "0.8.0";
+        version = "0.8.1";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "92704288036a3111835488933002c58c1da240b1";
-          sha256 = "0sa1dfd3smhsxy7r1s4kl9a3rds8xjx7kszr9nw8f5h98z1999ws";
+          rev = "22457d6855fb39b8aedf068556d0e2fbd2874d5b";
+          sha256 = "0ll7ivxqnglfb0i70ly6qq2yfw9cyi3vq3lmj4s6h6c1c7rm3gcq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
@@ -30008,8 +30073,8 @@
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "52091426ee319b4ec53799696bae75571f7ecbf6";
-          sha256 = "15vr1yz23h0kb7h3d6gh3ljax762666lkz53chqgm54bszgfwjcm";
+          rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf";
+          sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -30319,14 +30384,14 @@
         pname = "sexy-monochrome-theme";
         version = "2.1";
         src = fetchFromGitHub {
-          owner = "nuncostans";
+          owner = "voloyev";
           repo = "sexy-monochrome-theme";
           rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96";
           sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
-          sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
+          sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq";
           name = "sexy-monochrome-theme";
         };
         packageRequires = [];
@@ -30695,12 +30760,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "bcdbc7142a0542639f47abb48fe17aa6c92f8406";
-          sha256 = "0wrxwjlkix5qgi3fvkaj9m43hyif9ba2bdyzc0hkig7ng0b99cjd";
+          rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f";
+          sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -30779,12 +30844,12 @@
     simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simpleclip";
-        version = "1.0.0";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "simpleclip";
-          rev = "eba19a21da2e4d1e11abdc158f72d6513afaa669";
-          sha256 = "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v";
+          rev = "7deff873b79910496b4baf647cdb8dd5de63465a";
+          sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
@@ -31892,12 +31957,12 @@
     sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sqlup-mode";
-        version = "0.7.2";
+        version = "0.8.0";
         src = fetchFromGitHub {
           owner = "Trevoke";
           repo = "sqlup-mode.el";
-          rev = "40f2bc0179539087971d48556dcce38e14907768";
-          sha256 = "1ya5acz07l61hry96fq0yx81w7zwcswxinb3fi0g1s4gshxy4hgk";
+          rev = "04970977b4abb4d44301651618bbf1cdb0b263dd";
+          sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@@ -33379,12 +33444,12 @@
     thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thinks";
-        version = "1.11";
+        version = "1.12";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "thinks.el";
-          rev = "f5a339b21cd5044f7b66beafab7c2d822c36f9e5";
-          sha256 = "1qjwzr9q98da25rf8hjgancb0k2kgr8xllhb4lhnqc8jsc4qnn5v";
+          rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d";
+          sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@@ -33627,6 +33692,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
+    melpaBuild {
+        pname = "treemacs";
+        version = "1.7";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "treemacs";
+          rev = "d5878b0ed6da2a561aa795b31848e31e7c696197";
+          sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
+          sha256 = "1sg3m9l9l1xww6an2210bghlby5cljw2jxh7q0w8cwmcga7rr4jh";
+          name = "treemacs";
+        };
+        packageRequires = [ ace-window cl-lib dash emacs f pfuture s ];
+        meta = {
+          homepage = "https://melpa.org/#/treemacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
+    melpaBuild {
+        pname = "treemacs-evil";
+        version = "1.7";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "treemacs";
+          rev = "d5878b0ed6da2a561aa795b31848e31e7c696197";
+          sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
+          sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3";
+          name = "treemacs-evil";
+        };
+        packageRequires = [ evil treemacs ];
+        meta = {
+          homepage = "https://melpa.org/#/treemacs-evil";
+          license = lib.licenses.free;
+        };
+      }) {};
     trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "trr";
@@ -34707,12 +34814,12 @@
     wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "wandbox";
-        version = "0.6.3";
+        version = "0.6.4";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "emacs-wandbox";
-          rev = "c82a71e880cb701281dd96a9772bdad37a6eacf2";
-          sha256 = "0hdpy4rf0406615mx5w235dkz71v24qmr2ci5rlqmfv53si0gynj";
+          rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1";
+          sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox";
@@ -34893,27 +35000,48 @@
           license = lib.licenses.free;
         };
       }) {};
-    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
+    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "1.4.0";
+        version = "1.5.0";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "b5491ab52d9e73e8a3175f9713b6c1acde6dcfe5";
-          sha256 = "1l45glgw6va6xaqbpjia69035p06a6csgwxs9xislfvmvq9lcxqz";
+          rev = "77e6154ece15ffcc58db80dca48fe342376831aa";
+          sha256 = "0zj1hhz7m0fxaj03aqjfd6jhcg2khi87l6742miwkdxxggwhdijj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
           sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm";
           name = "webpaste";
         };
-        packageRequires = [ cl-lib emacs json request ];
+        packageRequires = [ cl-lib emacs request ];
         meta = {
           homepage = "https://melpa.org/#/webpaste";
           license = lib.licenses.free;
         };
       }) {};
+    websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "websocket";
+        version = "1.8";
+        src = fetchFromGitHub {
+          owner = "ahyatt";
+          repo = "emacs-websocket";
+          rev = "a9b8e74fa190024cd450ef4f832482e8438674fa";
+          sha256 = "0yi6g7wmjsgv0dmpyf8cpin0icw3ymb7vbr3f9s01xs2w6kp8p13";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
+          sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
+          name = "websocket";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/websocket";
+          license = lib.licenses.free;
+        };
+      }) {};
     weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
     melpaBuild {
         pname = "weechat";
@@ -36031,8 +36159,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "c940797c19ad";
-          sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03";
+          rev = "c996fbcc2e79";
+          sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
-- 
GitLab


From 97d750eac05bdbfab280772afb36e216980d0dff Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 7 Jun 2017 13:51:42 -0400
Subject: [PATCH 0620/1490] melpa-packages: 2017-06-12

---
 .../editors/emacs-modes/melpa-generated.nix   | 1708 ++++++++++-------
 1 file changed, 1064 insertions(+), 644 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index bf943bf125e..daea504c24c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -127,12 +127,12 @@
     abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abl-mode";
-        version = "20170309.117";
+        version = "20170604.1309";
         src = fetchFromGitHub {
           owner = "afroisalreadyinu";
           repo = "abl-mode";
-          rev = "0539862591a5af70e6fa04f0e88e7fc0f0fbb11e";
-          sha256 = "0fxl67nmy6vi6viwxday4j81m9lg4l8vg6yw2phgagm4zlp65k58";
+          rev = "9aff997fe7b4caded60150a832e3704ac55e69e5";
+          sha256 = "0yfk7s7n10lkf11dy1l0xi0bbsjbam5lqq8kj9hxpz2zkddbaljl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode";
@@ -316,12 +316,12 @@
     ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
     melpaBuild {
         pname = "ac-clang";
-        version = "20170330.1108";
+        version = "20170608.958";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "ac-clang";
-          rev = "c4aab21df64011916039e18094e189533018e115";
-          sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms";
+          rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686";
+          sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -801,8 +801,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
-          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
+          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
+          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1258,12 +1258,12 @@
     aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aes";
-        version = "20160121.1237";
+        version = "20170607.157";
         src = fetchFromGitHub {
           owner = "Sauermann";
           repo = "emacs-aes";
-          rev = "1b9918036b16ee30ada71703a9283c67f2ad9999";
-          sha256 = "1p90yv2xl1hhpjm0mmhdjyf1jagf79610hkzhw8nycy2p1y4gvl6";
+          rev = "8d9ddaa7d13875745241f0f98758b1d72dd3be92";
+          sha256 = "1d998xyfnzgci62h0wv1n9a7hlk23ngcbl83k04ahz61g7haqnh2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
@@ -1487,12 +1487,12 @@
     alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alda-mode";
-        version = "20170529.1224";
+        version = "20170611.1031";
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "69f9f1aec6a52350a67ed1db87b6f6c99400622f";
-          sha256 = "1fkpq787z1k914kyln280mk06x58niks5hp9if620qpqvmqaih3s";
+          rev = "8bf40e0ed78c3d2b6536bee3a4b50a9f78a0c1a1";
+          sha256 = "167lmzh4grz4k47pw0pcq5pqbwjncfgw2wgzhvvg5jp66p7pmwqp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -2873,12 +2873,12 @@
     async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "async";
-        version = "20170502.2343";
+        version = "20170610.2241";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "09a177c15bd3aafc57ba6a63ab093f640ffa2610";
-          sha256 = "0jr5q7zrh2k5h884xk5m45g3ymj6kikx08wz521qhablfxma6xw8";
+          rev = "d6222c2959caaca5c4980038756097da8a51e505";
+          sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -3041,12 +3041,12 @@
     audio-notes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "audio-notes-mode";
-        version = "20140204.1154";
+        version = "20170611.1459";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "audio-notes-mode";
-          rev = "2158b2e8d20df3184bbe273a7fd5aa693e98baa9";
-          sha256 = "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm";
+          rev = "fa38350829c7e97257efc746a010471d33748a68";
+          sha256 = "1srg6rg3j9ri2cyr4g78dfqq3fhpn6hf3mq4iz2jfqjayppfv38b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/audio-notes-mode";
@@ -3559,6 +3559,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-minor-mode";
+        version = "20170601.1421";
+        src = fetchFromGitHub {
+          owner = "joewreschnig";
+          repo = "auto-minor-mode";
+          rev = "92871449782f8679f15573ad178b9c2247da8bfd";
+          sha256 = "14kh6p34mrqfqyjzr0wvxx4acp72pz2b75w96y3jyhiswvaqfcr1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
+          sha256 = "1dpdylrpw1pvlmhh229b3lqs07drx9kdhw4vcv5a48qah14dz6qa";
+          name = "auto-minor-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/auto-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "auto-org-md";
@@ -4382,12 +4403,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170525.1746";
+        version = "20170606.1402";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "ac27813fdc7ce32eca1c16a439b46eb3a6835ac1";
-          sha256 = "1alhmgj40hhkgdpc7j34iswl9d5afmxjw74p189gm782mzl9y4c6";
+          rev = "be8f3ea35a2f58a218db062934ce3a1a054db3df";
+          sha256 = "01pdwvv1pbphnsw3h38x087xbdp5ry1h18bqiiispzvhyc56xvak";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4798,12 +4819,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "20170526.743";
+        version = "20170605.541";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "01920ffea5965d0ac5bc7196b73d4e0dcfe86c60";
-          sha256 = "04fdcxb0rvrrrglwcd6f83fk445bziycrzdcvh3gcpq09x5ryinx";
+          rev = "28806d09207e4a194a39eb385650824a0121e0cd";
+          sha256 = "17qhbgq3ciyjjl4a1mm6qn5g5y39plmncad6i4kijcda9kx44w48";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -5153,12 +5174,12 @@
     bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bing-dict";
-        version = "20170209.1459";
+        version = "20170604.1831";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "bing-dict.el";
-          rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7";
-          sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6";
+          rev = "d4b261739e53e8ed8fa5db3d3946de82c0ab8e34";
+          sha256 = "0dn6rifr0njpw3mwbyn21bw88lp0kzwwjp7ivgbbl1bxshj0ybhk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bing-dict";
@@ -6762,7 +6783,7 @@
         version = "20151009.845";
         src = fetchsvn {
           url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/";
-          rev = "16556";
+          rev = "16557";
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
@@ -6972,8 +6993,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd";
-          sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr";
+          rev = "25057a27543788079e7040bf42b139e0aa0635b5";
+          sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -7014,8 +7035,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd";
-          sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr";
+          rev = "25057a27543788079e7040bf42b139e0aa0635b5";
+          sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7198,12 +7219,12 @@
     ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ceylon-mode";
-        version = "20170527.334";
+        version = "20170605.1450";
         src = fetchFromGitHub {
           owner = "lucaswerkmeister";
           repo = "ceylon-mode";
-          rev = "2a53cef43915576f68deb9646e38d432334d7ee0";
-          sha256 = "01qfivq3rr1rrsh45xjmw2wbljw14jbsm72a0c1fnbj9v75q2xlh";
+          rev = "00f790b3ed5ec48e2461e20a4d466ba45c634e13";
+          sha256 = "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
@@ -7223,8 +7244,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "1caec0c64d8fcf3b1e57192d1a6dff58e0a9ff87";
-          sha256 = "0w3l9awi76m4d4jscy3s50xfk56z4ym1qrihf9yansdqjzlzsi8l";
+          rev = "036c5898eb89e846fa1b86537a5c0569868dbaf0";
+          sha256 = "0cz4cwisnlbkclc6cn7rlz7pkpwh5p0646dzrkw92bk5vmwh89pg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7263,7 +7284,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12213";
+          rev = "12230";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7403,6 +7424,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cheat-sh";
+        version = "20170606.727";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "cheat-sh.el";
+          rev = "512c74b0cb0798a75303c5384ee165c8a5f3356b";
+          sha256 = "1m65k2gqd5irwk4cj97p33q14shn4cpz0zxcpg4m3bgiwl8qmxhs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
+          sha256 = "0f6wqyh3c3ap0l6khikqlw8sqqi6fsl468gn157faza4x63j9z80";
+          name = "cheat-sh";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/cheat-sh";
+          license = lib.licenses.free;
+        };
+      }) {};
     cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cheatsheet";
@@ -8142,8 +8184,8 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "304204";
-          sha256 = "1yvk57q2q4hg04lkvrnx79vgkw6j7hzlx3kvrq0xw93nr351adqv";
+          rev = "305184";
+          sha256 = "1hs00lf2f2fmxv2abhskrlqr96395j3ywbgs8aacadbzigdx4iq5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -8348,12 +8390,12 @@
     clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20170520.323";
+        version = "20170608.320";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "8904b7a9e21ea6319f8c37cf83a7200896bfae9c";
-          sha256 = "1bklsndfhg76a6y3vwbdcakmbrr2hnywjjfk2qaa3mbyxvmlqii3";
+          rev = "769eb06ac82dff8aa0239b9ca47cf3240ff0857f";
+          sha256 = "17g6rq30dvvhr3lljzn5gg6v9bdxw31fw6b20sgcp7gx4xspc42w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8528,12 +8570,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170527.1442";
+        version = "20170608.2315";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "6e966d57578bd1d30f2986b7aa8e222baa59a11c";
-          sha256 = "0l97zfa6vzb90w6592mydxvbppg126nyvd13m6w5b37bdm1ykj7v";
+          rev = "eacd330f28513276da18e4d6f2607f9041314c49";
+          sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8553,8 +8595,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "6e966d57578bd1d30f2986b7aa8e222baa59a11c";
-          sha256 = "0l97zfa6vzb90w6592mydxvbppg126nyvd13m6w5b37bdm1ykj7v";
+          rev = "eacd330f28513276da18e4d6f2607f9041314c49";
+          sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8759,12 +8801,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20170522.1105";
+        version = "20170605.12";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "afad08063f8b3d4e412b92663b237a2a7db467e9";
-          sha256 = "12n4fznz38p4iy8ak5ix7yvclhxrdkkmg324m4b2i3hd2s4ql80r";
+          rev = "b7bb7bf36d442c377988a090fc648b03b50c8eff";
+          sha256 = "1iw0blpi38yykqqzl6s0w7z74ym0b56k1rxg5anyw0q9zkp0hb72";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8784,8 +8826,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "3ed14cb3ac03e7df53b9f9f987d5180e74dc2b64";
-          sha256 = "1c8ilgx713lkg2hlla5bgp6lm3g12l6viy0ddflcghh3ql744x4f";
+          rev = "abd1216c1f8a1211d348568bb7695c30505de84e";
+          sha256 = "1z3c0wjvk5ry69sjmslvw2mnnri63dk1vk6lbx881fxf67r4wf7f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9048,6 +9090,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    coin-ticker = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "coin-ticker";
+        version = "20170611.27";
+        src = fetchFromGitHub {
+          owner = "eklitzke";
+          repo = "coin-ticker-mode";
+          rev = "9efab90fe4e6f29464af14e0d8fd1e20c0147b80";
+          sha256 = "0xnrh6v4s2s3fgvw0v9fl48dlk4r2p6axp7xf41gzb1ai81yczhv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fd783998658b69159e39d9440da7a0dd04135e49/recipes/coin-ticker";
+          sha256 = "0v4zyswhghknlsal9xfsgwf8ckjwrjkjrg8w7p6yjqrxmfsbw93b";
+          name = "coin-ticker";
+        };
+        packageRequires = [ emacs request ];
+        meta = {
+          homepage = "https://melpa.org/#/coin-ticker";
+          license = lib.licenses.free;
+        };
+      }) {};
     col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }:
     melpaBuild {
         pname = "col-highlight";
@@ -9259,12 +9322,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170528.1653";
+        version = "20170604.1611";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "2e229477acab33f4df54e3106ab3dc379df10f35";
-          sha256 = "00zhdmqfk50gilcan067ymc9n4wjw1ab3xyvv6v6q3s365wyh120";
+          rev = "21b9b9ae14f2f0084497de00e5a0a00919b87c88";
+          sha256 = "0v69lzqknk8qr7digda9vwri7pkhr5600lb39xzlml15m693acin";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9530,12 +9593,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170517.1436";
+        version = "20170611.1356";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "a5289c533c7a5445b2add25b7bf784cfa0f1f23c";
-          sha256 = "1wz1dp3fincxjcajmy35cbkjbwz5gi9iqdan9bhxii91g842zgpq";
+          rev = "950c54721f85e68fd21f1e92991d597fd38685e4";
+          sha256 = "1gkjin7ikghh4zbnpbg7gzhdj1hg125h8kq694aa4ag9379vivw7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9664,12 +9727,12 @@
     company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-c-headers";
-        version = "20150801.901";
+        version = "20170531.1330";
         src = fetchFromGitHub {
           owner = "randomphrase";
           repo = "company-c-headers";
-          rev = "9bfdd438be5ecb75e5717eb48e09ce69904676e3";
-          sha256 = "152fwy23x5k3dp45z1k4h4n6pcvl3wrhwhwd4l4rp06yhgwf0i1a";
+          rev = "e959d43bebf0a524f7378669983a39ee1379cc21";
+          sha256 = "18fi1jp3scz5rrf877qd1ciwx29bzndb85ifnx4ki0jvznvfas8n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d97b5c53967e0ff767b3654c52622f4b5ddf1985/recipes/company-c-headers";
@@ -10007,12 +10070,12 @@
     company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
     melpaBuild {
         pname = "company-irony";
-        version = "20170515.1608";
+        version = "20170611.1403";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "company-irony";
-          rev = "cebd82506c59d21a9c436bd8e8a33dfa8be84955";
-          sha256 = "09mzxyvp07qwdhxagyiggpccxsklkbhjg730q6wbqd13g1mlkryj";
+          rev = "f68c1b46d64b9f95cfc2a6d611089d0442ed58ba";
+          sha256 = "0kfv89vma93qv97vh1ajg74wq62sq7f6gr39pm8hmfvmk0d6y51y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
@@ -10311,8 +10374,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
-          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
+          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
+          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10475,12 +10538,12 @@
     company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "20170521.1109";
+        version = "20170606.49";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "b7ad7c440dc3640a46291a9acf98e523272e302b";
-          sha256 = "0cpq2kqhxg61rs6q53mfidgd96gna3czw90rhb6njhch01cv9i5m";
+          rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6";
+          sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10542,8 +10605,8 @@
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba";
-          sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2";
+          rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
+          sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
@@ -10559,12 +10622,12 @@
     conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "conda";
-        version = "20170425.1845";
+        version = "20170608.756";
         src = fetchFromGitHub {
           owner = "necaris";
           repo = "conda.el";
-          rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7";
-          sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2";
+          rev = "0257cd83796c3bdc357b69c1ecaf6d7eb6e2bf53";
+          sha256 = "035srwyx94fp80f6rgkvx1vxlvaznsgp7zy5gcddvyazx1a1yj0s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -10726,12 +10789,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "20170310.1621";
+        version = "20170603.945";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "161feb918b104e87f1a284f5c4e5e507e0c177f8";
-          sha256 = "0y1j6f9xs877r4bv6dmcl2jsl27v0n6rsmpml719id2cfnh9sn4g";
+          rev = "fba9fe57a310a71c5aac90a26434df4c08214833";
+          sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -10789,12 +10852,12 @@
     coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "coq-commenter";
-        version = "20160808.2307";
+        version = "20170607.1355";
         src = fetchFromGitHub {
           owner = "ailrun";
           repo = "coq-commenter";
-          rev = "b57c7c92219201c0f931014127b50fd9b1e0039a";
-          sha256 = "03wwdd9n7fijrczrrdhn9xisrj7mqhc2q7z4da6fm3q45sy2npqk";
+          rev = "6100933cadea289cdaabf2f56f2a0dd72385c1fe";
+          sha256 = "1b28gyyfjknjz23m18yhaj1ir72y8nl75cnam3ggygm9ax65h8i1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coq-commenter";
@@ -10831,12 +10894,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170526.203";
+        version = "20170610.2335";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
-          sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
+          rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c";
+          sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11630,8 +11693,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "290fb3c5101cf2957596cd21dfc8c04f6c441ca2";
-          sha256 = "0wxk1ylqn5zamjs6ksin4a2j3afgv3bygngb3sfvf6x061wyvzzr";
+          rev = "1fd1023bd5f2ec2f457f13d0d0a165a98c05fde2";
+          sha256 = "0gxn0kdzzsc801h5vhbpnn5p6msj6gv5lpy5qq6gyvvd0djp06mn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11728,10 +11791,10 @@
       }) {};
     cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cus-edit-plus";
-        version = "20170206.1603";
+        version = "20170604.1000";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cus-edit+.el";
-          sha256 = "02mcvr8fnaflqwxzafr6i745wcw8akhjjq8ami312aibf5yjadik";
+          sha256 = "0awn3m16cyamb4h9i4iq9fzbwzl6qrkpbcr4v3dr7iwlcz7lw7jl";
           name = "cus-edit+.el";
         };
         recipeFile = fetchurl {
@@ -11897,8 +11960,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "1b7a91a2c2aea7d3a25e8f0bf3689b106d673201";
-          sha256 = "0msv987niax3sid3krj791p780lm9kb2v83gd4f8g5y29if930dm";
+          rev = "0898a2f2bdc4dd01cc5ffacdf5dad45c9e38e32b";
+          sha256 = "0chfmiy1nk12yalq2bd812580fr38x3di5vjf6z2kyi96p11jw6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12523,12 +12586,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170322.401";
+        version = "20170610.1729";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd";
-          sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr";
+          rev = "25057a27543788079e7040bf42b139e0aa0635b5";
+          sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12731,12 +12794,12 @@
     deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "deferred";
-        version = "20170331.1759";
+        version = "20170531.2135";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-deferred";
-          rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba";
-          sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2";
+          rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
+          sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred";
@@ -13277,8 +13340,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
-          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
+          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
+          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13442,8 +13505,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
-          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
+          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
+          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13463,8 +13526,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
-          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
+          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
+          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13589,8 +13652,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
-          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
+          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
+          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13610,8 +13673,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
-          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
+          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
+          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13626,10 +13689,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170522.918";
+        version = "20170530.1023";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "061m501k8mg641acpvfjh6vbfhlml98xz0zxdqd34mm7aqsbrnz2";
+          sha256 = "121i39l4zaw3vhsxbh6r0b088982y3gvm0skf5b8wqldp4nsy55m";
           name = "dired+.el";
         };
         recipeFile = fetchurl {
@@ -13667,12 +13730,12 @@
     dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-rainbow";
-        version = "20170417.1341";
+        version = "20170531.816";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
-          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
+          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
+          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13692,8 +13755,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
-          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
+          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
+          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13792,8 +13855,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "cab59f335430f86a5c94cc9d8812d5f4f8d843f6";
-          sha256 = "06ckab6jabpx2kyi0ckwdr8jww4adh2dsrmb84qfgmanfgkbsb8x";
+          rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36";
+          sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14562,12 +14625,12 @@
     docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
     melpaBuild {
         pname = "docker";
-        version = "20170114.440";
+        version = "20170601.1345";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "b565a66d7fb8b41363fb90172b9882d4768ddd47";
-          sha256 = "185mw8yaxpq7327nyyqjbc4bipx6shhmbl1dzdl3bfhc11vp1xfn";
+          rev = "d3bdb09af10c7aa466b25e0c65a3d21fdf44514e";
+          sha256 = "097nrhnc668yclvisq5hc3j8jgpk7w7k7clrlp5a1r1gd5472sj7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14738,16 +14801,16 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170528.1204";
+        version = "20170611.1109";
         src = fetchFromGitHub {
           owner = "hlissner";
-          repo = "emacs-doom-theme";
-          rev = "71ca3f2910f2d857cea50f84a8cd27894aef848f";
-          sha256 = "1f4c3nf0psn6si13a7044z06mhj416hzqjgiyypxcwqx9mgbryhn";
+          repo = "emacs-doom-themes";
+          rev = "4b6482765e3be2c51a9d8d23bbbfb9a0c80bf4ac";
+          sha256 = "0g1883qz5a0fra1hsn6kx9r1hply61ba0bxhb8xx08j2zxbwj65s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
-          sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
+          sha256 = "0plqhis9ki3ck1pbv4hiqk4x428fps8qsfx72mamdayyx2nncdrs";
           name = "doom-themes";
         };
         packageRequires = [ all-the-icons cl-lib emacs ];
@@ -15173,7 +15236,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1796835";
+          rev = "1798436";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15274,12 +15337,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170520.112";
+        version = "20170611.1336";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "4fd2911b97db3d2d2450b4129337fa47da7e9011";
-          sha256 = "0zfc2lpb4lhrkhr5lyaqyk20zw11xh05hgb6b26sbvaz730s2rwb";
+          rev = "9743f3f2736c0e84c5dff860a142c78a0c4ed861";
+          sha256 = "19pdgwziriamf31vjca3y4fxcz4pcfdhr8ac2djz1gsfslq9n236";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15651,12 +15714,12 @@
     easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-hugo";
-        version = "20170529.2039";
+        version = "20170531.216";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-easy-hugo";
-          rev = "1aee9432aa99286410611c59c6317c3f97a66481";
-          sha256 = "0l05hg1fwjxknvv2rcz145disyxy9yr98lfd0nd1rhjgwhwyv2wh";
+          rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62";
+          sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15798,12 +15861,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20170523.1324";
+        version = "20170605.1440";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "594f69068c0022e3d9655ec794b55318458f3d6a";
-          sha256 = "00aw1mc7vaywk808jsnc0myl9l6vhkz2ag202mh5rp8zdsm9vy9s";
+          rev = "4624e67ca26cb348063a97a8f59a3fbcbf8a5736";
+          sha256 = "0ds11hphxp8jxsc50lvnr9n4macvzd82y7siqh8wvswk62l8vb4x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -16279,12 +16342,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20170518.817";
+        version = "20170607.713";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "4355de0802a88c04fa3016e91a66a640e2af066b";
-          sha256 = "0ikp37wq0992vn7qjzymp8xqri257mprqwxijxcp7q7w8xhcdq0n";
+          rev = "1543835ce00412c3cd34a61497af5f68ead250a6";
+          sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16476,12 +16539,12 @@
     ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "ego";
-        version = "20170112.2043";
+        version = "20170601.817";
         src = fetchFromGitHub {
           owner = "emacs-china";
           repo = "EGO";
-          rev = "d81561d39524a5f78d5f94216b0ca5fef4b5700b";
-          sha256 = "0scnhpj4naaicxp62hd0b5g3kf05gpldbi1z1sfnq4mqi84fnfgx";
+          rev = "93ccd450d2d9e5db27aebb024a1b2ed56d5131dc";
+          sha256 = "0izxsckmkdw70cz3ljar2r4iv784c43mnzjkayly08hlabq1g6b6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ego";
@@ -16534,22 +16597,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ cl-generic, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170524.758";
+        version = "20170606.1325";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "8a231bfb2dd8e3b8e88cc449e73bcd73beba62e9";
-          sha256 = "02hqxfvb5yzqlslas7cd268s2apminw8nh2nj8x1l6hlnmcqvqd7";
+          rev = "d9c81f3d900f2ffd78fd314685023d66d6d16438";
+          sha256 = "1vf2bxxk3dj0npgab0yzqfx6dvfh5aj1bhmbpw1xfhssciyg8q47";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
           sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
           name = "ein";
         };
-        packageRequires = [ cl-generic dash request websocket ];
+        packageRequires = [ cl-generic dash deferred request websocket ];
         meta = {
           homepage = "https://melpa.org/#/ein";
           license = lib.licenses.free;
@@ -16654,8 +16717,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "464ed451b506956ac7ec36c2a62be73243510291";
-          sha256 = "1jzk1798arigjdz99ss6ll8cbd8fxagn2mz7afcissvaq7rw35rm";
+          rev = "5b623bc5fa394389be7b0c00fd0b32e8e6b024c3";
+          sha256 = "0wisl97gpp9a2mbs34v4mas2q3hkry3zqxmlbll7l3h7r950wyqf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -17108,12 +17171,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170518.1835";
+        version = "20170531.206";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "c79fd5824a3881a8d82cd2fb4b18a559e1f26b8b";
-          sha256 = "1vgbk8blh43h2ih4jqn19wrhdigbf649d28iplv8r9d8vp54njp4";
+          rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55";
+          sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17182,8 +17245,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "c79fd5824a3881a8d82cd2fb4b18a559e1f26b8b";
-          sha256 = "1vgbk8blh43h2ih4jqn19wrhdigbf649d28iplv8r9d8vp54njp4";
+          rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55";
+          sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17409,12 +17472,12 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20170527.1917";
+        version = "20170603.2006";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "2edb123372624222e3510b5ce9b59c5e20a55a3e";
-          sha256 = "1yc3xbfx3ly6r5hicn4qm4rp27x6j4nm41cc0m7cshl7fdf83wzi";
+          rev = "85319b9e75dea9f79e6d16011ee2a15be11eb9c0";
+          sha256 = "1gnjx7ay0c167vnl7k9gxmvm93ipqfs93jmcmvy56rlvc7yyk39x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -18234,11 +18297,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20170501.1102";
+        version = "20170601.1651";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "179e8e73f501115a9b0c73056846d80809d5a144";
-          sha256 = "0v81x21bsxmvaxrg8yx4j5ycyd4fkjnk9bf3dw7p2cdywsjfb1hi";
+          rev = "0481ca3b8f8d558e545582440dde6dac514818fe";
+          sha256 = "1z2kzaw2jr4m189gd8978g6wy6z9wicf1klyh48l623lh7cv48ic";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18728,12 +18791,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170530.354";
+        version = "20170611.1428";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "cccdd2f7caa9b5357f8021098e63384b4cae381c";
-          sha256 = "0fhzlawd2nq14a0b8yx6lnmmklh2s9y5i23nwz8zmwmxxivffn3z";
+          rev = "86a52709a0c45e2f84737319f8f95abd0ea55ff2";
+          sha256 = "10ix3yx916c929i8fj2bqkjjm409mwpjzydji6x8n8v5s8lnw6m2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19369,8 +19432,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "b182febe36aa63eb8290f24ba4b7932673a9a9bc";
-          sha256 = "0p45lcfm4qxzfrcw2pw53m19swgx1m1805v7vdgdkcm63qbdjalj";
+          rev = "dd9e39dc2b97e30c03b24a00eb757be7d2c2bdc2";
+          sha256 = "1q5pd9a5d5513brw5s2x6652fmmql7y7lcnzv18kw3wc4qvccl24";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19532,12 +19595,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170502.2206";
+        version = "20170608.1234";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "ac13cb477d0775fc8fe1ffbd88f9909eb0688174";
-          sha256 = "0416sqx32aby2qaybc3qif8dhsmc3xq0968y772y5hq2lk7sh8dm";
+          rev = "3752438d17c45553956cf775022b2358ff3d8731";
+          sha256 = "0a2afjg0ygd88qp5pc39ghwck837f6sk57c8zbcsyxwrabxnchhd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
@@ -19952,12 +20015,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170516.257";
+        version = "20170603.817";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "39fa48ac89fcc0a3b8dfd9708207e4acf64bb2fa";
-          sha256 = "1i40v2dah5d1rx5pj40ivl534qs840bvk1h44hqs8n9fz945ck2j";
+          rev = "f2643cd3ae6727535ce76ed00a91bf96c09e280f";
+          sha256 = "1fyr963y2mnp8wk9jf0fpfp1k74ayhbcdyg1xknvd5jd5lyjgbkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20326,12 +20389,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170528.1105";
+        version = "20170612.100";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "00ab2876f2849c3be9f5d7475e4538a0ffecf872";
-          sha256 = "06idkqrbh96vp6nb2835g4cgxdcxhp3nm7am46r5ylvgmflw9jf6";
+          rev = "d45772929db630be8226e2786132d46e2c6bdb2c";
+          sha256 = "07mc036lz2lj0csg10a8gdqxqsf8mxsjfy3ha9wsrmbqhsvwixn9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20851,12 +20914,12 @@
     evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "evil-magit";
-        version = "20161130.847";
+        version = "20170611.1237";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-magit";
-          rev = "9251065b73c5023fc21d56f5b94c505cb7bee52d";
-          sha256 = "17jnqd73i680fpmghghadc4d4xlg39xfjx3ra8sll0h1xf4xkspi";
+          rev = "f851e5896fa90ae94dfde3d2a7554b4d5f9e665c";
+          sha256 = "127ccll30526b38g64pagagnia8mw0bs9db95xri0n48x4vginkd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -21061,12 +21124,12 @@
     evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "evil-org";
-        version = "20170528.1654";
+        version = "20170611.1149";
         src = fetchFromGitHub {
           owner = "Somelauw";
           repo = "evil-org-mode";
-          rev = "7cd1903419b9681993210723fc854bd43ca080e5";
-          sha256 = "14jfvk7y102ba7ky8qanhpg46i6if3narshixlbnsb2jd26dyvh6";
+          rev = "4da3d179d71113b906173a974fec933e9f55afa8";
+          sha256 = "16d9x89plmy6qrjvc8czrqpc1y53xbcaclc20yd8yyi722sdd4x1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21233,8 +21296,8 @@
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "c3e5e26c14f4a47daedb4fc48e1b0fb993aa0999";
-          sha256 = "009491hskqkvycng70n3mm7zqxlf6jjninddlcbnknyfr44y4xka";
+          rev = "d6d60b077e31755b6d543337dd165ab7e1c67d36";
+          sha256 = "05fxr48r7qilh52ycm6bi108y9kd1zw62mckf8ddhsjrvszx97nb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21273,14 +21336,14 @@
         pname = "evil-surround";
         version = "20170124.1110";
         src = fetchFromGitHub {
-          owner = "timcharper";
+          owner = "emacs-evil";
           repo = "evil-surround";
-          rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839";
-          sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031";
+          rev = "a4fc4483dff0bb0e544d832a845fdc6fb85c6214";
+          sha256 = "0xqvpr8irkv4qw82gcgnnfb9mjavb4jj9a11cw32wqjdg0106dlr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround";
-          sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
+          sha256 = "0aphv5zinb0lzdx22qbzcr7fn6jbpkdczar7py3df6mzxw5wvcm1";
           name = "evil-surround";
         };
         packageRequires = [ evil ];
@@ -21711,12 +21774,12 @@
     exsqlaim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "exsqlaim-mode";
-        version = "20170418.124";
+        version = "20170607.303";
         src = fetchFromGitHub {
           owner = "ahmadnazir";
           repo = "exsqlaim-mode";
-          rev = "3cac2ba06862a6407ce487423898af04de4996c6";
-          sha256 = "149g76rms1h183f78kzns6cy3jyllxyyhvb1x61c2823k2372wvh";
+          rev = "a2e0a62ec8b87193d8eaa695774bfd689324b06c";
+          sha256 = "1gj1q2h1ja30jizkjql12cxlppj07ykr4wxqca9msy043zdhqnkk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f660d7629bc27144c99ebcba45f1b06b14c5745/recipes/exsqlaim-mode";
@@ -21774,12 +21837,12 @@
     exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170528.2210";
+        version = "20170606.2038";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "9f71ca70942724e7a0c0ec2723963961ed0980c8";
-          sha256 = "13dpqm1b58ivlb17nbsb0rxg5bm52r64y4x0k0pajqfyig2krsrd";
+          rev = "ff656107e55458cb2b453eb4637ad203007068f1";
+          sha256 = "1ssbqcrhcprfd1n4bvcbczp3dqhq4hcl75qaz6alc9y11r2jb4ar";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -22251,12 +22314,12 @@
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20170208.1012";
+        version = "20170602.1912";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "ec1d202c11a1c81f7ab0b9cf235d64c68d8e3134";
-          sha256 = "1p32lqmnp7k0gck6my1cy4hd5sck28zkfvlg8q23lpkcg1vcsqlx";
+          rev = "2e3abe356b464b30350c08e243988a3116818b19";
+          sha256 = "0cplg10mhr2r3cp4wcaykyvbzilmjma90hkv4h1m8d8xrfdmmi7g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -22537,12 +22600,12 @@
     find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "find-file-in-project";
-        version = "20170522.729";
+        version = "20170531.2054";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "d84263bdac55501e05662caffcb0642bb8bb4a53";
-          sha256 = "0f133fpa53sqrx9a4hycvqzi3sbaswxdbma25isfrr0g9kf7j7db";
+          rev = "eb9fec502a2622b46301ca49183147b6b1fcaff6";
+          sha256 = "1hrdqdps76c1sfq9m9l6nid32lklsli2hgwzd4sl5ypb0zqhn25k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -23293,12 +23356,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170524.1742";
+        version = "20170601.608";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "b6baa8abc95d83a2f612e4f62f99681b8c4a91b6";
-          sha256 = "1i0bpfpascza9mw9w34a20d4l8q9pm444hw9dk39jkkvzksh98qc";
+          rev = "db3a745edb6b2678286e4d2bccebbb8d388c1a9e";
+          sha256 = "057yy3nmvlsczzq4h72a67qi4qbjl5ysv3vz4iw2nr1772a1y9ja";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23839,12 +23902,12 @@
     flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-flow";
-        version = "20170512.836";
+        version = "20170604.811";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-flow";
-          rev = "01c1150737b6d824153ec41adfbafcd3e1442d61";
-          sha256 = "1wxmx40hs391pkjiqmxdz1i4ajksagxbrm3wmp654pix8ynxcvxl";
+          rev = "a249e60803b1e423c67e40462229646cc77fcb68";
+          sha256 = "04xghj1l4fnfhl139k3s6q7fhln946gx8ak7l6ys7rz23iizbx4q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -23902,12 +23965,12 @@
     flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-haskell";
-        version = "20170519.1321";
+        version = "20170604.447";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-haskell";
-          rev = "2e4167d4cc055d5f825ed22d25b1662e10ebf8d2";
-          sha256 = "1idh7ji2hn4wxhxw4cz66qwkgh6fhzy6lqbxw55d0wlwwq1zva3d";
+          rev = "84a8853d2ed4bd74038bb45d531dfbff0a3b1de0";
+          sha256 = "1lzf5wahmbxfqa7944z5gjbs7vfbm5qsv02jc7x3cvj8z22kf4fd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
@@ -24179,8 +24242,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "flycheck-package";
-          rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38";
-          sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa";
+          rev = "cb526f54f4017454e2503b340757ba15578a5aed";
+          sha256 = "1x1pmz7gd909s11fsyqrh8a7bg2j4hw572wwqy1kjz2qf42mfw53";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
@@ -24368,8 +24431,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
-          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
+          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
+          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24578,8 +24641,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "b7ad7c440dc3640a46291a9acf98e523272e302b";
-          sha256 = "0cpq2kqhxg61rs6q53mfidgd96gna3czw90rhb6njhch01cv9i5m";
+          rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6";
+          sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -26142,12 +26205,12 @@
     fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "20170416.335";
+        version = "20170606.925";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "c2acdaaf36176d36ccadfe73c2593362ef930ebd";
-          sha256 = "00am42hl5icvbw5d7kpbdcl9sr8flsgl1pqmcxqpcz30yw6f4pr2";
+          rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e";
+          sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -26171,12 +26234,12 @@
     fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170529.2340";
+        version = "20170531.1958";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "75444875c86fdf33b1604b26100cf5399d6aec86";
-          sha256 = "0a8nb947xab72pcahjz11jilnzasldi0ywcaxwviv6z6k92j8k62";
+          rev = "c9a9d722848dfc3f37ac9e0e91603340e5f5df1e";
+          sha256 = "0faf8796vvfi2g4kmh7xsnc08m3iyldgcivslq0xy86ndh682f06";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26200,11 +26263,11 @@
     fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fuel";
-        version = "20170107.626";
+        version = "20170601.1205";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "5b1198e20cc5b7e748835040bd5331b4618c419f";
-          sha256 = "0gyy77zm8mfx4krrdzdpivmzrfx3kp89sw7wipqpx6g4a4ji6pgz";
+          rev = "dc0b8994f00bd46de99398f92bf949a784c7a9ee";
+          sha256 = "1wka0ldx68psxjp3bl6xwx48mlnawqccvyig1lr4c5vi1avkf6dk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26329,8 +26392,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "6a06fd8ce22d945edf6eb777d6b82f8859c5189f";
-          sha256 = "1jglv0f1lw5wf7xc9hmbgdbfn465qymp53wmy93k43k0zhg9nzpi";
+          rev = "19015c8d84abc84cfd5f39295b02af8af5ef2e94";
+          sha256 = "1vp24kgi3hv2j7df6nmczhfy847725c6jpjizmgfl9r2d7d1v9bs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -27009,6 +27072,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gift-mode";
+        version = "20170603.906";
+        src = fetchFromGitHub {
+          owner = "csrhodes";
+          repo = "gift-mode";
+          rev = "0d6adae976ee0831877d4bf237090ff67fb76e1d";
+          sha256 = "1ld367qvyn7700mry24j4ywmanaknpwgfmq18h72sn408z9vsalc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode";
+          sha256 = "0sybrjmcg90cjaax7lzzqvacirn5l23hqy9d843c660fsv98scg1";
+          name = "gift-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/gift-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     gildas-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
     melpaBuild {
         pname = "gildas-mode";
@@ -27033,12 +27117,12 @@
     gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
     melpaBuild {
         pname = "gist";
-        version = "20161127.855";
+        version = "20170604.1834";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "gist.el";
-          rev = "62888de7f776c867a51cee4d5d55edc561e519cc";
-          sha256 = "0xvmrpx3gbdancxhggw7k7r2bzlwmni9vynsjf5ddpv5alw2bscx";
+          rev = "a03f142455e8b39f77fbd57ee1c1e44478c1f9e2";
+          sha256 = "1xisjaxr54zrxzxj8cp8f90kzphd5v3j56d14534fm5r1f5343vp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist";
@@ -27159,12 +27243,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170510.910";
+        version = "20170609.2310";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
-          sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
+          rev = "622c994183294b02893ff286210bffd5255296df";
+          sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27327,12 +27411,12 @@
     git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "20170504.1834";
+        version = "20170603.1026";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "88bb1cddbcbaa52c674288173fc0806fc6d4a904";
-          sha256 = "0yj0rldpvyfz939ld9pfgpamlzrc70wchvq094js6il78514lr49";
+          rev = "472af75eca7aba42a1934f408c4bda55e34c9dcf";
+          sha256 = "0xgvwg2zxb9akk3kxxcz5cvgw4zkbqx5p4b5in01z5aj4lqmjw6s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -27579,12 +27663,12 @@
     github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-notifier";
-        version = "20161102.755";
+        version = "20170604.2119";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "github-notifier.el";
-          rev = "12621caa8d78bf2b559d2113ef476a8f2c2a4e0e";
-          sha256 = "1cwabnm6nirmrwdq14l3pqdjh40h49icbfjx3z86rppp7cj3dmlm";
+          rev = "f8d011ebef9f626a94a27b5576c8ed06e6ff8987";
+          sha256 = "0glkn36fs93y2n1583k8v958qfhl212hbdk3cpkq432hj08wzjnr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier";
@@ -28610,8 +28694,8 @@
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "a5f4a247366d8fc436941822e14fc3eac7727015";
-          sha256 = "0fixw5j4ypzaj5jni7d1pak8g0wv3c9h267x3nkyjdwwwqrxkwi0";
+          rev = "c5fb716d6688a859aae56d26d3e6070808df29f7";
+          sha256 = "0bp9aarkinjr6m358qw9x4qxi3v9h06jvipyx1pg3pwsqh61vb12";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -28771,6 +28855,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "goose-theme";
+        version = "20160828.545";
+        src = fetchFromGitHub {
+          owner = "tokenrove";
+          repo = "goose-theme";
+          rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c";
+          sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e23a52e068ec0e6d457402254727673ea02bd407/recipes/goose-theme";
+          sha256 = "1nw948js678xc5vgrpdkykpcbn1b1id4k1clf87vfv7y5zssvd0x";
+          name = "goose-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/goose-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "gore-mode";
@@ -28923,8 +29028,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "67b13b52bd135469ede5b0caa4b1f79e19d228d0";
-          sha256 = "15mpcp8pyg22d9a81nxv7zbwiqipvz7xfllkrrwn9ggb0vp3bj2q";
+          rev = "98f52561d70fd95cfb7a5155ec9e62282bc55dc2";
+          sha256 = "0vqnsyn80h06qi2ypql4j66a9w1dsnd5f95gcnj5dgwk0scgpfxp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29049,8 +29154,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2";
-          sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7";
+          rev = "816182124457bed620678f9a92b349787cbf87bd";
+          sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29430,12 +29535,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170529.46";
+        version = "20170609.1120";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2";
-          sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7";
+          rev = "816182124457bed620678f9a92b349787cbf87bd";
+          sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29640,12 +29745,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170508.1218";
+        version = "20170608.303";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "41a9d7ba0acfd19e4c669aed12684e852bf886ca";
-          sha256 = "1vkhzb9mzcrm7yc6vccd0937j19hg1m3jbswlb7qjl3gi3dc57hr";
+          rev = "af57f5e969004dc5141cdb1d4c77c55ece0c6868";
+          sha256 = "0nv85nlcac7k5pld2sg9wsbggq394jlmpcayzkrm81yy8a5grm5d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30144,12 +30249,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170526.2107";
+        version = "20170601.2103";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "b0a5743f349e5e5b812291b5b06095aee1456656";
-          sha256 = "0ms4jf9zj2svyyh0rqbdbkx4rjll4rla7x5lzyiki7z27pf3c7df";
+          rev = "c46bdf129fb7ac241b84e0cfffcd3c7588dfb1af";
+          sha256 = "095y6zg8frdl9z7r4xp4dysf93d947srwiylngss8fclav7fjq2y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30413,12 +30518,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170527.2302";
+        version = "20170611.701";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "3396747e847a355b9cfbf7df1e851c507bd96381";
-          sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644";
+          rev = "9f532785d43389339ed73d90357d4aea9d966020";
+          sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30788,6 +30893,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-charinfo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-charinfo";
+        version = "20170611.1746";
+        src = fetchFromGitHub {
+          owner = "mandoku";
+          repo = "helm-charinfo";
+          rev = "a4902a90bd9f012468ad8186e2548c7814847613";
+          sha256 = "024pqnw87whwa7zpld8bcz1izaymqk0vajhbf9m173hlfw6x7wmp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/helm-charinfo";
+          sha256 = "04k6crcwhv2k69f5w75g0dg0f5qsbhyxl93qzxxdb5bnr56ad7f6";
+          name = "helm-charinfo";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-charinfo";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-chrome = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-chrome";
@@ -30980,12 +31106,12 @@
     helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-company";
-        version = "20170519.2126";
+        version = "20170608.1029";
         src = fetchFromGitHub {
           owner = "Sodel-the-Vociferous";
           repo = "helm-company";
-          rev = "467617b68f43600e09ea6e3e7ad82cab08148fd1";
-          sha256 = "1akrc04xfsv3xjvj783mvmq20rch1igpzldd3ym4l343xrgbi69w";
+          rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048";
+          sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
@@ -31001,12 +31127,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170526.36";
+        version = "20170611.135";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "3396747e847a355b9cfbf7df1e851c507bd96381";
-          sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644";
+          rev = "9f532785d43389339ed73d90357d4aea9d966020";
+          sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31085,12 +31211,12 @@
     helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dash";
-        version = "20170221.638";
+        version = "20170531.135";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "f07a77bd6ae6d8c933753f25526cbf3b71903e77";
-          sha256 = "0az1j68g0svynvag7p3x7l1rv4n6y1knkmfcjhcli4jwrkn720xr";
+          rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe";
+          sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -31568,12 +31694,12 @@
     helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-git-grep";
-        version = "20170423.759";
+        version = "20170530.830";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-git-grep";
-          rev = "605e214632644224b5b7adf2a68f265489c2a080";
-          sha256 = "03hix4vqp1krh8v3x6iqs3xqpcjzibwlafxrmn2gz3n4f9xb9j37";
+          rev = "e3ae5f60585ac0213876dca5093aca467db1ac5b";
+          sha256 = "0bld5kjzgjhkjcjc7b66kg55yb7pzrbnxfqx79f5glxckbp2pxjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
@@ -32030,12 +32156,12 @@
     helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ls-git";
-        version = "20170523.1149";
+        version = "20170601.2200";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-ls-git";
-          rev = "61ee52a6b095a8cd1b23387e0eec58c93a7368be";
-          sha256 = "10g60rdbk46xr8kxcvvqnpha20vv38fj1qpc1872ycg3r911sa11";
+          rev = "1253c7615da055a95548b4f92a8a503fe249884e";
+          sha256 = "1zyix2whj9j19ica9pff1hh7vgyg1h009vx5xhcqw5sligrh2dwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git";
@@ -32621,8 +32747,8 @@
         src = fetchFromGitHub {
           owner = "bomgar";
           repo = "helm-rage";
-          rev = "dc51371265acea60ac0691016f6ce84597bcace1";
-          sha256 = "1asz4rq5c4w82w167li0vvmqv3zjl4rz67c2dj8i717ihcm45sip";
+          rev = "3cae7f309b45cc6e40507be68c0cc2e5595c1392";
+          sha256 = "0j8yvxvd78lcfpss327xc6rahkqva66rrqjjx5cmdl82xncb53vz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
@@ -32789,8 +32915,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
-          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
+          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
+          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33104,8 +33230,8 @@
         src = fetchFromGitHub {
           owner = "bomgar";
           repo = "helm-unicode";
-          rev = "e331c38e651287981e5d34c27e5d7dc4ff24b0d4";
-          sha256 = "05pvswisi44bl35anjbimd0q8i3c7kkjfksvaj69gcr788lhb8iv";
+          rev = "1ad1fcca7a83c163ae74eb72a443cfc102128e33";
+          sha256 = "16s0k6l2k32nxmgqc159kr5vzgn8gydj3bkrkvhhydm3lnh8ki0n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode";
@@ -33251,8 +33377,8 @@
         src = fetchFromGitHub {
           owner = "maximus12793";
           repo = "helm-youtube";
-          rev = "7a944bc25f0f9e915011e9325caf46b46fcaa1b8";
-          sha256 = "0948rq6i4ibwhmi6m2k23f83yvf56vwgri1sg2060d901zd86cxy";
+          rev = "202c27fc3b54927611e9d9c764465e1b42ef7e41";
+          sha256 = "1wqxcz03fq2z31a1n90dg9ap3451vx1376ijbpfy9sg66pgj8yxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7537f732091b96b6c1b96c0174895278eba6776a/recipes/helm-youtube";
@@ -33343,6 +33469,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helpful";
+        version = "20170612.205";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "helpful";
+          rev = "fdabfe7d88853e052cd5a20614585ed3cc1faeac";
+          sha256 = "0x8d28s6fi8lmdyp8nyqi0dryf06703kddws079qr0l4p5jiibxr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
+          sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
+          name = "helpful";
+        };
+        packageRequires = [ dash elisp-refs emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/helpful";
+          license = lib.licenses.free;
+        };
+      }) {};
     hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hemisu-theme";
@@ -33632,12 +33779,12 @@
     hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hierarchy";
-        version = "20170502.746";
+        version = "20170605.842";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "18722f28baf24e2040c5ba00e548bd2e73b52bb4";
-          sha256 = "1f07hpg8v1xyxn2nrwz5hq1m9iq162k7b0sgi5jnq55zyii25dvr";
+          rev = "d26f566d386a56e752d8ca1c813932d68b088bde";
+          sha256 = "1dk5hdcjakxi91q29lbnwvbfhr834sxmsr2mrxr5mqhp3wfg3qga";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -34105,12 +34252,12 @@
     hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hindent";
-        version = "20160905.243";
+        version = "20170609.126";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "ea919ff276028b525688bcc09105943c584c0892";
-          sha256 = "08gd4dl7p0gxmlds1yw1a36902zgbrdcjzb6sp45yk1i4xqqg1az";
+          rev = "b858104fab63257de4b172b085b28e24ecacfed0";
+          sha256 = "1yzmlflzx9gvm0dysgjwi0a5nm7w7diczwqp4zggd4bl8bb45fip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34354,10 +34501,10 @@
       }) {};
     hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hl-line-plus";
-        version = "20170223.745";
+        version = "20170604.1526";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-line+.el";
-          sha256 = "1dhrfbmh98y18xgsp42rx1qqcs296mpqqzzp3nr9rcqv4gvpllgp";
+          sha256 = "09dwllzhw0441fbhkw7nb4isfnll6nbpp0il4yc7wgjvg4s94hw6";
           name = "hl-line+.el";
         };
         recipeFile = fetchurl {
@@ -34456,12 +34603,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170525.748";
+        version = "20170606.644";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "6dacb781f48bc818286d8a63bcb23a93991ed292";
-          sha256 = "0vgmms7z5rfhjjh2gszyaqdnfhx585mlmn8mp54rrz9zbnqy5qnd";
+          rev = "bee9cee09d6909cf35f80582aee5a1de6c90db39";
+          sha256 = "0jzl2qjyl7kbb16barh365kl5qziamgv87nx934s608498dyl4j6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -34853,12 +35000,12 @@
     http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "http";
-        version = "20161127.1449";
+        version = "20170603.1107";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "http.el";
-          rev = "18057d0967015979ee7e59598b1d3410d5966fcb";
-          sha256 = "1bw9369c3r172p14rb74vqs0243696rqf46z627p1w73afq48zy5";
+          rev = "19317fcc928bb75e0464e39032af1627b7961a0c";
+          sha256 = "14zq54g4ckcrrbpwjcb84krg9bijw88nwnkj8kg9kij5p25knqwh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http";
@@ -35270,7 +35417,7 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170522.1503";
+        version = "20170609.903";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087";
           sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
@@ -35477,12 +35624,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20170313.1603";
+        version = "20170601.559";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
-          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
+          rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40";
+          sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -35792,12 +35939,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20170313.1603";
+        version = "20170530.1839";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
-          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
+          rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40";
+          sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -35876,12 +36023,12 @@
     idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
     melpaBuild {
         pname = "idris-mode";
-        version = "20161102.707";
+        version = "20170611.2243";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "b5e057bf6b805f4da7c17cb6ca5e69833935e900";
-          sha256 = "1bwrf529m9xjb9bdypx35ss5v6k5v96hcqah3sij98x9357g7b6n";
+          rev = "8a2711efb7e2e4cc2a9a48cee422dba848c6155c";
+          sha256 = "0akp4mbsm4jmf5c652sbbb7gqf5w31ijfqdcckm28zxk2jwc1gz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -36373,12 +36520,12 @@
     importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "importmagic";
-        version = "20170519.2206";
+        version = "20170601.1828";
         src = fetchFromGitHub {
           owner = "anachronic";
           repo = "importmagic.el";
-          rev = "a5505985086ce3c5bb3255ca10b140f3a5563e65";
-          sha256 = "1ikik8b99qkmfdcp6lqy0ivpb1wbav6vd0idvbd5qazkp9jj3qya";
+          rev = "41f90782b7d5c58f53ad0187b816faeea408e4cf";
+          sha256 = "1w73734n8qwhvina1y9m60b5jj5yy1csizbldyph4vcgi3x0ff6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@@ -36415,12 +36562,12 @@
     indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
     melpaBuild {
         pname = "indent-tools";
-        version = "20170322.1001";
+        version = "20170608.647";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "indent-tools";
-          rev = "d50c762d9f6f66cd1b4b72f1b5d024284b378aa9";
-          sha256 = "1jk8k13mx5z3v38q9d8m5lz52p14imj89zvy7484mbjqmvxh6wga";
+          rev = "8d2072eef1fdc87e35f7495adfbfa0beb9faf6b7";
+          sha256 = "1hrsmv25q9rpmj8paf3gggw7sp28z1m4gwlx50s64k5mxqa99iy8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
@@ -36454,29 +36601,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    indium = callPackage ({ company, emacs, exec-path-from-shell, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
+    indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170524.651";
+        version = "20170609.923";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "07c3d444def957a05757a035dc178b8459822ee1";
-          sha256 = "1hbhkl7i1b09dhc9vc555xic8hsmlh8rjhvkcb09g372slikzxfa";
+          rev = "e9b0104bb36b1ce349bf048979746e0ad738d43d";
+          sha256 = "14a0gpp71045j4hs5s2kmisv3466imzyag7f43r1gsg4b0gp4c8m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
           sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
           name = "indium";
         };
-        packageRequires = [
-          company
-          emacs
-          exec-path-from-shell
-          js2-mode
-          seq
-          websocket
-        ];
+        packageRequires = [ company emacs js2-mode seq websocket ];
         meta = {
           homepage = "https://melpa.org/#/indium";
           license = lib.licenses.free;
@@ -36569,12 +36709,12 @@
     inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-ruby";
-        version = "20170515.1648";
+        version = "20170530.1824";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "81adadf0f98122b655d0c2bee9c8074d2b6a3ee2";
-          sha256 = "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z";
+          rev = "62c1c72d8e2a8e1ca8430010c19be930f54e6daa";
+          sha256 = "1w9jgrvly07056f72xf4ink0i8q1xv3rnpv5kbifsjfxzz05crbb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -36819,12 +36959,12 @@
     inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inkpot-theme";
-        version = "20170413.120";
+        version = "20170602.1000";
         src = fetchFromGitHub {
           owner = "ideasman42";
           repo = "emacs-inkpot-theme";
-          rev = "372ad654293cd0b8cf7db6129674c5a84d54ca53";
-          sha256 = "0642rcjj1z5c86ry97b6kmf7kivhajvz5f9fz9kqfw0f98srzhrs";
+          rev = "d9e97a2b95a7740c8eb72fa795fface8b1500fd0";
+          sha256 = "1c8zl512c5mw126p43l6prdimfn2mi58msb0sw4csf9r1krkv8if";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -37028,12 +37168,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170518.307";
+        version = "20170611.437";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "4151177d17af8af58488398a4092e406bb93311d";
-          sha256 = "0q8qbg2j84vb4n2yyg279yprf9ssh0s6mi0gpmawjwvqp7f3rjdw";
+          rev = "70c9c524b3de8dce739df7fe0fdb5128fc8adf11";
+          sha256 = "1jb28d9mcnn2098lmlq4jfk64jjdfn24pmwl8gax80v4p81b54vm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37505,12 +37645,12 @@
     itasca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "itasca";
-        version = "20160406.542";
+        version = "20170601.922";
         src = fetchFromGitHub {
           owner = "jkfurtney";
           repo = "itasca-emacs";
-          rev = "bf0b6a66b57c8a0e7d692d306a50b587a2da8284";
-          sha256 = "1174f75p3rkq812gl2rs1x51nqbz4fqxwsbrd7djh1vkd2zii3aw";
+          rev = "3d15dd1b70d6db69b0f4758a3e28b8b506cc84ca";
+          sha256 = "0mfcl7ka7r5mx52xvf13i3799ddkdi9sq2q4p2rkgb96r37ia221";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/itasca";
@@ -37589,12 +37729,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170524.950";
+        version = "20170609.943";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
-          sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
+          rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c";
+          sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37631,12 +37771,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170524.2010";
+        version = "20170605.2046";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "2d93b1b0ec1705e449f2e0f43073aacc8f1e3242";
-          sha256 = "0lrnd5r9ycy2qqggqd0sr6b2w7s28yfm15pgyh0r0rjdxky4a5vm";
+          rev = "117369f882f81fb9cc88459a4072a2789138c136";
+          sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37694,12 +37834,12 @@
     ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-hydra";
-        version = "20170412.30";
+        version = "20170609.938";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
-          sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
+          rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c";
+          sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37782,8 +37922,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
-          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
+          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
+          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38445,6 +38585,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    jemdoc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jemdoc-mode";
+        version = "20170611.1536";
+        src = fetchFromGitHub {
+          owner = "drdv";
+          repo = "jemdoc-mode";
+          rev = "0b09b0368acf3b90c9b58274ff8c2a1e77d1d5e1";
+          sha256 = "094smy6n30lwgldg958z387dc0nzjvghlai5xpxc5q2i1gjjqh78";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/49a8c0f885df0b91d758b4d7c92bd67368da8a56/recipes/jemdoc-mode";
+          sha256 = "1bl8a9fcilrqjzh92q7nvd16pxjiwmbnj157q2bx36y7bxm60acv";
+          name = "jemdoc-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/jemdoc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "jenkins";
@@ -38968,6 +39129,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "json-navigator";
+        version = "20170606.34";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "json-navigator";
+          rev = "bc5634fc78d2e43ebd3c255350829877f3e4549c";
+          sha256 = "1j2lic9sn00j6pzq5qslv9m2z0rvsxkvz73z8swp7vcrsgz7qvqd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator";
+          sha256 = "0yfl31cg0mkgsbpgx00m9h2cxnhsavcf7zlspb0qr4g2zq6ya1wx";
+          name = "json-navigator";
+        };
+        packageRequires = [ emacs hierarchy ];
+        meta = {
+          homepage = "https://melpa.org/#/json-navigator";
+          license = lib.licenses.free;
+        };
+      }) {};
     json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "json-reformat";
@@ -39116,12 +39298,12 @@
     julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "julia-mode";
-        version = "20170426.1806";
+        version = "20170607.537";
         src = fetchFromGitHub {
           owner = "JuliaLang";
           repo = "julia-emacs";
-          rev = "46d2469c408888cfeeec27904116cfc22ceb1461";
-          sha256 = "13w3wpq5qi5fvzs56ckfr118qx7kfllhjsxxfj2l4ijg8x5d56vq";
+          rev = "f591c6d42e493d51f1522fd0449d6a62881adfad";
+          sha256 = "1wjbvwfdish673y5qjr3r8w935dv1cz8j0sv8dmd2i6w5wf5d1qb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -39408,12 +39590,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170529.1516";
+        version = "20170611.1344";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "4b3dab02562eeadfb67ea07bc9f2c9d7b6be2d44";
-          sha256 = "1gqfpg2agf2ln8ca3qp14rwmh1blxrfwm1aai2n7bv2maz3b1lz9";
+          rev = "e0c14489867eaafa3ab39bb271e3e466cebb632e";
+          sha256 = "0zk2crzqzrbn1051fdkpxzyr6d2rknh7nznnbqyw3k75agiq3lm9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39916,8 +40098,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "b7906e7456383c39555cd988f410043dbcca47a1";
-          sha256 = "1ifzx2z48l1g1livnmhngnaf875fgnnmv1p79j2w10xjwkasvff4";
+          rev = "27e3b90eae2a0155b22a435f1b6f65c913519db6";
+          sha256 = "0c6qxnhmhwsb7gqib40fgg2p7krvmxdx75xka8gh3j47zww0pylp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40105,8 +40287,8 @@
         src = fetchFromGitHub {
           owner = "Emacs-Kotlin-Mode-Maintainers";
           repo = "kotlin-mode";
-          rev = "e5ee4c4bd25a61e0f5067ca8939d1a3185909471";
-          sha256 = "1sfl4cz2ll5vvzzmg3cr8gpcbg0rmnd8dvmbvphb80gc8qacnd7s";
+          rev = "1ed0c5589ef2d53242f767f6071dbea90c64e813";
+          sha256 = "0nywyf0znaffkchca5hal1w6h7fis9pybiivz7vzrr85ppl0gzas";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode";
@@ -40372,12 +40554,12 @@
     langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "langtool";
-        version = "20160116.1654";
+        version = "20170606.432";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-langtool";
-          rev = "d014434d5698d927dfdbd0882d974edc3fc6ac66";
-          sha256 = "1rj0j4vxfwss0w6bwh591w5mbyzjg5rkbwyjaphyi6p7wq5w6np1";
+          rev = "d976e4f0cadb2309b798540429558936f8f45889";
+          sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool";
@@ -40686,12 +40868,12 @@
     ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170529.647";
+        version = "20170612.123";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "7a987a57317272e9ffc1f7e8bb82045a2f4566f8";
-          sha256 = "0jazqm4cb4sai9qbb0pwnpql0x6s2w6mfwk32kzm7fn9iplih8rl";
+          rev = "1afc0c9a3b1a25fdf510c13bf7764f6c4867a897";
+          sha256 = "1niww7czhqxn2dpnjbdghplva7l7ymrx77ka3djjln70x0gnvv2v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -40942,8 +41124,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "c6422663ab03a3d8e9bee6413890d0fe93bc9556";
-          sha256 = "0lx5lxlql9pxgjqidb2k850i36qgx97jx15b24vv2s2l9f1skrw2";
+          rev = "e231e8325765cde4ec3faa73d57bb5064a35620b";
+          sha256 = "1k2s7s3wq7pgncrj1hs8vbd393kp8zmxygbci5jq4gvymmsb6qza";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41596,8 +41778,8 @@
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "5a04d426b33566027fdf5fd3090dfd315fda7314";
-          sha256 = "073cqwy2iw9ynrdbb8r9n4rnkk9j8zba91872sx2gyp47xkq6pjk";
+          rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674";
+          sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -41679,8 +41861,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "3ba25d2222701517a0e00ba189a1d47b58fb7359";
-          sha256 = "1y7v50w3i07jzizj5vrbqiafz2355bxw6hai3v7vam15ii3ir6fw";
+          rev = "f6d6d2b0f7ca39f7b64137c4c90241af7099ebe8";
+          sha256 = "1kjyf2gj3kj9blyabri3z808krs1a7wq0ffxsz8378pl8dl8vcwc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -42115,12 +42297,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170510.726";
+        version = "20170601.1101";
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-mode";
-          rev = "228980c3fe73c111ce6035a3d5e210da450cc052";
-          sha256 = "0gwxvglfgp5fblwg14wwrj74wblsapv8plqvsdfca7myzkvrp7yk";
+          rev = "6fe3246e00995ca7ebe3b3c36ea58a69de521193";
+          sha256 = "1ib4ld45wfwq5c48w56k8ca5qggjmxgpn2q0vvi556awk47anhqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -42449,12 +42631,12 @@
     magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magic-latex-buffer";
-        version = "20161231.2300";
+        version = "20170530.1705";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "magic-latex-buffer";
-          rev = "49a9ac6aff0a45aa6630dc0044533b7b3d3be7ad";
-          sha256 = "1r9zq16n546xd9i27kiifdl7mwld8jk88rll2h0lbd77ir6wdlfm";
+          rev = "c03277d5619d9adcd871f3e6480a1a27985810cb";
+          sha256 = "065xfj6asw7px4xmh5isbfs0y6m6818lrds1ca45rhkyfw98d2sb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer";
@@ -42470,12 +42652,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170528.740";
+        version = "20170609.2322";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
-          sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
+          rev = "622c994183294b02893ff286210bffd5255296df";
+          sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42666,12 +42848,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170508.936";
+        version = "20170609.2310";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
-          sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
+          rev = "622c994183294b02893ff286210bffd5255296df";
+          sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43146,6 +43328,35 @@
           license = lib.licenses.free;
         };
       }) {};
+    mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }:
+    melpaBuild {
+        pname = "mandoku-tls";
+        version = "20170611.6";
+        src = fetchFromGitHub {
+          owner = "mandoku";
+          repo = "mandoku-tls";
+          rev = "e21205ca9c1c053801190f291d6583ce057e8a65";
+          sha256 = "0yd33hflm1da61mc54y7yaaxb6y8gzv00n4ghcqn6rp4vlmi6534";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/mandoku-tls";
+          sha256 = "0zny1l548rvjsbbzj47wysz6gk1sqxvpj215r3w84vw5dyrn78bz";
+          name = "mandoku-tls";
+        };
+        packageRequires = [
+          emacs
+          github-clone
+          helm
+          helm-charinfo
+          hydra
+          mandoku
+          org
+        ];
+        meta = {
+          homepage = "https://melpa.org/#/mandoku-tls";
+          license = lib.licenses.free;
+        };
+      }) {};
     map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "map-progress";
@@ -43254,12 +43465,12 @@
     markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "markdown-edit-indirect";
-        version = "20170210.1504";
+        version = "20170607.1244";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "markdown-edit-indirect.el";
-          rev = "980d8bf3a123a72aef18f608e99be3472be100c3";
-          sha256 = "1idsh6gsm7kaz7i8kv3s326qxnd2j3nmwn8ykbnfwracm6him3qf";
+          rev = "a789320354eab2b2275a308c38b1390e6d2cc41b";
+          sha256 = "067rp6h2wax242zmykz5iv2v30cj327dh9vz6c69im02lsn65ib3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect";
@@ -43275,12 +43486,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170526.1213";
+        version = "20170611.1532";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9";
-          sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs";
+          rev = "0fa1d523fe95a15a8cebaaba7d4af3002ddbeef5";
+          sha256 = "0y6j5gdlxw9kp961sgdpnkprxdmnndcjd6s3v9jbz8py2k3pqpxx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -43846,12 +44057,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170525.2333";
+        version = "20170610.1806";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76";
-          sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp";
+          rev = "f8ebc163a289532ce99134716008440a515e65ea";
+          sha256 = "00z9w8nzf1adh6kic485w332dj6m53qdmb99w4aqz70ygq6i2s89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44576,12 +44787,12 @@
     minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "minizinc-mode";
-        version = "20151214.558";
+        version = "20170605.2342";
         src = fetchFromGitHub {
           owner = "m00nlight";
           repo = "minizinc-mode";
-          rev = "98064f098e6871382614fcf3c99520f7a526af0a";
-          sha256 = "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c";
+          rev = "c33a8e23817468c2a64dcfede6dea41485fb43df";
+          sha256 = "1892s4cxzxdrwj2mjav1lqbisx20zsjgnw41m6a61ds7hg035c3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode";
@@ -45489,8 +45700,8 @@
         src = fetchFromGitHub {
           owner = "retroj";
           repo = "mowedline";
-          rev = "5c848d79c9eba921df77879bb7b3e6b97b9bccb2";
-          sha256 = "1dmfks09yd4y7p1sidr39a9c6gxby47vdv8pwy1hwi11kxd6zbwf";
+          rev = "832e81b7f90f6c2e753f89737c0b57a260544424";
+          sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -45695,12 +45906,12 @@
     msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "msvc";
-        version = "20170528.2256";
+        version = "20170610.1044";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "msvc";
-          rev = "ffc7974f1cafb5e03bae2765afc6a984ffcb0f7e";
-          sha256 = "155bgayysdyr5a9wpx78azpipd11s3k8ijgw4mpvbmkk5j7fi6a8";
+          rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577";
+          sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -45882,11 +46093,11 @@
     multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-project";
-        version = "20170322.332";
+        version = "20170604.1514";
         src = fetchhg {
           url = "https://bitbucket.com/ellisvelo/multi-project";
-          rev = "c03cafbbfba9";
-          sha256 = "0v0q4v3pnqmm89hix90pfx4hpfpc9iv1r5ldn3zwzwhbs0jvgj3d";
+          rev = "04eeab45d19b";
+          sha256 = "11mn36m40i93wig79kj1jp2i3ggck1qsfw2z9q24a1zxj2gns12i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
@@ -47071,12 +47282,12 @@
     nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nginx-mode";
-        version = "20170524.1812";
+        version = "20170611.2137";
         src = fetchFromGitHub {
           owner = "ajc";
           repo = "nginx-mode";
-          rev = "9e25e1f696087c412a45fe004b98b9345f610767";
-          sha256 = "0hjvbjwsk64aw63k4wcizpqiqq6d8s4qwzfvvsdbm3rx743zgzsz";
+          rev = "a2bab83c2eb233d57d76b236e7c141c2ccc97005";
+          sha256 = "17dh5pr3gh6adrbqx588gimxbb2fr7iv2qrxv6r48w2727l344xs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
@@ -47152,6 +47363,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nikola";
+        version = "20170301.1148";
+        src = fetchgit {
+          url = "https://git.daemons.cf/drymer/nikola.el/";
+          rev = "6752cc70b08889ff5184ac111616863f1881d357";
+          sha256 = "0cwn05q0fj6xddfc5qimryvqi5l68sqyxvw638vzmrpnzl6dfc9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola";
+          sha256 = "1i6z4gkh52fr9s506dqr3ccczank7c8zr0q1bg8ik5gbna0jv705";
+          name = "nikola";
+        };
+        packageRequires = [ async emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nikola";
+          license = lib.licenses.free;
+        };
+      }) {};
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
@@ -47243,8 +47474,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "6e01ecd112dce8d8bbe46c839f982892a3ffb589";
-          sha256 = "1gxsp2xf8lcqwk0f842g9cimc6k12cpf0m4rs0qv3v3mqqic985n";
+          rev = "186571965dccf57d15b9f37c1cca92a57187b7b3";
+          sha256 = "1iz48szkby5b3f4935c8pnry84f6mh4f2xklv7zdykrczdqy5b0r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47299,6 +47530,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nlinum-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }:
+    melpaBuild {
+        pname = "nlinum-hl";
+        version = "20170609.440";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-nlinum-hl";
+          rev = "294037f5231375ac63836637651585f8b82b962d";
+          sha256 = "048zm3x62wjp2ym0q8jn4ll0f11nak5i41q6mdcabq3zwg42zbqi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl";
+          sha256 = "17lcp1ira7yhch9npg9sf3npwg06yh9zyhg0lnb22xg09lbndj0x";
+          name = "nlinum-hl";
+        };
+        packageRequires = [ cl-lib emacs nlinum ];
+        meta = {
+          homepage = "https://melpa.org/#/nlinum-hl";
+          license = lib.licenses.free;
+        };
+      }) {};
     nlinum-relative = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }:
     melpaBuild {
         pname = "nlinum-relative";
@@ -47470,12 +47722,12 @@
     nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nodejs-repl";
-        version = "20170110.940";
+        version = "20170607.1303";
         src = fetchFromGitHub {
           owner = "abicky";
           repo = "nodejs-repl.el";
-          rev = "53b7f09a9be6700934321297758e29180e7850d7";
-          sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy";
+          rev = "f72a537700b08e14db28e6bcc1d6244bbeaefca4";
+          sha256 = "1wha680gklq974wl2si3q024qhcdkqgicr6x3qrb9fhfkfr1nbjx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -47554,8 +47806,8 @@
         version = "20170530.454";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "51cf6dbab220ca0f7c9f7472280adf02189ba437";
-          sha256 = "1ixdrg3ak0x8rnkckz392s91dhssrsh9hcg30606fhjd9nk811a5";
+          rev = "1ec634461ea25d87cc16dbeb1318f8e30a07c9f1";
+          sha256 = "00sqb0vl0990c5fxg0znwdfgq20q0zbx1pnhpr3dmnydqzmh7wwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47737,12 +47989,12 @@
     nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nubox";
-        version = "20170528.109";
+        version = "20170611.725";
         src = fetchFromGitHub {
           owner = "martijnat";
           repo = "nubox";
-          rev = "2ef0281511aa29347d79575449c3f44f91fd0f97";
-          sha256 = "0idd2sg68x02ishcziigkr5izvdrda5ra3imqgb1ilgfh6kgfqjw";
+          rev = "2c6c1cae665dfc9cd000aacd84b9843eac0c74cb";
+          sha256 = "13zjrql7arj0fklvajmr7xr7486i9917b9x54mxzmkwnbas4rg04";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox";
@@ -49080,12 +49332,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170509.104";
+        version = "20170601.1329";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "59aa5ac1957b4875e13f52885255293608a960f4";
-          sha256 = "1jjhksrp3ljl4pqkclyvdwbj0dzn1alnxdz42f4xmlx4kn93w8bs";
+          rev = "7ca20bb808dd51adbd83e0c18885c4300548d032";
+          sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -49632,12 +49884,12 @@
     org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-caldav";
-        version = "20170529.1205";
+        version = "20170610.945";
         src = fetchFromGitHub {
           owner = "dengste";
           repo = "org-caldav";
-          rev = "4a618a03ef4a0c95d4f8ffe1c92e986c12a53416";
-          sha256 = "0sgwq7zwgr2khhyvf0a1b5fl616h8x05bd2bmm6437ih3fcx8mjy";
+          rev = "57dce0b4f0f234d9f4a72e5f0b811ee399e6d989";
+          sha256 = "180amsndil1y24675xbdr9l6qad7lxq1pr7nlqgspmw0nccp0al4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav";
@@ -49905,12 +50157,12 @@
     org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-download";
-        version = "20170213.1151";
+        version = "20170605.23";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "137c3d2aa083283a3fc853f9ecbbc03039bf397b";
-          sha256 = "0c4vvpccmc60bavywsd0lijzyzchs6cdmp8y36d70lmp4s66863v";
+          rev = "131d2409b3639798ebac6d77c98eae446ea915dc";
+          sha256 = "1l04vs47pl63daz9n0d2xby43kr2ynbykvdr7hjbyizcg9l9fzp7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -50077,8 +50329,8 @@
         src = fetchFromGitHub {
           owner = "GuiltyDolphin";
           repo = "org-evil";
-          rev = "6c98be7488fb0dc7cea8f88af6e432edb43e0e32";
-          sha256 = "0jlaspk11l0g8mqbwqiarn7ada1zgnxg9i68xgrjzhxmv1nw9mq5";
+          rev = "aff7bf3885e318287abf7d542916d21372496bdd";
+          sha256 = "1z6rj7nrjdmkc7skx2si7s462228bpka96p0zzmkg7wa82j7ywv9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
@@ -50265,8 +50517,8 @@
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "4876bbc7cd3129f6285f41b9076c178d30720163";
-          sha256 = "18fxficbm430alxn82866qphiaxdzjcb73ckm7czw2yvgxd706qs";
+          rev = "c020fa3f58cdeff51701322334daa6253a144db6";
+          sha256 = "0pcymhjaybaxpghixa2gnshzqy03hafmzjdas8q087dn7b19cr8h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -50327,8 +50579,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "496b2a9855fe514b186890a1f883411ee566d294";
-          sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0";
+          rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86";
+          sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -50347,8 +50599,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "496b2a9855fe514b186890a1f883411ee566d294";
-          sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0";
+          rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86";
+          sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -50511,12 +50763,12 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20170522.524";
+        version = "20170607.442";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "35404eac9aba04081e575b7c84e628bc68e01dd1";
-          sha256 = "1apx105gm36xf813lhwsq69lk88gyb9gmmvscrps9gmml6lzknnf";
+          rev = "fa4e86621a63033148f8fe295a11b4721ba17462";
+          sha256 = "123b0cf47c5gnj3yakhjr2q7kc8nmhim9c2ngdls6g944ig07l0d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -50755,12 +51007,12 @@
     org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-recent-headings";
-        version = "20170518.129";
+        version = "20170604.1353";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "org-recent-headings";
-          rev = "7bc05874de270c5314e4c927b66f27d6aed344ee";
-          sha256 = "13kqkv2wn3c7s5pnp1hyr2558827cipqg3lg31bpbjr6j9pn9l6m";
+          rev = "9b373ddafe33283ed9a41bddc65f05d6e9bfcda6";
+          sha256 = "0k92z02dyzax35wx7q5s9zasmkba9vzb2y7jf55jn8d7qjdw4lnn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -50797,12 +51049,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170526.1519";
+        version = "20170611.1357";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "d61770adfbc39dd8544db3a96724089d5bd6ded3";
-          sha256 = "16anl4ls66xm7vbcziwisg41jwzcd4cphxvrxv83vw52w24gqf1r";
+          rev = "b84634891be4323ccba938dc68b971150ae9a609";
+          sha256 = "1m8g9laf2fij5vm3sqb087323gqncnww35jx8bbn888zjzxnsiy9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51270,12 +51522,12 @@
     org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
     melpaBuild {
         pname = "org2blog";
-        version = "20170521.903";
+        version = "20170611.1836";
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "b3de93c348f5da8b9cb892664c1eab461e443525";
-          sha256 = "1c4zr4bz3w8y8gaq21flgrj1bid0rh6dsajgl0gydb8sbrfc4f3q";
+          rev = "256c0af68004fde8cf35d4824acb938803b10e7c";
+          sha256 = "17ib0rsfdw3krvvz9gmfsqsn9gagqlvwh0ydfyaqpdiq9q2nllbs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -51456,6 +51708,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    orgnav = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "orgnav";
+        version = "20170608.1013";
+        src = fetchFromGitHub {
+          owner = "facetframer";
+          repo = "orgnav";
+          rev = "9e2cac9c1a67af5f0080e60022e821bf7b70312d";
+          sha256 = "0764dg3dcsdy4i6syv9aqqmr47civn9dl3638g4lsqdikghw7lvv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a41436df126d7ef2c0a8b56d90afb942fe47dc59/recipes/orgnav";
+          sha256 = "0z04n5rzv5c0lvn658nrfj6rg3a31n369h5rjgi5bap06qm427ix";
+          name = "orgnav";
+        };
+        packageRequires = [ dash emacs helm s ];
+        meta = {
+          homepage = "https://melpa.org/#/orgnav";
+          license = lib.licenses.free;
+        };
+      }) {};
     orgtbl-aggregate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "orgtbl-aggregate";
@@ -51967,8 +52240,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "feaa96ff995237270f0ed0af861f59b544e484c9";
-          sha256 = "05idkkvnjrsfbrg0dhcvagsgbybvlqyiqnng5z6abqwbsp344hv2";
+          rev = "2080e5fcbce8147ef6931457c678309f7a679c49";
+          sha256 = "0kmga1zm8zyby9yrczybrqm0gj56lk29v2nan4rhzhfnb87v9r28";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -52089,12 +52362,12 @@
     ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-jira";
-        version = "20170326.47";
+        version = "20170607.1513";
         src = fetchFromGitHub {
           owner = "stig";
           repo = "ox-jira.el";
-          rev = "638a9a44c96f5b21e2e36121465645e586910713";
-          sha256 = "12is86csnix270rnyf9q0l7ds70g128fn9nzgjgjgfylsp5nk9rf";
+          rev = "a5e7c7166f5d4baf4b6487f44865f2636cda4698";
+          sha256 = "14qybj34wvpn91m9hvfmcrsj5d9zzq5pyzjc61gd0zn482bklxz4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
@@ -52509,12 +52782,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170417.54";
+        version = "20170608.1006";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "1cee5135bd9a12e1b28e515a28093a751b4f7dd1";
-          sha256 = "1qvvdr5wx37x5jrw4hkx5vl4jmi3l1bjn97nnvwlsmzi6sgkcwsr";
+          rev = "bef9e37fd8a9cb726e9b8a0e28baddc773a65912";
+          sha256 = "10h6zlyhaw8waxd6g1x2xqprq0y9prl3jgndhgnmlq7zcmh7fjrd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -52889,8 +53162,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "4554d7651c26de10d350db28e150c685cd171e19";
-          sha256 = "0k2gbgrh1vb810qpdx632gbd8gx0gy4img022a16n620l3g1s0rn";
+          rev = "c508a52aee7f10f5e9b750b4724e264a3e694757";
+          sha256 = "1xbys48368a6vcyjqxn71lg6yf7zvb2k9dlf07dl6hvh0a7qlpqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -54056,12 +54329,12 @@
     pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pfuture";
-        version = "20170529.813";
+        version = "20170531.805";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "pfuture";
-          rev = "f6728c808ba96b19718ff4e15ac5173bf848b21d";
-          sha256 = "10v5rc1kcv3rd6mqksqc8bcc6w0w20fcz77fvgq0hxl88ng6vi4q";
+          rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5";
+          sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
@@ -54203,12 +54476,12 @@
     phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "phi-grep";
-        version = "20170220.103";
+        version = "20170606.107";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "phi-grep";
-          rev = "e0cdb6d6b8502f9cb4db2d5536d8b32a3be9ebc5";
-          sha256 = "12y7jhhqg16sqm063zbz8hjlh1hggjl627qqigqnslxbgsghk97n";
+          rev = "ab9bd8d25e751a9cbfa108b49839293230b6e8b5";
+          sha256 = "0p1i07dgaic0jnwdsnvsnib2913r9w8j98d1p5rx8db2nabjmzc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/992655fa4bd209abdf1149572e95f853e595125e/recipes/phi-grep";
@@ -54476,12 +54749,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170428.1853";
+        version = "20170609.1728";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "6e57817aa3a3cabe41e069ff8af1521db118ff13";
-          sha256 = "15lf3hvq466bhsnw5hzmpnwsnynqk0wsg5d5vn2n4j9kax4lzhb9";
+          rev = "dc30cb8110f395fffbc42c6271141887a0c0ec60";
+          sha256 = "1zgyy3mnn6sciy0ml2l0crfqy9mlcy1iqck5kracbbz41ygigsqy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -55068,8 +55341,8 @@
         src = fetchFromGitHub {
           owner = "brocode";
           repo = "play-routes-mode";
-          rev = "ef8230932f7bb96643febbd6872c522932f9571a";
-          sha256 = "1wv4wnkcdlq5qvxr55wgs6dc64m69r0niz0r5h2ch9d5nclmvbkh";
+          rev = "ec861ab171fc5513df082d26b96a2e9d545ad64c";
+          sha256 = "1yn3270d0djsi7jwxw0arrylsyxkwbwawyw2ifpn6iwzcz55cnxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode";
@@ -55788,6 +56061,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    postcss-sorting = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "postcss-sorting";
+        version = "20170531.1858";
+        src = fetchFromGitHub {
+          owner = "P233";
+          repo = "postcss-sorting.el";
+          rev = "1320d74abd8ee7f0a09b5f7920d554650a7047a6";
+          sha256 = "0071al1nwqazv8rhr7qm799rmizbqwgcrb5in3lm0sz88fbs9vnk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9fae97430f211786f615f7450936f823e2a04ec4/recipes/postcss-sorting";
+          sha256 = "0730b2wddal15yi4k6wzhv9xv1k40iwrn3mivg9bkxabh3mgrl10";
+          name = "postcss-sorting";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/postcss-sorting";
+          license = lib.licenses.free;
+        };
+      }) {};
     pov-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pov-mode";
@@ -56015,6 +56309,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prettier-js";
+        version = "20170606.612";
+        src = fetchFromGitHub {
+          owner = "prettier";
+          repo = "prettier-emacs";
+          rev = "f8ab2e5fb74beaf9e3023baafc118828526c5bb7";
+          sha256 = "00gjzw855xa6ahghdlq6yygz6b279xbp47s6vj0rjsyghf65xkf6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js";
+          sha256 = "0mf66sdsdbhf76pwkjkfjsnh26g4j3zb4y1qrbxc9jcvymccb3yq";
+          name = "prettier-js";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/prettier-js";
+          license = lib.licenses.free;
+        };
+      }) {};
     prettify-greek = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "prettify-greek";
@@ -56539,12 +56854,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170524.1333";
+        version = "20170602.336";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "399a214f629168501c33589b6175c447f38ea0b3";
-          sha256 = "1d6y8pqn6yll2vpv457z5bf30qb92wmnpyfarfvcs07spqq3zkz0";
+          rev = "4e864c75bfbee4a5a1a9c76d3d2a77b2da01fa5f";
+          sha256 = "1a0a3hay6ixplk0q6jd2s0hbwxm36zxd5vng3k769cjc8nrsnbix";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -56564,8 +56879,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "73595f1364f2117db49e1e4a49290bd6d430e345";
-          sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj";
+          rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e";
+          sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
@@ -56837,8 +57152,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "1e86ef4e9f0b9c9e8bd8d62a61e141f139366920";
-          sha256 = "1cf87jxq8r56nxp4h9ig3q489lj7bb35wkasrw2yi48q9j445bw8";
+          rev = "96095f3a8577cd61ded2191d267cca70f221a9c9";
+          sha256 = "1ia0krk66l0cl5bklprdk4bbrzv9j8lszvkakcd0fd9ikcdv68a1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -56875,12 +57190,12 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20170512.1513";
+        version = "20170607.1512";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "cba01805f1c767fba386ca61305bfb781cf7286e";
-          sha256 = "0384l3n1870xw3bcskp2hrbdkbvzr2dp8w0zd8nja1zpx38gr0ly";
+          rev = "04de7bd8a14ea71eaed568127428b8a44f325b24";
+          sha256 = "14dbg9cvph8b0shs49g6sfh5xrzpr9nn7c5rzxsnaaijys3z47rn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -56966,22 +57281,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    psysh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psysh";
-        version = "20170205.1142";
+        version = "20170610.2104";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "psysh.el";
-          rev = "429b59ba8fd5ac7b6d3c6c4e3ad72867062c96db";
-          sha256 = "0ldv1lyra05g91hdsif131x7yqdmwld8hdpg4h3qi040kls9bix1";
+          rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa";
+          sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh";
           sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
           name = "psysh";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs f s ];
         meta = {
           homepage = "https://melpa.org/#/psysh";
           license = lib.licenses.free;
@@ -57325,12 +57640,12 @@
     py-smart-operator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "py-smart-operator";
-        version = "20150824.1910";
+        version = "20170531.509";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "py-smart-operator";
-          rev = "5e3222e4fc285c48a77c8e4c0e1cbc985a9713c8";
-          sha256 = "14gppb354wzbbqv0zp1675p84n07rll9n4i6lncd9bvv1flqsxy8";
+          rev = "0c8a66faca4b35158d0b5885472cb75286039167";
+          sha256 = "09pmkp24s7nwh6p4pzsjp1z65ksi9n3n2xv7d3igpa86l8qgcm2d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7491a1825b7aaa5f76aafadb8f04721ab1b1cfe/recipes/py-smart-operator";
@@ -57601,8 +57916,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "6f2b4ccf5542be7243db1b679c6f52e2e4acf504";
-          sha256 = "0966c47nja1mav4qixj9xr0529pxqqrh7j4vb9jk8l3hdky99vw9";
+          rev = "2e820672609c489458dc2cf39d811e8c10255fe4";
+          sha256 = "1nvylps33w5lbxh33qc704rvl998cniwhvwzj1x8fqlsnh1qaxfd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -57744,12 +58059,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170521.1217";
+        version = "20170605.123";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "5d2d85a370ae20c29203ad64f1eb508a63420ed9";
-          sha256 = "1r36xxm5xhhrps3wywjnr5rb4dcb8zpkwvj4bgadvmszi8pbzbpj";
+          rev = "17747eaca4e75e17e29fbdceab9380cd4772c4ad";
+          sha256 = "0j4xq66gdwnz94wm68xzc88gbaigfxhc035whijl43yxkf9mc14y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -57909,6 +58224,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "qt-pro-mode";
+        version = "20170604.1141";
+        src = fetchFromGitHub {
+          owner = "EricCrosson";
+          repo = "qt-pro-mode";
+          rev = "66601441cc728a609765b149ee0d7dcfb74dc8bf";
+          sha256 = "0azx8a7kwgn5byijgwar2rib9xv2p9w7w3yyb5bk19g3id2f8gdw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e9af710be77ccde8ffa5f22168d2c8a06b73dd6a/recipes/qt-pro-mode";
+          sha256 = "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf";
+          name = "qt-pro-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/qt-pro-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quack";
@@ -58164,12 +58500,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170524.935";
+        version = "20170607.737";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "4cfb2eba0bf3a78f5e622731496cc3783c42054d";
-          sha256 = "0cly2c1k2gmf7v4ka0l1kkq24r2r33cj44ajaaacr3i59bahcvnf";
+          rev = "02fe949875a7db935693af7d20109d29521b4276";
+          sha256 = "0aqv9j36abmhd82fd443khaj3i4mww5xs4f9p3d65glg07wm2j7q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -58836,12 +59172,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20170522.325";
+        version = "20170603.1430";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "a1130df3ada34e76675324a8c25823b420b20239";
-          sha256 = "12nz159if1hlz12fmkil3mmzn1f66f6vjnlz65na8jr39hrkgx8n";
+          rev = "3d0fcb80eb017ee2277440d688bf366af3bcdf6f";
+          sha256 = "1i71z36hk46w50c9p4b078rqlh4bvwb3dcylhfcwnp4b8j02f31p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -59178,8 +59514,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "a9afa481d6194ea46ec00c1dc3098e88b419f6d1";
-          sha256 = "1hjkqjvnjmalmrcb1dikzsg0glnlzjb5s4insn2g83irwid7v8y1";
+          rev = "e0d467cfc50546d88f286383ea8ab54aa36cd5a9";
+          sha256 = "1lyj4h2qpl88hwxfrk2f1vr729bdyr5vvm8ra8p73rcz40zwdamr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -59800,12 +60136,12 @@
     restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restart-emacs";
-        version = "20170413.2305";
+        version = "20170609.905";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "restart-emacs";
-          rev = "dc25f00c3cab1c97db2ca4733e7e7e7805ae68f2";
-          sha256 = "1rx5mj7lpxpmkbpbwb78garhl118d0kpbwvdwfh3f3j1rmzyiblx";
+          rev = "e6ac81464cce37b7ae3aea38dcf2720cc2750d31";
+          sha256 = "19fh4hsnxb7jc0zhgrg01hn8vbcirjxny5w29gcq7xiighwrbap7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -59924,12 +60260,12 @@
     reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "reverse-im";
-        version = "20170209.556";
+        version = "20170611.2334";
         src = fetchFromGitHub {
           owner = "a13";
           repo = "reverse-im.el";
-          rev = "47033e0597675a45d2b6852682e392e848a51af8";
-          sha256 = "0kd55p8hl7mhcbsqxhqqyfkzq31cnk4aaqzrka681dk6d1xzk8z5";
+          rev = "341e1d7955d9b25778a0e28921abc4d31704ec3b";
+          sha256 = "1mcggccv75v9xrd1i1x2csjnk432ws2h93bh5y4wm3sp3ky8lg6d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
@@ -60048,12 +60384,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "20170527.806";
+        version = "20170603.1202";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "6069dafb4a71b8d8b6c8787d2b68f4745e0c9cae";
-          sha256 = "09xdpzp2yviqnxc7m2l1zy4rkyp1m8sdwyvsbbdqiiwa8pjg9gvf";
+          rev = "fa63228680add9b30735fec571a3eea572345914";
+          sha256 = "0bh23avfdcadfx2awkbd0mld54g6ir0bg1szbwi8m0w9pwa4w4mk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -60174,12 +60510,12 @@
     ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ripgrep";
-        version = "20170211.857";
+        version = "20170602.152";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "73595f1364f2117db49e1e4a49290bd6d430e345";
-          sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj";
+          rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e";
+          sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -60237,12 +60573,12 @@
     robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "20170522.1815";
+        version = "20170611.1755";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "845d10041b3eb76fb35b895279c9dde45c599929";
-          sha256 = "0cvspl9wqg73bl9xpdlzcm564i9kvlr29by3lc8n1sc4yaghw8sq";
+          rev = "9305fa042c40a32a2fcf60f935c0796dc67b5c55";
+          sha256 = "0jx3pnz9m9bxlga867qdb6midz82mfl4wzn9dsfihkl399hbj46j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
@@ -60451,8 +60787,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "499db6f98cc725bca66d122bce571adcdfa32187";
-          sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
+          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
+          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -60513,8 +60849,8 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58969";
-          sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb";
+          rev = "59070";
+          sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
@@ -60594,8 +60930,8 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "58969";
-          sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb";
+          rev = "59070";
+          sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric";
@@ -60842,12 +61178,12 @@
     rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20170514.2022";
+        version = "20170606.457";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "3220937aca17fd3200c9616d97a3484f55b604d5";
-          sha256 = "060kk4yds0iz070p8x3mjjsyify7pyxfs7zhhvs4hf1v0mzil21c";
+          rev = "ac6a45e6091c0d542b696b6e13551be7e333264a";
+          sha256 = "0hba3djxzgpk13xcfz51s0qlv9415q8701pkw9qq974fxqpcrawl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -61031,12 +61367,12 @@
     salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
     melpaBuild {
         pname = "salt-mode";
-        version = "20170526.1702";
+        version = "20170611.420";
         src = fetchFromGitHub {
           owner = "glynnforrest";
           repo = "salt-mode";
-          rev = "6f5776ab411aa62668e774c5cf2aaff22cae5401";
-          sha256 = "05fla50f9dmp3wb4wr8wx5j2mhfarsq50sbr0yi29kabyn3va9ig";
+          rev = "bfcfa72093974f36635413a845e7a5df7c5ea974";
+          sha256 = "1x974csw8xyd90xf8ns5h6c0s9fszy02hdmcdax6ywi8vxksmjsy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -61245,8 +61581,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "d1e295137589b5285e26c962d648f53c081bb972";
-          sha256 = "17y7db32836gj97k85hk8acvd0xvrdck3hb9j1qxmdzf16lmagfi";
+          rev = "0b7aaa108710b2f197cbcb32fdb3ae12ff121747";
+          sha256 = "1yp382s4jxbyn646mv245gm5c2h1n734r8qzrspimipr79mrbklk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -61283,12 +61619,12 @@
     scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scala-mode";
-        version = "20170530.356";
+        version = "20170611.806";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-scala-mode";
-          rev = "52091426ee319b4ec53799696bae75571f7ecbf6";
-          sha256 = "15vr1yz23h0kb7h3d6gh3ljax762666lkz53chqgm54bszgfwjcm";
+          rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf";
+          sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -62263,16 +62599,16 @@
     sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sexy-monochrome-theme";
-        version = "20170324.510";
+        version = "20170611.859";
         src = fetchFromGitHub {
-          owner = "nuncostans";
+          owner = "voloyev";
           repo = "sexy-monochrome-theme";
-          rev = "c221231bb8a0d60413d710efe6226683326d57b0";
-          sha256 = "0zjy6d4fqg08dwbn1y360514pzzj3nrg3wzm656n7sg90mffh22i";
+          rev = "8def559784c9f3ebaad179caaff58a9c6afc83a5";
+          sha256 = "043pplyjdvqz45q1vlnkh8j8a4fhiw4km3b2xb06bycgs3ysb42h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
-          sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
+          sha256 = "0rlx4029zxrnzzqspn8zrp3q6w0n46q24qk7za46hvxdsmgdpxbq";
           name = "sexy-monochrome-theme";
         };
         packageRequires = [];
@@ -62889,12 +63225,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "20170529.2012";
+        version = "20170610.1147";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "bcdbc7142a0542639f47abb48fe17aa6c92f8406";
-          sha256 = "0wrxwjlkix5qgi3fvkaj9m43hyif9ba2bdyzc0hkig7ng0b99cjd";
+          rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f";
+          sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -63203,12 +63539,12 @@
     simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simpleclip";
-        version = "20150804.1010";
+        version = "20170603.1542";
         src = fetchFromGitHub {
           owner = "rolandwalker";
           repo = "simpleclip";
-          rev = "7079086ec09a148fcc9146ba9bd10e12fb011861";
-          sha256 = "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s";
+          rev = "7deff873b79910496b4baf647cdb8dd5de63465a";
+          sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
@@ -63413,12 +63749,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170524.2122";
+        version = "20170610.841";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "3cd88700176541b3c1ae39fa9f1219d3367be684";
-          sha256 = "020vvzqv39lm9h037jk42zisx59xz9c5pkmblg7p35yjz9nxydwf";
+          rev = "b020352573a14e452a5c8a18bbd0ab23539a52cc";
+          sha256 = "1nqax756ya008glr1qffqa222hcz45grjwfnncsq48k1nj5b0dpf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -63665,12 +64001,12 @@
     slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slstats";
-        version = "20170522.631";
+        version = "20170602.304";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "slstats.el";
-          rev = "a2f640f724fee7ecbd1cf28fc78297180cd959bc";
-          sha256 = "0gzpwcrmlbd7fphgyv6g04wjavd9i3vgn3y1fnh178iswmpsxj62";
+          rev = "07f515f835c92b6be538d2f39dda31ed281f1054";
+          sha256 = "12fzcfw4fxf6g0zadzcr8mx46a8x8969shpcmkn0f8ixn014w7ax";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -63690,8 +64026,8 @@
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "35ccf713384477b9e314ffef69f762ce2a6a94e9";
-          sha256 = "0j1z536ydcdmg16xx0nzd2cj9cpi8l8lhwb8ig0b9nl3lv12cb4d";
+          rev = "95519c4ef41988205bb642e534bf2bd2463b6170";
+          sha256 = "1bvmmpk4xd954i6dmxjcqayd6apzabg732yhcmjyg633d8hmmiwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -64187,12 +64523,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170524.1533";
+        version = "20170606.725";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "a758dd1d231ce0b6a5648bbedc20927abb6a2bce";
-          sha256 = "1kfsnbdj9mgx666pq94ajjwnf3hj59rlmr545ka3k0g981lqkap2";
+          rev = "3bc7f1d38a0b5800e62a612e16fe42d9b0c0e11e";
+          sha256 = "1xghvmwx66mns3kzk1jw2g08553qqa50h1sq1jg5n2apjl4gprdh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -64708,6 +65044,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "solaire-mode";
+        version = "20170610.442";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "emacs-solaire-mode";
+          rev = "70e3b9cc171d4d9171c652c6d255bf03dcd0ad9a";
+          sha256 = "15plb1gh7wz558008653v1xskz0bby477vvs7d7a752vrd8s6jcr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
+          sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5";
+          name = "solaire-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/solaire-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
@@ -65096,12 +65453,12 @@
     spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
     melpaBuild {
         pname = "spaceline-all-the-icons";
-        version = "20170530.114";
+        version = "20170605.838";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "spaceline-all-the-icons.el";
-          rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350";
-          sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2";
+          rev = "bc611779a7a3c10b7367bc8c985923d26ee91443";
+          sha256 = "1slnzb26fkmj01hakzbaarlmf2ng4d1zkimgb93axx0svxh03qc7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -65117,12 +65474,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170305.506";
+        version = "20170611.1307";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "9358c37ee9c90a3d13a43afcd6917fea8eef144b";
-          sha256 = "1k711ppzkd9c5ial8cs0aazsi0zig6r9acmbhr0h9zizbrsw5sl1";
+          rev = "a7e76aeb0a62f986e0469183728407c7bcbf4993";
+          sha256 = "17gbrijf62qdk5s02lish5nf6l8mfqrkly98hpkwzz3js4xkykkb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -65345,12 +65702,12 @@
     sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sphinx-mode";
-        version = "20160911.558";
+        version = "20170607.1436";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "sphinx-mode";
-          rev = "7db516b8b985cf209b6430b032cd0457af83b72b";
-          sha256 = "0a3vgkp65hpc1a5h79yl0pc02lr6w299wd2fs9cgn8nvbdrip5ij";
+          rev = "0a9fcd60639f1f4235b4747e8449b9f48651705f";
+          sha256 = "05kn45gh4l1wrj06qb3qzphx8mfqn3zqb8v73awhn5p7a1asb8kr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sphinx-mode";
@@ -65721,12 +66078,12 @@
     sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sqlup-mode";
-        version = "20170521.1628";
+        version = "20170610.837";
         src = fetchFromGitHub {
           owner = "Trevoke";
           repo = "sqlup-mode.el";
-          rev = "40f2bc0179539087971d48556dcce38e14907768";
-          sha256 = "1ya5acz07l61hry96fq0yx81w7zwcswxinb3fi0g1s4gshxy4hgk";
+          rev = "04970977b4abb4d44301651618bbf1cdb0b263dd";
+          sha256 = "14s66xrabj269z7f94iynsla96bka7zac011psrbcfyy4m8mlamz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@@ -65847,12 +66204,12 @@
     ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-config-mode";
-        version = "20170506.2330";
+        version = "20170603.251";
         src = fetchFromGitHub {
           owner = "jhgorrell";
           repo = "ssh-config-mode-el";
-          rev = "2d47d28a527d2e5a6aa350ef5f50e0c05378ad35";
-          sha256 = "0x8153ps266b359ll15w792qzqzpqs0jllc006jd59n71frdi8zv";
+          rev = "ba47dd11c5be684595ffa62dbdfdc616ce3eb9d6";
+          sha256 = "011n7vyhrawmymkhmr28isk5zvdljj9bhynmfr6v0mi2h7kn79p3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
@@ -65973,12 +66330,12 @@
     standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "standoff-mode";
-        version = "20170516.1042";
+        version = "20170609.134";
         src = fetchFromGitHub {
           owner = "lueck";
           repo = "standoff-mode";
-          rev = "83ec2460cd9f6979aab2ed64a9ae32221a0ec930";
-          sha256 = "0hzdq8wf28zx7llisg2907fibb4pfn2x5vxl44ka0c45kbza3q8b";
+          rev = "b194fde6bf31ddc77409275e134aacba27e88043";
+          sha256 = "0l48dij62d5cvw7kry0739i8zixkbmj80ghhixb30l6g0wg8k48g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode";
@@ -66511,12 +66868,12 @@
     sublime-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sublime-themes";
-        version = "20160111.122";
+        version = "20170606.1144";
         src = fetchFromGitHub {
           owner = "owainlewis";
           repo = "emacs-color-themes";
-          rev = "4648b68e96bfde26d6e4af9f919971eef2768e5f";
-          sha256 = "0q9p974xvswr2sijz1rs858x9sdx0rb00lkhj5cd90abn33lb260";
+          rev = "60ee40af82eb55b79d5ed4026f1911326311603f";
+          sha256 = "17fcqvavgyl9cmv1hwcid2bw513vhawlsmac1w2adiz567594i6h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/648d250c7d341b31581c839f77c1084ac29d3163/recipes/sublime-themes";
@@ -66614,12 +66971,12 @@
     sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sudo-edit";
-        version = "20170520.845";
+        version = "20170605.1710";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "sudo-edit";
-          rev = "0e079e12cba524dc9745f30cbd6e8c553679b624";
-          sha256 = "1gq48whi09hib1723r7182iy8ywpa9xxvbr8ybb0z5jn0z2dvs51";
+          rev = "57d49eafd53868d3c86b20fa51e1889e621872c0";
+          sha256 = "1gxyy1z8qq610g2x0zzlccqq33gd54wwl1akhnw5xg4mvwhjvidf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
@@ -67051,12 +67408,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20170515.1409";
+        version = "20170609.938";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
-          sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
+          rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c";
+          sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67198,12 +67555,12 @@
     symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symbol-overlay";
-        version = "20170528.119";
+        version = "20170604.2240";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "fcd6ffe97aeb3e9190610f29f1d69895771edcb6";
-          sha256 = "10iidqq7gz3cmkp8sxg0jwyn0hn6hrlnbvll62hdrb91cxa0hgnf";
+          rev = "3eb0864b65f9fe0e7c98fae7e9bcfd6330c471a0";
+          sha256 = "178ny3cbxm2hvmh0f49hvi2m15r72f2by3k076d4rzawab0gnp1p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -67992,12 +68349,12 @@
     telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "telephone-line";
-        version = "20170528.1027";
+        version = "20170611.1115";
         src = fetchFromGitHub {
           owner = "dbordak";
           repo = "telephone-line";
-          rev = "80b09f3357161705fce9ccee9ca23056e91ee2cf";
-          sha256 = "08wc37qw22rsmyzxqiz6d8mwq13j6r4i38lb4gk7kxjpqxwzblxc";
+          rev = "743614f372598597282efd29a18e624d5ef80bc1";
+          sha256 = "0jl4kdmid2jy5gys9q1r58x41q4srh7hinhzr3q1f6f47lpcpvkf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -68720,12 +69077,12 @@
     thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "thinks";
-        version = "20170418.854";
+        version = "20170607.144";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "thinks.el";
-          rev = "f5a339b21cd5044f7b66beafab7c2d822c36f9e5";
-          sha256 = "1qjwzr9q98da25rf8hjgancb0k2kgr8xllhb4lhnqc8jsc4qnn5v";
+          rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d";
+          sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@@ -68787,8 +69144,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "72ca60debae1d9fb35d9f0085118873669006d7f";
-          sha256 = "1hgqs1z2m2g3avid98bhgipsqp2478bpf1vby3c3f2xmymag0l74";
+          rev = "b8ee72de5bf9318d50846852082325d0f932682b";
+          sha256 = "0gaiy81zvhx6d7yfnxy0hlpb8q5crg312xhqxbx8lgw0m702k6a3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -68845,12 +69202,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170516.543";
+        version = "20170609.753";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "669ce39bcd93ca6353d24a72a358272d7b0e2268";
-          sha256 = "1sbvkgrdf6s8bkg38rfyj677dq3x4pry84hv30dgqhll7h8ja72w";
+          rev = "dda031ba33e1c61674c1c17861abef6b5c37fe28";
+          sha256 = "17r7vjpcj4wxq8zxvm5bzm8xg0y29ybgff608s8hq6vkbj5sflm2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -69835,6 +70192,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
+    melpaBuild {
+        pname = "treemacs";
+        version = "20170607.1239";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "treemacs";
+          rev = "d5878b0ed6da2a561aa795b31848e31e7c696197";
+          sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
+          sha256 = "1sg3m9l9l1xww6an2210bghlby5cljw2jxh7q0w8cwmcga7rr4jh";
+          name = "treemacs";
+        };
+        packageRequires = [ ace-window cl-lib dash emacs f pfuture s ];
+        meta = {
+          homepage = "https://melpa.org/#/treemacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
+    melpaBuild {
+        pname = "treemacs-evil";
+        version = "20170604.315";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "treemacs";
+          rev = "d5878b0ed6da2a561aa795b31848e31e7c696197";
+          sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
+          sha256 = "146j4l2g40dhrv8nyfymxkajn19gvlkmirwv9ndvkvl3yy175vg3";
+          name = "treemacs-evil";
+        };
+        packageRequires = [ evil treemacs ];
+        meta = {
+          homepage = "https://melpa.org/#/treemacs-evil";
+          license = lib.licenses.free;
+        };
+      }) {};
     trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }:
     melpaBuild {
         pname = "trident-mode";
@@ -70025,12 +70424,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170508.930";
+        version = "20170531.557";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "d1a7ce84c51a3dc5639ebb643bd7557a55c91f76";
-          sha256 = "056hdzh1kgy33s7pnqn59jwhrs5fqh8rzsxq4h3spadyyga33k36";
+          rev = "79bca7dc9254da190d821b504da4946df8c3d548";
+          sha256 = "02zjjq3nmmawmialhj95bz032a3ycyvzl5sgp7g37l7q3l0s63bc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -70298,12 +70697,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170530.530";
+        version = "20170530.953";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "4235b47a389bf04a95fa54e59695f60599dc918b";
-          sha256 = "1mkl8y1khzsggg08jmjj73f1gvvjy3z34i1vfrhik05qx1n9z3jz";
+          rev = "9ad892fb2274decb637d12d81a8640d2c6cf11d3";
+          sha256 = "0ynnh3ac6zblcg2d0nf8fwdfmp5ymzjqncl64xa43m4lw24p6xng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -70504,12 +70903,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170530.246";
+        version = "20170607.206";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "30efb05b1135992eaa88c5755814b35291e1f343";
-          sha256 = "1j0hzbm5zhz3qrz264xmj60f4227yrly2namr5ys115pbvhhh4hc";
+          rev = "e3a343991c0175092f27665fce9474e240f3f1f7";
+          sha256 = "0wmyym7aj0wr80ya1wif1ywmsy4pln4khyzcnfhd0xrp62pya2cv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -71144,8 +71543,8 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "ab45d0499f541884d009654d99c5014508c7c5bd";
-          sha256 = "0zp67asbn0kic4clc0r6hmmplq38rdvqfs561sw7zilh5wrnj5dy";
+          rev = "06460235d6f6ffd82dd2d973c2ad1004a4a2619b";
+          sha256 = "19ffqy52r52c7kjpb54flfilgnfkmxa7pkq5w0mw6xiaw3qvha2w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -71539,12 +71938,12 @@
     vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
     melpaBuild {
         pname = "vdirel";
-        version = "20161009.224";
+        version = "20170605.43";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "1f071902d4e2aea49e7e96a327e09712565cb39c";
-          sha256 = "0qkb7wx1qaa85g0dwmkyh4r65fg1j441f0b4hgg7qjq1yxrlkkhb";
+          rev = "a1e6ea3ed5faaf70667c62bc5591dc810331cb1a";
+          sha256 = "1z8q3akm0hq7z7nqclra1wv7a6m0cbskhnd3ca4v9wf9dajiwnsb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
@@ -71812,12 +72211,12 @@
     vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vimish-fold";
-        version = "20170519.729";
+        version = "20170606.539";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "vimish-fold";
-          rev = "3e0bdb14ecce4f601ef37350a20e31167f7708bf";
-          sha256 = "1v80m7aficvjj0h1vg2d5pxznzh8y7fq5cwmi957cin30ac0k7cw";
+          rev = "527a1d9b9e031713c29f12d1a82f1fdac50c5610";
+          sha256 = "1k8m7b0h3qb5w0wvvjz8047xz71ljfj7kj4z5sv26rhsh5bsdb2s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -72352,12 +72751,12 @@
     wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "wandbox";
-        version = "20170425.1502";
+        version = "20170603.531";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "emacs-wandbox";
-          rev = "c82a71e880cb701281dd96a9772bdad37a6eacf2";
-          sha256 = "0hdpy4rf0406615mx5w235dkz71v24qmr2ci5rlqmfv53si0gynj";
+          rev = "e002fe41f2cd9b4ce2b1dc80b83301176e9117f1";
+          sha256 = "0fnbj3k21lisgs94pf8z13cdymmclgpn994xq3xly4gq6l8k0an5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox";
@@ -72604,12 +73003,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170529.1030";
+        version = "20170603.632";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "aef2a32f6e5e2fdb7f38a650b009a737c67959e2";
-          sha256 = "14x91pngh9i7r66inssc4jaqvzv2kb3bnbks5x2bhsidvls7s28r";
+          rev = "290f0ecb43dc6a636e45f55cf95c0d8fbda3fdc2";
+          sha256 = "00i697brchwdz3hviq2khhxcih7zi90dym1s5m9vk5azi2qly8ys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -72706,22 +73105,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
+    webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20170514.240";
+        version = "20170611.345";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "865ff10f5315ead9c9ed29edd9cbed85babf8c4c";
-          sha256 = "1mg9bfya0j3kax7h74jhx9mbf6a2l56qpchm8rxbvr31gkk1ffcg";
+          rev = "90a96d21fc3c7edc7c339b343462696bfc6d21ff";
+          sha256 = "0q2fdxdlyfggrlgyfbq63n5k7qfjyr08cjy0k4i74sjphdss1bcl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
           sha256 = "1pqqapslb5wxfrf1ykrj5jxcl43pix17lawgdqrqkv5fyxbhmfpm";
           name = "webpaste";
         };
-        packageRequires = [ cl-lib emacs json request ];
+        packageRequires = [ cl-lib emacs request ];
         meta = {
           homepage = "https://melpa.org/#/webpaste";
           license = lib.licenses.free;
@@ -72730,12 +73129,12 @@
     websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "websocket";
-        version = "20161113.1736";
+        version = "20170610.2117";
         src = fetchFromGitHub {
           owner = "ahyatt";
           repo = "emacs-websocket";
-          rev = "fbd9e2263d2d7168aae31d4f8bde38f511e9d2ec";
-          sha256 = "04kg6njw5frp9xafjyqff57m0a2r15r7c57mnb6dw6lgazxlscgb";
+          rev = "ccbe93ac8b5858a85686b83642fbd6e828a47deb";
+          sha256 = "18aw5pmvz91gv9wlmna1i5sli6z3f6dqk0bc4wkc15zbsi1dmdlw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
@@ -74172,12 +74571,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170527.1910";
+        version = "20170531.554";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "85748f769689d923ff7f88227c78ccd3315b8336";
-          sha256 = "07miaf7fgfl54pdjj7y6lymmk9yz1qyyvvdv4i1h1fshv07c57qd";
+          rev = "4d871873024520168572babd174adc203776c71c";
+          sha256 = "0xiyh9qam40c2by0qp26x8ki090z2yv0319qrn5d4lsz69ivnpy0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -74550,12 +74949,12 @@
     xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xquery-tool";
-        version = "20160823.902";
+        version = "20170605.126";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "xquery-tool.el";
-          rev = "b81b5862e8541aca5231840eb176afad7ab55cf3";
-          sha256 = "0dv3gl9djs9sbsg5mhdfnnv61ir9xccqijh7i2b82gq2j3lqhibm";
+          rev = "0d1e2960c48701b83be5255d56324f65a6ee182e";
+          sha256 = "0x6927x18nimh9rgnkl8dyc6r437a03byzscgg053lbg0cf2mqp1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool";
@@ -74820,6 +75219,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yahtzee";
+        version = "20170608.836";
+        src = fetchFromGitHub {
+          owner = "drdv";
+          repo = "yahtzee";
+          rev = "0a4c06ce68868133498e0ce1ab5efdf296fa4862";
+          sha256 = "12vmgn118bwrrjpp1a1s47zk1q80gx7pakjhll03vpsyw08yvg13";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
+          sha256 = "1fnywiami9mszagmms27dmak6chcichdi7q70x5c6aimc4jb98jk";
+          name = "yahtzee";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/yahtzee";
+          license = lib.licenses.free;
+        };
+      }) {};
     yalinum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yalinum";
@@ -74928,12 +75348,12 @@
     yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yankpad";
-        version = "20170523.235";
+        version = "20170607.819";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "yankpad";
-          rev = "1742630496f1994fe0746f8079582da5a168232d";
-          sha256 = "09qjpkk9q4xw395afnzf3rmwaahsrzhx0793p77rrpxckg64hrgz";
+          rev = "70e755fcf58e37092de2c335355eab93d5f1fb44";
+          sha256 = "1ijd3vpym573p96dh81pw9rzlmman7dvamhvnf0jqp8mmy4g4bml";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
@@ -75073,12 +75493,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170518.1753";
+        version = "20170605.1940";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "1043b6c557f39a38b14b7618c174d8c47e946c4a";
-          sha256 = "1yn1aij0s4zibc51i7ya9wxmd6xfcr8769skm2d0psi1ng8wjfsc";
+          rev = "e8ed276e2cba90126f694a90df28b5f5eca66376";
+          sha256 = "0ripg5bvj4hj0y7qb35fdfg38fkqsvcxa977d24wbswmgcj08bjs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -75114,11 +75534,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170528.1711";
+        version = "20170603.725";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "c940797c19ad";
-          sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03";
+          rev = "c996fbcc2e79";
+          sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -75180,8 +75600,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "b7ad7c440dc3640a46291a9acf98e523272e302b";
-          sha256 = "0cpq2kqhxg61rs6q53mfidgd96gna3czw90rhb6njhch01cv9i5m";
+          rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6";
+          sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -75436,12 +75856,12 @@
     zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20170505.439";
+        version = "20170607.1301";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "60615d101769694038b17a2c75bb31c26f36a042";
-          sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj";
+          rev = "ab406749083a41e5ca7fe518949a09853f23e5d5";
+          sha256 = "0kanprhczqx14gn87wjwi9x4fg6dn7i64awbwsls4r5nkqf4ykn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -75645,10 +76065,10 @@
       }) {};
     zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "zones";
-        version = "20170309.1440";
+        version = "20170605.1046";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/zones.el?revision=28";
-          sha256 = "1mgfv9q4mwng0cqni13kmsridbfqsw66z5cgynlrvagga6v94bq0";
+          url = "https://www.emacswiki.org/emacs/download/zones.el?revision=30";
+          sha256 = "05my99nn7pj5alswfhd11kkyibivqh65bhjfalbfv7flfmvg6pcz";
           name = "zones.el";
         };
         recipeFile = fetchurl {
@@ -75832,11 +76252,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170420.2233";
+        version = "20170608.2201";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "f3a17c2b58c0";
-          sha256 = "1ra92piwxv5knlc79pj4n4dv895bdz5nv4pf8zd0k1rirn6qj6sa";
+          rev = "66d2f665daa1";
+          sha256 = "1fgggwivp405qm0nvbqk8vrnprimg336mcv3am37yavi9da48fi8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
-- 
GitLab


From c5467a16c44e1d2d7a3d6953c368918bf7e308d9 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 16 May 2017 18:56:16 +0200
Subject: [PATCH 0621/1490] errbot module: needs network-online to connect
 properly

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

diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix
index 427cb7c546d..cb2fa677624 100644
--- a/nixos/modules/services/misc/errbot.nix
+++ b/nixos/modules/services/misc/errbot.nix
@@ -84,7 +84,7 @@ in {
       dataDir = if !isNull instanceCfg.dataDir then instanceCfg.dataDir else
         "/var/lib/errbot/${name}";
     in {
-      after = [ "network.target" ];
+      after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
         mkdir -p ${dataDir}
-- 
GitLab


From d138f9ef65c2ad27ddf1368c1b9c7f9600fc6c05 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 4 Sep 2016 21:44:15 +0200
Subject: [PATCH 0622/1490] gstreamer-plugins-bad: add deps for HLS & H.265

---
 pkgs/development/libraries/gstreamer/bad/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 7ca2ddd0ce2..4efef258211 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -6,6 +6,7 @@
 , wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls, mjpegtools
 , mesa, libintlOrEmpty, libgme
+, openssl, x265, libxml2
 }:
 
 assert faacSupport -> faac != null;
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
     openjpeg libopus librsvg
     fluidsynth libvdpau
     libwebp xvidcore gnutls mesa
-    mjpegtools libgme
+    mjpegtools libgme openssl x265 libxml2
   ]
     ++ libintlOrEmpty
     ++ optional faacSupport faac
-- 
GitLab


From 934b72301e5147e66de0c791619e63469ea39c1e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 20 Mar 2017 21:23:15 +0100
Subject: [PATCH 0623/1490] libfann: init at 2.2.0

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

diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix
new file mode 100644
index 00000000000..4c637485086
--- /dev/null
+++ b/pkgs/development/libraries/libfann/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "libfann-${version}";
+  version = "2.2.0";
+
+  src = fetchFromGitHub {
+    owner = "libfann";
+    repo = "fann";
+    rev = version;
+    sha256 = "0awbs0vjsrdglqiaybb0ln13ciizmyrw9ahllahvgbq4nr0nvf6y";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  outputs = [ "out" "dev" ];
+
+  meta = {
+    homepage = "http://leenissen.dk/fann/wp/";
+    description = "Fast Artificial Neural Network Library";
+    maintainers = with lib.maintainers; [ fpletz ];
+    license = lib.licenses.lgpl21;
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf3e3c70f81..b0104a07e1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2870,6 +2870,8 @@ with pkgs;
 
   libevhtp = callPackage ../development/libraries/libevhtp { };
 
+  libfann = callPackage ../development/libraries/libfann { };
+
   libircclient = callPackage ../development/libraries/libircclient { };
 
   libite = callPackage ../development/libraries/libite { };
-- 
GitLab


From c34299f5926756837b68c020bcce566b9b0cd36e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 7 Jun 2017 07:14:16 +0200
Subject: [PATCH 0624/1490] dmidecode: 3.0 -> 3.1

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

diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix
index 7ba8dffcc31..65908fd18e2 100644
--- a/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/pkgs/os-specific/linux/dmidecode/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dmidecode-3.0";
+  name = "dmidecode-3.1";
 
   src = fetchurl {
     url = "mirror://savannah/dmidecode/${name}.tar.xz";
-    sha256 = "0iby0xfk5x3cdr0x0gxj5888jjyjhafvaq0l79civ73jjfqmphvy";
+    sha256 = "1h0sg0lxa15nzf8s7884p6q7p6md9idm0c79wyqmk32l4ndwwrnp";
   };
 
   makeFlags = "prefix=$(out)";
-- 
GitLab


From 4268eb51450be7aa5fc9964ec5dbf543c463a331 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 12 Jun 2017 17:32:53 +0200
Subject: [PATCH 0625/1490] gnutls: remove unused parameter

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

diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index bca23f2e748..e47537c64a9 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, libunistring, ... } @ args:
+{ callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
   version = "3.5.13";
-- 
GitLab


From b733a34e8e5e0692e542ac631926dd425510406f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 16 Apr 2017 14:32:36 +0200
Subject: [PATCH 0626/1490] firmwareLinuxNonfree: 2017-03-11 -> 2017-04-16

---
 .../linux/firmware/firmware-linux-nonfree/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 69f0a16785d..b81c8f257b8 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2017-03-11";
+  version = "2017-04-16";
 
   # This repo is built by merging the latest versions of
   # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "fpletz";
     repo = "linux-firmware";
     rev = version;
-    sha256 = "05hz78z919jnacvk4i1mghjn2h15ph91vkffgi4w94zhzbf77cna";
+    sha256 = "0ar29vjjpsw7r7pqqa8b0jxx03k230cn7x8fkqi23bj68bd9x5pc";
   };
 
   preInstall = ''
-- 
GitLab


From 8ef32b334ee9c741fc40e09dcae2357b62455407 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Mon, 12 Jun 2017 09:55:27 +0200
Subject: [PATCH 0627/1490] pythonPackages.bz2file: init at 0.98

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

diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix
new file mode 100644
index 00000000000..9f7ef8d5521
--- /dev/null
+++ b/pkgs/development/python-modules/bz2file/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "bz2file";
+  version = "0.98";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "126s53fkpx04f33a829yqqk8fj4png3qwg4m66cvlmhmwc8zihb4";
+  };
+
+  doCheck = false;
+  # The test module (test_bz2file) is not available
+
+  meta = {
+    description = "Bz2file is a Python library for reading and writing bzip2-compressed files";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jpbernardy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b33596dbf9a..e38036ca6c7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30483,6 +30483,8 @@ EOF
 
   distro = callPackage ../development/python-modules/distro { };
 
+  bz2file =  callPackage ../development/python-modules/bz2file { };
+
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 4b3e5c9beac6c874dce36d6dcd6cc01ae4f127d2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Mon, 12 Jun 2017 10:13:42 +0200
Subject: [PATCH 0628/1490] pythonPackages.smart_open: init at 1.5.3

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

diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix
new file mode 100644
index 00000000000..dbc3889406f
--- /dev/null
+++ b/pkgs/development/python-modules/smart_open/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, boto
+, bz2file
+, moto
+, requests
+, responses
+}:
+
+buildPythonPackage rec {
+  pname = "smart_open";
+  name = "${pname}-${version}";
+  version = "1.5.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0m5j71f7f36s17v4mwv0bxg4azknvcy82rbjp28b4vifrjd6dm7s";
+  };
+
+  propagatedBuildInputs = [ boto bz2file requests responses moto ];
+  meta = {
+    license = lib.licenses.mit;
+    description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file";
+    maintainers = with lib.maintainers; [ jpbernardy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e38036ca6c7..bf5184ca606 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30485,6 +30485,8 @@ EOF
 
   bz2file =  callPackage ../development/python-modules/bz2file { };
 
+  smart_open =  callPackage ../development/python-modules/smart_open { };
+
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 3b29d702da6ced54e7d5ae24ad9cc8715c23662d Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Mon, 12 Jun 2017 10:21:40 -0700
Subject: [PATCH 0629/1490] hugo: 0.21 -> 0.22

---
 pkgs/applications/misc/hugo/default.nix |   4 +-
 pkgs/applications/misc/hugo/deps.nix    | 106 ++++++++++++++----------
 2 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index ab844e8b5b8..f25426d8b06 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.21";
+  version = "0.22";
 
   goPackagePath = "github.com/spf13/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1lv815dwj02gwp5jhs03yrcfilhg5afx476bv7hb9ipx4q3a8lqm";
+    sha256 = "1gjkzvpd8hpr77v6lxrry8diigr8ch8cvwb8gkbd0z33wsvr2vqi";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 4b33a1ec0de..1daab7854d8 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -49,8 +49,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/chaseadamsio/goorgeous";
-      rev = "42b0ec184e93fc9fd2c0402f099a4939aba68407";
-      sha256 = "00mlv64q34d0vdq7p88hlsck4lsnk2pnxghx1jzy99r7wvs34am3";
+      rev = "677defd0e024333503d8c946dd4ba3f32ad3e5d2";
+      sha256 = "1mcncs3qdb62m9xwhkxy743ddvgsjfbmbl2djnhqmz1va05njna1";
     };
   }
   {
@@ -58,8 +58,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/cpuguy83/go-md2man";
-      rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa";
-      sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6";
+      rev = "bcc0a711c5e6bbe72c7cb13d81c7109b45267fd2";
+      sha256 = "097l5ln1b08x5hc41qhiybzlyjfcm6kjllgv6pgsgxlx8irz459j";
     };
   }
   {
@@ -76,8 +76,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/eknkc/amber";
-      rev = "d15eb996544134263b00cce829b5bc4988fdb2df";
-      sha256 = "1izrfw8vp5m2x8bmjaz1psmyn9pqcmcdsr3adiv1kkkqr01r37bb";
+      rev = "f0d8fdb67f9f4a2c0d02fb6ce4830b8b6754de10";
+      sha256 = "148q8ng5kzv1n8wz5dx9fjhz7kz1l34n8vmksnfwhnqg82b77vsy";
     };
   }
   {
@@ -85,8 +85,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/fortytw2/leaktest";
-      rev = "0db74e8cd5adacfcc982838c6e185789e4b44e14";
-      sha256 = "11s04f1pliqw185ai1dbpqn5rahc3yzv2fp5zdanjvql4168499m";
+      rev = "7dad53304f9614c1c365755c1176a8e876fee3e8";
+      sha256 = "1f2pmzs0dgayg0q672cpzxqa1ls48aha262qxlglihdvami53b2m";
     };
   }
   {
@@ -107,13 +107,31 @@
       sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";
     };
   }
+  {
+    goPackagePath = "github.com/hashicorp/go-immutable-radix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-immutable-radix";
+      rev = "30664b879c9a771d8d50b137ab80ee0748cb2fcc";
+      sha256 = "0v9k0l7w2zmczcqmhrmpb9hvc63xm9ppbb8fj87yvl0hvrb92mgb";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
+      sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
+    };
+  }
   {
     goPackagePath = "github.com/hashicorp/hcl";
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev = "630949a3c5fa3c613328e1b8256052cbc2327c9b";
-      sha256 = "00lalg0gz7218gnw6zgn28gfizpcl8zw8jpkghn681vj7lfah5dh";
+      rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca";
+      sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb";
     };
   }
   {
@@ -130,8 +148,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kardianos/osext";
-      rev = "9d302b58e975387d0b4d9be876622c86cefe64be";
-      sha256 = "0r6f727s16g4f66k8c2z1xh8ga1p53hg9g2v95pmhd1i60fhy47a";
+      rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
+      sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
     };
   }
   {
@@ -148,8 +166,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kyokomi/emoji";
-      rev = "7ad0be7be9d4ee6ec2cf5df483dbec752626ac64";
-      sha256 = "1ck33c8xhdqdpmi5zjdk0f2qv2fda3wz88i22bxr10f9rmwkj004";
+      rev = "ddd4753eac3f6480ca86b16cc6c98d26a0935d17";
+      sha256 = "16vnpj8zxg3gg9ljwmvrlmdf4dqbxjagi8mldpq1cr481r35dsqh";
     };
   }
   {
@@ -166,8 +184,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/miekg/mmark";
-      rev = "8b498b013a3e10b12864c2023a59d490c9d4bf5b";
-      sha256 = "1v1q365d94hmpdip13a5435y6pfw3mq5isjj33q19by21zvb433v";
+      rev = "f809cc9d384e2f7f3985a28a899237b892f35719";
+      sha256 = "0fyw2dkv9bk1fx10a23n8qvcgsr0pjk7p379k8nafx8sjmz3pdbd";
     };
   }
   {
@@ -175,8 +193,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "53818660ed4955e899c0bcafa97299a388bd7c8e";
-      sha256 = "10gdkk8gcjv0lg15ajy68dwgvfkjhawk08ccs9x9ym1adp6l2ycs";
+      rev = "d0303fe809921458f417bcf828397a65db30a7e4";
+      sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
     };
   }
   {
@@ -184,8 +202,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nicksnyder/go-i18n";
-      rev = "f373441d6d54a32891b2d8b1dbf99bc518f3d60d";
-      sha256 = "094kcybx0vmdvi3n2y4krrirg79527cq8713kppd6b19jwrqwqf4";
+      rev = "3e70a1a463008cea6726380c908b1a6a8bdf7b24";
+      sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i";
     };
   }
   {
@@ -202,8 +220,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "fe206efb84b2bc8e8cfafe6b4c1826622be969e3";
-      sha256 = "1dlabfpnlzvwf4i86idy8ilqpjsl8yqfgdv0nv5cccm8gkcans5w";
+      rev = "26ae43fdeeea7db6778850f76cc828b232da1e13";
+      sha256 = "06gz20ywqbsy4sfsjjay60y7km9m07l9qvmarr7fldqfi8xgl1f4";
     };
   }
   {
@@ -211,8 +229,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pkg/errors";
-      rev = "ff09b135c25aae272398c51a07235b90a75aa4f0";
-      sha256 = "0pwl6v3hmc22zp32gkyqykl4kg69xk1mlp0vmhgd1f44difd5fvz";
+      rev = "c605e284fe17294bda444b34710735b29d1a9d90";
+      sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6";
     };
   }
   {
@@ -220,8 +238,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pkg/sftp";
-      rev = "4d0e916071f68db74f8a73926335f809396d6b42";
-      sha256 = "0l4n4ld0lx53s0hgz5rhk8gn7kr51adsr0cs6wlqm296xlcfp52h";
+      rev = "a5f8514e29e90a859e93871b1582e5c81f466f82";
+      sha256 = "0fis12k0h4jyyrpm13mhr5vvyqrgmnc06p4dwgzbfk6h6aq3qzcd";
     };
   }
   {
@@ -229,8 +247,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev = "b253417e1cb644d645a0a3bb1fa5034c8030127c";
-      sha256 = "1knj8vabymhmkg12cj3hnpqf3b74wwrvqib12yczcvpi52xaqi20";
+      rev = "0ba0f2b6ed7c475a92e4df8641825cb7a11d1fa3";
+      sha256 = "0jj9zkk64sxs8vpfhz95y9li30q6qnxm7sncsfjn2ykcdgs252f7";
     };
   }
   {
@@ -238,8 +256,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shurcooL/sanitized_anchor_name";
-      rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2";
-      sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg";
+      rev = "541ff5ee47f1dddf6a5281af78307d921524bcb5";
+      sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5";
     };
   }
   {
@@ -265,8 +283,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "3d7bff8a321b0a0f88b115558bb7e21bec9124ab";
-      sha256 = "07lxw8lnbpdqjvjlx732v9i04z8kgyvlp68d0fqdv6a16smf3nyz";
+      rev = "ca57f0f5dba473a8a58765d16d7e811fb8027add";
+      sha256 = "1lycnfkby5c7aamvwgxwq6ivzyvd8r761zkdignww1rmnqmiwd2h";
     };
   }
   {
@@ -283,8 +301,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/jwalterweatherman";
-      rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66";
-      sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8";
+      rev = "0efa5202c04663c757d84f90f5219c1250baf94f";
+      sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs";
     };
   }
   {
@@ -301,8 +319,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "f1d95a35e132e8a1868023a08932b14f0b8b8fcb";
-      sha256 = "0fwvkyq36jvy2gid81031ll7qaj8jxr5g36fff7hhkp3hh4kz6zh";
+      rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
+      sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
     };
   }
   {
@@ -310,8 +328,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/viper";
-      rev = "5d46e70da8c0b6f812e0b170b7a985753b5c63cb";
-      sha256 = "1wvcb1n3y3b7ixlw9vcj4fss5r6vi35a89c42nfb1hqaaji3lypi";
+      rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2";
+      sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f";
     };
   }
   {
@@ -337,8 +355,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "cbc3d0884eac986df6e78a039b8792e869bff863";
-      sha256 = "1b82asfxajwjb9rindx85c39lll8ygsj9rxxjca9171yh6wi5xbb";
+      rev = "7e9105388ebff089b3f99f0ef676ea55a6da3a7e";
+      sha256 = "0q3nx9px0bddpfnh2d5h56hsvbfx483jz93j6vanxqnysizgfc1n";
     };
   }
   {
@@ -346,8 +364,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "5602c733f70afc6dcec6766be0d5034d4c4f14de";
-      sha256 = "0n7jv3sl2s5fzdvj9jv4dqsgsdgkw6m3azqhiwq8igi97rymchyd";
+      rev = "5961165da77ad3a2abf3a77ea904c13a76b0b073";
+      sha256 = "0r4zb2pafrjyjb0alfnxbxkfc27iikkfdqhpklrm790j2x9xrp89";
     };
   }
   {
@@ -364,8 +382,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "f4b4367115ec2de254587813edaa901bc1c723a8";
-      sha256 = "1a5m97y7sdxks02p4swg8ffp8bgr95aaf5fhfw511p7h3xg1dm0d";
+      rev = "19e51611da83d6be54ddafce4a4af510cb3e9ea4";
+      sha256 = "09pcfzx7nrma0gjv93jx57c28farf8m1qm4x07vk5505wlcgvvfl";
     };
   }
   {
-- 
GitLab


From 0bffe0382863e317b392996685bb1eedccd9fc90 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 12 Jun 2017 20:09:12 +0200
Subject: [PATCH 0630/1490] nix: 1.11.9 -> 1.11.10

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++---
 pkgs/tools/package-management/nix/default.nix        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 83378247719..6ccc645a125 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
 {
-  x86_64-linux = "/nix/store/71im965h634iy99zsmlncw6qhx5jcclx-nix-1.11.9";
-  i686-linux = "/nix/store/cgvavixkayc36l6kl92i8mxr6k0p2yhy-nix-1.11.9";
-  x86_64-darwin = "/nix/store/w1c96v5yxvdmq4nvqlxjvg6kp7xa2lag-nix-1.11.9";
+  x86_64-linux = "/nix/store/qiiwjyc338xigks5wqyxn0nnqiwy7xav-nix-1.11.10";
+  i686-linux = "/nix/store/30fi96qqggjs51c5085y3fiws0a3wdcl-nix-1.11.10";
+  x86_64-darwin = "/nix/store/zs6msqwjgjr9v9kbs5s0sap7vhdw692z-nix-1.11.10";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 40ef90fa2b2..bef203e588e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -39,7 +39,7 @@ let
     buildInputs = [ curl openssl sqlite xz ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
       ++ lib.optionals fromGit [ brotli readline ] # Since 1.12
-      ++ lib.optional (stdenv.isLinux && is112) libseccomp
+      ++ lib.optional stdenv.isLinux libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112)
           (aws-sdk-cpp.override {
             apis = ["s3"];
@@ -148,10 +148,10 @@ in rec {
   nix = nixStable;
 
   nixStable = (common rec {
-    name = "nix-1.11.9";
+    name = "nix-1.11.10";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1";
+      sha256 = "b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467";
     };
   }) // { perl-bindings = nixStable; };
 
-- 
GitLab


From ab9d2443488a271abc4e1c298625aadd75178613 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 12 Jun 2017 14:56:28 -0500
Subject: [PATCH 0631/1490] elfkickers: init at 3.1

---
 .../tools/misc/elfkickers/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/misc/elfkickers/default.nix

diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix
new file mode 100644
index 00000000000..98976b5ab0e
--- /dev/null
+++ b/pkgs/development/tools/misc/elfkickers/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "elfkickers-${version}";
+  version = "3.1";
+
+  src = fetchurl {
+    url = "http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-${version}.tar.gz";
+    sha256 = "0n0sypjrdm3ramv0sby4sdh3i3j9d0ihadr951wa08ypdnq3yrkd";
+  };
+
+  makeFlags = [ "CC=cc prefix=$(out)" ];
+
+  enableParallelBuildingg = true;
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html";
+    description = "A collection of programs that access and manipulate ELF files";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0104a07e1b..b29525a1f77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6690,6 +6690,8 @@ with pkgs;
 
   elfutils = callPackage ../development/tools/misc/elfutils { };
 
+  elfkickers = callPackage ../development/tools/misc/elfkickers { };
+
   emma = callPackage ../development/tools/analysis/emma { };
 
   epm = callPackage ../development/tools/misc/epm { };
-- 
GitLab


From f78362d64c8d81375cc15f76030f19653e3ad72d Mon Sep 17 00:00:00 2001
From: gratuxri <gratuxri@users.noreply.github.com>
Date: Mon, 12 Jun 2017 22:25:00 +0200
Subject: [PATCH 0632/1490] fvwm: 2.6.6 -> 2.6.7

Release notes: https://github.com/fvwmorg/fvwm/releases/tag/2.6.7
---
 pkgs/applications/window-managers/fvwm/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index f8c8a59f6f6..75df68427aa 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -8,11 +8,13 @@
 assert gestures -> libstroke != null;
 
 stdenv.mkDerivation rec {
-  name = "fvwm-2.6.6";
+  pname = "fvwm";
+  version = "2.6.7";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "https://github.com/fvwmorg/fvwm/releases/download/version-2_6_6/${name}.tar.gz";
-    sha256 = "c5de085ff25b2128a401a80225481e63335f815f84eea139f80a5f66e606dc2c";
+    url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${name}.tar.gz";
+    sha256 = "01654d5abdcde6dac131cae9befe5cf6f01f9f7524d097c3b0f316e39f84ef73";
   };
 
   buildInputs = [
-- 
GitLab


From b349d4b899a42edcd83cf7057e9d3f1c0833a741 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 12 Jun 2017 19:29:46 -0400
Subject: [PATCH 0633/1490] haskellPackages.developPackage: Add overrides
 argument

---
 .../haskell-modules/make-package-set.nix           | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index f933d6ebfeb..cc161e3ca2d 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -129,16 +129,20 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
                                else self.callHackage;
         in generateExprs name src {}) overrides;
 
-    # : { root : Path, source-overrides : Defaulted (Either Path VersionNumber } -> NixShellAwareDerivation
+    # : { root : Path
+    #   , source-overrides : Defaulted (Either Path VersionNumber
+    #   , overrides : Defaulted (HaskellPackageOverrideSet)
+    #   } -> NixShellAwareDerivation
     # Given a path to a haskell package directory whose cabal file is
-    # named the same as the directory name, and an optional set of
+    # named the same as the directory name, an optional set of
     # source overrides as appropriate for the 'packageSourceOverrides'
-    # function, return a derivation appropriate for nix-build or nix-shell
+    # function, and an optional set of arbitrary overrides,
+    # return a derivation appropriate for nix-build or nix-shell
     # to build that package.
-    developPackage = { root, source-overrides ? {} }:
+    developPackage = { root, source-overrides ? {}, overrides ? self: super: {} }:
       let name = builtins.baseNameOf root;
           drv =
-            (extensible-self.extend (self.packageSourceOverrides source-overrides)).callCabal2nix name root {};
+            (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {};
       in if pkgs.lib.inNixShell then drv.env else drv;
 
     ghcWithPackages = selectFrom: withPackages (selectFrom self);
-- 
GitLab


From 94ec54598c3a8d67cb6b6667ad86b0874962bb2b Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 13 Jun 2017 15:29:14 +1000
Subject: [PATCH 0634/1490] snpeff: 4.3i -> 4.3p

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

diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
index 6c7a6b969ee..844374fceb9 100644
--- a/pkgs/applications/science/biology/snpeff/default.nix
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -2,15 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "snpeff-${version}";
-  version = "4.3i";
+  version = "4.3p";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/snpeff/snpEff_latest_core.zip";
-    sha256 = "0i1slg201c8yjfr4wrg4xcgzwi0c8b9l3fb1i73fphq6q6zdblzb";
+    url = "mirror://sourceforge/project/snpeff/snpEff_v4_3p_core.zip";
+    sha256 = "1xb3k0yxd634znw2q083ligm2ww4p6v64041r9sdy3930lhjvxb1";
   };
 
   buildInputs = [ unzip jre makeWrapper ];
 
+  sourceRoot = "snpEff";
+
   installPhase = ''
     mkdir -p $out/libexec/snpeff
     cp *.jar *.config $out/libexec/snpeff
-- 
GitLab


From d74f8351a525c604d85289119de4e65199365b58 Mon Sep 17 00:00:00 2001
From: timor <timor.dd@googlemail.com>
Date: Fri, 26 May 2017 15:18:11 +0200
Subject: [PATCH 0635/1490] kernel: enable audio jack reconfiguration

Change kernel config to allow for changing the functions of the audio
jacks at run-time as well as at boot time.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a0d4f8dbb5c..b23d52b39e3 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -212,6 +212,8 @@ with stdenv.lib;
   SND_DYNAMIC_MINORS y
   SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode
   SND_HDA_INPUT_BEEP y # Support digital beep via input layer
+  SND_HDA_RECONFIG y # Support reconfiguration of jack functions
+  SND_HDA_PATCH_LOADER y # Support configuring jack functions via fw mechanism at boot
   SND_USB_CAIAQ_INPUT y
   ${optionalString (versionOlder version "4.12") ''
     PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible)
-- 
GitLab


From f866cae200b9989faa0375e5dc8994fd0868479f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 13 Jun 2017 08:05:37 +0100
Subject: [PATCH 0636/1490] android-udev-rules: 20170305 -> 20170612

---
 pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 08c729baaaf..55f62e6073f 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20170305";
+  version = "20170612";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "0di64pqs0snbfmncbarvyb9dr3bpv203pqxn5h5i39400jvqwyb6";
+    sha256 = "14x22d00zby6wsjaccyh7n8jq1mqzwpx49s85mhmaahbrfd5jwnw";
   };
 
   installPhase = ''
-- 
GitLab


From cbbdc7d3eb6cd359f94e3d763341c864aeb15b88 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Mon, 12 Jun 2017 10:15:19 +0200
Subject: [PATCH 0637/1490] pythonPackages.gensim: init at 2.1.0

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

diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
new file mode 100644
index 00000000000..51794059b8e
--- /dev/null
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, numpy
+, six
+, scipy
+, smart_open
+, scikitlearn
+, testfixtures
+, unittest2
+}:
+
+buildPythonPackage rec {
+  pname = "gensim";
+  name = "${pname}-${version}";
+  version = "2.1.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1wn7bji9b80wn1yggmh7a0dlwzdjr6cp24x4p33j2rf29lxnm2kc";
+  };
+
+  propagatedBuildInputs = [ smart_open numpy six scipy
+                            # scikitlearn testfixtures unittest2 # for tests
+                          ];
+  doCheck = false;
+
+  # Two tests fail.
+
+  # ERROR: testAddMorphemesToEmbeddings (gensim.test.test_varembed_wrapper.TestVarembed)
+  # ImportError: Could not import morfessor.
+  # This package is not in nix
+
+  # ERROR: testWmdistance (gensim.test.test_fasttext_wrapper.TestFastText)
+  # ImportError: Please install pyemd Python package to compute WMD.
+  # This package is not in nix
+
+  meta = {
+    description = "Topic-modelling library";
+    homepage = "https://radimrehurek.com/gensim/";
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ jpbernardy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf5184ca606..0d294661136 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30487,6 +30487,8 @@ EOF
 
   smart_open =  callPackage ../development/python-modules/smart_open { };
 
+  gensim = callPackage  ../development/python-modules/gensim { };
+
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 156a9afb2b86444d5d3bc239db89c57d02cedb4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Jun 2017 10:57:33 +0200
Subject: [PATCH 0638/1490] knot-resolver: 1.2.6 -> 1.3.0

---
 pkgs/servers/dns/knot-resolver/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index c60e7232b79..1fec8ef11b7 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,19 +10,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.2.6";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "31e1b8899c5592433e5265a8e9685126fc5aeff3bd6b10884154b2e34b786f3c";
+    sha256 = "667002dc3ee0b0f755628997ef4f71be769a06fb8b9ccd935db329c8709c2af4";
   };
 
-  patches = [(fetchpatch {
-    name = "luajit-2.1.0-beta3.diff";
-    url = https://gitlab.labs.nic.cz/knot/resolver/merge_requests/289.diff;
-    sha256 = "1cgfi715qhmvb31ri2wr6cacsjvb1dqavdmnnl1074y25zalxfax";
-  })];
-
   outputs = [ "out" "dev" ];
 
   configurePhase = ":";
-- 
GitLab


From db2849c8a2201199c1d5945a4f8d046655df54f4 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 12 Jun 2017 09:42:05 +0100
Subject: [PATCH 0639/1490] rigsofrods: 20160412 -> 0.4.7.0

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

diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
index ac658ee1367..a118a75aefe 100644
--- a/pkgs/games/rigsofrods/default.nix
+++ b/pkgs/games/rigsofrods/default.nix
@@ -4,14 +4,14 @@
   }:
 
 stdenv.mkDerivation rec {
-  version = "git-20160412";
+  version = "0.4.7.0";
   name = "rigsofrods-${version}";
 
   src = fetchFromGitHub {
     owner = "RigsOfRods";
     repo = "rigs-of-rods";
-    rev = "1ebd359dbd467b4c3171dd6d054e7d8ec39f78ba";
-    sha256 = "0h71nrgq5r5cnh20c7wl8jzyaf50dj1b5jdrwihnklpsfyfvjlw4";
+    rev = version;
+    sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4";
   };
 
   enableParallelBuilding = true;
-- 
GitLab


From 04d4d14d6d1662526a42234f4500f1161cb7936d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 30 Mar 2017 23:19:57 +0200
Subject: [PATCH 0640/1490] gawk: link gawk manpage to awk

---
 pkgs/tools/text/gawk/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 3a504e9478c..baaf7d4bb3b 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -32,7 +32,10 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
     ++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")];
 
-  postInstall = "rm $out/bin/gawk-*";
+  postInstall = ''
+    rm $out/bin/gawk-*
+    ln -s $man/share/man/man1/gawk.1 $man/share/man/man1/awk.1
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/gawk/;
-- 
GitLab


From d6452233065eba63cc74380fe5691d204b644dd3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 13 Jun 2017 06:58:57 -0500
Subject: [PATCH 0641/1490] elfkickers: fix typo in enableParallelBuilding.

Thanks @bjornfor for spotting this!
---
 pkgs/development/tools/misc/elfkickers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix
index 98976b5ab0e..603f8c0bef6 100644
--- a/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/pkgs/development/tools/misc/elfkickers/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "CC=cc prefix=$(out)" ];
 
-  enableParallelBuildingg = true;
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html";
-- 
GitLab


From 5ad7d3106e04f961d0c6fdf05b7a9e79c27c9d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Jun 2017 14:26:15 +0200
Subject: [PATCH 0642/1490] kde4.kdepimlibs: fixup build by using older cmake

I have no idea why, but apparently the last cmake update caused:
  kdepimlibs-4.14.3/akonadi/tests/../pastehelper.cpp:343:27:
    fatal error: pastehelper.moc: No such file or directory
---
 pkgs/desktops/kde-4.14/kdepimlibs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix
index 5e7643469b6..1f412d3c766 100644
--- a/pkgs/desktops/kde-4.14/kdepimlibs.nix
+++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix
@@ -1,7 +1,7 @@
 { kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
 , kdelibs, akonadi, libxslt
 , shared_mime_info, shared_desktop_ontologies, qjson
-, automoc4, cmake, perl
+, automoc4, cmake_2_8, perl
 }:
 
 kde {
@@ -11,7 +11,7 @@ kde {
 
   setOutputFlags = false;
 
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+  nativeBuildInputs = [ automoc4 cmake_2_8 perl pkgconfig ];
 
   cmakeFlags = [
     "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3"
-- 
GitLab


From 9d4bf6b1557e7d606fc55cb0bcd8debe88f1aba8 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 13 Jun 2017 15:55:56 +0200
Subject: [PATCH 0643/1490] wireguard: 0.0.20170531 -> 0.0.20170613

Simple version bump. Release notes:

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 pkgs/os-specific/linux/wireguard/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 696166f3947..3ccf703370c 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,18 +6,18 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170531";
+  version = "0.0.20170613";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1k6asxx7qzmxasvdwkvlalvav643fqfbndv80vjkbjqxy6mdkdrf";
+    sha256 = "88ac77569eeb79c517318d58a0954caa0a4d2a6a1694e74c2a3b1c14438ac941";
   };
 
   meta = with stdenv.lib; {
     homepage     = https://www.wireguard.io/;
     downloadPage = https://git.zx2c4.com/WireGuard/refs/;
     description  = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security";
-    maintainers  = with maintainers; [ ericsagnes mic92 ];
+    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
     license      = licenses.gpl2;
     platforms    = platforms.linux;
   };
-- 
GitLab


From b7f71bd2ada3000b01058b32daa7c47496b2539f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 Jun 2017 16:55:50 +0200
Subject: [PATCH 0644/1490] mr: update to version 1.20170129

---
 pkgs/applications/version-management/mr/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 551a5795d11..4d7ccaf3027 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchgit, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.20160123";
+  version = "1.20170129";
   name = "mr-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz";
-    sha256 = "1723cg5haplz2w9dwdzp6ds1ip33cx3awmj4wnb0h4yq171v5lqk";
+  src = fetchgit {
+    url = "git://myrepos.branchable.com/";
+    rev = "refs/tags/" + version;
+    sha256 = "15i9bs2i25l7ibv530ghy8280kklcgm5kr6j86s7iwcqqckd0czp";
   };
 
   buildInputs = [ perl ];
-- 
GitLab


From 90cf4cfabecad2b4e04d1c018f862868bb59b0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Jun 2017 17:17:03 +0200
Subject: [PATCH 0645/1490] rhash: extend meta.platforms

Now cmake evaluates on Darwin again.  Let's be optimistic about building.
Discussion: https://github.com/NixOS/nixpkgs/commit/d74d871f52
---
 pkgs/tools/security/rhash/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 1f72ca294eb..35fab64ffc8 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://rhash.anz.ru;
     description = "Console utility and library for computing and verifying hash sums of files";
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.andrewrk ];
   };
 }
-- 
GitLab


From 6b1087d9b135c94b929fec3d4cf3724b9539c6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 13 Jun 2017 18:08:27 +0100
Subject: [PATCH 0646/1490] add zx2c4 to lib/maintainers.nix

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f83b887ba97..d4f9d1c31a8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -604,4 +604,5 @@
   zohl = "Al Zohali <zohl@fmap.me>";
   zoomulator = "Kim Simmons <zoomulator@gmail.com>";
   zraexy = "David Mell <zraexy@gmail.com>";
+  zx2c4 = "Jason A. Donenfeld <Jason@zx2c4.com>";
 }
-- 
GitLab


From e973c75d659f15897191d3e46e06a04744cc7358 Mon Sep 17 00:00:00 2001
From: Tim Shaffer <tshaffe1@nd.edu>
Date: Tue, 13 Jun 2017 13:24:51 -0400
Subject: [PATCH 0647/1490] vim: update URL for vimrc

Previous URL was returning a 404. Adjusting the query parameters fixes
things.
---
 pkgs/applications/editors/vim/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 8c9a725ddd6..98e9a47a760 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -2,7 +2,7 @@
 # default vimrc
 , vimrc ? fetchurl {
     name = "default-vimrc";
-    url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?h=packages/vim?id=68f6d131750aa778807119e03eed70286a17b1cb;
+    url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?id=68f6d131750aa778807119e03eed70286a17b1cb;
     sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
   }
 # apple frameworks
-- 
GitLab


From 8d71c758a105e3aade5d087933476cc3e1a63087 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 Jun 2017 17:17:30 +0200
Subject: [PATCH 0648/1490] perl-Shell-Command: initial version 0.06

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 97ec906f30f..b9eb8a82eef 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12212,6 +12212,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ShellCommand = buildPerlPackage {
+    name = "Shell-Command-0.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/F/FL/FLORA/Shell-Command-0.06.tar.gz;
+      sha256 = "1lgc2rb3b5a4lxvbq0cbg08qk0n2i88srxbsz93bwi3razpxxr7k";
+    };
+  };
+
   StringToIdentifierEN = buildPerlPackage rec {
     name = "String-ToIdentifier-EN-0.11";
     src = fetchurl {
-- 
GitLab


From 14283b6a95b40881a79cf37d1b46cd5cfc0ff971 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 Jun 2017 17:19:14 +0200
Subject: [PATCH 0649/1490] vcsh: update to latest Git head, enable test suite,
 install man page

---
 .../version-management/vcsh/default.nix       | 19 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
index 4f87f4b569c..038e72e83a0 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -1,20 +1,19 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }:
 
 stdenv.mkDerivation rec {
-  version = "1.20151229-1";
+  version = "1.20170226";       # date of commit we're pulling
   name = "vcsh-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/RichiH/vcsh/archive/v${version}.tar.gz";
-    sha256 = "0wgg5zz11ql2v37vby5gbqvnbs80g1q83b9qbvm8d2pqx8bsb0kn";
+  src = fetchFromGitHub {
+    owner = "RichiH";
+    repo = "vcsh";
+    rev = "36a7cedf196793a6d99f9d3ba2e69805cfff23ab";
+    sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln";
   };
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  buildInputs = [ which git ronn perl ShellCommand TestMost ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp vcsh $out/bin
-  '';
+  installPhase = "make install PREFIX=$out";
 
   meta = with stdenv.lib; {
     description = "Version Control System for $HOME";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b29525a1f77..ab9c2abcf14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4515,7 +4515,9 @@ with pkgs;
 
   vboot_reference = callPackage ../tools/system/vboot_reference { };
 
-  vcsh = callPackage ../applications/version-management/vcsh { };
+  vcsh = callPackage ../applications/version-management/vcsh {
+    inherit (perlPackages) ShellCommand TestMost;
+  };
 
   verilator = callPackage ../applications/science/electronics/verilator {};
 
-- 
GitLab


From ec27fcdd6cf78c6b923ce4658be63af8f50f2ab6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 11 Jun 2017 21:14:01 +0200
Subject: [PATCH 0650/1490] caddy: 0.9.5 -> 0.10.3

---
 pkgs/servers/caddy/default.nix |  8 ++--
 pkgs/servers/caddy/deps.nix    | 73 +++++++++++++++++++---------------
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index add92f68876..5e5ac3bcafd 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.9.5";
+  version = "0.10.3";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,12 +12,12 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "0z1qjmlxrsiccrl5cb0j4c48ksng4xgp5bgy11gswrijvymsbq2r";
+    sha256 = "0srz1cji1z6ag591vfwjd0aypi32hr7hh9ypps8p5szf075rkr8p";
   };
 
   buildFlagsArray = ''
     -ldflags=
-      -X github.com/mholt/caddy/caddy/caddymain.gitTag=${version}
+      -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version}
   '';
 
   goDeps = ./deps.nix;
@@ -26,6 +26,6 @@ buildGoPackage rec {
     homepage = https://caddyserver.com;
     description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";
     license = licenses.asl20;
-    maintainers = [ maintainers.rushmorem ];
+    maintainers = with maintainers; [ rushmorem fpletz ];
   };
 }
diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix
index 49ae8fa09e8..e2b318ca60e 100644
--- a/pkgs/servers/caddy/deps.nix
+++ b/pkgs/servers/caddy/deps.nix
@@ -1,12 +1,21 @@
-# This file was generated by go2nix.
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
 [
+  {
+    goPackagePath = "github.com/codahale/aesnicheck";
+    fetch = {
+      type = "git";
+      url = "https://github.com/codahale/aesnicheck";
+      rev = "349fcc471aaccc29cd074e1275f1a494323826cd";
+      sha256 = "1zab6jjs5hiqpq484pbpx490zlj42v7hf4wwkqmicyaq7wclfnka";
+    };
+  }
   {
     goPackagePath = "github.com/dustin/go-humanize";
     fetch = {
       type = "git";
       url = "https://github.com/dustin/go-humanize";
-      rev = "7a41df006ff9af79a29f0ffa9c5f21fbe6314a2d";
-      sha256 = "0055ir369kz63x9ay0fxqpx2xby8digja6ffbc35vsqjnzfwws18";
+      rev = "259d2a102b871d17f30e3cd9881a642961a1e486";
+      sha256 = "1jiada1pfhw2wwkx7cjsa6ixa8c37w51b3x09vlr4m0l945pval9";
     };
   }
   {
@@ -23,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "0674c7c7968d9fac5f0f678325161ec31df406af";
-      sha256 = "0ql8bsxcc0rjli5cxb0jf22jaq18bd6s4pja7razir3a9zcyn3km";
+      rev = "a91eba7f97777409bc2c443f5534d41dd20c5720";
+      sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";
     };
   }
   {
@@ -77,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lucas-clemente/quic-go";
-      rev = "86e02c4d2c459b70073cd5c39468e8a5a22db45a";
-      sha256 = "16qrkcwllx88f6623ps5p5h62168xs6mcwybbw8862pvb0zkndz0";
+      rev = "bb280f29be75d6d78c64a32692b668e2a99c57bb";
+      sha256 = "1a6xqh7z8amb1372kb63kmn764w6c0ypcl7c4c7kyy2sqx8lyjyc";
     };
   }
   {
@@ -95,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/miekg/dns";
-      rev = "ca336a1f95a6b89be9c250df26c7a41742eb4a6f";
-      sha256 = "03yh1zszhspmmq0v22ckw96q8ds2a5s3nd0c6r3p3n165w28z434";
+      rev = "e78414ef75607394ad7d917824f07f381df2eafa";
+      sha256 = "1g5rgbjy7nr0l6074plh2aqiwiy9nck9bhhks9c5ki3r00fjj3ay";
     };
   }
   {
@@ -113,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/naoina/toml";
-      rev = "751171607256bb66e64c9f0220c00662420c38e9";
-      sha256 = "07ivrcdd62y7jj5isrz7jhkqqc29s0wsn005mn0yxain51f8h7ly";
+      rev = "e6f5723bf2a66af014955e0888881314cf294129";
+      sha256 = "0kh7xnckw689kksh23ginyl3g8h2yqyvjh54nmnfvjaj886lvbsf";
     };
   }
   {
@@ -122,17 +131,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70";
-      sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k";
-    };
-  }
-  {
-    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shurcooL/sanitized_anchor_name";
-      rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2";
-      sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg";
+      rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae";
+      sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137";
     };
   }
   {
@@ -140,8 +140,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/xenolf/lego";
-      rev = "f5d538caab6dc0c167d4e32990c79bbf9eff578c";
-      sha256 = "026sjqinb0j4ddfh3rwhhh7a1yjkfdmdr4yflba5syp1hrjf1f37";
+      rev = "aaa8e70aec58a858b6bef0706b367dd5e8d58128";
+      sha256 = "0899mdgb01bpz83zyxzln8ygyll78gmcslw5i36q9m60pqj59z60";
     };
   }
   {
@@ -149,8 +149,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "41d678d1df78cd0410143162dff954e6dc09300f";
-      sha256 = "1gcw2850nghsfi3m98ibsxs8bwqzhdjsgiznrr9ymarzn58v3357";
+      rev = "e7ba82683099cae71475961448ab8f903ea77c26";
+      sha256 = "0w6zvzchgzk197siq3qbsh6pdpnx7g9xc08k5axv5yc6w8qhgx11";
     };
   }
   {
@@ -158,8 +158,17 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "f2499483f923065a842d38eb4c7f1927e6fc6e6d";
-      sha256 = "0q1ps8igfczfafk39hkp8gs57s6qxjvf2c48hiq00p873agz0x7s";
+      rev = "1a68b1313cf4ad7778376e82641197b60c02f65c";
+      sha256 = "1nfva16dasc9h5y1njcfnr2g09damk754g3yliij3ar06k06p1xf";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "210eee5cf7323015d097341bcf7166130d001cd8";
+      sha256 = "0sm9548ky5vi2sr5zjzwwna5f4pfs0nmlaw0pjnamxwfjzy4jnfb";
     };
   }
   {
@@ -167,8 +176,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/natefinch/lumberjack.v2";
-      rev = "dd45e6a67c53f673bb49ca8a001fd3a63ceb640e";
-      sha256 = "1fla2mzbwl1lxa9na3xhjmcszn8kiw051xq7i9xzbazzpgf0csg0";
+      rev = "a96e63847dc3c67d17befa69c303767e2f84e54f";
+      sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d";
     };
   }
   {
@@ -185,8 +194,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "14227de293ca979cf205cd88769fe71ed96a97e2";
-      sha256 = "038hnrjcnjygyi3qidfrkpkakis82qg381sr495d2s40g2dwlzah";
+      rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
+      sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
     };
   }
 ]
-- 
GitLab


From 071815cb244e2f884552936d245944e4369e81a0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 11 Jun 2017 22:02:06 +0200
Subject: [PATCH 0651/1490] caddy service: sync with upstream systemd unit

Increases security and fixes minor issues.
---
 nixos/modules/services/web-servers/caddy.nix | 21 ++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index eec285f6bc4..9ac1a08bb58 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -50,17 +50,30 @@ in
   config = mkIf cfg.enable {
     systemd.services.caddy = {
       description = "Caddy web server";
-      after = [ "network.target" ];
+      after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = ''${cfg.package.bin}/bin/caddy -conf=${configFile} \
-          -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"}
+        ExecStart = ''
+          ${cfg.package.bin}/bin/caddy -root=/var/tmp -conf=${configFile} \
+            -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"}
         '';
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Type = "simple";
         User = "caddy";
         Group = "caddy";
+        Restart = "on-failure";
+        StartLimitInterval = 86400;
+        StartLimitBurst = 5;
         AmbientCapabilities = "cap_net_bind_service";
-        LimitNOFILE = 8192;
+        CapabilityBoundingSet = "cap_net_bind_service";
+        NoNewPrivileges = true;
+        LimitNPROC = 64;
+        LimitNOFILE = 1048576;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        ProtectHome = true;
+        ProtectSystem = "full";
+        ReadWriteDirectories = cfg.dataDir;
       };
     };
 
-- 
GitLab


From ac5258edb25814f2b2c70380f24a15625b10fae1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 11 Jun 2017 22:04:03 +0200
Subject: [PATCH 0652/1490] caddy service: don't use extra dotdir in dataDir

---
 nixos/doc/manual/release-notes/rl-1709.xml   | 9 +++++++++
 nixos/modules/services/web-servers/caddy.nix | 8 +++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 6948c22cc88..c16499a0c1d 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -89,6 +89,15 @@ rmdir /var/lib/ipfs/.ipfs
       The <literal>postgres</literal> default <literal>dataDir</literal> has changed from <literal>/var/db/postgres</literal> to <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is 9.6 for example.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>caddy</literal> service was previously using an extra
+      <literal>.caddy</literal> in the data directory specified with the
+      <literal>dataDir</literal> option. The contents of the
+      <literal>.caddy</literal> directory are now expected to be in the
+      <literal>dataDir</literal>.
+    </para>
+  </listitem>
 </itemizedlist>
 
 
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 9ac1a08bb58..ee32a1c86d4 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -36,7 +36,11 @@ in
     dataDir = mkOption {
       default = "/var/lib/caddy";
       type = types.path;
-      description = "The data directory, for storing certificates.";
+      description = ''
+        The data directory, for storing certificates. Before 17.09, this
+        would create a .caddy directory. With 17.09 the contents of the
+        .caddy directory are in the specified data directory instead.
+      '';
     };
 
     package = mkOption {
@@ -52,6 +56,8 @@ in
       description = "Caddy web server";
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
+      environment = mkIf (versionAtLeast config.system.stateVersion "17.09")
+        { CADDYPATH = cfg.dataDir; };
       serviceConfig = {
         ExecStart = ''
           ${cfg.package.bin}/bin/caddy -root=/var/tmp -conf=${configFile} \
-- 
GitLab


From 44cb792077c7f111e2ef721f85acfe76e0a9e713 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 11 Jun 2017 22:20:47 +0200
Subject: [PATCH 0653/1490] powerdns: 4.0.2 -> 4.0.3

---
 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 b1e4ec6e368..8b838a58b27 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.0.2";
+  version = "4.0.3";
 
   src = fetchurl {
     url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    sha256 = "17b2gv7r53skj54ms4hx8rdjiggpc8bais0cy0jck1pmccxyalfh";
+    sha256 = "10p2m2zbydbd5xjdgf8z4zgvl8diyb4k3bq1hzsl32r71daj3yk0";
   };
 
   buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ];
-- 
GitLab


From 3640c65be64506d00ed9d3096cb1840738e154c6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Jun 2017 21:20:10 +0200
Subject: [PATCH 0654/1490] jenkins: 2.64 -> 2.65

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 2c80e9c8002..2737329121a 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.64";
+  version = "2.65";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "0w0yz36kj4bw5lswyxqg6rfcvrqmkvidfrbbvdn8rq6sfrcpvjrg";
+    sha256 = "0ydg8crv8a4lg2y8dihflxcb3b2fxn6ds70c9l1vwmb8j29wsli6";
   };
 
   buildCommand = ''
-- 
GitLab


From 50b3f8e051c6a1e6c571d9ee43c0ad29fde045d6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 13 Jun 2017 21:26:07 +0200
Subject: [PATCH 0655/1490] fsql: 0.1.1 -> 0.2.1

---
 pkgs/tools/misc/fsql/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix
index ffd3b3f5153..e3a9297c4ab 100644
--- a/pkgs/tools/misc/fsql/default.nix
+++ b/pkgs/tools/misc/fsql/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "fsql-${version}";
-  version = "0.1.1";
+  version = "0.2.1";
 
   goPackagePath = "github.com/kshvmdn/fsql";
 
-  src = fetchgit {
-    rev = "refs/tags/v${version}";
-    url = "https://github.com/kshvmdn/fsql";
-    sha256 = "1zvblhfd15l86dcx0p12yrc2rrmfdpzyd107508pb72r2ar638vh";
+  src = fetchFromGitHub {
+    owner = "kshvmdn";
+    repo = "fsql";
+    rev = "v${version}";
+    sha256 = "1izcfxm77hjj8z7a2nk9bbwbz4wc2yqzs2ir8v3k822m1hvgwb9a";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 053377e49f289cee713ee1b380430cba6a2e1887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Urban=20=C5=A0kudnik?= <urban.skudnik@gmail.com>
Date: Sun, 11 Jun 2017 18:40:50 +0200
Subject: [PATCH 0656/1490] google-play-music-desktop-player: 4.2.0 -> 4.3.0

---
 .../audio/google-play-music-desktop-player/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 12e9b88880d..47b85af724a 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "4.2.0";
+  version = "4.3.0";
 
   deps = [
     alsaLib
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
-    sha256 = "0n59b73jc6b86p5063xz7n0z48wy9mzqcx0l34av2hqkx6wcb2h8";
+    sha256 = "0mbrfnsnajmpwyqyrjmcv84ywzimjmm2b8faxqiwfcikdgpm9amb";
   };
 
   dontBuild = true;
-- 
GitLab


From 972fa2a2191e422a04b1175cc90eb9485b70915a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 13 Jun 2017 21:31:42 +0200
Subject: [PATCH 0657/1490] instead: 3.0.0 -> 3.0.1

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

diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index a0bb45746f7..2c360241fb9 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
 
 let
-  version = "3.0.0";
+  version = "3.0.1";
 
   # I took several games at random from http://instead.syscall.ru/games/
   games = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
-    sha256 = "14scbb5x36dywak930ry7hwv502jnzc4m5cjkymqn1vz1xkq2m5w";
+    sha256 = "0ynqzmr35zd1vbbv8n3vk93zj0njhs45w9z33wwkphg2zlniwnzb";
   };
 
   NIX_LDFLAGS = "-llua -lgcc_s";
-- 
GitLab


From c9fcce368d20de7755fdc1e5d2e93af88c674597 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 13 Jun 2017 21:34:58 +0200
Subject: [PATCH 0658/1490] ragel: 6.9 -> 6.10

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

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 5140719c62b..bfd43401a34 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -37,8 +37,8 @@ in
 
 {
   ragelStable = generic {
-    version = "6.9";
-    sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf";
+    version = "6.10";
+    sha256 = "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az";
   };
 
   ragelDev = generic {
-- 
GitLab


From a9b2de487b2e81394decb687638d0c14d32bdef1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 13 Jun 2017 21:36:49 +0200
Subject: [PATCH 0659/1490] rage: fix license for unstable

Beginning with the next development release (> 7.0.0.9)
Ragel is licensed under an MIT style license. Ragel 6
remains under GPL v2. Please see the file COPYING in the
source.
---
 pkgs/development/tools/parsing/ragel/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index bfd43401a34..02a13bfa28d 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  generic = { version, sha256 }:
+  generic = { version, sha256, license }:
     stdenv.mkDerivation rec {
       name = "ragel-${version}";
 
@@ -27,7 +27,7 @@ let
       meta = with stdenv.lib; {
         homepage = http://www.complang.org/ragel;
         description = "State machine compiler";
-        license = licenses.gpl2;
+        inherit license;
         platforms = platforms.unix;
         maintainers = with maintainers; [ pSub ];
       };
@@ -39,10 +39,12 @@ in
   ragelStable = generic {
     version = "6.10";
     sha256 = "0gvcsl62gh6sg73nwaxav4a5ja23zcnyxncdcdnqa2yjcpdnw5az";
+    license = stdenv.lib.licenses.gpl2;
   };
 
   ragelDev = generic {
     version = "7.0.0.10";
     sha256 = "1v4ddzxal4gf8l8nkn32qabba6nbpd2mg8sphgmdn8kaqv52nmj0";
+    license = stdenv.lib.licenses.mit;
   };
 }
-- 
GitLab


From 5c8192c7d66cbea01e3b6cbab86463ca59defcf2 Mon Sep 17 00:00:00 2001
From: Yann Hodique <yann.hodique@gmail.com>
Date: Tue, 13 Jun 2017 12:40:45 -0700
Subject: [PATCH 0660/1490] hugo: 0.22 -> 0.22.1 (#26558)

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index f25426d8b06..8d14db09c3f 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.22";
+  version = "0.22.1";
 
   goPackagePath = "github.com/spf13/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1gjkzvpd8hpr77v6lxrry8diigr8ch8cvwb8gkbd0z33wsvr2vqi";
+    sha256 = "0m459np11izsflwdja6k0znaxvd8zpgivvswnq9501m49h8m4x7q";
   };
 
   goDeps = ./deps.nix;
-- 
GitLab


From 727ec216dced62f90b4dc3d1cc052a915290904d Mon Sep 17 00:00:00 2001
From: Wei Tang <accounts@that.world>
Date: Wed, 14 Jun 2017 03:43:33 +0800
Subject: [PATCH 0661/1490] go-ethereum-classic: init at 3.5.0 (#26551)

thanks
---
 pkgs/applications/altcoins/default.nix        |  1 +
 .../altcoins/go-ethereum-classic/default.nix  | 24 ++++++++++++
 .../altcoins/go-ethereum-classic/deps.nix     | 39 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 pkgs/applications/altcoins/go-ethereum-classic/default.nix
 create mode 100644 pkgs/applications/altcoins/go-ethereum-classic/deps.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 471d2a16ef7..1fcfd5f2b60 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -21,6 +21,7 @@ rec {
 
   freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; };
   go-ethereum = callPackage ./go-ethereum.nix { };
+  go-ethereum-classic = callPackage ./go-ethereum-classic { };
 
   hivemind = callPackage ./hivemind.nix { withGui = true; };
   hivemindd = callPackage ./hivemind.nix { withGui = false; };
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
new file mode 100644
index 00000000000..b7585b2f109
--- /dev/null
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "go-ethereum-classic-${version}";
+  version = "3.5.0";
+  rev = "402c1700fbefb9512e444b32fe12c2d674638ddb";
+
+  goPackagePath = "github.com/ethereumproject/go-ethereum";
+  subPackages = [ "cmd/evm" "cmd/geth" ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/ethereumproject/go-ethereum";
+    sha256 = "15wji12wqcrgsb1glwwz4jv7rsas71bbxh7750iv2phn7jivm0fi";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+    description = "Golang implementation of Ethereum Classic";
+    homepage = "https://github.com/ethereumproject/go-ethereum";
+    license = with lib.licenses; [ lgpl3 gpl3 ];
+  };
+}
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/deps.nix b/pkgs/applications/altcoins/go-ethereum-classic/deps.nix
new file mode 100644
index 00000000000..0aa6755ee96
--- /dev/null
+++ b/pkgs/applications/altcoins/go-ethereum-classic/deps.nix
@@ -0,0 +1,39 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
+[
+  {
+    goPackagePath = "github.com/maruel/panicparse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/maruel/panicparse";
+      rev = "ae43f192cef2add653fe1481a3070ed00a4a6981";
+      sha256 = "11q8v4adbrazqvh24235s5nifck0d1083gbwv4dh5lhd10xlwdvr";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
+      sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-wordwrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-wordwrap";
+      rev = "ad45545899c7b13c020ea92b2072220eefad42b8";
+      sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9";
+    };
+  }
+  {
+    goPackagePath = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev = "4163cd39dda1c0dda883a713640bc01e08951c24";
+      sha256 = "1vzrhxf8823lrnwf1bfyxwlm52pph5iq2hgr1d0n07v8kjgqkrmx";
+    };
+  }
+]
-- 
GitLab


From f03ee2475406a24c3162f8d137aae8f6f5440cda Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Tue, 13 Jun 2017 21:46:37 +0200
Subject: [PATCH 0662/1490] gfortran7: added by wrapping gcc7 (#26535)

thanks
---
 pkgs/top-level/all-packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab9c2abcf14..ea00365659d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5312,6 +5312,14 @@ with pkgs;
     profiledCompiler = false;
   });
 
+  gfortran7 = wrapCC (gcc7.cc.override {
+    name = "gfortran";
+    langFortran = true;
+    langCC = false;
+    langC = false;
+    profiledCompiler = false;
+  });
+
   gcj = gcj49;
   gcj49 = wrapCC (gcc49.cc.override {
     name = "gcj";
-- 
GitLab


From 8a06af11637760fb8038f2b0b71830bd464211e7 Mon Sep 17 00:00:00 2001
From: Guillaume Koenig <guillaume.edward.koenig@gmail.com>
Date: Tue, 13 Jun 2017 21:50:46 +0200
Subject: [PATCH 0663/1490] reno: 1.8.0 -> 2.3.2 (#26516)

thanks
---
 pkgs/development/tools/reno/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix
index dbc2401970b..35aab138292 100644
--- a/pkgs/development/tools/reno/default.nix
+++ b/pkgs/development/tools/reno/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonApplication rec {
+with pythonPackages; buildPythonApplication rec {
   name = "reno-${version}";
-  version = "1.8.0";
+  version = "2.3.2";
 
   src = fetchurl {
     url = "mirror://pypi/r/reno/${name}.tar.gz";
-    sha256 = "1pqg0xzcilmyrrnpa87m11xwlvfc94a98s28z9cgddkhw27lg3ps";
+    sha256 = "018vl9fj706jjf07xdx8q6761s53mrihjn69yjq09gp0vmp1g7i4";
   };
 
   # Don't know how to make tests pass
@@ -15,8 +15,8 @@ pythonPackages.buildPythonApplication rec {
   # Nothing to strip (python files)
   dontStrip = true;
 
-  propagatedBuildInputs = with pythonPackages; [ pbr six pyyaml ];
-  buildInputs = with pythonPackages; [ Babel ];
+  propagatedBuildInputs = [ pbr six pyyaml dulwich ];
+  buildInputs = [ Babel ];
 
   meta = with stdenv.lib; {
     description = "Release Notes Manager";
-- 
GitLab


From 4fc077bfeee8e09980a75f19823400e46cbd5063 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 13 Jun 2017 20:51:33 +0100
Subject: [PATCH 0664/1490] vdrift: fix build (#26522)

Had been broken since 7bf7f1976545666ba958034f7e61062595338f84
---
 pkgs/games/vdrift/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index ea3231dbe63..98fe9d7c6f6 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     cp -r --reflink=auto $data data
     chmod -R +w data
     sed -i -e s,/usr/local,$out, SConstruct
+    export CXXFLAGS="$(pkg-config --cflags SDL2_image)"
     scons
   '';
   installPhase = "scons install";
-- 
GitLab


From 9fb87f9c9d0eaeb97773e53e3740231d52b1104f Mon Sep 17 00:00:00 2001
From: "Taylor \"Nekroze\" Lawson" <nekroze.lawson@gmail.com>
Date: Wed, 14 Jun 2017 05:54:36 +1000
Subject: [PATCH 0665/1490] Kubernetes ABAC policy file fix (#26499)

Fix the incorrect nix map that generates the Kubernetes policy file
---
 nixos/modules/services/cluster/kubernetes.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index f58306ab63e..68917af5094 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -40,7 +40,7 @@ let
   });
 
   policyFile = pkgs.writeText "kube-policy"
-    concatStringsSep "\n" (map (builtins.toJSON cfg.apiserver.authorizationPolicy));
+    (concatStringsSep "\n" (map builtins.toJSON cfg.apiserver.authorizationPolicy));
 
   cniConfig = pkgs.buildEnv {
     name = "kubernetes-cni-config";
-- 
GitLab


From b83609add3e90bf67aba7e4dc628542487271340 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 13 Jun 2017 07:04:29 -0500
Subject: [PATCH 0666/1490] psmisc: 22.21 -> 23.0

No longer need fuser patch, fixes musl compat.
---
 ...ypo-in-fuser-makes-M-on-all-the-time.patch | 44 -------------------
 pkgs/os-specific/linux/psmisc/default.nix     |  9 ++--
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch

diff --git a/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch b/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
deleted file mode 100644
index 2bb93955aea..00000000000
--- a/pkgs/os-specific/linux/psmisc/0001-Typo-in-fuser-makes-M-on-all-the-time.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
-From: Brad Jorsch <anomie@users.sourceforge.net>
-Date: Fri, 28 Feb 2014 21:55:02 +1100
-Subject: [PATCH] Typo in fuser makes -M on all the time
-
-Brad found that fuser had the -M option on all the time.
-A simple but significant typo caused this, thanks the the patch.
-
-Bug-Debian: http://bugs.debian.org/740275
-
-Signed-off-by: Craig Small <csmall@enc.com.au>
----
- ChangeLog   | 4 ++++
- src/fuser.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index fd1cccf..e5f784c 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+Changes in 22.22
-+================
-+	* Fixed typo in fuser which has -M on Debian #740275
-+
- Changes in 22.21
- ================
- 	* Missing comma in fuser(1) added Debian #702391
-diff --git a/src/fuser.c b/src/fuser.c
-index b485f65..389b302 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
- 		usage(_("No process specification given"));
- 
- 	/* Check if -M flag was used and if so check mounts */
--	if (opts * OPT_ISMOUNTPOINT) {
-+	if (opts & OPT_ISMOUNTPOINT) {
- 	    check_mountpoints(&mounts, &names_head, &names_tail);
- 	}
- 
--- 
-1.9.2
-
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 5cf5e9a542d..7209c44ff3c 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -3,18 +3,15 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "psmisc-22.21";
+  name = "psmisc-23.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/psmisc/${name}.tar.gz";
-    sha256 = "0nhlm1vrrwn4a845p6y4nnnb4liq70n74zbdd5dq844jc6nkqclp";
+    url = "mirror://sourceforge/psmisc/${name}.tar.xz";
+    sha256 = "0k7hafh9388s3hh9j943jy1qk9g1c43j02nyk0xis0ngbs632lvm";
   };
 
   buildInputs = [ncurses];
 
-  # From upstream, will be in next release.
-  patches = [ ./0001-Typo-in-fuser-makes-M-on-all-the-time.patch ];
-
   meta = {
     homepage = http://psmisc.sourceforge.net/;
     description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)";
-- 
GitLab


From 9079f94df7530b2794a0aa0c032db3e3340cf2b9 Mon Sep 17 00:00:00 2001
From: Robin Stumm <serverkorken@gmail.com>
Date: Tue, 13 Jun 2017 15:27:51 +0200
Subject: [PATCH 0667/1490] exa: 2017-04-02 -> 0.6.0

---
 pkgs/tools/misc/exa/default.nix | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index c49f11a72a9..4dd49e02e0e 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }:
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }:
 
 with rustPlatform;
 
@@ -12,31 +12,28 @@ let
   };
   cargoPatch = ''
     # use non-git dependencies
-    patch -p1 <<EOF
-   --- exa-v0.4.1-src.org/Cargo.toml       1970-01-01 01:00:01.000000000 +0100
-   +++ exa-v0.4.1-src/Cargo.toml   2017-04-04 10:33:31.554377034 +0200
-   @@ -42,4 +42,4 @@
-    optional = true
-
-    [dependencies.zoneinfo_compiled]
-   -git = "https://github.com/rust-datetime/zoneinfo-compiled.git"
-   +path = "${zoneinfo_compiled}"
-EOF
+    patch Cargo.toml <<EOF
+    46c46
+    < git = "https://github.com/rust-datetime/zoneinfo-compiled.git"
+    ---
+    > path = "${zoneinfo_compiled}"
+    EOF
   '';
 in buildRustPackage rec {
-  name = "exa-unstable-2017-04-02";
+  name = "exa-${version}";
+  version = "0.6.0";
 
-  depsSha256 = "0szjba03q4iwzjzb2dp39hhz554ys4z11qdhcdq1mgxqk94scjf4";
+  depsSha256 = "0c1vyl1c67xq18ss0xs5cjdfn892jpwj6ml51dfppzfyns3namm4";
 
   src = fetchFromGitHub {
     owner = "ogham";
     repo = "exa";
-    rev = "1a6066327d2643881996946942aba530e8a1c67c";
-    sha256 = "1xrsg3zw5d3sw2bwx8g0lrs6zpk8rdrvvnknf7c9drp7rplmd8zq";
+    rev = "v${version}";
+    sha256 = "0065gj4pbbppbnwp23s6bb7zlz428nrir00d0kz7axydxk6swhyv";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
-  buildInputs = [ openssl zlib ];
+  buildInputs = [ zlib ];
 
   # Some tests fail, but Travis ensures a proper build
   doCheck = false;
@@ -60,7 +57,7 @@ in buildRustPackage rec {
       for a directory, or recursing into directories with a tree view. exa is
       written in Rust, so it’s small, fast, and portable.
     '';
-    homepage = http://bsago.me/exa;
+    homepage = http://the.exa.website;
     license = licenses.mit;
     maintainer = [ maintainers.ehegnes ];
   };
-- 
GitLab


From 30412f99304e51e8c27aa5be6d413d17c1da0ece Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 13 Jun 2017 21:37:24 +0200
Subject: [PATCH 0668/1490] rhash: fix darwin build

Fixes cmake update to 3.8.2, d74d871f52512a1f827d2dc165db685f499ce5f0
---
 pkgs/tools/security/rhash/darwin.patch | 38 ++++++++++++++++++++++++++
 pkgs/tools/security/rhash/default.nix  |  4 ++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/security/rhash/darwin.patch

diff --git a/pkgs/tools/security/rhash/darwin.patch b/pkgs/tools/security/rhash/darwin.patch
new file mode 100644
index 00000000000..76ad8fe9abd
--- /dev/null
+++ b/pkgs/tools/security/rhash/darwin.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index e40dbc3..e198b93 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@ ALLCFLAGS = -pipe $(CFLAGS) $(ADDCFLAGS) \
+   -Wbad-function-cast -Wmissing-prototypes -Wmissing-declarations
+ LDLIBRHASH = -Llibrhash -lrhash
+ ALLLDFLAGS = $(LDLIBRHASH) $(LDFLAGS) $(ADDLDFLAGS)
+-SHAREDLIB  = librhash/librhash.so.0
++SHAREDLIB  = librhash/librhash.0.dylib
+ SHRDLFLAGS = $(LDFLAGS) $(ADDLDFLAGS)
+ HEADERS = calc_sums.h hash_print.h common_func.h hash_update.h file_mask.h file_set.h find_file.h hash_check.h output.h parse_cmdline.h rhash_main.h win_utils.h version.h
+ SOURCES = calc_sums.c hash_print.c common_func.c hash_update.c file_mask.c file_set.c find_file.c hash_check.c output.c parse_cmdline.c rhash_main.c win_utils.c
+diff --git a/librhash/Makefile b/librhash/Makefile
+index 2f9bcc9..0c5aaad 100644
+--- a/librhash/Makefile
++++ b/librhash/Makefile
+@@ -28,8 +28,8 @@ PREFIX  = /usr/local
+ INCDIR  = $(PREFIX)/include
+ LIBDIR  = $(PREFIX)/lib
+ LIBRARY = librhash.a
+-SONAME  = librhash.so.0
+-SOLINK  = librhash.so
++SONAME  = librhash.0.dylib
++SOLINK  = librhash.dylib
+ TEST_TARGET = test_hashes
+ TEST_SHARED = test_shared
+ # Set variables according to GNU coding standard
+@@ -182,8 +182,7 @@ test-dll: $(DLLNAME) test_hashes.o
+ 
+ # shared and static libraries
+ $(SONAME): $(SOURCES)
+-	sed -n '1s/.*/{ global:/p; s/^RHASH_API.* \([a-z0-9_]\+\)(.*/  \1;/p; $$s/.*/local: *; };/p' $(SO_HEADERS) > exports.sym
+-	$(CC) -fpic $(ALLCFLAGS) -shared $(SOURCES) -Wl,--version-script,exports.sym,-soname,$(SONAME) $(LIBLDFLAGS) -o $@
++	$(CC) -fpic $(ALLCFLAGS) -dynamiclib $(SOURCES) $(LIBLDFLAGS) -Wl,-install_name,$(PREFIX)/lib/$@ -o $@
+ 	ln -s $(SONAME) $(SOLINK)
+ # use 'nm -Cg --defined-only $@' to view exported symbols
+ 
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 35fab64ffc8..e33c680b457 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -10,13 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "0nii6p4m2x8rkaf8r6smgfwb1q4hpf117kkg64yr6gyqgdchnljv";
   };
 
+  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
+
   installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];
 
   # we build the static library because of two makefile bugs
   # * .h files installed for static library target only
   # * .so.0 -> .so link only created in the static library install target
   buildPhase = ''
-    make lib-shared lib-static build-shared
+    make lib-shared lib-static build-shared CC=cc PREFIX=$out
   '';
 
   # we don't actually want the static library, so we remove it after it
-- 
GitLab


From 0edd78f7bc15df371fe53c3bd214915d8efd41e8 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 13 Jun 2017 22:09:48 +0200
Subject: [PATCH 0669/1490] calibre: fix missing gsettings schemas

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 5d228d264d0..49c005cf739 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite
 , makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp
-, xdg_utils, makeDesktopItem
+, xdg_utils, makeDesktopItem, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     poppler_utils libpng imagemagick libjpeg
-    fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
+    fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
   ] ++ (with python2Packages; [
     apsw cssselect cssutils dateutil lxml mechanize netifaces pillow
     python pyqt5 sip
-- 
GitLab


From 424dc0138d45c63ae7c71a0a09778dcb67aea7e3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 13 Jun 2017 22:28:05 +0200
Subject: [PATCH 0670/1490] parallel: fix broken shebangs to /usr/bin/perl

Adding perl to buildInputs accomplishes this for us automatically.
---
 pkgs/tools/misc/parallel/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 08c672b5612..8097902b0d9 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -8,11 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0afk1q8mqzz02h6imyykgi9gwk5gj08hzs6lwgd65ilj4slkh93s";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-
-  preFixup = ''
-    sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/*
+  nativeBuildInputs = [ makeWrapper perl ];
 
+  postInstall = ''
     wrapProgram $out/bin/parallel \
       ${if stdenv.isLinux then ("--prefix PATH \":\" ${procps}/bin") else ""} \
       --prefix PATH : "${perl}/bin" \
-- 
GitLab


From 2444eab485ed6631fea02577b0d21c808405fd5e Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 13 Jun 2017 22:36:08 +0200
Subject: [PATCH 0671/1490] ELK: update kibana and the elastic beats to 5.4
 (#26252)

* Add kibana5 and logstash5
* Upgrade the elastic beats to 5.4
* Make sure all elastic products use the same version
  (see elk5Version)
* Add a test for the ELK stack
---
 nixos/modules/services/logging/logstash.nix | 108 +++++++++++++++-----
 nixos/modules/services/search/kibana.nix    |  48 ++++++++-
 nixos/tests/elk.nix                         |  95 +++++++++++++++++
 nixos/tests/logstash.nix                    |  41 --------
 pkgs/development/tools/misc/kibana/5.x.nix  |  45 ++++++++
 pkgs/misc/logging/beats/default.nix         |  42 ++++++++
 pkgs/misc/logging/filebeat/default.nix      |  25 -----
 pkgs/misc/logging/heartbeat/default.nix     |  25 -----
 pkgs/misc/logging/metricbeat/default.nix    |  25 -----
 pkgs/misc/logging/packetbeat/default.nix    |  36 -------
 pkgs/servers/search/elasticsearch/5.x.nix   |   4 +-
 pkgs/tools/misc/logstash/5.x.nix            |  39 +++++++
 pkgs/top-level/all-packages.nix             |  23 +++--
 13 files changed, 363 insertions(+), 193 deletions(-)
 create mode 100644 nixos/tests/elk.nix
 delete mode 100644 nixos/tests/logstash.nix
 create mode 100644 pkgs/development/tools/misc/kibana/5.x.nix
 create mode 100644 pkgs/misc/logging/beats/default.nix
 delete mode 100644 pkgs/misc/logging/filebeat/default.nix
 delete mode 100644 pkgs/misc/logging/heartbeat/default.nix
 delete mode 100644 pkgs/misc/logging/metricbeat/default.nix
 delete mode 100644 pkgs/misc/logging/packetbeat/default.nix
 create mode 100644 pkgs/tools/misc/logstash/5.x.nix

diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index c9477b9e3ab..b4abd2cd7e5 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -4,17 +4,46 @@ with lib;
 
 let
   cfg = config.services.logstash;
+  atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4";
   pluginPath = lib.concatStringsSep ":" cfg.plugins;
   havePluginPath = lib.length cfg.plugins > 0;
   ops = lib.optionalString;
-  verbosityFlag = {
-    debug = "--debug";
-    info  = "--verbose";
-    warn  = ""; # intentionally empty
-    error = "--quiet";
-    fatal = "--silent";
-  }."${cfg.logLevel}";
-
+  verbosityFlag =
+    if atLeast54
+    then "--log.level " + cfg.logLevel
+    else {
+      debug = "--debug";
+      info  = "--verbose";
+      warn  = ""; # intentionally empty
+      error = "--quiet";
+      fatal = "--silent";
+    }."${cfg.logLevel}";
+
+  pluginsPath =
+    if atLeast54
+    then "--path.plugins ${pluginPath}"
+    else "--pluginpath ${pluginPath}";
+
+  logstashConf = pkgs.writeText "logstash.conf" ''
+    input {
+      ${cfg.inputConfig}
+    }
+
+    filter {
+      ${cfg.filterConfig}
+    }
+
+    output {
+      ${cfg.outputConfig}
+    }
+  '';
+
+  logstashSettingsYml = pkgs.writeText "logstash.yml" cfg.extraSettings;
+
+  logstashSettingsDir = pkgs.runCommand "logstash-settings" {inherit logstashSettingsYml;} ''
+    mkdir -p $out
+    ln -s $logstashSettingsYml $out/logstash.yml
+  '';
 in
 
 {
@@ -45,6 +74,15 @@ in
         description = "The paths to find other logstash plugins in.";
       };
 
+      dataDir = mkOption {
+        type = types.str;
+        default = "/var/lib/logstash";
+        description = ''
+          A path to directory writable by logstash that it uses to store data.
+          Plugins will also have access to this path.
+        '';
+      };
+
       logLevel = mkOption {
         type = types.enum [ "debug" "info" "warn" "error" "fatal" ];
         default = "warn";
@@ -116,6 +154,19 @@ in
         '';
       };
 
+      extraSettings = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Extra Logstash settings in YAML format.";
+        example = ''
+          pipeline:
+            batch:
+              size: 125
+              delay: 5
+        '';
+      };
+
+
     };
   };
 
@@ -123,31 +174,34 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
+    assertions = [
+      { assertion = atLeast54 -> !cfg.enableWeb;
+        message = ''
+          The logstash web interface is only available for versions older than 5.4.
+          So either set services.logstash.enableWeb = false,
+          or set services.logstash.package to an older logstash.
+        '';
+      }
+    ];
+
     systemd.services.logstash = with pkgs; {
       description = "Logstash Daemon";
       wantedBy = [ "multi-user.target" ];
       environment = { JAVA_HOME = jre; };
       path = [ pkgs.bash ];
       serviceConfig = {
-        ExecStart =
-          "${cfg.package}/bin/logstash agent " +
-          "-w ${toString cfg.filterWorkers} " +
-          ops havePluginPath "--pluginpath ${pluginPath} " +
-          "${verbosityFlag} " +
-          "-f ${writeText "logstash.conf" ''
-            input {
-              ${cfg.inputConfig}
-            }
-
-            filter {
-              ${cfg.filterConfig}
-            }
-
-            output {
-              ${cfg.outputConfig}
-            }
-          ''} " +
-          ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}";
+        ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"'';
+        ExecStart = concatStringsSep " " (filter (s: stringLength s != 0) [
+          "${cfg.package}/bin/logstash"
+          (ops (!atLeast54) "agent")
+          "-w ${toString cfg.filterWorkers}"
+          (ops havePluginPath pluginsPath)
+          "${verbosityFlag}"
+          "-f ${logstashConf}"
+          (ops atLeast54 "--path.settings ${logstashSettingsDir}")
+          (ops atLeast54 "--path.data ${cfg.dataDir}")
+          (ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}")
+        ]);
       };
     };
   };
diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
index d377a6feeb8..9d7d2d79918 100644
--- a/nixos/modules/services/search/kibana.nix
+++ b/nixos/modules/services/search/kibana.nix
@@ -5,7 +5,11 @@ with lib;
 let
   cfg = config.services.kibana;
 
-  cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
+  atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4";
+
+  cfgFile = if atLeast54 then cfgFile5 else cfgFile4;
+
+  cfgFile4 = pkgs.writeText "kibana.json" (builtins.toJSON (
     (filterAttrsRecursive (n: v: v != null) ({
       host = cfg.listenAddress;
       port = cfg.port;
@@ -36,6 +40,27 @@ let
       ];
     } // cfg.extraConf)
   )));
+
+  cfgFile5 = pkgs.writeText "kibana.json" (builtins.toJSON (
+    (filterAttrsRecursive (n: v: v != null) ({
+      server.host = cfg.listenAddress;
+      server.port = cfg.port;
+      server.ssl.certificate = cfg.cert;
+      server.ssl.key = cfg.key;
+
+      kibana.index = cfg.index;
+      kibana.defaultAppId = cfg.defaultAppId;
+
+      elasticsearch.url = cfg.elasticsearch.url;
+      elasticsearch.username = cfg.elasticsearch.username;
+      elasticsearch.password = cfg.elasticsearch.password;
+
+      elasticsearch.ssl.certificate = cfg.elasticsearch.cert;
+      elasticsearch.ssl.key = cfg.elasticsearch.key;
+      elasticsearch.ssl.certificateAuthorities = cfg.elasticsearch.certificateAuthorities;
+    } // cfg.extraConf)
+  )));
+
 in {
   options.services.kibana = {
     enable = mkEnableOption "enable kibana service";
@@ -96,11 +121,29 @@ in {
       };
 
       ca = mkOption {
-        description = "CA file to auth against elasticsearch.";
+        description = ''
+          CA file to auth against elasticsearch.
+
+          It's recommended to use the <option>certificateAuthorities</option> option
+          when using kibana-5.4 or newer.
+        '';
         default = null;
         type = types.nullOr types.path;
       };
 
+      certificateAuthorities = mkOption {
+        description = ''
+          CA files to auth against elasticsearch.
+
+          Please use the <option>ca</option> option when using kibana &lt; 5.4
+          because those old versions don't support setting multiple CA's.
+
+          This defaults to the singleton list [ca] when the <option>ca</option> option is defined.
+        '';
+        default = if isNull cfg.elasticsearch.ca then [] else [ca];
+        type = types.listOf types.path;
+      };
+
       cert = mkOption {
         description = "Certificate file to auth against elasticsearch.";
         default = null;
@@ -118,6 +161,7 @@ in {
       description = "Kibana package to use";
       default = pkgs.kibana;
       defaultText = "pkgs.kibana";
+      example = "pkgs.kibana5";
       type = types.package;
     };
 
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
new file mode 100644
index 00000000000..65ff1cac070
--- /dev/null
+++ b/nixos/tests/elk.nix
@@ -0,0 +1,95 @@
+# Test the ELK stack: Elasticsearch, Logstash and Kibana.
+
+import ./make-test.nix ({ pkgs, ...} :
+let
+  esUrl = "http://localhost:9200";
+in {
+  name = "ELK";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ eelco chaoflow offline basvandijk ];
+  };
+
+  nodes = {
+    one =
+      { config, pkgs, ... }: {
+          # Not giving the machine at least 2060MB results in elasticsearch failing with the following error:
+          #
+          #   OpenJDK 64-Bit Server VM warning:
+          #     INFO: os::commit_memory(0x0000000085330000, 2060255232, 0)
+          #     failed; error='Cannot allocate memory' (errno=12)
+          #
+          #   There is insufficient memory for the Java Runtime Environment to continue.
+          #   Native memory allocation (mmap) failed to map 2060255232 bytes for committing reserved memory.
+          #
+          # When setting this to 2500 I got "Kernel panic - not syncing: Out of
+          # memory: compulsory panic_on_oom is enabled" so lets give it even a
+          # bit more room:
+          virtualisation.memorySize = 3000;
+
+          # For querying JSON objects returned from elasticsearch and kibana.
+          environment.systemPackages = [ pkgs.jq ];
+
+          services = {
+            logstash = {
+              enable = true;
+              package = pkgs.logstash5;
+              inputConfig = ''
+                exec { command => "echo -n flowers" interval => 1 type => "test" }
+                exec { command => "echo -n dragons" interval => 1 type => "test" }
+              '';
+              filterConfig = ''
+                if [message] =~ /dragons/ {
+                  drop {}
+                }
+              '';
+              outputConfig = ''
+                file {
+                  path => "/tmp/logstash.out"
+                  codec => line { format => "%{message}" }
+                }
+                elasticsearch {
+                  hosts => [ "${esUrl}" ]
+                }
+              '';
+            };
+
+            elasticsearch = {
+              enable = true;
+              package = pkgs.elasticsearch5;
+            };
+
+            kibana = {
+              enable = true;
+              package = pkgs.kibana5;
+              elasticsearch.url = esUrl;
+            };
+          };
+        };
+    };
+
+  testScript = ''
+    startAll;
+
+    $one->waitForUnit("elasticsearch.service");
+
+    # Continue as long as the status is not "red". The status is probably
+    # "yellow" instead of "green" because we are using a single elasticsearch
+    # node which elasticsearch considers risky.
+    #
+    # TODO: extend this test with multiple elasticsearch nodes and see if the status turns "green".
+    $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_cluster/health' | jq .status | grep -v red");
+
+    # Perform some simple logstash tests.
+    $one->waitForUnit("logstash.service");
+    $one->waitUntilSucceeds("cat /tmp/logstash.out | grep flowers");
+    $one->waitUntilSucceeds("cat /tmp/logstash.out | grep -v dragons");
+
+    # See if kibana is healthy.
+    $one->waitForUnit("kibana.service");
+    $one->waitUntilSucceeds("curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green");
+
+    # See if logstash messages arive in elasticsearch.
+    $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0");
+    $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0");
+  '';
+})
diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix
deleted file mode 100644
index 01f6a0358b2..00000000000
--- a/nixos/tests/logstash.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-# This test runs logstash and checks if messages flows and
-# elasticsearch is started.
-
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "logstash";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ eelco chaoflow offline ];
-  };
-
-  nodes = {
-    one =
-      { config, pkgs, ... }:
-        {
-          services = {
-            logstash = {
-              enable = true;
-              inputConfig = ''
-                exec { command => "echo flowers" interval => 1 type => "test" }
-                exec { command => "echo dragons" interval => 1 type => "test" }
-              '';
-              filterConfig = ''
-                if [message] =~ /dragons/ {
-                  drop {}
-                }
-              '';
-              outputConfig = ''
-                stdout { codec => rubydebug }
-              '';
-            };
-          };
-        };
-    };
-
-  testScript = ''
-    startAll;
-
-    $one->waitForUnit("logstash.service");
-    $one->waitUntilSucceeds("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep flowers");
-    $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons");
-  '';
-})
diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix
new file mode 100644
index 00000000000..4a4fc3e214f
--- /dev/null
+++ b/pkgs/development/tools/misc/kibana/5.x.nix
@@ -0,0 +1,45 @@
+{ stdenv, makeWrapper, fetchurl, elk5Version, nodejs, coreutils, which }:
+
+with stdenv.lib;
+let
+  inherit (builtins) elemAt;
+  archOverrides = {
+    "i686" = "x86";
+  };
+  info = splitString "-" stdenv.system;
+  arch = (elemAt info 0);
+  elasticArch = archOverrides."${arch}" or arch;
+  plat = elemAt info 1;
+  shas = {
+    "x86_64-linux"  = "1g5i81wq77fk6pyaq3rpfqs2m23xsbz2cndh3rg4b59ibg5qv0sq";
+    "i686-linux"    = "0pxnpg3g8l6hy8qz404kbkk5rd9y65jrzd0y9j8wr5fd4pqs7vgv";
+    "x86_64-darwin" = "0pffl2hbck3s271jlzdibp5698djm5fdvj15w2knm815rs2kfbl5";
+  };
+in stdenv.mkDerivation rec {
+  name = "kibana-${version}";
+  version = elk5Version;
+
+  src = fetchurl {
+    url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${elasticArch}.tar.gz";
+    sha256 = shas."${stdenv.system}" or (throw "Unknown architecture");
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/libexec/kibana $out/bin
+    mv * $out/libexec/kibana/
+    rm -r $out/libexec/kibana/node
+    makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
+    sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
+  '';
+
+  meta = {
+    description = "Visualize logs and time-stamped data";
+    homepage = http://www.elasticsearch.org/overview/kibana;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ offline rickynils ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix
new file mode 100644
index 00000000000..d4c78389e66
--- /dev/null
+++ b/pkgs/misc/logging/beats/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, elk5Version, buildGoPackage, libpcap }:
+
+let beat = package : extraArgs : buildGoPackage (rec {
+      name = "${package}-${version}";
+      version = elk5Version;
+
+      src = fetchFromGitHub {
+        owner = "elastic";
+        repo = "beats";
+        rev = "v${version}";
+        sha256 = "1if16sqbhgxc7ahn9pak8av9rq9l8ldk44hr4w4g7lhxnqhmhsji";
+      };
+
+      goPackagePath = "github.com/elastic/beats";
+
+      subPackages = [ package ];
+
+      meta = with stdenv.lib; {
+        homepage = https://www.elastic.co/products/beats;
+        license = licenses.asl20;
+        maintainers = with maintainers; [ fadenb basvandijk ];
+        platforms = platforms.linux;
+      };
+    } // extraArgs);
+in {
+  filebeat   = beat "filebeat"   {meta.description = "Lightweight shipper for logfiles";};
+  heartbeat  = beat "heartbeat"  {meta.description = "Lightweight shipper for uptime monitoring";};
+  metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";};
+  packetbeat = beat "packetbeat" {
+    buildInputs = [ libpcap ];
+    meta.description = "Network packet analyzer that ships data to Elasticsearch";
+    meta.longDescription = ''
+      Packetbeat is an open source network packet analyzer that ships the
+      data to Elasticsearch.
+
+      Think of it like a distributed real-time Wireshark with a lot more
+      analytics features. The Packetbeat shippers sniff the traffic between
+      your application processes, parse on the fly protocols like HTTP, MySQL,
+      PostgreSQL, Redis or Thrift and correlate the messages into transactions.
+    '';
+  };
+}
diff --git a/pkgs/misc/logging/filebeat/default.nix b/pkgs/misc/logging/filebeat/default.nix
deleted file mode 100644
index c33f34c6dc4..00000000000
--- a/pkgs/misc/logging/filebeat/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
-
-buildGoPackage rec {
-  name = "filebeat-${version}";
-  version = "5.2.2";
-
-  src = fetchFromGitHub {
-    owner = "elastic";
-    repo = "beats";
-    rev = "v${version}";
-    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
-  };
-
-  goPackagePath = "github.com/elastic/beats";
-
-  subPackages = [ "filebeat" ];
-
-  meta = with stdenv.lib; {
-    description = "Lightweight shipper for logfiles";
-    homepage = https://www.elastic.co/products/beats;
-    license = licenses.asl20;
-    maintainers = [ maintainers.fadenb ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/logging/heartbeat/default.nix b/pkgs/misc/logging/heartbeat/default.nix
deleted file mode 100644
index faa558589f2..00000000000
--- a/pkgs/misc/logging/heartbeat/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
-
-buildGoPackage rec {
-  name = "heartbeat-${version}";
-  version = "5.2.2";
-
-  src = fetchFromGitHub {
-    owner = "elastic";
-    repo = "beats";
-    rev = "v${version}";
-    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
-  };
-
-  goPackagePath = "github.com/elastic/beats";
-
-  subPackages = [ "heartbeat" ];
-
-  meta = with stdenv.lib; {
-    description = "Lightweight shipper for uptime monitoring";
-    homepage = https://www.elastic.co/products/beats;
-    license = licenses.asl20;
-    maintainers = [ maintainers.fadenb ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/logging/metricbeat/default.nix b/pkgs/misc/logging/metricbeat/default.nix
deleted file mode 100644
index fcb2376a93d..00000000000
--- a/pkgs/misc/logging/metricbeat/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
-
-buildGoPackage rec {
-  name = "metricbeat-${version}";
-  version = "5.2.2";
-
-  src = fetchFromGitHub {
-    owner = "elastic";
-    repo = "beats";
-    rev = "v${version}";
-    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
-  };
-
-  goPackagePath = "github.com/elastic/beats";
-
-  subPackages = [ "metricbeat" ];
-
-  meta = with stdenv.lib; {
-    description = "Lightweight shipper for metrics";
-    homepage = https://www.elastic.co/products/beats;
-    license = licenses.asl20;
-    maintainers = [ maintainers.fadenb ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/logging/packetbeat/default.nix b/pkgs/misc/logging/packetbeat/default.nix
deleted file mode 100644
index d4445bec998..00000000000
--- a/pkgs/misc/logging/packetbeat/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, libpcap }:
-
-buildGoPackage rec {
-  name = "packetbeat-${version}";
-  version = "5.2.2";
-
-  src = fetchFromGitHub {
-    owner = "elastic";
-    repo = "beats";
-    rev = "v${version}";
-    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
-  };
-
-  goPackagePath = "github.com/elastic/beats";
-
-  subPackages = [ "packetbeat" ];
-
-  buildInputs = [ libpcap ];
-
-  meta = with stdenv.lib; {
-    description = "Network packet analyzer that ships data to Elasticsearch";
-    longDescription = ''
-      Packetbeat is an open source network packet analyzer that ships the
-      data to Elasticsearch.
-
-      Think of it like a distributed real-time Wireshark with a lot more
-      analytics features. The Packetbeat shippers sniff the traffic between
-      your application processes, parse on the fly protocols like HTTP, MySQL,
-      PostgreSQL, Redis or Thrift and correlate the messages into transactions.
-    '';
-    homepage = https://www.elastic.co/products/beats;
-    license = licenses.asl20;
-    maintainers = [ maintainers.fadenb ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
index 030c4730f38..512337cf382 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
+{ stdenv, fetchurl, elk5Version, makeWrapper, jre, utillinux, getopt }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "5.4.0";
+  version = elk5Version;
   name = "elasticsearch-${version}";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix
new file mode 100644
index 00000000000..13387b5c1a9
--- /dev/null
+++ b/pkgs/tools/misc/logstash/5.x.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, elk5Version, makeWrapper, jre  }:
+
+stdenv.mkDerivation rec {
+  version = elk5Version;
+  name = "logstash-${version}";
+
+  src = fetchurl {
+    url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
+    sha256 = "019bhsnbbbg1a4g9jf02j3jb1xhhmrr3i7882s5l4pmkyn1d3gd1";
+  };
+
+  dontBuild         = true;
+  dontPatchELF      = true;
+  dontStrip         = true;
+  dontPatchShebangs = true;
+
+  buildInputs = [
+    makeWrapper jre
+  ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r {Gemfile*,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
+
+    wrapProgram $out/bin/logstash \
+       --set JAVA_HOME "${jre}"
+
+    wrapProgram $out/bin/logstash-plugin \
+       --set JAVA_HOME "${jre}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
+    homepage    = https://www.elastic.co/products/logstash;
+    license     = licenses.asl20;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.wjlroe maintainers.offline ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea00365659d..5f838d3156c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -667,6 +667,12 @@ with pkgs;
 
   bchunk = callPackage ../tools/cd-dvd/bchunk { };
 
+  inherit (callPackages ../misc/logging/beats { })
+    filebeat
+    heartbeat
+    metricbeat
+    packetbeat;
+
   bfr = callPackage ../tools/misc/bfr { };
 
   bibtool = callPackage ../tools/misc/bibtool { };
@@ -968,8 +974,6 @@ with pkgs;
 
   fastJson = callPackage ../development/libraries/fastjson { };
 
-  filebeat = callPackage ../misc/logging/filebeat { };
-
   filebench = callPackage ../tools/misc/filebench { };
 
   fsmon = callPackage ../tools/misc/fsmon { };
@@ -1018,8 +1022,6 @@ with pkgs;
 
   gti = callPackage ../tools/misc/gti { };
 
-  heartbeat = callPackage ../misc/logging/heartbeat { };
-
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
   hexio = callPackage ../development/tools/hexio { };
@@ -1050,8 +1052,6 @@ with pkgs;
 
   meson = callPackage ../development/tools/build-managers/meson { };
 
-  metricbeat = callPackage ../misc/logging/metricbeat { };
-
   mp3fs = callPackage ../tools/filesystems/mp3fs { };
 
   mpdcron = callPackage ../tools/audio/mpdcron { };
@@ -1732,6 +1732,9 @@ with pkgs;
 
   evemu = callPackage ../tools/system/evemu { };
 
+  # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
+  elk5Version = "5.4.0";
+
   elasticsearch = callPackage ../servers/search/elasticsearch { };
   elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
   elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };
@@ -2625,7 +2628,8 @@ with pkgs;
 
   keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
 
-  kibana = callPackage ../development/tools/misc/kibana { };
+  kibana  = callPackage ../development/tools/misc/kibana { };
+  kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { };
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };
 
@@ -2685,7 +2689,8 @@ with pkgs;
 
   lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
 
-  logstash = callPackage ../tools/misc/logstash { };
+  logstash  = callPackage ../tools/misc/logstash { };
+  logstash5 = callPackage ../tools/misc/logstash/5.x.nix { };
 
   logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { };
 
@@ -3500,8 +3505,6 @@ with pkgs;
     nix = nixUnstable;
   };
 
-  packetbeat = callPackage ../misc/logging/packetbeat { };
-
   packetdrill = callPackage ../tools/networking/packetdrill { };
 
   pakcs = callPackage ../development/compilers/pakcs {};
-- 
GitLab


From 3b1c4fce4fc18cd8ce51fc895527ecfa273d2761 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Tue, 23 May 2017 17:56:00 -0400
Subject: [PATCH 0672/1490] psensor: init at 1.2.0

psensor is a graphical hardware monitoring application for Linux
---
 .../os-specific/linux/nvidia-x11/settings.nix | 41 ++++++++++++++++---
 pkgs/tools/system/psensor/default.nix         | 33 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/system/psensor/default.nix

diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index 9c8f3f9cd74..ddc190a08e6 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -1,19 +1,44 @@
 nvidia_x11: sha256:
 
-{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau
+{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libvdpau, libXext
 , librsvg, wrapGAppsHook
 , withGtk2 ? false, withGtk3 ? true
 }:
 
-stdenv.mkDerivation rec {
-  name = "nvidia-settings-${nvidia_x11.version}";
-  inherit (nvidia_x11) version;
-
+let
   src = fetchurl {
-    url = "https://download.nvidia.com/XFree86/nvidia-settings/${name}.tar.bz2";
+    url = "https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${nvidia_x11.version}.tar.bz2";
     inherit sha256;
   };
 
+  libXNVCtrl = stdenv.mkDerivation {
+    name = "libXNVCtrl-${nvidia_x11.version}";
+    inherit (nvidia_x11) version;
+    inherit src;
+
+    buildInputs = [ libXrandr libXext ];
+
+    preBuild = ''
+      cd src/libXNVCtrl
+    '';
+
+    installPhase = ''
+      mkdir -p $out/lib
+      mkdir -p $out/include/NVCtrl
+
+      cp libXNVCtrl.a $out/lib
+      cp NVCtrl.h     $out/include/NVCtrl
+      cp NVCtrlLib.h  $out/include/NVCtrl
+    '';
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "nvidia-settings-${nvidia_x11.version}";
+  inherit (nvidia_x11) version;
+  inherit src;
+
   nativeBuildInputs = [ pkgconfig m4 ];
 
   buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus ]
@@ -52,6 +77,10 @@ stdenv.mkDerivation rec {
       $out/bin/$binaryName
   '';
 
+  passthru = {
+    inherit libXNVCtrl;
+  };
+
   meta = with stdenv.lib; {
     homepage = "http://www.nvidia.com/object/unix.html";
     description = "Settings application for NVIDIA graphics cards";
diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix
new file mode 100644
index 00000000000..b62bb92564c
--- /dev/null
+++ b/pkgs/tools/system/psensor/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, fetchurl, pkgconfig, lm_sensors, libgtop, libatasmart, gtk3
+, libnotify, udisks2, libXNVCtrl, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  name = "psensor-${version}";
+
+  version = "1.2.0";
+
+  src = fetchurl {
+    url = "http://wpitchoune.net/psensor/files/psensor-${version}.tar.gz";
+    sha256 = "1smbidbby4rh14jnh9kn7y64qf486aqnmyxcgacjvkz27cqqnw4r";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+  buildInputs = [
+    lm_sensors libgtop libatasmart gtk3 libnotify udisks2
+  ];
+
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include"
+    NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib"
+  '';
+
+  meta = with lib; {
+    description = "Graphical hardware monitoring application for Linux";
+    homepage = "https://wpitchoune.net/psensor/";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f838d3156c..56769470689 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3768,6 +3768,10 @@ with pkgs;
 
   psutils = callPackage ../tools/typesetting/psutils { };
 
+  psensor = callPackage ../tools/system/psensor {
+    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
+  };
+
   pv = callPackage ../tools/misc/pv { };
 
   pwgen = callPackage ../tools/security/pwgen { };
-- 
GitLab


From fd2976bb20afed977fee27562b7454abbc402121 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 14 Jun 2017 10:22:31 +0800
Subject: [PATCH 0673/1490] syncthing: 0.14.29 -> 0.14.30

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 87018c1e08e..e0ba43986e3 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }:
 
 stdenv.mkDerivation rec {
-  version = "0.14.29";
+  version = "0.14.30";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "01q0xlixjvmzs0acrg54b07fp68sa5axh1wb4lz25mmxfjl04v1d";
+    sha256 = "14f2v8i8ga9vii015vbx70k1vd85ac0ygykz2z614ii932g5lfdr";
   };
 
   buildInputs = [ go removeReferencesTo ];
-- 
GitLab


From 89b1d4cbe2fe1f57cbf3397dbe885982adf6553c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 13 Jun 2017 21:17:13 -0300
Subject: [PATCH 0674/1490] greybird: 3.22.3 -> 3.22.4

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

diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
index 515b8fc712a..b1e104b7c3e 100644
--- a/pkgs/misc/themes/greybird/default.nix
+++ b/pkgs/misc/themes/greybird/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "greybird";
-  version = "3.22.3";
+  version = "3.22.4";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "${pname}";
     rev = "v${version}";
-    sha256 = "0hz8q2sf2kcxixzw088rny6zmhfls5z49zlhm8m9013wph799a8c";
+    sha256 = "1xh6vi4rmxmkrgy9qskcl8q6014qnsn19xjjwbmwf8n6yr07scl3";
   };
 
   nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];
-- 
GitLab


From 773cc7c03d8f3579453b155abb5045062dbb9ea5 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@gmail.com>
Date: Tue, 13 Jun 2017 20:55:38 +0200
Subject: [PATCH 0675/1490] pythonPackages.hug: Disable on python2

Hug is only supported on python3.
---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 87c469c937f..55128c4aaa4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11191,6 +11191,7 @@ in {
       url = "mirror://pypi/h/hug/${name}.tar.gz";
       sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c";
     };
+    disabled = !isPy3k;
 
     propagatedBuildInputs = with self; [ falcon requests ];
 
-- 
GitLab


From cc0ce6b7a61976c9ea517d12daf62505365c0b8a Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 14 Jun 2017 08:32:42 +0200
Subject: [PATCH 0676/1490] rofi-pass: 1.4.3 -> 1.5.0

---
 pkgs/tools/security/pass/rofi-pass.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix
index 165091d934a..2f3fab6de81 100644
--- a/pkgs/tools/security/pass/rofi-pass.nix
+++ b/pkgs/tools/security/pass/rofi-pass.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "rofi-pass-${version}";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "carnager";
     repo = "rofi-pass";
     rev = version;
-    sha256 = "09wpkxg5b7xicdisgbhlfr8vs1iv7z9sc58pjl0p198yap57khq5";
+    sha256 = "08chbn966140p3gmgalkhhm01ym64fvb6d2w5mbwpyl0986m89ba";
   };
 
   buildInputs = [ makeWrapper ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A script to make rofi work with password-store";
     homepage = https://github.com/carnager/rofi-pass;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ the-kenny garbas ];
     license = stdenv.lib.licenses.gpl3;
     platforms = with stdenv.lib.platforms; linux;
   };
-- 
GitLab


From 537944ea77d100a56345df449d9a05622f5b949d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 14 Jun 2017 09:19:51 +0100
Subject: [PATCH 0677/1490] gajim: 0.16.7 -> 0.16.8

---
 .../networking/instant-messengers/gajim/default.nix |  9 +++++----
 .../instant-messengers/gajim/fix-tests.patch        | 13 +++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 1228804f5b9..a21a82848e0 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -25,13 +25,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.16.7";
+  version = "0.16.8";
 
   src = fetchurl {
     name = "${name}.tar.bz2";
     url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?"
         + "ref=${name}";
-    sha256 = "18srrsswq09i54gcqqy0ylmrix1rrq43f0b8sz1lijr39h3ayw3j";
+    sha256 = "009cpzqh4zy7hc9pq3r5m4lgagwawhjab13rjzavb0n9ggijcscb";
   };
 
   patches = let
@@ -42,11 +42,12 @@ stdenv.mkDerivation rec {
       #  sha256 = "<replace-with-sha256>";
       #};
     };
-  in mapAttrsToList (name: { rev, sha256 }: fetchurl {
+  in (mapAttrsToList (name: { rev, sha256 }: fetchurl {
     name = "gajim-${name}.patch";
     url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff";
     inherit sha256;
-  }) cherries;
+  }) cherries)
+    ++ [./fix-tests.patch]; # https://dev.gajim.org/gajim/gajim/issues/8660
 
   postPatch = ''
     sed -i -e '0,/^[^#]/ {
diff --git a/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch
new file mode 100644
index 00000000000..cb866bb2d73
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gajim/fix-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common/gajim.py b/src/common/gajim.py
+index 4a5d884b6..95d401b67 100644
+--- a/src/common/gajim.py
++++ b/src/common/gajim.py
+@@ -415,7 +415,7 @@ def get_jid_from_account(account_name, full=False):
+     jid = name + '@' + hostname
+     if full:
+         resource = connections[account_name].server_resource
+-        jid += '/' + resource
++        jid += '/' + str(resource)
+     return jid
+ 
+ def get_our_jids():
-- 
GitLab


From 9cad7076d1bc5475a857fd2c6e9a56d9ed254252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 14 Jun 2017 10:33:37 +0200
Subject: [PATCH 0678/1490] Fix #26441: avoid infinite recursion

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

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 53772b90dfb..fbc586bd74c 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 { buildInputs ? []
 , extraArgs ? []
 , LD_LIBRARY_PATH ? []
-, ghc ? ghc
+, ghc' ? ghc
 , ...
 }@args:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation (args // {
   buildInputs =
     buildInputs ++
     optional stdenv.isLinux glibcLocales ++
-    [ ghc pkgconfig ];
+    [ ghc' pkgconfig ];
 
   STACK_PLATFORM_VARIANT="nix";
   STACK_IN_NIX_SHELL=1;
-- 
GitLab


From 3803864ca61b7737e3b6be843fc8e09598ce4bda Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 14 Jun 2017 10:57:38 +0200
Subject: [PATCH 0679/1490] thefuck: init at 3.18 (#26529)

---
 nixos/modules/module-list.nix       |  1 +
 nixos/modules/programs/thefuck.nix  | 31 +++++++++++++++++++++++++++++
 pkgs/tools/misc/thefuck/default.nix | 27 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 4 files changed, 61 insertions(+)
 create mode 100644 nixos/modules/programs/thefuck.nix
 create mode 100644 pkgs/tools/misc/thefuck/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 13924f7e507..bdede1726a1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -99,6 +99,7 @@
   ./programs/spacefm.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
+  ./programs/thefuck.nix
   ./programs/tmux.nix
   ./programs/venus.nix
   ./programs/vim.nix
diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
new file mode 100644
index 00000000000..433a0ca95fe
--- /dev/null
+++ b/nixos/modules/programs/thefuck.nix
@@ -0,0 +1,31 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.thefuck;
+in
+  {
+    options = {
+      programs.thefuck = {
+        enable = mkEnableOption "thefuck";
+
+        alias = mkOption {
+          default = "fuck";
+          type = types.string;
+
+          description = ''
+            `thefuck` needs an alias to be configured.
+            The default value is `fuck`, but you can use anything else as well.
+          '';
+        };
+      };
+    };
+
+    config = mkIf cfg.enable {
+      environment.systemPackages = with pkgs; [ thefuck ];
+      environment.shellInit = ''
+        eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
+      '';
+    };
+  }
diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix
new file mode 100644
index 00000000000..00fde7acafb
--- /dev/null
+++ b/pkgs/tools/misc/thefuck/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, stdenv, pkgs, ... }:
+
+pkgs.pythonPackages.buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "thefuck";
+  version = "3.18";
+
+  src = fetchurl {
+    url = "https://github.com/nvbn/${pname}/archive/${version}.tar.gz";
+    sha256 = "1xsvkqh89rgxq5w03mnlcfkn9y39nfwhb2pjabjspcc2mi2mq5y6";
+  };
+
+  propagatedBuildInputs = with pkgs.pythonPackages; [
+    psutil
+    colorama
+    six
+    decorator
+    pathlib2
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/nvbn/thefuck";
+    description = "Magnificent app which corrects your previous console command.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56769470689..ccfdcb9385b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4342,6 +4342,8 @@ with pkgs;
 
   thc-hydra = callPackage ../tools/security/thc-hydra { };
 
+  thefuck = callPackage ../tools/misc/thefuck { };
+
   thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools {  };
 
   tiled = libsForQt5.callPackage ../applications/editors/tiled { };
-- 
GitLab


From f6fbbabcb70a19428a7adde2e4f1ec477c439654 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Wed, 14 Jun 2017 11:26:39 +0200
Subject: [PATCH 0680/1490] pythonPackages.django: 1.11.1 -> 1.11.2 (#26557)

Bugfix release.
See https://docs.djangoproject.com/en/1.11/releases/1.11.2/
---
 pkgs/development/python-modules/django/1_11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index 0845352fba1..f0035095b04 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -5,13 +5,13 @@
 buildPythonPackage rec {
   pname = "Django";
   name = "${pname}-${version}";
-  version = "1.11.1";
+  version = "1.11.2";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
-    sha256 = "131swdygapgrnkicvksqf904gkrfvljcrsqq8z82rvzf4bwgvkmv";
+    sha256 = "05q6bgm3vkdqg72i1m1z8bp2jdrm9n1c37aka1brwkyzh820fnrw";
   };
 
   patches = [
-- 
GitLab


From 79dd4deda5a5ee44359a88cdcbbc22a15ba26224 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 14 Jun 2017 11:29:31 +0200
Subject: [PATCH 0681/1490] Ultrastar (#26524)

* ultrastardx-beta: init at 1.3.5

* libbass, libbass_fx: init at 24

* ultrastar-creator: init at 2017-04-12

* buildSupport/plugins.nix: add diffPlugins

Helper function to compare expected plugin lists to the found plugins.

* ultrastar-manager: init at 2017-05-24

The plugins are built in their own derivations, speeding up (re-)compilation.
The `diffPlugins` function from `beets` is reused to test for changes in the
plugin list on updates.

* beets: switch to diffPlugins

The function is basically just extracted for better reusability.
---
 pkgs/build-support/plugins.nix                |  29 +++++
 .../libraries/audio/libbass/default.nix       |  59 +++++++++
 .../ultrastardx/{default.nix => 1.1.nix}      |   0
 pkgs/games/ultrastardx/1.3-beta.nix           |  49 +++++++
 pkgs/tools/audio/beets/default.nix            |  11 +-
 pkgs/tools/misc/ultrastar-creator/default.nix |  41 ++++++
 pkgs/tools/misc/ultrastar-manager/default.nix | 121 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  15 ++-
 8 files changed, 315 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/build-support/plugins.nix
 create mode 100644 pkgs/development/libraries/audio/libbass/default.nix
 rename pkgs/games/ultrastardx/{default.nix => 1.1.nix} (100%)
 create mode 100644 pkgs/games/ultrastardx/1.3-beta.nix
 create mode 100644 pkgs/tools/misc/ultrastar-creator/default.nix
 create mode 100644 pkgs/tools/misc/ultrastar-manager/default.nix

diff --git a/pkgs/build-support/plugins.nix b/pkgs/build-support/plugins.nix
new file mode 100644
index 00000000000..bf8a982a88f
--- /dev/null
+++ b/pkgs/build-support/plugins.nix
@@ -0,0 +1,29 @@
+{ stdenv }:
+# helper functions for packaging programs with plugin systems
+{
+
+  /* Takes a list of expected plugin names
+   * and compares it to the found plugins given in the file,
+   * one plugin per line.
+   * If the lists differ, the build fails with a nice message.
+   *
+   * This is helpful to ensure maintainers don’t miss
+   * the addition or removal of a plugin.
+   */
+  diffPlugins = expectedPlugins: foundPluginsFilePath: ''
+     # sort both lists first
+     plugins_expected=$(mktemp)
+     (${stdenv.lib.concatMapStrings (s: "echo \"${s}\";") expectedPlugins}) \
+       | sort -u > "$plugins_expected"
+     plugins_found=$(mktemp)
+     sort -u "${foundPluginsFilePath}" > "$plugins_found"
+
+     if ! mismatches="$(diff -y "$plugins_expected" "$plugins_found")"; then
+       echo "The the list of expected plugins (left side) doesn't match" \
+           "the list of plugins we found (right side):" >&2
+       echo "$mismatches" >&2
+       exit 1
+     fi
+   '';
+
+}
diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix
new file mode 100644
index 00000000000..dedfa5ceb35
--- /dev/null
+++ b/pkgs/development/libraries/audio/libbass/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, unzip, fetchurl, writeText }:
+
+let
+  version = "24";
+
+  allBass = {
+    bass = {
+      h = "bass.h";
+      so = {
+        i686_linux = "libbass.so";
+        x86_64-linux = "x64/libbass.so";
+      };
+      urlpath = "bass${version}-linux.zip";
+      sha256 = "1a2z9isabkymz7qmkgklbjpj2wxkvv1cngfp9aj0c9178v97pjd7";
+    };
+
+    bass_fx = {
+      h = "C/bass_fx.h";
+      so = {
+        i686_linux = "libbass_fx.so";
+        x86_64-linux = "x64/libbass_fx.so";
+      };
+      urlpath = "z/0/bass_fx${version}-linux.zip";
+      sha256 = "0j1cbq88j3vnqf2bibcqnfhciz904w48ldgycyh9d8954hwyg22m";
+    };
+  };
+
+  dropBass = name: bass: stdenv.mkDerivation {
+    name = "lib${name}-${version}";
+
+    src = fetchurl {
+      url = "https://www.un4seen.com/files/${bass.urlpath}";
+      inherit (bass) sha256;
+    };
+    unpackCmd = ''
+      mkdir out
+      ${unzip}/bin/unzip $curSrc -d out
+    '';
+
+    lpropagatedBuildInputs = [ unzip ];
+    dontBuild = true;
+    installPhase =
+      let so =
+            if bass.so ? ${stdenv.system} then bass.so.${stdenv.system}
+            else abort "${name} not packaged for ${stdenv.system} (yet).";
+      in ''
+        mkdir -p $out/{lib,include}
+        install -m644 -t $out/lib/ ${so}
+        install -m644 -t $out/include/ ${bass.h}
+      '';
+
+    meta = with stdenv.lib; {
+      description = "Shareware audio library";
+      homepage = https://www.un4seen.com/;
+      license = licenses.unfreeRedistributable;
+    };
+  };
+
+in stdenv.lib.mapAttrs dropBass allBass
diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/1.1.nix
similarity index 100%
rename from pkgs/games/ultrastardx/default.nix
rename to pkgs/games/ultrastardx/1.1.nix
diff --git a/pkgs/games/ultrastardx/1.3-beta.nix b/pkgs/games/ultrastardx/1.3-beta.nix
new file mode 100644
index 00000000000..ca7d6b35a21
--- /dev/null
+++ b/pkgs/games/ultrastardx/1.3-beta.nix
@@ -0,0 +1,49 @@
+{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig
+, lua, fpc, pcre, portaudio, freetype, libpng
+, SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf
+, ffmpeg, sqlite, zlib, libX11, mesa }:
+
+let
+  sharedLibs = [
+    pcre portaudio freetype
+    SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf
+    sqlite lua zlib libX11 mesa ffmpeg
+  ];
+
+in stdenv.mkDerivation rec {
+  name = "ultrastardx-${version}";
+  version = "1.3.5-beta";
+  src = fetchFromGitHub {
+    owner = "UltraStar-Deluxe";
+    repo = "USDX";
+    rev = "v${version}";
+    sha256 = "0qp64qsj29a08cbv3i52jm1w2pcklw6ya5sniycs24zxggza5pkn";
+  };
+
+  buildInputs = [
+    pkgconfig autoreconfHook
+    fpc libpng
+  ] ++ sharedLibs;
+
+  postPatch = ''
+    # autoconf substitutes strange things otherwise
+    substituteInPlace src/config.inc.in \
+      --subst-var-by libpcre_LIBNAME libpcre.so.1
+  '';
+
+  preBuild = with stdenv.lib;
+    let items = concatMapStringsSep " " (x: "-rpath ${getLib x}/lib") sharedLibs;
+    in ''
+      export NIX_LDFLAGS="$NIX_LDFLAGS ${items}"
+    '';
+
+  # dlopened libgcc requires the rpath not to be shrinked
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://ultrastardx.sourceforge.net/;
+    description = "Free and open source karaoke game";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ profpatsch ];
+  };
+}
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index c1418d152dd..35b4557a33c 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, writeScript, glibcLocales
+{ stdenv, fetchFromGitHub, writeScript, glibcLocales, diffPlugins
 , pythonPackages, imagemagick, gobjectIntrospection, gst_all_1
 
 , enableAcousticbrainz ? true
@@ -158,20 +158,13 @@ in pythonPackages.buildPythonApplication rec {
   doCheck = true;
 
   preCheck = ''
-    (${concatMapStrings (s: "echo \"${s}\";") allPlugins}) \
-      | sort -u > plugins_defined
     find beetsplug -mindepth 1 \
       \! -path 'beetsplug/__init__.py' -a \
       \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \
       | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \
       | sort -u > plugins_available
 
-    if ! mismatches="$(diff -y plugins_defined plugins_available)"; then
-      echo "The the list of defined plugins (left side) doesn't match" \
-           "the list of available plugins (right side):" >&2
-      echo "$mismatches" >&2
-      exit 1
-    fi
+     ${diffPlugins allPlugins "plugins_available"}
   '';
 
   checkPhase = ''
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
new file mode 100644
index 00000000000..0700c43b26e
--- /dev/null
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub
+, qmakeHook, qtbase, makeQtWrapper
+, pkgconfig, taglib, libbass, libbass_fx }:
+
+stdenv.mkDerivation rec {
+  name = "ultrastar-creator-${version}";
+  version = "2017-04-12";
+
+  src = fetchFromGitHub {
+    owner = "UltraStar-Deluxe";
+    repo = "UltraStar-Creator";
+    rev = "ac519a003f8283bfbe5e2d8e9cdff3a3faf97001";
+    sha256 = "00idr8a178gvmylq722n13bli59kpxlsy5d8hlplqn7fih48mnzi";
+  };
+
+  postPatch = with stdenv.lib; ''
+    # we don’t want prebuild binaries checked into version control!
+    rm -rf lib include
+    sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \
+        -e 's|-L".*unix"||' \
+        -e "/QMAKE_POST_LINK/d" \
+        -e "s|../include/bass|${getLib libbass}/include|g" \
+        -e "s|../include/bass_fx|${getLib libbass_fx}/include|g" \
+        -e "s|../include/taglib|${getLib taglib}/include|g" \
+        -i src/UltraStar-Creator.pro
+  '';
+
+  preConfigure = ''
+    cd src
+  '';
+
+  nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
+  buildInputs = [ qtbase taglib libbass libbass_fx ];
+
+  meta = with stdenv.lib; {
+    description = "Ultrastar karaoke song creation tool";
+    homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ profpatsch ];
+  };
+}
diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
new file mode 100644
index 00000000000..61b2c6aaa22
--- /dev/null
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -0,0 +1,121 @@
+{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmakeHook, diffPlugins
+, qtbase, qtmultimedia, makeQtWrapper
+, taglib, libmediainfo, libzen, libbass }:
+
+let
+  version = "2017-05-24";
+  rev = "eed5dc41c849ab29b2dee37d97852fffdb45e390";
+  sha256 = "1ymdgaffazndg9vhh47qqjr5873ld7j066hycp670r08bm519ysg";
+  buildInputs = [ qtbase qtmultimedia taglib libmediainfo libzen libbass ];
+
+  plugins = [
+    "albumartex"
+    "amazon"
+    "audiotag"
+    "cleanup"
+    "freecovers"
+    "lyric"
+    "preparatory"
+    "rename"
+ ];
+
+  patchedSrc =
+    let src = fetchFromGitHub {
+      owner = "UltraStar-Deluxe";
+      repo = "UltraStar-Manager";
+      inherit rev sha256;
+    };
+    in stdenv.mkDerivation {
+      name = "${src.name}-patched";
+      inherit src;
+      phases = [ "unpackPhase" "patchPhase" ];
+
+      patchPhase = with stdenv.lib; ''
+        # we don’t want prebuild binaries checked into version control!
+        rm -rf lib include
+
+        # fix up main project file
+        sed -e 's|-L.*unix.*lbass.*$|-lbass|' \
+            -e "/QMAKE_POST_LINK/d" \
+            -e "s|../include/bass|${getLib libbass}/include|g" \
+            -e "s|../include/taglib|${getLib taglib}/include|g" \
+            -e "s|../include/mediainfo|${getLib libmediainfo}/include|g" \
+            -i src/UltraStar-Manager.pro
+
+        # if more plugins start depending on ../../../include,
+        # it should be abstracted out for all .pro files
+        sed -e "s|../../../include/taglib|${getLib taglib}/include/taglib|g" \
+            -i src/plugins/audiotag/audiotag.pro
+
+        mkdir $out
+        mv * $out
+      '';
+    };
+
+  patchApplicationPath = file: path: ''
+    sed -e "s|QCore.*applicationDirPath()|QString(\"${path}\")|" -i "${file}"
+  '';
+
+  buildPlugin = name: stdenv.mkDerivation {
+    name = "ultrastar-manager-${name}-plugin-${version}";
+    src = patchedSrc;
+
+    buildInputs = [ qmakeHook ] ++ buildInputs;
+
+    postPatch = ''
+      sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \
+          -i src/plugins/${name}/${name}.pro
+
+      # plugins use the application’s binary folder (wtf)
+      for f in $(grep -lr "QCoreApplication::applicationDirPath" src/plugins); do
+        ${patchApplicationPath "$f" "\$out"}
+      done
+
+    '';
+    preConfigure = ''
+      cd src/plugins/${name}
+    '';
+  };
+
+  builtPlugins =
+    symlinkJoin {
+      name = "ultrastar-manager-plugins-${version}";
+      paths = map buildPlugin plugins;
+    };
+
+in stdenv.mkDerivation {
+  name = "ultrastar-manager-${version}";
+  src = patchedSrc;
+
+  postPatch = ''
+    sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \
+        -i src/UltraStar-Manager.pro
+    # patch plugin manager to point to the collected plugin folder
+    ${patchApplicationPath "src/plugins/QUPluginManager.cpp" builtPlugins}
+  '';
+
+  buildPhase = ''
+    find -path './src/plugins/*' -prune -type d -print0 \
+      | xargs -0 -i'{}' basename '{}' \
+      | sed -e '/shared/d' \
+      > found_plugins
+    ${diffPlugins plugins "found_plugins"}
+
+    cd src && qmake && make
+  '';
+
+  # is not installPhase so that qt post hooks can run
+  preInstall = ''
+    make install
+  '';
+
+  nativeBuildInputs = [ makeQtWrapper pkgconfig ];
+  inherit buildInputs;
+
+  meta = with stdenv.lib; {
+    description = "Ultrastar karaoke song manager";
+    homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ profpatsch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccfdcb9385b..cbe2a9bfc5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -98,6 +98,8 @@ with pkgs;
     inherit (haskellPackages) dhall-nix;
   };
 
+  diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins;
+
   dockerTools = callPackage ../build-support/docker { };
 
   docker_compose = pythonPackages.docker_compose;
@@ -8325,6 +8327,9 @@ with pkgs;
     inherit (ocamlPackages_4_02) bap ocaml findlib ctypes;
   };
 
+  libbass = (callPackage ../development/libraries/audio/libbass { }).bass;
+  libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx;
+
   libbluedevil = callPackage ../development/libraries/libbluedevil { };
 
   libbdplus = callPackage ../development/libraries/libbdplus { };
@@ -17327,7 +17332,15 @@ with pkgs;
 
   ultimatestunts = callPackage ../games/ultimatestunts { };
 
-  ultrastardx = callPackage ../games/ultrastardx {
+  ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { };
+
+  ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
+
+  ultrastardx = callPackage ../games/ultrastardx/1.1.nix {
+    ffmpeg = ffmpeg_0;
+    lua = lua5;
+  };
+  ultrastardx-beta = callPackage ../games/ultrastardx/1.3-beta.nix {
     ffmpeg = ffmpeg_0;
     lua = lua5;
   };
-- 
GitLab


From 264ec9242fa36b5990851af589d05f7ad32c6387 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 13 Jun 2017 21:14:12 +0900
Subject: [PATCH 0682/1490] flashplayer: 25.0.0.171 -> 26.0.0.126

---
 .../networking/browsers/chromium/plugins.nix         |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------
 .../mozilla-plugins/flashplayer/standalone.nix       | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 3de495ae327..01f4b03e4ca 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "25.0.0.171";
+    version = "26.0.0.126";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0g2955wybwqlcgslm0mfi0jdnpih1w10lkzm5g5am4smgpch8prs";
+      sha256 =  "17ivhkdkbnzxr10ln1ix30k1hmaak5p9zzcchdyrjxdpzfk5qq7s";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 69fdb285d6f..5936c86c1cc 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "25.0.0.171";
+  version = "26.0.0.126";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_npapi_linux_debug.${arch}.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_npapi_linux_debug.${arch}.tar.gz"
       else
         "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0rm7kdb8h1pf9z2sl3lv8siyizz3dw4fyfmizn48622nsfh13dzd"
+          "0i5rr8bymbdzwqpns854i2r9390av89v1ikh8msincczq5vpj012"
         else
-          "1akvvya0jn708ifmrf4pbpp3dpi10i3mgyld46275lcwpz8xhyw5"
+          "1mzq3wvq6rxqfdlapd0b1ymw7389414jxwhkd6wk3677qdhr1y42"
       else
         if arch == "x86_64" then
-          "1r6cr00ax590jgjfp20wya67gkpw6cw0dgb9ixvlxnld4wi4mzk0"
+          "0684kizzfwfzaj0i54cdlkx3fqb3kyhb9jw88n031bjrzv7ddiz7"
         else
-          "1x326qihprq59s70szf0yh96p78mbnkw41lhar71128nv91mnfc3";
+          "1pn15wnldabacmahlqdsl8nd60982j77bghjlf2cdc7drysby3ns";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 94f6d8bf26c..e29af0eaf4e 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,19 +55,19 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "25.0.0.171";
+  version = "26.0.0.126";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux_debug.x86_64.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux_debug.x86_64.tar.gz"
       else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz";
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "1llvglydsqp5r9f903bzn8i09zg6rcka7lzxlhb8xi0gbw4imsv2"
+        "17s55b1ncjj0hnldjmxm133z0i4jf49wbh4sn1cfwrw6xrhgbkiw"
       else
-        "1sx20mgja17hi6zp5ygqg4sklp5h0h55j3jw5b759j9c2x1frq5g";
+        "02j98ji2jw2sxrs9hhlkkdrhpf2c4hc336cfvqzdf1iajza5was8";
   };
 
   nativeBuildInputs = [ unzip ];
-- 
GitLab


From 6cf604828568f0594db75daae39498f055c1a01f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Jun 2017 21:10:49 +0900
Subject: [PATCH 0683/1490] firefox-bin: 53.0.3 -> 54.0

---
 .../browsers/firefox-bin/release_sources.nix  | 756 +++++++++---------
 1 file changed, 383 insertions(+), 373 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 44066161448..7bc97b093a4 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,935 +1,945 @@
 {
-  version = "53.0.3";
+  version = "54.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ach/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ach/firefox-54.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "3ed2b420a4e9e1d05c4fc8750f0f426283a8c10ef914a163ed203ce65368bdaf11191151a17b0a5efcf80f7fc5ca5d910fd58e7afabe650328792aae36e1ab52";
+      sha512 = "d6ba946848d9e771def1a4cf28a7a43c3dca0d6f1bed0a51c6ebeaef59fc8df808c8cc9bd8d016c2ce9e21e8dee35989ed6575f6047735a7ebe62e75f68fbefe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/af/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/af/firefox-54.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "e3fd2b922d6371ac4908dad8a18ab5fc2a331f6f07b369bcd25465f958c6425a61a737b20b490a59cd27484fde718ebe5139c8fa5149ea48d4a47d7149d7ee28";
+      sha512 = "23564ab7f741ed5eccc2178a5fa3f72941bc843dbd0ad4f265467cf6fe6fb3afe65238d9026a5dc036e91aa0fcc32c8aa8a56d9d514df9c02642fa61c00360ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/an/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/an/firefox-54.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "ead664ef262bccfed1326f55df271afdcbcbd1e172dd413c0488b2590a22ee8ba828d4e78df77ce7df3310b0e6e64cc446775093efa858baacee88f5a986901c";
+      sha512 = "22c2ff25acc8b573fa975ad0a002cc1babda188c60635c75a618d8ec008a14c79d62bec4a432a3b18b11cf38836a70c62156aa7f6991fac50f744ab5141ad52b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ar/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ar/firefox-54.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "a4a50be0ddf294f11f083956583c0ad2e2475a77d9f7d93669ef0fa9b81c11a3bbb3ac3531b213ebbc0be1ab68dd8c9ccdb1d6308eca91b48de9bd5712ac90ed";
+      sha512 = "8ebb9385e8a988c5c1215030833b694300df4f6415b592059fc286fd2b8ddc5e2b7b3e0ed09514c4b97cbeb96d6b463a1105b70f9a7a18833ff4142b4de01661";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/as/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/as/firefox-54.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "93260ffc4f050ac7731771e07b84b749e7dfa1b5ae44daf9e2149e794220911805837f56a47777debb5dd321a50295723e9c6289f02045db949a1e5bc773a3da";
+      sha512 = "2c51fed49a6be6f8162a8b67a851d8ce5ddc438a7c10dbb77cd3ab3d839d7737839ee0104d8a11dad8ed98923346d7658305ab291b8843e87a653f33fe342a60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ast/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ast/firefox-54.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "f55ef36a1985d30852b84b6fe0255534c1d425e54dbfdb8a50c538869cad59f8a9089f0129dfe61f9c2f834c560050233c9ba87638846eb833d112516273c54b";
+      sha512 = "a2d9c266dadc87aa7c3a0d57b31b4dc28ae674fb19a6ceafbf936f6fcb7ee86eda5f2ff2ad52b1567376aaf637c77bbcfcae62b8c526c62c2d7ebc87c8a2501b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/az/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/az/firefox-54.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "0e07ad2848c0c2f45fa7cbaaa80ccc505458766dcaff7cb9bbd060c1a05bcf6b1ca85e602a78cb6cb6b57b95c7b49df374021a2ac429a4e8f99d2b08864ab215";
+      sha512 = "af5617504e53c360a9b1a2d40dc9231d3518115f3d8149e9e7aff8eabed4d1c86467d3634c8c2278e7e10039952feca0513a62934e52645410aa85069123efaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bg/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bg/firefox-54.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "a1d253a65f790faf026dc4431fc090677a001697d575c172270228abddf29a3574d2a30f519938b1a950b2f3a3bfba8efc5218fea90e5a9d11c158a8d1dd6491";
+      sha512 = "2f13be1e976b02769e1c47ea1dfee7e8bc940c524c4881daeffe10500d7fcc662f00273156699ba37d82fe4f52dded2e2b34cba1caa22fa6fb9184d4ed7d2ea5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bn-BD/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bn-BD/firefox-54.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "1a5dbe0fc52a8daf5c13b055b1cb12bf7eff5b5ca6715abe78b6ef1093efcdb3744fc268955d62258a7580b2bd363435bdb289f9db5c91eff294736b272b20f2";
+      sha512 = "c4f9f249788df7e10fc226cd10ba8d4638743b65b46cc87b97460e7e551cff8d814a93ba41da294f409b032fdc05b19ab9774a09d6b62458a1ab695805757dd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bn-IN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bn-IN/firefox-54.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "487fc98d5a1b15344287e8088053c43a81633ac4a6b567c41fd4b15886a02830e12dfa98c673f1076ab5b90e1e7ceae924e28415913a6cfefe6599915177c17f";
+      sha512 = "bb6d4dfe207bd7fb018a6a473ac1c3c63d13e4c4aeb152174579c85a29b503d382c02df420028f1b98335fbef5ccb1a712e72cf0eca889f841e3b45a30d98db3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/br/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/br/firefox-54.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "37bca2e9f120ab1a491ca318e0440a3704b4b1c7d01c7704af5ac3a32295b0896e9944a8c41e01b6b4a7bf08093fa947376f69103abefd568d3bc4a78991958c";
+      sha512 = "1c8c98dded57330c5008cff959da2fb23808aec2397b0b5d2b9dd2b190c73e113d9b599ab243e500dcf94aa81f3497f91b205067de2d0f766a1d801bc2f9fb76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/bs/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bs/firefox-54.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "0f2b0572d5f77d046a095e89e0a449015ecf0bb6a4ca38573fe20aa2ab2971c7f5f38a7efc5ddddb84cff5758c4b62928f369f037841485d16dc79e1c660b233";
+      sha512 = "89e51b99c1386567a09a78927945f1a7157064d34b3b0f8972893be491fe04033da92a68690a9d81ee9578f1b35af34eb57cea29a403b1d399f8dd50934bb24b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ca/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ca/firefox-54.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "2380f8a53e96bd7ac2b366eea27483d181c347bfdec3ffdda9e31b487bf93a1ae80d950cb5321c6c76bc8808e03feb0d3eeaa466f6168c7f4db5cd358076ec28";
+      sha512 = "650f81422fa74dee6d12db5e3e66056ffdad669c110633b796e59c7fddbac96e042f4e4eb11c2146f3f4f9625ce9e283aa4309aa8e6f814567be8c5a3bece3e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/cak/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cak/firefox-54.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "df86bac5a6fd67c3bedb9a04ba1f1de27090f58dda3a0e1b5a5d23569e610d1d16a1bbc5c9d1d068d73d6ab0f87f24d819293189dcf1e562e58772f63ee7a11a";
+      sha512 = "9b76e8827814e487b4d240a77b2c5bf9900bc0476073bbe9e7d0f7f90120906021b33e74ee92677deb33c84a5eb11c4fd4cc81a330140b8f5f0002795ca6ef81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/cs/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cs/firefox-54.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "6d17878babeeea65e7eb2b32c44b13700b2a294eb75116e98e9b4603c921614cb5278142cbafdbbdac5948f33e5381ee266933beb53bba1cf76152a60c402808";
+      sha512 = "9c450275e7b8abad2e2cd96a4cc4b97deab479d30540687227802084890e33b69dad96a0389f43fc49dccf86269b3830f35ec810cc87d92b3e0642c71bf3b6f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/cy/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cy/firefox-54.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "9088b69d9bcad59215fd64905ada085f9b5f27c850e73174bccc9b6beb99d7423d1b688a36e82dc4fb4923e1fe3624ac2039175a08389f1a3459b856ab762f9f";
+      sha512 = "aa6f96cc78054703f474a2a386fa4d76604e9f38c682647d27f987013225244e0e62e23523132fbad2ec021c5795f23c3fdccd76c43f560882581a2847205705";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/da/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/da/firefox-54.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "4333533bc2496b5059dbd0d727de207419008d5e1a45855504e602d7351d27419abf0a82b56004a35fe6c104370c44eaf52d240943641a07bc281d23f3294fa0";
+      sha512 = "c4270c94ea2a9d864ec7b19b94279c9f260afb99c3c70d6b5a2cd24d3cf05a709dcf5b14f977a197f0460a33ba5f0f70311a4d581f1e21dce863182e8213d961";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/de/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/de/firefox-54.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "8962dd969b0f6e4c03d52dd222cd1307d838ef5e03d938852e11ed3ba0df4578f1fdcce0ab560772d1b3810982b011fae9846bb93f723be1103686012447141a";
+      sha512 = "e254eaa1fce2385fc7fb564b8342529b23b9004156104e35da963fe166cbdf89f1079a966e818bd57386def6436c4894fca4de7876e31452763e66ea7aa74968";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/dsb/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/dsb/firefox-54.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "b33a1fe8f235d6522345bbbbcca791036236c6ceee16d42883830048f866b1bd816d4f065350cda7fc7be2f0bb8bad1a37c455ac3353b8db7aa80e8bb3921c30";
+      sha512 = "f1c13a53ee4a86d3e88020babd3cbabc4be84595f51d7060be531d3f02a4eadd0db398b17539b877dd1de3c9b29bbec21a810c42bd430421c66d1e9d4e17b346";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/el/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/el/firefox-54.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ff32cf67e9d5e424fe318fbefae5c10fca855f8105b3a0ced52a4a894b76731fd8e581ee9835d5424e3a08aefdbb4024fc94f02dbaa1ba6beeea0e07dd67e22f";
+      sha512 = "3449ea6101a16f78e0f36a4fe85b993f70b5e77e6e7bf2a30dd2a2f1dec85af5627681825d0ee2cc47feae1b22d979257b77b59d61371c5cac7a27b90f9cd1ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/en-GB/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-GB/firefox-54.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "863336e62c3ef2e99babb2bd08a57b29097a9b7fd8a9b5a790bb7002a6a6f7cdc29d921783845271b7602af6a40c8905c3b075551f0a5e73887177417887770b";
+      sha512 = "01f521f407cceefe3f8ea432fb66f8f554791c9f5ba5bedc9eff08039c02c637af5e725e3cf9e9b74b7c071d8479472a4abf7e9ecae8cc85188dfa5fced9a1d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/en-US/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-US/firefox-54.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "57d31466390e60d45a77ba2b41a78bafc17d22c4258d184252993a9a1ce9334988cdcda45fcec43afd23f13db5438d04d795e6da383434e434c1b426c2f53362";
+      sha512 = "96e4f085134296203e4c42db570e9b38e61e08766966d71ef6863bb695ff80f37c1839f44a1bb1257ba35fe9fcec9f403c1e259e93147d54cf2b8a4561c0cfae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/en-ZA/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-ZA/firefox-54.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "3283d2a67baca3e552a1c7507e4ec3d36679c61501773d1ca2c8d7e972a864c59f24ba29895e0ccd11eca0ad335f4a47ffb5e6bc2f1282c451d1b34aa306ea0e";
+      sha512 = "5789e07d2b90f63aafcce9ba8ef8469a420ac03fb4b98f3bab19d7bf51a37b7796215f0cb5614e3dc490d3724dd01f3dbfa26030659b66ea9390fb452d3dac49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/eo/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/eo/firefox-54.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "a708cd2f3bbdabd87a07d957db31dc2fa7bb873f50f0139b5feca2d95b9ad1424ea0c809d194dd38cc0c33170be34dd4ddcb1fc1da52d91bfb1006d066b4688a";
+      sha512 = "c76ecdce017ffe7688383295155687a30034461affaa405ad37e477ef634f7c6dd0f9e07594aeae3f9a61fa5698346f9970fa8effdfec55d9fdc95e5ed67d66b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-AR/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-AR/firefox-54.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ef930196f23ef40dffef2bfe9772ee65306497019200b8932865bd03f2053069c02a08bf4857bc291e7d3d6597dba7e90c82a15cb33eb99d2818a1ce5390879b";
+      sha512 = "f993cbbdeb2a8a065f827a4eb4152b3537af84fb95d0876dd363b1c04cd57634c2b24466e2a03432ee29e1615e7b5d1bd13ba20f844b347f0f9efe504d48efa9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-CL/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-CL/firefox-54.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "6f16598409eee0b14c98185d764d691c31f1da63a66e0be70261227d5c7739010964b54ca42dd3aabce0ae82448a6839b8abdf5794a5bed621dab269a3ff5866";
+      sha512 = "75557b6731be41d435a0e962117a01c078f36a1d385816a05e15dc3c0148d89c7901af7471da64ded327972d9e73a50e49668b7b3b30c89e2b6aea2068b35ed7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-ES/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-ES/firefox-54.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "6e6a5f74d26cb0b53a53e1a600ecf34efeeb79f56d36747116e11ab25a63c4b48bab7c7d57b2cc8748297a1b106671367b4ed463f56978a4142f830cf1a2ed9f";
+      sha512 = "1aadd468b2328379b7958a5ede8f9658f4521ab877ca86e7e2bb7ff04a13294b5e0f6be510068fecb94603d4f81c5f51584db308711043f0bde36ce72723417c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/es-MX/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-MX/firefox-54.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "3b5eb1e55060caa77c86e56ff11d89435b816e2ae0b42c3059be5c0f50f3e4d3ed6e818386cd0ae75d00fb0e6541df0c3d3cdb313237d504df48667818f3a204";
+      sha512 = "de5e95e50b7f04572f7812bd4cff5a724dd32b9ccc389eb61eb258fde4dff651df7ad0fcee78f78692413e73381b1711cfd80200be66d4b1c5e87a5cbe19da42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/et/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/et/firefox-54.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "7d1bd7e1fafdb2f58c09ea30bfc52ab233ef744465163fb39c59b2481090c1e3d3ed6d2beab304aa6d2784ee4240c7c9f13cbea787ceb505ae7be369669d785c";
+      sha512 = "0889d3884a01e6e69f67197f1b86bae4fc506064fdb40c082e9b9892e4b42d9f13f61d41cc55063b9d4fa51f45b96f5ed7c8a50070b9af4b8e9be94e7aea73ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/eu/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/eu/firefox-54.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "f8829234556a6fbacddc2e5702c9ece833414eb480421e6a6820ac854377b5d9a7f704fe8e9f793b09598695e8cfd256bd0dab357c81d6530a2d7fdc1934afbe";
+      sha512 = "353e2230c1bedea7b805a2ada15ab863591b92c9a8bfa0e47464fb0d0f2f2601d086a71679dc5c1f560bfa6ae9bc428026eeb88a0d8a2b04318d38c8183ccb9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fa/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fa/firefox-54.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "40016acde4a5cea189fbe1abad75851e054b69d1446216fddb553151732466f48a93443d377b989e0092cb01276a45cee56436fab5275fac84f4dceff3f93225";
+      sha512 = "e09d1adfba848d46e55102c0e5c366237d9e273646a82a03609fe70c13e38ae28f5029515e8656d1a0634574dddd557f9427bc26b8d5b2fce1d873a3cb2a69c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ff/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ff/firefox-54.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "5eec968da6bac4064562309c3253d2e57999399f241d9e59c83284fb6fb35e0619180e1c41d1e39c9741037d3419d6ff7fb2560d2c5c1b1eea33d56494d52d1f";
+      sha512 = "cc998af1b778a4c9688001ac139f1018d723bea35cb6149ef16516998f46f0f9addec295d2b377ff1f47d26bef27722b9300b28d5dd5f1eb860816b279c7cba9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fi/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fi/firefox-54.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f90b091a238398259972884fc759c48d5aba51b4879dd70595139202119eb8982a51d3c6c38ef5efcd1c7774a27dbdfe95243e7f22ae62c510c41131c77d4c07";
+      sha512 = "e976095a009d5a51439d6fbdf81e84679c1a1d7ad2db4fc027cf52b4a8c9fa188fe337d0d08cb42d415a2132b8a38dd03698e3fa53605db221c781025c1a0437";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fr/firefox-54.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "18772c36b65bfbb383b1b953e2505275bfce8096278ef9d0ea31d421368bf5d71d48b61b15c0c1de603439a584656870292abe46a37a3a1e6a6630b759fa7c4f";
+      sha512 = "7d3346a00e4ea36d438f4ac42bb840ae070cae87a68a773d63319b06308a25650c3a69d97631f30552ff53ba992389ef1d5e62781bf5eb257a9286eb66f15afb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/fy-NL/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fy-NL/firefox-54.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "3cde666bb2f708450e094a20d452ce4b5f1e69f345bde017c2d61bdd5dbf90172caf2f4f27f2dfae3a68fb27edf11beb0152fbaab981d36d34e0fc96b9b09801";
+      sha512 = "39e670e2f5e6956bce1ca4c8b4fcef4893e47c102988880ba546b91e5055fe9438c6c8cedf69aae922d64af0ce427f6fa66456bcbd907a75be7e4360cd86d2f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ga-IE/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ga-IE/firefox-54.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "02324de8476db9c5d64aa04e7e034856495833f01b115e1ea8a9063b778e74e19350f9352f1c0d544837ca7970b871525d28785af54057064fdee9018eae1d38";
+      sha512 = "a6815ecf3c1660aa7fe9c32ef3335ed4227649545bf5316aefaf1767559604b282412d2541a0be266121a75fea770790ea419d91359a97e25d9fd31334fe8532";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gd/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gd/firefox-54.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "d08c084011c92b161245587d1c01870332bc82c3f032dd2198849f1a87eb31eeab6daba435193cbc2ccf9086e0a3008a9ab50c5a938260ae7c14730f60608d8d";
+      sha512 = "9d7a273e3717d21eb2316fc073f4270ec904a9182fc4a2b8b5fb01b90bda20f63a9886b427ae7fe5b3ac0107c7a1316578f42b2ff85fc3b9baa3721d1616e11c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gl/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gl/firefox-54.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "fb9cc6fc39708c04d7581879977de4f4070f7766e8050889302d9cd0c4faaf0b25dfc41f46f7ee380f416bda55deba0b7f9e6baf69a8d9abb643d60ab009d57a";
+      sha512 = "bbcf4690ed439d3214ccd2387b4fde5b5252b2039dad168b67f5103ec0407fe040bf263185e54b360e0c9875b972827937a6a634cd928d817e09b10c7cc50103";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gn/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gn/firefox-54.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "b836aed3b5fa3cc5fd4675753b090305d195bdce97de29865eba72e7f5faacb5ba21b0646d9766f5545151650157e4bd5a6e0a6f43c6fb452ee590fef886ffc0";
+      sha512 = "cf82a08458e6182ec8c320e5dab4e1629b86efc6f68c26b967fc646d91bc8f3a394849de50c4f960df75bdc88b884c8b59181238302262e864eeca60181c285f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/gu-IN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gu-IN/firefox-54.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "2c2325aa1f52d3e5ca639d95f76fd7671805c5402ae9b943f416260184bc03fe087f2186f21b935e12c0669720bbad3aeada2286a6c77f06ff76c0663b86954f";
+      sha512 = "3b1c8246364405574c4ce064969b69704141cb8fda339d1064c3e1499563f5ea2fd5b3749077aaa6fae1cc98c610ac0fafc1e0129e49f064f3603e2e6097f81e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/he/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/he/firefox-54.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c00eea318d9e96e3da14b815f0dfd75aaf196aa2623dc7732ff6dedd911329445b4eb2d2ee2fb0004a68f461c15210c2b1f867d41ecc808bba21cd5db7cbd790";
+      sha512 = "3171dd501918aad9a612a679d9f0ca2c682b5e4f49b5249ac74890df6e8e98520afb724791f9c610c90135623c414e8da667e1e4777c1fb6a6e4b52495a9d905";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hi-IN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hi-IN/firefox-54.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "f301e9983fc30107dad8ba206ba0ade4a24d845395333bf7faeffb1eaf688a5854798ade11692326e14a7107d407542199cf3db4903c2fbcb3a20bca29e31e0a";
+      sha512 = "cb72f0f30d029968a80ea775661dddd255d7c3520895c3241e5f309c6fe52399fef4f7b904009237ee047ad16fe6e893fd008fdfde852b39dff2878de454df45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hr/firefox-54.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "931681f57455ef67512d5f68a8c0b2284314dbff1e7f5aefc7d08048ff4efc083158daf6c4b41310943063d91afcf15f952b1b3a743ba18158b9a88290751b2d";
+      sha512 = "7a4a9989416fb270a861b2ca5738ddecae4fd28d050cae482f096b9b8d497e4109687eb3f1f7f5bec52fc5255a11c9248564677896e803dafc260d2460573618";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hsb/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hsb/firefox-54.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "840e9c919251be5f31d692ceb111272611c7f4b468304b643580b0b4b12baa54b1a2e2f208369013854f145bf747aa326e4f2767534e49c27e62ccbe626bf8d8";
+      sha512 = "33e1ac831c8aa44675b76259ee90836db8c6dc22c012a1235aa3b4f8715b59a47a5afe73f7f2cd0d160f4026799d2ed8635a289c17fd8424edbc8e3f7e4aae2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hu/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hu/firefox-54.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "05b04d6ee4ce2c0999397471eda64305afe5f5c4d714a404f5ed98f6298d77599cb7c10225e876559a790cb37984db5a3a1fa31f3db83adb04f505f46eca9704";
+      sha512 = "357c9ef51cf8c55b0b651f6208afe47caa3972e59183d4cbd9173c4825f6b1a1a831bd148455078bc2899732e094eeb6997954465311a04ffdd52a1add5d90c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/hy-AM/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hy-AM/firefox-54.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "3696cba2a380c8d0b1a2c116dfac8dc3c3afb9f28e0ba5f03b07b52f23c52d5b6fce293b3c83d8ed041df3a2f4f9c387113753387e1ff94a2854d09284a322e5";
+      sha512 = "0baf66276422e646dc0085ace17b0ce6c9da5ce690d78388c2d8658cf79837658bbba045d2fc98a50c8d0f3b8f6895889687605c458fae1f1f7894e880dae2dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/id/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/id/firefox-54.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "fda5ebc2e4e0aff27a3ed719fa9caaca3d622221b9288d4075e3964fccbb3efca312f0cb7c36090474d3296aca6944967ba9fce7446c9bc33d82c5518ad182f4";
+      sha512 = "658bef583f93bbc91c2a1f4106987e0099089f88d6537c23f6cf53757cba8886b2b59175a6b99b4abeeb6462b59951cd4fe15feaa69d73e9948e91246f3c1119";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/is/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/is/firefox-54.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "4c106cce385024290a02953f793caa5f28b65b9a2369ee9644d64d3f547d0c4fb6a9e4fd4f2a03337b8c29e5559c1df7bec9f6138b74fb199a0b259fe599b493";
+      sha512 = "63eba83cc9c8d601c8916d1fe5ad2fc08f9177334df66f299deaa1a25bd15c61656e7f22c68db4717928c75d6e2efb9127e818da631c24432a106e255afcd695";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/it/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/it/firefox-54.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "bdf7c1f37b60ba514ff5098917f82dcdcd96a871bc546f9aa951153e8c633fd218411a2c10481c6d0f1a02b22db10b51751ea9c5a954155ee7fcc43e2e160b63";
+      sha512 = "0adbc77efaaf4f666f650bfaaa0371aaed517c172086e9c6977b4e44a7eb359f460cbdf52293151cb7aa44461cd1f0867e35b30845d544279b95c93911f3082c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ja/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ja/firefox-54.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "09b741a0edd5608f96a5309167a5fb082c004fc2c7ca6ab2a9ddf8133d106563a942cd3763966623f2e98407375987071f8fe05e8132fbb28fe68589e6c1ffe3";
+      sha512 = "3b4b6a3428c2eb5a733807e659c5de44f4731a39c5e18845851b9d5f5b812ca86ef9bb0100218fa6a158f0da5094b1035ceba9c54011b7bf2af0f168e3242069";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ka/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ka/firefox-54.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "8dc9a1fedc8f0a4fbb7b85cbb1f2571f13d6e1e3a421b84b6efc80a7ba69fce43eb11e9ce2b5969bde8443062340515e875ac14246905421b4832c771277125e";
+      sha512 = "bf978f673c00f0f56d99291e2ab47581bfc5373b95831ea097b96866705517eb126853e14b74f677b887016cdbe7120a0b2cc57f4dd2f1ccb892022d1acd5f14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/kab/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kab/firefox-54.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "63db0e66a5696388887077b8666fbe4e9706c9ad05ee3c2ba5e7fddf8a861ba03da3ab2fd80ac005595f59ee3d5f0a85a7e38e7f9d8032052ad1d56335790c2f";
+      sha512 = "3bd525ac91d472f6b9001a9074963cb3fe3ca6ed6b9a8fa48c90425b1305302f0ac8ff3155282025fbcb0df65ae63864bb86c23ad6506d0f34ad49b9feeb1664";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/kk/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kk/firefox-54.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "a9191d0d3ad3f42de52cd63631acfc1829b5cdba4b92d59d6966bc9a0ceec93aa0d1fbc258310706c9993df51f5a917fb781f936cbac3a1d1848de281a00eaad";
+      sha512 = "590e66e973f822f4823f2b0a333c955555080a0dde0e3931d93c398fe2121156d93e0b779fdc71fa952261d3fcec75899c127854f62ac68ed88867fc6591b8c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/km/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/km/firefox-54.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "3ceda47889de3f7041dc0acda2440ce25285aa21a9d4323da8c50d7e1c3abc03c92806195afe25e8f4998a97d481aa8be3f0761b679795f57eb2edaaf1b92092";
+      sha512 = "1e88844f2164de5725d9ed694b25c702feea980cb3cb3a1750ec0876296da4687b56f167fb9dc89bb2cc84a1439b22db5fa40ff42a506426e71cb4016fb04b38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/kn/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kn/firefox-54.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "fecfd001bebf9ed11dfdbfaa96933eec721a12d213fc5b3e7f115cfb8de27d01792662799856ba26d2f3529d10a8ecdbf08df33124c7f60c18c8ffe45e35994d";
+      sha512 = "29d306c15e87feb3740a146614a01d113cde8621930ca4b97c64c42fe761409f50d8d05e7953dbf3e8b3f971479b2bb6826cc9d7ae83d87ab9d3cf8959ad4fee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ko/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ko/firefox-54.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c863345b98c37662b8848ddbdd3f567e1b14ad1c303fca517918126722c7819f57ee4b4ab7e222c1e7d84f7b04aaa6bd7ab1bc1e68df27086ef48b785c3d4047";
+      sha512 = "79aed8d95b7680a8ba634cb2016c7aafc9cdac723bfa291bde7d3a9929ed6716376b02db523e544842862782ab0c6157edd2e747d461bcfe10495eb09d2cf85d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/lij/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lij/firefox-54.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "5b0d6dcf400e32d51be63feb5fdb0d8161ce4fac9ebb2f6f2f70dac6d3df052bef7aebd25d53f79db73589e48145945ba2671bc0a34a429822e56d9913405136";
+      sha512 = "d0c57332f12b617e8a0f819b6aac170f0a253a13f1bf9ca2e43435c8edfd6c6d16a3bb4746349cd92097dd4b94aa131b4fc3d01a4b088444881284c7bb355f12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/lt/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lt/firefox-54.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "3d9bad39dcd2cfc80fc16c7a443d8553540b0f22d712f6ec9a6b98de988442e1fcc3a57b1424ae784ebf5dd9e6fffe64b9ba6afbc09ed8942a6bb7f8b4ccf805";
+      sha512 = "7e4f74337824f52bafaae0b72c4d250bd5d6b023dfb13724af63f27e43db082a9a46d30654944124379553545d2bdd7c345685fe91a249ec6fc837a54e1681f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/lv/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lv/firefox-54.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "d2ae12c346575f634801bbdde46791cadf0002508c210fd76970201786aa849e18abdf433ab3917056c1b7d61f02aefbf7f43bfa940dcde76ee16b1cf307beb5";
+      sha512 = "e1a794ffdefb6f05d4c8c775f1352396ae66bf4f09ef10cfec166cddc98808b35a286997f5dc7df9515cd31c9012801c749c79b07c50091218159fce38caf5c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/mai/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mai/firefox-54.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "5b60c10506d243bc557e791edc8eb92830346f309a514b98d42b75340e330367eae6566b4eeb20d4c7e63d0cab0f74686ccdc6eea48b816b13fe27e7f311de4e";
+      sha512 = "af68ec14dbe6136d40e43f408fffb2e1fd481231ee2fc0925ccc63abc59c2c737446b34342b90b71e740ff3de4431e0c39c3f6e626e0b5bb196c92a865bd0414";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/mk/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mk/firefox-54.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "44636a0e2b9424ee2fb0db99d2bf080f2c1d5b5c27642486bea11d70c3db41e9013e6095f502c426c3ae22bc13cdd414f0561579abe08e9f81324125cf2f2b70";
+      sha512 = "7a898ea167773d30af253bffd3806ebf65ac65622f9da5bbca7b4f39eb6b98e728a06bb19894fd8f6306a830755b0947956be34dda96af4e1a14b96f5948c758";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ml/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ml/firefox-54.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "2a1d4a1890ba1dc90e79a92589b713fb1b0d3485af70cd37a04e5e75cfe5d5474fb98e1ecb18c819570e7b1b2f9796a8440b08b0b72c38757f5399ac6644d54a";
+      sha512 = "cbb924b17d93794d2c1b457fae63f75a77f70d42b95d55288f34f232d50323ae49b19689b71254e8c94f02c6347745ba99b847ebdffda99cf645e2ab38db058b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/mr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mr/firefox-54.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "e637a7aeb70e77299eef5dcb351822158a876d9c09eb32baba0e3d48627114ad3f2776d0fe58b9b1979a2ac49b1930656ce46877773fc0981c39c114c0bc7464";
+      sha512 = "0d92711677ade6316b06cf6ba2a5f0eac11d3e31c852204e12c4b9b77de0d1e3cb29be798bdcc2eeafe9201a6b59dbd7b9c12cd30331fcd031230acde54e4fe4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ms/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ms/firefox-54.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "f112dff09f6589982d3ef7f9861302cb161274f9a54b1884955472b0e4032c5686e6e459a925bb34f060e8fe820ce012d7ab2cdf11181bac795f58a379499ccb";
+      sha512 = "a5eaa800c71d623aaab224cf61e97565f49382d382c05a097c19eba4ae4f0f655f268237a8bb2e42ffe01ba82045fe50a13c94ee45912c80351c883502280be6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/nb-NO/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/my/firefox-54.0.tar.bz2";
+      locale = "my";
+      arch = "linux-x86_64";
+      sha512 = "9e2e6b85fe3d6ecdea000fe87c1060d7ab954cceea3b6b93386c77012e108b8bdb7aeed18506964e58297a0c513b734462982047b1d3afc1ef4945beae76f574";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nb-NO/firefox-54.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "121ccfff0492ee00ce4934fe741247a663f36bdbb65944d2f21fbde45d7f5dcbbc42d1770b31d5a23d3369d3e6959edfd5231900ed8d905ed55c43e0f528f1c8";
+      sha512 = "1885b3d94e505d68cf84cafb86b72a5fbe8b787ed2b274ab607fda3320daabf096793e16b330262110c606d3aa9802cee01e8529a3f7387b8923f44f9afa85fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/nl/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nl/firefox-54.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "c74a422603fbfc1afce6b5bf3da5197a9a5b10c643ada427a7833e7331c1a307212960b6a8252ccae876a33743a0d14393260bff7914f7527bd1c79868618d00";
+      sha512 = "769939416b77471e735533c562767ad2234bd3700c766cbaf3c365d49c55f4f84c426050d8c19a59d0cef9ea6d4456830d73ed201611e960c21e3d4ac8511b5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/nn-NO/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nn-NO/firefox-54.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "da0e91486235f65ed42a3bae7e230313a75020e3d0f0da5c10822cb91eb2aa4db2566ce33149bce25fdacea768f516e45ae6b5cd071d332f94d6ee2d3ad7aa3f";
+      sha512 = "fecf58250fc95780305e2424e15b1b792fd319418ab378974ed2f1fe2d12d66ec2237db278aacd32201f04164ba77364effa5b83832859f599f494a1bf19dfef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/or/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/or/firefox-54.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "e47f99475bd827edbc4bd79499a481333823a138a4d5ffc105105e3ef707ace1c695db0d4d9cf4ed41f8e498f6e1152d8905e84ea45b7407c4a14b7bc7668833";
+      sha512 = "4f5c95899185a2836f51bb1e46581a6c3a983935d2a51a2877caa6e275b94d576e2d09c1ad5ef1c586d5b862b7318d013160e21a466ad122b147a06e118791d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pa-IN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pa-IN/firefox-54.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "e90471400caf622d690c0b3bd7abbb55094871742a263aefe89a83add637459bb4f004d9bfabac7f32258f77123e5a85bd414fe56cc286a2eaa7f0342ef8e46d";
+      sha512 = "f67051953287c794eee5223739d637557b287dc0edc91b24a4cebac84e106d9a1c1b670c763da7a4b15a3204fb7292e8c436b51d8b45af22f4c4c726f45aea05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pl/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pl/firefox-54.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "ae97799d80447aa54c9989780fcabe3f2840bbc1bcc9ccf2378de85eacf5957b99522b345c528d751cf055ce04a90bf206da3f53c55ff704ad8202e6f0d298e1";
+      sha512 = "ac3e10595201713e06a80554732a7ec53334f288b223fe04ab388b83d3190bd4046c82ce60d934b15245964de68ac2a1d1923362025209e5c0ac683dcaa0b6e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pt-BR/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pt-BR/firefox-54.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "7fe17634ccb071ff55eb49c63cfe6e0fe7ad5b65aa158bf64d8cdaf4725fa54feeb7c5546c057f5f73690cc805637d6149e3ca938bc31f1798337f69a79eb0f6";
+      sha512 = "cff8e41d257181bdc2dceaa301b3d38b51157690d4b4ab78506353f3f0f883547aa688a74de643d82851619388ee37407ef48d3578a397d9ef352ceb08d112d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/pt-PT/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pt-PT/firefox-54.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "50d0597479e726eb8342eb0ff41be5130a991cdeefcf0a020e46fff70940bcd4422ed9cdb12260d9ccb91ee04cc2cd2d3d103aed6cc49f4ebd40270fd7180954";
+      sha512 = "156516df4abe22265eb9f7b8515a7ace20a0d35c6e460f10ba5ce9a96b428deac0c72ac22b61c2bd95b0da9dae52c1cb055730720c5fe0c42314f83b838950c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/rm/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/rm/firefox-54.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "5a7c05944c5cd97cdd45e467244cfd0118cf960f8353d34746463eae627a2aadf298097d97f5545a570e7a3eddfaf2dfb02541efe9cb24fb36b8bcb3d1b8e1f2";
+      sha512 = "738716a0580928ef597b64f3cfccd73a38ff42b7d4f5ea18bf3425dbdb262fb7beb99ec11b31acf1d2ee321af4b4ab25ecc554c819223a84aea7722d14ee3246";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ro/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ro/firefox-54.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "daba193469d8114eb8b6fb85b0f79ce7b7a9a6f61b34bc6debcd9ef5254e0f716024cee6760a3ccb2fe3c0f0e5948fd56753e0a3036177ea4bfa3c3f11c5561e";
+      sha512 = "6c5f8e0eeda88f40765ede24c75b3f0fb70f9e90af30767d8fe4d08cb49be64a389a0e7b4e141031d15e2def42074bac0c64d2cf5b650587f898e6be981c9756";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ru/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ru/firefox-54.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2421185e831ba4720c01f471fc919ffefeeb5684050834fcc039da0508fe71a2a3bfbdb1a8968d1dbd1d282ba6b7075a8568290f32adca9d987fe7c1cfe83a4b";
+      sha512 = "7ddb1a185465980310695ac06794a8d659da3eef8c451f0e0c75588fcce9a1af65e75a0ebfc0dd583f0a6e6e511b03108e6d9923a2f6488da2276018d7ad2c04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/si/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/si/firefox-54.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "d8ece0794a893d1b0469203084720bdf06c8e68c31ed9c84c4f998061c310460849d979c7cf4d30a6e339ac05191a5196c280ce8c734378082b629090e2c46cf";
+      sha512 = "16d516cad8e6ae86eea95d0c4bbd8eaa56afbb74f5d6db82452176394c723c4e2b821616ca76186c990a78d30e208554e7eaf7deb82e7a3d78c97cb2c1338b45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sk/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sk/firefox-54.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "9ebd01ceaee3927a4a45e0add1de69b2a3b142c00a3495488f649a56884b503235ccb67fb0f693c305a5c5c13f1f314c3e9ecf4a7d6887ac6f22f14186ff9508";
+      sha512 = "e6175dd3316c7b05f95e075ea5966b50e243b83d281bbc87f6a4dace16c708560bbaec8fb0700823ddf1b55d27f7f64450254a40570616a9bba0d2497bea1a08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sl/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sl/firefox-54.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "9517e4379531feb4741e6f679e8e7e366a75c61fb9f47885ee7cab83446807ec91519a2829e2cb947d0816b5801788d21ff7d4c17181403703aa26c849d14e89";
+      sha512 = "4e78e2d9808b88c191f51f8cf0d83f1762d743b4bc736d469bc145056af2207bdd8c3dbef7283a730486b041826bb25fb4816017786b0bc7515238b67a285062";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/son/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/son/firefox-54.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "1f3ea9241c91249f7dd35da0ca27487a844e9902fc6ca567bde28306f2556448dd32291bfffe3567ccd12162dfc92b06c26b25cbd1af8565cace2934993ea358";
+      sha512 = "6ee8a87158c2f7cc8bc38aa59959644514888bf683b7fbc3c703ae596fc6260190cea141b5f4d6aa72b21484b4a4218850d7d0c72cbe83b8329352de64b19e3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sq/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sq/firefox-54.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "1359d549c9bf298b869968d5d5fee722ce2ebc11095f3b7472111df07d2148153358e0ed31a722192deba68b67fc9d5a1f237f975412fc5d762fc3f396652b5e";
+      sha512 = "1dd34fd13cb790a91f0592af0e21ecc815820ff4fe6d0c07c27b5efd82b37aa6c9526f5af9a444a1911b249651c17d9b367c02bdc5ccb420c80718f01bcae925";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sr/firefox-54.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "4200ca53e3b4b61baa929385dbaab5bbf4b5f8fb922695c8ee378f5be6ed7b4c505c616782fc992df0f88ba5cc95a06ca1f8cbba79319f2e9734be42ab336093";
+      sha512 = "869e31f47498ef748557c7bc0b9d49b893826b785112b5e152bac46a9260877f9d73740ad36fa139452074cc9b0bd23880d7a046eedc0bd652ca44eb5188e035";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/sv-SE/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sv-SE/firefox-54.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "5208eca959275c6c491b609f9afa750c7c509eb8fea1a7996ef74314c6001797879887111048071bfa06583e9caf710be75edc8015f16b4e0975f949a21a9229";
+      sha512 = "94601f07bfe9e13872cad9a0273c669d4a8a44b3c8f654aa866b703e325a0f1b6313cbce70fada7bd2bbc074d6d51ad28e829c6afba59d0e7d95645c276c2594";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ta/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ta/firefox-54.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "a3c9dcdf28703bbe2ec1243e93074462729c4ff81c0cd0c8d8b83dfbfe1f0d1e6d0480f292a6df5b6f961f928fb503563ad5ac19c02802ae69fd415d9b4782df";
+      sha512 = "0ca3d09ceb89ece40b8f6825ee7f46d4ba2a546204ab185b82e32d9206e428e8818ca0478d8b54fabe6ceef4641e8411a1490d862bf53964e0ab269bb2bdfe1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/te/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/te/firefox-54.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "d39abe44752af8ad2eaed332306c5708c619cb8223f47bc639d0872e3199561a2546c003c39a6e14ce7ffc1ece686314cb0ee93e747dc89ba699c5ab2f9de2d0";
+      sha512 = "58e6e95a7972f2c5b4ad8f3428b95c82434d9041dc8879ff1fe961adc6baff87584011296621f07ac9f1277f6392d1f230310a65d64f245c7bc3494872dc0248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/th/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/th/firefox-54.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "1f2900ca72f19786ff7832d4b279c26ae56fbef6e85f12f41c0fb180fc84da7dc795c6b09e413a616325744d6a970a8aeba037bca2bd2ab136f68f658bc255d7";
+      sha512 = "da0c6bd3cde25ab20eec1e31538dd93d4aabd5659af3a00da1279a7ed37a30f5321f8260dc684610f37e7f744ca70bdf882c9db3d66b2988a7231ed4f07f6232";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/tr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/tr/firefox-54.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "7854700e0274974799e1f7496896a06122351c8915d30eecd9b0109a94dc22f095d964187614cf38d4be4d453231b07ee9517227acc6cbe4003856e18455539b";
+      sha512 = "fa98f5488afce2b1b7f27810bc9fb8bf6d45e09137bd7a5dae89adcfa77f3f1eeef9ae593d037614197524128c317549edfd8b692b25ac6a79005f49f8deab4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/uk/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/uk/firefox-54.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "536075f5842b5ecd79032cb9a62f7d5efe8235ca34b3f089bf9e7b44af5e9e39dcdc8ca04b45392ffb943f2d53c64fe39e34b28df1345beb63307ef359d66ede";
+      sha512 = "2ba13913b317f059093abd6407f9c4f798dc82491375fe8cd5ba21cd6f92f7144496f9f879b3f34eae7d41bd6a5e5a66efd57c19a76f1f89a266c2d50069f01d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/ur/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ur/firefox-54.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "219c7b7437e70a7970bac631bdcd1d70c98bb19bb51a7f95ab45106b97f2207a3d19f45b55fc8b26d136029f2ead5767acf6bb241b1e62b0d4e45cec6fdb6d19";
+      sha512 = "b3c9ee474325b2afad9380896f2f785949170bf32582187afb414b4052bf6ec55e1ec7ee974a980f6256b178621abecf6e87a24c23d7df8c9faeb486cdf9aedf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/uz/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/uz/firefox-54.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "c90d39920c732bf022a417c7ee4ac6ff616274cd37c3a0263afd97efd9edf992aeae7dd9a3a7303a2d4e65b1bac49e70554e9e0310088c5367aa7a15963ab233";
+      sha512 = "1b419fd85815927410a43aca976074965953eb217596b6273fbdbdffaa71b0a87786a266a27fb9db11acf25df539c45807d780ec9af0c2e05fdb8b43e12833dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/vi/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/vi/firefox-54.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "66f08964c0eee2befc58c8edd0faa9140ea3a9a2ea90a31cb28dc20faf3aa471f06ac12568ca0d8ded0bd6dc5e34b90a141602c37742bd6918f00a0d02a20972";
+      sha512 = "74be717bec52c300b7accc9a31012c2a6483d4f5060315326aed2cbdf500d627fbb101d9cbe0e19f7a3ad76029a88e42e815118683fb5b32d6ea855c5044bfc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/xh/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/xh/firefox-54.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "06510ed45ff6eac5af3a5ce6e58487abc849b91148587dc8905cabd2762ab04890561dc0f49959c51fd52fdcc9664fee4452de189f13c4acabc99308f6db16d1";
+      sha512 = "9b5e7428042d619f61f45ca58092247462bd683060772fa7c32d862aff7882a402a10bd0ebed940d31871bfc0212b3555fc5c99b1470d590e7b9d3d614351a3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/zh-CN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/zh-CN/firefox-54.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "e9c6459671027431433a8734e9126575713a1bdc6c4059f0010c9357f6cc6474ab294c6b1db093513d51e6ba48afa1b467ea90502ee92c09b540e93b5eb80764";
+      sha512 = "e86dc80340a30a89cff1063dd9559156c7a8713228d1f5bdd660a203373bf1ae99f682fbc29f8ce2de65d48eb5380e748b5484f20e1d73cb52f719327274d90a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-x86_64/zh-TW/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/zh-TW/firefox-54.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "a1e9b1490cd6d309131cf3432aac9fb82d4f473d832c935252fa9c3cd5dbeeecceacf31f11bb51c06c58ef998339201331663f12d9e586f4d3a2abc1bcbf7f4b";
+      sha512 = "bd412bb36f6c41293ef68f38609ef0554d492aa92b6ae74e318cde23e9fe13b8e8d4d5e3d46a95020951c0dbe64ff83df0987b166d8de6afce14b6f4ca09d3ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ach/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ach/firefox-54.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9644dc1f73f520aa89998e7ef37fe658a63cd625d90ea0ba478f321506aafce4a1c18470f94adac25ce1be2aed8dfbf2e255984febc4008bb031b369dbf494ea";
+      sha512 = "bcf4707a88b8e40ce98ff2f6dfd9bd219d567e9595b1686485f6229c3644528320e2f4639752e4144493fd6066996235a850ca5539b67f2dfe07902ce4759b13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/af/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/af/firefox-54.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "98b2d5862db2853d0c9253ba63604ff55766d7e601620a1dfbca8a4bc8c356652e24e91892c530195651fbe93ab38b69eea7e4a7aa8da8c1c19b2489790f88b5";
+      sha512 = "f527c2f0cf5b7585f00f1c897a178e2f526db0ed126ff8616da7ea86f1dede94b3e5e011622886323fc1245c935d362f96c8bcb792043b05febb4a8dc01c2a50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/an/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/an/firefox-54.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "d69ac47458c5ba751f21db719336114e49a6601db52b1c4d2fb6636cf4d869ee5eca1f32e9d106ae384719d511bfca595445dfa30a8ec2347b544661e7203177";
+      sha512 = "b99880f2b69a44b24750642a67db2d617c237483b5da6da10b18250b419aa54b0809052ea7d09bba8e66bb8047a65f4ad3a371bdc8a016d800b24b5ef1a453f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ar/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ar/firefox-54.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "6f09ceb03ce77ecf8eaea8cc4087f8531290ba0c1c3bb727811fa03c25228f0d38cea020281cff53d7acd682560590de2e2355d3ca5c46e8e777696e6424717c";
+      sha512 = "b9792beb0db0e1555e9bebf33fe5912abdecaf54302a6573d8d1a7dd3b362b4bf364e13f38c1aa326cbcb80c16ad2ce2f6ca7557f1eb8afcd3aa37c0c5272823";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/as/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/as/firefox-54.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "428974d2c110cc2bc88c792c0fe835232a51cc5b2c8bff1ecc08490a20e9641b3a465b3412e0a05dfa8859bd2839846a7ed75e26b31456db77bf35a9079162c9";
+      sha512 = "f215bc4be896f04a867d516dd2dfcbe2965428306bf5faeda66981d80171d66bdf7363175fc0ab15d41ee54ce064d5f4d662518d41731b569b89fafad959b19c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ast/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ast/firefox-54.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "5368dfb536053eff3ea846366e8d5b4c025c3c5b828f41bb015276ca40c9c6b529cdac715a181d53e70df3ff99b1ea310b1a9c5a5da74e36ab97504b03c99e3e";
+      sha512 = "aef5200ea3333c899e206667de6333405d8605a502ac2c1d08f9ce6609939c347d5e19c4475da3476623657e6dcf9eb92b72698901ac38eed3704fe15684d31d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/az/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/az/firefox-54.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "d9c69659d8f77949b3c12419202ba95a53c2a0bd9a8b1e580afafe93e245609071239cd69722e391af7373ad431f1acd09dd9484038d6eade48d0642c667f137";
+      sha512 = "f5dc2d4218f1433c4ec5c0e363f78ee445ad9afe70be3f019ca206fa873d6905d553b3ce6b8227f02d00353b3d4db349a2a8ef2354c5a740a799774be1ec4fbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bg/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bg/firefox-54.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "20dceee7ca9dedd1fc063fec6485acbfca5db804d6f7dec8a8fa0513615f1a8b73c51f8dc4cd427e5e06d1fa49e74f2b94293880a47fec95e7c670f0a6c9fc2e";
+      sha512 = "57b7e5c479e092bceae1633f6e117db0a3652d3a037667a97d9f5283cf390df731e6b67105b4c59296c4843e1f98624030a7bd72ba8812488094ebd1336ebfb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bn-BD/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bn-BD/firefox-54.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "00050cc713a7901848eb73bcfe15c3757a028391e71d59d6e20843b67aa1f19283e45fc5fd22e9301a15a4178f2f461a5984ff196473125682ec5eb5dcab41b0";
+      sha512 = "dcb2f5c033648cf5a887cabd1ac70d4a569bf1af965e3c0eebe2c1a2b746be007b3e76cff666288b29279246b005e2309c7b5e48df20955ee9b685a0d9548636";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bn-IN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bn-IN/firefox-54.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "6439b4ba4808ac648543818388f08752dd7ee07d30390afa6735777b70e84cd1110e6846d3baa1424262fd3e1fe78acec9815781a2b0a1942798b2292d26fe3a";
+      sha512 = "5cb248381eb1c67f0d18d2a9fef63ecea7bc8b3cf6f3db2aede0e9c25dfd6d0eb8aabc4d9177f2f174f2718e4361166bc5045e815ebbebbb613bf79de3345060";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/br/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/br/firefox-54.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "7d9380030df59be07f1b5d8952313d1de06b7f2d4a04edec74eab06a35997609624d8b90400158ce43638d0134db7a71fc3194db8bf60e480f0bbc4ae358a884";
+      sha512 = "5e0693d9cf46a78cf5f1581e5a18d3ad56f072f975e9169c6505715dc054819fe6773196b9d71e46c40b1757ea2060d8d5365b98550fa068d4f27f63e89ebc1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/bs/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bs/firefox-54.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "0326ce367d48f4696868defb1c5ef6295d71abfb4e152df57fa37644c0e9c9ddc4d1a859bde9710baa7e1dd164d2509a690b49782e691755117f8955ce019981";
+      sha512 = "71e79a378d6ff2a29a2c3e20f0595688dcb344829e6b241fe97ba6ac0dbf27b982966168a691e0293d8625459f89dbb4c7cb6072547934aba2410dc20b525f3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ca/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ca/firefox-54.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "7225dbb158fafc1fd3b0aaed1b2b012b30a3595c0763b9d695a757dac6f279909a3a5ced7afe260b2b22afa1b80286f15edd04889b91d0a5d0f02d4e3af464cf";
+      sha512 = "5a40bf62d0d6691df4588e4db7e9e48d64922d1d81f94d383873588abbd4541a7589ee662c9624b5a9d1c70fffe3e3a468af420e54fef119d1b66c5eac9bea52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/cak/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cak/firefox-54.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "ecad96912d70051d7ea41e32f100c028a45c5ad819e22e8e9cd60c72b87d57300f797d661f9af20bfb18bade2921b59260c0eb08b5430316a1d706ff8f0cbd1d";
+      sha512 = "65e760fe89659181582f86424d44406e0a2e4d033b5ae030f199564fe1666a5a85e77839ea9458c474e4c7f26b1ae6656c071c7c27553c53d276cf5a5aa976fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/cs/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cs/firefox-54.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "d1d78d58b141cd919153b2c2d4667628786c330df01f9183b63f4592faab8863af3103204786f14bbdbb3e8a1e769ad2578e337ab528191dabdd82f51a45809e";
+      sha512 = "5b9e2c3d30d316ed7c013d49ff0524497ce76c02f2bc5d33254c561d94fcac5be8bc4cf269b6239399b22aa9d9c466698499149dd895644d17a65e2960d1b6bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/cy/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cy/firefox-54.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "fa97198f6850be7fad4a6740813eee763f2a9c69d0c23cc5f1bab5067874cf843bd529f63e2078731d68f916a0b628008fede65fafc1e899441472fd32d6efbc";
+      sha512 = "85ca010fce9e7a15891ff51e1c69a2ddcc686857e0958495b7f7eb8ed59e2faad7de5c81453d2ad901de3db2695f8dde0c3bf4a182cd4b8ad6ce94895669ccb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/da/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/da/firefox-54.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "a19211b6d5aa3e4b4f3b15ea4c44355227c30aa01e0cb501187eaa92633d549a67df89e7b6edafc4671b69f7110f28d197f27c02dd7f603f9fbc7a1e70bfe629";
+      sha512 = "22913845f9bc2ad7eb58c0d556b2dcc139b98b37ffc3606bf4595d748890e094968adbd4f888117a2ac163ed0dcba2c5a4ab97105ffc48cfef38accc15c06ad1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/de/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/de/firefox-54.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "195878e23fcee7b344b0b318a6e8c7b2af30de97ef9228e5a0c80cce7e7c7405e6a58ee8489c100a5b2d8801c388598e80a22048686cbd9b736b30298757cc86";
+      sha512 = "8a650095e1c80dbf8f931b8dd7f883312f52f76f2743a6428d0a5d7526946247e3ae87512454ac77a2601fdec05abc8ae16957d09ce440e02ecdefda243d4a86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/dsb/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/dsb/firefox-54.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "b1bfbd251b59a122932edc3d4edeaa311f72fa093d103bae8f18ec900063cf9b88bf26f695decbcc2cbe7a8b0cf6c978db3ece86b8aa11c7d097db47bf8fcb93";
+      sha512 = "7d673a98260823cdec8cd44dd564c4dbd0e6f4cbafe1b1234eb4c631dd07edbe34ec6aadc5863d62030271c1d4fb39a7f8be1036ed5048ce98d2af85d4999e09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/el/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/el/firefox-54.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "a8cdda39a3f221adf0361871c5eba486808209809eca5a1b9d3b9d2c0c91e68569451dac2907e33018ad97efb4c3d646ddd6db87a9cd98461fe8a5a6de2a492a";
+      sha512 = "fddc48117e63558a7a8cbe83ecdd937cf5d3d444c1d58f016026b51ae46cb7a0c4a44f04474d285b8681a985c59c1962c39a8171802821702d6ed4744ab39390";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/en-GB/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-GB/firefox-54.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "b99dfa1b518e7fd0b5ac3780b69cdefc6fff26d5a30a0a0c95aae9bca88def65a0cbcc1ac22aaa369fa854686dff0de75e138edee1d8d13cd5c1d25110c0befa";
+      sha512 = "0f27b44e13c620a22ddb24adb03aa504ea48ba1674d25272ad5dff86cd59554b66c517cb378a6d2668d6c9014fbbb4fc9e56565ee943c608479a6c6ab577dd50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/en-US/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-US/firefox-54.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "df0f895b336faeefdb24a65f110d73709a9d9c37aeb66348d8f347db237b5f4989a4b37e3e15fd638b7cb907e567e40e88f4372fdd1f10c924f44c5bb61086a2";
+      sha512 = "727ad142bc3861407552a0c4438911493381ca5def555b3ceeb2b15d6a66cb4ef97c05dbace932b06048b3a5636f6568e3940cc8ef45af28a9797b738f2510cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/en-ZA/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-ZA/firefox-54.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "928e0efcdb9284ed8eebfc9a05fb9b33ff05a72f5db28813928064970e0c6b5c67de429fbc49b85cb780fc18ed3964e14b445460dbcee8d9c271ea112c43a402";
+      sha512 = "47f1385a47014a0517a15dcdd1ec93752207992de077a89742ca1b6998ea49e9d07b1ca12cee02c3b8381be674e9687cb403d620231003bf8b683e279d281b69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/eo/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/eo/firefox-54.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "a624a4d42a096929ac6eb467251de6bf3eadd5b6492b5b9e5ab7923601015ccee69f976186c66bbb2ea268b791cc2708fe9e128a4d978176a5d9ca3801631774";
+      sha512 = "b3d941ca034a50f2f998ca6827682cfb18a9a3e280696951dae1964980e153bb2a0461fa33c21109b5aec1f12514bfcb9eb89376df6d8e4d87f81fcf5f9b7d9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-AR/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-AR/firefox-54.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "7a2d2ff9251935b8cc3f592b2c7708ad86e85a389d8599620801f514b797a64cc28bc0458c0d7903261f5251be65e29ae8eb1628d45d9a7ae70f57ea56f20e12";
+      sha512 = "39f930dab3f08441b6dbeb08d85803ace7e81e43208a03fc820c6245ae66de183f3759081c4f2ea4dae9ea8724f8fe5081123cd4b82bfe695e1bf0afe34407fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-CL/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-CL/firefox-54.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "0b9ccf6f2024409348623ade927d0b21df79211ef7a01f9efe414ce389a6a4d98ab5f34f8c3b4c0dd01209c8304d102068e8a9517be097b64768a163aff96ae6";
+      sha512 = "469a2e7af658fb21f41cdaad5bcd77610e031c965cc5e8e1e6abb32c2553f68a6c7b60eceec56a3eed99f65dce34b09046748e0551bf95f0bf98cfe97a3f726e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-ES/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-ES/firefox-54.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "02b8f2b83d869db41cc910f647d6c6c8136609d499b6e77f2526915654e6bc22fa202b09f9c93a3f2fca7a432deea9a08a2e983f0783b5712341d9ec02d4754c";
+      sha512 = "1e33b0a7dce58908bf98b63e3248628a8d62e5c980555b4385ffa990d8401cdeb14240f4a79eeaf6e3f5f0830455aa00009c142dd499714bf50209d10a083f51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/es-MX/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-MX/firefox-54.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "b18d0971d8b595c8a6bad2fe51fb46d995565947890979b2a157664ea9c5d20852043340c944754d90b820ad5b65f35bc5d0f847a7bcfd322b2a952b3a5fd4ed";
+      sha512 = "8d847605bd336079728087716b781fea40d256304c8f5bd839d83c0e5b4062ee13f30fd257da84bbe4203656aa31c8acd570c400ae04f39107f6c56f7d2ebb09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/et/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/et/firefox-54.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f8836395758112d16b6ff74bd5144279184b125e9d415d239b1dbc87899da2000880af3bb9e0b4d49dfaa641f3c8cef4585c31699014fb2dc95969407fae4a69";
+      sha512 = "9502f47b30053aa89d0a79f6fc88a698e4206bd7cc37a2befed76d7811c5d758d61716f949de21e73c5690fb348ee26df7bd6eaa05473e4b257e4e9d6721ea77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/eu/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/eu/firefox-54.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "05584c588f76685791c54f24bfdbeea37c9ec36f0080ea5efda8fb5db5b59789b68384be1e36aafbc79338cacb200f1246d786afe1b3331ce1b1bfcb6c86c403";
+      sha512 = "7bbf574f723999e238ca8daff96a81dc124545046e6a0143c95ac6ea05ee3aefec86dc33b588fe206c862d2fdbc882112fe0cc1d30ac5e4b215f16f41957413f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fa/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fa/firefox-54.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "c89ecae7468b0c0689995df31c8d0b04b25ee8b3f6633db9a84197bd7e7348b4289af95b8d656794bef22250e9aa7598be3a871661e0d03e02267766c2caabb4";
+      sha512 = "05ff15f72e785af68f91a890a72982c218e0dd8075e7ab5a43f11d9a0ea03b67535b5a7b088a6ebe1ef97bb6f08a1ead394fde51dc708e8aec8843c611765e3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ff/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ff/firefox-54.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "63302710dd067dac349a322fe7df8ffb33796790bf17758bb9554d1601e4d414c0f919cb92ea56f3030b4d3604caaa39149ea438bdf03fc6164f384e9cc081c6";
+      sha512 = "b70de55bcb1e582fbafe6ff7a61da548300e0c21c78ba80178e07540dda9088024e3286c3c9dd8d5473e02a1692916adf0417baae8c949ee19a8f00f6882cb65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fi/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fi/firefox-54.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "df62123c529bf3f9ac017a553268ce58cece1c916bf2d671b03a5207434c762cd9b2f1c81f960e5eb26038f4dd39d99ac8c65d426eca996c230694ea1b4ab2a8";
+      sha512 = "fd895e153156ebe879115c24e6e35d3983dc0e8968a061de017584f6c255d4b9aefda19ac244eca5e8b833e9a7836df2bff4e61a39ea71dadec1242431202971";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fr/firefox-54.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "4e6b3b271c1ac945e05e72926a4ade75bfd2e24bb97bed78e350c5f637007810035720c25a24a6cf0c0cd24d49915259a7a38e0f792b78dbd26ac01a30092922";
+      sha512 = "ec36040ceb536d4b99da9b9b5b300b066f4e54b29faacd248c7d29834e1e902da446fdcbb3972b4a07c1bab71bc144f53650e0ace150ecb3e659cc8fc15be71b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/fy-NL/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fy-NL/firefox-54.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "11118697039174892aaf813d434dd2f3ac93839681d9544100560e5d906ea7f71063e89b9a4e2f53e7aff3a4b83726a0645dcc4ad212255b054a51ef3d3cdd1c";
+      sha512 = "085a76fdf7def5a9bde73b7d92369fe577b448b8fb829445ddccf15fa3918f9fd1a6cdcea68376ec0c0b716592c8148b1ab638f5cdbe22e0a6ba7135e9702c2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ga-IE/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ga-IE/firefox-54.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "3d22dfe4827d218bb42a65dea5309d058f4e047a33ddbaedf95d0eb98960e567b7735fb7e25e508e06f5b92cc21494e73fd37e02a5228c87a903bb77f37bdf78";
+      sha512 = "c344ca0fcdc266361ce5dde1e8adda69c9bf0ca093538ae339e520035c5cbd16906e4b40db03098647511071f6e11df819bbbf07661fb61edf8cd14662429374";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gd/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gd/firefox-54.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "71ea69837a36b698b483e44c87db1737a618f4099d4b6450434a5518a9f77a0d1373f85ab91f76397e7594c1a5be921c6302f1cf9b66701b5a8aadf846f64321";
+      sha512 = "4d44ef6abde187c2546b01bb59a1453bff07491152a9e08abc8674f72fdb201d0ca84bde913f0de7f46a69d6687affb419060994f49f5f934628456964eae075";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gl/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gl/firefox-54.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "86db97e300e8ede881524618b110993999e08c4d21c309ea0228f742ec47a7e7d4d71c6f77eb1b57f16fbbf08fd5b5d7d1e314feeec4bcc10821047bbf1946ac";
+      sha512 = "c3f3d6de8511b7f782a57d99a368ad82f8caecf86caf88508f01e4c86cda35504bc99eba89b007ed1b79e089863a3ba8a93efd348e13ed64cf2ac6b9501da65f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gn/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gn/firefox-54.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "151c2c8f78f00414d358b296625dcd2c8166de12a8deb5dc31d330e5083e3020c7b12b9334dac7cb09e1508fb28b3b2601ded61914ba9df9df7e239871812f1b";
+      sha512 = "126c042e28e2aaa6ea6d36a52ee5d80a0700f4660d5ead0a7d756e59a1aa42044e67e2dd297d95282b71b94fe9ede9ec8ccd1a553c1e03ac2217769ea407d09a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/gu-IN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gu-IN/firefox-54.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "8201dc515ebf1457dbffe1e518f4d1d4073f51b1491fe794edd86f30e8e9d7e0feace1ba2fe74b136157597ed7087a857f204e5a6bafc297fec4fc0e04acee9f";
+      sha512 = "ec796a9f4b1d8e8c5b2c16d96efeaf1841aec9e66429f0ec2aa87b81281c29e7f99b94228a3963dd81e30685d1125d673d8b0f287593cecdbd64563353a0420d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/he/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/he/firefox-54.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "4a665fbcd7e54acb84e7948a326219557e14dd7326a4a0513de7271f128661a928305814dea69ef6a48d349deb148a08bb386b381fc0ea8c18c5632c7b9a3c54";
+      sha512 = "1fde862295fe781992694670e015e1b3baf717032d2c8f3ce7cdf3d4a97e708c2fc7e3d0aebe2bd46b960c108f2a7843e69cdea2c0bbfc29f36f10b1a7895f89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hi-IN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hi-IN/firefox-54.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "9e071cc2d107b04d874f3bd11b2ebc184fa4ff6534bc4b2a87f85cc3996f8b3d7ca453edbc58ae598bfe5ad90f9b23a1fbc5eb77d6e3095f09fa4b3619282ccb";
+      sha512 = "f06fb8d9e06e02b9292000556a3c3e7b7076fcb832fee023411a53acb7e8a6292d5bd25afb19d840424623213149432bab52edff0976a7a05ae70a340927480f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hr/firefox-54.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "263c65dcfd77a79dabb9416f23fa48400ec577ef03204daeead577c7159d5ef0b12cb2a17d2d7523078edbdfc61bd0bf41435c300b690b0121a5dbe76df76bde";
+      sha512 = "7c7ddabc990da13351a2796bcd8797d67200076d3bc4df772f1db1d6b894832d54b3cb6d491d928a4266b32716a27a5dd4bb5a70e8e5b008ae72613e65894cab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hsb/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hsb/firefox-54.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "78b3777c2017c60428a15a3531b7864d7a58347686fff2486ac9194852fabb658c170ff11c7b59bc96a9c73e6b35ff8074ebd9e5ee401e74c760ff598b5fc28d";
+      sha512 = "304907257fa32adfa16afa23743f7c4f8dda5b79f92c99bbebbd971965376a2fa81995873ca13ad85698117404ae3ddc60f29b1aa19d1a54e0441eced35e56e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hu/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hu/firefox-54.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "688a543527d26ebdc9fd2b2022d34e500aa0d65e6a85d504c957c988d0ea285ef2208a2a17c80be472eacd2cb726e99ddfa9048c1035c70999c0a8cbf98500e9";
+      sha512 = "4f9cadd48ddc7a4e25d79388a833d74418b013346a597edff0b9a7f418fe899f2ada685406fd02d0d4912126fd35c31ee51772cdab0951aaa2a38da3cef4dfc5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/hy-AM/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hy-AM/firefox-54.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "561cd5c209113abe4c36e9697323a966a09734e9039f9e2ad40bab5e7ee701e2aa5aa1f6f0ded758be914e7a9f33f59e84d895c40d3b15bbe7043b04e9e23918";
+      sha512 = "d8b57889da068cb0aa8c5bd8b3900d81b2944795dca03e09abc2803b985d0bf5b8ec183493ff51423bebee7ce3294ae8e9c5c3feec3e2af4c20627c4ee2f20e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/id/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/id/firefox-54.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "c624da71c7f3fd040b5ddc6da0795aff8796c684e44a05b53bb375d69abaea436350588bd6e3c60cd7fe75c5e0d17be11c956d2e3196212fd3e4208af3c4d131";
+      sha512 = "9f37f651b8fea3bab155550923a8bb6baf1d0a887f2a21c01da3c15c7935d176d7b63abfeef0fcd883807017aef39d66bf2cf5e80dbf3a42e8fe1691c12f965f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/is/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/is/firefox-54.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "f43157cc8c0bfc7108d9638c1b6997444d11c4c82fa2d937085fba02e8cf7bcf6e2c3c498d58039baea60461d8895b3a959d39af1612bf1b1f30574ab5c6a6ea";
+      sha512 = "2d98104a4b4c000416cbf3fd9fbf03e2923b502ff32cfc8e94aa10a6f86170b0ee1a6a3caa2ad6974203a3ec81b7ba17a55c7d7935170eaf67e8f59c29973d78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/it/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/it/firefox-54.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "a8278d7a14f0570f5d418c87e55b710a40dc9e76fcf9c3318f361a72f51e55777d726e99bd2afa495b09f997fef9e86f31ab7a1110a43617719d49456b7f2136";
+      sha512 = "0ae1021ec2e8ad2a4c028c44fa568f3561dce73feca12245b033650a9df023a7eb957fa748159fccc0735e16b227caaf019f738094ecf06d2c09dd537a8a7adb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ja/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ja/firefox-54.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "d9d305dda59cd09db5444f27599f9846e25869d3a43cfda90af0f8a760504e92df1df95da6559da8294baa75ce6c587721dc45a4d80163f7d8464a1039c9c180";
+      sha512 = "9f555cdf704922c3151ae41bda1222371c149aa7ba1f8f6ac61962a7f296effc337ed3579a7aad4eb187bd2a7fb40a5374342ea87112589dd4a9d9335a4b8f35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ka/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ka/firefox-54.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "d5d8a55002e8828f3e32c90f7a24aaede2eb820f203b3a2d5151010aaa5c3996f47dcdd36a4702ec96a93157cb7cd591ef81affa9c1750e078f3b569a537725e";
+      sha512 = "9b4a943cca2841617fd4e62cbd6e5b696282903e540f7d177e790da5ff388b1af2e2397f27b82af136fee37149bfbcd6b18906996f383f14a0bc79351efe8ffe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/kab/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kab/firefox-54.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "31b158d5e83cd8f241740a350465ab3d4e1a12fb374d85b97b4f32f848357bcdc4f179b97ac63701ddd619f9934a2edcf41f65ad1c13b8b2141522f79f3b24fc";
+      sha512 = "39688e228149ccf9f0435fe1bc2c04bfaa3ea4da66eb0310b9eb2d757ecabbcf157ff8af7821565b2d78743f9075e398a76024854815427bc04ac99148634d01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/kk/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kk/firefox-54.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "a32d200a7715a7598fca3f3214ab4c5ad6d25ceb92224f1602d3446af75d7da15b36d8ec1f71e65ae8f74cda8650bd46b81e16b16aae7130795764a8ed2779eb";
+      sha512 = "46c7f12f73a4fa5d7835e957ea7179b81438132fdc3683b4fd61bf68aeb78fe3cfbdcf5c92b77dfb2eea1e5e3c249e03dc5c0d9adeca75417938ddf8f8be9dff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/km/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/km/firefox-54.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "9fc0a533296974bd1ab7c16d7e6d2f6c5482e292bce11ab322ae94a96003cda788750a1a26f4064e9c65144003e0acac67d214f89a388c9c433be6d2ecc5444a";
+      sha512 = "de65d654b3381b111694134697866e6c9924e42e2957449cafbd50fa67d1330c53ee1dcad21e59dcb9993d706ca08fa0e82bbce4cb2e48d318bba46134a12a59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/kn/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kn/firefox-54.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "a613e37c8635508f728d890232e54cf69f2f66b76ee9cb1994d4c0050f579fbacba749efb2307cc40cdea32aadc024497d80f921afc632bcc6d0d4db88828b83";
+      sha512 = "10c8be44d567ef6dbd5030611a3bf72604485504033d27df336e7db6e44b9e319771026dfef3db666c7107e6c9e53e57e7923b9059091ea288f44a594dba1953";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ko/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ko/firefox-54.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "014e823ba7c4e4b2d36283157a5931d7fd4a8bb499216e5ff9228cd598602eb426d38a5d8e50452b0187dc8475dace5844c08c18a960db78b26d2139c6d843de";
+      sha512 = "d0a3a812c96990eacc2b332696b6f17a602b65691fff54d8e1511b5261cd8d482e590abaa93e56ef801388b02cb8dcb20575658d7429ceb1dba24bc2e30cd8e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/lij/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lij/firefox-54.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "cf8b398d2b1d47c3f5803311cee0a7f3b3ee2a28d74ff7b2b8537a14b7b05fcff37ab5097da6ad0370982cfdecc9b6bdc8b40880c745f491c42e10eeca67eab8";
+      sha512 = "700991c2ff12ecca4f11540a563b3cfa72c928fcb864471d638777ed53eaee105c62f62e6de768df895d54c2718cb4dc0ae1648e4869d5af102eb567d6fccaf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/lt/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lt/firefox-54.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "4dce327b10e2a7f79fff55d02e6cdbca3edefd3b5f6618af6bfb9ef4db7049499a274dd6deb3964a3bf473952377ce21b3887deaf2822073b0dff1109ef45b56";
+      sha512 = "488b215810ee0672b0a0f44a3891881df312095537f6f7936ae4fcb17b211a6675080ef720b977c1a35ea2fdae38b1e0393aab57dc2a008705d6a8d27560b0c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/lv/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lv/firefox-54.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "c088c08ab0f6f6d4222675808928dbf623be20e64f10e08ddc01e99054724060272d1ea71df8db8e93fe107a91559005954c0fd267634b14b0b9cac874d80761";
+      sha512 = "b5ab118ebb407c17dabbcd32ae297fd22b663bed8f9feff40d442a9a24f2dc0c5a2762cb5136ef8910820014f404fd9ef4160a413c70bc2840ffcf11578ed56a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/mai/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mai/firefox-54.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "ebd15fe44dd5c8e8880f45c854ce8785c6a3fd74f4c7991c99ca47d3bcc57371d0378fec3d40d1565aca1ee4a85ba787776690892700fc6714d7212405d94a9a";
+      sha512 = "b77d5a3b1d57ddeb45bb765610901ba6c142a125450d5a247088ec2b113ffcdce33341ddcbad277a9789972297f98bb9c120501bcd47578d9d633697bded8af3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/mk/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mk/firefox-54.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "342b993d781d170f23543bfc4e37ae624326ca0b0fea570e58ea30ca49eb0cf8e2d868dc11efec00e84aa7461c6d84594ec816ea1fd5ade1eeac3d54804363c1";
+      sha512 = "180a9730ffed7c69db3fe5deb0496d077a655106c06492e0da3611c5775acadc62c5ebf47e525aeb3cb51a0beb7f8599aafdb725884ffb2a9a9a5a8b61d7c032";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ml/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ml/firefox-54.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "9f73181a36e7f357fafb9fd7fe740e67bdce13788674396ca34a13560aeb0aa5326efcbce88f55040e4b7516a1cf0baa933b19559eaf6c5ce0a61502c41151a5";
+      sha512 = "07a29dda4ab7aee1a67b8d832e5237ba5bcec6be8fc848985428f7385687269b798530582788e11cc7858a1e0be0cfba5a134d0ac164bfa61c0e2cffc5640c82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/mr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mr/firefox-54.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "042c362723d46b32888fae19cf9b81b2ddc13fbc35123c507cba00171339e2bbb0d107b51f9c18c6d422196bba0c6c1eac2fec2828b1f2f2347eb1d78f10d9e0";
+      sha512 = "18b6d2f31c180ddf27082bc7d15f84c605004641bc6e48277ea061d0cddf02dee872657febab9fd84149688beb36a359864da22d9dd3ff3cfccd05dfbfe8b44b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ms/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ms/firefox-54.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "aa79ef859b97021d4813535fa0ab92af86594a0486444f2ace11176f00b963b456a7c11acf0c3821ba7553777ad464fd2364cf68901e3b6e56acb04db5ad3314";
+      sha512 = "3ad92632ab4858581d1a3039c7ba73c94de38af920f95dd3eaff637d84d25b6925af04fddf400f2e33c5821ef9ba40b431eb66b2fac117aad56ad52850a651c2";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/my/firefox-54.0.tar.bz2";
+      locale = "my";
+      arch = "linux-i686";
+      sha512 = "e99437ff5a9417b15eaaed82c68d49712d212b2062924f84857e80b030668654e423a270199e6d8b60eaa34918c935614e4a85020e2e93f963c37781e1e059cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/nb-NO/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nb-NO/firefox-54.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "7fc4c59b813029f55931265b65963145a0ab6460e0316dfe30810a7867243057e9dadf500224a5604381eb6b13506cf5ed54b91d673e3635c5ad4f253bc1a9ae";
+      sha512 = "c342735a2470fe7e932c66e6a423bcf4b092966c9c89b1a2283a20583cec5f4d878ea35523e74c1405f69702339c453f96d3a52b3bbb851b9b1bf2ab2e304a21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/nl/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nl/firefox-54.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "991f9d18873ab9c451e0ad099f468eb7dc70a52ae70194a1133af98a293737a0846bc2cc48ef6a626bf324df2d2e5a20e0977deeccef6d34abdec463b8029a43";
+      sha512 = "e4a68a804e0607431ec387faf5acce61d66e8bd7f39eb6834a3eceb43349f7b2bbc70fd5939dbaaf26b72232e3d1ffb1a71ad9cecdfc9e58afe2e332e67be4f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/nn-NO/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nn-NO/firefox-54.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "594b7c0de90609c9efa5b9081ade9028a21ac0e48dbe998b6dce8010159175698a091e3f06e1c996f81086a9e37a3792a55fd67f0a2435a48f4f103dfc2cf627";
+      sha512 = "8df06d7a97df865099fa00b3c247bade0ea43975fe13d12904da62e0a84931a91e6555d96a5632ade139956837298b66c4b496cb6568e5794caf09236e23e64d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/or/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/or/firefox-54.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "f47de5cc05616ea138d13f29b46baaecc048e47c582c0b17a6d245acbba49dc4247eecd420616c7df62075cdabb49f014cc0028a52771b6cd7fa157e8900fe15";
+      sha512 = "8db56055a775654b83cf0ff02f9c3c46296245c1a6c3544297495904ca632288bc96f4aecef6439d85706189be3ad1c6cfd6df1c113535dfb9af281a34fcf3e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pa-IN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pa-IN/firefox-54.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "608e53a64a367b34621ad1fedf762fbbcd52428e1d85aa123a24ba099b676f7ab6bde953a45d5598e393b7c0ef53fb80d6189841386c9cef46445560f68fdc69";
+      sha512 = "a3aee571e2d4d5e4c198a58c4e0cf140fc7db77f8a86aca77166b1eda04117456f1518f79d8000ea961e9a2c7c54fba5db5838bd380724c29260cc494c81a978";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pl/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pl/firefox-54.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "169b218f454660b3fed1c1b728d14872cc839d95cbdb962c8d8e3035cba4041a111a850bb517c37b90ba0fc211effbfe0359995e030484b6467ea2b333436205";
+      sha512 = "39a69b56e20f6436e1dea3eba50d816c4aac496107da5a06f093e9f177eb3e11efb169cb25f27766c87f3347d00d9ac63c4028246ea31871b6861ecabccf511d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pt-BR/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pt-BR/firefox-54.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "b9e41a078a4b73d30e1c13a6aea84e9268235229032377dca4c88607ea0c54b9addbfc0c4e5a1ad52f16033dc1d51c35150746d600220d27cc07e037ca3354da";
+      sha512 = "02d450c530e1f219d97b894d2c3c9d2f376aeafb89edba9b2f65d5db5ef7ddf90f43fb4aecb98c0253777158f96b3f49b6adcb9c3fdbd1adf1448fb57420c401";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/pt-PT/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pt-PT/firefox-54.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "bfa18669b700abfb868265b7d5d045d4a8bcbed8b9c0d4430b8035ea9300c9c5270fb2f673d7ac5c1dfa570b4fd4a0d3c2ce43e56f19134f6004c9d5996cd3a4";
+      sha512 = "319b5e765a3a561e54aa9ec967246e335e080c0008a102b1f023725f0905cb624e90dc5afa65e8a6d2209d9b04e59df50a6229f40c590041a5ad9abce9701ef0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/rm/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/rm/firefox-54.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "67e7d274a0cac15f3d7955c1c63064f15a77d83bd3dd0d5916dd59c76affc59e1df3384c47dc5884ee7c988a3b4e21cb1363683b2b13afc03147125c85d2737d";
+      sha512 = "66e70a6969a28f55276ec1a50e581b96b585b671bac733ebcdc5045c4c8473fb8c191ffcf43813cc0eeccd5dfe1068215c4731923a2e5fead423eb52ebd4724d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ro/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ro/firefox-54.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "e2089b66e855015526ce1800ed93abe81b41b712474f6a29a58d7e7b814fb0838d833669cce24302f76983f1d11b90ec9e50437caf6f951be50f96ded4b22e4a";
+      sha512 = "2372437efb96d9e62215d191d3201ea2ea54bb7a328137ceb0532ce08638aa67bd88573e8a2c9746074a91717f431acf68782b75773a81a34ece7ecb117c1c12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ru/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ru/firefox-54.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e1cebc4fdd645ed6e013e189b83b923734bb910b422565a88eaea36f55bc95ce31543010c35b64198acef82618829e3de41254053242ac06ad2829b168bef5bc";
+      sha512 = "aa8c61333efdd8808819c07b00301db4a16aff10a2cd2fb57f172df538ed58148e32b9be87ff0cff69a09306036df1aff13c55532c8a63aceeee93c7692ce8c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/si/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/si/firefox-54.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "65e792b47baa1de0def9e5a381c55ebbfa5e81101ce88e369c0b44781ed04671159bbbdf74461412fd87bb0ae8778f7358da357f73ecb8ed54096563b54be7ae";
+      sha512 = "5f2ed1bc75093da1b3bd2355170575127709f61fd627e84c0170950e9991efe7d6511a29b20907f694fc797cc824fdbe793087e28dd998bd4aacab328151457f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sk/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sk/firefox-54.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "b5954bd0cb0b2184e3894d425c6af6bcc0750a302d19a220f379da848cc1faeb7d0a73809ac5d9190e19b955e354b62bb08310f06a08fe566fa90775070995f5";
+      sha512 = "9eb52821878542601040b926ac80035f92cbc9b568d5fba5c79e49d53245b4e4480b5e1ece0b671d0d77e86d3596758f5defd2f87e640836d1722341f24eed15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sl/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sl/firefox-54.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "de7f5650e3723c4c1be6c85dfd184a47336e9912a3482b5367c734238073d73458fdf6db0350ec7fe229ac6268adb6b3c825b493f7e7c03fefaa538a9a3538e3";
+      sha512 = "0f0d38df630f9e501e074d7fa1c0d7e8f4841a0e7a17aaee9d369432f2a7a14321011759c843fba3cea41f24a5aa929f94b47be8b76409d3b8931cb660dfe938";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/son/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/son/firefox-54.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "6e751724307db69ff14ca3149bd919e1d0f203083e0d15087f10a5f25715416ba84b25eeb6d8146ed97bafb3f53889fc24ad225c06bc67fa47e07dcaee8655ef";
+      sha512 = "1a68b374225b6dfe831ad090c26985abf309b788ac418baba20ba9296dd647e0d66ed6563235918dcba80839f06ec8f3e64e1d54b8d8baef9a10275f860b99bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sq/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sq/firefox-54.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "22e2ed05c946c91152d30bfbf0dd38396d07050690294eff0910c80cd3cd7970181b6019c22eec9dbc07f5511fbb14813e87445b04f8e4a9977c34ba242b8008";
+      sha512 = "382fa3024f3a776ba18e10a66d6dd6b5b9640dab2b1f1088f1e6f385332dccf1fd5acf2f77881128444c36bdd4e82a311327755c8d469e7e02360b054a7b3c20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sr/firefox-54.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b8c6a818b0d4ea3830e5840c307f059857a323f094e32233560f34148ff7f889dc0e7af85997cbd39cc09a34ec4409e5cba8ad4a3700b9f296cc1655d76ca613";
+      sha512 = "e31e17699727e40eb3be4f21b483163edc385c5ab19f1fe6bbe51b50525f17ff126d94937e2faf31d2c993730697d5911703bf6b9519338a995c1694a016da22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/sv-SE/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sv-SE/firefox-54.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "8d6c1fb2c9f29c5821e7a104a131d8d18e7cca5bed59a67fb0fe7338f569b8ae514514cae3cee55cc9a28a42e429cdc3728fb73484deb85a2493c6f966de10fb";
+      sha512 = "a7ec76ad1db4e9d0a472625ba476f410018f0df6a9c76b81079cff894300ef21b489e0be73107e349982aeb3fa496ac6aad99651228b001422270d97e8caf1a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ta/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ta/firefox-54.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "5177a282aa879798962fdab652799739f30c66b5d56cae807dd2df1a58932968b1f668c4239c253fb81a4e2a51f014f17146d15f9534b8afd8f4ad76e0786325";
+      sha512 = "cd47c0d9cdc92f91ec284aeb2f858317c6fc52afa183ebd2bdc6c038a8dc1d343f7881ceec53844c821c5a6786fc05b5344cd2e213f4ba598d5ae23a78c7a6a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/te/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/te/firefox-54.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "524913d7bd13d930501a87e63461233a8afbe5ee8efeabff09a47ce835457dba0b197766bd92e1857c2a2d957e8a37c45819514b06cc9264b6be7a91c4112ce4";
+      sha512 = "bd0b47f0f85a5b05bbc1a7640da9ce79f018cd7daee8d5fa2b011f8c91ded499305c4bb53290ec0a0224e69f500e5b9ad173898d10a4071e425c7004ed8fe5ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/th/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/th/firefox-54.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "3f56c618b406e8b7a9ad2bc8646bbe3d48d405b5ca960bede132c0b05558a85a09f9054055256a53a4fffdcb7e60a4265aed09522e432b6461581b444b003501";
+      sha512 = "ecdbf45a5a5b1fdcbdc3fe52a69f7310dc3b1b76c758ed5a055daebe7b0aa47be398ad8cc6df403db93a9b49b85eba5611debeb6abceff4511a58ce6d71632c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/tr/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/tr/firefox-54.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "7dafa29e3663967a1fcad46395433d43e523cd48872bcd78292703610d39fd206646809f8126b87436424a3db2666585fabd2d6f8f431ba524217b4086d7ed47";
+      sha512 = "dad56a8230094269fcc64d01f33b38d399fbbcedcafec26ea34e2c6edd6caac2f821b3aa2ba755ae9222400076f1753ed5a31c374a1c858cb53151a5af9614e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/uk/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/uk/firefox-54.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "6d304c4f822f650061dff8f41803c30c767a48dd73e8f32e5b164f63d9370243d5954c280ac6a19822b85836b7a0a9202ca1bb892319a51bdee7113cdfc10dbe";
+      sha512 = "3ec96ff7b5ae14eb7331970899138c9cb12e3d369c48df1af970cf4805be9fb232c9197b0956dc69b48470eef29f85b6507dd7707da78c64611ee5229c82dd3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/ur/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ur/firefox-54.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "9bb203445fbc293a2f972b39569dd31b3b87d5f5e7be4ae5fca946fed828a05ccfe06ddc0ae34401471cc08a907e7ffa336727d25610729470e0842b4680bb1c";
+      sha512 = "b02959b4f8c456fbc1017b36d468449aab678008e05bf73dbeed4b69becdc9688bdc6f1c404cd749327b7cabf44c4b969c2f851402ab9ac7196ab53b5c974c26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/uz/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/uz/firefox-54.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "71377fb8fda9ca8a0d606ae1944328195fabc51d57923edc9e9bcc10b08859141553c855ecd325fe02cf422a6af2f1a9b104bfbfb7d96399f0d7fbb1ac050bde";
+      sha512 = "bff5034a765276f48aa43c0cf72ce1fc29ac8c39a296f72b330668ba6dd28cc32abf7eec4c31b247f12e7458f8f4640978fe0dc5a2d4a883b13e3335ede042a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/vi/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/vi/firefox-54.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "a1e62493b7629b5acc950e1f0ed18845d3dec9cf01b561058a9d67e3420418110391f245fc584535c500e8bace53218305a66e60439e781de340f9bac7085f39";
+      sha512 = "172665812d4c239ab8d9bc7610744fd88e721801d1939eff27dd8f7bc1614ca09bbc67d0de2518b76617cc804c7b98080b4a4c673b0dcf880fe57e58f8e75dff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/xh/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/xh/firefox-54.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "948854c1ddd02f6dc0df035156481c66ff66c475988c9555cc2eb79dbebf9134291e4f4624a82e95736f08c1043e2d61077bbadb22b765682ee1a76338209d32";
+      sha512 = "1a238fa435714d9e83a4d3e0d31f33350e40b2617d0b72698a6e381e7a8ece884a129fea5b7803b3564625089f26b4760e7547f497c964a9fce66fff11bbbd43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/zh-CN/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/zh-CN/firefox-54.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "79f2ed7038f129ea81fc20dd41d93b91731a38b0fd984f7ea2354b5d6391fda9301a99df9afc87e2130ffbb72b4efc1ba26678b2d7cf4c274f82407d6265961f";
+      sha512 = "60fea3731a2d67b9480158011a2ea9df119b4db54018e0ac4194a1e86312f495647ee1861aa8ae1b9f6ff6cee28f925c061064c035f1fd23d37495211ad8744c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/53.0.3/linux-i686/zh-TW/firefox-53.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/zh-TW/firefox-54.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f8f081aaf28264a566909d36dd63d7bdafecc8b84f2238974eda749fb83c7f90b774d5bd46aba6e8a7e7bd14c57167123eddaf2a28fb83db7c5029cef886ca52";
+      sha512 = "0462e6b2ba08a09ec422aadcef76ed2f406f57addd4ae4a8469e4801010d7a5fe89a69e9f201cdd2c5258cad4e381f2f0616dc1c1daed07d8ebf7fc1c036e143";
     }
     ];
 }
-- 
GitLab


From b707e8c78f5370ede2e0f5c077745eef1fc60883 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Wed, 14 Jun 2017 15:18:56 +0300
Subject: [PATCH 0684/1490] perlPackages: init packages needed for bugzilla
 (#26569)

perlPackages.EmailMIMEAttachmentStripper: init at 1.317
perlPackages.EmailReply: init at 1.204
perlPackages.PatchReader: init at 0.9.6
perlPackages.TemplateGD: init at 2.66
perlPackages.AuthenRadius: init at 0.26
perlPackages.Chart: init at 2.4.10
perlPackages.EmailMIMEModifier at 1.444
---
 pkgs/top-level/perl-packages.nix | 102 ++++++++++++++++++++++++++++++-
 1 file changed, 100 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b9eb8a82eef..2282cdc2f32 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -517,6 +517,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  AuthenRadius = buildPerlPackage rec {
+    name = "Authen-Radius-0.26";
+    src = fetchurl {
+      url = "http://search.cpan.org/CPAN/authors/id/P/PO/PORTAONE/${name}.tar.gz";
+      sha256 = "4f272c19b8a9f6514a1107e98efae6773208233df4db11f2dc4764b4784b17c3";
+    };
+    buildInputs = [ TestNoWarnings ];
+    propagatedBuildInputs = [ DataHexDump NetIP ];
+    meta = {
+      description = "Provide simple Radius client facilities  ";
+      license = with stdenv.lib.licenses; [ artistic2 ];
+    };
+  };
+
   AuthenSASL = buildPerlPackage rec {
     name = "Authen-SASL-2.16";
     src = fetchurl {
@@ -1735,6 +1749,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Chart = buildPerlPackage rec {
+    name = "Chart-2.4.10";
+    src = fetchurl {
+      url = "http://search.cpan.org/CPAN/authors/id/C/CH/CHARTGRP/${name}.tar.gz";
+      sha256 = "84bd99a1a0ce72477b15e35881e6120398bb3f553aeeb5e8d72b088520e4f6bf";
+    };
+    propagatedBuildInputs = [ GD ];
+    meta = {
+        description = "A series of charting modules";
+        license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   ClassAccessor = buildPerlPackage {
     name = "Class-Accessor-0.34";
     src = fetchurl {
@@ -4510,6 +4537,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  EmailReply = buildPerlPackage rec {
+    name = "Email-Reply-1.204";
+    src = fetchurl {
+      url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "ba4fd80ac5017d6d132e0358c786b0ecd1c7adcbeee5c19fb3da2964791a56f0";
+    };
+    propagatedBuildInputs = [ EmailAbstract EmailAddress EmailMIME ];
+    meta = {
+      homepage = "http://search.cpan.org/~rjbs/${name}";
+      description = "Reply to an email message";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   EmailMessageID = buildPerlPackage {
     name = "Email-MessageID-1.404";
     src = fetchurl {
@@ -4540,6 +4581,22 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  EmailMIMEAttachmentStripper = buildPerlPackage rec {
+    name = "Email-MIME-Attachment-Stripper-1.317";
+    buildInputs = [ CaptureTiny TestPod ];
+    propagatedBuildInputs = [ EmailAbstract EmailMIME ];
+
+    src = fetchurl {
+        url = "http://www.cpan.org/authors/id/R/RJ/RJBS/${name}.tar.gz";
+        sha256 = "dcb98b09dc3e8f757ec3882a4234548108bb2d12e3cfadf95a26cef381a9e789";
+    };
+    meta = {
+        homepage = "http://search.cpan.org/dist/${name}";
+        description = "Strip the attachments from an email";
+        license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   EmailMIMEContentType = buildPerlPackage rec {
     name = "Email-MIME-ContentType-1.018";
     src = fetchurl {
@@ -4569,6 +4626,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  EmailMIMEModifier = buildPerlPackage rec {
+    doCheck = false; # tests are broken, it seems
+    name = "Email-MIME-Modifier-1.444";
+    src = fetchurl {
+      url = "http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "4521cf361527cd9b5e8b0db3d2e6c9588c52de6a8997e1daf5c21ed1eb7a4ba2";
+    };
+    propagatedBuildInputs = [ EmailMIME EmailMIMEContentType ];
+    meta = {
+      homepage = "http://search.cpan.org/~rjbs/${name}";
+      description = "Modify Email::MIME Objects Easily";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   EmailSend = buildPerlPackage rec {
     name = "Email-Send-2.201";
     src = fetchurl {
@@ -4761,7 +4833,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1vzpz6syb82ir8svp2wjh95x6lpf01lgkxn2xy60ixrszc24zdya";
     };
   };
- 
+
   EV = buildPerlPackage rec {
     name = "EV-4.22";
     src = fetchurl {
@@ -10406,6 +10478,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  PatchReader = buildPerlPackage rec {
+    name = "PatchReader-0.9.6";
+    src = fetchurl {
+      url = "http://search.cpan.org/CPAN/authors/id/T/TM/TMANNERM/${name}.tar.gz";
+      sha256 = "b8de37460347bb5474dc01916ccb31dd2fe0cd92242c4a32d730e8eb087c323c";
+    };
+    meta = {
+      homepage = "http://search.cpan.org/~tmannerm/${name}";
+      description = "Utilities to read and manipulate patches and CVS";
+      license = with stdenv.lib.licenses; [ artistic1 ];
+    };
+  };
+
   PackageStash = buildPerlPackage {
     name = "Package-Stash-0.37";
     src = fetchurl {
@@ -11471,7 +11556,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "09c8xb43p1s6ala6g4274az51mf33phyjkp66dpvgkgbi1xfnawp";
     };
   };
-  
+
   RegexpGrammars = buildPerlPackage rec {
     name = "Regexp-Grammars-1.045";
     src = fetchurl {
@@ -12771,6 +12856,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+   TemplateGD = buildPerlPackage rec {
+    name = "Template-GD-2.66";
+    src = fetchurl {
+      url = "http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${name}.tar.gz";
+      sha256 = "98523c8192f2e8184042e5a2e172bd767ac289dd2e480f35f680dce32160905b";
+    };
+    propagatedBuildInputs = [ GD TemplateToolkit ];
+    meta = {
+      description = "GD plugin(s) for the Template Toolkit";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   TermANSIColor = buildPerlPackage {
     name = "Term-ANSIColor-4.03";
     src = fetchurl {
-- 
GitLab


From ceb34c6d95044b37605e49dc6b2ae73ef5be8210 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Jun 2017 21:33:35 +0900
Subject: [PATCH 0685/1490] nspr: 4.13.1 -> 4.15

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 71a15b7e477..c2aea07d102 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl
 , CoreServices ? null }:
 
-let version = "4.13.1"; in
+let version = "4.15"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab";
+    sha256 = "101dksqm1z0hzd7ap82ccbxjr48s6q3xhshdl81qkj6hqdmy1p97";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 0ed1aead70e8ba7394df9d32df50c0b54e0ed480 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Jun 2017 21:45:07 +0900
Subject: [PATCH 0686/1490] nss: 3.30 -> 3.31

---
 pkgs/development/libraries/nss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 396d795c5a4..80975c8ef5d 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.30";
+  version = "3.31";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_30_RTM/src/${name}.tar.gz";
-    sha256 = "a8c0000dae5e992f6563972e26dbfefc50d006dd845c43b8ca24ea50169ff3a9";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_31_RTM/src/${name}.tar.gz";
+    sha256 = "0pd643a8ns7q5az5ai3ascrw666i2kbfiyy1c9hlhw9jd8jn21g9";
   };
 
   buildInputs = [ perl zlib sqlite ];
-- 
GitLab


From 04e95882c0eadcfeaed91e1610e1d21921c02eba Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Jun 2017 21:10:49 +0900
Subject: [PATCH 0687/1490] firefox: 53.0.3 -> 54.0

---
 .../browsers/firefox/cargo-fix.patch          | 33 -------------------
 .../networking/browsers/firefox/packages.nix  |  6 ++--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/cargo-fix.patch

diff --git a/pkgs/applications/networking/browsers/firefox/cargo-fix.patch b/pkgs/applications/networking/browsers/firefox/cargo-fix.patch
deleted file mode 100644
index bb19e9e45a3..00000000000
--- a/pkgs/applications/networking/browsers/firefox/cargo-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/media/libstagefright/binding/mp4parse-cargo.patch b/media/libstagefright/binding/mp4parse-cargo.patch
-index 1dd13d2..f98b722 100644
---- a/media/libstagefright/binding/mp4parse-cargo.patch
-+++ b/media/libstagefright/binding/mp4parse-cargo.patch
-@@ -27,12 +27,13 @@ diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libst
- index aeeebc65..5c0836a 100644
- --- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
- +++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
--@@ -18,18 +18,10 @@ exclude = [
-+@@ -18,17 +18,12 @@ exclude = [
-    "*.mp4",
-  ]
-  
- -build = "build.rs"
---
-++build = false
-++
-  [dependencies]
-  byteorder = "1.0.0"
-  "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
-diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-index aee7ee9..d7e3f55 100644
---- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-+++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-@@ -18,6 +18,8 @@ exclude = [
-   "*.mp4",
- ]
- 
-+build = false
-+
- [dependencies]
- byteorder = "1.0.0"
- "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 8f117e1416b..3df6b9195bc 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,14 +6,12 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "53.0.3";
+    version = "54.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "cef5de1e9d6ddf6509a80cd30169fdce701b2fed022979ba5931ccea7b8f77cb644b01984dae028d350e32321cfe2eefc0236c0731bf5a2be12a994fc3fc1118";
+      sha512 = "0ff6960804e7f6d3e15faeb14b237fee45acae31b4652a6cc5cafa1a1b1eab3537616c3e8ea6d8f3109c87dcc8f86f0df3da2627903b80061c8a62fb11598ed9";
     };
 
-    patches = [ ./cargo-fix.patch ];
-
     meta = {
       description = "A web browser built from Firefox source tree";
       homepage = http://www.mozilla.com/en-US/firefox/;
-- 
GitLab


From 930a00bc923dbd49e42cdae080e363245a55665a Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 14 Jun 2017 21:10:50 +0900
Subject: [PATCH 0688/1490] firefox-esr: 52.1.2esr -> 52.2.0esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 3df6b9195bc..bf33595b54c 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -25,10 +25,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.1.2esr";
+    version = "52.2.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "76362738f6db82a41ff6af4e12a15a302068a5ce10d23739f29375f3279573d0ea43ecee9d2e46fce833a029e437efcfcceab9442c288560f476e0cff2ea9e1d";
+      sha512 = "62a2bd47c9f4b325199b8a0b155a7a412ffbd493e8ca6ff246ade5b10aacea22bc806bc646824059f7c97b71d27e167025c600293c781fbad3fdefb8bbc8d18e";
     };
 
     meta = firefox.meta // {
-- 
GitLab


From ca17f3b8efc48af4f8a6128c1d5de7146053af40 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Wed, 14 Jun 2017 16:44:46 +0200
Subject: [PATCH 0689/1490] hostapd dependency fix for
 https://github.com/nixos/nixpkgs/issues/16090 (#26573)

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

diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index fd4545e88e2..bf2d0916fa3 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -164,7 +164,7 @@ in
         path = [ pkgs.hostapd ];
         wantedBy = [ "network.target" ];
 
-        after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service"];
+        after = [ "${cfg.interface}-cfg.service" "nat.service" "bind.service" "dhcpd.service" "sys-subsystem-net-devices-${cfg.interface}.device" ];
 
         serviceConfig =
           { ExecStart = "${pkgs.hostapd}/bin/hostapd ${configFile}";
-- 
GitLab


From b2660fe3cca8fd87d1def86798423783726f1906 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 14 Jun 2017 10:44:33 -0500
Subject: [PATCH 0690/1490] mplayer: Use system ffmpeg instead of vendored
 version. (#26572)

Fixes use of mplayer with https:// URL's.
---
 pkgs/applications/video/mplayer/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index ba02583a274..37b424d922b 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -93,6 +93,8 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     sed -i /^_install_strip/d configure
+
+    rm -rf ffmpeg
   '';
 
   buildInputs = with stdenv.lib;
@@ -159,6 +161,7 @@ stdenv.mkDerivation rec {
       ${optionalString stdenv.isLinux "--enable-vidix"}
       ${optionalString stdenv.isLinux "--enable-fbdev"}
       --disable-ossaudio
+      --disable-ffmpeg_a
     '';
 
   NIX_LDFLAGS = with stdenv.lib;
-- 
GitLab


From 13a8fa88011a45447ec26f81c473fe7f39172d02 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Wed, 14 Jun 2017 15:46:13 +0000
Subject: [PATCH 0691/1490] nixos-artwork: do not leak nix hashes to filenames
 in /share/artwork/gnome/ (#26566)

* nixos-artwork: do not leak nix hashes to filenames /share/artwork/gnome/

* simplify
---
 pkgs/data/misc/nixos-artwork/wallpapers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix
index 28bf0d40b39..254f13825ab 100644
--- a/pkgs/data/misc/nixos-artwork/wallpapers.nix
+++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix
@@ -10,7 +10,7 @@ let
 
       installPhase = ''
         mkdir -p $out/share/artwork/gnome
-        ln -s $src $out/share/artwork/gnome/
+        ln -s $src $out/share/artwork/gnome/${src.name}
       '';
 
       meta = with stdenv.lib; {
-- 
GitLab


From 3a9c7c6c1880b6b09fd29074d64ba8ffb54896c4 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Wed, 14 Jun 2017 17:50:48 +0200
Subject: [PATCH 0692/1490] pythonPackages.netcdf4: add missing cython
 dependency (#26570)

---
 .../python-modules/{netcdf4.nix => netcdf4/default.nix}     | 6 +++++-
 pkgs/top-level/python-packages.nix                          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename pkgs/development/python-modules/{netcdf4.nix => netcdf4/default.nix} (90%)

diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4/default.nix
similarity index 90%
rename from pkgs/development/python-modules/netcdf4.nix
rename to pkgs/development/python-modules/netcdf4/default.nix
index b123921a1ce..8f06957bf22 100644
--- a/pkgs/development/python-modules/netcdf4.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchurl, isPyPy
-, numpy, zlib, netcdf, hdf5, curl, libjpeg
+, numpy, zlib, netcdf, hdf5, curl, libjpeg, cython
 }:
 buildPythonPackage rec {
   pname = "netCDF4";
@@ -13,6 +13,10 @@ buildPythonPackage rec {
     sha256 = "31eb4eae5fd3b2bd8f828721142ddcefdbf10287281bf6f636764dd7957f8450";
   };
 
+  buildInputs = [
+    cython
+  ];
+
   propagatedBuildInputs = [
     numpy
     zlib
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55128c4aaa4..9e957218263 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8066,7 +8066,7 @@ in {
     };
   };
 
-  netcdf4 = callPackage ../development/python-modules/netcdf4.nix { };
+  netcdf4 = callPackage ../development/python-modules/netcdf4 { };
 
   Nikola = callPackage ../development/python-modules/Nikola { };
 
-- 
GitLab


From 24d313e2039b6d89f8a1ba4c5be12b134479fe67 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Wed, 14 Jun 2017 11:41:00 -0300
Subject: [PATCH 0693/1490] justStaticExecutables: enable -dead_strip on mac to
 shrink closure

---
 pkgs/development/haskell-modules/lib.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 6c718bafda5..30d82d3efc9 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -89,7 +89,10 @@ rec {
     isLibrary = false;
     doHaddock = false;
     postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
-  });
+  } // (if pkgs.stdenv.isDarwin then {
+    configureFlags = (drv.configureFlags or []) ++ ["--ghc-option=-optl=-dead_strip"];
+  } else {})
+  );
 
   buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: {
     unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in ''
-- 
GitLab


From b7f4e04c18dd75a1fc0d51a0395150797fb44f23 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 14 Jun 2017 18:04:23 +0000
Subject: [PATCH 0694/1490] ocamlPackages.mparser: 1.2.1 -> 1.2.3

---
 pkgs/development/ocaml-modules/mparser/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix
index 6490eeb2f38..9a935cf4a5a 100644
--- a/pkgs/development/ocaml-modules/mparser/default.nix
+++ b/pkgs/development/ocaml-modules/mparser/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-mparser-1.2.1";
+  name = "ocaml${ocaml.version}-mparser-1.2.3";
   src = fetchzip {
-    url = http://github.com/cakeplus/mparser/archive/1.2.1.tar.gz;
-    sha256 = "1g1r3p0inmm5xwh9i5mrc4s414b0j8l13a66hpvwhqcpp6qglfh3";
+    url = http://github.com/cakeplus/mparser/archive/1.2.3.tar.gz;
+    sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ];
-- 
GitLab


From 3628ce4d67184a92576f795279bce1bf240d9b1d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 14 Jun 2017 19:23:13 +0200
Subject: [PATCH 0695/1490] intel-gpu-tools: 1.18 -> 1.19

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

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index f644160b9a3..d1aef990230 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -3,11 +3,11 @@
 , procps, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "intel-gpu-tools-1.18";
+  name = "intel-gpu-tools-1.19";
 
   src = fetchurl {
     url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2";
-    sha256 = "1vp4czxp8xa6qk4pg3mrxhc2yadw2rv6p8r8247mkpcbb8dzjxyz";
+    sha256 = "1wdhwf3im6ids95qw5r9hjj9hvp0qhzgi4llrlriy723q3kqm754";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf automake ];
-- 
GitLab


From fcf205024a642902648d80444a4df5a31b455bf5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 14 Jun 2017 20:14:07 +0200
Subject: [PATCH 0696/1490] jasper: 2.0.12 -> 2.0.13, fixes CVE-2017-6850

---
 pkgs/development/libraries/jasper/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 34e7e4a761f..63dd931a139 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, libjpeg, cmake }:
+{ stdenv, fetchFromGitHub, fetchpatch, libjpeg, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "jasper-2.0.12";
-
-  src = fetchurl {
-    # You can find this code on Github at https://github.com/mdadams/jasper
-    # however note at https://www.ece.uvic.ca/~frodo/jasper/#download
-    # not all tagged releases are for distribution.
-    url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz";
-    sha256 = "1njdbxv7d4anzrd476wjww2qsi96dd8vfnp4hri0srrqxpszl92v";
+  name = "jasper-${version}";
+  version = "2.0.13";
+
+  src = fetchFromGitHub {
+    repo = "jasper";
+    owner = "mdadams";
+    rev = "version-${version}";
+    sha256 = "1kd2xiszg9bxfavs3fadi4gi27m876d9zjjy0ns6mmbcjk109c0a";
   };
 
   # newer reconf to recognize a multiout flag
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.ece.uvic.ca/~frodo/jasper/;
     description = "JPEG2000 Library";
     platforms = platforms.unix;
+    maintainers = with maintainers; [ pSub ];
   };
 }
-- 
GitLab


From f59104bc736cd47d98814da073db772298ae32d9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Jun 2017 21:28:28 +0200
Subject: [PATCH 0697/1490] vcsh: patch broken parser for $GIT_VERSION_MINOR

---
 pkgs/applications/version-management/vcsh/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix
index 038e72e83a0..e15bc489beb 100644
--- a/pkgs/applications/version-management/vcsh/default.nix
+++ b/pkgs/applications/version-management/vcsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }:
+{ stdenv, fetchpatch, fetchFromGitHub, which, git, ronn, perl, ShellCommand, TestMost }:
 
 stdenv.mkDerivation rec {
   version = "1.20170226";       # date of commit we're pulling
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "16lb28m4k7n796cc1kifyc1ixry4bg69q9wqivjzygdsb77awgln";
   };
 
+  patches =
+    [ (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch";
+                    sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k";
+                  })
+    ];
+
   buildInputs = [ which git ronn perl ShellCommand TestMost ];
 
   installPhase = "make install PREFIX=$out";
-- 
GitLab


From 98c38d51b944e984805a6b150e2a80e7401c0e72 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 14 Jun 2017 14:11:26 -0500
Subject: [PATCH 0698/1490] dropbox: 27.4.22 -> 28.4.14

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 9c68253cf42..12ed28979d2 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "27.4.22";
+  version = "28.4.14";
   sha256 =
     {
-      "x86_64-linux" = "1v1q799dj0bffg3s98ifzpsccjaajl221h5ckaqijlmpzr2q5hhh";
-      "i686-linux"   = "1qsw6c0mb0n0djz7xpfixispi9k68kbvf8dc92frpcbcvm0h845y";
+      "x86_64-linux" = "02pfly33bg85c8y3igvkhyshra8ra089ghjibhzl1a4fmd45wf52";
+      "i686-linux"   = "10swkjbzkyf19cilzw7ja6byla4dllr52pbz19wjzb8rv088gcla";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
-- 
GitLab


From 4f909c4f3a4f3ba26fb205c4e0aaaafc64daaf3c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 14 Jun 2017 22:58:42 +0200
Subject: [PATCH 0699/1490] tor-browser-bundle-bin: 7.0 -> 7.0.1

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index d8ab6d5d1d1..09ca83b5acd 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -81,7 +81,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.0";
+  version = "7.0.1";
 
   lang = "en-US";
 
@@ -91,7 +91,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1c9aiv4qdpi95yymmj86hkkinvkgbcdsa12vvdh9c18wsh4qrfvn";
+      sha256 = "1zmczf1bpbd85zcrs5qw91d1xmplikbna5xs053jnjl6pbbq1fs9";
     };
 
     "i686-linux" = fetchurl {
@@ -99,7 +99,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1znbywcwlrrl3hbvk4dvq92b00flr8niw2kqk5pwvwwbl1gxiyz0";
+      sha256 = "0mdlgmqkryg0i55jgf3x1nnjni0x45g1xcjwsfacsck3m70v4flq";
     };
   };
 in
-- 
GitLab


From 7ef9a9ffc17048f725836c9e95b33213af680068 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 14 Jun 2017 18:56:35 +0200
Subject: [PATCH 0700/1490] ddcutil: init at 0.8.2

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

diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
new file mode 100644
index 00000000000..c45c85e4271
--- /dev/null
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "ddcutil-${version}";
+  version = "0.8.2";
+
+  src = fetchFromGitHub {
+    owner  = "rockowitz";
+    repo   = "ddcutil";
+    rev    = "v${version}";
+    sha256 = "1hcdg54xyb1pfl03iqll14y9yglwmyvxyvhbql87hd9q0dywah6m";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [
+    i2c-tools udev libgudev
+    glib libusb libdrm xorg.libXrandr
+  ];
+
+  meta = with stdenv.lib; {
+    homepage    = http://www.ddcutil.com/;
+    description = "Query and change Linux monitor settings using DDC/CI and USB";
+    license     = licenses.gpl2;
+    maintainer  = with maintainers; [ rnhmjoj ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbe2a9bfc5c..2e9c53df192 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1544,6 +1544,8 @@ with pkgs;
 
   ddccontrol-db = callPackage ../data/misc/ddccontrol-db { };
 
+  ddcutil = callPackage ../tools/misc/ddcutil { };
+
   ddclient = callPackage ../tools/networking/ddclient { };
 
   dd_rescue = callPackage ../tools/system/dd_rescue { };
-- 
GitLab


From fdef885d9769fe619e1f9b7bc780047cd2e01fa3 Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Wed, 14 Jun 2017 17:25:46 -0500
Subject: [PATCH 0701/1490] ply: init at v1-beta1(9e810b1)

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

diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
new file mode 100644
index 00000000000..4d8e5001b0b
--- /dev/null
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -0,0 +1,30 @@
+{ autoconf, automake, flex, yacc, stdenv, kernel, fetchFromGitHub }:
+let
+  version = "1.0.beta1-9e810b1";
+in stdenv.mkDerivation {
+  name = "ply-${version}";
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
+  buildInputs = [
+    flex
+    yacc
+    kernel
+    stdenv.cc
+  ];
+
+  src = fetchFromGitHub {
+    owner = "iovisor";
+    repo = "ply";
+    rev = "9e810b157ba079c32c430a7d4c6034826982056e";
+    sha256 = "15cp6iczawaqlhsa0af6i37zn5iq53kh6ya8s2hzd018yd7mhg50";
+  };
+
+  preConfigure = "sh autogen.sh --prefix=$out";
+
+  configureFlags = [
+    "--with-kerneldir=${kernel.dev}"
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbe2a9bfc5c..c2006d9b006 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12008,6 +12008,8 @@ with pkgs;
     nvidia_x11_beta      = nvidiaPackages.beta;
     nvidia_x11           = nvidiaPackages.stable;
 
+    ply = callPackage ../os-specific/linux/ply { };
+
     rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { };
 
     rtl8812au = callPackage ../os-specific/linux/rtl8812au { };
-- 
GitLab


From 3dcecf09fc1c7c32b88dab97a87591543300a48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 15 Jun 2017 06:41:45 +0200
Subject: [PATCH 0702/1490] Remove aiccu package and service due to sunsetting.

https://www.sixxs.net/main/
---
 nixos/doc/manual/release-notes/rl-1709.xml  |   6 +
 nixos/modules/module-list.nix               |   1 -
 nixos/modules/services/networking/aiccu.nix | 185 --------------------
 pkgs/tools/networking/aiccu/default.nix     |  43 -----
 4 files changed, 6 insertions(+), 229 deletions(-)
 delete mode 100644 nixos/modules/services/networking/aiccu.nix
 delete mode 100644 pkgs/tools/networking/aiccu/default.nix

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index c16499a0c1d..b1bef8ef1c2 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -55,6 +55,12 @@ has the following highlights: </para>
 following incompatible changes:</para>
 
 <itemizedlist>
+  <listitem>
+    <para>
+      <literal>aiccu</literal> package was removed. This is due to SixXS
+      <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6 tunnel.
+    </para>
+  </listitem>
   <listitem>
     <para>
       Top-level <literal>idea</literal> package collection was renamed.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bdede1726a1..7f94d6569e9 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -389,7 +389,6 @@
   ./services/network-filesystems/u9fs.nix
   ./services/network-filesystems/yandex-disk.nix
   ./services/network-filesystems/xtreemfs.nix
-  ./services/networking/aiccu.nix
   ./services/networking/amuled.nix
   ./services/networking/asterisk.nix
   ./services/networking/atftpd.nix
diff --git a/nixos/modules/services/networking/aiccu.nix b/nixos/modules/services/networking/aiccu.nix
deleted file mode 100644
index ac755270951..00000000000
--- a/nixos/modules/services/networking/aiccu.nix
+++ /dev/null
@@ -1,185 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.aiccu;
-  notNull = a: ! isNull a;
-  configFile = pkgs.writeText "aiccu.conf" ''
-    ${if notNull cfg.username then "username " + cfg.username else ""}
-    ${if notNull cfg.password then "password " + cfg.password else ""}
-    protocol ${cfg.protocol}
-    server ${cfg.server}
-    ipv6_interface ${cfg.interfaceName}
-    verbose ${boolToString cfg.verbose}
-    daemonize true
-    automatic ${boolToString cfg.automatic}
-    requiretls ${boolToString cfg.requireTLS}
-    pidfile ${cfg.pidFile}
-    defaultroute ${boolToString cfg.defaultRoute}
-    ${if notNull cfg.setupScript then cfg.setupScript else ""}
-    makebeats ${boolToString cfg.makeHeartBeats}
-    noconfigure ${boolToString cfg.noConfigure}
-    behindnat ${boolToString cfg.behindNAT}
-    ${if cfg.localIPv4Override then "local_ipv4_override" else ""}
-  '';
-
-in {
-
-  options = {
-
-    services.aiccu = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable aiccu IPv6 over IPv4 SiXXs tunnel";
-      };
-
-      username = mkOption {
-        type = with types; nullOr str;
-        default = null;
-        example = "FAB5-SIXXS";
-        description = "Login credential";
-      };
-
-      password = mkOption {
-        type = with types; nullOr str;
-        default = null;
-        example = "TmAkRbBEr0";
-        description = "Login credential";
-      };
-
-      protocol = mkOption {
-        type = types.str;
-        default = "tic";
-        example = "tic|tsp|l2tp";
-        description = "Protocol to use for setting up the tunnel";
-      };
-
-      server = mkOption {
-        type = types.str;
-        default = "tic.sixxs.net";
-        example = "enabled.ipv6server.net";
-        description = "Server to use for setting up the tunnel";
-      };
-
-      interfaceName = mkOption {
-        type = types.str;
-        default = "aiccu";
-        example = "sixxs";
-        description = ''
-          The name of the interface that will be used as a tunnel interface.
-          On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels
-          or tunX (eg tun0) for AYIYA tunnels.
-        '';
-      };
-
-      tunnelID = mkOption {
-        type = with types; nullOr str;
-        default = null;
-        example = "T12345";
-        description = "The tunnel id to use, only required when there are multiple tunnels in the list";
-      };
-
-      verbose = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Be verbose?";
-      };
-
-      automatic = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Automatic Login and Tunnel activation";
-      };
-
-      requireTLS = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          When set to true, if TLS is not supported on the server
-          the TIC transaction will fail.
-          When set to false, it will try a starttls, when that is
-          not supported it will continue.
-          In any case if AICCU is build with TLS support it will
-          try to do a 'starttls' to the TIC server to see if that
-          is supported.
-        '';
-      };
-
-      pidFile = mkOption {
-        type = types.path;
-        default = "/run/aiccu.pid";
-        example = "/var/lib/aiccu/aiccu.pid";
-        description = "Location of PID File";
-      };
-
-      defaultRoute = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Add a default route";
-      };
-
-      setupScript = mkOption {
-        type = with types; nullOr path;
-        default = null;
-        example = "/var/lib/aiccu/fix-subnets.sh";
-        description = "Script to run after setting up the interfaces";
-      };
-
-      makeHeartBeats = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          In general you don't want to turn this off
-          Of course only applies to AYIYA and heartbeat tunnels not to static ones
-        '';
-      };
-
-      noConfigure = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Don't configure anything";
-      };
-
-      behindNAT = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Notify the user that a NAT-kind network is detected";
-      };
-
-      localIPv4Override = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Overrides the IPv4 parameter received from TIC
-          This allows one to configure a NAT into "DMZ" mode and then
-          forwarding the proto-41 packets to an internal host.
-
-          This is only needed for static proto-41 tunnels!
-          AYIYA and heartbeat tunnels don't require this.
-        '';
-      };
-
-    };
-  };
-
-  config = mkIf cfg.enable {
-
-    systemd.services.aiccu = {
-      description = "Automatic IPv6 Connectivity Client Utility";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.aiccu}/bin/aiccu start ${configFile}";
-        ExecStop = "${pkgs.aiccu}/bin/aiccu stop";
-        Type = "forking";
-        PIDFile = cfg.pidFile;
-        Restart = "no"; # aiccu startup errors are serious, do not pound the tic server or be banned.
-      };
-    };
-
-  };
-}
diff --git a/pkgs/tools/networking/aiccu/default.nix b/pkgs/tools/networking/aiccu/default.nix
deleted file mode 100644
index a821c6476f7..00000000000
--- a/pkgs/tools/networking/aiccu/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, gnutls, iproute, makeWrapper }:
-
-stdenv.mkDerivation rec {
-
-  name = "aiccu-${version}";
-  version = "20070115";
-
-  src = fetchurl {
-    url = "http://http.debian.net/debian/pool/main/a/aiccu/aiccu_20070115.orig.tar.gz";
-    sha256 = "1k73vw7i25qzmnbvmsp3ci4pm6h8q70w70vnr512517s2q5gag6j";
-  };
-
-  buildInputs = [ gnutls iproute makeWrapper ];
-
-  patches = [
-    (fetchurl {
-      url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/gnutls-3.4.0.patch?h=packages/aiccu&id=cc6decc4e734420e4c5d0cd28652077f6bd88d84";
-      sha256 = "1ni3lhwy3r54js124p7fhm1my82a703chvh07vrhslb4v4b71g5s";
-      name = "gnutls-3.4.0.patch";
-    })
-  ];
-
-  configureFlags = "--prefix=$out";
-  installPhase = ''
-    install -D -m 755 unix-console/aiccu $out/bin/aiccu
-    install -D -m 644 doc/aiccu.sgml $out/doc/aiccu.sgml
-    install -D -m 644 doc/aiccu.1 $out/share/man/man1/aiccu.1
-    wrapProgram "$out/bin/aiccu" \
-      --prefix PATH : "${iproute}/bin"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Automatic IPv6 Connectivity Configuration Utility";
-    homepage = "https://www.sixxs.net/tools/aiccu/";
-    longDescription = ''
-      A TIC+ heartbeart client for the public dynamic-IPv4 IPv6 tunnel beta test from the SixXS tunnel service provider.
-    '';
-    maintainers = with maintainers; [ edwtjo ];
-    license = "SixXS";
-    platforms = with platforms; linux;
-  };
-
-}
-- 
GitLab


From 4ef8313bb65696b0a39739a799b8231e6b925a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Jun 2017 07:54:50 +0200
Subject: [PATCH 0703/1490] aiccu: remove leftover from 3dcecf09fc1c

---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbe2a9bfc5c..86615203061 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -407,8 +407,6 @@ with pkgs;
 
   ahcpd = callPackage ../tools/networking/ahcpd { };
 
-  aiccu = callPackage ../tools/networking/aiccu { };
-
   aide = callPackage ../tools/security/aide { };
 
   aircrack-ng = callPackage ../tools/networking/aircrack-ng { };
-- 
GitLab


From 0f9a2285b8abc4fd7fc9747dadfd3929d518c191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 15 Jun 2017 08:37:24 +0200
Subject: [PATCH 0704/1490] ezquake: init at 3.0.1

---
 pkgs/games/ezquake/default.nix  | 37 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/games/ezquake/default.nix

diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix
new file mode 100644
index 00000000000..a1560fb1934
--- /dev/null
+++ b/pkgs/games/ezquake/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, curl, expat
+, jansson, libpng, libjpeg, mesa, pcre
+, pkgconfig, SDL2, vimNox }:
+
+stdenv.mkDerivation rec {
+  name = pname + "-" + version;
+  pname = "ezquake";
+  version = "3.0.1";
+
+  src = fetchFromGitHub {
+    owner = "ezQuake";
+    repo = pname + "-source";
+    rev = "v" + version;
+    sha256 = "14wck0r64z5haacp7g7qb2qrbhff3x6jfjmn4268dyb9dl5663f2";
+  };
+
+  buildInputs = [
+    expat curl jansson libpng libjpeg mesa pcre pkgconfig SDL2 vimNox
+  ];
+
+  installPhase = with stdenv.lib; let
+    sys = last (splitString "-" stdenv.system);
+    arch = head (splitString "-" stdenv.system);
+  in ''
+    mkdir -p $out/bin
+    find .
+    mv ezquake-${sys}-${arch} $out/bin/ezquake
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://ezquake.github.io/";
+    description = "A modern QuakeWorld client focused on competitive online play.";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ edwtjo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86615203061..d929c23dd8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6719,6 +6719,8 @@ with pkgs;
 
   eztrace = callPackage ../development/tools/profiling/EZTrace { };
 
+  ezquake = callPackage ../games/ezquake { };
+
   findbugs = callPackage ../development/tools/analysis/findbugs { };
 
   foreman = callPackage ../tools/system/foreman { };
-- 
GitLab


From ea32c77e25f6c20e60a381225b6605fe34a1e9db Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 15 Jun 2017 09:16:21 +0200
Subject: [PATCH 0705/1490] glpk: 4.61 -> 4.62

See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00006.html
for release announcement
---
 pkgs/development/libraries/glpk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index 03f8ff3bc76..a4b0090296f 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.61";
+  name = "glpk-4.62";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${name}.tar.gz";
-    sha256 = "1adbvwiaqrv9pql9ry3lhn2vfsxnff2vh4fs477d90kpfx0xwrlq";
+    sha256 = "0w7s3869ybwyq9a4490dikpib1qp3jnn5nqz1vvwqy1qz3ilnvh9";
   };
 
   doCheck = true;
-- 
GitLab


From fe041692e2b871ac52be6dd3ac98abf3cb99a0e0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Thu, 15 Jun 2017 10:08:08 +0200
Subject: [PATCH 0706/1490] git-standup: init at 2.1.8

---
 .../node-packages/node-packages-v4.nix        |  367 +--
 .../node-packages/node-packages-v6.json       |    1 +
 .../node-packages/node-packages-v6.nix        | 2691 ++++++++++-------
 3 files changed, 1780 insertions(+), 1279 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index b483c75cf6f..bbc0f2b8ad0 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -103,22 +103,22 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "brace-expansion-1.1.7" = {
+    "brace-expansion-1.1.8" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
-      version = "1.1.7";
+      version = "1.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz";
-        sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59";
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
+        sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
       };
     };
-    "balanced-match-0.4.2" = {
+    "balanced-match-1.0.0" = {
       name = "balanced-match";
       packageName = "balanced-match";
-      version = "0.4.2";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz";
-        sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838";
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
     "concat-map-0.0.1" = {
@@ -634,13 +634,13 @@ let
         sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
       };
     };
-    "readable-stream-2.2.10" = {
+    "readable-stream-2.2.11" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.10";
+      version = "2.2.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz";
-        sha1 = "effe72bb7c884c0dd335e2379d526196d9d011ee";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz";
+        sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72";
       };
     };
     "xtend-4.0.1" = {
@@ -670,22 +670,22 @@ let
         sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
       };
     };
-    "safe-buffer-5.1.0" = {
+    "safe-buffer-5.0.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.1.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz";
-        sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
       };
     };
-    "string_decoder-1.0.1" = {
+    "string_decoder-1.0.2" = {
       name = "string_decoder";
       packageName = "string_decoder";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz";
-        sha1 = "62e200f039955a6810d8df0a33ffc0f013662d98";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz";
+        sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -1012,13 +1012,13 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
-    "randomatic-1.1.6" = {
+    "randomatic-1.1.7" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz";
-        sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
+        sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c";
       };
     };
     "repeat-string-1.6.1" = {
@@ -1030,13 +1030,22 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "is-posix-bracket-0.1.1" = {
-      name = "is-posix-bracket";
-      packageName = "is-posix-bracket";
-      version = "0.1.1";
+    "is-number-3.0.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz";
-        sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
+        url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz";
+        sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
+      };
+    };
+    "kind-of-4.0.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz";
+        sha1 = "20813df3d712928b207378691a45066fae72dd57";
       };
     };
     "is-buffer-1.1.5" = {
@@ -1048,13 +1057,22 @@ let
         sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
       };
     };
-    "remove-trailing-separator-1.0.1" = {
+    "is-posix-bracket-0.1.1" = {
+      name = "is-posix-bracket";
+      packageName = "is-posix-bracket";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz";
+        sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
+      };
+    };
+    "remove-trailing-separator-1.0.2" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz";
-        sha1 = "615ebb96af559552d4bf4057c8436d486ab63cc4";
+        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz";
+        sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511";
       };
     };
     "for-own-0.1.5" = {
@@ -2002,6 +2020,15 @@ let
         sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233";
       };
     };
+    "safe-buffer-5.1.0" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz";
+        sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223";
+      };
+    };
     "stringstream-0.0.5" = {
       name = "stringstream";
       packageName = "stringstream";
@@ -2155,13 +2182,13 @@ let
         sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
       };
     };
-    "sshpk-1.13.0" = {
+    "sshpk-1.13.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.13.0";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz";
-        sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz";
+        sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3";
       };
     };
     "assert-plus-1.0.0" = {
@@ -2245,15 +2272,6 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "jodid25519-1.0.2" = {
-      name = "jodid25519";
-      packageName = "jodid25519";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
-        sha1 = "06d4912255093419477d425633606e0e90782967";
-      };
-    };
     "ecc-jsbn-0.1.1" = {
       name = "ecc-jsbn";
       packageName = "ecc-jsbn";
@@ -3235,15 +3253,6 @@ let
         sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
-    "safe-buffer-5.0.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
-      };
-    };
     "truncate-1.0.5" = {
       name = "truncate";
       packageName = "truncate";
@@ -3424,13 +3433,13 @@ let
         sha1 = "791420d7f551eea2897453a8a77653f96606d67c";
       };
     };
-    "cacache-9.2.6" = {
+    "cacache-9.2.8" = {
       name = "cacache";
       packageName = "cacache";
-      version = "9.2.6";
+      version = "9.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.6.tgz";
-        sha1 = "ea5c7f2b6b514710a22a58a27f857fd972fdfa51";
+        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz";
+        sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4";
       };
     };
     "call-limit-1.1.0" = {
@@ -3667,13 +3676,13 @@ let
         sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
       };
     };
-    "npm-package-arg-5.1.1" = {
+    "npm-package-arg-5.1.2" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "5.1.1";
+      version = "5.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.1.tgz";
-        sha1 = "a3d09053f2d8a0bfa562624507baa597737fc3bf";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
+        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
       };
     };
     "npm-registry-client-8.3.0" = {
@@ -3703,13 +3712,13 @@ let
         sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
-    "pacote-2.7.27" = {
+    "pacote-2.7.36" = {
       name = "pacote";
       packageName = "pacote";
-      version = "2.7.27";
+      version = "2.7.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.27.tgz";
-        sha1 = "ab3a7e6b584d351c9d19bfe76b0b420f7013eff6";
+        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz";
+        sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c";
       };
     };
     "path-is-inside-1.0.2" = {
@@ -3820,13 +3829,13 @@ let
         sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
       };
     };
-    "ssri-4.1.4" = {
+    "ssri-4.1.6" = {
       name = "ssri";
       packageName = "ssri";
-      version = "4.1.4";
+      version = "4.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.4.tgz";
-        sha1 = "22be0659c075a612b622158872b585d5fe6b03af";
+        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
+        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
       };
     };
     "text-table-0.2.0" = {
@@ -4162,13 +4171,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "make-fetch-happen-2.4.10" = {
+    "make-fetch-happen-2.4.12" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "2.4.10";
+      version = "2.4.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.10.tgz";
-        sha1 = "5e52244a4cd80be925f5c8118a38ad0c2ceb4a81";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz";
+        sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399";
       };
     };
     "npm-pick-manifest-1.0.3" = {
@@ -4198,13 +4207,13 @@ let
         sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
       };
     };
-    "tar-fs-1.15.2" = {
+    "tar-fs-1.15.3" = {
       name = "tar-fs";
       packageName = "tar-fs";
-      version = "1.15.2";
+      version = "1.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz";
-        sha1 = "761f5b32932c7b39461a60d537faea0d8084830c";
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz";
+        sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20";
       };
     };
     "tar-stream-1.5.4" = {
@@ -4216,13 +4225,13 @@ let
         sha1 = "36549cf04ed1aee9b2a30c0143252238daf94016";
       };
     };
-    "agentkeepalive-3.1.0" = {
+    "agentkeepalive-3.2.0" = {
       name = "agentkeepalive";
       packageName = "agentkeepalive";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.1.0.tgz";
-        sha1 = "0393a4f1e68f85d355887c2e71681b28f3b7df35";
+        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz";
+        sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -4261,13 +4270,13 @@ let
         sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465";
       };
     };
-    "socks-proxy-agent-2.1.0" = {
+    "socks-proxy-agent-2.1.1" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.0.tgz";
-        sha1 = "ddfb01b5dbea5fc879490ca38a25fe87d3d15912";
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz";
+        sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -4315,13 +4324,13 @@ let
         sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc";
       };
     };
-    "iconv-lite-0.4.17" = {
+    "iconv-lite-0.4.18" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.4.17";
+      version = "0.4.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz";
-        sha1 = "4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
+        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
       };
     };
     "jju-1.3.0" = {
@@ -5363,9 +5372,9 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.4" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.7" // {
+                  (sources."brace-expansion-1.1.8" // {
                     dependencies = [
-                      sources."balanced-match-0.4.2"
+                      sources."balanced-match-1.0.0"
                       sources."concat-map-0.0.1"
                     ];
                   })
@@ -5495,14 +5504,14 @@ in
           sources."replace-ext-0.0.1"
           (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.2.10" // {
+              (sources."readable-stream-2.2.11" // {
                 dependencies = [
                   sources."core-util-is-1.0.2"
                   sources."inherits-2.0.3"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
-                  sources."safe-buffer-5.1.0"
-                  sources."string_decoder-1.0.1"
+                  sources."safe-buffer-5.0.1"
+                  sources."string_decoder-1.0.2"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -5553,7 +5562,24 @@ in
                                   sources."isarray-1.0.0"
                                 ];
                               })
-                              sources."randomatic-1.1.6"
+                              (sources."randomatic-1.1.7" // {
+                                dependencies = [
+                                  (sources."is-number-3.0.0" // {
+                                    dependencies = [
+                                      (sources."kind-of-3.2.2" // {
+                                        dependencies = [
+                                          sources."is-buffer-1.1.5"
+                                        ];
+                                      })
+                                    ];
+                                  })
+                                  (sources."kind-of-4.0.0" // {
+                                    dependencies = [
+                                      sources."is-buffer-1.1.5"
+                                    ];
+                                  })
+                                ];
+                              })
                               sources."repeat-string-1.6.1"
                             ];
                           })
@@ -5578,7 +5604,7 @@ in
                   })
                   (sources."normalize-path-2.1.1" // {
                     dependencies = [
-                      sources."remove-trailing-separator-1.0.1"
+                      sources."remove-trailing-separator-1.0.2"
                     ];
                   })
                   (sources."object.omit-2.0.1" // {
@@ -5742,9 +5768,9 @@ in
               })
               (sources."minimatch-2.0.10" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.7" // {
+                  (sources."brace-expansion-1.1.8" // {
                     dependencies = [
-                      sources."balanced-match-0.4.2"
+                      sources."balanced-match-1.0.0"
                       sources."concat-map-0.0.1"
                     ];
                   })
@@ -5864,9 +5890,9 @@ in
       sources."graceful-fs-4.1.11"
       (sources."minimatch-3.0.4" // {
         dependencies = [
-          (sources."brace-expansion-1.1.7" // {
+          (sources."brace-expansion-1.1.8" // {
             dependencies = [
-              sources."balanced-match-0.4.2"
+              sources."balanced-match-1.0.0"
               sources."concat-map-0.0.1"
             ];
           })
@@ -5887,14 +5913,14 @@ in
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.10" // {
+              (sources."readable-stream-2.2.11" // {
                 dependencies = [
                   sources."core-util-is-1.0.2"
                   sources."inherits-2.0.3"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
-                  sources."safe-buffer-5.1.0"
-                  sources."string_decoder-1.0.1"
+                  sources."safe-buffer-5.0.1"
+                  sources."string_decoder-1.0.2"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -5985,7 +6011,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.13.0" // {
+              (sources."sshpk-1.13.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -5993,7 +6019,6 @@ in
                   sources."getpass-0.1.7"
                   sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
-                  sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.1"
                 ];
@@ -6327,9 +6352,9 @@ in
           sources."inherits-2.0.3"
           (sources."minimatch-3.0.4" // {
             dependencies = [
-              (sources."brace-expansion-1.1.7" // {
+              (sources."brace-expansion-1.1.8" // {
                 dependencies = [
-                  sources."balanced-match-0.4.2"
+                  sources."balanced-match-1.0.0"
                   sources."concat-map-0.0.1"
                 ];
               })
@@ -6392,14 +6417,14 @@ in
                   (sources."are-we-there-yet-1.1.4" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.10" // {
+                      (sources."readable-stream-2.2.11" // {
                         dependencies = [
                           sources."core-util-is-1.0.2"
                           sources."inherits-2.0.3"
                           sources."isarray-1.0.0"
                           sources."process-nextick-args-1.0.7"
-                          sources."safe-buffer-5.1.0"
-                          sources."string_decoder-1.0.1"
+                          sources."safe-buffer-5.0.1"
+                          sources."string_decoder-1.0.2"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -6484,7 +6509,7 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.13.0" // {
+                      (sources."sshpk-1.13.1" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -6492,7 +6517,6 @@ in
                           sources."getpass-0.1.7"
                           sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
-                          sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.1"
                         ];
@@ -6534,9 +6558,9 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.4" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.7" // {
+                          (sources."brace-expansion-1.1.8" // {
                             dependencies = [
-                              sources."balanced-match-0.4.2"
+                              sources."balanced-match-1.0.0"
                               sources."concat-map-0.0.1"
                             ];
                           })
@@ -6576,9 +6600,9 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.4" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.7" // {
+                          (sources."brace-expansion-1.1.8" // {
                             dependencies = [
-                              sources."balanced-match-0.4.2"
+                              sources."balanced-match-1.0.0"
                               sources."concat-map-0.0.1"
                             ];
                           })
@@ -6591,14 +6615,14 @@ in
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.2.10" // {
+                  (sources."readable-stream-2.2.11" // {
                     dependencies = [
                       sources."core-util-is-1.0.2"
                       sources."inherits-2.0.3"
                       sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
-                      sources."safe-buffer-5.1.0"
-                      sources."string_decoder-1.0.1"
+                      sources."safe-buffer-5.0.1"
+                      sources."string_decoder-1.0.2"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -6635,14 +6659,14 @@ in
                   (sources."are-we-there-yet-1.1.4" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.10" // {
+                      (sources."readable-stream-2.2.11" // {
                         dependencies = [
                           sources."core-util-is-1.0.2"
                           sources."inherits-2.0.3"
                           sources."isarray-1.0.0"
                           sources."process-nextick-args-1.0.7"
-                          sources."safe-buffer-5.1.0"
-                          sources."string_decoder-1.0.1"
+                          sources."safe-buffer-5.0.1"
+                          sources."string_decoder-1.0.2"
                           sources."util-deprecate-1.0.2"
                         ];
                       })
@@ -6727,7 +6751,7 @@ in
                           sources."verror-1.3.6"
                         ];
                       })
-                      (sources."sshpk-1.13.0" // {
+                      (sources."sshpk-1.13.1" // {
                         dependencies = [
                           sources."asn1-0.2.3"
                           sources."assert-plus-1.0.0"
@@ -6735,7 +6759,6 @@ in
                           sources."getpass-0.1.7"
                           sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
-                          sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
                           sources."bcrypt-pbkdf-1.0.1"
                         ];
@@ -6777,9 +6800,9 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.4" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.7" // {
+                          (sources."brace-expansion-1.1.8" // {
                             dependencies = [
-                              sources."balanced-match-0.4.2"
+                              sources."balanced-match-1.0.0"
                               sources."concat-map-0.0.1"
                             ];
                           })
@@ -6819,9 +6842,9 @@ in
                       sources."inherits-2.0.3"
                       (sources."minimatch-3.0.4" // {
                         dependencies = [
-                          (sources."brace-expansion-1.1.7" // {
+                          (sources."brace-expansion-1.1.8" // {
                             dependencies = [
-                              sources."balanced-match-0.4.2"
+                              sources."balanced-match-1.0.0"
                               sources."concat-map-0.0.1"
                             ];
                           })
@@ -6834,14 +6857,14 @@ in
                       sources."wrappy-1.0.2"
                     ];
                   })
-                  (sources."readable-stream-2.2.10" // {
+                  (sources."readable-stream-2.2.11" // {
                     dependencies = [
                       sources."core-util-is-1.0.2"
                       sources."inherits-2.0.3"
                       sources."isarray-1.0.0"
                       sources."process-nextick-args-1.0.7"
-                      sources."safe-buffer-5.1.0"
-                      sources."string_decoder-1.0.1"
+                      sources."safe-buffer-5.0.1"
+                      sources."string_decoder-1.0.2"
                       sources."util-deprecate-1.0.2"
                     ];
                   })
@@ -6943,14 +6966,14 @@ in
           (sources."are-we-there-yet-1.1.4" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.10" // {
+              (sources."readable-stream-2.2.11" // {
                 dependencies = [
                   sources."core-util-is-1.0.2"
                   sources."inherits-2.0.3"
                   sources."isarray-1.0.0"
                   sources."process-nextick-args-1.0.7"
-                  sources."safe-buffer-5.1.0"
-                  sources."string_decoder-1.0.1"
+                  sources."safe-buffer-5.0.1"
+                  sources."string_decoder-1.0.2"
                   sources."util-deprecate-1.0.2"
                 ];
               })
@@ -7043,7 +7066,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.13.0" // {
+              (sources."sshpk-1.13.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -7051,7 +7074,6 @@ in
                   sources."getpass-0.1.7"
                   sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
-                  sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.1"
                 ];
@@ -7093,9 +7115,9 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.4" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.7" // {
+                  (sources."brace-expansion-1.1.8" // {
                     dependencies = [
-                      sources."balanced-match-0.4.2"
+                      sources."balanced-match-1.0.0"
                       sources."concat-map-0.0.1"
                     ];
                   })
@@ -7141,9 +7163,9 @@ in
               sources."inherits-2.0.3"
               (sources."minimatch-3.0.4" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.7" // {
+                  (sources."brace-expansion-1.1.8" // {
                     dependencies = [
-                      sources."balanced-match-0.4.2"
+                      sources."balanced-match-1.0.0"
                       sources."concat-map-0.0.1"
                     ];
                   })
@@ -7156,14 +7178,14 @@ in
               sources."wrappy-1.0.2"
             ];
           })
-          (sources."readable-stream-2.2.10" // {
+          (sources."readable-stream-2.2.11" // {
             dependencies = [
               sources."core-util-is-1.0.2"
               sources."inherits-2.0.3"
               sources."isarray-1.0.0"
               sources."process-nextick-args-1.0.7"
-              sources."safe-buffer-5.1.0"
-              sources."string_decoder-1.0.1"
+              sources."safe-buffer-5.0.1"
+              sources."string_decoder-1.0.2"
               sources."util-deprecate-1.0.2"
             ];
           })
@@ -7182,10 +7204,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.0.2";
+    version = "5.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.0.2.tgz";
-      sha1 = "139e6c29c5a4982af11dda04e48aea783156d190";
+      url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz";
+      sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856";
     };
     dependencies = [
       (sources."JSONStream-1.3.1" // {
@@ -7201,7 +7223,7 @@ in
       sources."aproba-1.1.2"
       sources."archy-1.0.0"
       sources."bluebird-3.5.0"
-      (sources."cacache-9.2.6" // {
+      (sources."cacache-9.2.8" // {
         dependencies = [
           sources."y18n-3.2.1"
         ];
@@ -7243,9 +7265,9 @@ in
             dependencies = [
               (sources."minimatch-3.0.4" // {
                 dependencies = [
-                  (sources."brace-expansion-1.1.7" // {
+                  (sources."brace-expansion-1.1.8" // {
                     dependencies = [
-                      sources."balanced-match-0.4.2"
+                      sources."balanced-match-1.0.0"
                       sources."concat-map-0.0.1"
                     ];
                   })
@@ -7260,9 +7282,9 @@ in
           sources."fs.realpath-1.0.0"
           (sources."minimatch-3.0.4" // {
             dependencies = [
-              (sources."brace-expansion-1.1.7" // {
+              (sources."brace-expansion-1.1.8" // {
                 dependencies = [
-                  sources."balanced-match-0.4.2"
+                  sources."balanced-match-1.0.0"
                   sources."concat-map-0.0.1"
                 ];
               })
@@ -7355,9 +7377,9 @@ in
         dependencies = [
           (sources."minimatch-3.0.4" // {
             dependencies = [
-              (sources."brace-expansion-1.1.7" // {
+              (sources."brace-expansion-1.1.8" // {
                 dependencies = [
-                  sources."balanced-match-0.4.2"
+                  sources."balanced-match-1.0.0"
                   sources."concat-map-0.0.1"
                 ];
               })
@@ -7378,7 +7400,7 @@ in
       })
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-5.1.1"
+      sources."npm-package-arg-5.1.2"
       (sources."npm-registry-client-8.3.0" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
@@ -7425,11 +7447,11 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."pacote-2.7.27" // {
+      (sources."pacote-2.7.36" // {
         dependencies = [
-          (sources."make-fetch-happen-2.4.10" // {
+          (sources."make-fetch-happen-2.4.12" // {
             dependencies = [
-              (sources."agentkeepalive-3.1.0" // {
+              (sources."agentkeepalive-3.2.0" // {
                 dependencies = [
                   (sources."humanize-ms-1.2.1" // {
                     dependencies = [
@@ -7473,7 +7495,7 @@ in
                 dependencies = [
                   (sources."encoding-0.1.12" // {
                     dependencies = [
-                      sources."iconv-lite-0.4.17"
+                      sources."iconv-lite-0.4.18"
                     ];
                   })
                   (sources."json-parse-helpfulerror-1.0.3" // {
@@ -7483,7 +7505,7 @@ in
                   })
                 ];
               })
-              (sources."socks-proxy-agent-2.1.0" // {
+              (sources."socks-proxy-agent-2.1.1" // {
                 dependencies = [
                   (sources."agent-base-2.1.1" // {
                     dependencies = [
@@ -7503,9 +7525,9 @@ in
           })
           (sources."minimatch-3.0.4" // {
             dependencies = [
-              (sources."brace-expansion-1.1.7" // {
+              (sources."brace-expansion-1.1.8" // {
                 dependencies = [
-                  sources."balanced-match-0.4.2"
+                  sources."balanced-match-1.0.0"
                   sources."concat-map-0.0.1"
                 ];
               })
@@ -7522,7 +7544,7 @@ in
               sources."genfun-4.0.1"
             ];
           })
-          (sources."tar-fs-1.15.2" // {
+          (sources."tar-fs-1.15.3" // {
             dependencies = [
               (sources."pump-1.0.2" // {
                 dependencies = [
@@ -7563,12 +7585,13 @@ in
         ];
       })
       sources."read-package-tree-5.1.6"
-      (sources."readable-stream-2.2.10" // {
+      (sources."readable-stream-2.2.11" // {
         dependencies = [
           sources."core-util-is-1.0.2"
           sources."isarray-1.0.0"
           sources."process-nextick-args-1.0.7"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
           sources."util-deprecate-1.0.2"
         ];
       })
@@ -7623,7 +7646,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.13.0" // {
+              (sources."sshpk-1.13.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -7631,7 +7654,6 @@ in
                   sources."getpass-0.1.7"
                   sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
-                  sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.1"
                 ];
@@ -7660,7 +7682,7 @@ in
       })
       sources."retry-0.10.1"
       sources."rimraf-2.6.1"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -7685,7 +7707,7 @@ in
           })
         ];
       })
-      sources."ssri-4.1.4"
+      sources."ssri-4.1.6"
       sources."strip-ansi-3.0.1"
       (sources."tar-2.2.1" // {
         dependencies = [
@@ -8054,7 +8076,7 @@ in
                   sources."verror-1.3.6"
                 ];
               })
-              (sources."sshpk-1.13.0" // {
+              (sources."sshpk-1.13.1" // {
                 dependencies = [
                   sources."asn1-0.2.3"
                   sources."assert-plus-1.0.0"
@@ -8062,7 +8084,6 @@ in
                   sources."getpass-0.1.7"
                   sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
-                  sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
                   sources."bcrypt-pbkdf-1.0.1"
                 ];
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 1a83b7ae900..08b3445e3d4 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -18,6 +18,7 @@
 , "fetch-bower"
 , "forever"
 , "git-run"
+, "git-standup"
 , "grunt-cli"
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
 , "gulp"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 6b6f878b908..5387a2acd05 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -13,40 +13,40 @@ let
         sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7";
       };
     };
-    "babel-core-6.24.1" = {
+    "babel-core-6.25.0" = {
       name = "babel-core";
       packageName = "babel-core";
-      version = "6.24.1";
+      version = "6.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz";
-        sha1 = "8c428564dce1e1f41fb337ec34f4c3b022b5ad83";
+        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz";
+        sha1 = "7dd42b0463c742e9d5296deb3ec67a9322dad729";
       };
     };
-    "babel-traverse-6.24.1" = {
+    "babel-traverse-6.25.0" = {
       name = "babel-traverse";
       packageName = "babel-traverse";
-      version = "6.24.1";
+      version = "6.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz";
-        sha1 = "ab36673fd356f9a0948659e7b338d5feadb31695";
+        url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz";
+        sha1 = "2257497e2fcd19b89edc13c4c91381f9512496f1";
       };
     };
-    "babel-types-6.24.1" = {
+    "babel-types-6.25.0" = {
       name = "babel-types";
       packageName = "babel-types";
-      version = "6.24.1";
+      version = "6.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz";
-        sha1 = "a136879dc15b3606bda0d90c1fc74304c2ff0975";
+        url = "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz";
+        sha1 = "70afb248d5660e5d18f811d91c8303b54134a18e";
       };
     };
-    "babylon-6.17.2" = {
+    "babylon-6.17.3" = {
       name = "babylon";
       packageName = "babylon";
-      version = "6.17.2";
+      version = "6.17.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babylon/-/babylon-6.17.2.tgz";
-        sha1 = "201d25ef5f892c41bae49488b08db0dd476e9f5c";
+        url = "https://registry.npmjs.org/babylon/-/babylon-6.17.3.tgz";
+        sha1 = "1327d709950b558f204e5352587fd0290f8d8e48";
       };
     };
     "colors-0.6.0-1" = {
@@ -67,13 +67,13 @@ let
         sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
       };
     };
-    "deasync-0.1.9" = {
+    "deasync-0.1.10" = {
       name = "deasync";
       packageName = "deasync";
-      version = "0.1.9";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.9.tgz";
-        sha1 = "f58dd49fa63110c74bea8405a90a828be26d3a24";
+        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.10.tgz";
+        sha1 = "4e4a6836fbe0477bd5f908308bd2a96557d5d7fe";
       };
     };
     "ejs-2.3.4" = {
@@ -193,13 +193,13 @@ let
         sha1 = "027620bee567a88c32561574e7fd0801d33118e4";
       };
     };
-    "babel-generator-6.24.1" = {
+    "babel-generator-6.25.0" = {
       name = "babel-generator";
       packageName = "babel-generator";
-      version = "6.24.1";
+      version = "6.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz";
-        sha1 = "e715f486c58ded25649d888944d52aa07c5d9497";
+        url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz";
+        sha1 = "33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc";
       };
     };
     "babel-helpers-6.24.1" = {
@@ -220,13 +220,13 @@ let
         sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
       };
     };
-    "babel-template-6.24.1" = {
+    "babel-template-6.25.0" = {
       name = "babel-template";
       packageName = "babel-template";
-      version = "6.24.1";
+      version = "6.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz";
-        sha1 = "04ae514f1f93b3a2537f2a0f60a5a45fb8308333";
+        url = "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz";
+        sha1 = "665241166b7c2aa4c619d71e192969552b10c071";
       };
     };
     "babel-runtime-6.23.0" = {
@@ -535,22 +535,22 @@ let
         sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
       };
     };
-    "brace-expansion-1.1.7" = {
+    "brace-expansion-1.1.8" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
-      version = "1.1.7";
+      version = "1.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz";
-        sha1 = "3effc3c50e000531fb720eaff80f0ae8ef23cf59";
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
+        sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
       };
     };
-    "balanced-match-0.4.2" = {
+    "balanced-match-1.0.0" = {
       name = "balanced-match";
       packageName = "balanced-match";
-      version = "0.4.2";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz";
-        sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838";
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
     "concat-map-0.0.1" = {
@@ -562,13 +562,13 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "globals-9.17.0" = {
+    "globals-9.18.0" = {
       name = "globals";
       packageName = "globals";
-      version = "9.17.0";
+      version = "9.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz";
-        sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286";
+        url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
+        sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a";
       };
     };
     "invariant-2.2.2" = {
@@ -868,13 +868,13 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.20.0" = {
+    "azure-arm-compute-3.0.0-preview" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.20.0";
+      version = "3.0.0-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz";
-        sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-3.0.0-preview.tgz";
+        sha1 = "f5f07792afcdff29ce0b7e16705342b6986f571b";
       };
     };
     "azure-arm-datalake-analytics-1.0.2-preview" = {
@@ -922,13 +922,13 @@ let
         sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f";
       };
     };
-    "azure-arm-iothub-0.1.4" = {
+    "azure-arm-iothub-1.0.1-preview" = {
       name = "azure-arm-iothub";
       packageName = "azure-arm-iothub";
-      version = "0.1.4";
+      version = "1.0.1-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.4.tgz";
-        sha1 = "58a0ba627216257a05d77f6aeeff8d0b45f9463d";
+        url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-1.0.1-preview.tgz";
+        sha1 = "f63a6dad0355633d9347fb403f417fb195fe3b91";
       };
     };
     "azure-arm-servermanagement-0.1.2" = {
@@ -940,13 +940,13 @@ let
         sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47";
       };
     };
-    "azure-arm-network-0.18.0" = {
+    "azure-arm-network-1.1.0-preview" = {
       name = "azure-arm-network";
       packageName = "azure-arm-network";
-      version = "0.18.0";
+      version = "1.1.0-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.18.0.tgz";
-        sha1 = "0ebfe1adbdfdc535d6c95e3713a5c54b5144932f";
+        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-1.1.0-preview.tgz";
+        sha1 = "e6ca3e27a0169ff49849f0378bc6c531b08a2b8b";
       };
     };
     "azure-arm-powerbiembedded-0.1.0" = {
@@ -958,13 +958,13 @@ let
         sha1 = "f0050ed833e2b3b12daba83d6f9e3d96852ee970";
       };
     };
-    "azure-arm-trafficmanager-0.12.0" = {
+    "azure-arm-trafficmanager-1.1.0-preview" = {
       name = "azure-arm-trafficmanager";
       packageName = "azure-arm-trafficmanager";
-      version = "0.12.0";
+      version = "1.1.0-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.12.0.tgz";
-        sha1 = "609e585c0253960a91deaf773dae1ce184ce414b";
+        url = "https://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-1.1.0-preview.tgz";
+        sha1 = "b46cfcf7f1690e4739864dcdb5c8de322e82ec50";
       };
     };
     "azure-arm-dns-0.11.1" = {
@@ -1003,13 +1003,13 @@ let
         sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40";
       };
     };
-    "azure-graph-1.1.1" = {
+    "azure-graph-2.1.0-preview" = {
       name = "azure-graph";
       packageName = "azure-graph";
-      version = "1.1.1";
+      version = "2.1.0-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz";
-        sha1 = "5277e750d223aec0fd2559e49149777fe1371708";
+        url = "https://registry.npmjs.org/azure-graph/-/azure-graph-2.1.0-preview.tgz";
+        sha1 = "2005abb76d9193cbfb90f25ee92823cde87d4f5f";
       };
     };
     "azure-gallery-2.0.0-pre.18" = {
@@ -1228,13 +1228,13 @@ let
         sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
       };
     };
-    "easy-table-0.0.1" = {
+    "easy-table-1.1.0" = {
       name = "easy-table";
       packageName = "easy-table";
-      version = "0.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/easy-table/-/easy-table-0.0.1.tgz";
-        sha1 = "dbd809177a1dd7afc06b4849d1ca7eff13e299eb";
+        url = "https://registry.npmjs.org/easy-table/-/easy-table-1.1.0.tgz";
+        sha1 = "86f9ab4c102f0371b7297b92a651d5824bc8cb73";
       };
     };
     "event-stream-3.1.5" = {
@@ -1318,13 +1318,13 @@ let
         sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79";
       };
     };
-    "kuduscript-1.0.13" = {
+    "kuduscript-1.0.15" = {
       name = "kuduscript";
       packageName = "kuduscript";
-      version = "1.0.13";
+      version = "1.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.13.tgz";
-        sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e";
+        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.15.tgz";
+        sha1 = "2721f05aa6876534cd30d6ded9418651cadfaa21";
       };
     };
     "moment-2.18.1" = {
@@ -1687,6 +1687,87 @@ let
         sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea";
       };
     };
+    "ms-rest-2.2.0" = {
+      name = "ms-rest";
+      packageName = "ms-rest";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.0.tgz";
+        sha1 = "5f2507522f1585e26666815588dbacbcec7fb79f";
+      };
+    };
+    "ms-rest-azure-2.1.2" = {
+      name = "ms-rest-azure";
+      packageName = "ms-rest-azure";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.1.2.tgz";
+        sha1 = "9774b1d4141c8a3a250ae5da36fc2654542be738";
+      };
+    };
+    "@types/node-7.0.31" = {
+      name = "@types/node";
+      packageName = "@types/node";
+      version = "7.0.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-7.0.31.tgz";
+        sha1 = "80ea4d175599b2a00149c29a10a4eb2dff592e86";
+      };
+    };
+    "@types/request-0.0.42" = {
+      name = "@types/request";
+      packageName = "@types/request";
+      version = "0.0.42";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/request/-/request-0.0.42.tgz";
+        sha1 = "e47a53bf0b130464854fb693297746a0c0479c31";
+      };
+    };
+    "@types/uuid-2.0.30" = {
+      name = "@types/uuid";
+      packageName = "@types/uuid";
+      version = "2.0.30";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz";
+        sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5";
+      };
+    };
+    "is-buffer-1.1.5" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
+        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
+      };
+    };
+    "is-stream-1.1.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+      };
+    };
+    "@types/form-data-0.0.33" = {
+      name = "@types/form-data";
+      packageName = "@types/form-data";
+      version = "0.0.33";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz";
+        sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8";
+      };
+    };
+    "async-0.2.7" = {
+      name = "async";
+      packageName = "async";
+      version = "0.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz";
+        sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
+      };
+    };
     "moment-2.6.0" = {
       name = "moment";
       packageName = "moment";
@@ -1840,6 +1921,33 @@ let
         sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
       };
     };
+    "wcwidth-1.0.1" = {
+      name = "wcwidth";
+      packageName = "wcwidth";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz";
+        sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8";
+      };
+    };
+    "defaults-1.0.3" = {
+      name = "defaults";
+      packageName = "defaults";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz";
+        sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d";
+      };
+    };
+    "clone-1.0.2" = {
+      name = "clone";
+      packageName = "clone";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz";
+        sha1 = "260b7a99ebb1edfe247538175f783243cb19d149";
+      };
+    };
     "from-0.1.7" = {
       name = "from";
       packageName = "from";
@@ -1903,15 +2011,6 @@ let
         sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
       };
     };
-    "async-0.2.7" = {
-      name = "async";
-      packageName = "async";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz";
-        sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
-      };
-    };
     "debug-0.7.4" = {
       name = "debug";
       packageName = "debug";
@@ -2425,13 +2524,13 @@ let
         sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918";
       };
     };
-    "sshpk-1.13.0" = {
+    "sshpk-1.13.1" = {
       name = "sshpk";
       packageName = "sshpk";
-      version = "1.13.0";
+      version = "1.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz";
-        sha1 = "ff2a3e4fd04497555fed97b39a0fd82fafb3a33c";
+        url = "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz";
+        sha1 = "512df6da6287144316dc4c18fe1cf1d940739be3";
       };
     };
     "assert-plus-1.0.0" = {
@@ -2515,15 +2614,6 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "jodid25519-1.0.2" = {
-      name = "jodid25519";
-      packageName = "jodid25519";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
-        sha1 = "06d4912255093419477d425633606e0e90782967";
-      };
-    };
     "ecc-jsbn-0.1.1" = {
       name = "ecc-jsbn";
       packageName = "ecc-jsbn";
@@ -2587,13 +2677,13 @@ let
         sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
       };
     };
-    "fibers-1.0.16" = {
+    "fibers-1.0.15" = {
       name = "fibers";
       packageName = "fibers";
-      version = "1.0.16";
+      version = "1.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fibers/-/fibers-1.0.16.tgz";
-        sha1 = "ccb48d58ec82eb646a769ab8278f514b85f34ca8";
+        url = "https://registry.npmjs.org/fibers/-/fibers-1.0.15.tgz";
+        sha1 = "22f039c8f18b856190fbbe4decf056154c1eae9c";
       };
     };
     "galaxy-0.1.12" = {
@@ -2641,22 +2731,31 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.10" = {
+    "readable-stream-2.2.11" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.10";
+      version = "2.2.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz";
+        sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72";
+      };
+    };
+    "safe-buffer-5.0.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz";
-        sha1 = "effe72bb7c884c0dd335e2379d526196d9d011ee";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
+        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
       };
     };
-    "string_decoder-1.0.1" = {
+    "string_decoder-1.0.2" = {
       name = "string_decoder";
       packageName = "string_decoder";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz";
-        sha1 = "62e200f039955a6810d8df0a33ffc0f013662d98";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz";
+        sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179";
       };
     };
     "http-basic-2.5.1" = {
@@ -3568,13 +3667,13 @@ let
         sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
       };
     };
-    "stream-http-2.7.1" = {
+    "stream-http-2.7.2" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.7.1";
+      version = "2.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.1.tgz";
-        sha1 = "546a51741ad5a6b07e9e31b0b10441a917df528a";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz";
+        sha1 = "40a050ec8dc3b53b33d9909415c02c0bf1abfbad";
       };
     };
     "subarg-1.0.0" = {
@@ -3829,13 +3928,13 @@ let
         sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
       };
     };
-    "randombytes-2.0.4" = {
+    "randombytes-2.0.5" = {
       name = "randombytes";
       packageName = "randombytes";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.4.tgz";
-        sha1 = "9551df208422c8f80eb58e2326dd0b840ff22efd";
+        url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz";
+        sha1 = "dc009a246b8d09a177b4b7a0ae77bc570f4b1b79";
       };
     };
     "browserify-aes-1.0.6" = {
@@ -4027,15 +4126,6 @@ let
         sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771";
       };
     };
-    "is-buffer-1.1.5" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "1.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz";
-        sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc";
-      };
-    };
     "lexical-scope-1.2.0" = {
       name = "lexical-scope";
       packageName = "lexical-scope";
@@ -5107,13 +5197,13 @@ let
         sha1 = "50346e42a43b35daf2a86f414afb153629a854be";
       };
     };
-    "random-access-file-1.7.3" = {
+    "random-access-file-1.8.1" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.7.3";
+      version = "1.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.7.3.tgz";
-        sha1 = "e5e642cb85dfc13166bfeaa97f7ffc9f5609053d";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.8.1.tgz";
+        sha1 = "b1a54a0f924fbd4d45731a5771aea36be2166532";
       };
     };
     "run-parallel-1.1.6" = {
@@ -5449,15 +5539,6 @@ let
         sha1 = "6b94b3e447cb6a363f785eaf94af6359e8e81c80";
       };
     };
-    "safe-buffer-5.0.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz";
-        sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7";
-      };
-    };
     "ultron-1.1.0" = {
       name = "ultron";
       packageName = "ultron";
@@ -6268,13 +6349,13 @@ let
         sha1 = "270e06b67b2ae94bcfee6592ed39eb42303d186f";
       };
     };
-    "dependency-ls-1.1.0" = {
+    "dependency-ls-1.1.1" = {
       name = "dependency-ls";
       packageName = "dependency-ls";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.0.tgz";
-        sha1 = "94cfe674620f5e9f2924d0501f9c6e710fc90f55";
+        url = "https://registry.npmjs.org/dependency-ls/-/dependency-ls-1.1.1.tgz";
+        sha1 = "0481b07f023d74ce311192e5c690d13e18600054";
       };
     };
     "is-url-1.2.2" = {
@@ -6286,13 +6367,13 @@ let
         sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26";
       };
     };
-    "shelljs-0.7.7" = {
+    "shelljs-0.7.8" = {
       name = "shelljs";
       packageName = "shelljs";
-      version = "0.7.7";
+      version = "0.7.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz";
-        sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1";
+        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz";
+        sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3";
       };
     };
     "q-1.4.1" = {
@@ -6736,13 +6817,13 @@ let
         sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
       };
     };
-    "npm-package-arg-5.1.1" = {
+    "npm-package-arg-5.1.2" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "5.1.1";
+      version = "5.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.1.tgz";
-        sha1 = "a3d09053f2d8a0bfa562624507baa597737fc3bf";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-5.1.2.tgz";
+        sha1 = "fb18d17bb61e60900d6312619919bd753755ab37";
       };
     };
     "promzard-0.3.0" = {
@@ -7222,33 +7303,6 @@ let
         sha1 = "b1f52dc2e8dc0e3cb04d187a25f758a38a90ca3b";
       };
     };
-    "wcwidth-1.0.1" = {
-      name = "wcwidth";
-      packageName = "wcwidth";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz";
-        sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8";
-      };
-    };
-    "defaults-1.0.3" = {
-      name = "defaults";
-      packageName = "defaults";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz";
-        sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d";
-      };
-    };
-    "clone-1.0.2" = {
-      name = "clone";
-      packageName = "clone";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz";
-        sha1 = "260b7a99ebb1edfe247538175f783243cb19d149";
-      };
-    };
     "proto-list-1.2.4" = {
       name = "proto-list";
       packageName = "proto-list";
@@ -7762,15 +7816,6 @@ let
         sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
       };
     };
-    "is-stream-1.1.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
-        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
-      };
-    };
     "lowercase-keys-1.0.0" = {
       name = "lowercase-keys";
       packageName = "lowercase-keys";
@@ -8276,13 +8321,13 @@ let
         sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e";
       };
     };
-    "debug-1.0.4" = {
+    "debug-1.0.5" = {
       name = "debug";
       packageName = "debug";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
-        sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+        url = "https://registry.npmjs.org/debug/-/debug-1.0.5.tgz";
+        sha1 = "f7241217430f99dec4c2b473eab92228e874c2ac";
       };
     };
     "lodash-2.4.2" = {
@@ -8321,15 +8366,6 @@ let
         sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5";
       };
     };
-    "ms-0.6.2" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
-        sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
-      };
-    };
     "better-curry-1.6.0" = {
       name = "better-curry";
       packageName = "better-curry";
@@ -9017,13 +9053,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.62.0" = {
+    "aws-sdk-2.70.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.62.0";
+      version = "2.70.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.62.0.tgz";
-        sha1 = "98508d3f93aaf3f74f18ca3b8cfe3a11bdad1a5f";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.70.0.tgz";
+        sha1 = "4163d94ac9e6a82f6a073ab74f8ae3c28a0a7534";
       };
     };
     "request-2.81.0" = {
@@ -9152,13 +9188,13 @@ let
         sha1 = "b82fffcf2828624afc1ec26530a66d6d1781a9cc";
       };
     };
-    "conf-1.1.1" = {
+    "conf-1.1.2" = {
       name = "conf";
       packageName = "conf";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conf/-/conf-1.1.1.tgz";
-        sha1 = "238d0a3090ac4916ed2d40c7e81d7a11667bc7ba";
+        url = "https://registry.npmjs.org/conf/-/conf-1.1.2.tgz";
+        sha1 = "a164003022dd1643cd5abd9653071bd3b0a19f50";
       };
     };
     "got-6.7.1" = {
@@ -9260,6 +9296,15 @@ let
         sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
       };
     };
+    "lru-cache-4.1.1" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz";
+        sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55";
+      };
+    };
     "path-key-2.0.1" = {
       name = "path-key";
       packageName = "path-key";
@@ -9440,13 +9485,13 @@ let
         sha1 = "c73d8d2909d22291e1a007a395804da8b665fe63";
       };
     };
-    "escope-3.6.0" = {
-      name = "escope";
-      packageName = "escope";
-      version = "3.6.0";
+    "eslint-scope-3.7.1" = {
+      name = "eslint-scope";
+      packageName = "eslint-scope";
+      version = "3.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz";
-        sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
+        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz";
+        sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8";
       };
     };
     "espree-3.4.3" = {
@@ -9494,13 +9539,13 @@ let
         sha1 = "432352e57accd87ab3110e82d3fea0e47812156d";
       };
     };
-    "inquirer-0.12.0" = {
+    "inquirer-3.1.0" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "0.12.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
-        sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.1.0.tgz";
+        sha1 = "e05400d48b94937c2d3caa7038663ba9189aab01";
       };
     };
     "is-resolvable-1.0.0" = {
@@ -9548,13 +9593,22 @@ let
         sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
       };
     };
-    "pluralize-1.2.1" = {
+    "pluralize-4.0.0" = {
       name = "pluralize";
       packageName = "pluralize";
-      version = "1.2.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz";
-        sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
+        url = "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz";
+        sha1 = "59b708c1c0190a2f692f1c7618c446b052fd1762";
+      };
+    };
+    "progress-2.0.0" = {
+      name = "progress";
+      packageName = "progress";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz";
+        sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f";
       };
     };
     "require-uncached-1.0.3" = {
@@ -9566,103 +9620,22 @@ let
         sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
       };
     };
-    "strip-bom-3.0.0" = {
-      name = "strip-bom";
-      packageName = "strip-bom";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
-        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
-      };
-    };
-    "table-3.8.3" = {
+    "table-4.0.1" = {
       name = "table";
       packageName = "table";
-      version = "3.8.3";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
-        sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
+        url = "https://registry.npmjs.org/table/-/table-4.0.1.tgz";
+        sha1 = "a8116c133fac2c61f4a420ab6cdf5c4d61f0e435";
       };
     };
-    "es6-map-0.1.5" = {
-      name = "es6-map";
-      packageName = "es6-map";
-      version = "0.1.5";
+    "esrecurse-4.1.0" = {
+      name = "esrecurse";
+      packageName = "esrecurse";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
-        sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
-      };
-    };
-    "es6-weak-map-2.0.2" = {
-      name = "es6-weak-map";
-      packageName = "es6-weak-map";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz";
-        sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f";
-      };
-    };
-    "esrecurse-4.1.0" = {
-      name = "esrecurse";
-      packageName = "esrecurse";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz";
-        sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220";
-      };
-    };
-    "d-1.0.0" = {
-      name = "d";
-      packageName = "d";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz";
-        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
-      };
-    };
-    "es5-ext-0.10.22" = {
-      name = "es5-ext";
-      packageName = "es5-ext";
-      version = "0.10.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz";
-        sha1 = "1876c51f990769c112c781ea3ebe89f84fd39071";
-      };
-    };
-    "es6-iterator-2.0.1" = {
-      name = "es6-iterator";
-      packageName = "es6-iterator";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz";
-        sha1 = "8e319c9f0453bf575d374940a655920e59ca5512";
-      };
-    };
-    "es6-set-0.1.5" = {
-      name = "es6-set";
-      packageName = "es6-set";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz";
-        sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
-      };
-    };
-    "es6-symbol-3.1.1" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
-        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
-      };
-    };
-    "event-emitter-0.3.5" = {
-      name = "event-emitter";
-      packageName = "event-emitter";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
-        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
+        url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz";
+        sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220";
       };
     };
     "estraverse-4.1.1" = {
@@ -9791,6 +9764,24 @@ let
         sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f";
       };
     };
+    "ansi-escapes-2.0.0" = {
+      name = "ansi-escapes";
+      packageName = "ansi-escapes";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz";
+        sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b";
+      };
+    };
+    "cli-cursor-2.1.0" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+      };
+    };
     "cli-width-2.1.0" = {
       name = "cli-width";
       packageName = "cli-width";
@@ -9800,13 +9791,121 @@ let
         sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a";
       };
     };
-    "string-width-1.0.2" = {
+    "external-editor-2.0.4" = {
+      name = "external-editor";
+      packageName = "external-editor";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz";
+        sha1 = "1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972";
+      };
+    };
+    "figures-2.0.0" = {
+      name = "figures";
+      packageName = "figures";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz";
+        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
+      };
+    };
+    "run-async-2.3.0" = {
+      name = "run-async";
+      packageName = "run-async";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
+        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+      };
+    };
+    "rx-lite-4.0.8" = {
+      name = "rx-lite";
+      packageName = "rx-lite";
+      version = "4.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz";
+        sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444";
+      };
+    };
+    "rx-lite-aggregates-4.0.8" = {
+      name = "rx-lite-aggregates";
+      packageName = "rx-lite-aggregates";
+      version = "4.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz";
+        sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
+      };
+    };
+    "string-width-2.0.0" = {
       name = "string-width";
       packageName = "string-width";
-      version = "1.0.2";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz";
+        sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e";
+      };
+    };
+    "restore-cursor-2.0.0" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+      };
+    };
+    "onetime-2.0.1" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
+      };
+    };
+    "iconv-lite-0.4.18" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz";
+        sha1 = "23d8656b16aae6742ac29732ea8f0336a4789cf2";
+      };
+    };
+    "jschardet-1.4.2" = {
+      name = "jschardet";
+      packageName = "jschardet";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz";
+        sha1 = "2aa107f142af4121d145659d44f50830961e699a";
+      };
+    };
+    "tmp-0.0.31" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.31";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
+        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
+      };
+    };
+    "is-promise-2.1.0" = {
+      name = "is-promise";
+      packageName = "is-promise";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+      };
+    };
+    "is-fullwidth-code-point-2.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
     "tryit-1.0.3" = {
@@ -9926,24 +10025,6 @@ let
         sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
       };
     };
-    "string-width-2.0.0" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz";
-        sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e";
-      };
-    };
-    "is-fullwidth-code-point-2.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
-        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
-      };
-    };
     "eslint-3.19.0" = {
       name = "eslint";
       packageName = "eslint";
@@ -9958,8 +10039,134 @@ let
       packageName = "supports-color";
       version = "3.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz";
-        sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz";
+        sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6";
+      };
+    };
+    "escope-3.6.0" = {
+      name = "escope";
+      packageName = "escope";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz";
+        sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
+      };
+    };
+    "inquirer-0.12.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
+        sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e";
+      };
+    };
+    "pluralize-1.2.1" = {
+      name = "pluralize";
+      packageName = "pluralize";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz";
+        sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
+      };
+    };
+    "strip-bom-3.0.0" = {
+      name = "strip-bom";
+      packageName = "strip-bom";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+        sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+      };
+    };
+    "table-3.8.3" = {
+      name = "table";
+      packageName = "table";
+      version = "3.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
+        sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f";
+      };
+    };
+    "es6-map-0.1.5" = {
+      name = "es6-map";
+      packageName = "es6-map";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
+        sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0";
+      };
+    };
+    "es6-weak-map-2.0.2" = {
+      name = "es6-weak-map";
+      packageName = "es6-weak-map";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz";
+        sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f";
+      };
+    };
+    "d-1.0.0" = {
+      name = "d";
+      packageName = "d";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz";
+        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
+      };
+    };
+    "es5-ext-0.10.23" = {
+      name = "es5-ext";
+      packageName = "es5-ext";
+      version = "0.10.23";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz";
+        sha1 = "7578b51be974207a5487821b56538c224e4e7b38";
+      };
+    };
+    "es6-iterator-2.0.1" = {
+      name = "es6-iterator";
+      packageName = "es6-iterator";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz";
+        sha1 = "8e319c9f0453bf575d374940a655920e59ca5512";
+      };
+    };
+    "es6-set-0.1.5" = {
+      name = "es6-set";
+      packageName = "es6-set";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz";
+        sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1";
+      };
+    };
+    "es6-symbol-3.1.1" = {
+      name = "es6-symbol";
+      packageName = "es6-symbol";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz";
+        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
+      };
+    };
+    "event-emitter-0.3.5" = {
+      name = "event-emitter";
+      packageName = "event-emitter";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
+        sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
+      };
+    };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
       };
     };
     "has-flag-1.0.0" = {
@@ -10187,13 +10394,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.1.1" = {
+    "fsevents-1.1.2" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz";
-        sha1 = "f19fd28f43eeaf761680e519a203c4d0b3d31aff";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz";
+        sha1 = "3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4";
       };
     };
     "micromatch-2.3.11" = {
@@ -10367,13 +10574,13 @@ let
         sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
       };
     };
-    "randomatic-1.1.6" = {
+    "randomatic-1.1.7" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz";
-        sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
+        sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c";
       };
     };
     "repeat-string-1.6.1" = {
@@ -10385,6 +10592,24 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
+    "is-number-3.0.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz";
+        sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
+      };
+    };
+    "kind-of-4.0.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz";
+        sha1 = "20813df3d712928b207378691a45066fae72dd57";
+      };
+    };
     "is-posix-bracket-0.1.1" = {
       name = "is-posix-bracket";
       packageName = "is-posix-bracket";
@@ -10394,13 +10619,13 @@ let
         sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
       };
     };
-    "remove-trailing-separator-1.0.1" = {
+    "remove-trailing-separator-1.0.2" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz";
-        sha1 = "615ebb96af559552d4bf4057c8436d486ab63cc4";
+        url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz";
+        sha1 = "69b062d978727ad14dc6b56ba4ab772fd8d70511";
       };
     };
     "for-own-0.1.5" = {
@@ -10746,13 +10971,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.26" = {
+    "clean-css-3.4.27" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.26";
+      version = "3.4.27";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.26.tgz";
-        sha1 = "55323b344ff3bcee684a2eac81c93df8fa73deeb";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.27.tgz";
+        sha1 = "adef75b31c160ffa5d72f4de67966e2660c1a255";
       };
     };
     "commander-2.6.0" = {
@@ -10791,13 +11016,13 @@ let
         sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
       };
     };
-    "uglify-js-2.8.28" = {
+    "uglify-js-2.8.29" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.8.28";
+      version = "2.8.29";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz";
-        sha1 = "e335032df9bb20dcb918f164589d5af47f38834a";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz";
+        sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
     "void-elements-2.0.1" = {
@@ -10845,15 +11070,6 @@ let
         sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
       };
     };
-    "is-promise-2.1.0" = {
-      name = "is-promise";
-      packageName = "is-promise";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
-        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
-      };
-    };
     "promise-6.1.0" = {
       name = "promise";
       packageName = "promise";
@@ -12501,15 +12717,6 @@ let
         sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b";
       };
     };
-    "tmp-0.0.31" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.0.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
-        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
-      };
-    };
     "useragent-2.1.13" = {
       name = "useragent";
       packageName = "useragent";
@@ -14382,13 +14589,13 @@ let
         sha1 = "52c074f42a32140132baea108d42cbcd0ef397d2";
       };
     };
-    "node-red-node-rbe-0.1.9" = {
+    "node-red-node-rbe-0.1.10" = {
       name = "node-red-node-rbe";
       packageName = "node-red-node-rbe";
-      version = "0.1.9";
+      version = "0.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.9.tgz";
-        sha1 = "d09795ebd9b6e4056b68b4843859fb65f5dff144";
+        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.10.tgz";
+        sha1 = "f05f72ace39b1b6158a48ee19d5c6cc426719a8f";
       };
     };
     "bcrypt-1.0.2" = {
@@ -14958,13 +15165,13 @@ let
         sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5";
       };
     };
-    "mimelib-0.3.0" = {
+    "mimelib-0.3.1" = {
       name = "mimelib";
       packageName = "mimelib";
-      version = "0.3.0";
+      version = "0.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.0.tgz";
-        sha1 = "4b16d4b435403daf692bc227890c7165ff3de894";
+        url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.1.tgz";
+        sha1 = "787add2415d827acb3af6ec4bca1ea9596418853";
       };
     };
     "encoding-0.1.12" = {
@@ -15651,13 +15858,13 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "cacache-9.2.6" = {
+    "cacache-9.2.8" = {
       name = "cacache";
       packageName = "cacache";
-      version = "9.2.6";
+      version = "9.2.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.6.tgz";
-        sha1 = "ea5c7f2b6b514710a22a58a27f857fd972fdfa51";
+        url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz";
+        sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4";
       };
     };
     "call-limit-1.1.0" = {
@@ -15795,13 +16002,13 @@ let
         sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
-    "pacote-2.7.27" = {
+    "pacote-2.7.36" = {
       name = "pacote";
       packageName = "pacote";
-      version = "2.7.27";
+      version = "2.7.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.27.tgz";
-        sha1 = "ab3a7e6b584d351c9d19bfe76b0b420f7013eff6";
+        url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz";
+        sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c";
       };
     };
     "promise-inflight-1.0.1" = {
@@ -15840,13 +16047,13 @@ let
         sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7";
       };
     };
-    "ssri-4.1.4" = {
+    "ssri-4.1.6" = {
       name = "ssri";
       packageName = "ssri";
-      version = "4.1.4";
+      version = "4.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.4.tgz";
-        sha1 = "22be0659c075a612b622158872b585d5fe6b03af";
+        url = "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz";
+        sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b";
       };
     };
     "unique-filename-1.1.0" = {
@@ -15975,13 +16182,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "make-fetch-happen-2.4.10" = {
+    "make-fetch-happen-2.4.12" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "2.4.10";
+      version = "2.4.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.10.tgz";
-        sha1 = "5e52244a4cd80be925f5c8118a38ad0c2ceb4a81";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz";
+        sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399";
       };
     };
     "npm-pick-manifest-1.0.3" = {
@@ -16011,22 +16218,22 @@ let
         sha1 = "fe4874d8c7913366cfd9ead12453a22cd3657f8e";
       };
     };
-    "tar-fs-1.15.2" = {
+    "tar-fs-1.15.3" = {
       name = "tar-fs";
       packageName = "tar-fs";
-      version = "1.15.2";
+      version = "1.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz";
-        sha1 = "761f5b32932c7b39461a60d537faea0d8084830c";
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz";
+        sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20";
       };
     };
-    "agentkeepalive-3.1.0" = {
+    "agentkeepalive-3.2.0" = {
       name = "agentkeepalive";
       packageName = "agentkeepalive";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.1.0.tgz";
-        sha1 = "0393a4f1e68f85d355887c2e71681b28f3b7df35";
+        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz";
+        sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd";
       };
     };
     "http-cache-semantics-3.7.3" = {
@@ -16065,13 +16272,13 @@ let
         sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465";
       };
     };
-    "socks-proxy-agent-2.1.0" = {
+    "socks-proxy-agent-2.1.1" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.0.tgz";
-        sha1 = "ddfb01b5dbea5fc879490ca38a25fe87d3d15912";
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz";
+        sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3";
       };
     };
     "humanize-ms-1.2.1" = {
@@ -16101,15 +16308,6 @@ let
         sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
       };
     };
-    "iconv-lite-0.4.17" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz";
-        sha1 = "4fdaa3b38acbc2c031b045d0edcdfe1ecab18c8d";
-      };
-    };
     "socks-1.1.10" = {
       name = "socks";
       packageName = "socks";
@@ -16551,13 +16749,13 @@ let
         sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
       };
     };
-    "snyk-1.33.0" = {
+    "snyk-1.34.4" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.33.0";
+      version = "1.34.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.33.0.tgz";
-        sha1 = "8e31a889e26f58819ca5eb5b39f95600afa67ac1";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.34.4.tgz";
+        sha1 = "9f0d50ab4f0544b125fa21c67dd162de1e7ce91b";
       };
     };
     "spawn-please-0.2.0" = {
@@ -16686,6 +16884,15 @@ let
         sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22";
       };
     };
+    "snyk-python-plugin-1.0.0" = {
+      name = "snyk-python-plugin";
+      packageName = "snyk-python-plugin";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.0.0.tgz";
+        sha1 = "d3915fbd933305d9988d86a56a7381e73c4565f7";
+      };
+    };
     "snyk-recursive-readdir-2.0.0" = {
       name = "snyk-recursive-readdir";
       packageName = "snyk-recursive-readdir";
@@ -16758,15 +16965,6 @@ let
         sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
       };
     };
-    "run-async-2.3.0" = {
-      name = "run-async";
-      packageName = "run-async";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
-        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
-      };
-    };
     "rx-4.1.0" = {
       name = "rx";
       packageName = "rx";
@@ -17130,13 +17328,13 @@ let
         sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31";
       };
     };
-    "dtrace-provider-0.8.2" = {
+    "dtrace-provider-0.8.3" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
-      version = "0.8.2";
+      version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.2.tgz";
-        sha1 = "f067c2773f15da1b61eb20dbc96aa1cabb3330bc";
+        url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.3.tgz";
+        sha1 = "ba1bfc6493285ccfcfc6ab69cd5c61d74c2a43bf";
       };
     };
     "mv-2.1.1" = {
@@ -18644,6 +18842,15 @@ let
         sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37";
       };
     };
+    "jodid25519-1.0.2" = {
+      name = "jodid25519";
+      packageName = "jodid25519";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
+        sha1 = "06d4912255093419477d425633606e0e90782967";
+      };
+    };
     "jsprim-0.3.0" = {
       name = "jsprim";
       packageName = "jsprim";
@@ -18698,13 +18905,13 @@ let
         sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
       };
     };
-    "coa-1.0.2" = {
+    "coa-1.0.3" = {
       name = "coa";
       packageName = "coa";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coa/-/coa-1.0.2.tgz";
-        sha1 = "2ba9fec3b4aa43d7a49d7e6c3561e92061b6bcec";
+        url = "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz";
+        sha1 = "1b54a5e1dcf77c990455d4deea98c564416dc893";
       };
     };
     "whet.extend-0.9.9" = {
@@ -18725,13 +18932,13 @@ let
         sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85";
       };
     };
-    "clap-1.1.3" = {
+    "clap-1.2.0" = {
       name = "clap";
       packageName = "clap";
-      version = "1.1.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz";
-        sha1 = "b3bd36e93dd4cbfb395a3c26896352445265c05b";
+        url = "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz";
+        sha1 = "59c90fe3e137104746ff19469a27a634ff68c857";
       };
     };
     "enhanced-resolve-2.3.0" = {
@@ -18950,13 +19157,13 @@ let
         sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "yargs-8.0.1" = {
+    "yargs-8.0.2" = {
       name = "yargs";
       packageName = "yargs";
-      version = "8.0.1";
+      version = "8.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.1.tgz";
-        sha1 = "420ef75e840c1457a80adcca9bc6fa3849de51aa";
+        url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz";
+        sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360";
       };
     };
     "color-convert-1.9.0" = {
@@ -19472,15 +19679,6 @@ let
         sha1 = "7d8316c8d0571e1d08a5a79e46fff0afe8172b19";
       };
     };
-    "inquirer-3.0.6" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz";
-        sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347";
-      };
-    };
     "is-ci-1.0.10" = {
       name = "is-ci";
       packageName = "is-ci";
@@ -19571,60 +19769,6 @@ let
         sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52";
       };
     };
-    "cli-cursor-2.1.0" = {
-      name = "cli-cursor";
-      packageName = "cli-cursor";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
-        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
-      };
-    };
-    "external-editor-2.0.4" = {
-      name = "external-editor";
-      packageName = "external-editor";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz";
-        sha1 = "1ed9199da9cbfe2ef2f7a31b2fde8b0d12368972";
-      };
-    };
-    "figures-2.0.0" = {
-      name = "figures";
-      packageName = "figures";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz";
-        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
-      };
-    };
-    "restore-cursor-2.0.0" = {
-      name = "restore-cursor";
-      packageName = "restore-cursor";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
-        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
-      };
-    };
-    "onetime-2.0.1" = {
-      name = "onetime";
-      packageName = "onetime";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
-        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
-      };
-    };
-    "jschardet-1.4.2" = {
-      name = "jschardet";
-      packageName = "jschardet";
-      version = "1.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jschardet/-/jschardet-1.4.2.tgz";
-        sha1 = "2aa107f142af4121d145659d44f50830961e699a";
-      };
-    };
     "ci-info-1.0.0" = {
       name = "ci-info";
       packageName = "ci-info";
@@ -19634,31 +19778,31 @@ let
         sha1 = "dc5285f2b4e251821683681c381c3388f46ec534";
       };
     };
-    "cli-list-0.1.8" = {
+    "cli-list-0.2.0" = {
       name = "cli-list";
       packageName = "cli-list";
-      version = "0.1.8";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-list/-/cli-list-0.1.8.tgz";
-        sha1 = "aee6d45c4c59bf80068bb968089fb06f1aeddc0a";
+        url = "https://registry.npmjs.org/cli-list/-/cli-list-0.2.0.tgz";
+        sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582";
       };
     };
-    "cross-spawn-3.0.1" = {
+    "cross-spawn-5.1.0" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
-      version = "3.0.1";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz";
-        sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982";
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
       };
     };
-    "fullname-2.1.0" = {
+    "fullname-3.3.0" = {
       name = "fullname";
       packageName = "fullname";
-      version = "2.1.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fullname/-/fullname-2.1.0.tgz";
-        sha1 = "c46bf0f7c3f24fd5b3358d00e4a41380eef87350";
+        url = "https://registry.npmjs.org/fullname/-/fullname-3.3.0.tgz";
+        sha1 = "a08747d6921229610b8178b7614fce10cb185f5a";
       };
     };
     "humanize-string-1.0.1" = {
@@ -19670,22 +19814,13 @@ let
         sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42";
       };
     };
-    "inquirer-0.11.4" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "0.11.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz";
-        sha1 = "81e3374e8361beaff2d97016206d359d0b32fa4d";
-      };
-    };
-    "insight-0.7.0" = {
+    "insight-0.8.4" = {
       name = "insight";
       packageName = "insight";
-      version = "0.7.0";
+      version = "0.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insight/-/insight-0.7.0.tgz";
-        sha1 = "061f9189835bd38a97a60c2b76ea0c6b30099ff6";
+        url = "https://registry.npmjs.org/insight/-/insight-0.8.4.tgz";
+        sha1 = "671caf65b47c9fe8c3d1b3206cf45bb211b75884";
       };
     };
     "npm-keyword-4.2.0" = {
@@ -19697,13 +19832,13 @@ let
         sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0";
       };
     };
-    "opn-3.0.3" = {
+    "opn-4.0.2" = {
       name = "opn";
       packageName = "opn";
-      version = "3.0.3";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz";
-        sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a";
+        url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz";
+        sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95";
       };
     };
     "parse-help-0.1.1" = {
@@ -19724,13 +19859,13 @@ let
         sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697";
       };
     };
-    "sort-on-1.3.0" = {
+    "sort-on-2.0.0" = {
       name = "sort-on";
       packageName = "sort-on";
-      version = "1.3.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sort-on/-/sort-on-1.3.0.tgz";
-        sha1 = "0dfd5b364b23df7f2acd86985daeb889e1a7c840";
+        url = "https://registry.npmjs.org/sort-on/-/sort-on-2.0.0.tgz";
+        sha1 = "0df42a679d7ae4aed9c30ba2f55807d979910fcc";
       };
     };
     "tabtab-1.3.2" = {
@@ -19751,6 +19886,15 @@ let
         sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a";
       };
     };
+    "update-notifier-2.2.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz";
+        sha1 = "1b5837cf90c0736d88627732b661c138f86de72f";
+      };
+    };
     "yeoman-character-1.1.0" = {
       name = "yeoman-character";
       packageName = "yeoman-character";
@@ -19769,31 +19913,121 @@ let
         sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
       };
     };
-    "yeoman-environment-1.6.6" = {
+    "yeoman-environment-2.0.0" = {
       name = "yeoman-environment";
       packageName = "yeoman-environment";
-      version = "1.6.6";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-1.6.6.tgz";
-        sha1 = "cd85fa67d156060e440d7807d7ef7cf0d2d1d671";
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.0.tgz";
+        sha1 = "dafa2fc512c168cb8313453e5318e64731265915";
       };
     };
-    "yosay-1.2.1" = {
+    "yosay-2.0.0" = {
       name = "yosay";
       packageName = "yosay";
-      version = "1.2.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yosay/-/yosay-1.2.1.tgz";
-        sha1 = "9466ef969830e85b474e267b50f7688693ed3b5b";
+        url = "https://registry.npmjs.org/yosay/-/yosay-2.0.0.tgz";
+        sha1 = "0f3d2bb01f7f25362c127212f53c1572906333fe";
       };
     };
-    "npmconf-2.1.2" = {
-      name = "npmconf";
-      packageName = "npmconf";
-      version = "2.1.2";
+    "shebang-command-1.2.0" = {
+      name = "shebang-command";
+      packageName = "shebang-command";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+      };
+    };
+    "shebang-regex-1.0.0" = {
+      name = "shebang-regex";
+      packageName = "shebang-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+      };
+    };
+    "execa-0.6.3" = {
+      name = "execa";
+      packageName = "execa";
+      version = "0.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz";
+        sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe";
+      };
+    };
+    "filter-obj-1.1.0" = {
+      name = "filter-obj";
+      packageName = "filter-obj";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz";
+        sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b";
+      };
+    };
+    "p-any-1.1.0" = {
+      name = "p-any";
+      packageName = "p-any";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz";
+        sha1 = "1d03835c7eed1e34b8e539c47b7b60d0d015d4e1";
+      };
+    };
+    "p-try-1.0.0" = {
+      name = "p-try";
+      packageName = "p-try";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
+        sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
+      };
+    };
+    "passwd-user-2.1.0" = {
+      name = "passwd-user";
+      packageName = "passwd-user";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/passwd-user/-/passwd-user-2.1.0.tgz";
+        sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e";
+      };
+    };
+    "p-some-2.0.0" = {
+      name = "p-some";
+      packageName = "p-some";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-some/-/p-some-2.0.0.tgz";
+        sha1 = "60b408e21f5da11a417fad13740bf20f9024ab3b";
+      };
+    };
+    "aggregate-error-1.0.0" = {
+      name = "aggregate-error";
+      packageName = "aggregate-error";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz";
+        sha1 = "888344dad0220a72e3af50906117f48771925fac";
+      };
+    };
+    "clean-stack-1.3.0" = {
+      name = "clean-stack";
+      packageName = "clean-stack";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz";
+        sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31";
+      };
+    };
+    "indent-string-3.1.0" = {
+      name = "indent-string";
+      packageName = "indent-string";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
-        sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
+        url = "https://registry.npmjs.org/indent-string/-/indent-string-3.1.0.tgz";
+        sha1 = "08ff4334603388399b329e6b9538dc7a3cf5de7d";
       };
     };
     "execall-1.0.0" = {
@@ -19877,13 +20111,13 @@ let
         sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1";
       };
     };
-    "dot-prop-2.4.0" = {
-      name = "dot-prop";
-      packageName = "dot-prop";
-      version = "2.4.0";
+    "import-lazy-2.1.0" = {
+      name = "import-lazy";
+      packageName = "import-lazy";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz";
-        sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c";
+        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz";
+        sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
       };
     };
     "bin-version-check-2.1.0" = {
@@ -19967,22 +20201,13 @@ let
         sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9";
       };
     };
-    "diff-2.2.3" = {
-      name = "diff";
-      packageName = "diff";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz";
-        sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
-      };
-    };
-    "globby-4.1.0" = {
+    "globby-6.1.0" = {
       name = "globby";
       packageName = "globby";
-      version = "4.1.0";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz";
-        sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8";
+        url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz";
+        sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c";
       };
     };
     "grouped-queue-0.3.3" = {
@@ -19994,6 +20219,15 @@ let
         sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c";
       };
     };
+    "is-scoped-1.0.0" = {
+      name = "is-scoped";
+      packageName = "is-scoped";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz";
+        sha1 = "449ca98299e713038256289ecb2b540dc437cb30";
+      };
+    };
     "mem-fs-1.1.3" = {
       name = "mem-fs";
       packageName = "mem-fs";
@@ -20003,6 +20237,24 @@ let
         sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc";
       };
     };
+    "untildify-3.0.2" = {
+      name = "untildify";
+      packageName = "untildify";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz";
+        sha1 = "7f1f302055b3fea0f3e81dc78eb36766cb65e3f1";
+      };
+    };
+    "scoped-regex-1.0.0" = {
+      name = "scoped-regex";
+      packageName = "scoped-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz";
+        sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8";
+      };
+    };
     "vinyl-file-2.0.0" = {
       name = "vinyl-file";
       packageName = "vinyl-file";
@@ -20030,6 +20282,15 @@ let
         sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
       };
     };
+    "ansi-styles-3.1.0" = {
+      name = "ansi-styles";
+      packageName = "ansi-styles";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz";
+        sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750";
+      };
+    };
     "pad-component-0.0.1" = {
       name = "pad-component";
       packageName = "pad-component";
@@ -20061,17 +20322,17 @@ in
     };
     dependencies = [
       sources."async-2.4.1"
-      (sources."babel-core-6.24.1" // {
+      (sources."babel-core-6.25.0" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
       })
-      sources."babel-traverse-6.24.1"
-      sources."babel-types-6.24.1"
-      sources."babylon-6.17.2"
+      sources."babel-traverse-6.25.0"
+      sources."babel-types-6.25.0"
+      sources."babylon-6.17.3"
       sources."colors-0.6.0-1"
       sources."commander-0.6.1"
-      sources."deasync-0.1.9"
+      sources."deasync-0.1.10"
       sources."ejs-2.3.4"
       sources."global-paths-0.1.2"
       sources."jsonlint-1.5.1"
@@ -20085,14 +20346,14 @@ in
       sources."xmldom-0.1.19"
       sources."lodash-4.17.4"
       sources."babel-code-frame-6.22.0"
-      (sources."babel-generator-6.24.1" // {
+      (sources."babel-generator-6.25.0" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
       })
       sources."babel-helpers-6.24.1"
       sources."babel-messages-6.23.0"
-      sources."babel-template-6.24.1"
+      sources."babel-template-6.25.0"
       sources."babel-runtime-6.23.0"
       sources."babel-register-6.24.1"
       sources."convert-source-map-1.5.0"
@@ -20130,10 +20391,10 @@ in
       sources."os-tmpdir-1.0.2"
       sources."minimist-0.0.8"
       sources."ms-2.0.0"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."globals-9.17.0"
+      sources."globals-9.18.0"
       sources."invariant-2.2.2"
       sources."loose-envify-1.3.1"
       sources."to-fast-properties-1.0.3"
@@ -20183,10 +20444,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.13";
+    version = "0.10.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.13.tgz";
-      sha1 = "7e98a46b058f436fb2a3fbed982d143d49557348";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.14.tgz";
+      sha1 = "e702e81a68b2b52db11e707796b484001b22063e";
     };
     dependencies = [
       sources."adal-node-0.1.21"
@@ -20200,22 +20461,52 @@ in
       sources."azure-arm-authorization-2.0.0"
       sources."azure-arm-cdn-1.0.3"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.20.0"
+      (sources."azure-arm-compute-3.0.0-preview" // {
+        dependencies = [
+          sources."ms-rest-2.2.0"
+          sources."ms-rest-azure-2.1.2"
+          sources."async-0.2.7"
+        ];
+      })
       sources."azure-arm-datalake-analytics-1.0.2-preview"
       sources."azure-arm-datalake-store-1.0.2-preview"
       sources."azure-arm-hdinsight-0.2.2"
       sources."azure-arm-hdinsight-jobs-0.1.0"
       sources."azure-arm-insights-0.11.3"
-      sources."azure-arm-iothub-0.1.4"
+      (sources."azure-arm-iothub-1.0.1-preview" // {
+        dependencies = [
+          sources."ms-rest-2.2.0"
+          sources."ms-rest-azure-2.1.2"
+          sources."async-0.2.7"
+        ];
+      })
       sources."azure-arm-servermanagement-0.1.2"
-      sources."azure-arm-network-0.18.0"
+      (sources."azure-arm-network-1.1.0-preview" // {
+        dependencies = [
+          sources."ms-rest-2.2.0"
+          sources."ms-rest-azure-2.1.2"
+          sources."async-0.2.7"
+        ];
+      })
       sources."azure-arm-powerbiembedded-0.1.0"
-      sources."azure-arm-trafficmanager-0.12.0"
+      (sources."azure-arm-trafficmanager-1.1.0-preview" // {
+        dependencies = [
+          sources."ms-rest-azure-2.1.2"
+          sources."ms-rest-2.2.0"
+          sources."async-0.2.7"
+        ];
+      })
       sources."azure-arm-dns-0.11.1"
       sources."azure-arm-website-0.11.4"
       sources."azure-arm-rediscache-0.2.3"
       sources."azure-arm-devtestlabs-0.1.0"
-      sources."azure-graph-1.1.1"
+      (sources."azure-graph-2.1.0-preview" // {
+        dependencies = [
+          sources."ms-rest-azure-2.1.2"
+          sources."ms-rest-2.2.0"
+          sources."async-0.2.7"
+        ];
+      })
       sources."azure-gallery-2.0.0-pre.18"
       sources."azure-keyvault-0.11.0"
       sources."azure-asm-compute-0.18.0"
@@ -20254,7 +20545,7 @@ in
       sources."colors-1.1.2"
       sources."commander-1.0.4"
       sources."date-utils-1.2.21"
-      sources."easy-table-0.0.1"
+      sources."easy-table-1.1.0"
       sources."event-stream-3.1.5"
       sources."eyes-0.1.8"
       sources."github-0.1.6"
@@ -20264,7 +20555,7 @@ in
       sources."jsonminify-0.4.1"
       sources."jsrsasign-4.8.2"
       sources."jwt-decode-2.2.0"
-      (sources."kuduscript-1.0.13" // {
+      (sources."kuduscript-1.0.15" // {
         dependencies = [
           sources."commander-1.1.1"
           sources."streamline-0.4.11"
@@ -20340,6 +20631,12 @@ in
       sources."envconf-0.0.4"
       sources."duplexer-0.1.1"
       sources."sax-0.5.2"
+      sources."@types/node-7.0.31"
+      sources."@types/request-0.0.42"
+      sources."@types/uuid-2.0.30"
+      sources."is-buffer-1.1.5"
+      sources."is-stream-1.1.0"
+      sources."@types/form-data-0.0.33"
       sources."browserify-mime-1.2.9"
       sources."extend-1.2.1"
       sources."json-edm-parser-0.1.2"
@@ -20354,6 +20651,9 @@ in
       sources."util-deprecate-1.0.2"
       sources."stack-trace-0.0.10"
       sources."keypress-0.1.0"
+      sources."wcwidth-1.0.1"
+      sources."defaults-1.0.3"
+      sources."clone-1.0.2"
       sources."from-0.1.7"
       sources."map-stream-0.1.0"
       sources."pause-stream-0.0.11"
@@ -20391,8 +20691,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."cycle-1.0.3"
       sources."isstream-0.1.2"
@@ -20454,7 +20754,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -20475,20 +20775,20 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
       sources."punycode-1.4.1"
       sources."ctype-0.5.2"
       sources."source-map-0.1.43"
-      sources."fibers-1.0.16"
+      sources."fibers-1.0.15"
       sources."galaxy-0.1.12"
       sources."amdefine-1.0.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
-          sources."string_decoder-1.0.1"
+          sources."readable-stream-2.2.11"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."http-response-object-1.1.0"
@@ -20635,8 +20935,8 @@ in
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."q-1.5.0"
       sources."debug-2.6.8"
@@ -20709,13 +21009,21 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      sources."readable-stream-2.2.10"
+      (sources."readable-stream-2.2.11" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."resolve-1.3.3"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.7.1"
-      sources."string_decoder-1.0.1"
+      sources."stream-http-2.7.2"
+      (sources."string_decoder-1.0.2" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."subarg-1.0.0"
       sources."syntax-error-1.3.0"
       sources."through2-2.0.3"
@@ -20758,7 +21066,7 @@ in
       sources."diffie-hellman-5.0.2"
       sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
-      sources."randombytes-2.0.4"
+      sources."randombytes-2.0.5"
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.0"
@@ -20786,8 +21094,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."function-bind-1.1.0"
       sources."is-buffer-1.1.5"
@@ -21049,14 +21357,14 @@ in
       sources."rimraf-2.6.1"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.1"
-      (sources."random-access-file-1.7.3" // {
+      (sources."random-access-file-1.8.1" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
-      sources."randombytes-2.0.4"
+      sources."randombytes-2.0.5"
       sources."run-parallel-1.1.6"
       sources."buffer-alloc-unsafe-1.0.0"
       sources."inherits-2.0.3"
@@ -21080,8 +21388,8 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -21110,18 +21418,19 @@ in
       sources."run-series-1.1.4"
       (sources."simple-peer-6.4.4" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."ws-2.3.1"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
           sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."string2compact-1.2.2"
@@ -21170,9 +21479,10 @@ in
       sources."voc-0.5.0"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."exit-on-epipe-1.0.0"
@@ -21277,8 +21587,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
@@ -21294,7 +21604,7 @@ in
       (sources."cordova-fetch-1.1.0" // {
         dependencies = [
           sources."q-1.5.0"
-          sources."shelljs-0.7.7"
+          sources."shelljs-0.7.8"
           sources."glob-7.1.2"
         ];
       })
@@ -21361,7 +21671,7 @@ in
       sources."isarray-0.0.1"
       sources."object-keys-1.0.11"
       sources."cordova-app-hello-world-3.12.0"
-      (sources."dependency-ls-1.1.0" // {
+      (sources."dependency-ls-1.1.1" // {
         dependencies = [
           sources."q-1.4.1"
         ];
@@ -21420,16 +21730,17 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.2.10" // {
+      (sources."readable-stream-2.2.11" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.7.1"
+      sources."stream-http-2.7.2"
       sources."string_decoder-0.10.31"
       (sources."subarg-1.0.0" // {
         dependencies = [
@@ -21477,7 +21788,7 @@ in
       sources."diffie-hellman-5.0.2"
       sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
-      sources."randombytes-2.0.4"
+      sources."randombytes-2.0.5"
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.0"
@@ -21591,7 +21902,7 @@ in
       sources."http-errors-1.6.1"
       sources."mime-1.3.4"
       sources."media-typer-0.3.0"
-      sources."npm-package-arg-5.1.1"
+      sources."npm-package-arg-5.1.2"
       sources."promzard-0.3.0"
       sources."read-1.0.7"
       (sources."read-package-json-2.0.5" // {
@@ -21737,7 +22048,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -21758,7 +22069,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."isexe-2.0.0"
@@ -21880,9 +22190,9 @@ in
       sources."hiredis-0.4.1"
       (sources."json-rpc2-0.8.1" // {
         dependencies = [
-          sources."debug-1.0.4"
+          sources."debug-1.0.5"
           sources."lodash-2.4.2"
-          sources."ms-0.6.2"
+          sources."ms-2.0.0"
         ];
       })
       sources."lodash-3.1.0"
@@ -22057,9 +22367,9 @@ in
           sources."minimist-1.2.0"
           sources."split2-2.1.1"
           sources."through2-2.0.3"
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."pump-1.0.2"
@@ -22072,9 +22382,9 @@ in
       (sources."tar-stream-1.5.4" // {
         dependencies = [
           sources."bl-1.2.1"
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       (sources."through2-0.6.5" // {
@@ -22098,16 +22408,16 @@ in
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."once-1.3.3"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."lru-cache-2.7.3"
       sources."stream-shift-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.0.1"
       sources."util-deprecate-1.0.2"
       sources."level-packager-0.18.0"
       sources."bytewise-1.1.0"
@@ -22161,16 +22471,16 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.3.0";
+    version = "3.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.0.tgz";
-      sha1 = "19aec66c4619e49a66dfa1106719819d9daecbc8";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.1.tgz";
+      sha1 = "84218b1184cec4859e63ae2ef44b5a7d877e4fe4";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
       sources."async-2.4.1"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.62.0"
+      sources."aws-sdk-2.70.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
@@ -22232,7 +22542,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22253,7 +22563,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -22277,7 +22586,7 @@ in
     dependencies = [
       sources."chalk-1.1.3"
       sources."clipboardy-0.1.2"
-      sources."conf-1.1.1"
+      sources."conf-1.1.2"
       (sources."got-6.7.1" // {
         dependencies = [
           sources."get-stream-3.0.0"
@@ -22302,7 +22611,7 @@ in
       sources."p-finally-1.0.0"
       sources."signal-exit-3.0.2"
       sources."strip-eof-1.0.0"
-      sources."lru-cache-4.0.2"
+      sources."lru-cache-4.1.1"
       sources."which-1.2.14"
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
@@ -22392,10 +22701,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.19.0";
+    version = "4.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
-      sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc";
+      url = "https://registry.npmjs.org/eslint/-/eslint-4.0.0.tgz";
+      sha1 = "7277c01437fdf41dccd168d5aa0e49b75ca1f260";
     };
     dependencies = [
       sources."babel-code-frame-6.22.0"
@@ -22403,17 +22712,17 @@ in
       sources."concat-stream-1.6.0"
       sources."debug-2.6.8"
       sources."doctrine-2.0.0"
-      sources."escope-3.6.0"
+      sources."eslint-scope-3.7.1"
       sources."espree-3.4.3"
       sources."esquery-1.0.0"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
       sources."glob-7.1.2"
-      sources."globals-9.17.0"
+      sources."globals-9.18.0"
       sources."ignore-3.3.3"
       sources."imurmurhash-0.1.4"
-      sources."inquirer-0.12.0"
+      sources."inquirer-3.1.0"
       sources."is-my-json-valid-2.16.0"
       sources."is-resolvable-1.0.0"
       sources."js-yaml-3.8.4"
@@ -22424,20 +22733,12 @@ in
       sources."natural-compare-1.4.0"
       sources."optionator-0.8.2"
       sources."path-is-inside-1.0.2"
-      sources."pluralize-1.2.1"
-      sources."progress-1.1.8"
+      sources."pluralize-4.0.0"
+      sources."progress-2.0.0"
       sources."require-uncached-1.0.3"
-      sources."shelljs-0.7.7"
-      sources."strip-bom-3.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."table-3.8.3" // {
-        dependencies = [
-          sources."string-width-2.0.0"
-          sources."is-fullwidth-code-point-2.0.0"
-        ];
-      })
+      sources."table-4.0.1"
       sources."text-table-0.2.0"
-      sources."user-home-2.0.0"
       sources."js-tokens-3.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -22447,27 +22748,19 @@ in
       sources."ansi-regex-2.1.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."ms-2.0.0"
-      sources."es6-map-0.1.5"
-      sources."es6-weak-map-2.0.2"
       (sources."esrecurse-4.1.0" // {
         dependencies = [
           sources."estraverse-4.1.1"
         ];
       })
-      sources."d-1.0.0"
-      sources."es5-ext-0.10.22"
-      sources."es6-iterator-2.0.1"
-      sources."es6-set-0.1.5"
-      sources."es6-symbol-3.1.1"
-      sources."event-emitter-0.3.5"
       sources."object-assign-4.1.1"
       sources."acorn-5.0.3"
       (sources."acorn-jsx-3.0.1" // {
@@ -22497,25 +22790,30 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."ansi-escapes-1.4.0"
-      sources."cli-cursor-1.0.2"
+      sources."ansi-escapes-2.0.0"
+      sources."cli-cursor-2.1.0"
       sources."cli-width-2.1.0"
-      sources."figures-1.7.0"
-      sources."readline2-1.0.1"
-      sources."run-async-0.1.0"
-      sources."rx-lite-3.1.2"
-      sources."string-width-1.0.2"
+      sources."external-editor-2.0.4"
+      sources."figures-2.0.0"
+      sources."mute-stream-0.0.7"
+      sources."run-async-2.3.0"
+      sources."rx-lite-4.0.8"
+      sources."rx-lite-aggregates-4.0.8"
+      sources."string-width-2.0.0"
       sources."through-2.3.8"
-      sources."restore-cursor-1.0.1"
-      sources."exit-hook-1.1.1"
-      sources."onetime-1.1.0"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."mute-stream-0.0.5"
-      sources."number-is-nan-1.0.1"
+      sources."restore-cursor-2.0.0"
+      sources."onetime-2.0.1"
+      sources."signal-exit-3.0.2"
+      sources."mimic-fn-1.1.0"
+      sources."iconv-lite-0.4.18"
+      sources."jschardet-1.4.2"
+      sources."tmp-0.0.31"
+      sources."os-tmpdir-1.0.2"
+      sources."is-promise-2.1.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
       sources."jsonpointer-4.0.1"
@@ -22535,15 +22833,10 @@ in
       sources."caller-path-0.1.0"
       sources."resolve-from-1.0.1"
       sources."callsites-0.2.0"
-      sources."interpret-1.0.3"
-      sources."rechoir-0.6.2"
-      sources."resolve-1.3.3"
-      sources."path-parse-1.0.5"
       sources."ajv-4.11.8"
       sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
-      sources."os-homedir-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -22587,7 +22880,7 @@ in
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
       sources."glob-7.1.2"
-      sources."globals-9.17.0"
+      sources."globals-9.18.0"
       sources."ignore-3.3.3"
       sources."imurmurhash-0.1.4"
       sources."inquirer-0.12.0"
@@ -22603,7 +22896,7 @@ in
       sources."pluralize-1.2.1"
       sources."progress-1.1.8"
       sources."require-uncached-1.0.3"
-      sources."shelljs-0.7.7"
+      sources."shelljs-0.7.8"
       sources."strip-bom-3.0.0"
       sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
@@ -22617,12 +22910,12 @@ in
       sources."js-tokens-3.0.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."ms-2.0.0"
       sources."es6-map-0.1.5"
@@ -22633,7 +22926,7 @@ in
         ];
       })
       sources."d-1.0.0"
-      sources."es5-ext-0.10.22"
+      sources."es5-ext-0.10.23"
       sources."es6-iterator-2.0.1"
       sources."es6-set-0.1.5"
       sources."es6-symbol-3.1.1"
@@ -22667,8 +22960,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."ansi-escapes-1.4.0"
       sources."cli-cursor-1.0.2"
@@ -22838,7 +23131,7 @@ in
       sources."is-binary-path-1.0.1"
       sources."is-glob-2.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.1.1"
+      sources."fsevents-1.1.2"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -22860,12 +23153,21 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
-      sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.5"
-      sources."remove-trailing-separator-1.0.1"
+      sources."is-posix-bracket-0.1.1"
+      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -22875,12 +23177,12 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."set-immediate-shim-1.0.1"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.36"
@@ -22965,7 +23267,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -22986,7 +23288,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -23002,8 +23303,8 @@ in
       sources."fstream-ignore-1.0.5"
       sources."uid-number-0.0.6"
       sources."ms-2.0.0"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       (sources."event-stream-0.5.3" // {
         dependencies = [
@@ -23055,6 +23356,22 @@ in
     };
     production = true;
   };
+  git-standup = nodeEnv.buildNodePackage {
+    name = "git-standup";
+    packageName = "git-standup";
+    version = "2.1.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/git-standup/-/git-standup-2.1.8.tgz";
+      sha1 = "4df13a13e9c49ba4cdbd5ad35a90457c8795e352";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Recall what you did on the last working day. Psst! or be nosy and find what someone else in your team did ;-)";
+      homepage = "https://github.com/kamranahmedse/git-standup#readme";
+      license = "MIT";
+    };
+    production = true;
+  };
   grunt-cli = nodeEnv.buildNodePackage {
     name = "grunt-cli";
     packageName = "grunt-cli";
@@ -23075,8 +23392,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."abbrev-1.1.0"
     ];
@@ -23108,7 +23425,7 @@ in
       sources."xml2js-0.4.17"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
-      (sources."clean-css-3.4.26" // {
+      (sources."clean-css-3.4.27" // {
         dependencies = [
           sources."commander-2.8.1"
         ];
@@ -23125,7 +23442,7 @@ in
           sources."source-map-0.1.43"
         ];
       })
-      (sources."uglify-js-2.8.28" // {
+      (sources."uglify-js-2.8.29" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -23233,9 +23550,9 @@ in
       sources."replace-ext-0.0.1"
       (sources."through2-2.0.3" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."vinyl-0.5.3"
@@ -23262,7 +23579,7 @@ in
       sources."inherits-2.0.3"
       sources."xtend-4.0.1"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
+      sources."safe-buffer-5.0.1"
       sources."util-deprecate-1.0.2"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
@@ -23303,11 +23620,20 @@ in
           sources."isarray-1.0.0"
         ];
       })
-      sources."randomatic-1.1.6"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."repeat-string-1.6.1"
-      sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.5"
-      sources."remove-trailing-separator-1.0.1"
+      sources."is-posix-bracket-0.1.1"
+      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -23365,8 +23691,8 @@ in
       sources."glob2base-0.0.12"
       sources."unique-stream-1.0.0"
       sources."inflight-1.0.6"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."find-index-0.1.1"
       sources."gaze-0.5.2"
@@ -23445,8 +23771,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       (sources."cli-0.6.6" // {
         dependencies = [
@@ -23556,15 +23882,15 @@ in
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       (sources."optimist-0.6.1" // {
         dependencies = [
           sources."wordwrap-0.0.3"
         ];
       })
-      (sources."uglify-js-2.8.28" // {
+      (sources."uglify-js-2.8.29" // {
         dependencies = [
           sources."source-map-0.5.6"
         ];
@@ -23659,8 +23985,8 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-0.0.1"
       sources."string_decoder-0.10.31"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
     ];
     buildInputs = globalBuildInputs;
@@ -23842,7 +24168,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -23863,7 +24189,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
@@ -23914,7 +24239,11 @@ in
       sources."parse-json-2.2.0"
       sources."pinkie-promise-2.0.1"
       sources."read-all-stream-3.1.0"
-      sources."readable-stream-2.2.10"
+      (sources."readable-stream-2.2.11" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."timed-out-3.1.3"
       sources."unzip-response-1.0.2"
       sources."url-parse-lax-1.0.0"
@@ -23925,7 +24254,11 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.1"
+      (sources."string_decoder-1.0.2" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."util-deprecate-1.0.2"
       sources."prepend-http-1.0.4"
       (sources."rc-1.2.1" // {
@@ -24086,7 +24419,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.1.1"
+      sources."fsevents-1.1.2"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -24108,12 +24441,21 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
-      sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.5"
-      sources."remove-trailing-separator-1.0.1"
+      sources."is-posix-bracket-0.1.1"
+      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -24122,11 +24464,19 @@ in
       sources."is-equal-shallow-0.1.3"
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
-      sources."readable-stream-2.2.10"
+      (sources."readable-stream-2.2.11" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."set-immediate-shim-1.0.1"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.1"
+      (sources."string_decoder-1.0.2" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."util-deprecate-1.0.2"
       sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.36"
@@ -24202,7 +24552,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24223,7 +24573,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
@@ -24246,8 +24595,8 @@ in
       sources."inflight-1.0.6"
       sources."eventemitter3-1.2.0"
       sources."requires-port-1.0.0"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."wordwrap-0.0.3"
       (sources."engine.io-1.8.3" // {
@@ -24496,14 +24845,14 @@ in
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-fs-2.4.4"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."xtend-4.0.1"
       sources."core-util-is-1.0.2"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."clone-1.0.2"
       sources."clone-stats-0.0.1"
@@ -24548,8 +24897,8 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."is-glob-3.1.0"
       sources."path-dirname-1.0.2"
@@ -24581,11 +24930,20 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."repeat-string-1.6.1"
-      sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.5"
-      sources."remove-trailing-separator-1.0.1"
+      sources."is-posix-bracket-0.1.1"
+      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -24680,8 +25038,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."lodash._baseassign-3.2.0"
       sources."lodash._basecreate-3.0.3"
@@ -24768,12 +25126,12 @@ in
       sources."npmlog-3.1.2"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
       sources."hosted-git-info-2.4.2"
@@ -24822,7 +25180,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -24843,7 +25201,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -24853,8 +25210,8 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.4"
       sources."console-control-strings-1.1.0"
@@ -24932,8 +25289,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
       sources."abbrev-1.1.0"
@@ -24942,12 +25299,12 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
@@ -25000,7 +25357,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25021,7 +25378,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -25193,8 +25549,8 @@ in
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
@@ -25225,11 +25581,11 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.1"
+      sources."string_decoder-1.0.2"
       sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
@@ -25274,7 +25630,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25295,7 +25651,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
@@ -25354,13 +25709,13 @@ in
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."core-util-is-1.0.2"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
@@ -25414,7 +25769,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25435,7 +25790,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -25447,8 +25801,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.11"
@@ -25497,7 +25851,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.1.1"
+      sources."fsevents-1.1.2"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -25519,12 +25873,21 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."repeat-string-1.6.1"
       sources."isarray-1.0.0"
-      sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.5"
-      sources."remove-trailing-separator-1.0.1"
+      sources."is-posix-bracket-0.1.1"
+      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -25534,12 +25897,12 @@ in
       sources."is-primitive-2.0.0"
       sources."binary-extensions-1.8.0"
       sources."graceful-fs-4.1.11"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."set-immediate-shim-1.0.1"
       sources."core-util-is-1.0.2"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.36"
@@ -25618,7 +25981,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -25639,7 +26002,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -25665,8 +26027,8 @@ in
       sources."lodash._getnative-3.9.1"
       sources."lodash.isarguments-3.1.0"
       sources."lodash.isarray-3.0.4"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."event-stream-3.3.4"
       sources."through-2.3.8"
@@ -25800,7 +26162,7 @@ in
           sources."tunnel-agent-0.6.0"
         ];
       })
-      sources."node-red-node-rbe-0.1.9"
+      sources."node-red-node-rbe-0.1.10"
       sources."bcrypt-1.0.2"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
@@ -25845,12 +26207,12 @@ in
       sources."nth-check-1.0.1"
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.1"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
@@ -25920,15 +26282,15 @@ in
       sources."is-negated-glob-1.0.0"
       sources."ordered-read-streams-1.0.1"
       sources."pumpify-1.3.5"
-      sources."remove-trailing-separator-1.0.1"
+      sources."remove-trailing-separator-1.0.2"
       sources."to-absolute-glob-2.0.1"
       sources."unique-stream-2.2.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."is-glob-3.1.0"
       sources."path-dirname-1.0.2"
@@ -26040,7 +26402,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26061,7 +26423,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
@@ -26099,7 +26460,7 @@ in
           sources."minimist-0.0.10"
         ];
       })
-      (sources."mimelib-0.3.0" // {
+      (sources."mimelib-0.3.1" // {
         dependencies = [
           sources."addressparser-1.0.1"
         ];
@@ -26303,10 +26664,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.0.2";
+    version = "5.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.0.2.tgz";
-      sha1 = "139e6c29c5a4982af11dda04e48aea783156d190";
+      url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz";
+      sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856";
     };
     dependencies = [
       sources."JSONStream-1.3.1"
@@ -26317,7 +26678,7 @@ in
       sources."aproba-1.1.2"
       sources."archy-1.0.0"
       sources."bluebird-3.5.0"
-      sources."cacache-9.2.6"
+      sources."cacache-9.2.8"
       sources."call-limit-1.1.0"
       sources."chownr-1.0.1"
       sources."cmd-shim-2.0.2"
@@ -26359,14 +26720,14 @@ in
       sources."normalize-package-data-2.3.8"
       sources."npm-cache-filename-1.0.2"
       sources."npm-install-checks-3.0.0"
-      sources."npm-package-arg-5.1.1"
+      sources."npm-package-arg-5.1.2"
       sources."npm-registry-client-8.3.0"
       sources."npm-user-validate-1.0.0"
       sources."npmlog-4.1.0"
       sources."once-1.4.0"
       sources."opener-1.4.3"
       sources."osenv-0.1.4"
-      sources."pacote-2.7.27"
+      sources."pacote-2.7.36"
       sources."path-is-inside-1.0.2"
       sources."promise-inflight-1.0.1"
       sources."read-1.0.7"
@@ -26374,11 +26735,15 @@ in
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.5"
       sources."read-package-tree-5.1.6"
-      sources."readable-stream-2.2.10"
+      (sources."readable-stream-2.2.11" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."request-2.81.0"
       sources."retry-0.10.1"
       sources."rimraf-2.6.1"
-      sources."safe-buffer-5.0.1"
+      sources."safe-buffer-5.1.0"
       sources."semver-5.3.0"
       sources."sha-2.0.1"
       sources."slide-1.1.6"
@@ -26391,7 +26756,7 @@ in
           sources."string_decoder-0.10.31"
         ];
       })
-      sources."ssri-4.1.4"
+      sources."ssri-4.1.6"
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."text-table-0.2.0"
@@ -26425,8 +26790,8 @@ in
       sources."asap-2.0.5"
       sources."fstream-ignore-1.0.5"
       sources."minimatch-3.0.4"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
       sources."path-is-absolute-1.0.1"
@@ -26473,18 +26838,18 @@ in
       sources."number-is-nan-1.0.1"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
-      sources."make-fetch-happen-2.4.10"
+      sources."make-fetch-happen-2.4.12"
       sources."npm-pick-manifest-1.0.3"
       sources."promise-retry-1.1.1"
       sources."protoduck-4.0.0"
-      sources."tar-fs-1.15.2"
+      sources."tar-fs-1.15.3"
       sources."tar-stream-1.5.4"
-      sources."agentkeepalive-3.1.0"
+      sources."agentkeepalive-3.2.0"
       sources."http-cache-semantics-3.7.3"
       sources."http-proxy-agent-1.0.0"
       sources."https-proxy-agent-1.0.0"
       sources."node-fetch-npm-2.0.1"
-      sources."socks-proxy-agent-2.1.0"
+      sources."socks-proxy-agent-2.1.1"
       sources."humanize-ms-1.2.1"
       sources."ms-2.0.0"
       (sources."agent-base-2.1.1" // {
@@ -26496,7 +26861,7 @@ in
       sources."debug-2.6.8"
       sources."encoding-0.1.12"
       sources."json-parse-helpfulerror-1.0.3"
-      sources."iconv-lite-0.4.17"
+      sources."iconv-lite-0.4.18"
       sources."jju-1.3.0"
       sources."socks-1.1.10"
       sources."ip-1.1.5"
@@ -26509,7 +26874,11 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.1"
+      (sources."string_decoder-1.0.2" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -26547,7 +26916,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26568,7 +26937,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -26739,7 +27107,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -26760,7 +27128,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -26773,19 +27140,27 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.4"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.4"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.10"
+      (sources."readable-stream-2.2.11" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.1"
+      (sources."string_decoder-1.0.2" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."util-deprecate-1.0.2"
       sources."aproba-1.1.2"
       sources."has-unicode-2.0.1"
@@ -26863,7 +27238,7 @@ in
       sources."require-dir-0.3.2"
       sources."semver-5.3.0"
       sources."semver-utils-1.1.1"
-      (sources."snyk-1.33.0" // {
+      (sources."snyk-1.34.4" // {
         dependencies = [
           sources."update-notifier-0.5.0"
           sources."latest-version-1.0.1"
@@ -27004,8 +27379,8 @@ in
       sources."proto-list-1.2.4"
       sources."fstream-ignore-1.0.5"
       sources."minimatch-3.0.4"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
       sources."path-is-absolute-1.0.1"
@@ -27033,21 +27408,21 @@ in
       sources."es6-symbol-3.1.1"
       sources."ms-2.0.0"
       sources."d-1.0.0"
-      sources."es5-ext-0.10.22"
+      sources."es5-ext-0.10.23"
       sources."es6-iterator-2.0.1"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
         ];
       })
       sources."typedarray-0.0.6"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -27098,7 +27473,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27119,7 +27494,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -27148,6 +27522,7 @@ in
       sources."snyk-config-1.0.1"
       sources."snyk-module-1.8.1"
       sources."snyk-policy-1.7.1"
+      sources."snyk-python-plugin-1.0.0"
       (sources."snyk-recursive-readdir-2.0.0" // {
         dependencies = [
           sources."minimatch-3.0.2"
@@ -27225,7 +27600,7 @@ in
           sources."window-size-0.2.0"
         ];
       })
-      sources."lru-cache-4.0.2"
+      sources."lru-cache-4.1.1"
       sources."lodash.defaults-4.2.0"
       sources."lodash.defaultsdeep-4.6.0"
       sources."lodash.mergewith-4.6.0"
@@ -27451,12 +27826,12 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."optimist-0.6.1"
       sources."source-map-0.4.4"
-      (sources."uglify-js-2.8.28" // {
+      (sources."uglify-js-2.8.29" // {
         dependencies = [
           sources."source-map-0.5.6"
           sources."yargs-3.10.0"
@@ -27526,7 +27901,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -27547,7 +27922,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
@@ -27558,13 +27932,14 @@ in
       sources."hot-shots-4.5.0"
       (sources."limitation-0.2.0" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."dnscache-1.0.1"
-      sources."dtrace-provider-0.8.2"
+      sources."dtrace-provider-0.8.3"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
@@ -27587,26 +27962,29 @@ in
       sources."hat-0.0.3"
       (sources."kad-fs-0.0.4" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."kad-localstorage-0.0.7"
       (sources."kad-memstore-0.0.1" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."lodash-3.10.1"
       sources."merge-1.2.0"
       (sources."msgpack5-3.4.1" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."process-nextick-args-1.0.7"
@@ -27614,9 +27992,10 @@ in
       sources."dom-storage-2.0.2"
       (sources."bl-1.2.1" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       sources."get-caller-file-1.0.2"
@@ -27736,12 +28115,12 @@ in
       sources."big-integer-1.6.23"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."base64-js-0.0.8"
       sources."xmlbuilder-4.0.0"
@@ -27867,14 +28246,18 @@ in
       sources."rimraf-2.6.1"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.1"
-      (sources."random-access-file-1.7.3" // {
+      (sources."random-access-file-1.8.1" // {
         dependencies = [
           sources."mkdirp-0.5.1"
           sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
-      sources."randombytes-2.0.4"
+      (sources."randombytes-2.0.5" // {
+        dependencies = [
+          sources."safe-buffer-5.1.0"
+        ];
+      })
       sources."run-parallel-1.1.6"
       sources."buffer-alloc-unsafe-1.0.0"
       sources."debug-2.6.8"
@@ -27897,8 +28280,8 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       (sources."bittorrent-dht-6.4.2" // {
         dependencies = [
@@ -27929,7 +28312,6 @@ in
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
           sources."ws-2.3.1"
-          sources."safe-buffer-5.0.1"
         ];
       })
       sources."string2compact-1.2.2"
@@ -28226,13 +28608,13 @@ in
       sources."rimraf-2.6.1"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.1"
-      (sources."random-access-file-1.7.3" // {
+      (sources."random-access-file-1.8.1" // {
         dependencies = [
           sources."debug-2.6.8"
           sources."ms-2.0.0"
         ];
       })
-      sources."randombytes-2.0.4"
+      sources."randombytes-2.0.5"
       sources."run-parallel-1.1.6"
       sources."thunky-1.0.2"
       sources."buffer-alloc-unsafe-1.0.0"
@@ -28252,8 +28634,8 @@ in
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."bittorrent-dht-6.4.2"
       (sources."bittorrent-tracker-7.7.0" // {
@@ -28284,18 +28666,19 @@ in
       sources."simple-get-2.6.0"
       (sources."simple-peer-6.4.4" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
+          sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
         ];
       })
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
           sources."ws-2.3.1"
           sources."isarray-1.0.0"
-          sources."string_decoder-1.0.1"
           sources."safe-buffer-5.0.1"
+          sources."string_decoder-1.0.2"
           sources."ultron-1.1.0"
         ];
       })
@@ -28361,8 +28744,8 @@ in
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."is-stream-1.1.0"
       sources."pinkie-promise-2.0.1"
@@ -28396,7 +28779,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28417,7 +28800,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."hoek-2.16.3"
@@ -28454,10 +28836,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.4.2";
+    version = "1.4.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.4.2.tgz";
-      sha1 = "bcdd95ed1eca434ac7f98ca26ea4d25a2af6a2ac";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.4.4.tgz";
+      sha1 = "a8d1447b14c9bf67e6d420dcadd10fb9a4fad65a";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -28486,7 +28868,7 @@ in
       sources."detective-4.5.0"
       sources."glob-5.0.15"
       sources."graceful-fs-4.1.11"
-      sources."iconv-lite-0.4.17"
+      sources."iconv-lite-0.4.18"
       sources."mkdirp-0.5.1"
       sources."private-0.1.7"
       sources."q-1.5.0"
@@ -28500,8 +28882,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
       sources."ast-types-0.9.6"
@@ -28636,7 +29018,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28657,7 +29039,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -28836,7 +29217,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -28857,13 +29238,12 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
       sources."lru-cache-2.7.3"
       sources."sigmund-1.0.1"
-      sources."dtrace-provider-0.8.2"
+      sources."dtrace-provider-0.8.3"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.4"
       sources."moment-2.18.1"
@@ -28879,8 +29259,8 @@ in
       sources."inherits-2.0.3"
       sources."once-1.4.0"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."optimist-0.3.7"
       (sources."uglify-js-2.3.6" // {
@@ -28899,7 +29279,8 @@ in
       sources."uc.micro-1.0.3"
       (sources."htmlparser2-3.9.2" // {
         dependencies = [
-          sources."readable-stream-2.2.10"
+          sources."readable-stream-2.2.11"
+          sources."safe-buffer-5.0.1"
         ];
       })
       sources."regexp-quote-0.0.0"
@@ -28915,7 +29296,11 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."string_decoder-1.0.1"
+      (sources."string_decoder-1.0.2" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
       sources."util-deprecate-1.0.2"
       sources."jsonparse-1.3.1"
       sources."through-2.3.8"
@@ -28950,17 +29335,17 @@ in
       sources."graceful-readlink-1.0.1"
       sources."graceful-fs-4.1.11"
       sources."minimatch-3.0.4"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."set-immediate-shim-1.0.1"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -29071,8 +29456,8 @@ in
       sources."inherits-2.0.3"
       sources."minimatch-3.0.4"
       sources."path-is-absolute-1.0.1"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."sshpk-agent-1.2.1"
       (sources."sshpk-1.7.1" // {
@@ -29094,11 +29479,11 @@ in
         ];
       })
       sources."json-schema-0.2.3"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
@@ -29136,8 +29521,8 @@ in
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."amdefine-1.0.1"
     ];
@@ -29159,7 +29544,7 @@ in
     };
     dependencies = [
       sources."sax-1.2.2"
-      sources."coa-1.0.2"
+      sources."coa-1.0.3"
       sources."js-yaml-3.7.0"
       sources."colors-1.1.2"
       sources."whet.extend-0.9.9"
@@ -29170,7 +29555,7 @@ in
       sources."esprima-2.7.3"
       sources."sprintf-js-1.0.3"
       sources."minimist-0.0.8"
-      sources."clap-1.1.3"
+      sources."clap-1.2.0"
       sources."source-map-0.5.6"
       sources."chalk-1.1.3"
       sources."ansi-styles-2.2.1"
@@ -29207,22 +29592,22 @@ in
       sources."graceful-fs-4.1.11"
       sources."object-assign-4.1.1"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."prr-0.0.0"
       sources."core-util-is-1.0.2"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."wrappy-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
     ];
     buildInputs = globalBuildInputs;
@@ -29252,10 +29637,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.0.15";
+    version = "3.0.16";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.15.tgz";
-      sha1 = "aacb323a846b234602270dead8a32441a8806f42";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.16.tgz";
+      sha1 = "fe394c6708a79ffbf21ca15d6591b16334501aec";
     };
     dependencies = [
       sources."commander-2.9.0"
@@ -29394,7 +29779,7 @@ in
           sources."colors-1.0.3"
         ];
       })
-      (sources."yargs-8.0.1" // {
+      (sources."yargs-8.0.2" // {
         dependencies = [
           sources."string-width-2.0.0"
           sources."is-fullwidth-code-point-2.0.0"
@@ -29600,7 +29985,7 @@ in
       sources."read-installed-4.0.3"
       sources."read-package-json-2.0.5"
       sources."read-package-tree-5.1.6"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.1"
       sources."sha-2.0.1"
@@ -29650,8 +30035,8 @@ in
           sources."minimatch-3.0.4"
         ];
       })
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
       sources."path-is-absolute-1.0.1"
@@ -29701,8 +30086,8 @@ in
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
@@ -29727,7 +30112,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -29748,7 +30133,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."punycode-1.4.1"
@@ -29785,7 +30169,7 @@ in
       sources."execa-0.4.0"
       (sources."cross-spawn-async-2.2.5" // {
         dependencies = [
-          sources."lru-cache-4.0.2"
+          sources."lru-cache-4.1.1"
         ];
       })
       sources."is-stream-1.1.0"
@@ -29824,7 +30208,11 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."ssri-4.1.4"
+      (sources."ssri-4.1.6" // {
+        dependencies = [
+          sources."safe-buffer-5.1.0"
+        ];
+      })
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
@@ -29920,7 +30308,7 @@ in
       sources."mem-1.1.0"
       (sources."cross-spawn-4.0.2" // {
         dependencies = [
-          sources."lru-cache-4.0.2"
+          sources."lru-cache-4.1.1"
         ];
       })
       sources."p-finally-1.0.0"
@@ -30019,8 +30407,8 @@ in
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."is-stream-1.1.0"
       sources."pinkie-promise-2.0.1"
@@ -30054,7 +30442,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -30075,7 +30463,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."hoek-2.16.3"
@@ -30145,7 +30532,7 @@ in
       sources."source-map-0.5.6"
       sources."supports-color-3.2.3"
       sources."tapable-0.2.6"
-      (sources."uglify-js-2.8.28" // {
+      (sources."uglify-js-2.8.29" // {
         dependencies = [
           sources."yargs-3.10.0"
         ];
@@ -30167,14 +30554,14 @@ in
       sources."big.js-3.1.3"
       sources."emojis-list-2.1.0"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."prr-0.0.0"
       sources."core-util-is-1.0.2"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
       sources."assert-1.4.1"
@@ -30192,7 +30579,7 @@ in
       sources."punycode-1.4.1"
       sources."querystring-es3-0.2.1"
       sources."stream-browserify-2.0.1"
-      sources."stream-http-2.7.1"
+      sources."stream-http-2.7.2"
       sources."timers-browserify-2.0.2"
       sources."tty-browserify-0.0.0"
       (sources."url-0.11.0" // {
@@ -30218,7 +30605,11 @@ in
       sources."diffie-hellman-5.0.2"
       sources."pbkdf2-3.0.12"
       sources."public-encrypt-4.0.0"
-      sources."randombytes-2.0.4"
+      (sources."randombytes-2.0.5" // {
+        dependencies = [
+          sources."safe-buffer-5.1.0"
+        ];
+      })
       sources."browserify-aes-1.0.6"
       sources."browserify-des-1.0.0"
       sources."evp_bytestokey-1.0.0"
@@ -30268,7 +30659,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.1.1"
+      sources."fsevents-1.1.2"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -30289,9 +30680,18 @@ in
       sources."fill-range-2.2.3"
       sources."is-number-2.1.0"
       sources."isobject-2.1.0"
-      sources."randomatic-1.1.6"
+      (sources."randomatic-1.1.7" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."is-posix-bracket-0.1.1"
-      sources."remove-trailing-separator-1.0.1"
+      sources."remove-trailing-separator-1.0.2"
       sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
       sources."for-in-1.0.2"
@@ -30302,8 +30702,8 @@ in
       sources."binary-extensions-1.8.0"
       sources."minimatch-3.0.4"
       sources."set-immediate-shim-1.0.1"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."nan-2.6.2"
       sources."node-pre-gyp-0.6.36"
@@ -30375,7 +30775,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -30396,7 +30796,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -30493,7 +30892,7 @@ in
       sources."detect-indent-5.0.0"
       sources."gunzip-maybe-1.4.0"
       sources."ini-1.3.4"
-      sources."inquirer-3.0.6"
+      sources."inquirer-3.1.0"
       sources."invariant-2.2.2"
       sources."is-builtin-module-1.0.0"
       sources."is-ci-1.0.10"
@@ -30510,7 +30909,7 @@ in
       sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."strip-bom-3.0.0"
-      sources."tar-fs-1.15.2"
+      sources."tar-fs-1.15.3"
       sources."tar-stream-1.5.4"
       sources."uuid-3.0.1"
       sources."v8-compile-cache-1.1.0"
@@ -30536,15 +30935,15 @@ in
       sources."duplexify-3.5.0"
       sources."end-of-stream-1.0.0"
       sources."inherits-2.0.3"
-      sources."readable-stream-2.2.10"
+      sources."readable-stream-2.2.11"
       sources."stream-shift-1.0.0"
       sources."once-1.3.3"
       sources."wrappy-1.0.2"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
       sources."util-deprecate-1.0.2"
       (sources."pump-1.0.2" // {
         dependencies = [
@@ -30556,7 +30955,7 @@ in
         ];
       })
       sources."xtend-4.0.1"
-      sources."ansi-escapes-1.4.0"
+      sources."ansi-escapes-2.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.1.0"
       sources."external-editor-2.0.4"
@@ -30564,14 +30963,15 @@ in
       sources."lodash-4.17.4"
       sources."mute-stream-0.0.7"
       sources."run-async-2.3.0"
-      sources."rx-4.1.0"
+      sources."rx-lite-4.0.8"
+      sources."rx-lite-aggregates-4.0.8"
       sources."string-width-2.0.0"
       sources."through-2.3.8"
       sources."restore-cursor-2.0.0"
       sources."onetime-2.0.1"
       sources."signal-exit-3.0.2"
       sources."mimic-fn-1.1.0"
-      sources."iconv-lite-0.4.17"
+      sources."iconv-lite-0.4.18"
       sources."jschardet-1.4.2"
       sources."tmp-0.0.31"
       sources."os-tmpdir-1.0.2"
@@ -30583,8 +30983,8 @@ in
       sources."ci-info-1.0.0"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
       sources."string.prototype.codepointat-0.2.0"
@@ -30626,7 +31026,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -30647,7 +31047,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -30673,179 +31072,220 @@ in
   yo = nodeEnv.buildNodePackage {
     name = "yo";
     packageName = "yo";
-    version = "1.8.5";
+    version = "2.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yo/-/yo-1.8.5.tgz";
-      sha1 = "776ab9ec79a7882f8d4f7a9e10214fdab050d928";
+      url = "https://registry.npmjs.org/yo/-/yo-2.0.0.tgz";
+      sha1 = "0cd75211379ed87105f99510885759062147b517";
     };
     dependencies = [
-      sources."async-1.5.2"
+      sources."async-2.4.1"
       sources."chalk-1.1.3"
-      sources."cli-list-0.1.8"
-      sources."configstore-1.4.0"
-      sources."cross-spawn-3.0.1"
-      sources."figures-1.7.0"
-      sources."fullname-2.1.0"
-      sources."got-5.7.1"
+      sources."cli-list-0.2.0"
+      sources."configstore-3.1.0"
+      sources."cross-spawn-5.1.0"
+      sources."figures-2.0.0"
+      sources."fullname-3.3.0"
+      sources."got-6.7.1"
       sources."humanize-string-1.0.1"
-      sources."inquirer-0.11.4"
-      (sources."insight-0.7.0" // {
+      sources."inquirer-3.1.0"
+      (sources."insight-0.8.4" // {
         dependencies = [
+          sources."async-1.5.2"
+          (sources."configstore-1.4.0" // {
+            dependencies = [
+              sources."uuid-2.0.3"
+            ];
+          })
           sources."inquirer-0.10.1"
+          sources."write-file-atomic-1.3.4"
+          sources."xdg-basedir-2.0.0"
+          sources."ansi-escapes-1.4.0"
+          sources."cli-cursor-1.0.2"
+          sources."cli-width-1.1.1"
+          sources."figures-1.7.0"
+          sources."lodash-3.10.1"
+          sources."run-async-0.1.0"
+          sources."rx-lite-3.1.2"
+          sources."restore-cursor-1.0.1"
+          sources."onetime-1.1.0"
         ];
       })
-      sources."lodash-3.10.1"
+      sources."lodash-4.17.4"
       (sources."meow-3.7.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."read-pkg-up-1.0.1"
+        ];
+      })
+      (sources."npm-keyword-4.2.0" // {
+        dependencies = [
+          sources."got-5.7.1"
+          sources."timed-out-3.1.3"
+          sources."unzip-response-1.0.2"
         ];
       })
-      sources."npm-keyword-4.2.0"
-      sources."opn-3.0.3"
+      sources."opn-4.0.2"
       (sources."package-json-2.4.0" // {
         dependencies = [
-          sources."semver-5.3.0"
+          sources."got-5.7.1"
+          sources."timed-out-3.1.3"
+          sources."unzip-response-1.0.2"
         ];
       })
       sources."parse-help-0.1.1"
-      sources."read-pkg-up-1.0.1"
-      sources."repeating-2.0.1"
+      (sources."read-pkg-up-2.0.0" // {
+        dependencies = [
+          sources."find-up-2.1.0"
+          sources."read-pkg-2.0.0"
+          sources."load-json-file-2.0.0"
+          sources."path-type-2.0.0"
+          sources."strip-bom-3.0.0"
+        ];
+      })
       sources."root-check-1.0.0"
-      sources."sort-on-1.3.0"
+      sources."sort-on-2.0.0"
       sources."string-length-1.0.1"
       (sources."tabtab-1.3.2" // {
         dependencies = [
           sources."inquirer-1.2.3"
-          sources."minimist-1.2.0"
-          sources."cli-width-2.1.0"
-          sources."lodash-4.17.4"
+          sources."ansi-escapes-1.4.0"
+          sources."cli-cursor-1.0.2"
+          sources."external-editor-1.1.1"
+          sources."figures-1.7.0"
           sources."mute-stream-0.0.6"
-          sources."run-async-2.3.0"
+          sources."string-width-1.0.2"
+          sources."restore-cursor-1.0.1"
+          sources."onetime-1.1.0"
+          sources."tmp-0.0.29"
+          sources."is-fullwidth-code-point-1.0.0"
         ];
       })
       sources."titleize-1.0.0"
-      (sources."update-notifier-0.6.3" // {
-        dependencies = [
-          sources."configstore-2.1.0"
-          sources."dot-prop-3.0.0"
-        ];
-      })
+      sources."update-notifier-2.2.0"
       sources."user-home-2.0.0"
       (sources."yeoman-character-1.1.0" // {
         dependencies = [
           sources."supports-color-3.2.3"
         ];
       })
-      (sources."yeoman-doctor-2.1.0" // {
-        dependencies = [
-          sources."semver-5.3.0"
-        ];
-      })
-      (sources."yeoman-environment-1.6.6" // {
+      sources."yeoman-doctor-2.1.0"
+      sources."yeoman-environment-2.0.0"
+      (sources."yosay-2.0.0" // {
         dependencies = [
-          sources."inquirer-1.2.3"
-          sources."lodash-4.17.4"
-          sources."cli-width-2.1.0"
-          sources."mute-stream-0.0.6"
-          sources."run-async-2.3.0"
+          sources."ansi-styles-3.1.0"
         ];
       })
-      sources."yosay-1.2.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."ansi-regex-2.1.1"
+      sources."dot-prop-4.1.1"
       sources."graceful-fs-4.1.11"
-      sources."mkdirp-0.5.1"
-      sources."object-assign-4.1.1"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.4"
-      sources."uuid-2.0.3"
-      sources."write-file-atomic-1.3.4"
-      sources."xdg-basedir-2.0.0"
-      sources."minimist-0.0.8"
-      sources."os-homedir-1.0.2"
+      sources."make-dir-1.0.0"
+      sources."unique-string-1.0.0"
+      sources."write-file-atomic-2.1.0"
+      sources."xdg-basedir-3.0.0"
+      sources."is-obj-1.0.1"
+      sources."pify-2.3.0"
+      sources."crypto-random-string-1.0.0"
       sources."imurmurhash-0.1.4"
       sources."slide-1.1.6"
-      sources."lru-cache-4.0.2"
+      sources."lru-cache-4.1.1"
+      sources."shebang-command-1.2.0"
       sources."which-1.2.14"
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
+      sources."shebang-regex-1.0.0"
       sources."isexe-2.0.0"
-      sources."npmconf-2.1.2"
-      sources."pify-2.3.0"
-      sources."pinkie-promise-2.0.1"
-      sources."config-chain-1.1.11"
-      sources."inherits-2.0.3"
+      sources."execa-0.6.3"
+      sources."filter-obj-1.1.0"
+      sources."mem-1.1.0"
+      sources."p-any-1.1.0"
+      sources."p-try-1.0.0"
+      (sources."passwd-user-2.1.0" // {
+        dependencies = [
+          sources."execa-0.4.0"
+          sources."npm-run-path-1.0.0"
+          sources."path-key-1.0.0"
+        ];
+      })
+      sources."rc-1.2.1"
+      sources."get-stream-3.0.0"
+      sources."is-stream-1.1.0"
+      sources."npm-run-path-2.0.2"
+      sources."p-finally-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."strip-eof-1.0.0"
+      sources."path-key-2.0.1"
+      sources."mimic-fn-1.1.0"
+      sources."p-some-2.0.0"
+      sources."aggregate-error-1.0.0"
+      sources."clean-stack-1.3.0"
+      sources."indent-string-3.1.0"
+      sources."cross-spawn-async-2.2.5"
+      sources."object-assign-4.1.1"
+      sources."deep-extend-0.4.2"
       sources."ini-1.3.4"
-      sources."nopt-3.0.6"
-      sources."once-1.3.3"
-      sources."semver-4.3.6"
-      sources."uid-number-0.0.5"
-      sources."proto-list-1.2.4"
-      sources."abbrev-1.1.0"
-      sources."wrappy-1.0.2"
-      sources."pinkie-2.0.4"
+      sources."minimist-1.2.0"
+      sources."strip-json-comments-2.0.1"
       sources."create-error-class-3.0.2"
-      sources."duplexer2-0.1.4"
+      sources."duplexer3-0.1.4"
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
-      sources."is-stream-1.1.0"
       sources."lowercase-keys-1.0.0"
-      sources."node-status-codes-1.0.0"
-      sources."parse-json-2.2.0"
-      sources."read-all-stream-3.1.0"
-      sources."readable-stream-2.2.10"
-      sources."timed-out-3.1.3"
-      sources."unzip-response-1.0.2"
+      sources."safe-buffer-5.1.0"
+      sources."timed-out-4.0.1"
+      sources."unzip-response-2.0.1"
       sources."url-parse-lax-1.0.0"
       sources."capture-stack-trace-1.0.0"
-      sources."error-ex-1.3.1"
-      sources."is-arrayish-0.2.1"
-      sources."core-util-is-1.0.2"
-      sources."isarray-1.0.0"
-      sources."process-nextick-args-1.0.7"
-      sources."safe-buffer-5.1.0"
-      sources."string_decoder-1.0.1"
-      sources."util-deprecate-1.0.2"
       sources."prepend-http-1.0.4"
       sources."decamelize-1.2.0"
-      sources."ansi-escapes-1.4.0"
-      sources."cli-cursor-1.0.2"
-      sources."cli-width-1.1.1"
-      sources."readline2-1.0.1"
-      sources."run-async-0.1.0"
-      sources."rx-lite-3.1.2"
-      sources."string-width-1.0.2"
+      sources."ansi-escapes-2.0.0"
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.1.0"
+      sources."external-editor-2.0.4"
+      sources."mute-stream-0.0.7"
+      sources."run-async-2.3.0"
+      sources."rx-lite-4.0.8"
+      sources."rx-lite-aggregates-4.0.8"
+      sources."string-width-2.0.0"
       sources."through-2.3.8"
-      sources."restore-cursor-1.0.1"
-      sources."exit-hook-1.1.1"
-      sources."onetime-1.1.0"
-      sources."code-point-at-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."mute-stream-0.0.5"
-      sources."number-is-nan-1.0.1"
+      sources."restore-cursor-2.0.0"
+      sources."onetime-2.0.1"
+      sources."iconv-lite-0.4.18"
+      sources."jschardet-1.4.2"
+      sources."tmp-0.0.31"
+      sources."os-tmpdir-1.0.2"
+      sources."is-promise-2.1.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."lodash.debounce-3.1.1"
       sources."os-name-1.0.3"
-      (sources."request-2.81.0" // {
-        dependencies = [
-          sources."uuid-3.0.1"
-        ];
-      })
+      sources."request-2.81.0"
       sources."tough-cookie-2.3.2"
-      sources."lodash._getnative-3.9.1"
-      (sources."osx-release-1.1.0" // {
+      sources."uuid-3.0.1"
+      (sources."mkdirp-0.5.1" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-0.0.8"
         ];
       })
-      (sources."win-release-1.1.1" // {
+      sources."osenv-0.1.4"
+      sources."os-homedir-1.0.2"
+      (sources."readline2-1.0.1" // {
         dependencies = [
-          sources."semver-5.3.0"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."mute-stream-0.0.5"
         ];
       })
+      sources."exit-hook-1.1.1"
+      sources."code-point-at-1.1.0"
+      sources."number-is-nan-1.0.1"
+      sources."once-1.4.0"
+      sources."wrappy-1.0.2"
+      sources."lodash._getnative-3.9.1"
+      sources."osx-release-1.1.0"
+      sources."win-release-1.1.1"
+      sources."semver-5.3.0"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.12.0"
@@ -30882,7 +31322,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      (sources."sshpk-1.13.0" // {
+      (sources."sshpk-1.13.1" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];
@@ -30903,7 +31343,6 @@ in
       })
       sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
-      sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.27.0"
@@ -30912,11 +31351,14 @@ in
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."normalize-package-data-2.3.8"
-      sources."redent-1.0.0"
+      (sources."redent-1.0.0" // {
+        dependencies = [
+          sources."indent-string-2.1.0"
+        ];
+      })
       sources."trim-newlines-1.0.0"
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."hosted-git-info-2.4.2"
       sources."is-builtin-module-1.0.0"
@@ -30925,49 +31367,67 @@ in
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
-      sources."indent-string-2.1.0"
+      sources."find-up-1.1.2"
+      sources."read-pkg-1.1.0"
+      sources."path-exists-2.1.0"
+      sources."pinkie-promise-2.0.1"
+      sources."pinkie-2.0.4"
+      sources."load-json-file-1.1.0"
+      sources."path-type-1.1.0"
+      sources."parse-json-2.2.0"
+      sources."strip-bom-2.0.0"
+      sources."error-ex-1.3.1"
+      sources."is-arrayish-0.2.1"
+      sources."is-utf8-0.2.1"
       sources."strip-indent-1.0.1"
+      sources."repeating-2.0.1"
+      sources."is-finite-1.0.2"
       sources."get-stdin-4.0.1"
       sources."registry-url-3.1.0"
-      (sources."rc-1.2.1" // {
+      sources."duplexer2-0.1.4"
+      sources."node-status-codes-1.0.0"
+      sources."read-all-stream-3.1.0"
+      (sources."readable-stream-2.2.11" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."safe-buffer-5.0.1"
         ];
       })
-      sources."deep-extend-0.4.2"
-      sources."strip-json-comments-2.0.1"
+      sources."core-util-is-1.0.2"
+      sources."inherits-2.0.3"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      (sources."string_decoder-1.0.2" // {
+        dependencies = [
+          sources."safe-buffer-5.0.1"
+        ];
+      })
+      sources."util-deprecate-1.0.2"
       sources."registry-auth-token-3.3.1"
       sources."execall-1.0.0"
       sources."clone-regexp-1.0.0"
       sources."is-regexp-1.0.0"
       sources."is-supported-regexp-flag-1.0.0"
-      sources."find-up-1.1.2"
-      sources."read-pkg-1.1.0"
-      sources."path-exists-2.1.0"
-      sources."load-json-file-1.1.0"
-      sources."path-type-1.1.0"
-      sources."strip-bom-2.0.0"
-      sources."is-utf8-0.2.1"
-      sources."is-finite-1.0.2"
+      (sources."locate-path-2.0.0" // {
+        dependencies = [
+          sources."path-exists-3.0.0"
+        ];
+      })
+      sources."p-locate-2.0.0"
+      sources."p-limit-1.1.0"
       sources."downgrade-root-1.2.2"
       sources."sudo-block-1.2.0"
       sources."default-uid-1.0.0"
       sources."is-root-1.0.0"
       sources."is-docker-1.1.0"
       sources."arrify-1.0.1"
-      sources."dot-prop-2.4.0"
-      sources."is-obj-1.0.1"
       sources."debug-2.6.8"
       sources."npmlog-2.0.4"
       sources."ms-2.0.0"
-      sources."external-editor-1.1.1"
       sources."rx-4.1.0"
       sources."spawn-sync-1.0.15"
-      sources."tmp-0.0.29"
       sources."concat-stream-1.6.0"
       sources."os-shim-0.1.3"
       sources."typedarray-0.0.6"
-      sources."is-promise-2.1.0"
       sources."ansi-0.3.1"
       sources."are-we-there-yet-1.1.4"
       sources."gauge-1.2.7"
@@ -30976,32 +31436,50 @@ in
       sources."lodash.pad-4.5.1"
       sources."lodash.padend-4.6.1"
       sources."lodash.padstart-4.6.1"
-      sources."boxen-0.3.1"
+      (sources."boxen-1.1.0" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+        ];
+      })
+      sources."import-lazy-2.1.0"
       sources."is-npm-1.0.0"
-      sources."latest-version-2.0.0"
-      (sources."semver-diff-2.1.0" // {
+      (sources."latest-version-3.1.0" // {
         dependencies = [
-          sources."semver-5.3.0"
+          sources."package-json-4.0.1"
+        ];
+      })
+      sources."semver-diff-2.1.0"
+      sources."ansi-align-2.0.0"
+      sources."cli-boxes-1.0.0"
+      (sources."term-size-0.1.1" // {
+        dependencies = [
+          sources."execa-0.4.0"
+          sources."npm-run-path-1.0.0"
+          sources."path-key-1.0.0"
+        ];
+      })
+      (sources."widest-line-1.0.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."is-fullwidth-code-point-1.0.0"
         ];
       })
-      sources."filled-array-1.1.0"
-      sources."widest-line-1.0.0"
       sources."has-flag-1.0.0"
       (sources."bin-version-check-2.1.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."semver-4.3.6"
+        ];
+      })
+      (sources."each-async-1.1.1" // {
+        dependencies = [
+          sources."onetime-1.1.0"
         ];
       })
-      sources."each-async-1.1.1"
       sources."log-symbols-1.0.2"
       sources."object-values-1.0.0"
       sources."twig-0.8.9"
       sources."bin-version-1.0.4"
-      (sources."semver-truncate-1.1.2" // {
-        dependencies = [
-          sources."semver-5.3.0"
-        ];
-      })
+      sources."semver-truncate-1.1.2"
       sources."find-versions-1.2.1"
       sources."array-uniq-1.0.3"
       sources."semver-regex-1.0.0"
@@ -31009,23 +31487,22 @@ in
       sources."walk-2.3.9"
       sources."minimatch-3.0.4"
       sources."foreachasync-3.0.0"
-      sources."brace-expansion-1.1.7"
-      sources."balanced-match-0.4.2"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
       sources."concat-map-0.0.1"
-      sources."diff-2.2.3"
-      sources."globby-4.1.0"
-      (sources."grouped-queue-0.3.3" // {
-        dependencies = [
-          sources."lodash-4.17.4"
-        ];
-      })
+      sources."diff-3.2.0"
+      sources."globby-6.1.0"
+      sources."grouped-queue-0.3.3"
+      sources."is-scoped-1.0.0"
       sources."mem-fs-1.1.3"
       sources."text-table-0.2.0"
-      sources."untildify-2.1.0"
+      sources."untildify-3.0.2"
       sources."array-union-1.0.2"
-      sources."glob-6.0.4"
+      sources."glob-7.1.2"
+      sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
       sources."path-is-absolute-1.0.1"
+      sources."scoped-regex-1.0.0"
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-file-2.0.0"
@@ -31035,14 +31512,16 @@ in
       sources."replace-ext-0.0.1"
       sources."strip-bom-stream-2.0.0"
       sources."first-chunk-stream-2.0.0"
-      sources."cli-boxes-1.0.0"
       sources."pad-component-0.0.1"
-      (sources."taketalk-1.0.0" // {
+      sources."taketalk-1.0.0"
+      (sources."wrap-ansi-2.1.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."string-width-1.0.2"
+          sources."is-fullwidth-code-point-1.0.0"
         ];
       })
-      sources."wrap-ansi-2.1.0"
+      sources."color-convert-1.9.0"
+      sources."color-name-1.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-- 
GitLab


From 7c455b5b7e31fd53a27d029435cb4a04dc64cb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 15 Jun 2017 10:19:29 +0200
Subject: [PATCH 0707/1490] Revert "Fix #26441: avoid infinite recursion"

This reverts commit 9cad7076d1bc5475a857fd2c6e9a56d9ed254252.

See https://github.com/NixOS/nixpkgs/commit/9cad7076d1bc5475a857fd2c6e9a56d9ed254252#commitcomment-22548331
---
 pkgs/development/haskell-modules/generic-stack-builder.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index fbc586bd74c..53772b90dfb 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -5,7 +5,7 @@ with stdenv.lib;
 { buildInputs ? []
 , extraArgs ? []
 , LD_LIBRARY_PATH ? []
-, ghc' ? ghc
+, ghc ? ghc
 , ...
 }@args:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation (args // {
   buildInputs =
     buildInputs ++
     optional stdenv.isLinux glibcLocales ++
-    [ ghc' pkgconfig ];
+    [ ghc pkgconfig ];
 
   STACK_PLATFORM_VARIANT="nix";
   STACK_IN_NIX_SHELL=1;
-- 
GitLab


From 72f530ba3310b8304b148b74ece9e6e75309666b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 15 Jun 2017 10:22:25 +0200
Subject: [PATCH 0708/1490] Fix #26441 second try: avoid infinite recursion

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

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 53772b90dfb..7fbca53886e 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -1,11 +1,11 @@
-{ stdenv, ghc, pkgconfig, glibcLocales, cacert }:
+{ stdenv, ghc, pkgconfig, glibcLocales, cacert }@depArgs:
 
 with stdenv.lib;
 
 { buildInputs ? []
 , extraArgs ? []
 , LD_LIBRARY_PATH ? []
-, ghc ? ghc
+, ghc ? depArgs.ghc
 , ...
 }@args:
 
-- 
GitLab


From 5172e1afee2c5e5b686b03cfafb18a023934c03a Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Thu, 15 Jun 2017 05:05:20 -0500
Subject: [PATCH 0709/1490] mendeley: 1.17.9 -> 1.17.10 (#26574)

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

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 0a14a87cf56..95286f3ab65 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -36,14 +36,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.17.9-stable";
+  shortVersion = "1.17.10-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "0z04r3ipwp2vca3qhp3b1zj0m12h023ynmbjsz4sysnd1bb5f2yr"
-    else "0h3m6s3s5283g9w3sm4fszhhnzgmqw49nr0ihvdwyxrgawxmz4vg";
+    then "0sc9fsprdpl39q8wqbjp59pnr10c1a8gss60b81h54agjni55yrg"
+    else "02ncfdxcrdwghpch2nlfhc7d0vgjsfqn8sxjkb5yn4bf5wi8z9bq";
 
   deps = [
     qt5.qtbase
-- 
GitLab


From c9802321c1dc4e9745e3bdad659031fc67a789b6 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Thu, 15 Jun 2017 12:11:48 +0200
Subject: [PATCH 0710/1490] cntlm service: cleanup non working config options
 (#26578)

- extraConfig was not working
- add possibility to add cntlm.conf in verbatime form
- create cntlm user as system user
- add no proxy option
---
 nixos/modules/services/networking/cntlm.nix | 154 +++++++++++---------
 1 file changed, 83 insertions(+), 71 deletions(-)

diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix
index 890ff508407..3978a1969ce 100644
--- a/nixos/modules/services/networking/cntlm.nix
+++ b/nixos/modules/services/networking/cntlm.nix
@@ -5,110 +5,122 @@ with lib;
 let
 
   cfg = config.services.cntlm;
-  uid = config.ids.uids.cntlm;
+
+  configFile = if cfg.configText != "" then
+    pkgs.writeText "cntlm.conf" ''
+      ${cfg.configText}
+    ''
+    else
+    pkgs.writeText "lighttpd.conf" ''
+      # Cntlm Authentication Proxy Configuration
+      Username ${cfg.username}
+      Domain ${cfg.domain}
+      Password ${cfg.password}
+      ${optionalString (cfg.netbios_hostname != "") "Workstation ${cfg.netbios_hostname}"}
+      ${concatMapStrings (entry: "Proxy ${entry}\n") cfg.proxy}
+      ${optionalString (cfg.noproxy != []) "NoProxy ${concatStringsSep ", " cfg.noproxy}"}
+
+      ${concatMapStrings (port: ''
+        Listen ${toString port}
+      '') cfg.port}
+
+      ${cfg.extraConfig}
+    '';
 
 in
 
 {
 
-  options = {
+  options.services.cntlm = {
 
-    services.cntlm = {
+    enable = mkOption {
+      default = false;
+      description = ''
+        Whether to enable the cntlm, which start a local proxy.
+      '';
+    };
 
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable the cntlm, which start a local proxy.
-        '';
-      };
+    username = mkOption {
+      description = ''
+        Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally).
+      '';
+    };
 
-      username = mkOption {
-        description = ''
-          Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally).
-        '';
-      };
+    domain = mkOption {
+      description = ''Proxy account domain/workgroup name.'';
+    };
 
-      domain = mkOption {
-        description = ''Proxy account domain/workgroup name.'';
-      };
+    password = mkOption {
+      default = "/etc/cntlm.password";
+      type = types.str;
+      description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.'';
+    };
 
-      password = mkOption {
-        default = "/etc/cntlm.password";
-        type = types.str;
-        description = ''Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security.'';
-      };
+    netbios_hostname = mkOption {
+      type = types.str;
+      default = "";
+      description = ''
+        The hostname of your machine.
+      '';
+    };
 
-      netbios_hostname = mkOption {
-        type = types.str;
-        description = ''
-          The hostname of your machine.
-        '';
-      };
+    proxy = mkOption {
+      description = ''
+        A list of NTLM/NTLMv2 authenticating HTTP proxies.
 
-      proxy = mkOption {
-        description = ''
-          A list of NTLM/NTLMv2 authenticating HTTP proxies.
+        Parent proxy, which requires authentication. The same as proxy on the command-line, can be used more than  once  to  specify  unlimited
+        number  of  proxies.  Should  one proxy fail, cntlm automatically moves on to the next one. The connect request fails only if the whole
+        list of proxies is scanned and (for each request) and found to be invalid. Command-line takes precedence over the configuration file.
+      '';
+      example = [ "proxy.example.com:81" ];
+    };
 
-          Parent proxy, which requires authentication. The same as proxy on the command-line, can be used more than  once  to  specify  unlimited
-          number  of  proxies.  Should  one proxy fail, cntlm automatically moves on to the next one. The connect request fails only if the whole
-          list of proxies is scanned and (for each request) and found to be invalid. Command-line takes precedence over the configuration file.
-        '';
-      };
+    noproxy = mkOption {
+      description = ''
+        A list of domains where the proxy is skipped.
+      '';
+      default = [];
+      example = [ "*.example.com" "example.com" ];
+    };
 
-      port = mkOption {
-        default = [3128];
-        description = "Specifies on which ports the cntlm daemon listens.";
-      };
+    port = mkOption {
+      default = [3128];
+      description = "Specifies on which ports the cntlm daemon listens.";
+    };
 
-     extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Verbatim contents of <filename>cntlm.conf</filename>.";
-     };
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      description = "Additional config appended to the end of the generated <filename>cntlm.conf</filename>.";
+    };
 
+    configText = mkOption {
+       type = types.lines;
+       default = "";
+       description = "Verbatim contents of <filename>cntlm.conf</filename>.";
     };
 
   };
 
-
   ###### implementation
 
-  config = mkIf config.services.cntlm.enable {
+  config = mkIf cfg.enable {
     systemd.services.cntlm = {
       description = "CNTLM is an NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        Type = "forking";
         User = "cntlm";
         ExecStart = ''
-          ${pkgs.cntlm}/bin/cntlm -U cntlm \
-            -c ${pkgs.writeText "cntlm_config" cfg.extraConfig}
+          ${pkgs.cntlm}/bin/cntlm -U cntlm -c ${configFile} -v -f
         '';
-      };  
+      };
     };
-   
-    services.cntlm.netbios_hostname = mkDefault config.networking.hostName;
-  
-    users.extraUsers.cntlm =  { 
+
+    users.extraUsers.cntlm = {
       name = "cntlm";
       description = "cntlm system-wide daemon";
-      home = "/var/empty";
+      isSystemUser = true;
     };
-
-    services.cntlm.extraConfig =
-      ''
-        # Cntlm Authentication Proxy Configuration
-        Username        ${cfg.username}
-        Domain          ${cfg.domain}
-        Password        ${cfg.password}
-        Workstation     ${cfg.netbios_hostname}
-        ${concatMapStrings (entry: "Proxy ${entry}\n") cfg.proxy}
-    
-        ${concatMapStrings (port: ''
-          Listen ${toString port}
-        '') cfg.port}
-      '';      
   };
-  
 }
-- 
GitLab


From 79c24a04f1eae738c437e131083bcb611af1c633 Mon Sep 17 00:00:00 2001
From: georgewhewell <george.whewell@aig.com>
Date: Thu, 15 Jun 2017 11:31:53 +0100
Subject: [PATCH 0711/1490] pythonPackages.defusedxml: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e957218263..44e6235535f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2516,10 +2516,10 @@ in {
   defusedxml = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "defusedxml";
-    version = "0.4.1";
+    version = "0.5.0";
     src = pkgs.fetchurl {
       url = "mirror://pypi/d/${pname}/${name}.tar.gz";
-      sha256 = "0y147zy3jqmk6ly7fbhqmzn1hf41xcb53f2vcc3m8x4ba5d1smfd";
+      sha256 = "1x54n0h8hl92vvwyymx883fbqpqjwn2mc8fb383bcg3z9zwz5mr4";
     };
   };
 
-- 
GitLab


From 286c36d7370763eb8222659ddd8f67773398c3c1 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 15 Jun 2017 14:05:50 +0300
Subject: [PATCH 0712/1490] utillinux: fix "fstrim --all"

---
 pkgs/os-specific/linux/util-linux/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 01bd8beea3d..79f63f8c27a 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,19 +1,28 @@
 { lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow
 , ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
 
-stdenv.mkDerivation rec {
-  name = "util-linux-${version}";
+let
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
   majorVersion = "2.29";
   patchVersion = "2";
 
+  fstrimPatch = fetchpatch {
+    url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=155d48f590a50bb5dc265162ff2f9a971daed543";
+    sha256 = "1wj0fj3iwaimr6p8wxg6l2i1hjyrfgcwcxziyxqz8acxba7k6zxh";
+  };
+in stdenv.mkDerivation rec {
+  name = "util-linux-${version}";
+
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
     sha256 = "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc";
   };
 
-  patches = [ ./rtcwake-search-PATH-for-shutdown.patch ];
+  patches = [
+    ./rtcwake-search-PATH-for-shutdown.patch
+    fstrimPatch
+  ];
 
   outputs = [ "bin" "dev" "out" "man" ];
 
-- 
GitLab


From c0df448d542b5261507f178d062ebad5338cdd58 Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Thu, 15 Jun 2017 14:07:14 +0300
Subject: [PATCH 0713/1490] apache-httpd: fix mod_perl by refering to
 apacheHttpdPackages (#26579)

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index ed77e084476..1c3c7835d96 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -16,7 +16,7 @@ let
 
   phpMajorVersion = head (splitString "." php.version);
 
-  mod_perl = pkgs.mod_perl.override { apacheHttpd = httpd; };
+  mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = httpd; };
 
   defaultListen = cfg: if cfg.enableSSL
     then [{ip = "*"; port = 443;}]
-- 
GitLab


From 525c10ecbd38e3bdb8da8060eb9ff06c48c9f4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 15 Jun 2017 13:35:27 +0200
Subject: [PATCH 0714/1490] hackage2nix: purescript{,-bridge} compiles now

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 9b017cad114..42334b380b7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7120,9 +7120,7 @@ dont-distribute-packages:
   pure-cdb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  purescript-bridge:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bundle-fast:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  purescript:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pusher-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pusher-http-haskell:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From 4ac68216bd012aeb9629998bff09545768e09b4b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 13 Jun 2017 22:05:56 +0200
Subject: [PATCH 0715/1490] unbound: 1.6.2 -> 1.6.3

Also moves the header file into the lib output.
---
 pkgs/tools/networking/unbound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 4d24a7f4e83..7fc5fb90173 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "171vbqijfk1crm04dbgbvw4052n6kwcvyvly3habg011qdr3schs";
+    sha256 = "0pw4m4z5qspsagxzbjb61xq5bhd57amw26xqvqzi6b8d3mf6azjc";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
-- 
GitLab


From cb59381eee5e89079cc855e52777dae7dc29263d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 15 Jun 2017 02:30:30 +0200
Subject: [PATCH 0716/1490] gnutls: remove dependency on unbound

Unbound is used for DANE support but this requires the unbound trust
anchor in /etc/unbound/root.key which we don't create in any NixOS
module.
---
 pkgs/development/libraries/gnutls/generic.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 3aef10df33e..48aa3fb9673 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,5 +1,5 @@
 { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
-, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv
+, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, libiconv
 , tpmSupport ? false, trousers, which, nettools, libunistring
 
 # Version dependent args
@@ -40,7 +40,6 @@ stdenv.mkDerivation {
   buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ]
     ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
-    ++ [ unbound ]
     ++ lib.optional guileBindings guile
     ++ buildInputs;
 
-- 
GitLab


From 72c36db003aa8ccebd7e5e673e5644f89cb45631 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 15 Jun 2017 02:15:45 +0200
Subject: [PATCH 0717/1490] bind: 9.10.5 -> 9.10.5-P1 for CVE-2017-3140

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 8ac9280b874..c18b7c46376 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -3,14 +3,14 @@
 
 assert enableSeccomp -> libseccomp != null;
 
-let version = "9.10.5"; in
+let version = "9.10.5-P1"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "03ibhzy9577w78kgh6ynl90a2hlbnz0krygffm820hjf2cp8ss3i";
+    sha256 = "1kg59a9118460k5wznqayxzqb6l3vbpybd8b1bdv9z97x5fqiyw2";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
-- 
GitLab


From 07edb44d15ab6daf4af75956694769e108fdb3a0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Jun 2017 08:52:26 -0400
Subject: [PATCH 0718/1490] linux: 4.4.71 -> 4.4.72

---
 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 01309774dba..51cd396ac60 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.71";
+  version = "4.4.72";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1az64a2qkx4yc0x4snhma9mvgkrgaj66z7pqs1zijcnzsqr5bka4";
+    sha256 = "1s7d6mw4vjsjwdyxbj0p04yq1nsxs3b0b7bi04ilcn2zhldv8cs1";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From 901069c577a14997135b0edc5edcb188146d7b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Thu, 15 Jun 2017 14:52:14 +0200
Subject: [PATCH 0719/1490] ocamlPackages.ppx_tools_versioned: 5.0alpha ->
 5.0.1

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

diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index c402c6be4f1..b680bcdd48c 100644
--- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
@@ -2,7 +2,7 @@
 
 buildOcaml rec {
   name = "ppx_tools_versioned";
-  version = "5.0alpha";
+  version = "5.0.1";
 
   minimumSupportedOcamlVersion = "4.02";
 
@@ -10,7 +10,7 @@ buildOcaml rec {
     owner = "let-def";
     repo = "ppx_tools_versioned";
     rev = version;
-    sha256 = "0sa3w0plpa0s202s9yjgz7dbk32xd2s6fymkjijrhj4lkvh08mba";
+    sha256 = "1rpbxbhk3k7f61h7lr4qkllkc12gjpq0rg52q7i6hcrg2dxkhwh6";
   };
 
   propagatedBuildInputs = [ ocaml-migrate-parsetree ];
-- 
GitLab


From a7efc9f0cdfec7c9854c4bcbfb848895663c3fe5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Jun 2017 08:53:35 -0400
Subject: [PATCH 0720/1490] linux: 4.9.31 -> 4.9.32

---
 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 aaffa40b353..ae1a4e4b120 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.31";
+  version = "4.9.32";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0mlqr9ngpsg5i2rd2rqmh85y9ga1f3rpfyjv2m82bnhncavdiji8";
+    sha256 = "0r87c65gf9j6shavsr0zviibpbvngccppw5k3wfmmxfjpdsnayf3";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From 8bc737d9d3cc56fac746deda75b5f882b49c054b Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Thu, 15 Jun 2017 15:53:41 +0300
Subject: [PATCH 0721/1490] zoom-us: fix facebook and SSO login

Turns out, zoom couldn't launch QtWebEngineProcess because of wrong interpreter
Also, there was a need for some extra deps, which I found when
running debug version of zoom.
---
 .../instant-messengers/zoom-us/default.nix       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index a1e94817b24..b3ea321d300 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, system, makeWrapper,
   alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
-  libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg }:
+  libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat }:
 
 let
 
@@ -35,6 +35,8 @@ in stdenv.mkDerivation {
     sqlite
     utillinux
     zlib
+    udev
+    expat
 
     xorg.libX11
     xorg.libSM
@@ -51,6 +53,7 @@ in stdenv.mkDerivation {
     xorg.libXi
     xorg.libXrender
     xorg.libXcomposite
+    xorg.libXScrnSaver
 
     stdenv.cc.cc
   ];
@@ -63,8 +66,10 @@ in stdenv.mkDerivation {
     mkdir -p $out/bin
     cp -ar * $packagePath
 
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      $packagePath/zoom
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  $packagePath/zoom
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  $packagePath/QtWebEngineProcess
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  $packagePath/qtdiag
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"  $packagePath/zopen
     # included from https://github.com/NixOS/nixpkgs/commit/fc218766333a05c9352b386e0cbb16e1ae84bf53
     # it works for me without it, but, well...
     paxmark m $packagePath/zoom
@@ -78,6 +83,11 @@ in stdenv.mkDerivation {
         --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
     ln -s "$packagePath/zoom" "$out/bin/zoom-us"
 
+    cat > $packagePath/qt.conf <<EOF
+    [Paths]
+    Prefix = $packagePath
+    EOF
+
     $postInstallHooks
   '';
 
-- 
GitLab


From b4576c510866bb9cf870cb8b7ba89acca7656a3b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 15 Jun 2017 08:54:55 -0400
Subject: [PATCH 0722/1490] linux: 4.11.4 -> 4.11.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index ce3240ecb81..d6d18319804 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11.4";
+  version = "4.11.5";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "144a8ianp6sy057pbhnssg6xs4f3dc5cwwkz8d4q9jzpd87fdm43";
+    sha256 = "0k3dy4izi56nfkp2r0cps817zfnc14czghr9l5z5k8j8x5blqipp";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From 6d6d2fd3247b215d11f3ceeed933d9196305aa8a Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Thu, 15 Jun 2017 15:56:49 +0300
Subject: [PATCH 0723/1490] zoom-us: fix webcam video

Webcam Logitech C270 showed black screen in zoom, but LD_PRELOADing
v4l1compat.so fixed this. I hope, this wouldn't break camera for people,
who were already able to see video, but I can't be 100% sure currently.
---
 .../networking/instant-messengers/zoom-us/default.nix          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index b3ea321d300..45fb10da391 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, system, makeWrapper,
   alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
-  libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat }:
+  libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
 
 let
 
@@ -78,6 +78,7 @@ in stdenv.mkDerivation {
     # RUNPATH set via patchelf is used only for half of libraries (why?), so wrap it
     wrapProgram $packagePath/zoom \
         --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \
+        --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \
         --set QT_PLUGIN_PATH "$packagePath/platforms" \
         --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
         --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"
-- 
GitLab


From 19f8213a3e49c0ba362c3715d90374e896d16068 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 15 Jun 2017 15:49:46 +0200
Subject: [PATCH 0724/1490] perl-Perl-Critic: 1.126 -> 1.128

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2282cdc2f32..5d8ae3ddc1d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10753,18 +10753,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   PerlCritic = buildPerlModule rec {
-    name = "Perl-Critic-1.126";
+    name = "Perl-Critic-1.128";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/T/TH/THALJEF/${name}.tar.gz";
-      sha256 = "b1a6151cb3603aef8555195b807e831655c83003b81e2f64fff095ff7114f5af";
+      url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
+      sha256 = "83ce563da0a950946367323214b6db30d72db7d006dce24c2a00a9ec13ddb9b4";
     };
-    buildInputs = [ TestDeep ];
+    buildInputs = [ ModuleBuild TestDeep ];
     propagatedBuildInputs = [ BKeywords ConfigTiny EmailAddress ExceptionClass FileHomeDir FileWhich IOString ListMoreUtils ModulePluggable PPI PPIxRegexp PPIxUtilities PerlTidy PodSpell Readonly StringFormat TaskWeaken ];
     meta = {
       homepage = http://perlcritic.com;
       description = "Critique Perl source code for best-practices";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = [ maintainers.rycee ];
     };
   };
 
-- 
GitLab


From d847b5c76323cc17f1ebcd3b4f42257930bde0c4 Mon Sep 17 00:00:00 2001
From: Maarten Hoogendoorn <maarten@moretea.nl>
Date: Thu, 15 Jun 2017 15:10:14 +0200
Subject: [PATCH 0725/1490] mysql module: add option to bind to an address

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

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index bae6b170c47..6027f109285 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -20,6 +20,7 @@ let
   ''
     [mysqld]
     port = ${toString cfg.port}
+    ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
     ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
     ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
     ${optionalString (cfg.replication.role == "slave" && !atLeast55)
@@ -58,6 +59,13 @@ in
         ";
       };
 
+      bind = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = literalExample "0.0.0.0";
+        description = "Address to bind to. The default it to bind to all addresses";
+      };
+
       port = mkOption {
         type = types.int;
         default = 3306;
-- 
GitLab


From 8ac0e688091d7ce4e75c058918b4137b3fac2427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 15 Jun 2017 15:15:24 +0100
Subject: [PATCH 0726/1490] ocamlPackages.utop: allow utop to locate topfile

fixes #16085
---
 pkgs/development/tools/ocaml/utop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index c50e6a108bd..9e394751761 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -61,8 +61,8 @@ stdenv.mkDerivation rec {
       --argv0 "" \
       --prefix CAML_LD_LIBRARY_PATH ":" "${get "CAML_LD_LIBRARY_PATH"}" \
       --prefix OCAMLPATH ":" "${get "OCAMLPATH"}" \
-      --prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH")
-
+      --prefix OCAMLPATH ":" $(unset OCAMLPATH; addOCamlPath "$out"; printf %s "$OCAMLPATH") \
+      --add-flags "-I ${findlib}/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib"
    done
    '';
 
-- 
GitLab


From 2732104cc328b8ee064edf5705731e4f7cda1058 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 16 Jun 2017 00:05:20 +0900
Subject: [PATCH 0727/1490] thunderbird, thunderbird-bin: 52.1.1 -> 52.2.0

---
 .../browsers/firefox-bin/default.nix          |   4 +
 .../browsers/firefox-bin/update.nix           |   7 +-
 .../mailreaders/thunderbird-bin/default.nix   |   3 +-
 .../thunderbird-bin/release_sources.nix       | 595 ++++++++++++++++++
 .../mailreaders/thunderbird-bin/sources.nix   | 595 ------------------
 .../mailreaders/thunderbird/default.nix       |   4 +-
 6 files changed, 604 insertions(+), 604 deletions(-)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index dcb25dc1343..f59cb402720 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -170,6 +170,10 @@ stdenv.mkDerivation {
   passthru.ffmpegSupport = true;
   passthru.updateScript = import ./update.nix {
     inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
+    baseUrl =
+      if channel == "devedition"
+        then "http://archive.mozilla.org/pub/devedition/releases/"
+        else "http://archive.mozilla.org/pub/firefox/releases/";
   };
   meta = with stdenv.lib; {
     description = "Mozilla Firefox, free web browser (binary package)";
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index 9c29d1288d1..3bcc2ab003c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -9,15 +9,10 @@
 , gnupg
 , baseName ? "firefox"
 , basePath ? "pkgs/applications/networking/browsers/firefox-bin"
+, baseUrl
 }:
 
 let
-
-  baseUrl =
-    if channel == "devedition"
-      then "http://archive.mozilla.org/pub/devedition/releases/"
-      else "http://archive.mozilla.org/pub/firefox/releases/";
-
   isBeta =
     channel != "release";
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index aba121ba761..4f714cabf79 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -46,7 +46,7 @@
 assert stdenv.isLinux;
 
 # imports `version` and `sources`
-with (import ./sources.nix);
+with (import ./release_sources.nix);
 
 let
   arch = if stdenv.system == "i686-linux"
@@ -163,6 +163,7 @@ stdenv.mkDerivation {
   passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
     inherit name writeScript xidel coreutils gnused gnugrep curl gnupg;
     baseName = "thunderbird";
+    channel = "release";
     basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
   };
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
new file mode 100644
index 00000000000..889d931c706
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -0,0 +1,595 @@
+{
+  version = "52.2.0";
+  sources = [
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ar/thunderbird-52.2.0.tar.bz2";
+      locale = "ar";
+      arch = "linux-x86_64";
+      sha512 = "d25bdeda7f5ee563176809811c5373d5232842ddb68315f31992754100e5cc96e5a2d0427897d245fcf9bbfc647331492e9b1fa79e0adb64f4f2169dd66ddc29";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ast/thunderbird-52.2.0.tar.bz2";
+      locale = "ast";
+      arch = "linux-x86_64";
+      sha512 = "f7d3f2caa404fa5b97b7c966bb4ddd6fc0f26531802d4db9930d984d9b4ca635c41f9b025ca3c0ccba93a288da9c229b43b760759969b269082402584eed14f0";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/be/thunderbird-52.2.0.tar.bz2";
+      locale = "be";
+      arch = "linux-x86_64";
+      sha512 = "baa46c3e1d07b284e6cbca0f6c61710d4760f2a33e829056b8fb4e05b63162e4e4c7c8414dd9b3733c6983b74765e2ed2129122feadeb5972f037a1a739eba1e";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bg/thunderbird-52.2.0.tar.bz2";
+      locale = "bg";
+      arch = "linux-x86_64";
+      sha512 = "166e64acbb8464142e78222ffb00e5ee421dbfee6789f544439963f4d3476e46795d53050e60195bbce648a3400f24edcef7a8f4cb47d5c3db0441ca564ad6d4";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bn-BD/thunderbird-52.2.0.tar.bz2";
+      locale = "bn-BD";
+      arch = "linux-x86_64";
+      sha512 = "817202f39eb6b0f79d07da92b7ad62c6dda9e8d196021828303030ac5eff97d5574ba99ae8a2d236cddf2eaa6cda4c85a17f23a6f84461654e8f0856156dc6bb";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/br/thunderbird-52.2.0.tar.bz2";
+      locale = "br";
+      arch = "linux-x86_64";
+      sha512 = "46eab89538b48e02237950207ce8e3d955ba87c7ffa7a030812bafa4bb54da5113a3ff53bfa1e1b243a77c1dcf32b5aa475382e824538536a759da0448cca305";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ca/thunderbird-52.2.0.tar.bz2";
+      locale = "ca";
+      arch = "linux-x86_64";
+      sha512 = "7bcb35886fd0344c18f29d5221d765a91da48db3c32f7be4c4ca0e9808dee2f6577bfafff32e8b9676a00e488f7617c66dc6e2cce5238569c24fc1679ac6c1d8";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cs/thunderbird-52.2.0.tar.bz2";
+      locale = "cs";
+      arch = "linux-x86_64";
+      sha512 = "8bda94fbe1043168894fb70edc3d87b670830377faee7397c26805bf8c2dd23bbbb5c4b1d797468875fb653fa02b8bc211aa3766793d3f9b21a139265651692b";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cy/thunderbird-52.2.0.tar.bz2";
+      locale = "cy";
+      arch = "linux-x86_64";
+      sha512 = "65818715e994ab314ef4ac8a7d3e7c61e8918cd1d0d0ea4f51461f50d207d1c998c6452740c6f3fc07d70ebc1d24e5bebef622787d8e6f79f57ace1fc85e1e16";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/da/thunderbird-52.2.0.tar.bz2";
+      locale = "da";
+      arch = "linux-x86_64";
+      sha512 = "1b7166d185ff6fc8cbe826d11e7b96ccc4528ce6421a7ad73f82d9c9c0f35a8de043b30fdec1e6ea3cc6d48645f42173b941cd6f8cc6d526264d4301c2943ade";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/de/thunderbird-52.2.0.tar.bz2";
+      locale = "de";
+      arch = "linux-x86_64";
+      sha512 = "af6005f229a4cbc84c4f99ea1b13413d5a40ab506163786cacf513460170f77b3cb866a4b76b0691facc43cdccc39de68e9010550220f9d6cf288aac53909a40";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/dsb/thunderbird-52.2.0.tar.bz2";
+      locale = "dsb";
+      arch = "linux-x86_64";
+      sha512 = "c326aa0c775e414fbfab466be742b804dbb364f60b084b4890c783f6c9e7bbe5da05b09b1608d51535ec3b60eaad5f775eb36834dd69d66f18a4746b7fe55c68";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/el/thunderbird-52.2.0.tar.bz2";
+      locale = "el";
+      arch = "linux-x86_64";
+      sha512 = "b18fe1345c27095b2ea0afdec088b56d2cfccd57e285e881f1bbae4bd6eed6e39e76d24ada963d2337729eb93775d948195139815f694cb45978978a33682e08";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-GB/thunderbird-52.2.0.tar.bz2";
+      locale = "en-GB";
+      arch = "linux-x86_64";
+      sha512 = "622c2c3979b30f724be73b5c6bc54f944f24a797cb1c3cafd11c2a08381e692621b29eadf64438b8207dd9254bddfa8b524211f7802e83453c1eeec99ab27108";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-US/thunderbird-52.2.0.tar.bz2";
+      locale = "en-US";
+      arch = "linux-x86_64";
+      sha512 = "76505876b7a408cc296ee575dea6f89db9cafd31f58e961bd0c1c5cf021771cdaa8bb4dfa508a4bde386846f97be6eccbd499725dab8e5a692bfd48125f1bf82";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-AR/thunderbird-52.2.0.tar.bz2";
+      locale = "es-AR";
+      arch = "linux-x86_64";
+      sha512 = "38f32cb430c679c63b8c6ab7d22bf5cb2af85bfa17fcbedc94d9fafa27874b917c7f34d7ddaa6a4dfa5d1674c09b3901cc19de5e217a965890eac5ef9246b22f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-ES/thunderbird-52.2.0.tar.bz2";
+      locale = "es-ES";
+      arch = "linux-x86_64";
+      sha512 = "049e9445a850da0df09a0675cc9524d1bcb6ac4dc0ba8178df07ae4fcb9b4d9ff4677229968573119c5ca2c61a6f35da96167ece9d2da97e6b4e541bd9fc04b1";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/et/thunderbird-52.2.0.tar.bz2";
+      locale = "et";
+      arch = "linux-x86_64";
+      sha512 = "e2bb4aaa7e6a447f63456adbc35feb56e5e6ceac791ae54a2f34eb283cf3a61565c06cc09f66fcf01d722b8ed0972e51da33a94dfd333108fee2e967346eb9cd";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/eu/thunderbird-52.2.0.tar.bz2";
+      locale = "eu";
+      arch = "linux-x86_64";
+      sha512 = "eacfbee76dc62b15e9a807db9409d63b2991f976faa109ef5991b2a6befadfeed8c341a448c0af84d1fc8f6914e4d515860294f2e54bb97f4ce2727c4d73a030";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fi/thunderbird-52.2.0.tar.bz2";
+      locale = "fi";
+      arch = "linux-x86_64";
+      sha512 = "c6ba259c3729535199905773674800f2772bf952a8596e11eb73785a9176072434ae47abb40c35e8cb0f66b4c46162d48ae699985857ad9a208c645cf76f0189";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fr/thunderbird-52.2.0.tar.bz2";
+      locale = "fr";
+      arch = "linux-x86_64";
+      sha512 = "eacdc3ce1967ef7913012c448c4a4898463c80fac41fb5bf16d924eb31ea2e68e7ad46ee88b5ce107e85a18789a19e05006ae4786a5d9e9a2f93c05013aa9f4a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fy-NL/thunderbird-52.2.0.tar.bz2";
+      locale = "fy-NL";
+      arch = "linux-x86_64";
+      sha512 = "450011ce8012918dc8196b68a32f4b2ab27dd893a15ebd621fa17923ba5a63bff6fb634e1cc22cca3fa64d61dcc23565ceda518e04e7f92d91a0bc86fcd0dda7";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ga-IE/thunderbird-52.2.0.tar.bz2";
+      locale = "ga-IE";
+      arch = "linux-x86_64";
+      sha512 = "ba8271e67b61e92bb819b0739351cfbfb128ecd3842f1c7ad69f7e9c26f4d52c10cf71f5d8cb45dc1f30d3168dc0acb991be4ef208e6947c3c36f4e5c0071f69";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gd/thunderbird-52.2.0.tar.bz2";
+      locale = "gd";
+      arch = "linux-x86_64";
+      sha512 = "324044728236a52fe136c62f250218d6d2e364bda7b9f781a5f1c05561e37e09c9180733be0dd69f170e2229924c9ff7f2db10def13b86a7d21d5801d171a3b0";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gl/thunderbird-52.2.0.tar.bz2";
+      locale = "gl";
+      arch = "linux-x86_64";
+      sha512 = "a31f01bf15d17d8efc645ebe4184bf4b5f02107f24765721eee87dc10463c7e8219a1ba3d60468e132f6b934f6f138b441f94d3d3e790f2fbad45107210f69d9";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/he/thunderbird-52.2.0.tar.bz2";
+      locale = "he";
+      arch = "linux-x86_64";
+      sha512 = "c8356bc183eb9837c3049288d63e1c13098143cf7a80cc5452d9852ffd2407eb85aa5ed574063700f93fb503c53c2b733a1bebc62cb890d408af75f8e4970856";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hr/thunderbird-52.2.0.tar.bz2";
+      locale = "hr";
+      arch = "linux-x86_64";
+      sha512 = "8ed3f1c84f28a4435a3a6c9b136d4c27f6fdd3a41089b34afa04b74d5ca15cd535e179070cfdc862d3b3f5559fbafa7ae6c620f448afc8279765aa6518cdbd9c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hsb/thunderbird-52.2.0.tar.bz2";
+      locale = "hsb";
+      arch = "linux-x86_64";
+      sha512 = "bd14c07d1c2f5b8aebbee64914db544823ab90b70cc2a4e5d9fda28e9611310a5d6a6fb0f17d07e60534e9d5082506f0ffe22b1b4da1351f5657620612add6b5";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hu/thunderbird-52.2.0.tar.bz2";
+      locale = "hu";
+      arch = "linux-x86_64";
+      sha512 = "9cb1430ef3036f4ce06d0734775e83ec09c551ce573cf3b50b5a2484f411e76ca09ae0295d6285d15e1f8a71f27c804f9dc328a4e4b534fbad34a97676ec2d7e";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hy-AM/thunderbird-52.2.0.tar.bz2";
+      locale = "hy-AM";
+      arch = "linux-x86_64";
+      sha512 = "0c1d84777286fb55c2d8d25d5f5abf5498575bd09261331cca680e1f18497dab80597e5a132618019c5d03350cc4d49f4856053b8d255f8a1d56d1029434b776";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/id/thunderbird-52.2.0.tar.bz2";
+      locale = "id";
+      arch = "linux-x86_64";
+      sha512 = "8adfabb7885b2442c9dd8ee1128675865690bc632185da20caa894b38c388cfff34a696c4932ffaab2217dd4c742e8c35acb2e10bee39a561aa83b19cce1ad6d";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/is/thunderbird-52.2.0.tar.bz2";
+      locale = "is";
+      arch = "linux-x86_64";
+      sha512 = "b5608a993d5a2a50a38516ba346cef8aa5f173f81eda2b29c06b77e8cc8964dc174fbd9a67294a66caa366956a0ae79aaf8c0e0d612935e871174b1073647f70";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/it/thunderbird-52.2.0.tar.bz2";
+      locale = "it";
+      arch = "linux-x86_64";
+      sha512 = "06bb846f018d1f8cc1bbda5e707b9aff31bf94ddd8a7aaa699c67f1c18ea8a4c92657587ae6c9a07571d2a6371d50e31b1000bec719aa432404924938a162274";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ja/thunderbird-52.2.0.tar.bz2";
+      locale = "ja";
+      arch = "linux-x86_64";
+      sha512 = "9019ec44f39918796c5da7fb2b23e19918e20d5688b8e55aa986e2b8a4f2abaf6ae87149b1bbbdedd2227c3152f48e4042078c979930db5d521d3a641312599e";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/kab/thunderbird-52.2.0.tar.bz2";
+      locale = "kab";
+      arch = "linux-x86_64";
+      sha512 = "1ed0950fd1b5cf82efe2c031abbb8d34ab3a0ef93182467592a9f77610bf494ed61a2e1d0117132abd5bd0f835bdcad75bf202588097210acdfbd67a1be5caf0";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ko/thunderbird-52.2.0.tar.bz2";
+      locale = "ko";
+      arch = "linux-x86_64";
+      sha512 = "65ae48fbc79da6e3e20f5d325d4c93b2e945a95eaffe572c83cee08cefbe6718bd202c7e54095ef74d3069148b58aea1d2b0b795e94230b4da99b9a42fb39155";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/lt/thunderbird-52.2.0.tar.bz2";
+      locale = "lt";
+      arch = "linux-x86_64";
+      sha512 = "f8870ee532dd73a0a387c00a1295209ebb965b3e7a63abcce7f17457c38636a07334ff7f4dd99c60349e748510645487ab3761efdbde985d1f3cd9038613cd05";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nb-NO/thunderbird-52.2.0.tar.bz2";
+      locale = "nb-NO";
+      arch = "linux-x86_64";
+      sha512 = "d4316434d0e8a824b3502bd413abe112bdb9b6da28acb39127ca83b43f8fa3f7b80bdde15758f2ca5a5013abcb374382ce79dd16ea48342fb6f6283eb242e162";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nl/thunderbird-52.2.0.tar.bz2";
+      locale = "nl";
+      arch = "linux-x86_64";
+      sha512 = "da6c7cf68f5502ea29a1600f2040953dcd064859a9b82856ae419472ae039bff5c2b31f56c282961eb02ae0c86c8ce63131fdc4aaaa712da03d76ee05726ba0c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nn-NO/thunderbird-52.2.0.tar.bz2";
+      locale = "nn-NO";
+      arch = "linux-x86_64";
+      sha512 = "9a5203e6f451aab318500eea9b7fcbdf70fcd22d6cf42e838926fa9fae14176f1abee875ac085823adeb40d2fd2e2992d538c34ad817b408fdae19248302aa88";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pa-IN/thunderbird-52.2.0.tar.bz2";
+      locale = "pa-IN";
+      arch = "linux-x86_64";
+      sha512 = "43e86e758f547363bfd5bb1c9c16506bbf6314354aee4265fed588fc29759d87482a86c442ba9d3e16c50477c4a5542b02a1539de8833052ee23811d61bcdba8";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pl/thunderbird-52.2.0.tar.bz2";
+      locale = "pl";
+      arch = "linux-x86_64";
+      sha512 = "d418735505f1152a3cf1a1c2ff36d4cba4801327b1f01e3743c6411d30b7fdad7f0ae72fa78de9b356bfb712bc834c6eef46df9c251be7d18119f5da423f3ca1";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-BR/thunderbird-52.2.0.tar.bz2";
+      locale = "pt-BR";
+      arch = "linux-x86_64";
+      sha512 = "3e33431860b0f815153845ebde36de52d8bd0c2e1828e127009b467c33710c70d38c4b9f70c5572e09778b17c30f7688f1e802e48ce7cb0a6a015d0fa1e26648";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-PT/thunderbird-52.2.0.tar.bz2";
+      locale = "pt-PT";
+      arch = "linux-x86_64";
+      sha512 = "953143e100d3ffcb76224da98ee5ae1d98342d2806565ab048fbb6d8de65f6a02c3b6dd87aec4cecff676ff724d4790964b2e82ebbc64a3eae8beb343ebab211";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/rm/thunderbird-52.2.0.tar.bz2";
+      locale = "rm";
+      arch = "linux-x86_64";
+      sha512 = "b5aa940b99282bd84748e47d8f51a53e250d20cf0c7b68e5f66719ae88d9c241f290b2d637fe3e711948f9a6c6df8304cf9514599d73e387eb268a1c8f8c8397";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ro/thunderbird-52.2.0.tar.bz2";
+      locale = "ro";
+      arch = "linux-x86_64";
+      sha512 = "26dc1b0c57b468ba815154b035c3fe382051b638bdc673db69a88c879a8524f55a24626c655026cb67c2688a29b6c946e2b495cd7dec4f16d8fbba21d5a493bb";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ru/thunderbird-52.2.0.tar.bz2";
+      locale = "ru";
+      arch = "linux-x86_64";
+      sha512 = "5d17e85ec3eeac8ea3916f0dc71be7560bb1c4877c505a1f29421a9d496d8aafe48b9236c225f1de48a4dffbc9ed536f91dffed7d6c823480ef1e0c5b6e400be";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/si/thunderbird-52.2.0.tar.bz2";
+      locale = "si";
+      arch = "linux-x86_64";
+      sha512 = "d4599a3814173d8bce2f24b6b015492d7b24547d4e53d17cad45cc9c01c8b65be3447f8b89ab8ef2f573140ef7e1aae7eef7943102e21611525abc6efcd02694";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sk/thunderbird-52.2.0.tar.bz2";
+      locale = "sk";
+      arch = "linux-x86_64";
+      sha512 = "a990104e68df9c2bf833c821eefdc1cbefc16f6e782bb8202683261f395f33c419afb967119ced710dc08966978043731c1adcf16dc716ff6eac8275b03f1834";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sl/thunderbird-52.2.0.tar.bz2";
+      locale = "sl";
+      arch = "linux-x86_64";
+      sha512 = "2fab7f52ceebee1895e520c6d185bbb92793a31c52ed2398731c0cf36e3888a58d945d92f5777fc87a0a55b96418406a0be15cdd95b0f54482e821ea1cf29ced";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sq/thunderbird-52.2.0.tar.bz2";
+      locale = "sq";
+      arch = "linux-x86_64";
+      sha512 = "f201861a30f993306378043ecab288970c4a311a91a3d232cdfe9a4d9339052f026ceb35bc6dbc2bb452f58faa5e3eccd273b87e96af5cfcf292dfcf94612077";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sr/thunderbird-52.2.0.tar.bz2";
+      locale = "sr";
+      arch = "linux-x86_64";
+      sha512 = "6f8962d8c30086434764f0d037801bfefeef13c67e46f2b639bc4f5a93ac0094630af375bffcc54574d50ecd8c7b5c5decdd9e2083666dc4394e6237fac0b746";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sv-SE/thunderbird-52.2.0.tar.bz2";
+      locale = "sv-SE";
+      arch = "linux-x86_64";
+      sha512 = "b29f506138f62350717ba2d2881cf8852dbef0c9797da64b9d5d9affa884cd1057483e2d0e357e967d9567ff4e861d1ad79596b39aa02a36087041e1f94d9d67";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ta-LK/thunderbird-52.2.0.tar.bz2";
+      locale = "ta-LK";
+      arch = "linux-x86_64";
+      sha512 = "3bc50fdc95776aeca2de94fa1b895d5a17cedafb95aa08f2d0100fbb4c3acd31990b96a57fad451c82b56d8cab7ea5066642da7b000857f00ba8f0bf94051f5a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/tr/thunderbird-52.2.0.tar.bz2";
+      locale = "tr";
+      arch = "linux-x86_64";
+      sha512 = "8e1481a03ba5de00bc64aa252f779dc0ceb14c238985d11bb49467a719ca88bc4e7946086b039951f03ed43e11a15a5bbe98139d158f63dc3cdbf01686ec91e2";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/uk/thunderbird-52.2.0.tar.bz2";
+      locale = "uk";
+      arch = "linux-x86_64";
+      sha512 = "e9bfce635b1d56d646baf06bc642a7914846a6a796e983c4b0f78b912833ccee850719f0857ceb7199d328415a976b436706d72c95f01da1d0d0b4c0c5d0d732";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/vi/thunderbird-52.2.0.tar.bz2";
+      locale = "vi";
+      arch = "linux-x86_64";
+      sha512 = "ea989bcf275162c8d72ad595bee767b9652f192ac18f61119cae8f084f9a25c0d0a83caa14cbbf901fa675f1a0c0a6b40ef46454f9c8f1fc3d5173a0ef1397be";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-CN/thunderbird-52.2.0.tar.bz2";
+      locale = "zh-CN";
+      arch = "linux-x86_64";
+      sha512 = "35637dedad6da1662057fc1506b2e21bc6269eb0256e332ff6b12bcdb71906e28dc0f361bd7aded2fa52d982589f0e319667acb7ccd405e2fbfa8ba991e5aeb2";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-TW/thunderbird-52.2.0.tar.bz2";
+      locale = "zh-TW";
+      arch = "linux-x86_64";
+      sha512 = "286ed00a024029f7e6ce30709cac3da3d6bf00576248622a09bd9ce1ae2e965a0fe158d718d35f1e088f51ac4e271d57aaa98446c87c0bdcdecfa0d36d988e92";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ar/thunderbird-52.2.0.tar.bz2";
+      locale = "ar";
+      arch = "linux-i686";
+      sha512 = "8783d0cfba31ead11e49bf1a8afb5b66b1387b29681acf3c63217ba4a399a6fe496eb0357e0871c98e8b6465abc6539e6ccbd9d40e799e04674f3ab2dee25390";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ast/thunderbird-52.2.0.tar.bz2";
+      locale = "ast";
+      arch = "linux-i686";
+      sha512 = "213f0457760072fd2e6cd2daa56677d8b67b8c345f44faebb2623f073ecf141ba4d30d2176fd5680efe91e46086b4add86462385fe5b9e72978cf2828eb8ed68";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/be/thunderbird-52.2.0.tar.bz2";
+      locale = "be";
+      arch = "linux-i686";
+      sha512 = "645d7eceac4d98ab37b8c85c2d0c58499bdba1c8db495690bc665c80b5aae414b0a8caad16931a74768137812f3ba8ce173f5080e95bd44e95e51d6f544cbf03";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bg/thunderbird-52.2.0.tar.bz2";
+      locale = "bg";
+      arch = "linux-i686";
+      sha512 = "b9030a61e8d964dd18362e472d18d7a9d6a7636679c016bca82b254b06e221c6551aebb166f829977fb4f0d1809b18b820cb1d842e6949f44dd4e5becbf98651";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bn-BD/thunderbird-52.2.0.tar.bz2";
+      locale = "bn-BD";
+      arch = "linux-i686";
+      sha512 = "fcf50581bb2f1548f4aab01b8f7a89e351e642a49ca76e05fc47d77b9e2459f2ff700501079180b92120727ab2ba74c3c6990fc7d6d9018b9ee4ec1d27c42aaf";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/br/thunderbird-52.2.0.tar.bz2";
+      locale = "br";
+      arch = "linux-i686";
+      sha512 = "5359fa3b6f745db0da286a0180773d3fd43c446c78d8351cc0c5589ade332fec5ccb6106a84ed3bc96e34ec7ca2d72f93c22f6653aa39250df05b0e39108fa89";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ca/thunderbird-52.2.0.tar.bz2";
+      locale = "ca";
+      arch = "linux-i686";
+      sha512 = "e5d6d77ad204d279abcd34b9734ef5489d5b8522558af7cfb26de77fc0d22a5ce669dd6ff9fce7046745aa9ef75323fadaa70ad3ca4fa0f05aad85add6c1e7fd";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cs/thunderbird-52.2.0.tar.bz2";
+      locale = "cs";
+      arch = "linux-i686";
+      sha512 = "4bee0154e7f1658ea88c7cf7cb5d89e354d29516c727090bd704945ecb2c0988551e98de2c8b44d5899e44ae141a6e3c230550392d34b5dac121cd1c4d6ce994";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cy/thunderbird-52.2.0.tar.bz2";
+      locale = "cy";
+      arch = "linux-i686";
+      sha512 = "23779727198092d4d8e7ed1d40615b020858999ae5023ebf81553dfdc62b7cc03cf864eae262450d75d6088f6b283ef7f791073901f5fda367df96e291e9537f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/da/thunderbird-52.2.0.tar.bz2";
+      locale = "da";
+      arch = "linux-i686";
+      sha512 = "e780597823f156e273832ff731adb2cb39a58e6e232d910f9f0a3b05dee68411ee3e8345462137d74a8aa2a6dd0c3d5e93bb889bd425c051ed7befcd4da5c711";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/de/thunderbird-52.2.0.tar.bz2";
+      locale = "de";
+      arch = "linux-i686";
+      sha512 = "1c35b4aab4bb27569955f3c29034e8c301c32d24547075c4662e162bfe1c19feb602b3fcc3c561956651328fa33605f60ed29ae52b50b06eecf39e43e82663e6";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/dsb/thunderbird-52.2.0.tar.bz2";
+      locale = "dsb";
+      arch = "linux-i686";
+      sha512 = "59fb994bd8b2db74ae5024e8c2f6c859b93afd247a159c552bffe8c2337a0d4229bd17433635f8c87420af614c7725af7b0ecd144938654f9372fe6d39a4152c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/el/thunderbird-52.2.0.tar.bz2";
+      locale = "el";
+      arch = "linux-i686";
+      sha512 = "87e43e3c66db44c6c1d659eff81b72bae4d6961045c37ce776531ab6e4f4a3e6c8d3774f39fd437e5ca4cc289bbae25fae8dbf8ed3e21aa2327cc166d4f17f47";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-GB/thunderbird-52.2.0.tar.bz2";
+      locale = "en-GB";
+      arch = "linux-i686";
+      sha512 = "b397fb3142c0693282405d9e6d4515f368b3c6aba581e6eb0712c3d161f8fc9dbe034a913a67ea034dd89860b32072f82dbf2b767bd0c360f3bc9c0c8944d045";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-US/thunderbird-52.2.0.tar.bz2";
+      locale = "en-US";
+      arch = "linux-i686";
+      sha512 = "05926a74f6ecef5caa43884a3fa2cdf85f40c53da58ffa24cdd2c8c31efd1b3e90a0d06ddba33d612a3b88f31d4c72fe92f49e31b4f3ba3479c510a02d91eb33";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-AR/thunderbird-52.2.0.tar.bz2";
+      locale = "es-AR";
+      arch = "linux-i686";
+      sha512 = "4652c005c0c28760d1a2657b691b13fcf7882763cff4ff05313d1dc5786661e76ca74a4fa23e1e71e4315818c9c2a386407151a996fab4d2f3bf343a353038db";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-ES/thunderbird-52.2.0.tar.bz2";
+      locale = "es-ES";
+      arch = "linux-i686";
+      sha512 = "64e8eedb59df8ebc5a568aa05d0df5217a3c91311455a090b4614dddbb2bd0d09add02e11c712b84696f3d203bb5503959dee9ec8e0aee7ba5d0ef2e606942a4";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/et/thunderbird-52.2.0.tar.bz2";
+      locale = "et";
+      arch = "linux-i686";
+      sha512 = "2773894ea50cb0bc889ad1cd887bd7c34d594a19ae69fe48cc181d5bb31a9a15bf6e0e41fa1493ff86e481715e888d35db5b100b22516b187cbbb4e35f36fdbb";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/eu/thunderbird-52.2.0.tar.bz2";
+      locale = "eu";
+      arch = "linux-i686";
+      sha512 = "8a73144e9085f4f07db7d24da388808ebe94b4cbd2c3cb1f327ed0c44a3144c94fd61171b74c18c3e4ee72fd809791a8c942adc0a4b3bcaebaa2f02dbf26d572";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fi/thunderbird-52.2.0.tar.bz2";
+      locale = "fi";
+      arch = "linux-i686";
+      sha512 = "ba53c735c136901bbcfebff6fa646d884aaeb919a77744c1ec412a109f39853b2d74d70a56f85e4bdc3b7780475283284c46b0db79c64980a7655eb8f0bbe0f6";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fr/thunderbird-52.2.0.tar.bz2";
+      locale = "fr";
+      arch = "linux-i686";
+      sha512 = "fe93f41bbf357eb1b60c0418dd64afbb37310ec25aeb66521472f84eebc6205d87d19090df6f38de3d9fee29f7f961e68e9794a65f51a0fcd103a40a16a919fa";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fy-NL/thunderbird-52.2.0.tar.bz2";
+      locale = "fy-NL";
+      arch = "linux-i686";
+      sha512 = "1739f96789414049ebb5a8fa47f0455a630bdfbc9757fd96f81a8fe0fbf6c0b522bdf04a315b590c968d1832ee2faa2bdd98fa4ef6e86cd8ab2d0a338e8a47f2";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ga-IE/thunderbird-52.2.0.tar.bz2";
+      locale = "ga-IE";
+      arch = "linux-i686";
+      sha512 = "b42fb3d2cb8ba5be74d3f4212aa80fbf2af0366bdd9eceba69555eb766f0a96c1a8092a3b1e39c0ddc8bae7cc7efb59f56806f90c0de95d3073db15e3d894a20";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gd/thunderbird-52.2.0.tar.bz2";
+      locale = "gd";
+      arch = "linux-i686";
+      sha512 = "0921d25bd235d2a234c75f24297ef38568d0532fbe1dbfe98f2b9ca3641ea95db6c4df0dba3f8a8313a2fd169d2d86f7adab21db795a96f68fa566117db2c2e9";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gl/thunderbird-52.2.0.tar.bz2";
+      locale = "gl";
+      arch = "linux-i686";
+      sha512 = "7fe9346fcb26a7d4a96cb6cd2d804874bdf2f3f89c9b9791742f9a2a03a7a865fc20766f8618c04e7d7fbe1fcf0fc907b4db5834770218f4e1fbe8d8df37e94f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/he/thunderbird-52.2.0.tar.bz2";
+      locale = "he";
+      arch = "linux-i686";
+      sha512 = "7082a591a52e8a0e7bf112dec08dc3e130791eebee6e7d39baf052f40b8b9fbc350518b7785f3bf7ec62df8dbe05a256fa322714ba7a4f704a9cddf40cd4b11c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hr/thunderbird-52.2.0.tar.bz2";
+      locale = "hr";
+      arch = "linux-i686";
+      sha512 = "397a1214ab27b187df6129f6f2f863ec1b76ce2af41c0ef5650f255451c57f07741f6a7d0674ad38432c7ea9c95fc2b36606d31defc698fffa4b676549b2c197";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hsb/thunderbird-52.2.0.tar.bz2";
+      locale = "hsb";
+      arch = "linux-i686";
+      sha512 = "f0c76d90ae2b47e8d5c66a536ee1b2572f60164f76424b61b491326e719f4454448a9af4b6ceb8e1055f7e44adb6490a0fc4df086c344d160861d877766e227f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hu/thunderbird-52.2.0.tar.bz2";
+      locale = "hu";
+      arch = "linux-i686";
+      sha512 = "d26eb645574d9298c75bd334371fc7a4baaa9b358b37c5d8da6e61b6d8fdf3fe165a5ea1855a840a742c6b19e3a15fbe7879e43bb29b187daffa63c59a863e06";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hy-AM/thunderbird-52.2.0.tar.bz2";
+      locale = "hy-AM";
+      arch = "linux-i686";
+      sha512 = "add66a00fd3a8be7c71276d02588ffafd0ed0a8b2e4875dab3b82e4fe9b2be3964096509ce6b0e67350f62cc814b7c7ed069f481516f72f19a8039967123346a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/id/thunderbird-52.2.0.tar.bz2";
+      locale = "id";
+      arch = "linux-i686";
+      sha512 = "b793e65e9e9f8d30ad0193f019acf33bfbfb165313a960f120bfabeb4df0c769cc9fc5b7e34ea05eaa085a5c0872134d606862b381852d04748c2e97ed1bf9f7";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/is/thunderbird-52.2.0.tar.bz2";
+      locale = "is";
+      arch = "linux-i686";
+      sha512 = "d4f163358a2c8830e3a77a5a82b8ee42d2aff39f19fb95171a249d1cde5119c66ee29bc894f5e6ea023c34e030282194025b25c04af25f647df8745d2b8aa2b9";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/it/thunderbird-52.2.0.tar.bz2";
+      locale = "it";
+      arch = "linux-i686";
+      sha512 = "9e73d51cfac30480fe0ef46c02df12c771fdd827bf4c2971b99cad7b3db42d3d60a2355c20c0b3601c7d27be5b9c2d1748a1e3b8954523ef919d120429153103";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ja/thunderbird-52.2.0.tar.bz2";
+      locale = "ja";
+      arch = "linux-i686";
+      sha512 = "ce3d8342c0fc63a9c6ab10a2d15f6ef79d8d827cbf542cf0eead9d01d1a26567edb48269ba2ed66dcf81bf83e35a120190614f740898181a3b2cd7fcbfd5e739";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/kab/thunderbird-52.2.0.tar.bz2";
+      locale = "kab";
+      arch = "linux-i686";
+      sha512 = "9ef94353b58ade84737debbd58a26aca9b8c5358c3fb852f2dd925e9c8eec46f091d4edeb0a4fe46da45eb9860ab76f43a97605085907fa79d2ba90751ea64e7";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ko/thunderbird-52.2.0.tar.bz2";
+      locale = "ko";
+      arch = "linux-i686";
+      sha512 = "651ab9ae9b966e10f420802937140a689a3c925a67732cc3082e8f265d2f98fe88195188632386d64f892338b1c4ba659c7e475951810d5b6ee48a7339155413";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/lt/thunderbird-52.2.0.tar.bz2";
+      locale = "lt";
+      arch = "linux-i686";
+      sha512 = "f64c0869033ac939538f982ff66b0a88cb566e7000838e549d63fa6509afe8a29865fce3cb6c7fea84c78b5ffd07a4f8b11b44b14c234ae957f22439f7a84a99";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nb-NO/thunderbird-52.2.0.tar.bz2";
+      locale = "nb-NO";
+      arch = "linux-i686";
+      sha512 = "9dbd31177470ba94a646d7d63890dcc2465681a4c6fc684f7cbe61eeebc788c03a863ed5a01a1baeb26ffa61d7af4631bebd74261c22ee1a109ceaf928ce4925";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nl/thunderbird-52.2.0.tar.bz2";
+      locale = "nl";
+      arch = "linux-i686";
+      sha512 = "3616bce4895db1c2f3b02773b05586bf6e38550ad7abd5beb3b31a6c5b414120972b5475c080bed782e7f2b09fe47bde3e5b41f4c3fdb7ffd823767c976dca0a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nn-NO/thunderbird-52.2.0.tar.bz2";
+      locale = "nn-NO";
+      arch = "linux-i686";
+      sha512 = "4ec009d5aca053ffbbb6cd5c84572f0305f22f33cd24eec13eb3fd04aa4eccd3447701edb53e4929914ebd2f7acc8e3d7f8e5d91c9e7a7f0b9e9c18493f74d55";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pa-IN/thunderbird-52.2.0.tar.bz2";
+      locale = "pa-IN";
+      arch = "linux-i686";
+      sha512 = "584c5cf7fc62f4f6435d9ed2ba9aa200012aa65e7fcd249aae10dc2b3dde8b4db724b11beb206a727f3eb2f60e4a8c0e5e1abbd4e621645d651cba449bc4a474";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pl/thunderbird-52.2.0.tar.bz2";
+      locale = "pl";
+      arch = "linux-i686";
+      sha512 = "aa02a2910513159c2621dc17aff373a8c2124bf9aebb24bf54c239d823d0080a1c05c330185af5dce21084d7ac9060a2b8daf890a3227650416d82afd0fa8e9a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-BR/thunderbird-52.2.0.tar.bz2";
+      locale = "pt-BR";
+      arch = "linux-i686";
+      sha512 = "b5b2654bf153bd7f7c85534b95f836892550e519e254312584b22981bcdf7205f31babb5cf32033f7d676eee2bf2400f88503b52268f2ef10286da82b2713704";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-PT/thunderbird-52.2.0.tar.bz2";
+      locale = "pt-PT";
+      arch = "linux-i686";
+      sha512 = "3d557b432531a757bad6f18754b9d2fb2359bdba49f20faf797f7eba821926aeb8476c89a93b475273514bf26a6f471637505c5eb8a1cc08d1cf830b28b21fca";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/rm/thunderbird-52.2.0.tar.bz2";
+      locale = "rm";
+      arch = "linux-i686";
+      sha512 = "434122ff7524630ec45a7e6a0e5f90e74ea1397b31bf67ce9e3046f8a31114a8320e56a5dedf1686e2eebc8c648e4a94fd0cdbe523bdcd6312448100d548e302";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ro/thunderbird-52.2.0.tar.bz2";
+      locale = "ro";
+      arch = "linux-i686";
+      sha512 = "6f2c74d119ad7380961c50d5bb91afd4bb9455737776a08eb5168c17e83143fefacfeaa3b98e1816d1fe96a7f2022256cd2acf7b697508e4139d792562be2176";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ru/thunderbird-52.2.0.tar.bz2";
+      locale = "ru";
+      arch = "linux-i686";
+      sha512 = "d9eff15876619a1bf0b8467847df18b0dba20c598e05428037b81e0cd90797b8baafc44541fed2a29dfb27075da19730919159495712099a54c9b488a693e3ca";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/si/thunderbird-52.2.0.tar.bz2";
+      locale = "si";
+      arch = "linux-i686";
+      sha512 = "a2e58a6b2632f8c2f6eaf6113e2af9e98ea222c5d2c98f0cfb4443804ce260bb3dba64bd5165590563fa946b500bbaed4341629eb25ea0c5388c61c69f4be5cf";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sk/thunderbird-52.2.0.tar.bz2";
+      locale = "sk";
+      arch = "linux-i686";
+      sha512 = "0b26b3848864def3a5b485c2d67d3c907b58d9977ae91db58d91218da278243c04eeac781fe0063b762d0797809dcbee18010824aa5d25926f8f48011e2a5bb4";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sl/thunderbird-52.2.0.tar.bz2";
+      locale = "sl";
+      arch = "linux-i686";
+      sha512 = "7158c776ec3776ac269402973482e2dfedb3c17aeac11fcae3bee6a982717443068223cc901ee71e6b7a42a8073f05d2a54047804997d992761fbe71d46bd223";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sq/thunderbird-52.2.0.tar.bz2";
+      locale = "sq";
+      arch = "linux-i686";
+      sha512 = "1a838db31f4db574669987614dfcbd5f7f1eb061dc4f2fd0c9ca206d5a5291ac348efce3ce59b30f89fdc375e72467531d9d96b8ce43ffe28e92916f2864908c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sr/thunderbird-52.2.0.tar.bz2";
+      locale = "sr";
+      arch = "linux-i686";
+      sha512 = "beb9eee26aa5474ac5e70c168e2ee32c84216d919528c9edce4d45ab6c522d5fc888ba2f8c57cfcd47d299367ddb7c367dafc9ccd3d29c5700de28eb2efe08fe";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sv-SE/thunderbird-52.2.0.tar.bz2";
+      locale = "sv-SE";
+      arch = "linux-i686";
+      sha512 = "e4c2320e547b2e61991feb586b7f9e4180cbeb88dc90cd0dfd2c026b062e4e1858d1d1b331cfde1e373cacec2231f7cb2ba61b5e4ef02a36802edbc96b39cf72";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ta-LK/thunderbird-52.2.0.tar.bz2";
+      locale = "ta-LK";
+      arch = "linux-i686";
+      sha512 = "aa42add8ba31edb5a40fd62304f10ac55006918d5196f71ca0330c3ca52dbbf4d9b5d39a07e977ee89c6b913e6ac4d4a4c9460da194b41760826d96e89e7bffb";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/tr/thunderbird-52.2.0.tar.bz2";
+      locale = "tr";
+      arch = "linux-i686";
+      sha512 = "ceb90e08e906d5a2520152c40c4e32ab85da31c746ea285280b6e9bfbd60e9178886799357f39d54e0e072c616059ae7fe1948c39f6152b5f0d1b196185c8475";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/uk/thunderbird-52.2.0.tar.bz2";
+      locale = "uk";
+      arch = "linux-i686";
+      sha512 = "9d9fc486d556dbe3a216a3d4e822750cfa1cd0348af37ddaa5a19f9c390170e348a41b8251fff1499d2dc6d92feb34061286ff5400a4f9b6ed4fdee27064078c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/vi/thunderbird-52.2.0.tar.bz2";
+      locale = "vi";
+      arch = "linux-i686";
+      sha512 = "010bc7ce4ee4329857291796e2077e0872593f2b52799b1524720fa7fca11f2f4b760610bc97db171421552eb59a36725f80d4852cd77d30c8e7eb6c6c523d2d";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-CN/thunderbird-52.2.0.tar.bz2";
+      locale = "zh-CN";
+      arch = "linux-i686";
+      sha512 = "c07d2559296acb160c19af2db9f516254d33e1d55c78b2397d2c28764a8296e3da0b74409d48702e889bbf34f06115b493bbcea2666ad8b4884ea01fed6ad12f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-TW/thunderbird-52.2.0.tar.bz2";
+      locale = "zh-TW";
+      arch = "linux-i686";
+      sha512 = "8fa1da0c35584cfb8013df9e86a37268e6ffed1ee5ba4617d3db185975b874af5dba3f3af5498b8ebfdf85e40409fb9fee8d517f84f4942cf69deaa94f3c64a1";
+    }
+    ];
+}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
deleted file mode 100644
index 78084753974..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ /dev/null
@@ -1,595 +0,0 @@
-{
-  version = "52.1.1";
-  sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ar/thunderbird-52.1.1.tar.bz2";
-      locale = "ar";
-      arch = "linux-x86_64";
-      sha512 = "41e7b02fa088054e59d68abf636b376837519502273ff9e25ba18d220e8e35927db2a7795354f997ba0f980f33a74338128999666dc0ea730babb4cb3077c17f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ast/thunderbird-52.1.1.tar.bz2";
-      locale = "ast";
-      arch = "linux-x86_64";
-      sha512 = "772e90be4cd4d10c1fc98df69d20509c954feb29c64a801d907f4944c429844d375ec241b8c45fdac375cfaeec3adfe7db81c2fd10e592cceb066b6c23c2c2e8";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/be/thunderbird-52.1.1.tar.bz2";
-      locale = "be";
-      arch = "linux-x86_64";
-      sha512 = "76832c00106c68a9b48c4892a11f7b48384d7934e7cf410eb2d7891f79303af29a2a94a3ac377bcda36a0894baf9c3768cfc62c3ebef0c640291c1b70d23e55a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bg/thunderbird-52.1.1.tar.bz2";
-      locale = "bg";
-      arch = "linux-x86_64";
-      sha512 = "a8776f1bb3c3d1c34b0a1d538cd70cfefb283031f372d0c7b1bc8bfe9dc39f240c746525a8a52968e060024282642a634488d7a8b30509b830232a63b3111fa9";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bn-BD/thunderbird-52.1.1.tar.bz2";
-      locale = "bn-BD";
-      arch = "linux-x86_64";
-      sha512 = "e0596b70e52733a01f7cbc073f444b5798e7beeed42effcb329fffe8a74de25fd69636624ef74f0bc31aa27a078a6a5c763f203eb3fdc275f59c3eccf49e0cc5";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/br/thunderbird-52.1.1.tar.bz2";
-      locale = "br";
-      arch = "linux-x86_64";
-      sha512 = "12269d34c5ea1836f8fc12f7c163b966ee57afacf8bab7a010fd1ce2315193a8dbbba201fa474c9dd2e642f418ffb64eef608eaa37a5991168faaceda818aa49";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ca/thunderbird-52.1.1.tar.bz2";
-      locale = "ca";
-      arch = "linux-x86_64";
-      sha512 = "42180ce29e1e53aa08c22d71902cb792ffd212c42c7a3632d069907d7dfa1571d0beb16141ab5b91af9f637d10278a5f5f5a2bd56146ea848b7f88010655cb92";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cs/thunderbird-52.1.1.tar.bz2";
-      locale = "cs";
-      arch = "linux-x86_64";
-      sha512 = "63e4c8ba853a1289e977ffc27627e69f4509addbf9dcc294be3a49ed7030eb56181cdc6630e6dc3d207d50e2060ef80d5aeb3aa58c3ff95890ad54f0b88a8fea";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cy/thunderbird-52.1.1.tar.bz2";
-      locale = "cy";
-      arch = "linux-x86_64";
-      sha512 = "30110d9db650afb9b0d47efa25006f03b4a9d9863f7fd37a49d49cfc4f2d8b7735a27676d36c84ef390d8358e0069d4708e6ef9eceeb12a38d226f917c4a2c19";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/da/thunderbird-52.1.1.tar.bz2";
-      locale = "da";
-      arch = "linux-x86_64";
-      sha512 = "1b0d6727f72cb8547f6b09c78d9375a63121d73959666e9500c01aa72253e923bc8f85f7a7738d9a0426c9a9e85bacfde3ad3e35b3101ae0af2c132841c60fa2";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/de/thunderbird-52.1.1.tar.bz2";
-      locale = "de";
-      arch = "linux-x86_64";
-      sha512 = "4e9c924cd763c15627494f9f247c76ad69fa719e1fec0aae1650949d0e13abdf7d4bdb86bf53cba0db7a124e97f8bb66895c00bbded00f324f8de06c9d1e9b55";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/dsb/thunderbird-52.1.1.tar.bz2";
-      locale = "dsb";
-      arch = "linux-x86_64";
-      sha512 = "b1b5fd7176a5743cb7064cfb9c74c78eb29873978551a6afd6c80bde92744d9793e53ff4bfca2af1bd06f9285305774d7be0d72d6fdd9ec38dd05e0c58fd537a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/el/thunderbird-52.1.1.tar.bz2";
-      locale = "el";
-      arch = "linux-x86_64";
-      sha512 = "f85bc8f35b59176c69e7dc8cfcd7dbbe649c54487d453e56f35c414ce98548127cdf973db7739f7481dca6476c0f9cc54cd42576a5b05abf03ca8a2a26fff229";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-GB/thunderbird-52.1.1.tar.bz2";
-      locale = "en-GB";
-      arch = "linux-x86_64";
-      sha512 = "95249b37205cee0a1677c8fed8199b1a9a98d80b0dfbc513321d72e2a294a84e1d82f19b8732fe30189d9c508d9ebf98be9bf5deda87ddb83134f9b1e24834a3";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-US/thunderbird-52.1.1.tar.bz2";
-      locale = "en-US";
-      arch = "linux-x86_64";
-      sha512 = "dd13cf3e5e8ca042583fd134172a4dbcbcbaf8fe923d7f2c19e1f66d2802edc9901fad3a2593e382305b97bc17ae3b1266f3c2176648f8255894749db55ac8fb";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-AR/thunderbird-52.1.1.tar.bz2";
-      locale = "es-AR";
-      arch = "linux-x86_64";
-      sha512 = "ca300f267a36f1c5251c8eb5200d93ec558cebb22736c6939581f06bb3c00a9b617188be183bcde78afc6bef2c8a579c82d0085cb8cb0b8668c4975f3bd4578c";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-ES/thunderbird-52.1.1.tar.bz2";
-      locale = "es-ES";
-      arch = "linux-x86_64";
-      sha512 = "050a9b2468db62c306ff94eca093c9bebb3b55227bda653f4355915264a73a3da4ee930f46fac27ad932e67d8b37f125b33895cc759f5aa213b8b5f432e82339";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/et/thunderbird-52.1.1.tar.bz2";
-      locale = "et";
-      arch = "linux-x86_64";
-      sha512 = "f07a8ddb278b697396a2988208cd28059fd1449044dfdce6330a058e060113c8748607c52443349bb59ee8851e6d17626830acb99a836f4102b30ba83e96d12e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/eu/thunderbird-52.1.1.tar.bz2";
-      locale = "eu";
-      arch = "linux-x86_64";
-      sha512 = "20d04d59df7689d515ecdfb64f118efec8964b7034e0e0bed0225e8b63c7f46228086f1d63b636eb3a549226aecc944db61e3d8fb1273ed5bf669f538f56017f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fi/thunderbird-52.1.1.tar.bz2";
-      locale = "fi";
-      arch = "linux-x86_64";
-      sha512 = "357ef2351d131fc4da8a4998cb3ca6147c3b2de638156d69a826d98c48d2fc8478905ba5c0a778280a2b29471f899d1851fa1cf8a7a010b0d7c7c8fcbf73f8c9";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fr/thunderbird-52.1.1.tar.bz2";
-      locale = "fr";
-      arch = "linux-x86_64";
-      sha512 = "279e46c579577643adbd671455c3053b96c97fad626392b755ebd173b4c09e46ff9f2b52a829b90850e12ebbaea2afa0520c21b5376389b80e5e4f4b09b25ed7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fy-NL/thunderbird-52.1.1.tar.bz2";
-      locale = "fy-NL";
-      arch = "linux-x86_64";
-      sha512 = "ab4f11659e682eb78d14952ca60a1394a8cb7a982d182eaffce9a6c97cd9e6a6cdd1cfe1e278caee66a91a9fa85a28e9cb8daf06f4efc40fd36daef77b0ec2cf";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ga-IE/thunderbird-52.1.1.tar.bz2";
-      locale = "ga-IE";
-      arch = "linux-x86_64";
-      sha512 = "31e8294c81955b1bd512c46d11659e9d95ef6e421060e37296e4e27d3a810ea3201c5ef01bec34a4161bb4e0a980063c546c4c8a2f23bbb7628dc6762857afc8";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gd/thunderbird-52.1.1.tar.bz2";
-      locale = "gd";
-      arch = "linux-x86_64";
-      sha512 = "88bf4276c8148e8e1809411706bfa3f5dbafaffee11d3a2e6cfe32e76a9c9d99c1d43aec5c9221d684ae446ec117704e501dce5790a1f16ce8c3ab6124df5bbf";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gl/thunderbird-52.1.1.tar.bz2";
-      locale = "gl";
-      arch = "linux-x86_64";
-      sha512 = "d19ccbf5cde54e6d4d9813803c33cf4b8bfdce14611e56c364bc2bbed0c65ab6bdb06b9c81e1e22f8b17f341552ea822a61eee431da815ab2b1ce21c32aa6d77";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/he/thunderbird-52.1.1.tar.bz2";
-      locale = "he";
-      arch = "linux-x86_64";
-      sha512 = "582654cd958b5ed3abe8a751dc085dcf47e3da92731512925144a9e7b77ac4efd05dc6414b61b63e107763f8149b9acb244913ab83014b45801da79c16d3ece4";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hr/thunderbird-52.1.1.tar.bz2";
-      locale = "hr";
-      arch = "linux-x86_64";
-      sha512 = "61019566186e0d5c3ab8dc963472d010bff1d0ed705b2df17d3e545ebb7cb8d4caf1982cd11b530659413c5e7776b086da89df5fa52775654038eed1ba8826a1";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hsb/thunderbird-52.1.1.tar.bz2";
-      locale = "hsb";
-      arch = "linux-x86_64";
-      sha512 = "7b1987d86b6eb4d620b6989f3b40583db56653be1c9bba9ac7d2a3132267790fadfaa4c34755c8c0df2a0fdfae15f6b8e70fa81dee9fd3885699ab67518a2958";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hu/thunderbird-52.1.1.tar.bz2";
-      locale = "hu";
-      arch = "linux-x86_64";
-      sha512 = "89b902b9bc281db85ba11904dd1b422a65ffaadcb41d933ebd5fcd7b7b3f97c2d050a8fdb78a6da88b29b47f0f7643511e90a4af133e528c38f63db326d13e86";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hy-AM/thunderbird-52.1.1.tar.bz2";
-      locale = "hy-AM";
-      arch = "linux-x86_64";
-      sha512 = "0afb1d38f1e4ceec5ec0a9d28ea9ca41558d3cec0d1ad04691e11901996d875a2d7508440c6870264c05b12f3776b2d705470cbef83cb11a68c19ae923b75763";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/id/thunderbird-52.1.1.tar.bz2";
-      locale = "id";
-      arch = "linux-x86_64";
-      sha512 = "34dd65c256900d0ad08db33272adc1761c190fc429de0e62d791f4160c241d9950d42efa03cd4e3aaa4ae5627b48ad2c9f0f0ad865f0d26233379d3b9a4e9f26";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/is/thunderbird-52.1.1.tar.bz2";
-      locale = "is";
-      arch = "linux-x86_64";
-      sha512 = "1b651359c2ccf8249fa2ed951e69bc2d16bdef08db6d103dd5110305ec497cce4452d2764c814068c968bfdfe75bfaeea0d119f8457ba1d72c881097c22fd143";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/it/thunderbird-52.1.1.tar.bz2";
-      locale = "it";
-      arch = "linux-x86_64";
-      sha512 = "15aaeacb1a0ab38297a179007039fb3fa5825618eae5e5d650f041bf5311e8f244dc0ef53d99b9513fc8e17b4f1d0a731cc06f08223b42d222be5e8f56b2a651";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ja/thunderbird-52.1.1.tar.bz2";
-      locale = "ja";
-      arch = "linux-x86_64";
-      sha512 = "ab3fc3d0cf7be8e463c5e8f25ccac1cde2df9be15277bb81f253af15a0de53935cd5c53b8435e7ef5369cc43739b6e2fb8424bb2d7e1b153201b50a8385d1763";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/kab/thunderbird-52.1.1.tar.bz2";
-      locale = "kab";
-      arch = "linux-x86_64";
-      sha512 = "60f2a58444b06ec8f7bd98ccada16b33b0e528bc59b73d33df370cd44283b2b0e65160aa1b5ab9cd0a7f7c628056e3bef4d7c293814837b6a7df17dd057b8ec8";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ko/thunderbird-52.1.1.tar.bz2";
-      locale = "ko";
-      arch = "linux-x86_64";
-      sha512 = "de7fedb8b379f54488c5ef6927c53e0c3651f08cb33b97a06359fa9c5a31b0d4a7717df8d493236b7e6cfcc5173d1faa3f07e938b65322ad6847f59c4061597e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/lt/thunderbird-52.1.1.tar.bz2";
-      locale = "lt";
-      arch = "linux-x86_64";
-      sha512 = "9c4c9969a851509dbddf3fbf0118067b29f679b2e13c15f507579f232a311941c1345636714c94151323bfe726f760ab507def1dfd3a4a4053c60d533a3a2abe";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nb-NO/thunderbird-52.1.1.tar.bz2";
-      locale = "nb-NO";
-      arch = "linux-x86_64";
-      sha512 = "61f6e4a840b8cbcb9b0706f121c93798924302184ecc92e4f6b4489178ae3d6962d6ecee52feee21fd4d89c5da7f349b383b5bef6f0b961e6e15a10f6dd5f2e8";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nl/thunderbird-52.1.1.tar.bz2";
-      locale = "nl";
-      arch = "linux-x86_64";
-      sha512 = "4de0257fa93e7450442cafcb3cb328928687b974303d3df9c4c37db843bc3379716a7c7058400dc11f25b632266f1f4f740de4c4ae099d6f88d810673856d562";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nn-NO/thunderbird-52.1.1.tar.bz2";
-      locale = "nn-NO";
-      arch = "linux-x86_64";
-      sha512 = "ff6152e088e8f94f60c31b172502207609a9b0908057f8343177e9b7c6a079dd2c503928debeb2c133a77edd6ebac5f691a2078f54d572c2479f60327ba580d0";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pa-IN/thunderbird-52.1.1.tar.bz2";
-      locale = "pa-IN";
-      arch = "linux-x86_64";
-      sha512 = "9a7876869b412efc3463eb2d161f4655804f740bbae0aee075d0f7e1466de6fbed21545bcfb93c5f03fcb837d3459a40882f4fceafae137f8aa4d3841010feeb";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pl/thunderbird-52.1.1.tar.bz2";
-      locale = "pl";
-      arch = "linux-x86_64";
-      sha512 = "9f897729f752126cf676a05672aaa35c620d025ca74ef8c611948b2b19e9239d39090a2983bf9568f796d0a20acba4fccd262ed04433c564791c5ef837955425";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-BR/thunderbird-52.1.1.tar.bz2";
-      locale = "pt-BR";
-      arch = "linux-x86_64";
-      sha512 = "fba636db2837ee9835a35bc36af874e50b113be1edd123a74c9d71080b25be761500b8aeed7605f589cd06328d67659cb25fa25959e49c017a4c63a27be3df6f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-PT/thunderbird-52.1.1.tar.bz2";
-      locale = "pt-PT";
-      arch = "linux-x86_64";
-      sha512 = "0ec0668509a19f52432c0de6450d14b20be01e0a26eedb316e63b33f44a001c3ff82c3b553ef51c9de740a164ad33ca25f9b4b2d64b792e89ed803b9d68d11fa";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/rm/thunderbird-52.1.1.tar.bz2";
-      locale = "rm";
-      arch = "linux-x86_64";
-      sha512 = "fc75870ecccb5cac6533887e96a3be0b44a07b638b96c5993c7d6ede1cf0e501172ab83c85b2e5978d6818086c4e7802ae133da96a8331846456c184f3dfa34a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ro/thunderbird-52.1.1.tar.bz2";
-      locale = "ro";
-      arch = "linux-x86_64";
-      sha512 = "bbb3f37e6559599022f3ac5aafb62ba9e62b67ee5165eb4aad2fb29e722206b7ddd0e4bfa1e5cf57453e0fb572b3829bba3c80e4ab0b3b14c91ce4f824f5150f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ru/thunderbird-52.1.1.tar.bz2";
-      locale = "ru";
-      arch = "linux-x86_64";
-      sha512 = "f93506805c0d45f19a7b17f3eb82a6f8ce6beec11e4fd6ea09888bacbb90f258cfa15bf35a6b5868ce496491b1dd62cf12ad4877576f4b00117f169065061555";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/si/thunderbird-52.1.1.tar.bz2";
-      locale = "si";
-      arch = "linux-x86_64";
-      sha512 = "09a1aa2393d95815cea16ecdc4a2abf7cc7782744e8ab39a447ee195feabf35102a7cbcc57761c1a8bab085036dea949a3ab2fc5cb3cd00cdd01047e1de0faee";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sk/thunderbird-52.1.1.tar.bz2";
-      locale = "sk";
-      arch = "linux-x86_64";
-      sha512 = "d37c2fbc9c72b627278e8bc8073544f0a35bd175e7015f88bc037861a5513286627ca016ed643db490759d7a9b57feaa7d0bb8948545da67ac6fdb2580549e93";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sl/thunderbird-52.1.1.tar.bz2";
-      locale = "sl";
-      arch = "linux-x86_64";
-      sha512 = "0134f110196af343e0fb3f24970caa74fa0a9f48c4c652e484bd79c2fd76f97eea86776c5b528c432ed98d24b2ce83529e7e68c3e4ff2533dd554465f24f701d";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sq/thunderbird-52.1.1.tar.bz2";
-      locale = "sq";
-      arch = "linux-x86_64";
-      sha512 = "9a85f94121e1af70e8eee2f0e56693807f881c288efbc9d4f4affe9353f0018145d2df03be74b76026dc0f51b28969cff69e19b639271df7bb34bbaeef21ffbe";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sr/thunderbird-52.1.1.tar.bz2";
-      locale = "sr";
-      arch = "linux-x86_64";
-      sha512 = "a11ec69a7fa8f49c9fe98a53280f6e71cb4dddea4f8a5a4adcb7a95cfcaa548575b334a15ce7c06dcb6053d633a1f2bb09b77ab022a09c3987228fd5a9fce339";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sv-SE/thunderbird-52.1.1.tar.bz2";
-      locale = "sv-SE";
-      arch = "linux-x86_64";
-      sha512 = "04215a4507f057151a9d3bbbc092e7c54a02bdf19af3e18c8042c0fdc477cf5739d3007beb4e28dd3354dae7ffc628fb601c18ad06e8898e5445c35855cdcf5f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ta-LK/thunderbird-52.1.1.tar.bz2";
-      locale = "ta-LK";
-      arch = "linux-x86_64";
-      sha512 = "f04af1419a7175a2c15f65bcca7def7e1ef0a82d4e1f706599a8a2a731b07d7d554dfd859911836f586cb0da09c8c67452110eb8caa181e4cf1d39af39406f55";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/tr/thunderbird-52.1.1.tar.bz2";
-      locale = "tr";
-      arch = "linux-x86_64";
-      sha512 = "44b3a06fded09732b1914ad6a373411eacd77defa23c29b1ac2d422f9f38eb3aaf5838915d96ae2400b35b6e751208f21b3f213fa92968887504187548f70431";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/uk/thunderbird-52.1.1.tar.bz2";
-      locale = "uk";
-      arch = "linux-x86_64";
-      sha512 = "c7024c0394da23e067327f9db5cacb263ed02e5e23dfec0059a64383a331b8c9695d30f0e25b2892516e189e2a7e4796d91041e684f44a66d0d6bfd287499203";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/vi/thunderbird-52.1.1.tar.bz2";
-      locale = "vi";
-      arch = "linux-x86_64";
-      sha512 = "d7718cbb734a11c82b4ec88e73174f34fc34819c0c398855897b7b11d811ef27c785d9588764dfd8c149adf61227ac416b8e64dac7d0a2bdfc1fefa5b980a4d2";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-CN/thunderbird-52.1.1.tar.bz2";
-      locale = "zh-CN";
-      arch = "linux-x86_64";
-      sha512 = "29b5183a5d824e6e5d4045b9e41403fb5b321ff7c05c73dd43357fe67c87fe05be26988f408788a7e0e1655f0068cbdb80311f396ba991801d0af462dade3432";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-TW/thunderbird-52.1.1.tar.bz2";
-      locale = "zh-TW";
-      arch = "linux-x86_64";
-      sha512 = "0fa4d43ff9a1f32fdc9695075205bdd32932ef790f53e04da778309bd35f5dde56f2d51d972d8c998eee3117a287d16fe79a49435b5cdf6631fe65395bd184c7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ar/thunderbird-52.1.1.tar.bz2";
-      locale = "ar";
-      arch = "linux-i686";
-      sha512 = "0234f231e1dbbe5776d9ea37a18e546d049470efe29eac34c2c4d05c59aaa81f509bf778b37d3865d117fbb43db17e33464090830b531ee434d7775b4020ab44";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ast/thunderbird-52.1.1.tar.bz2";
-      locale = "ast";
-      arch = "linux-i686";
-      sha512 = "5ab2c379709ef07d82870da6259fb9354005235d485d6eed4d5a0b1d23c83903e7e6092cd49ac2439b01c5d4f1e663f121bff7a45ade72eb18d166787c4f62f5";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/be/thunderbird-52.1.1.tar.bz2";
-      locale = "be";
-      arch = "linux-i686";
-      sha512 = "69c596d711b91664031e52605c1510532f2600b3927afc4ea12a1c9332baf5b05982a09648be6b30ea42b763a18f495d8fa2274515f8088c0b2e07be60e0510e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bg/thunderbird-52.1.1.tar.bz2";
-      locale = "bg";
-      arch = "linux-i686";
-      sha512 = "0de0dcdd70902f0f1eb8d8d361ce20383c8bec9ce9ea6ddd664876e6386075a424045478bbe6c88076085c97dc42bcf2205f6870e6b03f46dfa3872275ac195b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bn-BD/thunderbird-52.1.1.tar.bz2";
-      locale = "bn-BD";
-      arch = "linux-i686";
-      sha512 = "73e82f771d90a4861b9b34adfe94714cab47dd2cc86b9dbad23390a2cef8c0150a654a26a05a6a0effd0efe79a3caf419fce748e35ab3c94610d42e2cb06686e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/br/thunderbird-52.1.1.tar.bz2";
-      locale = "br";
-      arch = "linux-i686";
-      sha512 = "1abfcb8f361ccf5526f947ad8b7c497233d646913abb6fd345814355c548b4c93069a9710d27d2141c5e0045323522a6e76f9f3f53d7dff2c131ac94778545fb";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ca/thunderbird-52.1.1.tar.bz2";
-      locale = "ca";
-      arch = "linux-i686";
-      sha512 = "07a3436b009ba87180659345261de142d94500b8fb00fe21d9c48cffa43fc42f644c28bab739d420908342e28747f4f564eb46ae4e24222dea45f369a5caf3a5";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cs/thunderbird-52.1.1.tar.bz2";
-      locale = "cs";
-      arch = "linux-i686";
-      sha512 = "58b90bdba30ad6626f285c73601faf30f45fefc1e670e013e7f9e6b92540647cb402ec69eb88ca00dc450801fe07589792bae6eb602ccc60479f3ee6e5104ee7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cy/thunderbird-52.1.1.tar.bz2";
-      locale = "cy";
-      arch = "linux-i686";
-      sha512 = "d880dcce1b4dd47bb738d990886b71a858022b8ca76c67d33d8d97257e28cd4489d058526fce6b677cd6e925acdc2d04870e5ff6d84a89d82e2bc9f91469536a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/da/thunderbird-52.1.1.tar.bz2";
-      locale = "da";
-      arch = "linux-i686";
-      sha512 = "31e26b2333544c950b69a631a4f889052c79f3411b3f55b8c02d7fa248d50409a363ab9935d57946b704b5b85819b3e30bbb8230871a582bb27b8f2c062ef1b7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/de/thunderbird-52.1.1.tar.bz2";
-      locale = "de";
-      arch = "linux-i686";
-      sha512 = "c86681f6616d5f234f0878aa9370cca4c0fc5f38c131f2a3908d8529ab2e86e340558988c3ac5067a82edb99a3cacf316727652d181fcc0bc15ad7ecd713d11b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/dsb/thunderbird-52.1.1.tar.bz2";
-      locale = "dsb";
-      arch = "linux-i686";
-      sha512 = "4f3b39c1023235579079a46a7d557d177c3f2e398a6e311c728ec1083952b2c67db0cdf539d8ae3abc54061d22e607c6849699008b76e9b01569d12d6600feee";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/el/thunderbird-52.1.1.tar.bz2";
-      locale = "el";
-      arch = "linux-i686";
-      sha512 = "623205d1e326a0310c54a9c14e469fdbe156e538c2a09a770c872be8214611743b6d354b5a7b106db5105b8b278540d7f623c6fc56bc1fd450333ec774ded706";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-GB/thunderbird-52.1.1.tar.bz2";
-      locale = "en-GB";
-      arch = "linux-i686";
-      sha512 = "b38b9e6350edd11e58c644ebe4c11aa6bfeba7e7aa6fdf40f9b9a4cb5845f5a2895b82ebf717ca78138a0f11cdc2f6f5aefe5636acbcff857ba99d27e258b824";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-US/thunderbird-52.1.1.tar.bz2";
-      locale = "en-US";
-      arch = "linux-i686";
-      sha512 = "192f42fe4c7b9689743ec16191ef8576a19699812cfc4984e4b559fd847ab92c1dc002cbbdbb2212fb547fc9bfd77b4f58639d219ccc1ed86290b61f9effebf0";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-AR/thunderbird-52.1.1.tar.bz2";
-      locale = "es-AR";
-      arch = "linux-i686";
-      sha512 = "2022d12dd755e6583b3ccb068ffc53b91308702cff57f57ed455aee7299f8a7d4e614e600acc80be9da0e9df8e86c273b6cc7e99b94c5194420be367d5f12497";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-ES/thunderbird-52.1.1.tar.bz2";
-      locale = "es-ES";
-      arch = "linux-i686";
-      sha512 = "058004f7a94b55a393d626869d7b7690d17fa5b51b0466d83c029c65ef3a49d9efdfc0df2c2110865282972b23fbd22a68f81785d098cbe3ba6c39c81f5e903f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/et/thunderbird-52.1.1.tar.bz2";
-      locale = "et";
-      arch = "linux-i686";
-      sha512 = "95247bec1a365afcc5f6985ac635b0ebc02b2c345704749856ff5d9aa3d23e22fb274812617f3cd1648f80b9e47c95100fc10d41d5cbf0f8b7322e57adf48165";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/eu/thunderbird-52.1.1.tar.bz2";
-      locale = "eu";
-      arch = "linux-i686";
-      sha512 = "e561dc2fd2f32dcdaba034f7486a55da8e332c7a67fa4948ccb073fea5a49910c02bac3b4f988366d0e4cf7da00efa52020eb1fd837119e95360e7418b65e37b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fi/thunderbird-52.1.1.tar.bz2";
-      locale = "fi";
-      arch = "linux-i686";
-      sha512 = "d014aec796d7c4823748eb2d4a76df85a10fb6bba58d26fc9e46f72bbdc1457acbe473a563a1ebebed152c11242bd64b8c306c2fb43959ad2b649830bf50e95d";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fr/thunderbird-52.1.1.tar.bz2";
-      locale = "fr";
-      arch = "linux-i686";
-      sha512 = "e7bfe888ce1bffcb302c96bdb685bdbb7588521e9dec863175015622ebe13d0aa2b8a75c8fbe9ad6030be8303728a6a6718a837fc8fef8d0009fedad6ecd1b36";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fy-NL/thunderbird-52.1.1.tar.bz2";
-      locale = "fy-NL";
-      arch = "linux-i686";
-      sha512 = "08bb1c4e4187e6a4f61f9ad88daa605186b341033c256506f9dc2c7626af842a628dfd59732084cf1b6bf94eb52e78af9942fcbbfb3c0a0c42568c94d3a874d7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ga-IE/thunderbird-52.1.1.tar.bz2";
-      locale = "ga-IE";
-      arch = "linux-i686";
-      sha512 = "737af536b710b633b849ae0f7017bf9387daa6a3145409ed8cb315a0738083195992bac1fb4215b590784b7b2389f0611d89b55e17b5b02bedb79869e7caace9";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gd/thunderbird-52.1.1.tar.bz2";
-      locale = "gd";
-      arch = "linux-i686";
-      sha512 = "2ede5eebf73d7fa2f9ddf5a10b26649d43bc24512512b8f31b2998786c80de1c75890d3c825829ce1ee030ebb90e6bde1264cebc45d17475bfa5a343a5520491";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gl/thunderbird-52.1.1.tar.bz2";
-      locale = "gl";
-      arch = "linux-i686";
-      sha512 = "b0ae9a3d08160024203b6bddfa6fb4a9a15c552cce91701d644636cc9f9c6add879a1b78138a0bdf3946c9f356dfb50d97293cbd070bbc2a9764b30a7a29263a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/he/thunderbird-52.1.1.tar.bz2";
-      locale = "he";
-      arch = "linux-i686";
-      sha512 = "b1f5d4e299cc2d40397fb96b076625ea7e86faecc0ba6503276d675125373fe7eecfd531caf24241cb446bf47ba986c4ee497fbd115cf67160ef24b87f6ef19f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hr/thunderbird-52.1.1.tar.bz2";
-      locale = "hr";
-      arch = "linux-i686";
-      sha512 = "7e52b5aeeaf9cd3c205555b1cf69c7a184b3a30605611a0cbc66a7591beb9d11a18b5e084adc9f88a7b74b24b06dd9b470bb966c6dc4fd946ab23b6565608ff4";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hsb/thunderbird-52.1.1.tar.bz2";
-      locale = "hsb";
-      arch = "linux-i686";
-      sha512 = "49c718f7424337a6477b175446f3b532d0603ed8dd2bf789497706dd6c25f1d4968058facb61b2ea858e908911d0c04e87493a0956c33ad33df11d9990aaabb7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hu/thunderbird-52.1.1.tar.bz2";
-      locale = "hu";
-      arch = "linux-i686";
-      sha512 = "e6ca202e31f41b7e57235172fb107ddc0707633ba5762651da62e9e55f433fe21de642f20bc3cbddf99ee8a9881dd646add04bb180e630364e45384a13e75ef0";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hy-AM/thunderbird-52.1.1.tar.bz2";
-      locale = "hy-AM";
-      arch = "linux-i686";
-      sha512 = "43aed794a82dc7e74f086bdc9e401ecfd59329098c8a9a650c485348977815f7419cd1cf913bc3fba025fbfcf1a15db6b883ef6bf483e16187a85dfdad9cb299";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/id/thunderbird-52.1.1.tar.bz2";
-      locale = "id";
-      arch = "linux-i686";
-      sha512 = "3ce1c383d7640b9af2b7eae5e7689a200d27bc0a5527b3f3be1b1443ef3278cc58c0f2c0e3a9f94cb419fdc3b5797612fa96d78aa9a418b59fb066977955096a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/is/thunderbird-52.1.1.tar.bz2";
-      locale = "is";
-      arch = "linux-i686";
-      sha512 = "365d5b4c78605df8869438eca9ad700ff2353bc18d64cfedf8905bc7307646b45c365813b537eb813806a25b8d1f121595df744ac60b1cb48cfcbe4395affc7f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/it/thunderbird-52.1.1.tar.bz2";
-      locale = "it";
-      arch = "linux-i686";
-      sha512 = "ad0946bf1282f3ded23847b6fbbce55e620ca34b71bb3c7a12a6bb24e6e09a4d737503c39f5d634bdcd4c3a54418ef6b96a83fa997d911b85d8d05632d921711";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ja/thunderbird-52.1.1.tar.bz2";
-      locale = "ja";
-      arch = "linux-i686";
-      sha512 = "34841d9c22e9b4d737bc56e23935f12a5a0bedcdbb127447a21ae9a837c9f61ef93b9613fa2123dafc39cbe7f9ec3cc0b92c7dc27f96ca3175ae359be3cfa1db";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/kab/thunderbird-52.1.1.tar.bz2";
-      locale = "kab";
-      arch = "linux-i686";
-      sha512 = "19a40cf4ff9c0e34b4ae46a54364ca9b152aee18f2d4a438fe947cb225d9214f8316bd9aacfbec803076716668f100b0a02dd18b1f307498d086cfd6466f6433";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ko/thunderbird-52.1.1.tar.bz2";
-      locale = "ko";
-      arch = "linux-i686";
-      sha512 = "1497535d1de169c0498837ef164434700a99d5dfe5032cfbef62de4535f47c2473ef335f9796c0d7adf5c7f2cde7c3a655aaa92d65651667afd7f3cdf7cde574";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/lt/thunderbird-52.1.1.tar.bz2";
-      locale = "lt";
-      arch = "linux-i686";
-      sha512 = "54bdb2bfa2cf97e03c389a390ad018f485b5452c6c4e8acab9cc71c0076b830cfc7267a1e755f98ac54c87231511827ba7c64aa2502c502ab47d554fc5044856";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nb-NO/thunderbird-52.1.1.tar.bz2";
-      locale = "nb-NO";
-      arch = "linux-i686";
-      sha512 = "20f5d2e7bbc083a990d9e9d8373d1485d58d62837c4d0d0d9d0955d3a9355c326d8eebbbfe0c61090c598fca11dad85d101ffb96b12f72b76da55fe72773ad03";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nl/thunderbird-52.1.1.tar.bz2";
-      locale = "nl";
-      arch = "linux-i686";
-      sha512 = "c25e14b9d28f4985ffbb125b984168b4f073773c03bfc2af2bb845db19659b25d69e634896d9b0d92ad7f08ccd4523a5d58ee42fbf23ac25499f64e7da7463cd";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nn-NO/thunderbird-52.1.1.tar.bz2";
-      locale = "nn-NO";
-      arch = "linux-i686";
-      sha512 = "9fe667f785abbdcf57890c3c19def43165a5574409342eae335ba32c2f9fa089eb4c2d443fc6254fe5d21ead0f0d04fa1e2250f54ef805c2668aae37b15a3f84";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pa-IN/thunderbird-52.1.1.tar.bz2";
-      locale = "pa-IN";
-      arch = "linux-i686";
-      sha512 = "cfd6c5d43ad9c78663f217b4ebc40b34d80cceed7e266f95dff1d70665b4e7187742621367085ae38718ba15e14bebaf8a32bc8e696fad0febbbbbf360abfd69";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pl/thunderbird-52.1.1.tar.bz2";
-      locale = "pl";
-      arch = "linux-i686";
-      sha512 = "01dec9139816be174f14aa3f6e2165bcc52e53b8f681d8fbedb4db4f428a36128b832aa36fba7af096d15e83ecedb6b3570a447cde6bf10a722c2a452520852a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-BR/thunderbird-52.1.1.tar.bz2";
-      locale = "pt-BR";
-      arch = "linux-i686";
-      sha512 = "2f616760f069944f43cc8517981a7fb793564cf30214ca62b42161aa3fcd332bf3f25761deae00697c8f544c84c3a500e9fac6b4424ef5481250fe2b8b6075a1";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-PT/thunderbird-52.1.1.tar.bz2";
-      locale = "pt-PT";
-      arch = "linux-i686";
-      sha512 = "0e27a359621fc08e1162f413aabaf406af4754e0e6947764d2b86c0c20b4d88c7eea336863ad9a9c670a6b05d84bda3678b9665f3c6c2d6b8ec71f2278f8a494";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/rm/thunderbird-52.1.1.tar.bz2";
-      locale = "rm";
-      arch = "linux-i686";
-      sha512 = "84e58d1a7ce7e4d09ed30e83c6e46b88aac1419e719e1c55aa4cb5e1521ea3dd679e0bd41663de2a12d77c489d69f5ac0d5f5f0845fb2f9cc34d8f55ca278026";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ro/thunderbird-52.1.1.tar.bz2";
-      locale = "ro";
-      arch = "linux-i686";
-      sha512 = "9272c9fba59beab72fb6f59c81180514ddfa6b6dbd050f6b789e5072beb34a0cc6c70ecc26e11bbc082e9368df98cc13923eea643daaf24051371755b0bb26ac";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ru/thunderbird-52.1.1.tar.bz2";
-      locale = "ru";
-      arch = "linux-i686";
-      sha512 = "734b738d9712dc089db8460b72404be9bb6a97944ec9dc5a286a401531ef2a30f8b7c5fc22e689b98d1f80551515996c6d7ba1a7b72290e4071a95a4519c45b0";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/si/thunderbird-52.1.1.tar.bz2";
-      locale = "si";
-      arch = "linux-i686";
-      sha512 = "3868793813b2b09177ff7c5b36e44a289f7d7ae84f65c3194703f77e0067fd975a1397a289d3921b5ba7dcfe56c81280abec81c731b369692f2135f572dcdce6";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sk/thunderbird-52.1.1.tar.bz2";
-      locale = "sk";
-      arch = "linux-i686";
-      sha512 = "101f95b2bb118bb730117920099d1f5cc5f7744960a0148a1324043c17468d5b43c5d31fc5c45111fd3fc16a6e4d207548161fb600dbc4c4b92b015e342586fa";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sl/thunderbird-52.1.1.tar.bz2";
-      locale = "sl";
-      arch = "linux-i686";
-      sha512 = "a019e01de194d51acc6695447c30fd5d9e179d91035f942b2f42a536b29d03244a7fffe2821c19e51133d39773e70b18fda79b6b19c2a33fba3d9917669b0748";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sq/thunderbird-52.1.1.tar.bz2";
-      locale = "sq";
-      arch = "linux-i686";
-      sha512 = "64bdc99eb9bb3ece6fb5de9380fdc3d0a7e2598d36a66e7542c500a63c49f0d307ebdb99599b3bc72677a1053dd5d2aaf52088605236baa7d8d29dc2b377771d";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sr/thunderbird-52.1.1.tar.bz2";
-      locale = "sr";
-      arch = "linux-i686";
-      sha512 = "8d5d2ee0f5326b9cf76dcb1cfd2401350ca5aa39efbc2afcd822eb3c9a40e477d25e0d82d8f50e569b2fed487463c6a978d12284f63764b7259bd3f479b2461b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sv-SE/thunderbird-52.1.1.tar.bz2";
-      locale = "sv-SE";
-      arch = "linux-i686";
-      sha512 = "0efd878da02ec1e81f373f7e8090445f45c11f2c9a1931ed29a52c3d8642a277be07a2d194d873f1a11dc8cdb79ed4100fd87b8f262f8fa2ea034d4c20e96e6e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ta-LK/thunderbird-52.1.1.tar.bz2";
-      locale = "ta-LK";
-      arch = "linux-i686";
-      sha512 = "555c1b5862e71e7b9112b97b137375e0a38549ea91398b1631cb6000f5881f0adbbfe230612c2bd8765a20b1d14cf538e1b5c0e9ccfeb9fc7c1258afae54503b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/tr/thunderbird-52.1.1.tar.bz2";
-      locale = "tr";
-      arch = "linux-i686";
-      sha512 = "e9c5333cd807f44d98c83514caa5fa81ef54a11362b7aee05c2496d8c79288c6707ff154229cc77d9a4e8097b13c53845a7516d04ff4c3336513183a8218ac3b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/uk/thunderbird-52.1.1.tar.bz2";
-      locale = "uk";
-      arch = "linux-i686";
-      sha512 = "a7486ab5f63cece470b2850452cac236e153c3c797622cd2d87f6c4b276cea1c43d3770e7726c459334c5ca51034a8013d78176026375ac3d760c05e1cd9cd84";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/vi/thunderbird-52.1.1.tar.bz2";
-      locale = "vi";
-      arch = "linux-i686";
-      sha512 = "6b815b2dc07fc6cb799bdf2266d6bfbef4f2623790814cae80ba1853075f7c561270e2463b1be571cc4495de5f2c36df4d716cf5754470198b97602ef3fe3979";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-CN/thunderbird-52.1.1.tar.bz2";
-      locale = "zh-CN";
-      arch = "linux-i686";
-      sha512 = "7269d75bbec19be4045a6080c4e64679b5873a89039ffa9b633f40f41ca8d98a5f5f8a1b76233102b41a38ee307a49fe0c45206df1128b1526f490a417fb60c6";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-TW/thunderbird-52.1.1.tar.bz2";
-      locale = "zh-TW";
-      arch = "linux-i686";
-      sha512 = "3741d5ebd862706b212f90a9f81ea8f0c9f7b1a4eeb74acab420e287afb930cc74748db958debb698a49fbd9d8011107ea6a1bc917606700a80eea640b40ab1a";
-    }
-    ];
-}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 0f6be0281f3..ccced87a550 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.1.1";
+  version = "52.2.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "84b54ae4401c9728c38f32f58e0df24e049471b3613f9973981b305e0ed09b2e8c2c1b5a35d4fee85ce2cf1d6fa99e80418bc216ae0d35d40e9fdeef61a6c06e";
+    sha512 = "e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89";
   };
 
   # New sed no longer tolerates this mistake.
-- 
GitLab


From 994ffc01a04e4793fcfe360117564df904d44049 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 15 Jun 2017 19:27:01 +0200
Subject: [PATCH 0728/1490] ssh module: disable agent by default

---
 nixos/doc/manual/release-notes/rl-1709.xml | 9 +++++++++
 nixos/modules/programs/ssh.nix             | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index b1bef8ef1c2..34cfe1702e9 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -104,6 +104,15 @@ rmdir /var/lib/ipfs/.ipfs
       <literal>dataDir</literal>.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>ssh-agent</literal> user service is not started by default
+      anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if
+      needed. There is also a new <literal>programs.gnupg.agent</literal>
+      module that creates a <literal>gpg-agent</literal> user service. It can
+      also serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
+    </para>
+  </listitem>
 </itemizedlist>
 
 
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 4faef2c609b..e0fbba897fa 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -74,7 +74,7 @@ in
 
       startAgent = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = ''
           Whether to start the OpenSSH agent when you log in.  The OpenSSH agent
           remembers private keys for you so that you don't have to type in
-- 
GitLab


From 1b6176e45b05cbb89cac49359ba15a15c9187f68 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Fri, 16 Jun 2017 03:40:09 +1000
Subject: [PATCH 0729/1490] gnupg module: Added extra and browser sockets
 (#26295)

Also added dirmngr and made SSH support false by default
due to programs.ssh.startAgent defaulting to true.
---
 nixos/modules/programs/gnupg.nix | 83 +++++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index c5277f40d26..68adee94f79 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -21,13 +21,37 @@ in
 
     agent.enableSSHSupport = mkOption {
       type = types.bool;
-      default = true;
+      default = false;
       description = ''
         Enable SSH agent support in GnuPG agent. Also sets SSH_AUTH_SOCK
         environment variable correctly. This will disable socket-activation
         and thus always start a GnuPG agent per user session.
       '';
     };
+
+    agent.enableExtraSocket = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable extra socket for GnuPG agent.
+      '';
+    };
+
+    agent.enableBrowserSocket = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable browser socket for GnuPG agent.
+      '';
+    };
+
+    dirmngr.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enables GnuPG network certificate management daemon with socket-activation for every user session.
+      '';
+    };
   };
 
   config = mkIf cfg.agent.enable {
@@ -38,15 +62,72 @@ in
           ("${pkgs.gnupg}/bin/gpg-agent --supervised "
             + optionalString cfg.agent.enableSSHSupport "--enable-ssh-support")
         ];
+        ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload gpg-agent";
       };
     };
 
     systemd.user.sockets.gpg-agent = {
       wantedBy = [ "sockets.target" ];
+      listenStreams = [ "%t/gnupg/S.gpg-agent" ];
+      socketConfig = {
+        FileDescriptorName = "std";
+        SocketMode = "0600";
+        DirectoryMode = "0700";
+      };
     };
 
     systemd.user.sockets.gpg-agent-ssh = mkIf cfg.agent.enableSSHSupport {
       wantedBy = [ "sockets.target" ];
+      listenStreams = [ "%t/gnupg/S.gpg-agent.ssh" ];
+      socketConfig = {
+        FileDescriptorName = "ssh";
+        Service = "gpg-agent.service";
+        SocketMode = "0600";
+        DirectoryMode = "0700";
+      };
+    };
+
+    systemd.user.sockets.gpg-agent-extra = mkIf cfg.agent.enableExtraSocket {
+      wantedBy = [ "sockets.target" ];
+      listenStreams = [ "%t/gnupg/S.gpg-agent.extra" ];
+      socketConfig = {
+        FileDescriptorName = "extra";
+        Service = "gpg-agent.service";
+        SocketMode = "0600";
+        DirectoryMode = "0700";
+      };
+    };
+
+    systemd.user.sockets.gpg-agent-browser = mkIf cfg.agent.enableBrowserSocket {
+      wantedBy = [ "sockets.target" ];
+      listenStreams = [ "%t/gnupg/S.gpg-agent.browser" ];
+      socketConfig = {
+        FileDescriptorName = "browser";
+        Service = "gpg-agent.service";
+        SocketMode = "0600";
+        DirectoryMode = "0700";
+      };
+    };
+
+    systemd.user.services.dirmngr = {
+      requires = [ "dirmngr.socket" ];
+      after = [ "dirmngr.socket" ];
+      unitConfig = {
+        RefuseManualStart = "true";
+      };
+      serviceConfig = {
+        ExecStart = "${pkgs.gnupg}/bin/dirmngr --supervised";
+        ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload dirmngr";
+      };
+    };
+
+    systemd.user.sockets.dirmngr = {
+      wantedBy = [ "sockets.target" ];
+      listenStreams = [ "%t/gnupg/S.dirmngr" ];
+      socketConfig = {
+        SocketMode = "0600";
+        DirectoryMode = "0700";
+      };
     };
 
     systemd.packages = [ pkgs.gnupg ];
-- 
GitLab


From 4a5c593e8000747e6fd06025f94e7563d915d204 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 15 Jun 2017 17:48:30 +0000
Subject: [PATCH 0730/1490] vivaldi: fix space in sha256

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index da9f6472821..3489aeb4cf5 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -19,7 +19,7 @@ let
       sha256 = "0apkwgd98ld5k77nplzmk67nz6mb5pi8jyrnkp96m93mr41b08bq";
     } else {
       arch = "i386";
-      sha256 = "0xyf0z1cnzmb3pv6rgsbd7jdjf1v137priz4kkymr8jgmpq0mmfx ";
+      sha256 = "0xyf0z1cnzmb3pv6rgsbd7jdjf1v137priz4kkymr8jgmpq0mmfx";
     };
 
 in stdenv.mkDerivation rec {
-- 
GitLab


From 5f94d85e5eb33136b1fe3081fe448351347b8d26 Mon Sep 17 00:00:00 2001
From: Renzo Carbonara <gnuk0001@gmail.com>
Date: Thu, 15 Jun 2017 18:22:29 +0200
Subject: [PATCH 0731/1490] ghc821: init at 8.2.1-rc2 (a.k.a., 8.2.0.20170507)

The approach taken to add this package was to port over the definitions
currently existing for HEAD, and making the necessesary changes to get
this building.

The Haskell package set associated with this compiler doesn't yet
guarantee that all or most of the packages successfully build with this
new compiler, but that will improve over time after this GHC 8.2.1
is officially released and the ecosystem catches up.
---
 pkgs/development/compilers/ghc/8.2.1.nix      | 117 ++++++++++++++++++
 .../configuration-ghc-8.2.x.nix               |  60 +++++++++
 pkgs/top-level/haskell-packages.nix           |  15 +++
 3 files changed, 192 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/8.2.1.nix
 create mode 100644 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix

diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix
new file mode 100644
index 00000000000..6b0cdf4fbdc
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.2.1.nix
@@ -0,0 +1,117 @@
+{ stdenv, lib, fetchurl, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
+, autoconf, automake, happy, alex, python3, sphinx, hscolour
+, buildPlatform, targetPlatform , selfPkgs, cross ? null
+
+  # If enabled GHC will be build with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+, enableIntegerSimple ? false, gmp
+}:
+
+let
+  inherit (bootPkgs) ghc;
+  version = "8.2.1-rc2";
+  preReleaseName = "ghc-8.2.0.20170507";
+  commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ];
+  commonPreConfigure =  ''
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/${preReleaseName}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString enableIntegerSimple ''
+    echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk
+  '';
+in stdenv.mkDerivation (rec {
+  inherit version;
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz";
+    sha256 = "1hy3l6nzkyhzwy9mii4zs51jv048zwvdqk1q3188jznz35392zrn";
+  };
+
+  postPatch = "patchShebangs .";
+
+  preConfigure = commonPreConfigure;
+
+  buildInputs = commonBuildInputs;
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "CC=${stdenv.cc}/bin/cc"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+    "--datadir=$doc/share/doc/ghc"
+  ] ++ stdenv.lib.optional (! enableIntegerSimple) [
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional stdenv.isDarwin [
+    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
+
+  checkTarget = "test";
+
+  postInstall = ''
+    paxmark m $out/lib/${preReleaseName}/bin/{ghc,haddock}
+
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
+
+    # Patch scripts to include "readelf" and "cat" in $PATH.
+    for i in "$out/bin/"*; do
+      test ! -h $i || continue
+      egrep --quiet '^#!' <(head -n 1 $i) || continue
+      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i
+    done
+  '';
+
+  outputs = [ "out" "doc" ];
+
+  passthru = {
+    inherit bootPkgs;
+  } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) {
+    crossCompiler = selfPkgs.ghc.override {
+      cross = targetPlatform;
+      bootPkgs = selfPkgs;
+    };
+  };
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    inherit (ghc.meta) license platforms;
+  };
+
+} // stdenv.lib.optionalAttrs (cross != null) {
+  name = "${cross.config}-ghc-${version}";
+
+  preConfigure = commonPreConfigure + ''
+    sed 's|#BuildFlavour  = quick-cross|BuildFlavour  = perf-cross|' mk/build.mk.sample > mk/build.mk
+  '';
+
+  configureFlags = [
+    "CC=${stdenv.ccCross}/bin/${cross.config}-cc"
+    "LD=${stdenv.binutils}/bin/${cross.config}-ld"
+    "AR=${stdenv.binutils}/bin/${cross.config}-ar"
+    "NM=${stdenv.binutils}/bin/${cross.config}-nm"
+    "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib"
+    "--target=${cross.config}"
+    "--enable-bootstrap-with-devel-snapshot"
+  ] ++
+    # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+    lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space";
+
+  buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ];
+
+  dontSetConfigureCross = true;
+
+  passthru = {
+    inherit bootPkgs cross;
+    cc = "${stdenv.ccCross}/bin/${cross.config}-cc";
+    ld = "${stdenv.binutils}/bin/${cross.config}-ld";
+  };
+})
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
new file mode 100644
index 00000000000..e1bdfb776f3
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -0,0 +1,60 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # Suitable LLVM version.
+  llvmPackages = pkgs.llvmPackages_39;
+
+  # Disable GHC 8.2.x core libraries.
+  array = null;
+  base = null;
+  binary = null;
+  bytestring = null;
+  Cabal = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-boot = null;
+  ghc-boot-th = null;
+  ghc-compact = null;
+  ghc-prim = null;
+  ghci = null;
+  haskeline = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  terminfo = null;
+  time = null;
+  transformers = null;
+  unix = null;
+  xhtml = null;
+
+  # cabal-install can use the native Cabal library.
+  cabal-install = super.cabal-install.override { Cabal = null; };
+
+  # jailbreak-cabal can use the native Cabal library.
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
+
+  # https://github.com/bmillwood/applicative-quoters/issues/6
+  applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
+    sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
+  });
+
+  ## GHC > 8.0.2
+
+  # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
+  vector-algorithms = dontCheck super.vector-algorithms;
+
+  # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
+  yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
+
+
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2f21d2a5d74..099e45f1022 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -68,6 +68,13 @@ in rec {
       inherit (bootPkgs) hscolour;
       sphinx = pkgs.python27Packages.sphinx;
     };
+    ghc821 = callPackage ../development/compilers/ghc/8.2.1.nix rec {
+      bootPkgs = packages.ghc802;
+      inherit (bootPkgs) hscolour alex happy;
+      inherit buildPlatform targetPlatform;
+      sphinx = pkgs.python3Packages.sphinx;
+      selfPkgs = packages.ghc821;
+    };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
       bootPkgs = packages.ghc7103;
       inherit (bootPkgs) alex happy;
@@ -156,6 +163,10 @@ in rec {
       ghc = compiler.ghc802;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
     };
+    ghc821 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc821;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
+    };
     ghcHEAD = callPackage ../development/haskell-modules {
       ghc = compiler.ghcHEAD;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
@@ -165,6 +176,10 @@ in rec {
       ghc = compiler.ghcHEAD.crossCompiler;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
     };
+    ghcCross821 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc821.crossCompiler;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
+    };
     ghcjs = callPackage ../development/haskell-modules {
       ghc = compiler.ghcjs;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
-- 
GitLab


From 791f072384a18a821d998edcecb5d7b3cd78e4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Jun 2017 20:28:02 +0200
Subject: [PATCH 0732/1490] Merge #26601: thunderbird*: 52.1.1 -> 52.2.0
 (security)

---
 .../browsers/firefox-bin/default.nix          |   4 +
 .../browsers/firefox-bin/update.nix           |   7 +-
 .../mailreaders/thunderbird-bin/default.nix   |   3 +-
 .../thunderbird-bin/release_sources.nix       | 595 ++++++++++++++++++
 .../mailreaders/thunderbird-bin/sources.nix   | 595 ------------------
 .../mailreaders/thunderbird/default.nix       |   4 +-
 6 files changed, 604 insertions(+), 604 deletions(-)
 create mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index dcb25dc1343..f59cb402720 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -170,6 +170,10 @@ stdenv.mkDerivation {
   passthru.ffmpegSupport = true;
   passthru.updateScript = import ./update.nix {
     inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
+    baseUrl =
+      if channel == "devedition"
+        then "http://archive.mozilla.org/pub/devedition/releases/"
+        else "http://archive.mozilla.org/pub/firefox/releases/";
   };
   meta = with stdenv.lib; {
     description = "Mozilla Firefox, free web browser (binary package)";
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index 9c29d1288d1..3bcc2ab003c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -9,15 +9,10 @@
 , gnupg
 , baseName ? "firefox"
 , basePath ? "pkgs/applications/networking/browsers/firefox-bin"
+, baseUrl
 }:
 
 let
-
-  baseUrl =
-    if channel == "devedition"
-      then "http://archive.mozilla.org/pub/devedition/releases/"
-      else "http://archive.mozilla.org/pub/firefox/releases/";
-
   isBeta =
     channel != "release";
 
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index aba121ba761..4f714cabf79 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -46,7 +46,7 @@
 assert stdenv.isLinux;
 
 # imports `version` and `sources`
-with (import ./sources.nix);
+with (import ./release_sources.nix);
 
 let
   arch = if stdenv.system == "i686-linux"
@@ -163,6 +163,7 @@ stdenv.mkDerivation {
   passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
     inherit name writeScript xidel coreutils gnused gnugrep curl gnupg;
     baseName = "thunderbird";
+    channel = "release";
     basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
   };
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
new file mode 100644
index 00000000000..889d931c706
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -0,0 +1,595 @@
+{
+  version = "52.2.0";
+  sources = [
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ar/thunderbird-52.2.0.tar.bz2";
+      locale = "ar";
+      arch = "linux-x86_64";
+      sha512 = "d25bdeda7f5ee563176809811c5373d5232842ddb68315f31992754100e5cc96e5a2d0427897d245fcf9bbfc647331492e9b1fa79e0adb64f4f2169dd66ddc29";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ast/thunderbird-52.2.0.tar.bz2";
+      locale = "ast";
+      arch = "linux-x86_64";
+      sha512 = "f7d3f2caa404fa5b97b7c966bb4ddd6fc0f26531802d4db9930d984d9b4ca635c41f9b025ca3c0ccba93a288da9c229b43b760759969b269082402584eed14f0";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/be/thunderbird-52.2.0.tar.bz2";
+      locale = "be";
+      arch = "linux-x86_64";
+      sha512 = "baa46c3e1d07b284e6cbca0f6c61710d4760f2a33e829056b8fb4e05b63162e4e4c7c8414dd9b3733c6983b74765e2ed2129122feadeb5972f037a1a739eba1e";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bg/thunderbird-52.2.0.tar.bz2";
+      locale = "bg";
+      arch = "linux-x86_64";
+      sha512 = "166e64acbb8464142e78222ffb00e5ee421dbfee6789f544439963f4d3476e46795d53050e60195bbce648a3400f24edcef7a8f4cb47d5c3db0441ca564ad6d4";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bn-BD/thunderbird-52.2.0.tar.bz2";
+      locale = "bn-BD";
+      arch = "linux-x86_64";
+      sha512 = "817202f39eb6b0f79d07da92b7ad62c6dda9e8d196021828303030ac5eff97d5574ba99ae8a2d236cddf2eaa6cda4c85a17f23a6f84461654e8f0856156dc6bb";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/br/thunderbird-52.2.0.tar.bz2";
+      locale = "br";
+      arch = "linux-x86_64";
+      sha512 = "46eab89538b48e02237950207ce8e3d955ba87c7ffa7a030812bafa4bb54da5113a3ff53bfa1e1b243a77c1dcf32b5aa475382e824538536a759da0448cca305";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ca/thunderbird-52.2.0.tar.bz2";
+      locale = "ca";
+      arch = "linux-x86_64";
+      sha512 = "7bcb35886fd0344c18f29d5221d765a91da48db3c32f7be4c4ca0e9808dee2f6577bfafff32e8b9676a00e488f7617c66dc6e2cce5238569c24fc1679ac6c1d8";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cs/thunderbird-52.2.0.tar.bz2";
+      locale = "cs";
+      arch = "linux-x86_64";
+      sha512 = "8bda94fbe1043168894fb70edc3d87b670830377faee7397c26805bf8c2dd23bbbb5c4b1d797468875fb653fa02b8bc211aa3766793d3f9b21a139265651692b";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cy/thunderbird-52.2.0.tar.bz2";
+      locale = "cy";
+      arch = "linux-x86_64";
+      sha512 = "65818715e994ab314ef4ac8a7d3e7c61e8918cd1d0d0ea4f51461f50d207d1c998c6452740c6f3fc07d70ebc1d24e5bebef622787d8e6f79f57ace1fc85e1e16";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/da/thunderbird-52.2.0.tar.bz2";
+      locale = "da";
+      arch = "linux-x86_64";
+      sha512 = "1b7166d185ff6fc8cbe826d11e7b96ccc4528ce6421a7ad73f82d9c9c0f35a8de043b30fdec1e6ea3cc6d48645f42173b941cd6f8cc6d526264d4301c2943ade";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/de/thunderbird-52.2.0.tar.bz2";
+      locale = "de";
+      arch = "linux-x86_64";
+      sha512 = "af6005f229a4cbc84c4f99ea1b13413d5a40ab506163786cacf513460170f77b3cb866a4b76b0691facc43cdccc39de68e9010550220f9d6cf288aac53909a40";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/dsb/thunderbird-52.2.0.tar.bz2";
+      locale = "dsb";
+      arch = "linux-x86_64";
+      sha512 = "c326aa0c775e414fbfab466be742b804dbb364f60b084b4890c783f6c9e7bbe5da05b09b1608d51535ec3b60eaad5f775eb36834dd69d66f18a4746b7fe55c68";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/el/thunderbird-52.2.0.tar.bz2";
+      locale = "el";
+      arch = "linux-x86_64";
+      sha512 = "b18fe1345c27095b2ea0afdec088b56d2cfccd57e285e881f1bbae4bd6eed6e39e76d24ada963d2337729eb93775d948195139815f694cb45978978a33682e08";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-GB/thunderbird-52.2.0.tar.bz2";
+      locale = "en-GB";
+      arch = "linux-x86_64";
+      sha512 = "622c2c3979b30f724be73b5c6bc54f944f24a797cb1c3cafd11c2a08381e692621b29eadf64438b8207dd9254bddfa8b524211f7802e83453c1eeec99ab27108";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-US/thunderbird-52.2.0.tar.bz2";
+      locale = "en-US";
+      arch = "linux-x86_64";
+      sha512 = "76505876b7a408cc296ee575dea6f89db9cafd31f58e961bd0c1c5cf021771cdaa8bb4dfa508a4bde386846f97be6eccbd499725dab8e5a692bfd48125f1bf82";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-AR/thunderbird-52.2.0.tar.bz2";
+      locale = "es-AR";
+      arch = "linux-x86_64";
+      sha512 = "38f32cb430c679c63b8c6ab7d22bf5cb2af85bfa17fcbedc94d9fafa27874b917c7f34d7ddaa6a4dfa5d1674c09b3901cc19de5e217a965890eac5ef9246b22f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-ES/thunderbird-52.2.0.tar.bz2";
+      locale = "es-ES";
+      arch = "linux-x86_64";
+      sha512 = "049e9445a850da0df09a0675cc9524d1bcb6ac4dc0ba8178df07ae4fcb9b4d9ff4677229968573119c5ca2c61a6f35da96167ece9d2da97e6b4e541bd9fc04b1";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/et/thunderbird-52.2.0.tar.bz2";
+      locale = "et";
+      arch = "linux-x86_64";
+      sha512 = "e2bb4aaa7e6a447f63456adbc35feb56e5e6ceac791ae54a2f34eb283cf3a61565c06cc09f66fcf01d722b8ed0972e51da33a94dfd333108fee2e967346eb9cd";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/eu/thunderbird-52.2.0.tar.bz2";
+      locale = "eu";
+      arch = "linux-x86_64";
+      sha512 = "eacfbee76dc62b15e9a807db9409d63b2991f976faa109ef5991b2a6befadfeed8c341a448c0af84d1fc8f6914e4d515860294f2e54bb97f4ce2727c4d73a030";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fi/thunderbird-52.2.0.tar.bz2";
+      locale = "fi";
+      arch = "linux-x86_64";
+      sha512 = "c6ba259c3729535199905773674800f2772bf952a8596e11eb73785a9176072434ae47abb40c35e8cb0f66b4c46162d48ae699985857ad9a208c645cf76f0189";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fr/thunderbird-52.2.0.tar.bz2";
+      locale = "fr";
+      arch = "linux-x86_64";
+      sha512 = "eacdc3ce1967ef7913012c448c4a4898463c80fac41fb5bf16d924eb31ea2e68e7ad46ee88b5ce107e85a18789a19e05006ae4786a5d9e9a2f93c05013aa9f4a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fy-NL/thunderbird-52.2.0.tar.bz2";
+      locale = "fy-NL";
+      arch = "linux-x86_64";
+      sha512 = "450011ce8012918dc8196b68a32f4b2ab27dd893a15ebd621fa17923ba5a63bff6fb634e1cc22cca3fa64d61dcc23565ceda518e04e7f92d91a0bc86fcd0dda7";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ga-IE/thunderbird-52.2.0.tar.bz2";
+      locale = "ga-IE";
+      arch = "linux-x86_64";
+      sha512 = "ba8271e67b61e92bb819b0739351cfbfb128ecd3842f1c7ad69f7e9c26f4d52c10cf71f5d8cb45dc1f30d3168dc0acb991be4ef208e6947c3c36f4e5c0071f69";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gd/thunderbird-52.2.0.tar.bz2";
+      locale = "gd";
+      arch = "linux-x86_64";
+      sha512 = "324044728236a52fe136c62f250218d6d2e364bda7b9f781a5f1c05561e37e09c9180733be0dd69f170e2229924c9ff7f2db10def13b86a7d21d5801d171a3b0";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gl/thunderbird-52.2.0.tar.bz2";
+      locale = "gl";
+      arch = "linux-x86_64";
+      sha512 = "a31f01bf15d17d8efc645ebe4184bf4b5f02107f24765721eee87dc10463c7e8219a1ba3d60468e132f6b934f6f138b441f94d3d3e790f2fbad45107210f69d9";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/he/thunderbird-52.2.0.tar.bz2";
+      locale = "he";
+      arch = "linux-x86_64";
+      sha512 = "c8356bc183eb9837c3049288d63e1c13098143cf7a80cc5452d9852ffd2407eb85aa5ed574063700f93fb503c53c2b733a1bebc62cb890d408af75f8e4970856";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hr/thunderbird-52.2.0.tar.bz2";
+      locale = "hr";
+      arch = "linux-x86_64";
+      sha512 = "8ed3f1c84f28a4435a3a6c9b136d4c27f6fdd3a41089b34afa04b74d5ca15cd535e179070cfdc862d3b3f5559fbafa7ae6c620f448afc8279765aa6518cdbd9c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hsb/thunderbird-52.2.0.tar.bz2";
+      locale = "hsb";
+      arch = "linux-x86_64";
+      sha512 = "bd14c07d1c2f5b8aebbee64914db544823ab90b70cc2a4e5d9fda28e9611310a5d6a6fb0f17d07e60534e9d5082506f0ffe22b1b4da1351f5657620612add6b5";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hu/thunderbird-52.2.0.tar.bz2";
+      locale = "hu";
+      arch = "linux-x86_64";
+      sha512 = "9cb1430ef3036f4ce06d0734775e83ec09c551ce573cf3b50b5a2484f411e76ca09ae0295d6285d15e1f8a71f27c804f9dc328a4e4b534fbad34a97676ec2d7e";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hy-AM/thunderbird-52.2.0.tar.bz2";
+      locale = "hy-AM";
+      arch = "linux-x86_64";
+      sha512 = "0c1d84777286fb55c2d8d25d5f5abf5498575bd09261331cca680e1f18497dab80597e5a132618019c5d03350cc4d49f4856053b8d255f8a1d56d1029434b776";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/id/thunderbird-52.2.0.tar.bz2";
+      locale = "id";
+      arch = "linux-x86_64";
+      sha512 = "8adfabb7885b2442c9dd8ee1128675865690bc632185da20caa894b38c388cfff34a696c4932ffaab2217dd4c742e8c35acb2e10bee39a561aa83b19cce1ad6d";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/is/thunderbird-52.2.0.tar.bz2";
+      locale = "is";
+      arch = "linux-x86_64";
+      sha512 = "b5608a993d5a2a50a38516ba346cef8aa5f173f81eda2b29c06b77e8cc8964dc174fbd9a67294a66caa366956a0ae79aaf8c0e0d612935e871174b1073647f70";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/it/thunderbird-52.2.0.tar.bz2";
+      locale = "it";
+      arch = "linux-x86_64";
+      sha512 = "06bb846f018d1f8cc1bbda5e707b9aff31bf94ddd8a7aaa699c67f1c18ea8a4c92657587ae6c9a07571d2a6371d50e31b1000bec719aa432404924938a162274";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ja/thunderbird-52.2.0.tar.bz2";
+      locale = "ja";
+      arch = "linux-x86_64";
+      sha512 = "9019ec44f39918796c5da7fb2b23e19918e20d5688b8e55aa986e2b8a4f2abaf6ae87149b1bbbdedd2227c3152f48e4042078c979930db5d521d3a641312599e";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/kab/thunderbird-52.2.0.tar.bz2";
+      locale = "kab";
+      arch = "linux-x86_64";
+      sha512 = "1ed0950fd1b5cf82efe2c031abbb8d34ab3a0ef93182467592a9f77610bf494ed61a2e1d0117132abd5bd0f835bdcad75bf202588097210acdfbd67a1be5caf0";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ko/thunderbird-52.2.0.tar.bz2";
+      locale = "ko";
+      arch = "linux-x86_64";
+      sha512 = "65ae48fbc79da6e3e20f5d325d4c93b2e945a95eaffe572c83cee08cefbe6718bd202c7e54095ef74d3069148b58aea1d2b0b795e94230b4da99b9a42fb39155";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/lt/thunderbird-52.2.0.tar.bz2";
+      locale = "lt";
+      arch = "linux-x86_64";
+      sha512 = "f8870ee532dd73a0a387c00a1295209ebb965b3e7a63abcce7f17457c38636a07334ff7f4dd99c60349e748510645487ab3761efdbde985d1f3cd9038613cd05";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nb-NO/thunderbird-52.2.0.tar.bz2";
+      locale = "nb-NO";
+      arch = "linux-x86_64";
+      sha512 = "d4316434d0e8a824b3502bd413abe112bdb9b6da28acb39127ca83b43f8fa3f7b80bdde15758f2ca5a5013abcb374382ce79dd16ea48342fb6f6283eb242e162";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nl/thunderbird-52.2.0.tar.bz2";
+      locale = "nl";
+      arch = "linux-x86_64";
+      sha512 = "da6c7cf68f5502ea29a1600f2040953dcd064859a9b82856ae419472ae039bff5c2b31f56c282961eb02ae0c86c8ce63131fdc4aaaa712da03d76ee05726ba0c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nn-NO/thunderbird-52.2.0.tar.bz2";
+      locale = "nn-NO";
+      arch = "linux-x86_64";
+      sha512 = "9a5203e6f451aab318500eea9b7fcbdf70fcd22d6cf42e838926fa9fae14176f1abee875ac085823adeb40d2fd2e2992d538c34ad817b408fdae19248302aa88";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pa-IN/thunderbird-52.2.0.tar.bz2";
+      locale = "pa-IN";
+      arch = "linux-x86_64";
+      sha512 = "43e86e758f547363bfd5bb1c9c16506bbf6314354aee4265fed588fc29759d87482a86c442ba9d3e16c50477c4a5542b02a1539de8833052ee23811d61bcdba8";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pl/thunderbird-52.2.0.tar.bz2";
+      locale = "pl";
+      arch = "linux-x86_64";
+      sha512 = "d418735505f1152a3cf1a1c2ff36d4cba4801327b1f01e3743c6411d30b7fdad7f0ae72fa78de9b356bfb712bc834c6eef46df9c251be7d18119f5da423f3ca1";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-BR/thunderbird-52.2.0.tar.bz2";
+      locale = "pt-BR";
+      arch = "linux-x86_64";
+      sha512 = "3e33431860b0f815153845ebde36de52d8bd0c2e1828e127009b467c33710c70d38c4b9f70c5572e09778b17c30f7688f1e802e48ce7cb0a6a015d0fa1e26648";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-PT/thunderbird-52.2.0.tar.bz2";
+      locale = "pt-PT";
+      arch = "linux-x86_64";
+      sha512 = "953143e100d3ffcb76224da98ee5ae1d98342d2806565ab048fbb6d8de65f6a02c3b6dd87aec4cecff676ff724d4790964b2e82ebbc64a3eae8beb343ebab211";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/rm/thunderbird-52.2.0.tar.bz2";
+      locale = "rm";
+      arch = "linux-x86_64";
+      sha512 = "b5aa940b99282bd84748e47d8f51a53e250d20cf0c7b68e5f66719ae88d9c241f290b2d637fe3e711948f9a6c6df8304cf9514599d73e387eb268a1c8f8c8397";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ro/thunderbird-52.2.0.tar.bz2";
+      locale = "ro";
+      arch = "linux-x86_64";
+      sha512 = "26dc1b0c57b468ba815154b035c3fe382051b638bdc673db69a88c879a8524f55a24626c655026cb67c2688a29b6c946e2b495cd7dec4f16d8fbba21d5a493bb";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ru/thunderbird-52.2.0.tar.bz2";
+      locale = "ru";
+      arch = "linux-x86_64";
+      sha512 = "5d17e85ec3eeac8ea3916f0dc71be7560bb1c4877c505a1f29421a9d496d8aafe48b9236c225f1de48a4dffbc9ed536f91dffed7d6c823480ef1e0c5b6e400be";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/si/thunderbird-52.2.0.tar.bz2";
+      locale = "si";
+      arch = "linux-x86_64";
+      sha512 = "d4599a3814173d8bce2f24b6b015492d7b24547d4e53d17cad45cc9c01c8b65be3447f8b89ab8ef2f573140ef7e1aae7eef7943102e21611525abc6efcd02694";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sk/thunderbird-52.2.0.tar.bz2";
+      locale = "sk";
+      arch = "linux-x86_64";
+      sha512 = "a990104e68df9c2bf833c821eefdc1cbefc16f6e782bb8202683261f395f33c419afb967119ced710dc08966978043731c1adcf16dc716ff6eac8275b03f1834";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sl/thunderbird-52.2.0.tar.bz2";
+      locale = "sl";
+      arch = "linux-x86_64";
+      sha512 = "2fab7f52ceebee1895e520c6d185bbb92793a31c52ed2398731c0cf36e3888a58d945d92f5777fc87a0a55b96418406a0be15cdd95b0f54482e821ea1cf29ced";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sq/thunderbird-52.2.0.tar.bz2";
+      locale = "sq";
+      arch = "linux-x86_64";
+      sha512 = "f201861a30f993306378043ecab288970c4a311a91a3d232cdfe9a4d9339052f026ceb35bc6dbc2bb452f58faa5e3eccd273b87e96af5cfcf292dfcf94612077";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sr/thunderbird-52.2.0.tar.bz2";
+      locale = "sr";
+      arch = "linux-x86_64";
+      sha512 = "6f8962d8c30086434764f0d037801bfefeef13c67e46f2b639bc4f5a93ac0094630af375bffcc54574d50ecd8c7b5c5decdd9e2083666dc4394e6237fac0b746";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sv-SE/thunderbird-52.2.0.tar.bz2";
+      locale = "sv-SE";
+      arch = "linux-x86_64";
+      sha512 = "b29f506138f62350717ba2d2881cf8852dbef0c9797da64b9d5d9affa884cd1057483e2d0e357e967d9567ff4e861d1ad79596b39aa02a36087041e1f94d9d67";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ta-LK/thunderbird-52.2.0.tar.bz2";
+      locale = "ta-LK";
+      arch = "linux-x86_64";
+      sha512 = "3bc50fdc95776aeca2de94fa1b895d5a17cedafb95aa08f2d0100fbb4c3acd31990b96a57fad451c82b56d8cab7ea5066642da7b000857f00ba8f0bf94051f5a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/tr/thunderbird-52.2.0.tar.bz2";
+      locale = "tr";
+      arch = "linux-x86_64";
+      sha512 = "8e1481a03ba5de00bc64aa252f779dc0ceb14c238985d11bb49467a719ca88bc4e7946086b039951f03ed43e11a15a5bbe98139d158f63dc3cdbf01686ec91e2";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/uk/thunderbird-52.2.0.tar.bz2";
+      locale = "uk";
+      arch = "linux-x86_64";
+      sha512 = "e9bfce635b1d56d646baf06bc642a7914846a6a796e983c4b0f78b912833ccee850719f0857ceb7199d328415a976b436706d72c95f01da1d0d0b4c0c5d0d732";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/vi/thunderbird-52.2.0.tar.bz2";
+      locale = "vi";
+      arch = "linux-x86_64";
+      sha512 = "ea989bcf275162c8d72ad595bee767b9652f192ac18f61119cae8f084f9a25c0d0a83caa14cbbf901fa675f1a0c0a6b40ef46454f9c8f1fc3d5173a0ef1397be";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-CN/thunderbird-52.2.0.tar.bz2";
+      locale = "zh-CN";
+      arch = "linux-x86_64";
+      sha512 = "35637dedad6da1662057fc1506b2e21bc6269eb0256e332ff6b12bcdb71906e28dc0f361bd7aded2fa52d982589f0e319667acb7ccd405e2fbfa8ba991e5aeb2";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-TW/thunderbird-52.2.0.tar.bz2";
+      locale = "zh-TW";
+      arch = "linux-x86_64";
+      sha512 = "286ed00a024029f7e6ce30709cac3da3d6bf00576248622a09bd9ce1ae2e965a0fe158d718d35f1e088f51ac4e271d57aaa98446c87c0bdcdecfa0d36d988e92";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ar/thunderbird-52.2.0.tar.bz2";
+      locale = "ar";
+      arch = "linux-i686";
+      sha512 = "8783d0cfba31ead11e49bf1a8afb5b66b1387b29681acf3c63217ba4a399a6fe496eb0357e0871c98e8b6465abc6539e6ccbd9d40e799e04674f3ab2dee25390";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ast/thunderbird-52.2.0.tar.bz2";
+      locale = "ast";
+      arch = "linux-i686";
+      sha512 = "213f0457760072fd2e6cd2daa56677d8b67b8c345f44faebb2623f073ecf141ba4d30d2176fd5680efe91e46086b4add86462385fe5b9e72978cf2828eb8ed68";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/be/thunderbird-52.2.0.tar.bz2";
+      locale = "be";
+      arch = "linux-i686";
+      sha512 = "645d7eceac4d98ab37b8c85c2d0c58499bdba1c8db495690bc665c80b5aae414b0a8caad16931a74768137812f3ba8ce173f5080e95bd44e95e51d6f544cbf03";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bg/thunderbird-52.2.0.tar.bz2";
+      locale = "bg";
+      arch = "linux-i686";
+      sha512 = "b9030a61e8d964dd18362e472d18d7a9d6a7636679c016bca82b254b06e221c6551aebb166f829977fb4f0d1809b18b820cb1d842e6949f44dd4e5becbf98651";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bn-BD/thunderbird-52.2.0.tar.bz2";
+      locale = "bn-BD";
+      arch = "linux-i686";
+      sha512 = "fcf50581bb2f1548f4aab01b8f7a89e351e642a49ca76e05fc47d77b9e2459f2ff700501079180b92120727ab2ba74c3c6990fc7d6d9018b9ee4ec1d27c42aaf";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/br/thunderbird-52.2.0.tar.bz2";
+      locale = "br";
+      arch = "linux-i686";
+      sha512 = "5359fa3b6f745db0da286a0180773d3fd43c446c78d8351cc0c5589ade332fec5ccb6106a84ed3bc96e34ec7ca2d72f93c22f6653aa39250df05b0e39108fa89";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ca/thunderbird-52.2.0.tar.bz2";
+      locale = "ca";
+      arch = "linux-i686";
+      sha512 = "e5d6d77ad204d279abcd34b9734ef5489d5b8522558af7cfb26de77fc0d22a5ce669dd6ff9fce7046745aa9ef75323fadaa70ad3ca4fa0f05aad85add6c1e7fd";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cs/thunderbird-52.2.0.tar.bz2";
+      locale = "cs";
+      arch = "linux-i686";
+      sha512 = "4bee0154e7f1658ea88c7cf7cb5d89e354d29516c727090bd704945ecb2c0988551e98de2c8b44d5899e44ae141a6e3c230550392d34b5dac121cd1c4d6ce994";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cy/thunderbird-52.2.0.tar.bz2";
+      locale = "cy";
+      arch = "linux-i686";
+      sha512 = "23779727198092d4d8e7ed1d40615b020858999ae5023ebf81553dfdc62b7cc03cf864eae262450d75d6088f6b283ef7f791073901f5fda367df96e291e9537f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/da/thunderbird-52.2.0.tar.bz2";
+      locale = "da";
+      arch = "linux-i686";
+      sha512 = "e780597823f156e273832ff731adb2cb39a58e6e232d910f9f0a3b05dee68411ee3e8345462137d74a8aa2a6dd0c3d5e93bb889bd425c051ed7befcd4da5c711";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/de/thunderbird-52.2.0.tar.bz2";
+      locale = "de";
+      arch = "linux-i686";
+      sha512 = "1c35b4aab4bb27569955f3c29034e8c301c32d24547075c4662e162bfe1c19feb602b3fcc3c561956651328fa33605f60ed29ae52b50b06eecf39e43e82663e6";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/dsb/thunderbird-52.2.0.tar.bz2";
+      locale = "dsb";
+      arch = "linux-i686";
+      sha512 = "59fb994bd8b2db74ae5024e8c2f6c859b93afd247a159c552bffe8c2337a0d4229bd17433635f8c87420af614c7725af7b0ecd144938654f9372fe6d39a4152c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/el/thunderbird-52.2.0.tar.bz2";
+      locale = "el";
+      arch = "linux-i686";
+      sha512 = "87e43e3c66db44c6c1d659eff81b72bae4d6961045c37ce776531ab6e4f4a3e6c8d3774f39fd437e5ca4cc289bbae25fae8dbf8ed3e21aa2327cc166d4f17f47";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-GB/thunderbird-52.2.0.tar.bz2";
+      locale = "en-GB";
+      arch = "linux-i686";
+      sha512 = "b397fb3142c0693282405d9e6d4515f368b3c6aba581e6eb0712c3d161f8fc9dbe034a913a67ea034dd89860b32072f82dbf2b767bd0c360f3bc9c0c8944d045";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-US/thunderbird-52.2.0.tar.bz2";
+      locale = "en-US";
+      arch = "linux-i686";
+      sha512 = "05926a74f6ecef5caa43884a3fa2cdf85f40c53da58ffa24cdd2c8c31efd1b3e90a0d06ddba33d612a3b88f31d4c72fe92f49e31b4f3ba3479c510a02d91eb33";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-AR/thunderbird-52.2.0.tar.bz2";
+      locale = "es-AR";
+      arch = "linux-i686";
+      sha512 = "4652c005c0c28760d1a2657b691b13fcf7882763cff4ff05313d1dc5786661e76ca74a4fa23e1e71e4315818c9c2a386407151a996fab4d2f3bf343a353038db";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-ES/thunderbird-52.2.0.tar.bz2";
+      locale = "es-ES";
+      arch = "linux-i686";
+      sha512 = "64e8eedb59df8ebc5a568aa05d0df5217a3c91311455a090b4614dddbb2bd0d09add02e11c712b84696f3d203bb5503959dee9ec8e0aee7ba5d0ef2e606942a4";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/et/thunderbird-52.2.0.tar.bz2";
+      locale = "et";
+      arch = "linux-i686";
+      sha512 = "2773894ea50cb0bc889ad1cd887bd7c34d594a19ae69fe48cc181d5bb31a9a15bf6e0e41fa1493ff86e481715e888d35db5b100b22516b187cbbb4e35f36fdbb";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/eu/thunderbird-52.2.0.tar.bz2";
+      locale = "eu";
+      arch = "linux-i686";
+      sha512 = "8a73144e9085f4f07db7d24da388808ebe94b4cbd2c3cb1f327ed0c44a3144c94fd61171b74c18c3e4ee72fd809791a8c942adc0a4b3bcaebaa2f02dbf26d572";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fi/thunderbird-52.2.0.tar.bz2";
+      locale = "fi";
+      arch = "linux-i686";
+      sha512 = "ba53c735c136901bbcfebff6fa646d884aaeb919a77744c1ec412a109f39853b2d74d70a56f85e4bdc3b7780475283284c46b0db79c64980a7655eb8f0bbe0f6";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fr/thunderbird-52.2.0.tar.bz2";
+      locale = "fr";
+      arch = "linux-i686";
+      sha512 = "fe93f41bbf357eb1b60c0418dd64afbb37310ec25aeb66521472f84eebc6205d87d19090df6f38de3d9fee29f7f961e68e9794a65f51a0fcd103a40a16a919fa";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fy-NL/thunderbird-52.2.0.tar.bz2";
+      locale = "fy-NL";
+      arch = "linux-i686";
+      sha512 = "1739f96789414049ebb5a8fa47f0455a630bdfbc9757fd96f81a8fe0fbf6c0b522bdf04a315b590c968d1832ee2faa2bdd98fa4ef6e86cd8ab2d0a338e8a47f2";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ga-IE/thunderbird-52.2.0.tar.bz2";
+      locale = "ga-IE";
+      arch = "linux-i686";
+      sha512 = "b42fb3d2cb8ba5be74d3f4212aa80fbf2af0366bdd9eceba69555eb766f0a96c1a8092a3b1e39c0ddc8bae7cc7efb59f56806f90c0de95d3073db15e3d894a20";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gd/thunderbird-52.2.0.tar.bz2";
+      locale = "gd";
+      arch = "linux-i686";
+      sha512 = "0921d25bd235d2a234c75f24297ef38568d0532fbe1dbfe98f2b9ca3641ea95db6c4df0dba3f8a8313a2fd169d2d86f7adab21db795a96f68fa566117db2c2e9";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gl/thunderbird-52.2.0.tar.bz2";
+      locale = "gl";
+      arch = "linux-i686";
+      sha512 = "7fe9346fcb26a7d4a96cb6cd2d804874bdf2f3f89c9b9791742f9a2a03a7a865fc20766f8618c04e7d7fbe1fcf0fc907b4db5834770218f4e1fbe8d8df37e94f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/he/thunderbird-52.2.0.tar.bz2";
+      locale = "he";
+      arch = "linux-i686";
+      sha512 = "7082a591a52e8a0e7bf112dec08dc3e130791eebee6e7d39baf052f40b8b9fbc350518b7785f3bf7ec62df8dbe05a256fa322714ba7a4f704a9cddf40cd4b11c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hr/thunderbird-52.2.0.tar.bz2";
+      locale = "hr";
+      arch = "linux-i686";
+      sha512 = "397a1214ab27b187df6129f6f2f863ec1b76ce2af41c0ef5650f255451c57f07741f6a7d0674ad38432c7ea9c95fc2b36606d31defc698fffa4b676549b2c197";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hsb/thunderbird-52.2.0.tar.bz2";
+      locale = "hsb";
+      arch = "linux-i686";
+      sha512 = "f0c76d90ae2b47e8d5c66a536ee1b2572f60164f76424b61b491326e719f4454448a9af4b6ceb8e1055f7e44adb6490a0fc4df086c344d160861d877766e227f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hu/thunderbird-52.2.0.tar.bz2";
+      locale = "hu";
+      arch = "linux-i686";
+      sha512 = "d26eb645574d9298c75bd334371fc7a4baaa9b358b37c5d8da6e61b6d8fdf3fe165a5ea1855a840a742c6b19e3a15fbe7879e43bb29b187daffa63c59a863e06";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hy-AM/thunderbird-52.2.0.tar.bz2";
+      locale = "hy-AM";
+      arch = "linux-i686";
+      sha512 = "add66a00fd3a8be7c71276d02588ffafd0ed0a8b2e4875dab3b82e4fe9b2be3964096509ce6b0e67350f62cc814b7c7ed069f481516f72f19a8039967123346a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/id/thunderbird-52.2.0.tar.bz2";
+      locale = "id";
+      arch = "linux-i686";
+      sha512 = "b793e65e9e9f8d30ad0193f019acf33bfbfb165313a960f120bfabeb4df0c769cc9fc5b7e34ea05eaa085a5c0872134d606862b381852d04748c2e97ed1bf9f7";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/is/thunderbird-52.2.0.tar.bz2";
+      locale = "is";
+      arch = "linux-i686";
+      sha512 = "d4f163358a2c8830e3a77a5a82b8ee42d2aff39f19fb95171a249d1cde5119c66ee29bc894f5e6ea023c34e030282194025b25c04af25f647df8745d2b8aa2b9";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/it/thunderbird-52.2.0.tar.bz2";
+      locale = "it";
+      arch = "linux-i686";
+      sha512 = "9e73d51cfac30480fe0ef46c02df12c771fdd827bf4c2971b99cad7b3db42d3d60a2355c20c0b3601c7d27be5b9c2d1748a1e3b8954523ef919d120429153103";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ja/thunderbird-52.2.0.tar.bz2";
+      locale = "ja";
+      arch = "linux-i686";
+      sha512 = "ce3d8342c0fc63a9c6ab10a2d15f6ef79d8d827cbf542cf0eead9d01d1a26567edb48269ba2ed66dcf81bf83e35a120190614f740898181a3b2cd7fcbfd5e739";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/kab/thunderbird-52.2.0.tar.bz2";
+      locale = "kab";
+      arch = "linux-i686";
+      sha512 = "9ef94353b58ade84737debbd58a26aca9b8c5358c3fb852f2dd925e9c8eec46f091d4edeb0a4fe46da45eb9860ab76f43a97605085907fa79d2ba90751ea64e7";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ko/thunderbird-52.2.0.tar.bz2";
+      locale = "ko";
+      arch = "linux-i686";
+      sha512 = "651ab9ae9b966e10f420802937140a689a3c925a67732cc3082e8f265d2f98fe88195188632386d64f892338b1c4ba659c7e475951810d5b6ee48a7339155413";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/lt/thunderbird-52.2.0.tar.bz2";
+      locale = "lt";
+      arch = "linux-i686";
+      sha512 = "f64c0869033ac939538f982ff66b0a88cb566e7000838e549d63fa6509afe8a29865fce3cb6c7fea84c78b5ffd07a4f8b11b44b14c234ae957f22439f7a84a99";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nb-NO/thunderbird-52.2.0.tar.bz2";
+      locale = "nb-NO";
+      arch = "linux-i686";
+      sha512 = "9dbd31177470ba94a646d7d63890dcc2465681a4c6fc684f7cbe61eeebc788c03a863ed5a01a1baeb26ffa61d7af4631bebd74261c22ee1a109ceaf928ce4925";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nl/thunderbird-52.2.0.tar.bz2";
+      locale = "nl";
+      arch = "linux-i686";
+      sha512 = "3616bce4895db1c2f3b02773b05586bf6e38550ad7abd5beb3b31a6c5b414120972b5475c080bed782e7f2b09fe47bde3e5b41f4c3fdb7ffd823767c976dca0a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nn-NO/thunderbird-52.2.0.tar.bz2";
+      locale = "nn-NO";
+      arch = "linux-i686";
+      sha512 = "4ec009d5aca053ffbbb6cd5c84572f0305f22f33cd24eec13eb3fd04aa4eccd3447701edb53e4929914ebd2f7acc8e3d7f8e5d91c9e7a7f0b9e9c18493f74d55";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pa-IN/thunderbird-52.2.0.tar.bz2";
+      locale = "pa-IN";
+      arch = "linux-i686";
+      sha512 = "584c5cf7fc62f4f6435d9ed2ba9aa200012aa65e7fcd249aae10dc2b3dde8b4db724b11beb206a727f3eb2f60e4a8c0e5e1abbd4e621645d651cba449bc4a474";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pl/thunderbird-52.2.0.tar.bz2";
+      locale = "pl";
+      arch = "linux-i686";
+      sha512 = "aa02a2910513159c2621dc17aff373a8c2124bf9aebb24bf54c239d823d0080a1c05c330185af5dce21084d7ac9060a2b8daf890a3227650416d82afd0fa8e9a";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-BR/thunderbird-52.2.0.tar.bz2";
+      locale = "pt-BR";
+      arch = "linux-i686";
+      sha512 = "b5b2654bf153bd7f7c85534b95f836892550e519e254312584b22981bcdf7205f31babb5cf32033f7d676eee2bf2400f88503b52268f2ef10286da82b2713704";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-PT/thunderbird-52.2.0.tar.bz2";
+      locale = "pt-PT";
+      arch = "linux-i686";
+      sha512 = "3d557b432531a757bad6f18754b9d2fb2359bdba49f20faf797f7eba821926aeb8476c89a93b475273514bf26a6f471637505c5eb8a1cc08d1cf830b28b21fca";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/rm/thunderbird-52.2.0.tar.bz2";
+      locale = "rm";
+      arch = "linux-i686";
+      sha512 = "434122ff7524630ec45a7e6a0e5f90e74ea1397b31bf67ce9e3046f8a31114a8320e56a5dedf1686e2eebc8c648e4a94fd0cdbe523bdcd6312448100d548e302";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ro/thunderbird-52.2.0.tar.bz2";
+      locale = "ro";
+      arch = "linux-i686";
+      sha512 = "6f2c74d119ad7380961c50d5bb91afd4bb9455737776a08eb5168c17e83143fefacfeaa3b98e1816d1fe96a7f2022256cd2acf7b697508e4139d792562be2176";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ru/thunderbird-52.2.0.tar.bz2";
+      locale = "ru";
+      arch = "linux-i686";
+      sha512 = "d9eff15876619a1bf0b8467847df18b0dba20c598e05428037b81e0cd90797b8baafc44541fed2a29dfb27075da19730919159495712099a54c9b488a693e3ca";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/si/thunderbird-52.2.0.tar.bz2";
+      locale = "si";
+      arch = "linux-i686";
+      sha512 = "a2e58a6b2632f8c2f6eaf6113e2af9e98ea222c5d2c98f0cfb4443804ce260bb3dba64bd5165590563fa946b500bbaed4341629eb25ea0c5388c61c69f4be5cf";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sk/thunderbird-52.2.0.tar.bz2";
+      locale = "sk";
+      arch = "linux-i686";
+      sha512 = "0b26b3848864def3a5b485c2d67d3c907b58d9977ae91db58d91218da278243c04eeac781fe0063b762d0797809dcbee18010824aa5d25926f8f48011e2a5bb4";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sl/thunderbird-52.2.0.tar.bz2";
+      locale = "sl";
+      arch = "linux-i686";
+      sha512 = "7158c776ec3776ac269402973482e2dfedb3c17aeac11fcae3bee6a982717443068223cc901ee71e6b7a42a8073f05d2a54047804997d992761fbe71d46bd223";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sq/thunderbird-52.2.0.tar.bz2";
+      locale = "sq";
+      arch = "linux-i686";
+      sha512 = "1a838db31f4db574669987614dfcbd5f7f1eb061dc4f2fd0c9ca206d5a5291ac348efce3ce59b30f89fdc375e72467531d9d96b8ce43ffe28e92916f2864908c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sr/thunderbird-52.2.0.tar.bz2";
+      locale = "sr";
+      arch = "linux-i686";
+      sha512 = "beb9eee26aa5474ac5e70c168e2ee32c84216d919528c9edce4d45ab6c522d5fc888ba2f8c57cfcd47d299367ddb7c367dafc9ccd3d29c5700de28eb2efe08fe";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sv-SE/thunderbird-52.2.0.tar.bz2";
+      locale = "sv-SE";
+      arch = "linux-i686";
+      sha512 = "e4c2320e547b2e61991feb586b7f9e4180cbeb88dc90cd0dfd2c026b062e4e1858d1d1b331cfde1e373cacec2231f7cb2ba61b5e4ef02a36802edbc96b39cf72";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ta-LK/thunderbird-52.2.0.tar.bz2";
+      locale = "ta-LK";
+      arch = "linux-i686";
+      sha512 = "aa42add8ba31edb5a40fd62304f10ac55006918d5196f71ca0330c3ca52dbbf4d9b5d39a07e977ee89c6b913e6ac4d4a4c9460da194b41760826d96e89e7bffb";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/tr/thunderbird-52.2.0.tar.bz2";
+      locale = "tr";
+      arch = "linux-i686";
+      sha512 = "ceb90e08e906d5a2520152c40c4e32ab85da31c746ea285280b6e9bfbd60e9178886799357f39d54e0e072c616059ae7fe1948c39f6152b5f0d1b196185c8475";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/uk/thunderbird-52.2.0.tar.bz2";
+      locale = "uk";
+      arch = "linux-i686";
+      sha512 = "9d9fc486d556dbe3a216a3d4e822750cfa1cd0348af37ddaa5a19f9c390170e348a41b8251fff1499d2dc6d92feb34061286ff5400a4f9b6ed4fdee27064078c";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/vi/thunderbird-52.2.0.tar.bz2";
+      locale = "vi";
+      arch = "linux-i686";
+      sha512 = "010bc7ce4ee4329857291796e2077e0872593f2b52799b1524720fa7fca11f2f4b760610bc97db171421552eb59a36725f80d4852cd77d30c8e7eb6c6c523d2d";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-CN/thunderbird-52.2.0.tar.bz2";
+      locale = "zh-CN";
+      arch = "linux-i686";
+      sha512 = "c07d2559296acb160c19af2db9f516254d33e1d55c78b2397d2c28764a8296e3da0b74409d48702e889bbf34f06115b493bbcea2666ad8b4884ea01fed6ad12f";
+    }
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-TW/thunderbird-52.2.0.tar.bz2";
+      locale = "zh-TW";
+      arch = "linux-i686";
+      sha512 = "8fa1da0c35584cfb8013df9e86a37268e6ffed1ee5ba4617d3db185975b874af5dba3f3af5498b8ebfdf85e40409fb9fee8d517f84f4942cf69deaa94f3c64a1";
+    }
+    ];
+}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
deleted file mode 100644
index 78084753974..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ /dev/null
@@ -1,595 +0,0 @@
-{
-  version = "52.1.1";
-  sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ar/thunderbird-52.1.1.tar.bz2";
-      locale = "ar";
-      arch = "linux-x86_64";
-      sha512 = "41e7b02fa088054e59d68abf636b376837519502273ff9e25ba18d220e8e35927db2a7795354f997ba0f980f33a74338128999666dc0ea730babb4cb3077c17f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ast/thunderbird-52.1.1.tar.bz2";
-      locale = "ast";
-      arch = "linux-x86_64";
-      sha512 = "772e90be4cd4d10c1fc98df69d20509c954feb29c64a801d907f4944c429844d375ec241b8c45fdac375cfaeec3adfe7db81c2fd10e592cceb066b6c23c2c2e8";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/be/thunderbird-52.1.1.tar.bz2";
-      locale = "be";
-      arch = "linux-x86_64";
-      sha512 = "76832c00106c68a9b48c4892a11f7b48384d7934e7cf410eb2d7891f79303af29a2a94a3ac377bcda36a0894baf9c3768cfc62c3ebef0c640291c1b70d23e55a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bg/thunderbird-52.1.1.tar.bz2";
-      locale = "bg";
-      arch = "linux-x86_64";
-      sha512 = "a8776f1bb3c3d1c34b0a1d538cd70cfefb283031f372d0c7b1bc8bfe9dc39f240c746525a8a52968e060024282642a634488d7a8b30509b830232a63b3111fa9";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/bn-BD/thunderbird-52.1.1.tar.bz2";
-      locale = "bn-BD";
-      arch = "linux-x86_64";
-      sha512 = "e0596b70e52733a01f7cbc073f444b5798e7beeed42effcb329fffe8a74de25fd69636624ef74f0bc31aa27a078a6a5c763f203eb3fdc275f59c3eccf49e0cc5";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/br/thunderbird-52.1.1.tar.bz2";
-      locale = "br";
-      arch = "linux-x86_64";
-      sha512 = "12269d34c5ea1836f8fc12f7c163b966ee57afacf8bab7a010fd1ce2315193a8dbbba201fa474c9dd2e642f418ffb64eef608eaa37a5991168faaceda818aa49";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ca/thunderbird-52.1.1.tar.bz2";
-      locale = "ca";
-      arch = "linux-x86_64";
-      sha512 = "42180ce29e1e53aa08c22d71902cb792ffd212c42c7a3632d069907d7dfa1571d0beb16141ab5b91af9f637d10278a5f5f5a2bd56146ea848b7f88010655cb92";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cs/thunderbird-52.1.1.tar.bz2";
-      locale = "cs";
-      arch = "linux-x86_64";
-      sha512 = "63e4c8ba853a1289e977ffc27627e69f4509addbf9dcc294be3a49ed7030eb56181cdc6630e6dc3d207d50e2060ef80d5aeb3aa58c3ff95890ad54f0b88a8fea";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/cy/thunderbird-52.1.1.tar.bz2";
-      locale = "cy";
-      arch = "linux-x86_64";
-      sha512 = "30110d9db650afb9b0d47efa25006f03b4a9d9863f7fd37a49d49cfc4f2d8b7735a27676d36c84ef390d8358e0069d4708e6ef9eceeb12a38d226f917c4a2c19";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/da/thunderbird-52.1.1.tar.bz2";
-      locale = "da";
-      arch = "linux-x86_64";
-      sha512 = "1b0d6727f72cb8547f6b09c78d9375a63121d73959666e9500c01aa72253e923bc8f85f7a7738d9a0426c9a9e85bacfde3ad3e35b3101ae0af2c132841c60fa2";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/de/thunderbird-52.1.1.tar.bz2";
-      locale = "de";
-      arch = "linux-x86_64";
-      sha512 = "4e9c924cd763c15627494f9f247c76ad69fa719e1fec0aae1650949d0e13abdf7d4bdb86bf53cba0db7a124e97f8bb66895c00bbded00f324f8de06c9d1e9b55";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/dsb/thunderbird-52.1.1.tar.bz2";
-      locale = "dsb";
-      arch = "linux-x86_64";
-      sha512 = "b1b5fd7176a5743cb7064cfb9c74c78eb29873978551a6afd6c80bde92744d9793e53ff4bfca2af1bd06f9285305774d7be0d72d6fdd9ec38dd05e0c58fd537a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/el/thunderbird-52.1.1.tar.bz2";
-      locale = "el";
-      arch = "linux-x86_64";
-      sha512 = "f85bc8f35b59176c69e7dc8cfcd7dbbe649c54487d453e56f35c414ce98548127cdf973db7739f7481dca6476c0f9cc54cd42576a5b05abf03ca8a2a26fff229";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-GB/thunderbird-52.1.1.tar.bz2";
-      locale = "en-GB";
-      arch = "linux-x86_64";
-      sha512 = "95249b37205cee0a1677c8fed8199b1a9a98d80b0dfbc513321d72e2a294a84e1d82f19b8732fe30189d9c508d9ebf98be9bf5deda87ddb83134f9b1e24834a3";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/en-US/thunderbird-52.1.1.tar.bz2";
-      locale = "en-US";
-      arch = "linux-x86_64";
-      sha512 = "dd13cf3e5e8ca042583fd134172a4dbcbcbaf8fe923d7f2c19e1f66d2802edc9901fad3a2593e382305b97bc17ae3b1266f3c2176648f8255894749db55ac8fb";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-AR/thunderbird-52.1.1.tar.bz2";
-      locale = "es-AR";
-      arch = "linux-x86_64";
-      sha512 = "ca300f267a36f1c5251c8eb5200d93ec558cebb22736c6939581f06bb3c00a9b617188be183bcde78afc6bef2c8a579c82d0085cb8cb0b8668c4975f3bd4578c";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/es-ES/thunderbird-52.1.1.tar.bz2";
-      locale = "es-ES";
-      arch = "linux-x86_64";
-      sha512 = "050a9b2468db62c306ff94eca093c9bebb3b55227bda653f4355915264a73a3da4ee930f46fac27ad932e67d8b37f125b33895cc759f5aa213b8b5f432e82339";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/et/thunderbird-52.1.1.tar.bz2";
-      locale = "et";
-      arch = "linux-x86_64";
-      sha512 = "f07a8ddb278b697396a2988208cd28059fd1449044dfdce6330a058e060113c8748607c52443349bb59ee8851e6d17626830acb99a836f4102b30ba83e96d12e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/eu/thunderbird-52.1.1.tar.bz2";
-      locale = "eu";
-      arch = "linux-x86_64";
-      sha512 = "20d04d59df7689d515ecdfb64f118efec8964b7034e0e0bed0225e8b63c7f46228086f1d63b636eb3a549226aecc944db61e3d8fb1273ed5bf669f538f56017f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fi/thunderbird-52.1.1.tar.bz2";
-      locale = "fi";
-      arch = "linux-x86_64";
-      sha512 = "357ef2351d131fc4da8a4998cb3ca6147c3b2de638156d69a826d98c48d2fc8478905ba5c0a778280a2b29471f899d1851fa1cf8a7a010b0d7c7c8fcbf73f8c9";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fr/thunderbird-52.1.1.tar.bz2";
-      locale = "fr";
-      arch = "linux-x86_64";
-      sha512 = "279e46c579577643adbd671455c3053b96c97fad626392b755ebd173b4c09e46ff9f2b52a829b90850e12ebbaea2afa0520c21b5376389b80e5e4f4b09b25ed7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/fy-NL/thunderbird-52.1.1.tar.bz2";
-      locale = "fy-NL";
-      arch = "linux-x86_64";
-      sha512 = "ab4f11659e682eb78d14952ca60a1394a8cb7a982d182eaffce9a6c97cd9e6a6cdd1cfe1e278caee66a91a9fa85a28e9cb8daf06f4efc40fd36daef77b0ec2cf";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ga-IE/thunderbird-52.1.1.tar.bz2";
-      locale = "ga-IE";
-      arch = "linux-x86_64";
-      sha512 = "31e8294c81955b1bd512c46d11659e9d95ef6e421060e37296e4e27d3a810ea3201c5ef01bec34a4161bb4e0a980063c546c4c8a2f23bbb7628dc6762857afc8";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gd/thunderbird-52.1.1.tar.bz2";
-      locale = "gd";
-      arch = "linux-x86_64";
-      sha512 = "88bf4276c8148e8e1809411706bfa3f5dbafaffee11d3a2e6cfe32e76a9c9d99c1d43aec5c9221d684ae446ec117704e501dce5790a1f16ce8c3ab6124df5bbf";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/gl/thunderbird-52.1.1.tar.bz2";
-      locale = "gl";
-      arch = "linux-x86_64";
-      sha512 = "d19ccbf5cde54e6d4d9813803c33cf4b8bfdce14611e56c364bc2bbed0c65ab6bdb06b9c81e1e22f8b17f341552ea822a61eee431da815ab2b1ce21c32aa6d77";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/he/thunderbird-52.1.1.tar.bz2";
-      locale = "he";
-      arch = "linux-x86_64";
-      sha512 = "582654cd958b5ed3abe8a751dc085dcf47e3da92731512925144a9e7b77ac4efd05dc6414b61b63e107763f8149b9acb244913ab83014b45801da79c16d3ece4";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hr/thunderbird-52.1.1.tar.bz2";
-      locale = "hr";
-      arch = "linux-x86_64";
-      sha512 = "61019566186e0d5c3ab8dc963472d010bff1d0ed705b2df17d3e545ebb7cb8d4caf1982cd11b530659413c5e7776b086da89df5fa52775654038eed1ba8826a1";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hsb/thunderbird-52.1.1.tar.bz2";
-      locale = "hsb";
-      arch = "linux-x86_64";
-      sha512 = "7b1987d86b6eb4d620b6989f3b40583db56653be1c9bba9ac7d2a3132267790fadfaa4c34755c8c0df2a0fdfae15f6b8e70fa81dee9fd3885699ab67518a2958";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hu/thunderbird-52.1.1.tar.bz2";
-      locale = "hu";
-      arch = "linux-x86_64";
-      sha512 = "89b902b9bc281db85ba11904dd1b422a65ffaadcb41d933ebd5fcd7b7b3f97c2d050a8fdb78a6da88b29b47f0f7643511e90a4af133e528c38f63db326d13e86";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/hy-AM/thunderbird-52.1.1.tar.bz2";
-      locale = "hy-AM";
-      arch = "linux-x86_64";
-      sha512 = "0afb1d38f1e4ceec5ec0a9d28ea9ca41558d3cec0d1ad04691e11901996d875a2d7508440c6870264c05b12f3776b2d705470cbef83cb11a68c19ae923b75763";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/id/thunderbird-52.1.1.tar.bz2";
-      locale = "id";
-      arch = "linux-x86_64";
-      sha512 = "34dd65c256900d0ad08db33272adc1761c190fc429de0e62d791f4160c241d9950d42efa03cd4e3aaa4ae5627b48ad2c9f0f0ad865f0d26233379d3b9a4e9f26";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/is/thunderbird-52.1.1.tar.bz2";
-      locale = "is";
-      arch = "linux-x86_64";
-      sha512 = "1b651359c2ccf8249fa2ed951e69bc2d16bdef08db6d103dd5110305ec497cce4452d2764c814068c968bfdfe75bfaeea0d119f8457ba1d72c881097c22fd143";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/it/thunderbird-52.1.1.tar.bz2";
-      locale = "it";
-      arch = "linux-x86_64";
-      sha512 = "15aaeacb1a0ab38297a179007039fb3fa5825618eae5e5d650f041bf5311e8f244dc0ef53d99b9513fc8e17b4f1d0a731cc06f08223b42d222be5e8f56b2a651";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ja/thunderbird-52.1.1.tar.bz2";
-      locale = "ja";
-      arch = "linux-x86_64";
-      sha512 = "ab3fc3d0cf7be8e463c5e8f25ccac1cde2df9be15277bb81f253af15a0de53935cd5c53b8435e7ef5369cc43739b6e2fb8424bb2d7e1b153201b50a8385d1763";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/kab/thunderbird-52.1.1.tar.bz2";
-      locale = "kab";
-      arch = "linux-x86_64";
-      sha512 = "60f2a58444b06ec8f7bd98ccada16b33b0e528bc59b73d33df370cd44283b2b0e65160aa1b5ab9cd0a7f7c628056e3bef4d7c293814837b6a7df17dd057b8ec8";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ko/thunderbird-52.1.1.tar.bz2";
-      locale = "ko";
-      arch = "linux-x86_64";
-      sha512 = "de7fedb8b379f54488c5ef6927c53e0c3651f08cb33b97a06359fa9c5a31b0d4a7717df8d493236b7e6cfcc5173d1faa3f07e938b65322ad6847f59c4061597e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/lt/thunderbird-52.1.1.tar.bz2";
-      locale = "lt";
-      arch = "linux-x86_64";
-      sha512 = "9c4c9969a851509dbddf3fbf0118067b29f679b2e13c15f507579f232a311941c1345636714c94151323bfe726f760ab507def1dfd3a4a4053c60d533a3a2abe";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nb-NO/thunderbird-52.1.1.tar.bz2";
-      locale = "nb-NO";
-      arch = "linux-x86_64";
-      sha512 = "61f6e4a840b8cbcb9b0706f121c93798924302184ecc92e4f6b4489178ae3d6962d6ecee52feee21fd4d89c5da7f349b383b5bef6f0b961e6e15a10f6dd5f2e8";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nl/thunderbird-52.1.1.tar.bz2";
-      locale = "nl";
-      arch = "linux-x86_64";
-      sha512 = "4de0257fa93e7450442cafcb3cb328928687b974303d3df9c4c37db843bc3379716a7c7058400dc11f25b632266f1f4f740de4c4ae099d6f88d810673856d562";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/nn-NO/thunderbird-52.1.1.tar.bz2";
-      locale = "nn-NO";
-      arch = "linux-x86_64";
-      sha512 = "ff6152e088e8f94f60c31b172502207609a9b0908057f8343177e9b7c6a079dd2c503928debeb2c133a77edd6ebac5f691a2078f54d572c2479f60327ba580d0";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pa-IN/thunderbird-52.1.1.tar.bz2";
-      locale = "pa-IN";
-      arch = "linux-x86_64";
-      sha512 = "9a7876869b412efc3463eb2d161f4655804f740bbae0aee075d0f7e1466de6fbed21545bcfb93c5f03fcb837d3459a40882f4fceafae137f8aa4d3841010feeb";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pl/thunderbird-52.1.1.tar.bz2";
-      locale = "pl";
-      arch = "linux-x86_64";
-      sha512 = "9f897729f752126cf676a05672aaa35c620d025ca74ef8c611948b2b19e9239d39090a2983bf9568f796d0a20acba4fccd262ed04433c564791c5ef837955425";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-BR/thunderbird-52.1.1.tar.bz2";
-      locale = "pt-BR";
-      arch = "linux-x86_64";
-      sha512 = "fba636db2837ee9835a35bc36af874e50b113be1edd123a74c9d71080b25be761500b8aeed7605f589cd06328d67659cb25fa25959e49c017a4c63a27be3df6f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/pt-PT/thunderbird-52.1.1.tar.bz2";
-      locale = "pt-PT";
-      arch = "linux-x86_64";
-      sha512 = "0ec0668509a19f52432c0de6450d14b20be01e0a26eedb316e63b33f44a001c3ff82c3b553ef51c9de740a164ad33ca25f9b4b2d64b792e89ed803b9d68d11fa";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/rm/thunderbird-52.1.1.tar.bz2";
-      locale = "rm";
-      arch = "linux-x86_64";
-      sha512 = "fc75870ecccb5cac6533887e96a3be0b44a07b638b96c5993c7d6ede1cf0e501172ab83c85b2e5978d6818086c4e7802ae133da96a8331846456c184f3dfa34a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ro/thunderbird-52.1.1.tar.bz2";
-      locale = "ro";
-      arch = "linux-x86_64";
-      sha512 = "bbb3f37e6559599022f3ac5aafb62ba9e62b67ee5165eb4aad2fb29e722206b7ddd0e4bfa1e5cf57453e0fb572b3829bba3c80e4ab0b3b14c91ce4f824f5150f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ru/thunderbird-52.1.1.tar.bz2";
-      locale = "ru";
-      arch = "linux-x86_64";
-      sha512 = "f93506805c0d45f19a7b17f3eb82a6f8ce6beec11e4fd6ea09888bacbb90f258cfa15bf35a6b5868ce496491b1dd62cf12ad4877576f4b00117f169065061555";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/si/thunderbird-52.1.1.tar.bz2";
-      locale = "si";
-      arch = "linux-x86_64";
-      sha512 = "09a1aa2393d95815cea16ecdc4a2abf7cc7782744e8ab39a447ee195feabf35102a7cbcc57761c1a8bab085036dea949a3ab2fc5cb3cd00cdd01047e1de0faee";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sk/thunderbird-52.1.1.tar.bz2";
-      locale = "sk";
-      arch = "linux-x86_64";
-      sha512 = "d37c2fbc9c72b627278e8bc8073544f0a35bd175e7015f88bc037861a5513286627ca016ed643db490759d7a9b57feaa7d0bb8948545da67ac6fdb2580549e93";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sl/thunderbird-52.1.1.tar.bz2";
-      locale = "sl";
-      arch = "linux-x86_64";
-      sha512 = "0134f110196af343e0fb3f24970caa74fa0a9f48c4c652e484bd79c2fd76f97eea86776c5b528c432ed98d24b2ce83529e7e68c3e4ff2533dd554465f24f701d";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sq/thunderbird-52.1.1.tar.bz2";
-      locale = "sq";
-      arch = "linux-x86_64";
-      sha512 = "9a85f94121e1af70e8eee2f0e56693807f881c288efbc9d4f4affe9353f0018145d2df03be74b76026dc0f51b28969cff69e19b639271df7bb34bbaeef21ffbe";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sr/thunderbird-52.1.1.tar.bz2";
-      locale = "sr";
-      arch = "linux-x86_64";
-      sha512 = "a11ec69a7fa8f49c9fe98a53280f6e71cb4dddea4f8a5a4adcb7a95cfcaa548575b334a15ce7c06dcb6053d633a1f2bb09b77ab022a09c3987228fd5a9fce339";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/sv-SE/thunderbird-52.1.1.tar.bz2";
-      locale = "sv-SE";
-      arch = "linux-x86_64";
-      sha512 = "04215a4507f057151a9d3bbbc092e7c54a02bdf19af3e18c8042c0fdc477cf5739d3007beb4e28dd3354dae7ffc628fb601c18ad06e8898e5445c35855cdcf5f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/ta-LK/thunderbird-52.1.1.tar.bz2";
-      locale = "ta-LK";
-      arch = "linux-x86_64";
-      sha512 = "f04af1419a7175a2c15f65bcca7def7e1ef0a82d4e1f706599a8a2a731b07d7d554dfd859911836f586cb0da09c8c67452110eb8caa181e4cf1d39af39406f55";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/tr/thunderbird-52.1.1.tar.bz2";
-      locale = "tr";
-      arch = "linux-x86_64";
-      sha512 = "44b3a06fded09732b1914ad6a373411eacd77defa23c29b1ac2d422f9f38eb3aaf5838915d96ae2400b35b6e751208f21b3f213fa92968887504187548f70431";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/uk/thunderbird-52.1.1.tar.bz2";
-      locale = "uk";
-      arch = "linux-x86_64";
-      sha512 = "c7024c0394da23e067327f9db5cacb263ed02e5e23dfec0059a64383a331b8c9695d30f0e25b2892516e189e2a7e4796d91041e684f44a66d0d6bfd287499203";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/vi/thunderbird-52.1.1.tar.bz2";
-      locale = "vi";
-      arch = "linux-x86_64";
-      sha512 = "d7718cbb734a11c82b4ec88e73174f34fc34819c0c398855897b7b11d811ef27c785d9588764dfd8c149adf61227ac416b8e64dac7d0a2bdfc1fefa5b980a4d2";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-CN/thunderbird-52.1.1.tar.bz2";
-      locale = "zh-CN";
-      arch = "linux-x86_64";
-      sha512 = "29b5183a5d824e6e5d4045b9e41403fb5b321ff7c05c73dd43357fe67c87fe05be26988f408788a7e0e1655f0068cbdb80311f396ba991801d0af462dade3432";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-x86_64/zh-TW/thunderbird-52.1.1.tar.bz2";
-      locale = "zh-TW";
-      arch = "linux-x86_64";
-      sha512 = "0fa4d43ff9a1f32fdc9695075205bdd32932ef790f53e04da778309bd35f5dde56f2d51d972d8c998eee3117a287d16fe79a49435b5cdf6631fe65395bd184c7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ar/thunderbird-52.1.1.tar.bz2";
-      locale = "ar";
-      arch = "linux-i686";
-      sha512 = "0234f231e1dbbe5776d9ea37a18e546d049470efe29eac34c2c4d05c59aaa81f509bf778b37d3865d117fbb43db17e33464090830b531ee434d7775b4020ab44";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ast/thunderbird-52.1.1.tar.bz2";
-      locale = "ast";
-      arch = "linux-i686";
-      sha512 = "5ab2c379709ef07d82870da6259fb9354005235d485d6eed4d5a0b1d23c83903e7e6092cd49ac2439b01c5d4f1e663f121bff7a45ade72eb18d166787c4f62f5";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/be/thunderbird-52.1.1.tar.bz2";
-      locale = "be";
-      arch = "linux-i686";
-      sha512 = "69c596d711b91664031e52605c1510532f2600b3927afc4ea12a1c9332baf5b05982a09648be6b30ea42b763a18f495d8fa2274515f8088c0b2e07be60e0510e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bg/thunderbird-52.1.1.tar.bz2";
-      locale = "bg";
-      arch = "linux-i686";
-      sha512 = "0de0dcdd70902f0f1eb8d8d361ce20383c8bec9ce9ea6ddd664876e6386075a424045478bbe6c88076085c97dc42bcf2205f6870e6b03f46dfa3872275ac195b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/bn-BD/thunderbird-52.1.1.tar.bz2";
-      locale = "bn-BD";
-      arch = "linux-i686";
-      sha512 = "73e82f771d90a4861b9b34adfe94714cab47dd2cc86b9dbad23390a2cef8c0150a654a26a05a6a0effd0efe79a3caf419fce748e35ab3c94610d42e2cb06686e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/br/thunderbird-52.1.1.tar.bz2";
-      locale = "br";
-      arch = "linux-i686";
-      sha512 = "1abfcb8f361ccf5526f947ad8b7c497233d646913abb6fd345814355c548b4c93069a9710d27d2141c5e0045323522a6e76f9f3f53d7dff2c131ac94778545fb";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ca/thunderbird-52.1.1.tar.bz2";
-      locale = "ca";
-      arch = "linux-i686";
-      sha512 = "07a3436b009ba87180659345261de142d94500b8fb00fe21d9c48cffa43fc42f644c28bab739d420908342e28747f4f564eb46ae4e24222dea45f369a5caf3a5";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cs/thunderbird-52.1.1.tar.bz2";
-      locale = "cs";
-      arch = "linux-i686";
-      sha512 = "58b90bdba30ad6626f285c73601faf30f45fefc1e670e013e7f9e6b92540647cb402ec69eb88ca00dc450801fe07589792bae6eb602ccc60479f3ee6e5104ee7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/cy/thunderbird-52.1.1.tar.bz2";
-      locale = "cy";
-      arch = "linux-i686";
-      sha512 = "d880dcce1b4dd47bb738d990886b71a858022b8ca76c67d33d8d97257e28cd4489d058526fce6b677cd6e925acdc2d04870e5ff6d84a89d82e2bc9f91469536a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/da/thunderbird-52.1.1.tar.bz2";
-      locale = "da";
-      arch = "linux-i686";
-      sha512 = "31e26b2333544c950b69a631a4f889052c79f3411b3f55b8c02d7fa248d50409a363ab9935d57946b704b5b85819b3e30bbb8230871a582bb27b8f2c062ef1b7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/de/thunderbird-52.1.1.tar.bz2";
-      locale = "de";
-      arch = "linux-i686";
-      sha512 = "c86681f6616d5f234f0878aa9370cca4c0fc5f38c131f2a3908d8529ab2e86e340558988c3ac5067a82edb99a3cacf316727652d181fcc0bc15ad7ecd713d11b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/dsb/thunderbird-52.1.1.tar.bz2";
-      locale = "dsb";
-      arch = "linux-i686";
-      sha512 = "4f3b39c1023235579079a46a7d557d177c3f2e398a6e311c728ec1083952b2c67db0cdf539d8ae3abc54061d22e607c6849699008b76e9b01569d12d6600feee";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/el/thunderbird-52.1.1.tar.bz2";
-      locale = "el";
-      arch = "linux-i686";
-      sha512 = "623205d1e326a0310c54a9c14e469fdbe156e538c2a09a770c872be8214611743b6d354b5a7b106db5105b8b278540d7f623c6fc56bc1fd450333ec774ded706";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-GB/thunderbird-52.1.1.tar.bz2";
-      locale = "en-GB";
-      arch = "linux-i686";
-      sha512 = "b38b9e6350edd11e58c644ebe4c11aa6bfeba7e7aa6fdf40f9b9a4cb5845f5a2895b82ebf717ca78138a0f11cdc2f6f5aefe5636acbcff857ba99d27e258b824";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/en-US/thunderbird-52.1.1.tar.bz2";
-      locale = "en-US";
-      arch = "linux-i686";
-      sha512 = "192f42fe4c7b9689743ec16191ef8576a19699812cfc4984e4b559fd847ab92c1dc002cbbdbb2212fb547fc9bfd77b4f58639d219ccc1ed86290b61f9effebf0";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-AR/thunderbird-52.1.1.tar.bz2";
-      locale = "es-AR";
-      arch = "linux-i686";
-      sha512 = "2022d12dd755e6583b3ccb068ffc53b91308702cff57f57ed455aee7299f8a7d4e614e600acc80be9da0e9df8e86c273b6cc7e99b94c5194420be367d5f12497";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/es-ES/thunderbird-52.1.1.tar.bz2";
-      locale = "es-ES";
-      arch = "linux-i686";
-      sha512 = "058004f7a94b55a393d626869d7b7690d17fa5b51b0466d83c029c65ef3a49d9efdfc0df2c2110865282972b23fbd22a68f81785d098cbe3ba6c39c81f5e903f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/et/thunderbird-52.1.1.tar.bz2";
-      locale = "et";
-      arch = "linux-i686";
-      sha512 = "95247bec1a365afcc5f6985ac635b0ebc02b2c345704749856ff5d9aa3d23e22fb274812617f3cd1648f80b9e47c95100fc10d41d5cbf0f8b7322e57adf48165";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/eu/thunderbird-52.1.1.tar.bz2";
-      locale = "eu";
-      arch = "linux-i686";
-      sha512 = "e561dc2fd2f32dcdaba034f7486a55da8e332c7a67fa4948ccb073fea5a49910c02bac3b4f988366d0e4cf7da00efa52020eb1fd837119e95360e7418b65e37b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fi/thunderbird-52.1.1.tar.bz2";
-      locale = "fi";
-      arch = "linux-i686";
-      sha512 = "d014aec796d7c4823748eb2d4a76df85a10fb6bba58d26fc9e46f72bbdc1457acbe473a563a1ebebed152c11242bd64b8c306c2fb43959ad2b649830bf50e95d";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fr/thunderbird-52.1.1.tar.bz2";
-      locale = "fr";
-      arch = "linux-i686";
-      sha512 = "e7bfe888ce1bffcb302c96bdb685bdbb7588521e9dec863175015622ebe13d0aa2b8a75c8fbe9ad6030be8303728a6a6718a837fc8fef8d0009fedad6ecd1b36";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/fy-NL/thunderbird-52.1.1.tar.bz2";
-      locale = "fy-NL";
-      arch = "linux-i686";
-      sha512 = "08bb1c4e4187e6a4f61f9ad88daa605186b341033c256506f9dc2c7626af842a628dfd59732084cf1b6bf94eb52e78af9942fcbbfb3c0a0c42568c94d3a874d7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ga-IE/thunderbird-52.1.1.tar.bz2";
-      locale = "ga-IE";
-      arch = "linux-i686";
-      sha512 = "737af536b710b633b849ae0f7017bf9387daa6a3145409ed8cb315a0738083195992bac1fb4215b590784b7b2389f0611d89b55e17b5b02bedb79869e7caace9";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gd/thunderbird-52.1.1.tar.bz2";
-      locale = "gd";
-      arch = "linux-i686";
-      sha512 = "2ede5eebf73d7fa2f9ddf5a10b26649d43bc24512512b8f31b2998786c80de1c75890d3c825829ce1ee030ebb90e6bde1264cebc45d17475bfa5a343a5520491";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/gl/thunderbird-52.1.1.tar.bz2";
-      locale = "gl";
-      arch = "linux-i686";
-      sha512 = "b0ae9a3d08160024203b6bddfa6fb4a9a15c552cce91701d644636cc9f9c6add879a1b78138a0bdf3946c9f356dfb50d97293cbd070bbc2a9764b30a7a29263a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/he/thunderbird-52.1.1.tar.bz2";
-      locale = "he";
-      arch = "linux-i686";
-      sha512 = "b1f5d4e299cc2d40397fb96b076625ea7e86faecc0ba6503276d675125373fe7eecfd531caf24241cb446bf47ba986c4ee497fbd115cf67160ef24b87f6ef19f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hr/thunderbird-52.1.1.tar.bz2";
-      locale = "hr";
-      arch = "linux-i686";
-      sha512 = "7e52b5aeeaf9cd3c205555b1cf69c7a184b3a30605611a0cbc66a7591beb9d11a18b5e084adc9f88a7b74b24b06dd9b470bb966c6dc4fd946ab23b6565608ff4";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hsb/thunderbird-52.1.1.tar.bz2";
-      locale = "hsb";
-      arch = "linux-i686";
-      sha512 = "49c718f7424337a6477b175446f3b532d0603ed8dd2bf789497706dd6c25f1d4968058facb61b2ea858e908911d0c04e87493a0956c33ad33df11d9990aaabb7";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hu/thunderbird-52.1.1.tar.bz2";
-      locale = "hu";
-      arch = "linux-i686";
-      sha512 = "e6ca202e31f41b7e57235172fb107ddc0707633ba5762651da62e9e55f433fe21de642f20bc3cbddf99ee8a9881dd646add04bb180e630364e45384a13e75ef0";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/hy-AM/thunderbird-52.1.1.tar.bz2";
-      locale = "hy-AM";
-      arch = "linux-i686";
-      sha512 = "43aed794a82dc7e74f086bdc9e401ecfd59329098c8a9a650c485348977815f7419cd1cf913bc3fba025fbfcf1a15db6b883ef6bf483e16187a85dfdad9cb299";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/id/thunderbird-52.1.1.tar.bz2";
-      locale = "id";
-      arch = "linux-i686";
-      sha512 = "3ce1c383d7640b9af2b7eae5e7689a200d27bc0a5527b3f3be1b1443ef3278cc58c0f2c0e3a9f94cb419fdc3b5797612fa96d78aa9a418b59fb066977955096a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/is/thunderbird-52.1.1.tar.bz2";
-      locale = "is";
-      arch = "linux-i686";
-      sha512 = "365d5b4c78605df8869438eca9ad700ff2353bc18d64cfedf8905bc7307646b45c365813b537eb813806a25b8d1f121595df744ac60b1cb48cfcbe4395affc7f";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/it/thunderbird-52.1.1.tar.bz2";
-      locale = "it";
-      arch = "linux-i686";
-      sha512 = "ad0946bf1282f3ded23847b6fbbce55e620ca34b71bb3c7a12a6bb24e6e09a4d737503c39f5d634bdcd4c3a54418ef6b96a83fa997d911b85d8d05632d921711";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ja/thunderbird-52.1.1.tar.bz2";
-      locale = "ja";
-      arch = "linux-i686";
-      sha512 = "34841d9c22e9b4d737bc56e23935f12a5a0bedcdbb127447a21ae9a837c9f61ef93b9613fa2123dafc39cbe7f9ec3cc0b92c7dc27f96ca3175ae359be3cfa1db";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/kab/thunderbird-52.1.1.tar.bz2";
-      locale = "kab";
-      arch = "linux-i686";
-      sha512 = "19a40cf4ff9c0e34b4ae46a54364ca9b152aee18f2d4a438fe947cb225d9214f8316bd9aacfbec803076716668f100b0a02dd18b1f307498d086cfd6466f6433";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ko/thunderbird-52.1.1.tar.bz2";
-      locale = "ko";
-      arch = "linux-i686";
-      sha512 = "1497535d1de169c0498837ef164434700a99d5dfe5032cfbef62de4535f47c2473ef335f9796c0d7adf5c7f2cde7c3a655aaa92d65651667afd7f3cdf7cde574";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/lt/thunderbird-52.1.1.tar.bz2";
-      locale = "lt";
-      arch = "linux-i686";
-      sha512 = "54bdb2bfa2cf97e03c389a390ad018f485b5452c6c4e8acab9cc71c0076b830cfc7267a1e755f98ac54c87231511827ba7c64aa2502c502ab47d554fc5044856";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nb-NO/thunderbird-52.1.1.tar.bz2";
-      locale = "nb-NO";
-      arch = "linux-i686";
-      sha512 = "20f5d2e7bbc083a990d9e9d8373d1485d58d62837c4d0d0d9d0955d3a9355c326d8eebbbfe0c61090c598fca11dad85d101ffb96b12f72b76da55fe72773ad03";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nl/thunderbird-52.1.1.tar.bz2";
-      locale = "nl";
-      arch = "linux-i686";
-      sha512 = "c25e14b9d28f4985ffbb125b984168b4f073773c03bfc2af2bb845db19659b25d69e634896d9b0d92ad7f08ccd4523a5d58ee42fbf23ac25499f64e7da7463cd";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/nn-NO/thunderbird-52.1.1.tar.bz2";
-      locale = "nn-NO";
-      arch = "linux-i686";
-      sha512 = "9fe667f785abbdcf57890c3c19def43165a5574409342eae335ba32c2f9fa089eb4c2d443fc6254fe5d21ead0f0d04fa1e2250f54ef805c2668aae37b15a3f84";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pa-IN/thunderbird-52.1.1.tar.bz2";
-      locale = "pa-IN";
-      arch = "linux-i686";
-      sha512 = "cfd6c5d43ad9c78663f217b4ebc40b34d80cceed7e266f95dff1d70665b4e7187742621367085ae38718ba15e14bebaf8a32bc8e696fad0febbbbbf360abfd69";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pl/thunderbird-52.1.1.tar.bz2";
-      locale = "pl";
-      arch = "linux-i686";
-      sha512 = "01dec9139816be174f14aa3f6e2165bcc52e53b8f681d8fbedb4db4f428a36128b832aa36fba7af096d15e83ecedb6b3570a447cde6bf10a722c2a452520852a";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-BR/thunderbird-52.1.1.tar.bz2";
-      locale = "pt-BR";
-      arch = "linux-i686";
-      sha512 = "2f616760f069944f43cc8517981a7fb793564cf30214ca62b42161aa3fcd332bf3f25761deae00697c8f544c84c3a500e9fac6b4424ef5481250fe2b8b6075a1";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/pt-PT/thunderbird-52.1.1.tar.bz2";
-      locale = "pt-PT";
-      arch = "linux-i686";
-      sha512 = "0e27a359621fc08e1162f413aabaf406af4754e0e6947764d2b86c0c20b4d88c7eea336863ad9a9c670a6b05d84bda3678b9665f3c6c2d6b8ec71f2278f8a494";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/rm/thunderbird-52.1.1.tar.bz2";
-      locale = "rm";
-      arch = "linux-i686";
-      sha512 = "84e58d1a7ce7e4d09ed30e83c6e46b88aac1419e719e1c55aa4cb5e1521ea3dd679e0bd41663de2a12d77c489d69f5ac0d5f5f0845fb2f9cc34d8f55ca278026";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ro/thunderbird-52.1.1.tar.bz2";
-      locale = "ro";
-      arch = "linux-i686";
-      sha512 = "9272c9fba59beab72fb6f59c81180514ddfa6b6dbd050f6b789e5072beb34a0cc6c70ecc26e11bbc082e9368df98cc13923eea643daaf24051371755b0bb26ac";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ru/thunderbird-52.1.1.tar.bz2";
-      locale = "ru";
-      arch = "linux-i686";
-      sha512 = "734b738d9712dc089db8460b72404be9bb6a97944ec9dc5a286a401531ef2a30f8b7c5fc22e689b98d1f80551515996c6d7ba1a7b72290e4071a95a4519c45b0";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/si/thunderbird-52.1.1.tar.bz2";
-      locale = "si";
-      arch = "linux-i686";
-      sha512 = "3868793813b2b09177ff7c5b36e44a289f7d7ae84f65c3194703f77e0067fd975a1397a289d3921b5ba7dcfe56c81280abec81c731b369692f2135f572dcdce6";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sk/thunderbird-52.1.1.tar.bz2";
-      locale = "sk";
-      arch = "linux-i686";
-      sha512 = "101f95b2bb118bb730117920099d1f5cc5f7744960a0148a1324043c17468d5b43c5d31fc5c45111fd3fc16a6e4d207548161fb600dbc4c4b92b015e342586fa";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sl/thunderbird-52.1.1.tar.bz2";
-      locale = "sl";
-      arch = "linux-i686";
-      sha512 = "a019e01de194d51acc6695447c30fd5d9e179d91035f942b2f42a536b29d03244a7fffe2821c19e51133d39773e70b18fda79b6b19c2a33fba3d9917669b0748";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sq/thunderbird-52.1.1.tar.bz2";
-      locale = "sq";
-      arch = "linux-i686";
-      sha512 = "64bdc99eb9bb3ece6fb5de9380fdc3d0a7e2598d36a66e7542c500a63c49f0d307ebdb99599b3bc72677a1053dd5d2aaf52088605236baa7d8d29dc2b377771d";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sr/thunderbird-52.1.1.tar.bz2";
-      locale = "sr";
-      arch = "linux-i686";
-      sha512 = "8d5d2ee0f5326b9cf76dcb1cfd2401350ca5aa39efbc2afcd822eb3c9a40e477d25e0d82d8f50e569b2fed487463c6a978d12284f63764b7259bd3f479b2461b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/sv-SE/thunderbird-52.1.1.tar.bz2";
-      locale = "sv-SE";
-      arch = "linux-i686";
-      sha512 = "0efd878da02ec1e81f373f7e8090445f45c11f2c9a1931ed29a52c3d8642a277be07a2d194d873f1a11dc8cdb79ed4100fd87b8f262f8fa2ea034d4c20e96e6e";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/ta-LK/thunderbird-52.1.1.tar.bz2";
-      locale = "ta-LK";
-      arch = "linux-i686";
-      sha512 = "555c1b5862e71e7b9112b97b137375e0a38549ea91398b1631cb6000f5881f0adbbfe230612c2bd8765a20b1d14cf538e1b5c0e9ccfeb9fc7c1258afae54503b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/tr/thunderbird-52.1.1.tar.bz2";
-      locale = "tr";
-      arch = "linux-i686";
-      sha512 = "e9c5333cd807f44d98c83514caa5fa81ef54a11362b7aee05c2496d8c79288c6707ff154229cc77d9a4e8097b13c53845a7516d04ff4c3336513183a8218ac3b";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/uk/thunderbird-52.1.1.tar.bz2";
-      locale = "uk";
-      arch = "linux-i686";
-      sha512 = "a7486ab5f63cece470b2850452cac236e153c3c797622cd2d87f6c4b276cea1c43d3770e7726c459334c5ca51034a8013d78176026375ac3d760c05e1cd9cd84";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/vi/thunderbird-52.1.1.tar.bz2";
-      locale = "vi";
-      arch = "linux-i686";
-      sha512 = "6b815b2dc07fc6cb799bdf2266d6bfbef4f2623790814cae80ba1853075f7c561270e2463b1be571cc4495de5f2c36df4d716cf5754470198b97602ef3fe3979";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-CN/thunderbird-52.1.1.tar.bz2";
-      locale = "zh-CN";
-      arch = "linux-i686";
-      sha512 = "7269d75bbec19be4045a6080c4e64679b5873a89039ffa9b633f40f41ca8d98a5f5f8a1b76233102b41a38ee307a49fe0c45206df1128b1526f490a417fb60c6";
-    }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.1.1/linux-i686/zh-TW/thunderbird-52.1.1.tar.bz2";
-      locale = "zh-TW";
-      arch = "linux-i686";
-      sha512 = "3741d5ebd862706b212f90a9f81ea8f0c9f7b1a4eeb74acab420e287afb930cc74748db958debb698a49fbd9d8011107ea6a1bc917606700a80eea640b40ab1a";
-    }
-    ];
-}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 0f6be0281f3..ccced87a550 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.1.1";
+  version = "52.2.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "84b54ae4401c9728c38f32f58e0df24e049471b3613f9973981b305e0ed09b2e8c2c1b5a35d4fee85ce2cf1d6fa99e80418bc216ae0d35d40e9fdeef61a6c06e";
+    sha512 = "e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89";
   };
 
   # New sed no longer tolerates this mistake.
-- 
GitLab


From 9ffbebfeb0d1e680e7c9fce3f76559ea7d6c7062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 15 Jun 2017 19:37:43 +0100
Subject: [PATCH 0733/1490] ocamlPackages.camlidl: export c header and libs.

---
 pkgs/development/tools/ocaml/camlidl/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index 780862b6727..7cdf7dc9396 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, ocaml, ncurses }:
+{ stdenv, fetchurl, makeWrapper, ocaml, ncurses, writeText }:
 
 let
   pname = "camlidl";
@@ -36,6 +36,12 @@ stdenv.mkDerivation rec {
     ln -s $out/camlidl $out/bin
   '';
 
+  setupHook = writeText "setupHook.sh" ''
+    export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/"
+    export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
+    export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
+  '';
+
   meta = {
     description = "A stub code generator and COM binding for Objective Caml";
     homepage = "${webpage}";
-- 
GitLab


From f5d98e8e18067fd5980704a04bd44c68514f6778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 15 Jun 2017 20:30:12 +0100
Subject: [PATCH 0734/1490] ply: fix build

---
 pkgs/os-specific/linux/ply/default.nix | 30 ++++++++++++--------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 4d8e5001b0b..9d4bdb1e27d 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -1,19 +1,9 @@
-{ autoconf, automake, flex, yacc, stdenv, kernel, fetchFromGitHub }:
+{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison }:
 let
   version = "1.0.beta1-9e810b1";
 in stdenv.mkDerivation {
   name = "ply-${version}";
-  nativeBuildInputs = [
-    autoconf
-    automake
-  ];
-
-  buildInputs = [
-    flex
-    yacc
-    kernel
-    stdenv.cc
-  ];
+  nativeBuildInputs = [ autoreconfHook flex yacc ];
 
   src = fetchFromGitHub {
     owner = "iovisor";
@@ -22,9 +12,17 @@ in stdenv.mkDerivation {
     sha256 = "15cp6iczawaqlhsa0af6i37zn5iq53kh6ya8s2hzd018yd7mhg50";
   };
 
-  preConfigure = "sh autogen.sh --prefix=$out";
+  preAutoreconf = ''
+    # ply wants to install header fails to its build directory
+    xz -d < ${kernel.src} | tar -xf -
+    configureFlagsArray+=(--with-kerneldir=$(echo $(pwd)/linux-*))
+    ./autogen.sh --prefix=$out
+  '';
 
-  configureFlags = [
-    "--with-kerneldir=${kernel.dev}"
-  ];
+  meta = with stdenv.lib; {
+    description = "dynamic Tracing in Linux";
+    homepage = https://wkz.github.io/ply/;
+    license = [ licenses.gpl2 ];
+    maintainers = with maintainers; [ mic92 mbbx6spp ];
+  };
 }
-- 
GitLab


From ba9c71b999b1aa28dd2af6d23359d2db7b5da8ac Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 15 Jun 2017 19:57:00 -0400
Subject: [PATCH 0735/1490] rustc.bootstrap: 1.17.0 -> 1.16.0

bootstrapping rust requires the prior version of rust according to #rust-internals

they theorize this could be causing the build problems on i686
---
 pkgs/development/compilers/rust/bootstrap.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 409bf465630..ad49b130570 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -12,16 +12,17 @@ let
     then "x86_64-apple-darwin"
     else throw "missing bootstrap url for platform ${stdenv.system}";
 
-  # fetch hashes by running `print-hashes.sh 1.17.0`
+  # fetch hashes by patching print-hashes.sh to not use the "$DATE" variable
+  # then running `print-hashes.sh 1.16.0`
   bootstrapHash =
     if stdenv.system == "i686-linux"
-    then "39d16ce0f618ba37ee1024b83e4822a2d38e6ba9f341ff2020d34df94c7a6beb"
+    then "b5859161ebb182d3b75fa14a5741e5de87b088146fb0ef4a30f3b2439c6179c5"
     else if stdenv.system == "x86_64-linux"
-    then "bbb0e249a7a3e8143b569706c7d2e7e5f51932c753b7fd26c58ccd2015b02c6b"
+    then "48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd"
     else if stdenv.system == "i686-darwin"
-    then "308132b33d4002f95a725c2d31b975ff37905e3644894ed86e614b03ded70265"
+    then "26356b14164354725bd0351e8084f9b164abab134fb05cddb7758af35aad2065"
     else if stdenv.system == "x86_64-darwin"
-    then "1689060c07ec727e9756f19c9373045668471ab56fd8f53e92701150bbe2032b"
+    then "2d08259ee038d3a2c77a93f1a31fc59e7a1d6d1bbfcba3dba3c8213b2e5d1926"
     else throw "missing bootstrap hash for platform ${stdenv.system}";
 
   src = fetchurl {
@@ -29,7 +30,9 @@ let
      sha256 = bootstrapHash;
   };
 
-  version = "1.17.0";
+  # Note: the version  MUST be one version prior to the version we're
+  # building
+  version = "1.16.0";
 in import ./binaryBuild.nix
   { inherit stdenv fetchurl makeWrapper cacert zlib curl;
     buildRustPackage = null;
-- 
GitLab


From 5ca644c22876866751e653b0f15928a7d32bf9fc Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 15 Jun 2017 19:25:43 -0700
Subject: [PATCH 0736/1490] Fixing attribute name mistake: setguid => setgid

---
 nixos/modules/security/wrappers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index c051b7d49e3..dc1227c5628 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -80,8 +80,8 @@ let
                     group = "root";
                   } // s)
           else if 
-             (s ? "setuid"  && s.setuid  == true) ||
-             (s ? "setguid" && s.setguid == true) ||
+             (s ? "setuid" && s.setuid) ||
+             (s ? "setgid" && s.setgid) ||
              (s ? "permissions")
           then mkSetuidProgram s
           else mkSetuidProgram
-- 
GitLab


From 7272f8096e63b6561cd4dadbc0487009d8d3b025 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 14 Jun 2017 05:21:52 +0200
Subject: [PATCH 0737/1490] nmap: 7.40 -> 7.50

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

diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index aefa82128ac..6495634da33 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -19,11 +19,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "7.40";
+  version = "7.50";
 
   src = fetchurl {
     url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "121i9mgyc28ra2825akd0ix5qyssv4xc2qlx296mam6hzxgnc54y";
+    sha256 = "1ckl2qxqxkrfa2qxdrqyaa4k1hhj273aqckrc46fijdz0a76mag9";
   };
 
   patches = ./zenmap.patch;
-- 
GitLab


From fd0384b4c2b5ad6e55e2d2fd31d000dc4fc54a40 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 14 Jun 2017 01:21:29 +0200
Subject: [PATCH 0738/1490] pythonPackages.glances: 2.9.1 -> 2.10

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e182abf1c11..39d9555d22a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11654,14 +11654,14 @@ in {
 
   glances = buildPythonPackage rec {
     name = "glances-${version}";
-    version = "2.9.1";
+    version = "2.10";
     disabled = isPyPy;
 
     src = pkgs.fetchFromGitHub {
       owner = "nicolargo";
       repo = "glances";
       rev = "v${version}";
-      sha256 = "13pnim8zxqbw5b1jkl1ggqn2rg5kfwhznw42ckizrhg73ngy9yyp";
+      sha256 = "0hxs9bplxvj6grq9dqinr4f5ip6ray6mrw54scrcaqal8f3c8ah2";
     };
 
     doCheck = false;
-- 
GitLab


From aa645b51ba2f6df37903e3c4c71debceb8e70974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 16 Jun 2017 07:09:32 +0000
Subject: [PATCH 0739/1490] jenkins service: Add extraJavaOptions.

This is useful for the common case of passing arguments to
the JVM that runs Jenkins.
---
 .../continuous-integration/jenkins/default.nix        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 11adf74b9ed..c14aa416723 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -125,6 +125,15 @@ in {
           Additional command line arguments to pass to Jenkins.
         '';
       };
+
+      extraJavaOptions = mkOption {
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "-Xmx80m" ];
+        description = ''
+          Additional command line arguments to pass to the Java run time (as opposed to Jenkins).
+        '';
+      };
     };
   };
 
@@ -185,7 +194,7 @@ in {
         '';
 
       script = ''
-        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
+        ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
                                                   --httpPort=${toString cfg.port} \
                                                   --prefix=${cfg.prefix} \
                                                   ${concatStringsSep " " cfg.extraOptions}
-- 
GitLab


From ca8eed1732e3a6b879bfc93284092aa2c96b6754 Mon Sep 17 00:00:00 2001
From: Fatih Altinok <fatih@picussecurity.com>
Date: Thu, 15 Jun 2017 13:36:42 +0300
Subject: [PATCH 0740/1490] flow: 0.46.0 -> 0.48.0

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index d356caad1f6..9987996c95d 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -3,14 +3,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.46.0";
+  version = "0.48.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "05rnlckwiynkh0300f27xhrn53pf0hxlkb0iz3nlb81xmsk005a4";
+    sha256 = "13f9z4jg1v34jpaswa8kvbxkfp7flabv616vyqfvy9hafgfyisff";
   };
 
   installPhase = ''
-- 
GitLab


From 2f45c376461ec1153ebab48d87b074a82e143497 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Thu, 15 Jun 2017 06:47:07 -0400
Subject: [PATCH 0741/1490] gerbil: 0.10 -> 0.11

---
 pkgs/development/compilers/gerbil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix
index 1bffd1bd1c8..7ea403715a5 100644
--- a/pkgs/development/compilers/gerbil/default.nix
+++ b/pkgs/development/compilers/gerbil/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
   name    = "gerbil-${version}";
 
-  version = "0.10";
+  version = "0.11";
   src = fetchurl {
     url    = "https://github.com/vyzo/gerbil/archive/v${version}.tar.gz";
-    sha256 = "14wzdnifr99g1mvm2xwks97nhaq62hfx43pxcw9gs647i7cymbly";
+    sha256 = "0mqg6cqdcf5qr7vk79x5zkls7z2wm8i3lhwn0b7i0g1m6yyyyff7";
   };
 
   buildInputs = [ gambit openssl zlib coreutils rsync bash ];
@@ -46,7 +46,7 @@ EOF
   dontStrip = true;
 
   meta = {
-    description = "Gerbil";
+    description = "Gerbil Scheme";
     homepage    = "https://github.com/vyzo/gerbil";
     license     = stdenv.lib.licenses.lgpl2;
     platforms   = stdenv.lib.platforms.linux;
-- 
GitLab


From 3f97bcaf2dcf232859536ada8d6252878fbdc3d8 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 16 Jun 2017 01:56:31 -0700
Subject: [PATCH 0742/1490] hugo: 0.22.1 -> 0.23

This release includes a move to a new github organization.
---
 pkgs/applications/misc/hugo/default.nix | 6 +++---
 pkgs/applications/misc/hugo/deps.nix    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 8d14db09c3f..4fe62179b25 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.22.1";
+  version = "0.23";
 
-  goPackagePath = "github.com/spf13/hugo";
+  goPackagePath = "github.com/gohugoio/hugo";
 
   src = fetchFromGitHub {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "0m459np11izsflwdja6k0znaxvd8zpgivvswnq9501m49h8m4x7q";
+    sha256 = "0phw5pcmrmryxb83jzifhqh3vx20qiwh4dkk802v38fw07z1hvki";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 1daab7854d8..2b844943865 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -31,8 +31,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bep/gitmap";
-      rev = "dcb907b39a0690430d435eb8f63cd8811961231f";
-      sha256 = "0bw4spyiidrvd8rls9g57mwxykfmv57qi9mcnjadbqrpv92br856";
+      rev = "de8030ebafb76c6e84d50ee6d143382637c00598";
+      sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami";
     };
   }
   {
@@ -247,8 +247,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev = "0ba0f2b6ed7c475a92e4df8641825cb7a11d1fa3";
-      sha256 = "0jj9zkk64sxs8vpfhz95y9li30q6qnxm7sncsfjn2ykcdgs252f7";
+      rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae";
+      sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137";
     };
   }
   {
-- 
GitLab


From d036d882965989f38a9a414a3f34b692d146bdf6 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Tue, 30 May 2017 14:48:07 +0200
Subject: [PATCH 0743/1490] ocamlPackages.containers: 0.22 -> 1.2

---
 pkgs/development/ocaml-modules/containers/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
index 2e56635f360..f44db615175 100644
--- a/pkgs/development/ocaml-modules/containers/default.nix
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -6,7 +6,7 @@ let
   mkpath = p:
       "${p}/lib/ocaml/${ocaml.version}/site-lib";
 
-  version = "0.22";
+  version = "1.2";
 
 in
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     owner = "c-cube";
     repo = "ocaml-containers";
     rev = "${version}";
-    sha256 = "1kbf865z484z9nxskmg150xhfspikkvsxk0wbry5vvczqr63cwhq";
+    sha256 = "0k1676bn12hhayjlpy8bxfc3sgq6wd7zkh0ca700zh8jxjrshjqk";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ];
@@ -39,9 +39,8 @@ EOF
   configureFlags = [
     "--enable-unix"
     "--enable-thread"
-    "--enable-bigarray"
-    "--enable-advanced"
     "--enable-tests"
+    "--enable-docs"
     "--disable-bench"
   ];
 
-- 
GitLab


From 11b113541d26dc8f701ebc9810bf242fb70ecaec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 16 Jun 2017 11:53:23 +0200
Subject: [PATCH 0744/1490] rustRegistry: 2017-05-31 -> 2017-06-16

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 2fa9ac926d7..45e4d8e812e 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2017-05-31";
-  rev = "d85037df75a945b5a368d6ceaa7e030b67473a51";
-  sha256 = "0567lfjxvbn4pb39557yfdq1nm4ssgbvzvzkrdqnx9sx5xyx7n4s";
+  version = "2017-06-16";
+  rev = "cda0f689f844710a3d73c7ff459efa64997f73b5";
+  sha256 = "1b3brl9nn3qqaysd8lx9gaazd863grqx547iw7y9j6mkcc7sakvc";
 
   src = fetchFromGitHub {
       inherit rev;
-- 
GitLab


From 72ff321f9ca92c9ad54d006ee78751e2a3739535 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 16 Jun 2017 07:09:40 -0400
Subject: [PATCH 0745/1490] rustc: re-enable static_in_const

We saw this error when building main.rs:error: this needs a 'static lifetime or the static_in_const feature, see #35897
---
 pkgs/development/compilers/rust/rustc.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index a8ba933b52f..4e0d0971cb6 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -93,11 +93,6 @@ stdenv.mkDerivation {
     rm src/test/debuginfo/vec-slices.rs
     rm src/test/debuginfo/vec.rs
 
-    # this can probably be removed when rust is updated beyond 1.17
-    # fixes a warning in the test harness (I think?) which fails the build due
-    # to strict warnings
-    sed -i '/static_in_const/d' src/tools/compiletest/src/main.rs
-
     # Useful debugging parameter
     # export VERBOSE=1
   ''
-- 
GitLab


From 60183a11775014f7487fe8c9715b0333824bb22a Mon Sep 17 00:00:00 2001
From: Guillaume Koenig <guillaume.koenig@schibsted.com>
Date: Fri, 16 Jun 2017 13:10:42 +0200
Subject: [PATCH 0746/1490] gtk3: install gtk-launch

---
 pkgs/development/libraries/gtk+/3.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 8fbe2ba8dc9..917371678e9 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -65,6 +65,8 @@ stdenv.mkDerivation rec {
       --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
     # The updater is needed for nixos env and it's tiny.
     moveToOutput bin/gtk-update-icon-cache "$out"
+    # Launcher
+    moveToOutput bin/gtk-launch "$out"
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From c002b886c05271f891383b466e6810359776443c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 01:43:38 +0200
Subject: [PATCH 0747/1490] faustCompressors: 1.1.1 -> 1.2

---
 .../audio/magnetophonDSP/faustCompressors/default.nix      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
index 05e2b335f82..e526e40a1e3 100644
--- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
   name = "faustCompressors-v${version}";
-  version = "1.1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "magnetophon";
     repo = "faustCompressors";
     rev = "v${version}";
-    sha256 = "0mkram2hm7i5za7pfn5crh2arbajk8praksxzgjx90rrxwl1y3d1";
+    sha256 = "144f6g17q4m50kxzdncsfzdyycdfprnpwdaxcwgxj4jky1xsha1d";
   };
 
   buildInputs = [ faust2jaqt faust2lv2 ];
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     for f in *.dsp;
     do
+      echo "compiling standalone from" $f
       faust2jaqt -time -double -t 99999 $f
     done
 
@@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
 
     for f in *.dsp;
     do
+      echo "compiling plugin from" $f
       faust2lv2  -time -double -gui -t 99999 $f
     done
   '';
@@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib/lv2
     mv *.lv2/ $out/lib/lv2
     mkdir -p $out/bin
+    rm newlib.sh
     for f in $(find . -executable -type f);
     do
       cp $f $out/bin/
-- 
GitLab


From 3ed9546312d81f961b207d810f00dcaa0f7feb38 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 01:43:57 +0200
Subject: [PATCH 0748/1490] x42-plugins: 20161230 -> 20170428

---
 pkgs/applications/audio/x42-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index a0fcfe81102..75368c6633b 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -3,12 +3,12 @@
 , mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
 
 stdenv.mkDerivation rec {
-  version = "20161230";
+  version = "20170428";
   name = "x42-plugins-${version}";
 
   src = fetchurl {
     url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz";
-    sha256 = "1yni9c17kl2pi9lqxip07b6g6lyfii1pch5czp183113gk54fwj5";
+    sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg";
   };
 
   buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];
-- 
GitLab


From 075f43c8e6fa3eb8dd8eca8276a54f71711da941 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 01:44:46 +0200
Subject: [PATCH 0749/1490] zynaddsubfx: 2.5.4 -> 3.0.1

---
 pkgs/applications/audio/zynaddsubfx/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index ec803f2a9c5..42fe3e34cd4 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, alsaLib, cmake, libjack2, fftw, fltk13, libjpeg
-, minixml, pkgconfig, zlib, liblo
+{ stdenv, fetchurl, alsaLib, cairo, cmake, libjack2, fftw, fltk13, lash,  libjpeg
+, libXpm, minixml, ntk, pkgconfig, zlib, liblo
 }:
 
 stdenv.mkDerivation  rec {
   name = "zynaddsubfx-${version}";
-  version = "2.5.4";
+  version = "3.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2";
-    sha256 = "16llaa2wg2gbgjhwp3632b2vx9jvanj4csv7d41k233ms6d1sjq1";
+    sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8";
   };
 
-  buildInputs = [ alsaLib libjack2 fftw fltk13 libjpeg minixml zlib liblo ];
+  buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];
   nativeBuildInputs = [ cmake pkgconfig ];
 
   hardeningDisable = [ "format" ];
-- 
GitLab


From 33b08423057fce82a19f8da29f868db2c2fa751f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 12:40:24 +0200
Subject: [PATCH 0750/1490] artyFX: 2015-05-07 -> 1.3

---
 pkgs/applications/audio/artyFX/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
index 39edf18b056..568195c1dba 100644
--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/pkgs/applications/audio/artyFX/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
+{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "artyFX-git-${version}";
-  version = "2015-05-07";
+  name = "artyFX-${version}";
+  version = "1.3";
 
-  src = fetchgit {
-    url = "https://github.com/harryhaaren/openAV-ArtyFX.git";
-    rev = "3a8cb9a5e4ffaf27a497a31cc9cd6f2e79622d5b";
-    sha256 = "0nsmycm64a686ysfnmdvnaazijvfj90z5wyp96kyr81nsrbcv2ij";
+  src = fetchFromGitHub {
+    owner = "openAVproductions";
+    repo = "openAV-ArtyFX";
+    rev = "release-${version}";
+    sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9";
   };
 
   buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig   ];
-- 
GitLab


From 082563fe9e81a4a798e64ddbacbce45da5677cc5 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 12:42:40 +0200
Subject: [PATCH 0751/1490] eq10q: 2.1 -> 2.2

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

diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index a546441996e..35079ea2738 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }:
 stdenv.mkDerivation rec {
   name = "eq10q-${version}";
-  version = "2.1";
+  version = "2.2";
   src = fetchurl {
     url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
-    sha256 = "0brrr6ydsppi4zzn3vcgl0zgq5r8jmlcap1hpr3k43yvlwggb880";
+    sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
   };
 
   buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
-- 
GitLab


From c3399e5934b8a9b6dbee6fdef61897df8ab769f3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Jun 2017 13:34:17 +0200
Subject: [PATCH 0752/1490] haskell-hastache: don't install the internal
 mkReadme tool

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ec6e723db0d..ed99118850f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -305,7 +305,6 @@ self: super: {
   haeredes = dontCheck super.haeredes;
   hashed-storage = dontCheck super.hashed-storage;
   hashring = dontCheck super.hashring;
-  hastache = dontCheck super.hastache;
   hath = dontCheck super.hath;
   haxl-facebook = dontCheck super.haxl-facebook;        # needs facebook credentials for testing
   hdbi-postgresql = dontCheck super.hdbi-postgresql;
@@ -861,4 +860,11 @@ self: super: {
   # build liquidhaskell with the proper (old) aeson version
   liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; };
 
+  # Test suite fails: https://github.com/lymar/hastache/issues/46.
+  # Don't install internal mkReadme tool.
+  hastache = overrideCabal super.hastache (drv: {
+    doCheck = false;
+    postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
+  });
+
 }
-- 
GitLab


From 0d92084f756032ae7f23ebed9873a2a5cd15d16f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 06:40:48 -0500
Subject: [PATCH 0753/1490] at: Don't set fancy bits on install

---
 pkgs/tools/system/at/install.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/at/install.patch b/pkgs/tools/system/at/install.patch
index 0297d680aa4..35be4af875a 100644
--- a/pkgs/tools/system/at/install.patch
+++ b/pkgs/tools/system/at/install.patch
@@ -20,7 +20,7 @@
 +	$(INSTALL) -m 755 -d $(IROOT)$(sbindir)
 +	$(INSTALL) -m 755 -d $(IROOT)$(docdir)
 +	$(INSTALL) -m 755 -d $(IROOT)$(atdocdir)
-+	$(INSTALL) -m 6755 -s at $(IROOT)$(bindir)
++	$(INSTALL) -m 0755 -s at $(IROOT)$(bindir)
  	$(LN_S) -f at $(IROOT)$(bindir)/atq
  	$(LN_S) -f at $(IROOT)$(bindir)/atrm
 -	$(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
-- 
GitLab


From 3d5409ac970d624e5c75708e0176ca2e8b3b59b9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 06:44:14 -0500
Subject: [PATCH 0754/1490] cron: don't set special permissions

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

diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index 910bee727bb..13e55405d70 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   hardeningEnable = [ "pie" ];
 
   preBuild = ''
-    substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755
+    substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755 --replace 4755 0755
     makeFlags="DESTROOT=$out CC=cc"
 
     # We want to ignore the $glibc/include/paths.h definition of
-- 
GitLab


From 714cd37b2150407960305d789d759d5191750b51 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 06:48:04 -0500
Subject: [PATCH 0755/1490] logcheck: Don't set special permissions

---
 pkgs/tools/system/logcheck/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 40cee73dcd2..d551738b1f3 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "1x4skb5nmv2xj8cygj8pq1rd1ws4m2fsibw54yslgdyjri4r2yq7";
   };
 
+  prePatch = ''
+    substituteInPlace Makefile --replace 2750 0750
+  '';
+
   preConfigure = ''
     substituteInPlace src/logtail --replace "/usr/bin/perl" "${perl}/bin/perl"
     substituteInPlace src/logtail2 --replace "/usr/bin/perl" "${perl}/bin/perl"
-- 
GitLab


From 4d57153659a2c3a47aa297a396f04a6c62d6efbb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 06:51:16 -0500
Subject: [PATCH 0756/1490] logkeys: Don't chmod u+s

---
 pkgs/tools/security/logkeys/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
index b856308712f..2d58bcc9a23 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace src/Makefile.in --replace 'root' '$(id -u)'
     substituteInPlace configure --replace '/dev/input' '/tmp'
+    sed -i '/chmod u+s/d' src/Makefile.in
  '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 98b2e4816f0f2d638268f896bd79c69c28a4fe77 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 06:54:39 -0500
Subject: [PATCH 0757/1490] udevil: minor cleanup, fix setuid/setgid problems

---
 pkgs/applications/misc/udevil/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
index 8ce683ec908..83ebef7f10d 100644
--- a/pkgs/applications/misc/udevil/default.nix
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation {
   };
   buildInputs = [ intltool glib pkgconfig udev ];
   configurePhase = ''
-    substituteInPlace src/Makefile.am --replace "-o root -g root" ""
     substituteInPlace src/Makefile.in --replace "-o root -g root" ""
+    substituteInPlace src/Makefile.in --replace 4755 0755
     ./configure \
       --prefix=$out \
       --with-mount-prog=${utillinux}/bin/mount \
@@ -17,10 +17,6 @@ stdenv.mkDerivation {
       --with-setfacl-prog=${acl.bin}/bin/setfacl \
       --sysconfdir=$prefix/etc
   '';
-  preConfigure = ''
-    cat src/Makefile.am
-    exit 2
-  '';
   patches = [ ./device-info-sys-stat.patch ];
   meta = {
     description = "A command line Linux program which mounts and unmounts removable devices without a password, shows device info, and monitors device changes";
-- 
GitLab


From 9f399c40e92c452d6133c04c46c0a41196db1f4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Jun 2017 11:08:07 +0100
Subject: [PATCH 0758/1490] dino: 2017-05-31 -> 2017-06-13

---
 .../networking/instant-messengers/dino/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 94adef2dda8..611146080bd 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2017-05-31";
+  name = "dino-unstable-2017-06-13";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "2480c1ec26a8e0ccef3ea76e3c29566221405ffb";
-    sha256 = "0wdjj38gbr2j6yklna3pd8nsfpdfp1j936dy8s49pzayw4pxs2g2";
+    rev = "7bbbb738fdb233f4ad91ffdd7d9247b28849d715";
+    sha256 = "09w26c6b5rkrrz7wvm629cncpdmd5n0d0805h8hw69bbzirpjjh2";
     fetchSubmodules = true;
   };
 
-- 
GitLab


From b6caf109897f5860999d73680048640fd8525776 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 07:04:54 -0500
Subject: [PATCH 0759/1490] xconq: don't set special perms on install

---
 pkgs/games/xconq/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix
index e6e23752953..4bb39762939 100644
--- a/pkgs/games/xconq/default.nix
+++ b/pkgs/games/xconq/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     # Fix Makefiles
     find . -name 'Makefile.in' -exec sed -re 's@^        ( *)(cd|[&][&])@	\1\2@' -i '{}' ';'
     find . -name 'Makefile.in' -exec sed -e '/chown/d; /chgrp/d' -i '{}' ';'
+    find . -name 'Makefile.in' -exec sed -e 's/04755/755/g' -i '{}' ';'
     sed -e '/^			* *[$][(]tcltkdir[)]\/[*][.][*]/d' -i tcltk/Makefile.in
 
     # Fix C files
-- 
GitLab


From d0e6dcca4e352df6323e05774a8547adcba6ad7b Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 12:43:13 +0200
Subject: [PATCH 0760/1490] jalv: 1.4.6 -> 1.6.0

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

diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index bcec085887a..e2c86256ce6 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation  rec {
   name = "jalv-${version}";
-  version = "1.4.6";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9";
+    sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
   };
 
   buildInputs = [
-- 
GitLab


From 65ce8aa99229ff6b1c8c474441f77dc1d4e684c4 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 12:43:33 +0200
Subject: [PATCH 0761/1490] lv2bm: git-2015-04-10 -> git-2015-11-29

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

diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix
index 32a4f255abe..a7c8098dd79 100644
--- a/pkgs/applications/audio/lv2bm/default.nix
+++ b/pkgs/applications/audio/lv2bm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lv2bm-${version}";
-  version = "git-2015-04-10";
+  version = "git-2015-11-29";
 
   src = fetchFromGitHub {
-    owner = "portalmod";
+    owner = "moddevices";
     repo = "lv2bm";
-    rev = "08681624fc13eb700ec2b5cabedbffdf095e28b3";
-    sha256 = "11pi97jy4f4c3vsaizc8a6sw9hnhnanj6y1fil33yd9x7f8f0kbj";
+    rev = "e844931503b7597f45da6d61ff506bb9fca2e9ca";
+    sha256 = "1rrz5sp04zjal6v34ldkl6fjj9xqidb8xm1iscjyljf6z4l516cx";
   };
 
   buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ];
-- 
GitLab


From d990d618c0ad555ed222bf453adb1c82c20f809c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 16 Jun 2017 08:09:15 -0400
Subject: [PATCH 0762/1490] atom: 1.17.2 -> 1.18.0

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index e936c8a5a7c..39fe8fcb77e 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.17.2";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "05lf9f5c9l111prx7d76cr5h8h340vm7vb8hra5rdrqhjpdvwhhn";
+    sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6";
     name = "${name}.deb";
   };
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildCommand = ''
     mkdir -p $out/usr/
-    ar p $src data.tar.gz | tar -C $out -xz ./usr
+    ar p $src data.tar.xz | tar -C $out -xJ ./usr
     substituteInPlace $out/usr/share/applications/atom.desktop \
       --replace /usr/share/atom $out/bin
     mv $out/usr/* $out/
-- 
GitLab


From 94c6b321e9ad229ebdb87a3b11eb421077f2038e Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 12:44:16 +0200
Subject: [PATCH 0763/1490] sorcer: 1.1.1 -> 1.1.3

---
 pkgs/applications/audio/sorcer/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix
index ef28180cc3b..979f15d4006 100644
--- a/pkgs/applications/audio/sorcer/default.nix
+++ b/pkgs/applications/audio/sorcer/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
+{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
 
 stdenv.mkDerivation rec {
   name = "sorcer-${version}";
-  version = "1.1.1";
+  version = "1.1.3";
 
-  src = fetchurl {
-    url = "https://github.com/harryhaaren/openAV-Sorcer/archive/release-${version}.tar.gz";
-    sha256 = "1jkhs2rhn4givac7rlbj8067r7qq6jnj3ixabb346nw7pd6gn1wn";
+  src = fetchFromGitHub {
+    owner = "openAVproductions";
+    repo = "openAV-Sorcer";
+    rev = "release-${version}";
+    sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp";
   };
 
   buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ];
-- 
GitLab


From 5d0a8792a745418b7f47b82c8ad32acee58a069d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 07:11:02 -0500
Subject: [PATCH 0764/1490] uucp: Don't chown to 'uucp' user, don't set special
 perms

---
 pkgs/tools/misc/uucp/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix
index 4ef050b409e..39368da68be 100644
--- a/pkgs/tools/misc/uucp/default.nix
+++ b/pkgs/tools/misc/uucp/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  prePatch = ''
+    substituteInPlace Makefile.in \
+      --replace 4555 0555
+    sed -i '/chown $(OWNER)/d' Makefile.in
+  '';
+
   meta = {
     description = "Unix-unix cp over serial line, also includes cu program";
 
-- 
GitLab


From 6c3459772beabbbc5dbaf208a9c427f562f64fb8 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 12:44:41 +0200
Subject: [PATCH 0765/1490] ntk: 2014-10-18 -> 2017-04-22

---
 pkgs/development/libraries/audio/ntk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix
index 4f58adefdf3..35144862ce9 100644
--- a/pkgs/development/libraries/audio/ntk/default.nix
+++ b/pkgs/development/libraries/audio/ntk/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ntk-${version}";
-  version = "2014-10-18";
+  version = "2017-04-22";
   src = fetchgit {
     url = "git://git.tuxfamily.org/gitroot/non/fltk.git";
-    rev = "5719b0044d9f267de5391fab006370cc7f4e70bd";
-    sha256 = "1wpqy5kk6sk31qyx1c6gdslcqcbczgji6lk8w1l8kri0s908ywyj";
+    rev = "92365eca0f9a6f054abc70489c009aba0fcde0ff";
+    sha256 = "0pph7hf07xaa011zr40cs62f3f7hclfbv5kcrl757gcp2s5pi2iq";
   };
 
   buildInputs = [
-- 
GitLab


From b3f1f88175e8e33e7195da126407e6f4e5729345 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 17:00:16 +0200
Subject: [PATCH 0766/1490] qjackctl: 0.4.4 -> 0.4.5

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

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 857f77bbdaf..c5a977d741a 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.4";
+  version = "0.4.5";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak";
+    sha256 = "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5";
   };
 
   buildInputs = [
-- 
GitLab


From 8098e4048bbce82e37603199c56334213e103b91 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 07:13:54 -0500
Subject: [PATCH 0767/1490] super: Don't set special perms, don't chown to root

---
 pkgs/tools/security/super/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix
index abfdf8eedca..01e5dd4b20b 100644
--- a/pkgs/tools/security/super/default.nix
+++ b/pkgs/tools/security/super/default.nix
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0k476f83w7f45y9jpyxwr00ikv1vhjiq0c26fgjch9hnv18icvwy";
   };
 
+  prePatch = ''
+    substituteInPlace Makefile.in \
+      --replace "-o root" "" \
+      --replace 04755 755
+  '';
+
   patches = [
    (fetchpatch { url = http://anonscm.debian.org/cgit/users/robert/super.git/plain/debian/patches/14-Fix-unchecked-setuid-call.patch;
                  sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh";
-- 
GitLab


From 37bd5d40f92fb4c5ce586e5ec6e9930c8d2ec275 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 17:00:55 +0200
Subject: [PATCH 0768/1490] qmidinet: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 89f1682592a..132e4a0fca2 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.2";
+  version = "0.4.3";
   name = "qmidinet-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
-    sha256 = "1sdnd189db44xhl9p8pd8h4bsy8s0bn1y64lrdq7nb21mwg8ymcs";
+    sha256 = "1qhxhlvi6bj2a06i48pw81zf5vd36idxbq04g30794yhqcimh6vw";
   };
 
   hardeningDisable = [ "format" ];
-- 
GitLab


From 38b3e42f54ba1fc26f347829b69bd6dc563df0cc Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 16 Jun 2017 09:14:38 -0300
Subject: [PATCH 0769/1490] tint2: 0.14.5 -> 0.14.6

---
 pkgs/applications/misc/tint2/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 4b6f286351c..3edc9b73bb5 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.14.5";
+  version = "0.14.6";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "tint2";
     rev = version;
-    sha256 = "1nfvcw95wggih7pxh53cx4nlamny73nh88ggfh6a0ajjhafrd2j2";
+    sha256 = "0v7i8araj85cbl45icinvmsz5741cx2ybjgkx72m3xfcb9fqg69l";
   };
 
   enableParallelBuilding = true;
@@ -28,8 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   prePatch = ''
-    for f in ./src/tint2conf/properties.c \
-             ./src/launcher/apps-common.c \
+    for f in ./src/launcher/apps-common.c \
              ./src/launcher/icon-theme-common.c \
              ./themes/*tint2rc
     do
-- 
GitLab


From 9560fcbadf2b3784ed2515a6027afa8a67a3fec5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 16 Jun 2017 08:16:30 -0400
Subject: [PATCH 0770/1490] curl: 7.54.0 -> 7.54.1

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

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 67c7e82b4ff..d1f7c4112c6 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.54.0";
+  name = "curl-7.54.1";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "01pz0air8xiwiww981z94980zgcbz8482jxy6b6afzsh7ksbl3pm";
+    sha256 = "1815iz5a7qghipjcl7s97hk4jqh4f3kqc487xi20rvh1s3r4vz7x";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
-- 
GitLab


From 479d9f9cd321910d49f2803f200042dde1c1a8ab Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 07:18:20 -0500
Subject: [PATCH 0771/1490] xsokoban: Don't set special bits on install

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

diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index 47d05b7e3f6..2ec47d5d8b2 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  prePatch = ''
+    substituteInPlace Makefile.in --replace 4755 0755
+  '';
+
   preConfigure = ''
     sed -e 's/getline/my_getline/' -i score.c
 
-- 
GitLab


From 7270b9b425af84a287ed25ae6b976e3dd48696f8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 07:22:20 -0500
Subject: [PATCH 0772/1490] rewritefs: Don't attempt to set special bits

---
 pkgs/os-specific/linux/rewritefs/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
index 362f3edbc92..ac796c1fe58 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
  
   buildInputs = [ pkgconfig fuse pcre ];
 
+  prePatch = ''
+    substituteInPlace Makefile --replace 6755 0755
+  '';
+
   preConfigure = "substituteInPlace Makefile --replace /usr/local $out";
 
   meta = with stdenv.lib; {
-- 
GitLab


From b20b2af59fead38ef5d7839580de95106663cbbc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 07:24:39 -0500
Subject: [PATCH 0773/1490] unnethack: override GAMEPERM to not include special
 bits

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

diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix
index ae32de2e771..ea0186323c0 100644
--- a/pkgs/games/unnethack/default.nix
+++ b/pkgs/games/unnethack/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
                      "--with-gamesdir=/tmp/unnethack"
                    ];
 
+  makeFlags = [ "GAMEPERM=744" ];
+
   postInstall = ''
     cp -r /tmp/unnethack $out/share/unnethack/profile
     mv $out/bin/unnethack $out/bin/.wrapped_unnethack
-- 
GitLab


From bb1e0b51de9f40639fd4b4fca57421d72fb86df7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 07:27:23 -0500
Subject: [PATCH 0774/1490] torque: Patch out attempts to set special bits

---
 pkgs/servers/computing/torque/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix
index 6d0037f74bd..d0b8567c748 100644
--- a/pkgs/servers/computing/torque/default.nix
+++ b/pkgs/servers/computing/torque/default.nix
@@ -29,8 +29,9 @@ stdenv.mkDerivation rec {
 
    for f in $(find ./ -name Makefile.in); do
      echo patching $f...
-     sed -i $f -e '/PBS_MKDIRS/d'
+     sed -i $f -e '/PBS_MKDIRS/d' -e '/chmod u+s/d'
    done
+
   '';
 
   postInstall = ''
-- 
GitLab


From a4a0f301085279936a97cc8f498d9f473f4580a8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 16 Jun 2017 08:29:08 -0400
Subject: [PATCH 0775/1490] gradle: 3.5 -> 4.0

---
 .../tools/build-managers/gradle/default.nix            | 10 ++++++++++
 pkgs/top-level/all-packages.nix                        |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 51aaf5e6a79..460c6d44e4e 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,6 +52,16 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
+    name = "gradle-4.0";
+    nativeVersion = "0.14";
+
+    src = fetchurl {
+      url = "http://services.gradle.org/distributions/${name}-bin.zip";
+      sha256 = "1zlxnyb7iva0bb0862vbigfjrmxgbisa2zam7j896ams57g2vgan";
+    };
+  };
+
+  gradle_3_5 = gradleGen rec {
     name = "gradle-3.5";
     nativeVersion = "0.14";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..14a96c13d22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6789,6 +6789,7 @@ with pkgs;
   gradle = self.gradleGen.gradle_latest;
   gradle_2_14 = self.gradleGen.gradle_2_14;
   gradle_2_5 = self.gradleGen.gradle_2_5;
+  gradle_3_5 = self.gradleGen.gradle_3_5;
 
   gperf = callPackage ../development/tools/misc/gperf { };
   # 3.1 changed some parameters from int to size_t, leading to mismatches.
-- 
GitLab


From 7eaa7adf4e7f3e32be85dcf3bd34ffd6b4cf23be Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 07:31:21 -0500
Subject: [PATCH 0776/1490] rssh: don't set special bits

---
 pkgs/shells/rssh/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix
index b84f5f26685..d3ce1ff1cc2 100644
--- a/pkgs/shells/rssh/default.nix
+++ b/pkgs/shells/rssh/default.nix
@@ -59,6 +59,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # Run this after to avoid conflict with patches above
+  postPatch = ''
+    sed -i '/chmod u+s/d' Makefile.in
+  '';
+
+
   buildInputs = [ openssh rsync cvs ];
 
   configureFlags = [
-- 
GitLab


From ef2f34d3d7693df68829aa3cc8f47a12ab9fd919 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 16 Jun 2017 08:32:00 -0400
Subject: [PATCH 0777/1490] kotlin: 1.1.2 -> 1.1.2-5

---
 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 ca788a57c7c..e23bee15e1b 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.2";
+  version = "1.1.2-5";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0kngyv5qjjpd93i1b8gn1vw6r8p52lfjrqa2f13nf06v9aqk0vfb";
+    sha256 = "0whfnn7wf8nil9lb8hl9bccjrzwf9zpbf8pz607zg9x3q8g01p9d";
   };
 
   propagatedBuildInputs = [ jre ] ;
-- 
GitLab


From 5e9edcfebefb09fd208c195856b073a4e5769248 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 07:34:53 -0500
Subject: [PATCH 0778/1490] hiawatha: Don't ask cmake to install w/setuid perms

---
 pkgs/servers/http/hiawatha/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index 26566b2281c..c5dd9f7a577 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
 
   buildInputs =  [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ;
 
+  prePatch = ''
+    substituteInPlace CMakeLists.txt --replace SETUID ""
+  '';
+
   cmakeFlags = [
     ( if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" )
     ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" )
-- 
GitLab


From 6383a544406cb3642658113fbda160830b573912 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 16 Jun 2017 12:03:04 +0200
Subject: [PATCH 0779/1490] Ardour: 5.8 -> 5.10

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

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 57864f863e3..c447863e149 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -16,7 +16,7 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "5.8";
+  tag = "5.10";
 
 in
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    rev = "e5c6f16126e0901654b09ecce990554b1ff73833";
-    sha256 = "1lcvslrcw6g4kp9w0h1jx46x6ilz4nzz0k2yrw4gd545k1rwx0c1";
+    rev = "9c629c0c76808cc3e8f05e43bc760f849566dce6";
+    sha256 = "062igiaaj18kbismrpzbafyq1ryyqj3lh0ajqqs2s8ms675x33sl";
   };
 
   buildInputs =
-- 
GitLab


From c42d603910ae21f09a1a22792c60c5f03af8ce39 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 16 Jun 2017 12:03:23 +0200
Subject: [PATCH 0780/1490] lilv: 0.24.0 -> 0.24.2

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

diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 101322f3f53..87ff0bdb0b6 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lilv-${version}";
-  version = "0.24.0";
+  version = "0.24.2";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "17pv4wdaj7m5ghpfs7h7d8jd105xfzyn2lj438xslj1ndm9xwq7s";
+    sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p";
   };
 
   buildInputs = [ lv2 pkgconfig python serd sord sratom ];
-- 
GitLab


From 53b6f15d34630f005c4faeb53a5842b691235504 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 16 Jun 2017 12:03:57 +0200
Subject: [PATCH 0781/1490] serd: 0.24.0 -> 0.26.0

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

diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index d68503298fc..0023427f1ba 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "serd-${version}";
-  version = "0.24.0";
+  version = "0.26.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0v3a9xss5ailrnb3flfjyl6l9pmp51dc02p0lr6phvwsipg8mywc";
+    sha256 = "164j43am4hka2vbzw4n52zy7rafgp6kmkgbcbvap368az644mr73";
   };
 
   buildInputs = [ pcre pkgconfig python ];
-- 
GitLab


From fc0a4a52f9d08051e78abfac927f75591f054bfe Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 16 Jun 2017 15:01:49 +0200
Subject: [PATCH 0782/1490] clipster: 2017-02-27 -> 1.0.1

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

diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index 547cc289c3c..e34f4bc8f2f 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -1,14 +1,14 @@
 {fetchFromGitHub , stdenv, makeWrapper, python3, gtk3, libwnck3 }:
 
 stdenv.mkDerivation  rec {
-  name = "clipster-unstable-${version}";
-  version = "2017-02-27";
+  name = "clipster-${version}";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
-    rev = "dfa75b52ee3a41fff7534aca165dc0e6a24a3680";
-    sha256 = "0d7ak6wpvvgz7cwvfzy2shkfiw6gr8l703xyjpiayjbnr2s79k5j";
+    rev = "${version}";
+    sha256 = "0y0igi5r5x2gxglm0aarn2mhdfn6whakm6359i3h0wkn6qw1p1l2";
   };
 
   pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
-- 
GitLab


From 7d126080695d2f84c440953735c6be087074e7c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Jun 2017 16:21:48 +0100
Subject: [PATCH 0783/1490] llvmPackages_3.7: fix libnames output of
 llvm-config

see also 4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7
---
 .../compilers/llvm/3.7/fix-llvm-config.patch        | 13 +++++++++++++
 pkgs/development/compilers/llvm/3.7/llvm.nix        |  5 +++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch

diff --git a/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
new file mode 100644
index 00000000000..772c4960927
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
@@ -0,0 +1,13 @@
+diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
+index eacefdf60bf..40d25f5cef8 100644
+--- a/utils/llvm-build/llvmbuild/main.py
++++ b/utils/llvm-build/llvmbuild/main.py
+@@ -412,7 +412,7 @@ subdirectories = %s
+             if library_name is None:
+                 library_name_as_cstr = '0'
+             else:
+-                library_name_as_cstr = '"lib%s.a"' % library_name
++                library_name_as_cstr = '"lib%s.so"' % library_name
+             f.write('  { "%s", %s, %d, { %s } },\n' % (
+                 name, library_name_as_cstr, is_installed,
+                 ', '.join('"%s"' % dep
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index d4e7c73ad0d..1bdefd214f9 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -53,6 +53,11 @@ in stdenv.mkDerivation rec {
     ln -sv $PWD/lib $out
   '';
 
+  patches = stdenv.lib.optionals (!stdenv.isDarwin) [
+    # llvm-config --libfiles returns (non-existing) static libs
+    ./fix-llvm-config.patch
+  ];
+
   cmakeFlags = with stdenv; [
     "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
     "-DLLVM_INSTALL_UTILS=ON"  # Needed by rustc
-- 
GitLab


From 794a4a5ce58dea4f164c53db601ef1af3bc8b2e1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 10:41:33 -0500
Subject: [PATCH 0784/1490] xsokoban: Fix OWNER username quoting, maybe fix
 travis?

---
 pkgs/games/xsokoban/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index 2ec47d5d8b2..814241244e3 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     cat >>config.h <<EOF
     #define HERE "@nixos-packaged"
     #define WWW 0
-    #define OWNER "'$(whoami)'"
+    #define OWNER "$(whoami)"
     #define ROOTDIR "$out/lib/xsokoban"
     #define ANYLEVEL 1
     #define SCOREFILE ".xsokoban-score"
-- 
GitLab


From b1928704d440f6c2ec36444d709c340dd1dec469 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 16 Jun 2017 15:47:38 +0000
Subject: [PATCH 0785/1490] sbt: support build scala-native targets

---
 .../tools/build-managers/sbt/scala-native.nix      | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix                    |  1 +
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/sbt/scala-native.nix

diff --git a/pkgs/development/tools/build-managers/sbt/scala-native.nix b/pkgs/development/tools/build-managers/sbt/scala-native.nix
new file mode 100644
index 00000000000..6c8b44605a3
--- /dev/null
+++ b/pkgs/development/tools/build-managers/sbt/scala-native.nix
@@ -0,0 +1,14 @@
+{ lib, sbt, makeWrapper, boehmgc, libunwind, re2, llvmPackages, zlib }:
+
+sbt.overrideDerivation(old: {
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/sbt \
+      --set CLANG_PATH      "${llvmPackages.clang}/bin/clang" \
+      --set CLANGPP_PATH    "${llvmPackages.clang}/bin/clang" \
+      --set CPATH           "${lib.makeSearchPathOutput "dev" "include" [ re2 zlib boehmgc libunwind llvmPackages.libcxxabi llvmPackages.libcxx ]}/c++/v1" \
+      --set LIBRARY_PATH    "${lib.makeLibraryPath [ re2 zlib boehmgc libunwind llvmPackages.libcxxabi llvmPackages.libcxx ]}" \
+      --set NIX_CFLAGS_LINK "-lc++abi -lc++"
+  '';
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d929c23dd8c..104c1b90c40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7062,6 +7062,7 @@ with pkgs;
   scons = callPackage ../development/tools/build-managers/scons { };
 
   sbt = callPackage ../development/tools/build-managers/sbt { };
+  sbt-with-scala-native = callPackage ../development/tools/build-managers/sbt/scala-native.nix { };
   simpleBuildTool = sbt;
 
   shards = callPackage ../development/tools/build-managers/shards { };
-- 
GitLab


From 672d2dfbb83890200224a90c6155f3c1d6019190 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 16 Jun 2017 19:17:22 +0200
Subject: [PATCH 0786/1490] aws-sdk-cpp: Fix credentials test

These require a home directory.

http://hydra.nixos.org/build/54519006
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index c80abd5f3a0..95041097665 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -43,6 +43,8 @@ in stdenv.mkDerivation rec {
       for i in testing-resources aws-cpp-sdk-*; do
         export ${loaderVar}=$(pwd)/$i:''${${loaderVar}}
       done
+
+      export HOME=$TMPDIR
     '';
 
   NIX_LDFLAGS = lib.concatStringsSep " " (
-- 
GitLab


From ac8451508b7dc04a045a6825f5e1c0cad449e7a4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 16 Jun 2017 19:15:41 +0200
Subject: [PATCH 0787/1490] aws-sdk-cpp: 1.0.127 -> 1.0.153

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

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 95041097665..434c685e823 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -14,13 +14,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.0.127";
+  version = "1.0.153";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "1p06rkvi6mm4jylk5j7gji2c52qbls3i0yqg3hgs9iys4nd1p14r";
+    sha256 = "0mglg9a6klmsam8r9va7y5x2s8xylhljwcg93sr8152rvhxnjv08";
   };
 
   # FIXME: might be nice to put different APIs in different outputs
-- 
GitLab


From 0bb2f9af5e6d654ad0d75adbcaf245ad77f35a18 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Jun 2017 11:33:15 +0200
Subject: [PATCH 0788/1490] LTS Haskell 8.18

---
 .../configuration-hackage2nix.yaml            | 71 ++++++++++---------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 42334b380b7..a9769e73f30 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 8.17
+  # LTS Haskell 8.18
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -348,7 +348,7 @@ default-package-overrides:
   - check-email ==1.0.2
   - checkers ==0.4.6
   - chell ==0.4.0.1
-  - choice ==0.2.0
+  - choice ==0.2.1
   - chunked-data ==0.3.0
   - cipher-aes ==0.2.11
   - cipher-aes128 ==0.7.0.3
@@ -403,7 +403,7 @@ default-package-overrides:
   - concurrent-output ==1.7.9
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
-  - conduit ==1.2.10
+  - conduit ==1.2.11
   - conduit-combinators ==1.1.1
   - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.16
@@ -497,7 +497,7 @@ default-package-overrides:
   - data-inttrie ==0.1.2
   - data-lens-light ==0.1.2.2
   - data-memocombinators ==0.5.1
-  - data-msgpack ==0.0.9
+  - data-msgpack ==0.0.10
   - data-or ==1.0.0.5
   - data-ordlist ==0.4.7.0
   - data-ref ==0.0.1.1
@@ -526,7 +526,7 @@ default-package-overrides:
   - diagrams-core ==1.4
   - diagrams-gtk ==1.4
   - diagrams-html5 ==1.4
-  - diagrams-lib ==1.4.1
+  - diagrams-lib ==1.4.1.2
   - diagrams-postscript ==1.4
   - diagrams-rasterific ==1.4
   - diagrams-solve ==0.1.0.1
@@ -601,7 +601,7 @@ default-package-overrides:
   - ekg-statsd ==0.2.1.0
   - ekg-wai ==0.1.0.1
   - elerea ==2.9.0
-  - elm-bridge ==0.4.0
+  - elm-bridge ==0.4.1
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - elm-export-persistent ==0.1.2
@@ -705,7 +705,7 @@ default-package-overrides:
   - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
-  - foundation ==0.0.9
+  - foundation ==0.0.10
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
@@ -740,7 +740,7 @@ default-package-overrides:
   - ghc-mod ==5.7.0.0
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.3.0.2
-  - ghc-syb-utils ==0.2.3
+  - ghc-syb-utils ==0.2.3.1
   - ghc-tcplugins-extra ==0.2
   - ghc-typelits-extra ==0.2.3
   - ghc-typelits-knownnat ==0.2.4
@@ -757,7 +757,7 @@ default-package-overrides:
   - gi-gio ==2.0.12
   - gi-glib ==2.0.12
   - gi-gobject ==2.0.12
-  - gi-gtk ==3.0.14
+  - gi-gtk ==3.0.15
   - gi-javascriptcore ==3.0.12
   - gi-pango ==1.0.13
   - gi-soup ==2.4.12
@@ -920,7 +920,7 @@ default-package-overrides:
   - haddock-library ==1.4.3
   - hailgun ==0.4.1.3
   - hailgun-simple ==0.1.0.0
-  - hakyll ==4.9.5.1
+  - hakyll ==4.9.7.0
   - half ==0.2.2.3
   - hamilton ==0.1.0.0
   - hamlet ==1.2.0
@@ -991,7 +991,7 @@ default-package-overrides:
   - hedis ==0.9.8
   - here ==1.2.11
   - heredoc ==0.2.0.0
-  - heterocephalus ==1.0.4.0
+  - heterocephalus ==1.0.5.0
   - hex ==0.1.2
   - hexml ==0.3.2
   - hexpat ==0.20.10
@@ -1068,7 +1068,7 @@ default-package-overrides:
   - hslua-aeson ==0.1.0.4
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.8
+  - HsOpenSSL ==0.11.4.9
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.4.3
@@ -1232,7 +1232,7 @@ default-package-overrides:
   - jwt ==0.7.2
   - kan-extensions ==5.0.2
   - kansas-comet ==0.4
-  - katip ==0.3.1.4
+  - katip ==0.3.1.5
   - katip-elasticsearch ==0.3.0.2
   - kawhi ==0.2.3
   - kdt ==0.2.4
@@ -1254,7 +1254,7 @@ default-package-overrides:
   - language-glsl ==0.2.0
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.8
-  - language-javascript ==0.6.0.9
+  - language-javascript ==0.6.0.10
   - language-lua2 ==0.1.0.5
   - language-puppet ==1.3.7
   - language-python ==0.5.4
@@ -1355,7 +1355,7 @@ default-package-overrides:
   - median-stream ==0.7.0.0
   - mega-sdist ==0.3.0.2
   - megaparsec ==5.2.0
-  - memory ==0.14.5
+  - memory ==0.14.6
   - MemoTrie ==0.6.7
   - mersenne-random ==1.0.0.1
   - mersenne-random-pure64 ==0.2.2.0
@@ -1555,7 +1555,7 @@ default-package-overrides:
   - parsec ==3.1.11
   - parsec-numeric ==0.1.0.0
   - ParsecTools ==0.0.2.0
-  - parsers ==0.12.4
+  - parsers ==0.12.5
   - partial-handler ==1.0.2
   - partial-isomorphisms ==0.2.2.1
   - patat ==0.5.2.0
@@ -1590,7 +1590,7 @@ default-package-overrides:
   - picoparsec ==0.1.2.3
   - pid1 ==0.1.0.1
   - pinboard ==0.9.12.4
-  - pinch ==0.3.1.0
+  - pinch ==0.3.2.0
   - pinchot ==0.24.0.0
   - pipes ==4.3.4
   - pipes-attoparsec ==0.5.1.5
@@ -1667,12 +1667,12 @@ default-package-overrides:
   - prometheus-client ==0.1.1
   - prometheus-metrics-ghc ==0.1.1
   - prompt ==0.1.1.2
-  - proto-lens ==0.2.0.1
+  - proto-lens ==0.2.1.0
   - proto-lens-arbitrary ==0.1.0.2
-  - proto-lens-combinators ==0.1.0.6
-  - proto-lens-descriptors ==0.2.0.1
+  - proto-lens-combinators ==0.1.0.7
+  - proto-lens-descriptors ==0.2.1.0
   - proto-lens-optparse ==0.1.0.2
-  - proto-lens-protoc ==0.2.0.1
+  - proto-lens-protoc ==0.2.1.0
   - protobuf ==0.2.1.1
   - protobuf-simple ==0.1.0.4
   - protocol-buffers ==2.4.0
@@ -1747,7 +1747,7 @@ default-package-overrides:
   - reform-happstack ==0.2.5.1
   - reform-hsp ==0.2.7.1
   - RefSerialize ==0.4.0
-  - regex ==1.0.1.0
+  - regex ==1.0.1.3
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.93.2
@@ -1759,7 +1759,7 @@ default-package-overrides:
   - regex-posix ==0.95.2
   - regex-tdfa ==1.2.2
   - regex-tdfa-text ==1.0.0.3
-  - regex-with-pcre ==1.0.1.0
+  - regex-with-pcre ==1.0.1.3
   - reinterpret-cast ==0.1.0
   - relational-query ==0.8.4.0
   - relational-query-HDBC ==0.6.0.3
@@ -1819,7 +1819,7 @@ default-package-overrides:
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
-  - scientific ==0.3.4.13
+  - scientific ==0.3.4.15
   - scotty ==0.11.0
   - scrape-changes ==0.1.0.5
   - scrypt ==0.5.0
@@ -2061,7 +2061,7 @@ default-package-overrides:
   - temporary ==1.2.0.4
   - temporary-rc ==1.2.0.3
   - termcolor ==0.2.0.0
-  - terminal-progress-bar ==0.1.1
+  - terminal-progress-bar ==0.1.1.1
   - terminal-size ==0.3.2.1
   - terminfo ==0.4.1.0
   - test-fixture ==0.5.0.1
@@ -2124,7 +2124,7 @@ default-package-overrides:
   - timemap ==0.0.4
   - timerep ==2.0.0.2
   - timespan ==0.3.0.0
-  - timezone-olson ==0.1.7
+  - timezone-olson ==0.1.8
   - timezone-series ==0.1.6.1
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
@@ -2145,7 +2145,7 @@ default-package-overrides:
   - true-name ==0.1.0.2
   - tsv2csv ==0.1.0.2
   - ttrie ==0.1.2.1
-  - tttool ==1.7.0.2
+  - tttool ==1.7.0.3
   - tuple ==0.3.0.2
   - tuple-th ==0.2.5
   - tuples-homogenous-h98 ==0.1.1.0
@@ -2174,6 +2174,7 @@ default-package-overrides:
   - tzdata ==0.1.20161123.0
   - ua-parser ==0.7.3
   - uglymemo ==0.1.0.1
+  - unagi-chan ==0.4.0.0
   - unbound ==0.5.1
   - unbound-generics ==0.3.1
   - unbounded-delays ==0.1.1.0
@@ -2208,7 +2209,7 @@ default-package-overrides:
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.8.0
   - unsafe ==0.0
-  - uri-bytestring ==0.2.3.2
+  - uri-bytestring ==0.2.3.3
   - uri-encode ==1.5.0.5
   - uri-templater ==0.2.1.0
   - url ==2.1.3
@@ -2376,12 +2377,12 @@ default-package-overrides:
   - YampaSynth ==0.2
   - yes-precure5-command ==5.5.3
   - yesod ==1.4.5
-  - yesod-auth ==1.4.17.1
+  - yesod-auth ==1.4.17.2
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
   - yesod-auth-hashdb ==1.6.1
   - yesod-bin ==1.5.2.3
-  - yesod-core ==1.4.33
+  - yesod-core ==1.4.35
   - yesod-eventsource ==1.4.1
   - yesod-fay ==0.8.0
   - yesod-form ==1.4.12
@@ -2392,10 +2393,10 @@ default-package-overrides:
   - yesod-newsfeed ==1.6
   - yesod-persistent ==1.4.2
   - yesod-sitemap ==1.4.0.1
-  - yesod-static ==1.5.2
+  - yesod-static ==1.5.3
   - yesod-static-angular ==0.1.8
   - yesod-table ==2.0.3
-  - yesod-test ==1.5.5
+  - yesod-test ==1.5.6
   - yesod-websockets ==0.2.6
   - yi-core ==0.13.5
   - yi-frontend-vty ==0.13.5
@@ -2416,10 +2417,10 @@ default-package-overrides:
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.5
   - zip ==0.1.11
-  - zip-archive ==0.3.0.6
+  - zip-archive ==0.3.1
   - zippers ==0.2.3
-  - ziptastic-client ==0.3.0.2
-  - ziptastic-core ==0.2.0.2
+  - ziptastic-client ==0.3.0.3
+  - ziptastic-core ==0.2.0.3
   - zlib ==0.6.1.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
-- 
GitLab


From 46f8242d89bce76a0d2b7b0ed276262e1ee9f797 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Jun 2017 14:27:39 +0200
Subject: [PATCH 0789/1490] hackage2nix: disable broken 'trasa-reflex' package

Depends on insecure webkitgtk-2.4.11.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a9769e73f30..e4741017b1f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8330,6 +8330,7 @@ dont-distribute-packages:
   transient-universe-tls:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   translatable-intset:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   translate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trasa-reflex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis-meta-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   trawl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traypoweroff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From 0335b93284b156291d77ff121ea51a01c07527c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 12 Jun 2017 11:31:57 +0200
Subject: [PATCH 0790/1490] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-10-g4e4961f from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e2c9a8916e8d005f3c9e6a55f7fc717fdaf4394c.
---
 .../haskell-modules/hackage-packages.nix      | 3048 ++++++++++-------
 1 file changed, 1877 insertions(+), 1171 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 057df5adf58..a384a682757 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7674,6 +7674,8 @@ self: {
        pname = "HJavaScript";
        version = "0.4.7";
        sha256 = "0sb2wqbf6kml5d414xi6jk0gr31673djqxa5wg1mxl40vwn14pvh";
+       revision = "1";
+       editedCabalFile = "05m2kgz0laxv9jl1qfc1sxndan9503010y3aadvfcsxi9cyg3j1j";
        libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
        license = stdenv.lib.licenses.bsd3;
@@ -8698,6 +8700,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "HaRe_0_8_4_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, Cabal
+     , cabal-helper, case-insensitive, containers, conversion
+     , conversion-case-insensitive, conversion-text, Diff, directory
+     , filepath, foldl, ghc, ghc-exactprint, ghc-mod, ghc-syb-utils
+     , gitrev, hslogger, hspec, HUnit, monad-control, mtl
+     , optparse-applicative, optparse-simple, parsec
+     , Strafunski-StrategyLib, syb, syz, turtle
+     }:
+     mkDerivation {
+       pname = "HaRe";
+       version = "0.8.4.1";
+       sha256 = "16ld7lrdf6vjmxam4kfc6zyy2g4baw7mr9ha39nrxjq0p8d4hn3v";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cabal-helper containers directory filepath ghc ghc-exactprint
+         ghc-mod ghc-syb-utils hslogger monad-control mtl
+         Strafunski-StrategyLib syb syz
+       ];
+       executableHaskellDepends = [
+         base Cabal ghc-mod gitrev mtl optparse-applicative optparse-simple
+       ];
+       testHaskellDepends = [
+         attoparsec base base-prelude case-insensitive containers conversion
+         conversion-case-insensitive conversion-text Diff directory foldl
+         ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger hspec HUnit mtl
+         parsec turtle
+       ];
+       homepage = "https://github.com/RefactoringTools/HaRe/wiki";
+       description = "the Haskell Refactorer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HaTeX" = callPackage
     ({ mkDerivation, base, bytestring, containers, matrix, parsec
      , QuickCheck, tasty, tasty-quickcheck, text, transformers
@@ -9729,26 +9766,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
-     , openssl, time
-     }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.4.8";
-       sha256 = "07r190anfnrcy51xy6fqxcpn16sq3jazhjiidkix33kq4w40akfc";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         base bytestring integer-gmp network time
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/vshabanov/HsOpenSSL";
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_4_9" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
      , openssl, time
      }:
@@ -9939,6 +9956,26 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "Hydrogen" = callPackage
+    ({ mkDerivation, aeson, base, binary, directory, HFitUI, MissingH
+     , shakespeare, yaml
+     }:
+     mkDerivation {
+       pname = "Hydrogen";
+       version = "0.1.0.0";
+       sha256 = "10n45j8ri1svxhplpfj88riqk4qigzl02cqxkk3mrsahhgn6bkmp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary directory HFitUI MissingH shakespeare yaml
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/iqsf/Hydrogen.git";
+       description = "The library for generating a WebGL scene for the web";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "IDynamic" = callPackage
     ({ mkDerivation, base, containers, directory }:
      mkDerivation {
@@ -10078,8 +10115,8 @@ self: {
      }:
      mkDerivation {
        pname = "IPv6DB";
-       version = "0.2.0";
-       sha256 = "029qhw6h9vhzdcqbvm0km2fkijr20c0k4gk4ry5p9f3157d5pj0k";
+       version = "0.2.1";
+       sha256 = "1730whn02k1d9w6znfiibz8slwwnbrm1z47s544c24vdziwfh54v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10094,7 +10131,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec http-client http-types vector
        ];
-       homepage = "https://github.com/MichelBoucey/IPv6DB";
+       homepage = "http://ipv6db.cybervisible.com";
        description = "A RESTful Web Service for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13288,6 +13325,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Only" = callPackage
+    ({ mkDerivation, base, deepseq }:
+     mkDerivation {
+       pname = "Only";
+       version = "0.1";
+       sha256 = "0rdj3a629fk2vp121jq8mf2smkblrz5w3cxhlsyx6my2x29s2ymb";
+       libraryHaskellDepends = [ base deepseq ];
+       description = "The 1-tuple type or single-value \"collection\"";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "OpenAFP" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, hashable, hashtables, mtl, process, regex-compat
@@ -14542,6 +14590,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "QuickCheck_2_10_0_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, random
+     , template-haskell, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "QuickCheck";
+       version = "2.10.0.1";
+       sha256 = "0bml00g26vyky6mhfhkzh0rsafcxfkrdvk1imvlb2l4mrli0bm80";
+       libraryHaskellDepends = [
+         base containers deepseq random template-haskell tf-random
+         transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/nick8325/quickcheck";
+       description = "Automatic testing of Haskell programs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "QuickCheck-GenT" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, random }:
      mkDerivation {
@@ -20936,7 +21003,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_2_0_0" = callPackage
+  "aeson_1_2_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
@@ -20948,8 +21015,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.2.0.0";
-       sha256 = "0q0awch81kmq7k8p26wr6h1z31zkfyfxia8386vmsy0bgbcki8fb";
+       version = "1.2.1.0";
+       sha256 = "0wwa2i8jy3q7i8mys8hmy1nhis2a7hbs1bbfpmbj7xcvxpdhy5wn";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text time
@@ -21382,6 +21449,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-pretty_0_8_5" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , cmdargs, scientific, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-pretty";
+       version = "0.8.5";
+       sha256 = "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base-compat bytestring scientific text
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson attoparsec base bytestring cmdargs
+       ];
+       homepage = "http://github.com/informatikr/aeson-pretty";
+       description = "JSON pretty-printing library and command-line tool";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-qq" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
      , haskell-src-meta, hspec, parsec, scientific, template-haskell
@@ -21404,6 +21494,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "aeson-qq_0_8_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
+     , haskell-src-meta, hspec, parsec, scientific, template-haskell
+     , text, vector
+     }:
+     mkDerivation {
+       pname = "aeson-qq";
+       version = "0.8.2";
+       sha256 = "0ln13jqyfh5726hdrk1rad9a6cgrrj201plmwcfcpvq18v4m5ckd";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-compat haskell-src-meta parsec
+         scientific template-haskell text vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec
+         parsec scientific template-haskell text vector
+       ];
+       homepage = "https://github.com/sol/aeson-qq#readme";
+       description = "JSON quasiquoter for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-quick" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, microlens, tasty, tasty-hunit, text
@@ -21928,15 +22041,17 @@ self: {
      }) {};
 
   "aivika" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, random, vector }:
+    ({ mkDerivation, array, base, binary, containers, deepseq, mtl
+     , random, vector
+     }:
      mkDerivation {
        pname = "aivika";
-       version = "5.0.1";
-       sha256 = "0myayp5z77qwcjlvphiigd4sw3mbsxcgn1hm7izr8nn0fh0djpgc";
+       version = "5.1";
+       sha256 = "1mmpqmcvsx3qygwm8iszhcdnafp09vbnnklkskd1qsg55nisp0ps";
        libraryHaskellDepends = [
-         array base containers mtl random vector
+         array base binary containers deepseq mtl random vector
        ];
-       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       homepage = "http://www.aivikasoft.com";
        description = "A multi-method simulation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21947,12 +22062,12 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-branches";
-       version = "0.1.3";
-       sha256 = "1cqzyhc1chzn9bsr3k2s5z2z9jqhg7k7ic2frwdfba2r7lpsqkfi";
+       version = "0.2";
+       sha256 = "0riavp8jvsxmlqxjljm0dsijvrc0vknhkrjgf9g501g5yypd6byy";
        libraryHaskellDepends = [
          aivika aivika-transformers base containers mtl random
        ];
-       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       homepage = "http://www.aivikasoft.com";
        description = "Nested discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21964,30 +22079,30 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "0.3.1";
-       sha256 = "0lp80khb8nw335nwfnn5ik2qzbw4mgijra3p2wyqgakqllflxnz5";
+       version = "0.5";
+       sha256 = "0ghsnq1a9jfrdgaf4gqplka53ywnr8jbabz4ikdzvrh80nnf3gpc";
        libraryHaskellDepends = [
          aivika aivika-transformers base binary containers
          distributed-process exceptions mtl random stm time
        ];
-       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       homepage = "http://www.aivikasoft.com";
        description = "Parallel distributed discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "aivika-experiment" = callPackage
-    ({ mkDerivation, aivika, base, containers, directory, filepath, mtl
-     , network-uri, parallel-io, split
+    ({ mkDerivation, aivika, aivika-transformers, base, containers
+     , directory, filepath, mtl, network-uri, parallel-io, split
      }:
      mkDerivation {
        pname = "aivika-experiment";
-       version = "4.0.3";
-       sha256 = "1v0x37kmav87b3mxvribw6658glf5hbk7npipkabp1qbfz5sp7zv";
+       version = "5.0";
+       sha256 = "1bcmkpzdmca0xcnvmbvsb5g0gsrxbrhf7lc3nig472w0pxa0xhg9";
        libraryHaskellDepends = [
-         aivika base containers directory filepath mtl network-uri
-         parallel-io split
+         aivika aivika-transformers base containers directory filepath mtl
+         network-uri parallel-io split
        ];
-       homepage = "http://github.com/dsorokin/aivika-experiment";
+       homepage = "http://www.aivikasoft.com";
        description = "Simulation experiments for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21998,13 +22113,13 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-cairo";
-       version = "4.3.1";
-       sha256 = "0p54ssbl0ack51gwlj962x45954v4h22mqq6zqa5r8xrbcig2pdb";
+       version = "5.0";
+       sha256 = "1ybynnr9yiv9vi3v1zww9hlf7klm6kggs56basgpn7lzv5qdaz07";
        libraryHaskellDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-cairo
        ];
-       homepage = "http://github.com/dsorokin/aivika-experiment-cairo";
-       description = "Cairo backend for the Aivika simulation library";
+       homepage = "http://www.aivikasoft.com";
+       description = "Cairo-based charting backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -22015,13 +22130,13 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-chart";
-       version = "4.3.2";
-       sha256 = "1ndysamwsxqna1qrk4wps1adms7vjvp1dj3ri48dzk9n1hymz7l1";
+       version = "5.0";
+       sha256 = "0hmdb6bk8iy3y4dq5pkf1yqwgxl3mjyhl4lqjj0pz24bxxwlg33z";
        libraryHaskellDepends = [
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
        ];
-       homepage = "http://github.com/dsorokin/aivika-experiment-chart";
+       homepage = "http://www.aivikasoft.com";
        description = "Simulation experiments with charting for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22032,14 +22147,14 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-experiment-diagrams";
-       version = "4.3.1";
-       sha256 = "1plb44bcjnawg3fsb9crmlyzwzyiz802ldsk559ni9sb590ywr7n";
+       version = "5.0";
+       sha256 = "013l4zp8pxz34xjkl7q9hwy4sk75k8gdwhg5kc5hsmw9nm47xa72";
        libraryHaskellDepends = [
          aivika-experiment aivika-experiment-chart base Chart Chart-diagrams
          containers filepath
        ];
-       homepage = "http://github.com/dsorokin/aivika-experiment-diagrams";
-       description = "Diagrams backend for the Aivika simulation library";
+       homepage = "http://www.aivikasoft.com";
+       description = "Diagrams-based charting backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -22049,12 +22164,12 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-lattice";
-       version = "0.1.1";
-       sha256 = "1mz1a1jdqf5609mfivr8vr9jk3q6jql99kaapjjrkgsdaszdsrv8";
+       version = "0.2";
+       sha256 = "0bd3xwga4cq2qibywq20rnl7fhhxs7ax1dl13ylcaxbg0sxyd0cj";
        libraryHaskellDepends = [
          aivika aivika-transformers base containers mtl random
        ];
-       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       homepage = "http://www.aivikasoft.com";
        description = "Nested discrete event simulation module for the Aivika library using lattice";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22065,13 +22180,13 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-realtime";
-       version = "0.1.2";
-       sha256 = "0yny61yskyvb5n4m32iwxdyq0qmhbijiz68mx529zh33cl9ajq7v";
+       version = "0.2";
+       sha256 = "0dbbhf55w1i2wfr8lw3y5k2a51kw3223gnfhbamzz2283g5n80pg";
        libraryHaskellDepends = [
          aivika aivika-transformers async base containers mtl random stm
          time
        ];
-       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       homepage = "http://www.aivikasoft.com";
        description = "Soft real-time simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22082,12 +22197,12 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "5.0.1";
-       sha256 = "1n9kfdyhwx0rylnsrxfx9x7cjbmb0l7cr6mb2faq2hln92400kks";
+       version = "5.1";
+       sha256 = "0ihwgql0ilavwx81f3z902r51p180b4facicd4sximnyg6qankdr";
        libraryHaskellDepends = [
          aivika array base containers mtl random vector
        ];
-       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       homepage = "http://www.aivikasoft.com";
        description = "Transformers for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22172,8 +22287,8 @@ self: {
      }:
      mkDerivation {
        pname = "alerta";
-       version = "0.1.0.3";
-       sha256 = "0phw1l11v1dhim7njc5rrxlkacmk5wwm2vw9jcvkyh2j1bz5gx5g";
+       version = "0.1.0.4";
+       sha256 = "107qdab0wag38qj5j5wl0r3zp7zyhm2zj3c12zmksq4g5bzki8cb";
        libraryHaskellDepends = [
          aeson aeson-pretty base containers data-default http-api-data
          http-client servant servant-client servant-server text time
@@ -25249,8 +25364,8 @@ self: {
      }:
      mkDerivation {
        pname = "antigate";
-       version = "2.0.1";
-       sha256 = "0vd2f4kq2zkngyqpnw3lcvjkn8335gs9rdfr7kb8442p8dhps139";
+       version = "2.0.2";
+       sha256 = "1s1m0k2r18jvz14nqy07m1jm87cdk0n5x2r1xznyfbcik7081ywb";
        libraryHaskellDepends = [
          base bytestring data-default deepseq exceptions failure http-client
          http-conduit resourcet safe text transformers
@@ -25346,6 +25461,8 @@ self: {
        pname = "anydbm";
        version = "1.0.7";
        sha256 = "1rxk36r6i065m0qiq4g5xlrk2yjsds7j896cbddbsyddbzy10d6k";
+       revision = "1";
+       editedCabalFile = "1iny2zl44lbyv266al9047mkj51510vany6nfyq0xi7h7ak3wb13";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl ];
@@ -26062,8 +26179,8 @@ self: {
      }:
      mkDerivation {
        pname = "apply-refact";
-       version = "0.3.0.1";
-       sha256 = "0578ql80fzkbjiw589v4498qd9jd7l2sz626imkdybxr1lqbsm0p";
+       version = "0.4.0.0";
+       sha256 = "1s25nlkbfzjr6b5psii3n7hmwvg7lgvaljp1ilq5y82rq8sfyxps";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -26130,19 +26247,19 @@ self: {
      }) {};
 
   "approximate" = callPackage
-    ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
-     , directory, doctest, filepath, ghc-prim, hashable, hashable-extras
-     , lens, log-domain, pointed, safecopy, semigroupoids, semigroups
-     , simple-reflect, vector
+    ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
+     , comonad, deepseq, directory, doctest, filepath, ghc-prim
+     , hashable, lens, log-domain, pointed, safecopy, semigroupoids
+     , semigroups, simple-reflect, vector
      }:
      mkDerivation {
        pname = "approximate";
-       version = "0.2.2.3";
-       sha256 = "1b1b61an77k0dxz60w8f07mw7s36i39nnnrcdqn5kg9npmnc3z90";
+       version = "0.3";
+       sha256 = "0zg94yqbm6iasjkf8bxz1bnwc3gx5lh6603cvab8rrxz4xm7k27j";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         base binary bytes cereal comonad deepseq ghc-prim hashable
-         hashable-extras lens log-domain pointed safecopy semigroupoids
-         semigroups vector
+         base binary bytes cereal comonad deepseq ghc-prim hashable lens
+         log-domain pointed safecopy semigroupoids semigroups vector
        ];
        testHaskellDepends = [
          base directory doctest filepath semigroups simple-reflect
@@ -26857,6 +26974,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "arrowp-qq" = callPackage
+    ({ mkDerivation, array, base, containers, haskell-src
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "arrowp-qq";
+       version = "0.1";
+       sha256 = "05cj6drvnk74bcjkr1pqj65c57y09gwmribii887jvg6p77abkgv";
+       libraryHaskellDepends = [
+         array base containers haskell-src template-haskell transformers
+       ];
+       homepage = "http://www.haskell.org/arrows/";
+       description = "quasiquoter translating arrow notation into Haskell 98";
+       license = "GPL";
+     }) {};
+
   "arrows" = callPackage
     ({ mkDerivation, base, Stream }:
      mkDerivation {
@@ -27547,6 +27680,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "async-timer" = callPackage
+    ({ mkDerivation, base, containers, criterion, HUnit, lifted-async
+     , lifted-base, monad-control, safe-exceptions, test-framework
+     , test-framework-hunit, transformers-base
+     }:
+     mkDerivation {
+       pname = "async-timer";
+       version = "0.1.4.0";
+       sha256 = "00kdhxq0wpml4f7gdjvr2h8km8i3yj68bawpa229rzpp0y0yp3k3";
+       libraryHaskellDepends = [
+         base lifted-async lifted-base monad-control safe-exceptions
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base containers criterion HUnit lifted-async test-framework
+         test-framework-hunit
+       ];
+       homepage = "https://github.com/mtesseract/async-timer";
+       description = "Provides API for timer based execution of IO actions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "asynchronous-exceptions" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -27764,7 +27919,7 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "atom-conduit_0_4_0_2" = callPackage
+  "atom-conduit_0_4_0_3" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators
      , data-default, hlint, lens-simple, mono-traversable, parsers
      , quickcheck-instances, resourcet, safe-exceptions, tasty
@@ -27773,8 +27928,8 @@ self: {
      }:
      mkDerivation {
        pname = "atom-conduit";
-       version = "0.4.0.2";
-       sha256 = "1zrrx3vd9y3r34ghfl5zn8k58y6w87r7zca00h9846wn01hd19fw";
+       version = "0.4.0.3";
+       sha256 = "0pl5p9zj33fjjgrxkyj2y45r3qyl5p8z9g17zg19gvqzszsk3vr1";
        libraryHaskellDepends = [
          base blaze-builder conduit conduit-combinators lens-simple
          mono-traversable parsers safe-exceptions text time timerep
@@ -28279,6 +28434,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "audacity_0_0_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, directory
+     , explicit-exception, filepath, non-empty, storable-record
+     , storablevector, tagchup, transformers, utility-ht, xml-basic
+     }:
+     mkDerivation {
+       pname = "audacity";
+       version = "0.0.1.2";
+       sha256 = "1df9vk6f1gj0jpj3rmq63s3xjqc5p02hprfvq1nqgws0vfnp5lab";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring deepseq directory explicit-exception filepath
+         non-empty storable-record storablevector tagchup transformers
+         utility-ht xml-basic
+       ];
+       homepage = "http://hub.darcs.net/thielema/audacity";
+       description = "Interchange with the Audacity sound signal editor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "audiovisual" = callPackage
     ({ mkDerivation, base, boundingboxes, colors, deepseq, directory
      , filepath, free, freetype2, hashable, JuicyPixels
@@ -28921,6 +29098,8 @@ self: {
        pname = "aws";
        version = "0.16";
        sha256 = "1710jajfla76igqrb2hv455gqhr4wap8225z1bffvjgk4w1cddc4";
+       revision = "1";
+       editedCabalFile = "0q4nbmi6s2zzp9jc4hwvdml101xskgindv0scyjjzcvl2cfa0zk9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30915,6 +31094,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bench_1_0_5" = callPackage
+    ({ mkDerivation, base, criterion, optparse-applicative, silently
+     , text, turtle
+     }:
+     mkDerivation {
+       pname = "bench";
+       version = "1.0.5";
+       sha256 = "0fm92vwavgnh7pm0491vy5x21wylckga4a2n765nbw5hzmk9pz92";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base criterion optparse-applicative silently text turtle
+       ];
+       homepage = "http://github.com/Gabriel439/bench";
+       description = "Command-line benchmark tool";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "benchmark-function" = callPackage
     ({ mkDerivation, base, process, random, time }:
      mkDerivation {
@@ -33176,6 +33374,8 @@ self: {
        pname = "bitarray";
        version = "0.0.1.1";
        sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj";
+       revision = "1";
+       editedCabalFile = "10fk92v9afjqk43zi621jxl0n8kci0xjj32lz3vqa9xbh67zjz45";
        libraryHaskellDepends = [ array base ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Mutable and immutable bit arrays";
@@ -35297,6 +35497,8 @@ self: {
        pname = "bound";
        version = "2";
        sha256 = "0z63k6kkj43rvwzsy7rbrxz97f8clq87ajbdv7768xziw4mb022x";
+       revision = "1";
+       editedCabalFile = "1sdsshbvhv955ncgxygzl4mfkkk76rdkilwc70w04j9jmbvj5p6j";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq hashable mmorph
@@ -35601,6 +35803,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "brick_0_18" = callPackage
+    ({ mkDerivation, base, containers, contravariant, data-clist
+     , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
+     , template-haskell, text, text-zipper, transformers, vector, vty
+     }:
+     mkDerivation {
+       pname = "brick";
+       version = "0.18";
+       sha256 = "1qk3ds8h1krqhl8gk3c6akblybq2zvs9686ispj14im88mzjma8r";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers contravariant data-clist deepseq dlist microlens
+         microlens-mtl microlens-th stm template-haskell text text-zipper
+         transformers vector vty
+       ];
+       homepage = "https://github.com/jtdaugherty/brick/";
+       description = "A declarative terminal user interface library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "brillig" = callPackage
     ({ mkDerivation, base, binary, cmdargs, containers, directory
      , filepath, ListZipper, text
@@ -36011,8 +36235,8 @@ self: {
      }:
      mkDerivation {
        pname = "buildbox";
-       version = "2.1.9.2";
-       sha256 = "1kjk237ap86qwrxrwywwi8w80i6bb5im5nhixq630b9vcj13v6kz";
+       version = "2.1.9.3";
+       sha256 = "1ffvf82qmf05vxzxi70jm1yq8apv5s62nms529n6x1p5lyrwwdr5";
        libraryHaskellDepends = [
          base bytestring containers directory exceptions mtl old-locale
          pretty process stm temporary text time
@@ -38700,8 +38924,8 @@ self: {
      }:
      mkDerivation {
        pname = "canteven-log";
-       version = "2.0.0.1";
-       sha256 = "1jajfk7n6c0d42d2ciqn6x16dz7mzybh12jza4rdsp9bj6s23k8i";
+       version = "2.0.1.0";
+       sha256 = "0w7hzhb13g62l08ggld3rj9aamw1jhjkir1bpzc73bl59ls4gdgy";
        libraryHaskellDepends = [
          aeson base bytestring directory fast-logger filepath monad-logger
          template-haskell text time transformers yaml
@@ -38952,6 +39176,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "carray_0_1_6_7" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, ix-shapable
+     , QuickCheck, syb
+     }:
+     mkDerivation {
+       pname = "carray";
+       version = "0.1.6.7";
+       sha256 = "0b5zabyfzi60llvimk2hfw93r38qfl3z5kjhp71rdgqj0alaxmx9";
+       libraryHaskellDepends = [
+         array base binary bytestring ix-shapable QuickCheck syb
+       ];
+       testHaskellDepends = [ array base ix-shapable QuickCheck ];
+       benchmarkHaskellDepends = [ array base ];
+       description = "A C-compatible array library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "carte" = callPackage
     ({ mkDerivation, base, filepath, mtl, network, optparse-applicative
      , random, semigroups, time, transformers, tuple
@@ -40975,20 +41217,6 @@ self: {
      }) {};
 
   "choice" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "choice";
-       version = "0.2.0";
-       sha256 = "0bppl551b384c28fqzww73lddzhfdgs10qcf2wd8xk2awna0i9w9";
-       revision = "1";
-       editedCabalFile = "1bv77nhabm33jfaqhpl77jdcbfl7zxz4daphsmqb0pi6z85man7p";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mboes/choice#readme";
-       description = "A solution to boolean blindness";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "choice_0_2_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "choice";
@@ -40998,7 +41226,6 @@ self: {
        homepage = "https://github.com/mboes/choice#readme";
        description = "A solution to boolean blindness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "choose" = callPackage
@@ -43689,8 +43916,8 @@ self: {
      }:
      mkDerivation {
        pname = "coin";
-       version = "1.2";
-       sha256 = "01vryj8i55yfwf47m35yzh9b18xq31an41s5fi0ic4djzdacainh";
+       version = "1.2.1";
+       sha256 = "0076dvka5c0m3smppp58lklnf26ry9kibzyiy4yx1ygw5rn7m7pc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -44660,23 +44887,22 @@ self: {
      }) {};
 
   "compensated" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad
-     , deepseq, directory, distributive, doctest, filepath
+    ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
+     , cabal-doctest, cereal, comonad, deepseq, distributive, doctest
      , generic-deriving, hashable, lens, log-domain, safecopy
      , semigroupoids, semigroups, simple-reflect, vector
      }:
      mkDerivation {
        pname = "compensated";
-       version = "0.7";
-       sha256 = "1cp9nnagsnqkq3lmgg9khyg0dsi247gpy8afss25635q45cj8smg";
+       version = "0.7.1";
+       sha256 = "05vpx3jqb8m1naz1ka88kl2jfcf9snfhizb5mg6z2vf1w4axj7w6";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors binary bytes cereal comonad deepseq distributive
-         generic-deriving hashable lens log-domain safecopy semigroupoids
-         semigroups vector
+         hashable lens log-domain safecopy semigroupoids semigroups vector
        ];
        testHaskellDepends = [
-         base directory doctest filepath generic-deriving semigroups
-         simple-reflect
+         base doctest generic-deriving semigroups simple-reflect
        ];
        homepage = "http://github.com/analytics/compensated/";
        description = "Compensated floating-point arithmetic";
@@ -45201,8 +45427,8 @@ self: {
      }:
      mkDerivation {
        pname = "concrete-haskell";
-       version = "0.1.0.7";
-       sha256 = "1v076bi2fk6a5sm4bjrxlah8hglbgbr2gcbsh3017h2hkkhl8gdv";
+       version = "0.1.0.8";
+       sha256 = "10pr4c48kdgbm365y4jjwk5ba3xvi90p1n8m94161y1j4bs1zzvm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45592,33 +45818,6 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, exceptions
-     , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
-     , mwc-random, primitive, QuickCheck, resourcet, safe, split
-     , transformers, transformers-base, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
-       version = "1.2.10";
-       sha256 = "1paqps8sc5ilx2nj98svvv5y9p26cl02d2a16qk9m16slzg7l5ni";
-       libraryHaskellDepends = [
-         base exceptions lifted-base mmorph monad-control mtl primitive
-         resourcet transformers transformers-base
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec mtl QuickCheck resourcet safe
-         split transformers
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       homepage = "http://github.com/snoyberg/conduit";
-       description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit_1_2_11" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, exceptions
      , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl
      , mwc-random, primitive, QuickCheck, resourcet, safe, split
@@ -45643,7 +45842,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-audio" = callPackage
@@ -45907,6 +46105,29 @@ self: {
        license = "unknown";
      }) {};
 
+  "conduit-parse_0_1_2_1" = callPackage
+    ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint
+     , mtl, parsers, resourcet, safe, safe-exceptions, tasty
+     , tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "conduit-parse";
+       version = "0.1.2.1";
+       sha256 = "0yc3mkg3fic5bpjsffghidk51sx5dhzvyc1h94ppic9mym985fwd";
+       libraryHaskellDepends = [
+         base conduit conduit-combinators dlist mtl parsers safe
+         safe-exceptions text transformers
+       ];
+       testHaskellDepends = [
+         base conduit hlint mtl parsers resourcet safe-exceptions tasty
+         tasty-hunit
+       ];
+       homepage = "https://github.com/k0ral/conduit-parse";
+       description = "Parsing framework based on conduit";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-resumablesink" = callPackage
     ({ mkDerivation, base, bytestring, conduit, hspec, transformers
      , void
@@ -49664,8 +49885,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "5.2.0";
-       sha256 = "1lnnjwc4hvy54q1q8vdbjl1baz8psqfaivjkb0hfc36y0bgishsl";
+       version = "5.2.1";
+       sha256 = "1an6m2090xjrraibmbxagbwlakmg83d1d0wasr7njv3cihms2dbq";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -49711,16 +49932,16 @@ self: {
   "csound-expression-typed" = callPackage
     ({ mkDerivation, base, Boolean, colour, containers
      , csound-expression-dynamic, data-default, deepseq, ghc-prim
-     , hashable, temporal-media, transformers, wl-pprint
+     , hashable, NumInstances, temporal-media, transformers, wl-pprint
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.2.0.0";
-       sha256 = "1ihwl9mjbm8nr91nh9laxqgx4mx6i63kvykn6dmzawhj7bz20bi8";
+       version = "0.2.0.1";
+       sha256 = "1hihdgar789kbdb17a63h9cwsy4xz8mqlxq3919zj6cny87xl1af";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
-         data-default deepseq ghc-prim hashable temporal-media transformers
-         wl-pprint
+         data-default deepseq ghc-prim hashable NumInstances temporal-media
+         transformers wl-pprint
        ];
        homepage = "https://github.com/anton-k/csound-expression-typed";
        description = "typed core for the library csound-expression";
@@ -52146,35 +52367,6 @@ self: {
      }) {};
 
   "data-msgpack" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck
-     , text, unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "data-msgpack";
-       version = "0.0.9";
-       sha256 = "0p2bn29z7cdfc10sd0f34qqhyswhg5rwnfdicnqprzpv3hziwas3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers data-binary-ieee754 deepseq
-         hashable QuickCheck text unordered-containers vector void
-       ];
-       executableHaskellDepends = [ base bytestring groom ];
-       testHaskellDepends = [
-         base bytestring containers hashable hspec QuickCheck text
-         unordered-containers vector void
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq QuickCheck
-       ];
-       homepage = "http://msgpack.org/";
-       description = "A Haskell implementation of MessagePack";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "data-msgpack_0_0_10" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck
      , text, unordered-containers, vector, void
@@ -54266,19 +54458,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_0_7_0_1" = callPackage
+  "dejafu_0_7_0_2" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, monad-loops, mtl, random, ref-fd, semigroups
-     , transformers, transformers-base
+     , leancheck, mtl, random, ref-fd, semigroups, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.7.0.1";
-       sha256 = "0cdkf5qgcwy4sapvingi0s37s0k9d5v8crskaj5wjy1pwl9vs8kq";
+       version = "0.7.0.2";
+       sha256 = "0l2as53zmsr94sf2kh1h5mj1ra1gpnzik2yqj0nj56cxys6sm6iy";
        libraryHaskellDepends = [
-         base concurrency containers deepseq exceptions leancheck
-         monad-loops mtl random ref-fd semigroups transformers
-         transformers-base
+         base concurrency containers deepseq exceptions leancheck mtl random
+         ref-fd semigroups transformers transformers-base
        ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Systematic testing for Haskell concurrency";
@@ -55482,40 +55673,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.4.1";
-       sha256 = "0x7v0j27ydizb6lw89q7wilalzwyl545nqdwkxwnzg0fdnnhkz5w";
-       libraryHaskellDepends = [
-         active adjunctions array base bytestring cereal colour containers
-         data-default-class diagrams-core diagrams-solve directory
-         distributive dual-tree exceptions filepath fingertree fsnotify
-         hashable intervals JuicyPixels lens linear monoid-extras mtl
-         optparse-applicative process profunctors semigroups tagged text
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base deepseq diagrams-solve lens numeric-extras tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ base criterion diagrams-core ];
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Embedded domain-specific language for declarative graphics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-lib_1_4_1_1" = callPackage
-    ({ mkDerivation, active, adjunctions, array, base, bytestring
-     , cereal, colour, containers, criterion, data-default-class
-     , deepseq, diagrams-core, diagrams-solve, directory, distributive
-     , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable
-     , intervals, JuicyPixels, lens, linear, monoid-extras, mtl
-     , numeric-extras, optparse-applicative, process, profunctors
-     , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "diagrams-lib";
-       version = "1.4.1.1";
-       sha256 = "1sgpmxs8n05bl9cq4fmbgwyqra5kr69di2ngwlc2vqf1fpymis9a";
+       version = "1.4.1.2";
+       sha256 = "0w16cljv9jcvn46hd19qvw1bfvxijlak286nap9qbvyavq2qhvjb";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -55532,7 +55691,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -58176,6 +58334,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_11_3" = callPackage
+    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
+     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
+     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
+     , with-location
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.11.3";
+       sha256 = "0j3qbcvsc389g2y5k5xyln3cik7wfy8ii9c3jp665fywp28r1iys";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         process syb transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base-compat code-page deepseq directory filepath ghc ghc-paths
+         hspec HUnit mockery process QuickCheck setenv silently
+         stringbuilder syb transformers with-location
+       ];
+       homepage = "https://github.com/sol/doctest#readme";
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -58482,6 +58668,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dotenv_0_3_4_0" = callPackage
+    ({ mkDerivation, base, base-compat, exceptions, hspec
+     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "dotenv";
+       version = "0.3.4.0";
+       sha256 = "0rbz73wfsw89pc4l06xqk3x9m5r43r0w1swbmnciwy238v9w7bz8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat exceptions megaparsec text transformers
+       ];
+       executableHaskellDepends = [
+         base base-compat megaparsec optparse-applicative process text
+         transformers
+       ];
+       testHaskellDepends = [
+         base base-compat exceptions hspec hspec-megaparsec megaparsec text
+         transformers
+       ];
+       homepage = "https://github.com/stackbuilders/dotenv-hs";
+       description = "Loads environment variables from dotenv files";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dotfs" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src, HFuse, HUnit, parsec, process, QuickCheck
@@ -61181,23 +61395,6 @@ self: {
      }) {};
 
   "elm-bridge" = callPackage
-    ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "elm-bridge";
-       version = "0.4.0";
-       sha256 = "1n8znpk75ms50c433lgc594xh6761rx0l65bkjdirch6wig1swj5";
-       libraryHaskellDepends = [ aeson base template-haskell ];
-       testHaskellDepends = [
-         aeson base containers hspec QuickCheck text
-       ];
-       homepage = "https://github.com/agrafix/elm-bridge";
-       description = "Derive Elm types from Haskell types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "elm-bridge_0_4_1" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
      , template-haskell, text
      }:
@@ -61214,7 +61411,6 @@ self: {
        homepage = "https://github.com/agrafix/elm-bridge";
        description = "Derive Elm types and Json code from Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-build-lib" = callPackage
@@ -63597,20 +63793,20 @@ self: {
 
   "eventful-core" = callPackage
     ({ mkDerivation, aeson, base, containers, hlint, hspec
-     , http-api-data, HUnit, path-pieces, template-haskell, text
-     , transformers, uuid
+     , http-api-data, HUnit, path-pieces, sum-type-boilerplate
+     , template-haskell, text, transformers, uuid
      }:
      mkDerivation {
        pname = "eventful-core";
-       version = "0.1.1";
-       sha256 = "10s5qqc1amqn3zy6grdl6zbx8kfk6ny7q6dla7v743aiv4yi4zga";
+       version = "0.1.2";
+       sha256 = "0vlhn54qiwi6cvvf9r4nwgnlp747y3i1nh9y2dxr8g9zkpj0wcyn";
        libraryHaskellDepends = [
-         aeson base containers http-api-data path-pieces template-haskell
-         text transformers uuid
+         aeson base containers http-api-data path-pieces
+         sum-type-boilerplate template-haskell text transformers uuid
        ];
        testHaskellDepends = [
          aeson base containers hlint hspec http-api-data HUnit path-pieces
-         template-haskell text transformers uuid
+         sum-type-boilerplate template-haskell text transformers uuid
        ];
        homepage = "https://github.com/jdreaver/eventful#readme";
        description = "Core module for eventful";
@@ -63625,8 +63821,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventful-dynamodb";
-       version = "0.1.1";
-       sha256 = "14fc76dzfg1ngg89k92fylyd8j3ym0xgvicl75mxrixpb40zcc9l";
+       version = "0.1.2";
+       sha256 = "0q8wvnxcprh4gz74d4jsia5ripgn87lb2mw037mrf817g0w63dgl";
        libraryHaskellDepends = [
          aeson amazonka amazonka-dynamodb base bytestring conduit
          eventful-core lens safe text unordered-containers vector
@@ -63644,19 +63840,19 @@ self: {
      }) {};
 
   "eventful-memory" = callPackage
-    ({ mkDerivation, async, base, containers, eventful-core
+    ({ mkDerivation, base, containers, eventful-core
      , eventful-test-helpers, hlint, hspec, HUnit, mtl, safe, stm
      }:
      mkDerivation {
        pname = "eventful-memory";
-       version = "0.1.1";
-       sha256 = "1rj2hhw9qrkkakg87xznamr2fnam5y6dl4gmd7bc06jpja8b3lzg";
+       version = "0.1.2";
+       sha256 = "0kq8f6x7q19vlwgfz7mwlisik0j5wi8pxwlliyv2ispa37rlmvgx";
        libraryHaskellDepends = [
-         async base containers eventful-core mtl safe stm
+         base containers eventful-core mtl safe stm
        ];
        testHaskellDepends = [
-         async base containers eventful-core eventful-test-helpers hlint
-         hspec HUnit mtl safe stm
+         base containers eventful-core eventful-test-helpers hlint hspec
+         HUnit mtl safe stm
        ];
        homepage = "https://github.com/jdreaver/eventful#readme";
        description = "In-memory implementations for eventful";
@@ -63670,11 +63866,11 @@ self: {
      }:
      mkDerivation {
        pname = "eventful-postgresql";
-       version = "0.1.1";
-       sha256 = "14icv9h1hjxj15r37xjldii21xpw7cfyinh38ch4045d3lldyals";
+       version = "0.1.2";
+       sha256 = "0aim6907mkjxlwiwkhmjmmfcbagkaq7z633447xr4mw931v8k84l";
        libraryHaskellDepends = [
          aeson base bytestring eventful-core eventful-sql-common mtl
-         persistent persistent-postgresql text
+         persistent text
        ];
        testHaskellDepends = [
          aeson base bytestring eventful-core eventful-sql-common
@@ -63689,15 +63885,15 @@ self: {
 
   "eventful-sql-common" = callPackage
     ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl
-     , persistent, persistent-template, split, text, uuid
+     , persistent, persistent-template, text, uuid
      }:
      mkDerivation {
        pname = "eventful-sql-common";
-       version = "0.1.1";
-       sha256 = "1xk6i34wd0drba7mj7pgd7ynb7mr1bp64jbahnbqc21sck0br8b0";
+       version = "0.1.2";
+       sha256 = "05q1v64l007saazflvp70sz4579dpzpr08qcgzhg2b1m2ga3pwhn";
        libraryHaskellDepends = [
          aeson base bytestring eventful-core mtl persistent
-         persistent-template split text uuid
+         persistent-template text uuid
        ];
        homepage = "https://github.com/jdreaver/eventful#readme";
        description = "Common library for SQL event stores";
@@ -63711,11 +63907,11 @@ self: {
      }:
      mkDerivation {
        pname = "eventful-sqlite";
-       version = "0.1.1";
-       sha256 = "0bnwvk86rjcjy8i2ng4j7v29c75jz9q41x1ks2niq3pnc7kx3sz4";
+       version = "0.1.2";
+       sha256 = "191c8fcw7wyr9bvviz1h9nbwcyrh5sl31arv4s9b3rjw847zg50j";
        libraryHaskellDepends = [
          aeson base bytestring eventful-core eventful-sql-common mtl
-         persistent persistent-sqlite text uuid
+         persistent text uuid
        ];
        testHaskellDepends = [
          aeson base bytestring eventful-core eventful-sql-common
@@ -63733,8 +63929,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventful-test-helpers";
-       version = "0.1.1";
-       sha256 = "0mj3cmm4nn4clr52q8glzn85x9qsdgq3vhsjbb67wvx6j2i3bs9g";
+       version = "0.1.2";
+       sha256 = "17i55zi9npjj7c97lc6fzad5aak46agcr73d5lv3yycm4lk2hj1g";
        libraryHaskellDepends = [
          aeson aeson-casing base eventful-core extra hspec monad-logger
        ];
@@ -64115,8 +64311,8 @@ self: {
        pname = "exceptions";
        version = "0.8.3";
        sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd";
-       revision = "1";
-       editedCabalFile = "06qrs9vdscwy6bs9isfyc3b2x9n05xzpas04sq88d6rrc4a2c4zw";
+       revision = "2";
+       editedCabalFile = "1vl59j0l7m53hkzlcfmdbqbab8dk4lp9gzwryn7nsr6ylg94wayw";
        libraryHaskellDepends = [
          base mtl stm template-haskell transformers transformers-compat
        ];
@@ -64848,6 +65044,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extra_1_5_3" = callPackage
+    ({ mkDerivation, base, clock, directory, filepath, process
+     , QuickCheck, time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.5.3";
+       sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4";
+       libraryHaskellDepends = [
+         base clock directory filepath process time unix
+       ];
+       testHaskellDepends = [
+         base clock directory filepath QuickCheck time unix
+       ];
+       homepage = "https://github.com/ndmitchell/extra#readme";
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extract-dependencies" = callPackage
     ({ mkDerivation, async, base, Cabal, containers
      , package-description-remote
@@ -66397,6 +66613,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
+  "fft_0_1_8_6" = callPackage
+    ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
+     , QuickCheck, storable-complex, syb, transformers
+     }:
+     mkDerivation {
+       pname = "fft";
+       version = "0.1.8.6";
+       sha256 = "0hjv3r09imb2ypgbz3qj9hf4f36v977z38gdcad3qa0334qdin1f";
+       libraryHaskellDepends = [
+         array base carray ix-shapable storable-complex syb transformers
+       ];
+       libraryPkgconfigDepends = [ fftw fftwFloat ];
+       testHaskellDepends = [ base carray QuickCheck storable-complex ];
+       description = "Bindings to the FFTW library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
+
   "fftwRaw" = callPackage
     ({ mkDerivation, base, fftw }:
      mkDerivation {
@@ -68159,8 +68393,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.2.4";
-       sha256 = "196hfy2sw2ikgfnlwycmyn9bm8aykaqh05c67bjr03cgi42rnixk";
+       version = "0.5.2.6";
+       sha256 = "1krjwrwhfjyp80anb8y79a5rgfcs3qdlw6mgwdid5hfpddjbc1nd";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -68524,6 +68758,29 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "foldl-statistics_0_1_4_6" = callPackage
+    ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
+     , profunctors, quickcheck-instances, statistics, tasty
+     , tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "foldl-statistics";
+       version = "0.1.4.6";
+       sha256 = "05ibj8gw86n5jspn5qnvvqyihb1fanmk86xxrm04sghxbfc9szzy";
+       libraryHaskellDepends = [ base foldl math-functions profunctors ];
+       testHaskellDepends = [
+         base foldl profunctors quickcheck-instances statistics tasty
+         tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion foldl mwc-random statistics vector
+       ];
+       homepage = "http://github.com/Data61/foldl-statistics#readme";
+       description = "Statistical functions from the statistics package implemented as Folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl-transduce" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
      , criterion, doctest, foldl, free, lens-family-core
@@ -69236,8 +69493,8 @@ self: {
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.9";
-       sha256 = "15ji4pr81na7q4d1v5jlrd3sczvhqscndfma43kcblvrgg0p55nv";
+       version = "0.0.10";
+       sha256 = "0ihrdgsn4ivpyhck0qqcfqx2xza1spqv81sd071i151yfyvl1a5p";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -69249,14 +69506,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "foundation_0_0_10" = callPackage
+  "foundation_0_0_11" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.10";
-       sha256 = "0ihrdgsn4ivpyhck0qqcfqx2xza1spqv81sd071i151yfyvl1a5p";
+       version = "0.0.11";
+       sha256 = "0jgxcr532vb7376h43l88g0rjgbil2caqnknmznfsprawy6a9s1v";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -71833,6 +72090,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "generic-lens" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "generic-lens";
+       version = "0.2.0.0";
+       sha256 = "05p53pqx0an32zdjj9x7dj4l04yh0p8rww32i8hh2ymg3h616apl";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/kcsongor/generic-lens";
+       description = "Generic data-structure operations exposed as lenses";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generic-lucid-scaffold" = callPackage
     ({ mkDerivation, base, lucid, text }:
      mkDerivation {
@@ -72037,14 +72306,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "generics-sop_0_3_0_0" = callPackage
+  "generics-sop_0_3_1_0" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generics-sop";
-       version = "0.3.0.0";
-       sha256 = "0flirwxbkxq1fl4xnnmn166qivm9j1cc5vmqyyb684nxdz2d1g03";
-       revision = "1";
-       editedCabalFile = "0znmanm560ig69ba9hfaj42j91mqn0jifig8ld4d84s4jpprk9rm";
+       version = "0.3.1.0";
+       sha256 = "1bazlhgmxcwv7vd44jhdx74cnhmaz6yy47jxfycapjj4mjrnp0x7";
        libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ];
        testHaskellDepends = [ base ];
        description = "Generic Programming using True Sums of Products";
@@ -73254,6 +73521,53 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "ghc-mod_5_8_0_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
+     , containers, criterion, deepseq, directory, djinn-ghc, doctest
+     , extra, fclabels, filepath, ghc, ghc-boot, ghc-paths
+     , ghc-syb-utils, haskell-src-exts, hlint, hspec, monad-control
+     , monad-journal, mtl, old-time, optparse-applicative, pipes
+     , process, safe, semigroups, shelltest, split, syb
+     , template-haskell, temporary, text, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "ghc-mod";
+       version = "5.8.0.0";
+       sha256 = "1yf4fkg1xj1b66jg6kikzc6djad1xi44y7ark7ghgif0ab0g6rn3";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [
+         base Cabal containers directory filepath process template-haskell
+         transformers
+       ];
+       libraryHaskellDepends = [
+         base binary bytestring cabal-helper containers deepseq directory
+         djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths
+         ghc-syb-utils haskell-src-exts hlint monad-control monad-journal
+         mtl old-time optparse-applicative pipes process safe semigroups
+         split syb template-haskell temporary text time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         base binary deepseq directory fclabels filepath ghc monad-control
+         mtl old-time optparse-applicative process semigroups split time
+       ];
+       testHaskellDepends = [
+         base cabal-helper containers directory doctest fclabels filepath
+         ghc ghc-boot hspec monad-journal mtl process split temporary
+         transformers
+       ];
+       testToolDepends = [ shelltest ];
+       benchmarkHaskellDepends = [
+         base criterion directory filepath temporary
+       ];
+       homepage = "https://github.com/DanielG/ghc-mod";
+       description = "Happy Haskell Hacking";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {shelltest = null;};
+
   "ghc-mtl" = callPackage
     ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl
      }:
@@ -73529,15 +73843,30 @@ self: {
      }) {};
 
   "ghc-syb-utils" = callPackage
-    ({ mkDerivation, base, ghc, syb }:
+    ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }:
      mkDerivation {
        pname = "ghc-syb-utils";
-       version = "0.2.3";
-       sha256 = "0rxwdivpcppwzbqglbrz8rm9f4g1gmba9ij7p7aj3di9x37kzxky";
+       version = "0.2.3.1";
+       sha256 = "13gazr6ydlxrj5yfg9pqhrgm7az9a36m7cfxmmvv1hkq2plfgw7y";
+       libraryHaskellDepends = [ base ghc syb ];
+       testHaskellDepends = [ base directory filepath ghc ghc-paths ];
+       homepage = "http://github.com/nominolo/ghc-syb";
+       description = "Scrap Your Boilerplate utilities for the GHC API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "ghc-syb-utils_0_2_3_2" = callPackage
+    ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }:
+     mkDerivation {
+       pname = "ghc-syb-utils";
+       version = "0.2.3.2";
+       sha256 = "1h05blm311cg0ricd9skb0m115512mmrrp7g6qh4bbihjmy0l5nb";
        libraryHaskellDepends = [ base ghc syb ];
+       testHaskellDepends = [ base directory filepath ghc ghc-paths ];
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
@@ -73905,16 +74234,18 @@ self: {
      }) {};
 
   "ghcjs-dom-hello" = callPackage
-    ({ mkDerivation, base, ghcjs-dom, jsaddle-warp, jsaddle-webkit2gtk
-     , mtl
+    ({ mkDerivation, base, ghcjs-dom, jsaddle, jsaddle-warp
+     , jsaddle-webkit2gtk, mtl
      }:
      mkDerivation {
        pname = "ghcjs-dom-hello";
-       version = "5.0.0.0";
-       sha256 = "0v6xdbax9p6q1r5rmrkamnzfhscv9x2bv33jw9848glsxj966ppa";
+       version = "6.0.0.0";
+       sha256 = "16f69w53a3vcfnb805nyn257465gvyv2981gsggvpkzvyqklsp74";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base ghcjs-dom mtl ];
+       libraryHaskellDepends = [
+         base ghcjs-dom jsaddle jsaddle-warp mtl
+       ];
        executableHaskellDepends = [
          base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl
        ];
@@ -74440,29 +74771,6 @@ self: {
      }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
-     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
-     , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gtk";
-       version = "3.0.14";
-       sha256 = "0q5yf54idrrkgcc6mx53cvlc8qd7c6hgv491g60vc8i3559nfx20";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
-
-  "gi-gtk_3_0_15" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
@@ -74492,8 +74800,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-hs";
-       version = "0.3.4.2";
-       sha256 = "13p8sda776v5svsz0kilidb3j2284jwf8a4n6dd79jjh84fn90s3";
+       version = "0.3.4.3";
+       sha256 = "0ypvb5iklmw7k7j1jzd62arbn875hwyg0lcx1z24csyin6gl7zda";
        libraryHaskellDepends = [
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
@@ -75117,8 +75425,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20170519";
-       sha256 = "0avp6f07nsy7hb0334b33dng7hh20qqvaxbrzqyzsbcc9crnlq18";
+       version = "6.20170520";
+       sha256 = "05r701gd7jqjcxcvm8l11fb04z8rqjalf4z8id693q9c2x29pkzq";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -75315,8 +75623,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-mediate";
-       version = "1.0.2";
-       sha256 = "0v1h53fyblq3br3jaga3ajaiywa0qhgysvqknrjga4basaqi220v";
+       version = "1.0.3";
+       sha256 = "01lvw1lb2xfp9yyvj1053cczi1jfzvcxn5q5ls3jzc4g979grw18";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84495,8 +84803,8 @@ self: {
      }:
      mkDerivation {
        pname = "hail";
-       version = "0.1.0.2";
-       sha256 = "0n1h1wf8vxkyqfa8sw9gh30zmj6akl9ycphy7x5ssrzymj8zkvj3";
+       version = "0.1.0.3";
+       sha256 = "1nh76kk3bfnx802kc6afj6iw1xkj5s4sz07zwmhq32fvqbkmw889";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -84709,6 +85017,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hakka" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "hakka";
+       version = "0.2.0";
+       sha256 = "02rd2sw4a6ayr4kqqvkr14gxbpd3y9m92m9kvkk5m5701l1nz0xq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base transformers ];
+       executableHaskellDepends = [ base ];
+       description = "Minimal akka-inspired actor library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hako" = callPackage
     ({ mkDerivation, base, haskell-src-meta, parsec, QuickCheck
      , template-haskell, text, transformers
@@ -84739,8 +85061,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.9.5.1";
-       sha256 = "1rngwb75sm8z0mhfms8rkgs2mc505bldynbm4b574wvi74ws7v4d";
+       version = "4.9.7.0";
+       sha256 = "1zy2328lj7k6j0h7nrcd998sk1hbcl67yzaiysaxyif5c60l05ab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84769,50 +85091,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) utillinux;};
 
-  "hakyll_4_9_6_0" = callPackage
-    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
-     , containers, cryptohash, data-default, deepseq, directory
-     , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
-     , network, network-uri, optparse-applicative, pandoc
-     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
-     , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
-     , tasty, tasty-hunit, tasty-quickcheck, text, time
-     , time-locale-compat, unordered-containers, utillinux, vector, wai
-     , wai-app-static, warp, yaml
-     }:
-     mkDerivation {
-       pname = "hakyll";
-       version = "4.9.6.0";
-       sha256 = "0qkwa8fs5wpqg4gvk19cg5jsjhwyirvwbah1hk7a5b8yfrbsm08c";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process random
-         regex-base regex-tdfa resourcet scientific system-filepath tagsoup
-         text time time-locale-compat unordered-containers vector wai
-         wai-app-static warp yaml
-       ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory filepath fsnotify
-         http-conduit http-types lrucache mtl network network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process
-         QuickCheck random regex-base regex-tdfa resourcet scientific
-         system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
-         time time-locale-compat unordered-containers vector wai
-         wai-app-static warp yaml
-       ];
-       testToolDepends = [ utillinux ];
-       homepage = "http://jaspervdj.be/hakyll";
-       description = "A static website compiler library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) utillinux;};
-
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
      }:
@@ -85701,15 +85979,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hapistrano_0_3_2_1" = callPackage
+  "hapistrano_0_3_2_2" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath, hspec
      , mtl, optparse-applicative, path, path-io, process, stm, temporary
      , time, transformers, yaml
      }:
      mkDerivation {
        pname = "hapistrano";
-       version = "0.3.2.1";
-       sha256 = "0iafa8ina7c78dqhyql8k625s9ibjb15mpw7yizl7mg2rxj2ksb4";
+       version = "0.3.2.2";
+       sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86758,6 +87036,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasbolt_0_1_1_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , data-binary-ieee754, data-default, hex, hspec, network
+     , network-simple, QuickCheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "hasbolt";
+       version = "0.1.1.3";
+       sha256 = "1ba85bq8p6cjrxajinb3ykqyffq0h2xcsq80q26y9iy18ys7mcbr";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 data-default
+         hex network network-simple text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers hex hspec QuickCheck text
+       ];
+       homepage = "https://github.com/zmactep/hasbolt#readme";
+       description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hascal" = callPackage
     ({ mkDerivation, base, data-default, split }:
      mkDerivation {
@@ -87378,8 +87678,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskdogs";
-       version = "0.4.5";
-       sha256 = "1k1ihdyj6xm2956xw5fjjrjcf4rb908g2q6hk5fr74yhi72l604i";
+       version = "0.5.0";
+       sha256 = "16ba13qihpxfvb65szzs5ajhk854c0yii939xavwq76dk0cr01w3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -90108,6 +90408,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskus-system-build" = callPackage
+    ({ mkDerivation, base, directory, filepath, hashable, haskus-utils
+     , optparse-applicative, optparse-simple, process, simple-download
+     , temporary, text, yaml
+     }:
+     mkDerivation {
+       pname = "haskus-system-build";
+       version = "0.7.0.0";
+       sha256 = "1wfl4n7manfwgwjccvrsfwjb3la7sjg1zpzgj8v6r5sv2zdyl86g";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory filepath hashable haskus-utils optparse-applicative
+         optparse-simple process simple-download temporary text yaml
+       ];
+       homepage = "http://www.haskus.org/system";
+       description = "Haskus system build tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskus-utils" = callPackage
     ({ mkDerivation, base, containers, extra, file-embed, list-t, mtl
      , stm, stm-containers, tasty, tasty-quickcheck, template-haskell
@@ -90115,8 +90435,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskus-utils";
-       version = "0.6.0.0";
-       sha256 = "0hph5305ykz9qbc0dbm043q6m4x9bxzgwdnjqby7f6rir6ks995w";
+       version = "0.7.0.0";
+       sha256 = "0s28m6bhc5a1q3z7r1pd9f1l0nhsk5lnsi8y9zqadyg8j4jcv9kx";
        libraryHaskellDepends = [
          base containers extra file-embed list-t mtl stm stm-containers
          template-haskell transformers vector
@@ -90162,14 +90482,15 @@ self: {
      }) {};
 
   "hasmin" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, doctest
-     , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec, matrix
-     , mtl, numbers, optparse-applicative, parsers, QuickCheck, text
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, directory, doctest, doctest-discover, gitrev, hopfli
+     , hspec, hspec-attoparsec, matrix, mtl, numbers
+     , optparse-applicative, parsers, QuickCheck, text
      }:
      mkDerivation {
        pname = "hasmin";
-       version = "0.3.2";
-       sha256 = "16w52fsiw5ahrlyna9q9bs4f7wkkb15ksigshnjsbdbh32qp751f";
+       version = "0.3.2.2";
+       sha256 = "0522rp8cicvizvr183vfr07a5c8a98hz7g6m6pjjk1vzf95b7w20";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90184,6 +90505,7 @@ self: {
          attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
          QuickCheck text
        ];
+       benchmarkHaskellDepends = [ base criterion directory text ];
        homepage = "https://github.com/contivero/hasmin#readme";
        description = "\"A CSS Minifier\"";
        license = stdenv.lib.licenses.bsd3;
@@ -91134,6 +91456,8 @@ self: {
        pname = "hbayes";
        version = "0.5.2";
        sha256 = "1x8nwh3ba9qvrbcxd2fdb3lv9b94w6lkvdg4vrqm7vbns9yyk162";
+       revision = "2";
+       editedCabalFile = "19nclaq6y157gn8k4sl79rm30ws5gcykiq4zjmcnm7d5c1rm4dhn";
        libraryHaskellDepends = [
          array base binary boxes containers directory filepath gamma HUnit
          mtl mwc-random parsec pretty QuickCheck random split statistics
@@ -92115,8 +92439,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedgehog";
-       version = "0.2.2";
-       sha256 = "1lnqqjfvqajkav42pcw6dd9cirg6fz900wv6pr2zwq1al21hw32s";
+       version = "0.3";
+       sha256 = "0navcrq51wy7040a8vh9izzln61qpk06z4r4g33j7v6qk2hflwb7";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring concurrent-output containers
          directory exceptions mmorph mtl pretty-show primitive random
@@ -93083,24 +93407,6 @@ self: {
      }) {};
 
   "heterocephalus" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
-     , doctest, Glob, parsec, shakespeare, template-haskell, text
-     }:
-     mkDerivation {
-       pname = "heterocephalus";
-       version = "1.0.4.0";
-       sha256 = "0alqdw8d41v9ih3crf4lxhz4h9wqy27yv2r31kqpadasy4q8h82a";
-       libraryHaskellDepends = [
-         base blaze-html blaze-markup containers dlist parsec shakespeare
-         template-haskell text
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/heterocephalus#readme";
-       description = "A type-safe template engine for working with popular front end development tools";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "heterocephalus_1_0_5_0" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
      , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text
      , transformers
@@ -93117,7 +93423,6 @@ self: {
        homepage = "https://github.com/arowM/heterocephalus#readme";
        description = "A type-safe template engine for working with popular front end development tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heterolist" = callPackage
@@ -93853,8 +94158,8 @@ self: {
      }:
      mkDerivation {
        pname = "hgis";
-       version = "0.1.3.4";
-       sha256 = "07p2n9nyzispgbdlra5fvr87iglsny9rhch4mkcw95qr74qcw87m";
+       version = "0.1.3.5";
+       sha256 = "1vmx21s0q9w21118m60hzrfk1p704m7675k7idrqlwd4da54ib7c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94449,8 +94754,8 @@ self: {
      }:
      mkDerivation {
        pname = "hills";
-       version = "0.1.2.4";
-       sha256 = "0hsnal3agzy4d5y52yyaxscyw3zp7w754glxksz6kzn6n2djg1nq";
+       version = "0.1.2.5";
+       sha256 = "02zmjc056phi8xcdx8i86xms5204q1zkcg9c5dbd8phm11a5n3iz";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -94740,6 +95045,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hint_0_7_0" = callPackage
+    ({ mkDerivation, base, directory, exceptions, extensible-exceptions
+     , filepath, ghc, ghc-paths, HUnit, mtl, random, unix
+     }:
+     mkDerivation {
+       pname = "hint";
+       version = "0.7.0";
+       sha256 = "0mc17qdq0wb57zgh755viwcnby2jkmyv9r7fvq5jwsxx91c776i9";
+       libraryHaskellDepends = [
+         base directory exceptions filepath ghc ghc-paths mtl random unix
+       ];
+       testHaskellDepends = [
+         base directory exceptions extensible-exceptions filepath HUnit
+       ];
+       homepage = "https://github.com/mvdan/hint";
+       description = "Runtime Haskell interpreter (GHC API wrapper)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hint-server" = callPackage
     ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl
      }:
@@ -95847,7 +96172,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hlint_2_0_8" = callPackage
+  "hlint_2_0_9" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, directory, extra, filepath, haskell-src-exts
      , hscolour, process, refact, text, transformers, uniplate
@@ -95855,8 +96180,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.0.8";
-       sha256 = "1zdwlyj913cwdi0gfv5wmbqbgsxjg4ypggmkmlzj006sj7qpbn2z";
+       version = "2.0.9";
+       sha256 = "1bd5nizx1dbzhrfcr9mgpjvg4b6f6z73jvslkbialp7g9pkr6a95";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96540,13 +96865,15 @@ self: {
      , attoparsec-iso8601, base, bytestring, conduit
      , conduit-combinators, conduit-extra, containers, criterion
      , deepseq, directory, hspec, hspec-attoparsec, hspec-core
-     , hspec-expectations, ip, optparse-applicative, permute, random
-     , resourcet, text, time, unordered-containers, word8, yaml
+     , hspec-expectations, ip, lifted-base, monad-control, monad-loops
+     , mtl, optparse-applicative, permute, random, resourcet, text, time
+     , transformers-base, unix, unordered-containers, word8, yaml
+     , zeromq4-conduit, zeromq4-haskell
      }:
      mkDerivation {
        pname = "hnormalise";
-       version = "0.3.3.0";
-       sha256 = "1rrriy9i6bfh1l6q9iwsc9zfcaif3d3f1vmkzm353gprf7vg8fnk";
+       version = "0.4.1.0";
+       sha256 = "0mmkd0nidkffp80nn8yn9i1x7cqsi8qs2qyfgp36sjay58y92744";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96556,7 +96883,9 @@ self: {
        executableHaskellDepends = [
          aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring
          conduit conduit-combinators conduit-extra containers directory ip
-         optparse-applicative resourcet text time word8 yaml
+         lifted-base monad-control monad-loops mtl optparse-applicative
+         resourcet text time transformers-base unix word8 yaml
+         zeromq4-conduit zeromq4-haskell
        ];
        testHaskellDepends = [
          aeson attoparsec attoparsec-iso8601 base conduit-extra hspec
@@ -98092,7 +98421,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hpack" = callPackage
+  "hpack_0_17_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , containers, deepseq, directory, filepath, Glob, hspec
      , interpolate, mockery, QuickCheck, temporary, text
@@ -98120,6 +98449,37 @@ self: {
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hpack" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
+     , containers, deepseq, directory, filepath, Glob, hspec
+     , interpolate, mockery, QuickCheck, temporary, text
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "hpack";
+       version = "0.18.0";
+       sha256 = "1z738mw0kzic4wx5dpihh1c1gimpjkl14wl6w2nmmdfx2bdjm5rv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base-compat bytestring containers deepseq directory
+         filepath Glob text unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         aeson base base-compat bytestring containers deepseq directory
+         filepath Glob text unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring containers deepseq
+         directory filepath Glob hspec interpolate mockery QuickCheck
+         temporary text unordered-containers yaml
+       ];
+       homepage = "https://github.com/sol/hpack#readme";
+       description = "An alternative format for Haskell packages";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hpack-convert" = callPackage
@@ -101276,6 +101636,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_4_4" = callPackage
+    ({ mkDerivation, base, call-stack, directory, hspec-core
+     , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
+     , stringbuilder, transformers
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.4.4";
+       sha256 = "08fg8w38xbhidw3pfn13ag3mnpp3rb1lzp7xpq47cncwv92k46mh";
+       libraryHaskellDepends = [
+         base call-stack hspec-core hspec-discover hspec-expectations HUnit
+         QuickCheck transformers
+       ];
+       testHaskellDepends = [
+         base call-stack directory hspec-core hspec-discover
+         hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
+         transformers
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -101348,6 +101732,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_4_4" = callPackage
+    ({ mkDerivation, ansi-terminal, array, async, base, call-stack
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, temporary, tf-random, time, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.4.4";
+       sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0";
+       libraryHaskellDepends = [
+         ansi-terminal array async base call-stack deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv tf-random time transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal array async base call-stack deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently temporary tf-random time
+         transformers
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-discover" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
@@ -101364,6 +101775,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_4_4" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.4.4";
+       sha256 = "0isx9nc59nw8pkh4r6ynd55dghqnzgrzn9pvrq6ail1y5z3knhkn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [ base directory filepath hspec-meta ];
+       homepage = "http://hspec.github.io/";
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
@@ -103465,8 +103893,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit-browser";
-       version = "2.0.0.0";
-       sha256 = "1swgsb14mwsfrwhw2ggydi2wm24hrqlisslh5q46qll7rl2gx19q";
+       version = "2.0.0.1";
+       sha256 = "0h8kqjpw859q8kafplbxz5hn7zva71ym25z7vf5vz0pwiw2587wv";
        libraryHaskellDepends = [
          base bytestring conduit containers cookie data-default exceptions
          http-client http-conduit http-types lifted-base monad-control
@@ -106199,20 +106627,21 @@ self: {
      }) {};
 
   "hyperloglog" = callPackage
-    ({ mkDerivation, approximate, base, binary, bits, bytes, cereal
-     , cereal-vector, comonad, deepseq, directory, distributive, doctest
-     , filepath, generic-deriving, hashable, hashable-extras, lens
+    ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal
+     , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory
+     , distributive, doctest, filepath, generic-deriving, hashable, lens
      , reflection, safecopy, semigroupoids, semigroups, simple-reflect
      , siphash, tagged, vector
      }:
      mkDerivation {
        pname = "hyperloglog";
-       version = "0.4.0.4";
-       sha256 = "0iwqkgrvk7p9qmfbfld7cpparbc2j674i8vzmcwbr06n63ds5mrl";
+       version = "0.4.1";
+       sha256 = "08r0yrnfjcfv0p14p69dqjrsmff4alx5yykkq06mig0wycl4v4q0";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          approximate base binary bits bytes cereal cereal-vector comonad
-         deepseq distributive hashable hashable-extras lens reflection
-         safecopy semigroupoids semigroups siphash tagged vector
+         deepseq distributive hashable lens reflection safecopy
+         semigroupoids semigroups siphash tagged vector
        ];
        testHaskellDepends = [
          base directory doctest filepath generic-deriving semigroups
@@ -112282,16 +112711,17 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, containers, deepseq, filepath, ghc-prim, http-types
      , lens, primitive, process, ref-tf, scientific, stm, text, time
-     , transformers, unordered-containers, vector
+     , transformers, unordered-containers, uuid, uuid-types, vector
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.9.0.0";
-       sha256 = "1g61chx063m8n3yvs4z6awmdksvkr0yp5vwd4ffkhl94yczqh0q8";
+       version = "0.9.2.0";
+       sha256 = "0ymq70kwwi60f1rgjnjz914xv465zrnbbw5z351439qg572f8mvg";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          deepseq filepath ghc-prim http-types lens primitive process ref-tf
-         scientific stm text time transformers unordered-containers vector
+         scientific stm text time transformers unordered-containers uuid
+         uuid-types vector
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
@@ -112346,18 +112776,19 @@ self: {
 
   "jsaddle-warp" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , doctest, filepath, ghc-prim, http-types, jsaddle, lens, network
-     , primitive, process, QuickCheck, ref-tf, stm, text, time
-     , transformers, uuid, uuid-types, wai, wai-websockets, warp
+     , doctest, filepath, foreign-store, ghc-prim, http-types, jsaddle
+     , lens, network, primitive, process, QuickCheck, ref-tf, stm, text
+     , time, transformers, uuid, uuid-types, wai, wai-websockets, warp
      , webdriver, websockets
      }:
      mkDerivation {
        pname = "jsaddle-warp";
-       version = "0.9.1.0";
-       sha256 = "0d7q3dr05j81zx13qvl0kxhdmkk9bpka4cc2db8ck4wfnv7nj3yq";
+       version = "0.9.2.0";
+       sha256 = "08r9nzx8yvdw7klv7n19znqfp5r5585fvhz9jsk5mcinpkc7yvyv";
        libraryHaskellDepends = [
-         aeson base bytestring containers http-types jsaddle stm text time
-         transformers uuid uuid-types wai wai-websockets warp websockets
+         aeson base bytestring containers foreign-store http-types jsaddle
+         stm text time transformers uuid uuid-types wai wai-websockets warp
+         websockets
        ];
        testHaskellDepends = [
          aeson base bytestring containers deepseq doctest filepath ghc-prim
@@ -113983,42 +114414,6 @@ self: {
      }) {};
 
   "katip" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , bytestring, containers, criterion, deepseq, directory, either
-     , exceptions, hostname, microlens, microlens-th, monad-control, mtl
-     , old-locale, quickcheck-instances, regex-tdfa, resourcet
-     , semigroups, string-conv, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time
-     , time-locale-compat, transformers, transformers-base
-     , transformers-compat, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "katip";
-       version = "0.3.1.4";
-       sha256 = "14w43fcfqpsammhq8hb7yh9jychrglfcqjkg43aalsj4p53q8xq4";
-       libraryHaskellDepends = [
-         aeson auto-update base bytestring containers either exceptions
-         hostname microlens microlens-th monad-control mtl old-locale
-         resourcet semigroups string-conv template-haskell text time
-         transformers transformers-base transformers-compat unix
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory microlens quickcheck-instances
-         regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
-         template-haskell text time time-locale-compat unordered-containers
-       ];
-       benchmarkHaskellDepends = [
-         aeson async base blaze-builder criterion deepseq text time
-         transformers unix
-       ];
-       homepage = "https://github.com/Soostone/katip";
-       description = "A structured logging framework";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "katip_0_3_1_5" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , bytestring, containers, criterion, deepseq, directory, either
      , exceptions, hostname, microlens, microlens-th, monad-control, mtl
@@ -114616,12 +115011,12 @@ self: {
      , keera-hails-mvc-solutions-config, keera-hails-mvc-solutions-gtk
      , keera-hails-mvc-view-gtk, keera-hails-reactive-gtk
      , keera-hails-reactivevalues, MissingK, mtl, network, process, SDL
-     , SDL-mixer, setlocale, time, utf8-string
+     , SDL-mixer, SDL_mixer, setlocale, time, utf8-string
      }:
      mkDerivation {
        pname = "keera-posture";
-       version = "0.2.4.1";
-       sha256 = "1gcc4hxcvhaaqgz0q5l1mr7938m1wwl7sky8x1qcg82q8mdvl8vx";
+       version = "0.2.4.3";
+       sha256 = "0kaka302qgax29583kvzhyl6fffzmywh3fk398xhzvixmza9k7sl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -114635,11 +115030,12 @@ self: {
          keera-hails-reactivevalues MissingK mtl network process SDL
          SDL-mixer setlocale time utf8-string
        ];
+       executableSystemDepends = [ SDL_mixer ];
        homepage = "http://keera.co.uk/projects/keera-posture";
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) SDL_mixer;};
 
   "keiretsu" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
@@ -116867,28 +117263,6 @@ self: {
      }) {};
 
   "language-javascript" = callPackage
-    ({ mkDerivation, alex, array, base, blaze-builder, bytestring
-     , Cabal, containers, happy, hspec, mtl, QuickCheck, text
-     , utf8-light, utf8-string
-     }:
-     mkDerivation {
-       pname = "language-javascript";
-       version = "0.6.0.9";
-       sha256 = "1k1ji4iia6wpzls5999hirypxsng5bgfrvbv9zjvn9wczga9hsx8";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring containers mtl text utf8-string
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         array base blaze-builder bytestring Cabal containers hspec mtl
-         QuickCheck utf8-light utf8-string
-       ];
-       homepage = "https://github.com/erikd/language-javascript";
-       description = "Parser for JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-javascript_0_6_0_10" = callPackage
     ({ mkDerivation, alex, array, base, blaze-builder, bytestring
      , Cabal, containers, happy, hspec, mtl, QuickCheck, text
      , utf8-light, utf8-string
@@ -116908,7 +117282,6 @@ self: {
        homepage = "https://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-kort" = callPackage
@@ -120189,18 +120562,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "linear-accelerate_0_3" = callPackage
-    ({ mkDerivation, accelerate, base, Cabal, distributive, filepath
-     , lens, linear
+  "linear-accelerate_0_4" = callPackage
+    ({ mkDerivation, accelerate, base, Cabal, cabal-doctest
+     , distributive, doctest, lens, linear
      }:
      mkDerivation {
        pname = "linear-accelerate";
-       version = "0.3";
-       sha256 = "1aa2vfdhfdvyxnis4xkdjar15ircg2zsp6ljfc2nafwy0l20rvrs";
-       setupHaskellDepends = [ base Cabal filepath ];
+       version = "0.4";
+       sha256 = "03pma42zkk6cfisyfsjmb8496jkfqiab3my4wdahk8z9shmqa3rg";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          accelerate base distributive lens linear
        ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/ekmett/linear-accelerate/";
        description = "Lifting linear vector spaces into Accelerate";
        license = stdenv.lib.licenses.bsd3;
@@ -122220,6 +122594,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "log-domain_0_11_1" = callPackage
+    ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
+     , comonad, deepseq, distributive, doctest, generic-deriving
+     , hashable, safecopy, semigroupoids, semigroups, simple-reflect
+     , vector
+     }:
+     mkDerivation {
+       pname = "log-domain";
+       version = "0.11.1";
+       sha256 = "0zbwnx6bs417g67m0hr9n4lk9iwpcm0ivmfhjgaz98hryxx3s8wc";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base binary bytes cereal comonad deepseq distributive hashable
+         safecopy semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base doctest generic-deriving semigroups simple-reflect
+       ];
+       homepage = "http://github.com/ekmett/log-domain/";
+       description = "Log-domain arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, fast-logger
      , time
@@ -123153,18 +123551,20 @@ self: {
 
   "loup" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
-     , conduit, lifted-async, monad-control, optparse-generic, preamble
-     , shakers, time, turtle, uuid, yaml
+     , conduit, lifted-async, lifted-base, monad-control
+     , optparse-generic, preamble, shakers, time, turtle
+     , unordered-containers, uuid, yaml
      }:
      mkDerivation {
        pname = "loup";
-       version = "0.0.2";
-       sha256 = "1lfa20m67zncn9dpbbrdjq3qbv6qn2h1qb1iy0b5npan9sd85r5z";
+       version = "0.0.5";
+       sha256 = "1c42rp22r37l0fbmd5i463f9pfv7nqchi1rcchv7mcc3wwzyzymq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson amazonka amazonka-swf base bytestring conduit lifted-async
-         monad-control preamble time turtle uuid yaml
+         lifted-base monad-control preamble time turtle unordered-containers
+         uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
        homepage = "https://github.com/swift-nav/loup";
@@ -123256,6 +123656,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lrucaching_0_3_2" = callPackage
+    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
+     , hspec, psqueues, QuickCheck, transformers, vector
+     }:
+     mkDerivation {
+       pname = "lrucaching";
+       version = "0.3.2";
+       sha256 = "1vg6ip77vlqixj2ghvwm036yb4qhkif175k8gfd27nmr4w5rv2ns";
+       libraryHaskellDepends = [
+         base base-compat deepseq hashable psqueues vector
+       ];
+       testHaskellDepends = [
+         base containers deepseq hashable hspec QuickCheck transformers
+       ];
+       homepage = "https://github.com/cocreature/lrucaching#readme";
+       description = "LRU cache";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ls-usb" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols
      , cmdtheline, text, usb, usb-id-database, vector
@@ -124645,13 +125065,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "makefile_1_0_0_3" = callPackage
+  "makefile_1_0_0_4" = callPackage
     ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, text
      }:
      mkDerivation {
        pname = "makefile";
-       version = "1.0.0.3";
-       sha256 = "0w36rxzx4ryhrmjayqm9fad2zpkxnq4dmpxshd8q2x8wa3wp8j5p";
+       version = "1.0.0.4";
+       sha256 = "17g8syj2l2fr2f22flcngxsnpprl4hbfqpanql1k55a0z19sjr5k";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [
          attoparsec base doctest Glob QuickCheck text
@@ -127188,25 +127608,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
-     , tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.14.5";
-       sha256 = "01d1bg8pkhw9mpyd7nm5zzpqv9kh9cj2fkd2ywvkay7np2r14820";
-       revision = "1";
-       editedCabalFile = "01g68h3r1h15rrbfsbbk0195fyn93x256j8xwzlb11074sdwr0gy";
-       libraryHaskellDepends = [
-         base bytestring deepseq foundation ghc-prim
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       homepage = "https://github.com/vincenthz/hs-memory";
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_14_6" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim
      , tasty, tasty-hunit, tasty-quickcheck
      }:
@@ -127223,7 +127624,6 @@ self: {
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memorypool" = callPackage
@@ -127260,8 +127660,8 @@ self: {
      }:
      mkDerivation {
        pname = "mercury-api";
-       version = "0.1.0.0";
-       sha256 = "0pyrfwl0jzm8v25aviqflfw4q95hlkq9n6ps44shzb9l0bm5zls1";
+       version = "0.1.0.1";
+       sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127967,6 +128367,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "midi-music-box_0_0_0_4" = callPackage
+    ({ mkDerivation, base, containers, diagrams-lib
+     , diagrams-postscript, event-list, midi, non-empty
+     , optparse-applicative, utility-ht
+     }:
+     mkDerivation {
+       pname = "midi-music-box";
+       version = "0.0.0.4";
+       sha256 = "0l8nv3bfbncjbh80dav7qps5aqd20g88sx00xhqr6j9m66znfg1p";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers diagrams-lib diagrams-postscript event-list midi
+         non-empty optparse-applicative utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/midi-music-box";
+       description = "Convert MIDI file to music box punch tape";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "midi-simple" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, criterion
      , generic-random, hspec, hspec-attoparsec, QuickCheck, tasty
@@ -128185,17 +128606,18 @@ self: {
 
   "milena" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, digest, lens
-     , lifted-base, mtl, murmur-hash, network, QuickCheck, random
-     , resource-pool, semigroups, tasty, tasty-hspec, tasty-quickcheck
-     , transformers
+     , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck
+     , random, resource-pool, semigroups, tasty, tasty-hspec
+     , tasty-quickcheck, transformers, zlib
      }:
      mkDerivation {
        pname = "milena";
-       version = "0.5.0.2";
-       sha256 = "0jsw9zvilyk8c49g927wi535bx573hcnzf8nzgaxvjmhj6x0wxwf";
+       version = "0.5.1.0";
+       sha256 = "0vfypwp503ab91hca5mmclgxxy0ggzd9g90h7jaj5vxrij7ya5ly";
        libraryHaskellDepends = [
-         base bytestring cereal containers digest lens lifted-base mtl
-         murmur-hash network random resource-pool semigroups transformers
+         base bytestring cereal containers digest lens lifted-base
+         monad-control mtl murmur-hash network random resource-pool
+         semigroups transformers zlib
        ];
        testHaskellDepends = [
          base bytestring lens mtl network QuickCheck semigroups tasty
@@ -128993,6 +129415,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mockery_0_3_5" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, directory, filepath
+     , hspec, logging-facade, temporary
+     }:
+     mkDerivation {
+       pname = "mockery";
+       version = "0.3.5";
+       sha256 = "09ypgm3z69gq8mj6y66ss58kbjnk15r8frwcwbqcfbfksfnfv8dp";
+       libraryHaskellDepends = [
+         base base-compat bytestring directory filepath logging-facade
+         temporary
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring directory filepath hspec logging-facade
+         temporary
+       ];
+       description = "Support functions for automated testing";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "modbus-tcp" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, transformers }:
      mkDerivation {
@@ -129470,6 +129913,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-control_1_0_2_0" = callPackage
+    ({ mkDerivation, base, stm, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-control";
+       version = "1.0.2.0";
+       sha256 = "1k5lgwdnbqmzzc7y29pfq7a35g428qivsp5cafdv0mbn5kc59aq5";
+       libraryHaskellDepends = [
+         base stm transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/basvandijk/monad-control";
+       description = "Lift control operations, like exception catching, through monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-control-aligned" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
@@ -131227,6 +131687,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_9" = callPackage
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, http-client, http-client-tls
+     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
+     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-format, transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.9";
+       sha256 = "1a0s0hj09rhgixs09ay7fjk12d3wrlhm2w957md7pkan412vx200";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text text-format transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base code-page optparse-applicative text text-format
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mosaico-lib" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
      , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -133052,8 +133544,8 @@ self: {
      }:
      mkDerivation {
        pname = "mvc";
-       version = "1.1.3";
-       sha256 = "0cxnjw5pzxdpg25jw28a6wgjk61znbg90z8nniwdfmskldas6fqf";
+       version = "1.1.4";
+       sha256 = "0nx66swbca3c481abzbpgxfhs93y6bsm897dbk56v0dfdqn0inw4";
        libraryHaskellDepends = [
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
@@ -134079,6 +134571,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
+       revision = "1";
+       editedCabalFile = "1scwm1gs07znkj4ahfyxpwrksj4rdl1pa81xflcqhkqfgcndvgl3";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -136322,6 +136816,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nix-derivation" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, criterion, deepseq
+     , QuickCheck, system-filepath, text, vector
+     }:
+     mkDerivation {
+       pname = "nix-derivation";
+       version = "1.0.0";
+       sha256 = "1qx37nk5fg7kqvy9pfvf1jhn9cyr8rkfgz4hm3xy8m92l0rprfw4";
+       libraryHaskellDepends = [
+         attoparsec base containers deepseq system-filepath text vector
+       ];
+       testHaskellDepends = [
+         attoparsec base QuickCheck system-filepath text vector
+       ];
+       benchmarkHaskellDepends = [ attoparsec base criterion text ];
+       description = "Parse and render *.drv files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nix-eval" = callPackage
     ({ mkDerivation, base, hindent, process, QuickCheck, strict, tasty
      , tasty-quickcheck
@@ -137780,6 +138293,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "oanda-rest-api_0_4_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens
+     , old-locale, resourcet, scientific, text, thyme, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "oanda-rest-api";
+       version = "0.4.1";
+       sha256 = "1r20vn0hbx1xca5jaq9djfhgrxgdyhj1m4i9708wd972h2h7q2vr";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers Decimal http-client
+         http-conduit lens old-locale resourcet scientific text thyme
+         transformers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit containers Decimal hlint hspec
+         http-client http-conduit HUnit lens old-locale resourcet scientific
+         text thyme transformers vector
+       ];
+       homepage = "https://github.com/jdreaver/oanda-rest-api#readme";
+       description = "Client to the OANDA REST API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "oauth10a" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , cryptohash, entropy, http-types, time, transformers
@@ -138825,6 +139364,63 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {atomspace-cwrapper = null;};
 
+  "opencv" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bindings-DSL
+     , bytestring, Cabal, containers, criterion, data-default, deepseq
+     , directory, Glob, haskell-src-exts, inline-c, inline-c-cpp
+     , JuicyPixels, lens, linear, opencv, primitive, QuickCheck, repa
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "opencv";
+       version = "0.0.0.0";
+       sha256 = "1y2mjb6a6iym6h6m7c214lwrmcjhm9snsqgf1jrbq27fr346mrkb";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bindings-DSL bytestring containers
+         data-default deepseq inline-c inline-c-cpp JuicyPixels linear
+         primitive repa template-haskell text transformers vector
+       ];
+       libraryPkgconfigDepends = [ opencv ];
+       testHaskellDepends = [
+         base bytestring containers data-default directory Glob
+         haskell-src-exts JuicyPixels lens linear primitive QuickCheck repa
+         tasty tasty-hunit tasty-quickcheck template-haskell text
+         transformers vector
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion repa ];
+       hardeningDisable = [ "bindnow" ];
+       homepage = "https://github.com/LumiGuide/haskell-opencv";
+       description = "Haskell binding to OpenCV-3.x";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) opencv;};
+
+  "opencv-extra" = callPackage
+    ({ mkDerivation, base, bindings-DSL, bytestring, Cabal, containers
+     , data-default, directory, Glob, haskell-src-exts, inline-c
+     , inline-c-cpp, JuicyPixels, linear, opencv, primitive
+     , template-haskell, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "opencv-extra";
+       version = "0.0.0.0";
+       sha256 = "18r1y9ppw5i324fyfcbc3wm40gg16816javaxmsny5jc0vbl56gq";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         base bindings-DSL bytestring containers inline-c inline-c-cpp
+         linear opencv primitive template-haskell transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default directory Glob
+         haskell-src-exts JuicyPixels linear opencv primitive
+         template-haskell text transformers vector
+       ];
+       homepage = "https://github.com/LumiGuide/haskell-opencv";
+       description = "Haskell binding to OpenCV-3.x extra modules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "opencv-raw" = callPackage
     ({ mkDerivation, base, bindings-DSL, Cabal, opencv, vector }:
      mkDerivation {
@@ -138948,17 +139544,18 @@ self: {
      }) {EGL = null; GLESv2 = null;};
 
   "openid" = callPackage
-    ({ mkDerivation, base, bytestring, containers, HsOpenSSL, HTTP
-     , monadLib, network, time, xml
+    ({ mkDerivation, base, base-compat, bytestring, containers
+     , HsOpenSSL, HTTP, monadLib, network, network-uri, time, xml
      }:
      mkDerivation {
        pname = "openid";
-       version = "0.2.0.2";
-       sha256 = "0rhd2hz3ls9ifcrifxhd4qvd7axydnlk5gckxay55dp2lcfc4css";
+       version = "0.2.1.0";
+       sha256 = "1vwwwwcw03srgyr612gsnpv0gq8gvbykbwg6myrsn1k8c89f673d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers HsOpenSSL HTTP monadLib network time xml
+         base base-compat bytestring containers HsOpenSSL HTTP monadLib
+         network network-uri time xml
        ];
        homepage = "http://github.com/elliottt/hsopenid";
        description = "An implementation of the OpenID-2.0 spec.";
@@ -139514,7 +140111,7 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "opml-conduit_0_6_0_2" = callPackage
+  "opml-conduit_0_6_0_3" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, conduit
      , conduit-combinators, containers, data-default, hlint, lens-simple
      , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck
@@ -139524,8 +140121,8 @@ self: {
      }:
      mkDerivation {
        pname = "opml-conduit";
-       version = "0.6.0.2";
-       sha256 = "09a19s0g2aimijrjlhs8hcwqcnna5nk7z3h5i5l47prgm45nrxmi";
+       version = "0.6.0.3";
+       sha256 = "1flzv6v1mds7w9v3ap3g7gfwlvq54z0j1w7g2b07d17x334lyhgb";
        libraryHaskellDepends = [
          base case-insensitive conduit conduit-combinators containers
          lens-simple mono-traversable monoid-subclasses safe-exceptions
@@ -139774,14 +140371,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "optparse-generic_1_2_0" = callPackage
+  "optparse-generic_1_2_1" = callPackage
     ({ mkDerivation, base, bytestring, optparse-applicative, semigroups
      , system-filepath, text, time, transformers, void
      }:
      mkDerivation {
        pname = "optparse-generic";
-       version = "1.2.0";
-       sha256 = "1zhvrwcrchnls5fhy4m0466hhz84whrc2xm7nxwk1xjnmaqrb4l7";
+       version = "1.2.1";
+       sha256 = "1dk945dp98mwk1v4y0cky3z0ngmd29nbg6fbaaxnigcrgpbvkjml";
        libraryHaskellDepends = [
          base bytestring optparse-applicative semigroups system-filepath
          text time transformers void
@@ -142294,6 +142891,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "parser-combinators" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "parser-combinators";
+       version = "0.1.0";
+       sha256 = "18swiwkw5as3xqxqjw46rl07sgjsz5533ki9q3rngfciyzzdj1qv";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mrkkrp/parser-combinators";
+       description = "Lightweight package providing commonly useful parser combinators";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "parser-helper" = callPackage
     ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }:
      mkDerivation {
@@ -142349,31 +142958,6 @@ self: {
      }) {};
 
   "parsers" = callPackage
-    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
-     , charset, containers, directory, doctest, filepath, parsec
-     , QuickCheck, quickcheck-instances, scientific, text, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "parsers";
-       version = "0.12.4";
-       sha256 = "07najh7f9y3ahh42z96sw4hnd0kc4x3wm0xlf739y0gh81ys5097";
-       revision = "1";
-       editedCabalFile = "1y63jydbb5jsxj66ac0wljk0dyg4prrn2ik1rm636v9g0s8lf2di";
-       libraryHaskellDepends = [
-         attoparsec base base-orphans charset containers parsec scientific
-         text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring containers directory doctest filepath
-         parsec QuickCheck quickcheck-instances
-       ];
-       homepage = "http://github.com/ekmett/parsers/";
-       description = "Parsing combinators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "parsers_0_12_5" = callPackage
     ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal
      , cabal-doctest, charset, containers, directory, doctest, filepath
      , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text
@@ -142395,7 +142979,6 @@ self: {
        homepage = "http://github.com/ekmett/parsers/";
        description = "Parsing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsestar" = callPackage
@@ -142515,8 +143098,8 @@ self: {
      }:
      mkDerivation {
        pname = "partial-order";
-       version = "0.1.2";
-       sha256 = "1lgmrq2fl7jygy7lshzqpqza60xm5w2n4mdvl7cigmyx0rr3nd4s";
+       version = "0.1.2.1";
+       sha256 = "15y3593fl5gabcf0qzyfql30v80sninv1f79dz4v2ll89dzwfzg3";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
@@ -142660,6 +143243,30 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "patat_0_5_2_2" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
+     , bytestring, containers, directory, filepath, mtl, network
+     , network-uri, optparse-applicative, pandoc, skylighting
+     , terminal-size, text, time, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "patat";
+       version = "0.5.2.2";
+       sha256 = "01g74kw9qszz4781srqsjvf4vxf0rvb4q8yy5nbx3zyp4lwggv3j";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson ansi-terminal ansi-wl-pprint base bytestring containers
+         directory filepath mtl network network-uri optparse-applicative
+         pandoc skylighting terminal-size text time unordered-containers
+         yaml
+       ];
+       homepage = "http://github.com/jaspervdj/patat";
+       description = "Terminal-based presentations using Pandoc";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "patch-combinators" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -142736,6 +143343,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path_0_6_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
+     , filepath, genvalidity, genvalidity-property, hashable, hspec, mtl
+     , QuickCheck, template-haskell, validity
+     }:
+     mkDerivation {
+       pname = "path";
+       version = "0.6.0";
+       sha256 = "107jkd0wz40njxbdmgvc51q6bjqz71wl0bi0sprjhvgm2bn64x2x";
+       libraryHaskellDepends = [
+         aeson base deepseq exceptions filepath hashable template-haskell
+       ];
+       testHaskellDepends = [
+         aeson base bytestring filepath genvalidity genvalidity-property
+         hspec mtl QuickCheck validity
+       ];
+       description = "Support for well-typed paths";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-extra" = callPackage
     ({ mkDerivation, base, exceptions, path }:
      mkDerivation {
@@ -142767,17 +143395,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "path-io_1_3_0" = callPackage
-    ({ mkDerivation, base, containers, directory, exceptions, filepath
-     , hspec, path, temporary, time, transformers, unix-compat
+  "path-io_1_3_1" = callPackage
+    ({ mkDerivation, base, containers, directory, dlist, exceptions
+     , filepath, hspec, path, temporary, time, transformers, unix-compat
      }:
      mkDerivation {
        pname = "path-io";
-       version = "1.3.0";
-       sha256 = "1s3rkhfqcrnb3yalwlzd6ldvqlvwgf0h8yzc85l5gld8mwjs2lif";
+       version = "1.3.1";
+       sha256 = "166wxidsfyyv609bjfrn204k7lia02hgb4kmmbfv716dplywsb0q";
        libraryHaskellDepends = [
-         base containers directory exceptions filepath path temporary time
-         transformers unix-compat
+         base containers directory dlist exceptions filepath path temporary
+         time transformers unix-compat
        ];
        testHaskellDepends = [
          base exceptions hspec path transformers unix-compat
@@ -143785,8 +144413,8 @@ self: {
      }:
      mkDerivation {
        pname = "period";
-       version = "0.1.0.5";
-       sha256 = "1y6mijk8860nb0ln64iplnz4bjr4z3h3y25p8g7jdl092s7xwvmn";
+       version = "0.1.0.6";
+       sha256 = "0zk7ac5casyxgdx5895jap7sw0klys26b29kj4f4p1f75b1ga8lz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144388,6 +145016,8 @@ self: {
        pname = "persistent-template";
        version = "2.5.2";
        sha256 = "04a0ifjidy7lv5ip0dipjgsvr3h9kkw37z03s5kaxyaqh405nsfy";
+       revision = "1";
+       editedCabalFile = "0jhcanaz680knzc45g594fa68ihh7mkkrhlyaxnj6rjwbrcwjp9x";
        libraryHaskellDepends = [
          aeson aeson-compat base bytestring containers ghc-prim
          http-api-data monad-control monad-logger path-pieces persistent
@@ -144649,8 +145279,8 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "10.7";
-       sha256 = "0wzy7g6xc8snkfciahahm3qnhg0k21y9535gd1bzz6zmpx113sg9";
+       version = "10.8";
+       sha256 = "127xgzx1j2d4flqykgb6vp57zjmyc6jkx8l2jak4df68wpcy1gwq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145300,28 +145930,6 @@ self: {
      }) {};
 
   "pinch" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pinch";
-       version = "0.3.1.0";
-       sha256 = "1gw5bl9l7l6dj1bfnxgikhz8irxpdn4292wvdav4dgkgl90sm2vg";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq ghc-prim hashable text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-discover QuickCheck text
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/abhinav/pinch#readme";
-       description = "An alternative implementation of Thrift for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinch_0_3_2_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
      , unordered-containers, vector
@@ -145341,7 +145949,6 @@ self: {
        homepage = "https://github.com/abhinav/pinch#readme";
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinchot" = callPackage
@@ -145565,6 +146172,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-bytestring_2_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes-bytestring";
+       version = "2.1.5";
+       sha256 = "10snjd1abl954gbcl2vxn5vsj830k4sb1jxs8z3h372has13ls9c";
+       libraryHaskellDepends = [
+         base bytestring pipes pipes-group pipes-parse transformers
+       ];
+       description = "ByteString support for pipes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-bzip" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, bzlib
      , data-default, directory, hspec, MonadRandom, mtl, pipes
@@ -146694,6 +147317,8 @@ self: {
        pname = "plan-b";
        version = "0.2.1";
        sha256 = "038w0y90k7fn13ba5vrpyxa6vjn03lxqdnd2vgki9hmb4idxiakv";
+       revision = "1";
+       editedCabalFile = "0ci5x3vvwgasy47rxmqk2d1z7qakhh34zwgjbc3gydii2vapd7zh";
        libraryHaskellDepends = [
          base exceptions path path-io transformers
        ];
@@ -147569,18 +148194,21 @@ self: {
      }) {};
 
   "polynomial" = callPackage
-    ({ mkDerivation, base, deepseq, pretty, vector, vector-space
-     , vector-th-unbox
+    ({ mkDerivation, base, deepseq, HUnit, pretty, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , vector, vector-space, vector-th-unbox
      }:
      mkDerivation {
        pname = "polynomial";
-       version = "0.7.2";
-       sha256 = "1w1zpa2l7l7yzqdgr142mqhf73mq8kiz7h3ydpd84n4vawjzz7z1";
-       revision = "1";
-       editedCabalFile = "0davyhlqj2w92k0rnb0v6glkw0xrls90lry9i5lyrqzlypks5jws";
+       version = "0.7.3";
+       sha256 = "0wl9wdaqrs6hs83xi27m879j7i2q04v14jqkrwns2qy3f2yhq2rr";
        libraryHaskellDepends = [
          base deepseq pretty vector vector-space vector-th-unbox
        ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 vector vector-space
+       ];
        homepage = "https://github.com/mokus0/polynomial";
        description = "Polynomials";
        license = stdenv.lib.licenses.publicDomain;
@@ -148400,6 +149028,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
 
+  "postgresql-named" = callPackage
+    ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl
+     , postgresql-libpq, postgresql-simple, utf8-string
+     }:
+     mkDerivation {
+       pname = "postgresql-named";
+       version = "0.1.0";
+       sha256 = "0b7a3i8mcp9xs2zga6qi1byy489cl33j3mcrkx3smrz926ahbz95";
+       libraryHaskellDepends = [
+         base bytestring extra generics-sop mtl postgresql-libpq
+         postgresql-simple utf8-string
+       ];
+       testHaskellDepends = [ base generics-sop hspec postgresql-simple ];
+       homepage = "https://github.com/cocreature/postgresql-named#readme";
+       description = "Generic deserialization of PostgreSQL rows based on column names";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-orm" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , bytestring-builder, directory, filepath, ghc-prim, mtl
@@ -148552,16 +149198,17 @@ self: {
      }) {};
 
   "postgresql-simple-opts" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, markdown-unlit
-     , optparse-applicative, optparse-generic, postgresql-simple
+    ({ mkDerivation, base, bytestring, data-default, either, hspec
+     , markdown-unlit, optparse-applicative, optparse-generic
+     , postgresql-simple
      }:
      mkDerivation {
        pname = "postgresql-simple-opts";
-       version = "0.1.0.4";
-       sha256 = "1rb08900n21afs8vkmbhbma2jhlxw0a6mj4c67cpxgsidrysh174";
+       version = "0.2.0.0";
+       sha256 = "07zsykbxcl1rjbcnq21bw99r77jm743py9lcvk8grnqfjqyn43a7";
        libraryHaskellDepends = [
-         base bytestring markdown-unlit optparse-applicative
-         optparse-generic postgresql-simple
+         base bytestring data-default either markdown-unlit
+         optparse-applicative optparse-generic postgresql-simple
        ];
        testHaskellDepends = [
          base bytestring hspec optparse-applicative postgresql-simple
@@ -148697,26 +149344,26 @@ self: {
   "postgrest" = callPackage
     ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async
      , auto-update, base, base64-bytestring, bytestring
-     , case-insensitive, cassava, configurator, containers
+     , case-insensitive, cassava, configurator-ng, containers
      , contravariant, cookie, either, hasql, hasql-pool
      , hasql-transaction, heredoc, hjsonpointer, hjsonschema, hspec
      , hspec-wai, hspec-wai-json, HTTP, http-types
      , insert-ordered-containers, interpolatedstring-perl6, jwt, lens
      , lens-aeson, monad-control, network-uri, optparse-applicative
-     , parsec, process, protolude, Ranged-sets, regex-tdfa, safe
+     , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe
      , scientific, swagger2, text, time, transformers-base, unix
      , unordered-containers, vector, wai, wai-cors, wai-extra
      , wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.4.1.0";
-       sha256 = "1g344xb9gg8n60wrk9chr0v7k32ryjn7bfcinwj7zydv5xis2j8l";
+       version = "0.4.2.0";
+       sha256 = "0256mjq9xc0shanyb54p1bhbpb68mdadc71c5p7lpr0q4cn91c0m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bytestring case-insensitive cassava
-         configurator containers contravariant cookie either hasql
+         configurator-ng containers contravariant cookie either hasql
          hasql-pool hasql-transaction heredoc HTTP http-types
          insert-ordered-containers interpolatedstring-perl6 jwt lens
          lens-aeson network-uri optparse-applicative parsec protolude
@@ -148726,7 +149373,7 @@ self: {
        ];
        executableHaskellDepends = [
          auto-update base base64-bytestring bytestring hasql hasql-pool
-         protolude text time unix warp
+         protolude retry text time unix warp
        ];
        testHaskellDepends = [
          aeson aeson-qq async auto-update base base64-bytestring bytestring
@@ -149792,6 +150439,8 @@ self: {
        pname = "prettyprinter";
        version = "1.1";
        sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y";
+       revision = "1";
+       editedCabalFile = "0b3f3b55h49pini9fv01km1ydqwp6l687qmy193y8lcmrygnzbdy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -150295,6 +150944,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "process-extras_0_7_2" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, deepseq
+     , generic-deriving, HUnit, ListLike, mtl, process, text
+     }:
+     mkDerivation {
+       pname = "process-extras";
+       version = "0.7.2";
+       sha256 = "0n79m1kj59w4s2a86m1hm98019452mhh06szn0jwsvb9xhqi0v77";
+       libraryHaskellDepends = [
+         base bytestring data-default deepseq generic-deriving ListLike mtl
+         process text
+       ];
+       testHaskellDepends = [ base HUnit ];
+       homepage = "https://github.com/seereason/process-extras";
+       description = "Process extras";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "process-iterio" = callPackage
     ({ mkDerivation, base, bytestring, cpphs, iterIO, process
      , transformers
@@ -151119,25 +151787,6 @@ self: {
      }) {inherit (pkgs) alsaLib;};
 
   "proto-lens" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , data-default-class, lens-family, parsec, pretty, text
-     , transformers, void
-     }:
-     mkDerivation {
-       pname = "proto-lens";
-       version = "0.2.0.1";
-       sha256 = "1440kfxlwz8inbr68sml9najfb91yybmz5m93qz0fpf550p51h3k";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers data-default-class
-         lens-family parsec pretty text transformers void
-       ];
-       homepage = "https://github.com/google/proto-lens";
-       description = "A lens-based implementation of protocol buffers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "proto-lens_0_2_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default-class, lens-family, parsec, pretty, text
      , transformers, void
@@ -151174,29 +151823,6 @@ self: {
      }) {};
 
   "proto-lens-combinators" = callPackage
-    ({ mkDerivation, base, data-default-class, HUnit, lens-family
-     , lens-family-core, proto-lens, proto-lens-protoc, test-framework
-     , test-framework-hunit, transformers
-     }:
-     mkDerivation {
-       pname = "proto-lens-combinators";
-       version = "0.1.0.6";
-       sha256 = "0zycwrfn2c6vdp3ld2pspn9d5br0jn4m8qgjaxn0n4h3ilfzrskc";
-       libraryHaskellDepends = [
-         base data-default-class lens-family proto-lens proto-lens-protoc
-         transformers
-       ];
-       testHaskellDepends = [
-         base HUnit lens-family lens-family-core proto-lens
-         proto-lens-protoc test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/google/proto-lens";
-       description = "Utilities functions to proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "proto-lens-combinators_0_1_0_7" = callPackage
     ({ mkDerivation, base, Cabal, data-default-class, HUnit
      , lens-family, lens-family-core, proto-lens, proto-lens-protoc
      , test-framework, test-framework-hunit, transformers
@@ -151226,8 +151852,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-descriptors";
-       version = "0.2.0.1";
-       sha256 = "1vjdp3n7fh8qwql9a8gpcgrkcgdpf0d2x4y1i7ghvd6f2gq77jmh";
+       version = "0.2.1.0";
+       sha256 = "1qaprwdxck8h06wha6hp94kia5m247bc73973rz870c7hk2pdh6s";
        libraryHaskellDepends = [
          base bytestring containers data-default-class lens-family
          lens-labels proto-lens text
@@ -151236,29 +151862,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "proto-lens-descriptors_0_2_1_0" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default-class
-     , lens-family, lens-labels, proto-lens, text
-     }:
+  "proto-lens-optparse" = callPackage
+    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
-       pname = "proto-lens-descriptors";
-       version = "0.2.1.0";
-       sha256 = "1qaprwdxck8h06wha6hp94kia5m247bc73973rz870c7hk2pdh6s";
+       pname = "proto-lens-optparse";
+       version = "0.1.0.2";
+       sha256 = "1mi4q21i7zzlk6bs8p6ir07bfw2n1kavamxb90v90vdjy42bdbyn";
        libraryHaskellDepends = [
-         base bytestring containers data-default-class lens-family
-         lens-labels proto-lens text
+         base optparse-applicative proto-lens text
        ];
-       description = "Protocol buffers for describing the definitions of messages";
+       homepage = "https://github.com/google/proto-lens";
+       description = "Adapting proto-lens to optparse-applicative ReadMs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "proto-lens-optparse" = callPackage
+  "proto-lens-optparse_0_1_0_3" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
-       version = "0.1.0.2";
-       sha256 = "1mi4q21i7zzlk6bs8p6ir07bfw2n1kavamxb90v90vdjy42bdbyn";
+       version = "0.1.0.3";
+       sha256 = "16wk5paba9p7rz1z614d9byszygkqvxca78zwxyzjgvyjw1yssyl";
        libraryHaskellDepends = [
          base optparse-applicative proto-lens text
        ];
@@ -151282,32 +151906,6 @@ self: {
      }) {};
 
   "proto-lens-protoc" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers
-     , data-default-class, directory, filepath, haskell-src-exts
-     , lens-family, lens-labels, process, proto-lens
-     , proto-lens-descriptors, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-protoc";
-       version = "0.2.0.1";
-       sha256 = "0zsd7gw6nirfsa5pg119a7pqcqmc005ynhqvw2r2ccvdppq5y26y";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring Cabal containers data-default-class directory
-         filepath haskell-src-exts lens-family lens-labels process
-         proto-lens proto-lens-descriptors text
-       ];
-       executableHaskellDepends = [
-         base bytestring containers data-default-class filepath
-         haskell-src-exts lens-family proto-lens proto-lens-descriptors text
-       ];
-       description = "Protocol buffer compiler for the proto-lens library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "proto-lens-protoc_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, directory, filepath, haskell-src-exts
      , lens-family, lens-labels, process, proto-lens
@@ -152273,7 +152871,6 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -152294,7 +152891,6 @@ self: {
        ];
        description = "Generate PureScript data types from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge_0_11_0_0" = callPackage
@@ -153015,8 +153611,8 @@ self: {
     ({ mkDerivation, base, process, qtah-generator, qtbase }:
      mkDerivation {
        pname = "qtah-cpp-qt5";
-       version = "0.2.0";
-       sha256 = "1npgfxz3m30lsknw1nw1apmhl40zsaps3ysci23iv92m720zdnnn";
+       version = "0.3.1";
+       sha256 = "0yy6q10lsjhjnvirs2d8pdivs9d0kdilwsm4j7s59jz5xhwzbqzl";
        libraryHaskellDepends = [ base process qtah-generator ];
        librarySystemDepends = [ qtbase ];
        homepage = "http://khumba.net/projects/qtah";
@@ -153026,17 +153622,17 @@ self: {
      }) {inherit (pkgs.qt5) qtbase;};
 
   "qtah-examples" = callPackage
-    ({ mkDerivation, base, binary, bytestring, filepath, hoppy-runtime
-     , qtah-qt5
+    ({ mkDerivation, base, binary, bytestring, containers, filepath
+     , hoppy-runtime, qtah-qt5
      }:
      mkDerivation {
        pname = "qtah-examples";
-       version = "0.2.1";
-       sha256 = "13rwb7vxi1clg5mw6l1qh97knp53prh0hxy9yq40pxpak7wknwd9";
+       version = "0.3.0";
+       sha256 = "0scb00dilgbiqzp1jq0jknx76qb0fc9l9wsv214k9x741q7cv71b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base binary bytestring filepath hoppy-runtime qtah-qt5
+         base binary bytestring containers filepath hoppy-runtime qtah-qt5
        ];
        homepage = "http://khumba.net/projects/qtah";
        description = "Example programs for Qtah Qt bindings";
@@ -153050,8 +153646,8 @@ self: {
      }:
      mkDerivation {
        pname = "qtah-generator";
-       version = "0.2.1";
-       sha256 = "1vrg9cbp9ipvm3c9flg0pdj3n11rw4z9jcnwfgivcsp46rbm6y74";
+       version = "0.3.0";
+       sha256 = "0zyhpb70lcp9r8skq6lzw4xqpa3fndbq4vxk098diqivknl064ff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -153072,8 +153668,8 @@ self: {
      }:
      mkDerivation {
        pname = "qtah-qt5";
-       version = "0.2.0";
-       sha256 = "12n62sy7226r2bybppivjkaqywna31nnnmhsr4v984mvk53s6iw6";
+       version = "0.3.0";
+       sha256 = "0rrg0ymkhvgdhwcabr4n4alrqkzyyzyggdclygmjp7l2lq4md1ad";
        libraryHaskellDepends = [
          base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator
        ];
@@ -153452,21 +154048,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-instances_0_3_14" = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive
-     , containers, hashable, old-time, QuickCheck, scientific, tagged
-     , text, time, unordered-containers, uuid-types, vector
+  "quickcheck-instances_0_3_15" = callPackage
+    ({ mkDerivation, array, base, base-compat, bytestring
+     , case-insensitive, containers, hashable, old-time, QuickCheck
+     , scientific, tagged, text, time, transformers, transformers-compat
+     , unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "quickcheck-instances";
-       version = "0.3.14";
-       sha256 = "1mq9zg7d0h275lhwqjq5z2hs4ql4v13q7c8x5n6rhp47rr07pcgr";
-       revision = "1";
-       editedCabalFile = "107xlrf2r0d11c4ig33p5rg3hr8di0mbhnzzvkw0q7ys1ik5v0qn";
+       version = "0.3.15";
+       sha256 = "02nwas0i2jlvjahlj5mayhpiy8pkb46xicypjw63kzp1xc6zs3ly";
        libraryHaskellDepends = [
-         array base bytestring case-insensitive containers hashable old-time
-         QuickCheck scientific tagged text time unordered-containers
-         uuid-types vector
+         array base base-compat bytestring case-insensitive containers
+         hashable old-time QuickCheck scientific tagged text time
+         transformers transformers-compat unordered-containers uuid-types
+         vector
        ];
        testHaskellDepends = [
          base containers QuickCheck tagged uuid-types
@@ -153489,6 +154085,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "quickcheck-io_0_2_0" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck }:
+     mkDerivation {
+       pname = "quickcheck-io";
+       version = "0.2.0";
+       sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv";
+       libraryHaskellDepends = [ base HUnit QuickCheck ];
+       homepage = "https://github.com/hspec/quickcheck-io#readme";
+       description = "Use HUnit assertions as QuickCheck properties";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-poly" = callPackage
     ({ mkDerivation, base, haskell98, hint, MonadCatchIO-mtl
      , QuickCheck, regex-compat, regex-tdfa
@@ -155242,6 +155851,8 @@ self: {
        pname = "rasterific-svg";
        version = "0.3.2.1";
        sha256 = "1pxgazmyl9ky08vx2nnf5k7bw183ljpvzggvddrdlpwzczm8fzki";
+       revision = "1";
+       editedCabalFile = "19w6f01qc1ahwfsqnqb6ajsgv4wqy5vfy54f6x15z1pivnyw37sk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157407,27 +158018,6 @@ self: {
      }) {};
 
   "regex" = callPackage
-    ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , hashable, regex-base, regex-tdfa, regex-tdfa-text
-     , template-haskell, text, time, time-locale-compat, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "regex";
-       version = "1.0.1.0";
-       sha256 = "1kh4bh1yvpclx5f903pig034b2sjkvm3ijsrwmdh94ws9h0fdc9p";
-       libraryHaskellDepends = [
-         array base base-compat bytestring containers hashable regex-base
-         regex-tdfa regex-tdfa-text template-haskell text time
-         time-locale-compat transformers unordered-containers
-       ];
-       homepage = "http://regex.uk";
-       description = "Toolkit for regex-base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "regex_1_0_1_3" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , hashable, regex-base, regex-pcre-builtin, regex-tdfa
      , regex-tdfa-text, template-haskell, text, time, time-locale-compat
@@ -157887,26 +158477,6 @@ self: {
      }) {};
 
   "regex-with-pcre" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, containers, regex
-     , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa
-     , template-haskell, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "regex-with-pcre";
-       version = "1.0.1.0";
-       sha256 = "0r7fqh9mkbjdf21m9m1j9s21h27c1cm2xcmb3j1ai9ga7jhl4864";
-       libraryHaskellDepends = [
-         base base-compat bytestring containers regex regex-base
-         regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
-         transformers unordered-containers
-       ];
-       homepage = "http://regex.uk";
-       description = "Toolkit for regex-base";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "regex-with-pcre_1_0_1_3" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, regex
      , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa
      , template-haskell, text, transformers, unordered-containers
@@ -159346,6 +159916,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reproject" = callPackage
+    ({ mkDerivation, base, hspec, template-haskell }:
+     mkDerivation {
+       pname = "reproject";
+       version = "0.2.0.0";
+       sha256 = "1h1m5fdlhd2dxpk8bphcvbjybw40lw48b7j1bkk2grq3ljyvgmwl";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/agrafix/reproject#readme";
+       description = "Define and combine \"materialized\" projections";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "req" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
      , bytestring, case-insensitive, connection, data-default-class
@@ -161686,7 +162269,7 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "rss-conduit_0_3_1_0" = callPackage
+  "rss-conduit_0_3_1_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , containers, data-default, hlint, lens-simple, mono-traversable
      , QuickCheck, quickcheck-instances, resourcet, safe
@@ -161695,8 +162278,8 @@ self: {
      }:
      mkDerivation {
        pname = "rss-conduit";
-       version = "0.3.1.0";
-       sha256 = "1j9wxfadvhs4aaf84q4xy2p1x0ic7zhr22srrwzmw9qjjl4dy4is";
+       version = "0.3.1.1";
+       sha256 = "16pghxkk9pyskhp73sz43nw84w7qw62sdlwqpsrrfs2wr2ab71bd";
        libraryHaskellDepends = [
          base conduit conduit-combinators containers lens-simple
          mono-traversable safe safe-exceptions text time timerep
@@ -162213,6 +162796,8 @@ self: {
        pname = "safe-exceptions";
        version = "0.1.5.0";
        sha256 = "068srl44q66iv939fhk3mxalmxdn7348f6xh46pwg5mjj4vfrvvh";
+       revision = "1";
+       editedCabalFile = "0m0m2bj8xmiqj1qxkl00p0fndn6aw54a4yf2kx2qhijgzc4f1hwl";
        libraryHaskellDepends = [ base deepseq exceptions transformers ];
        testHaskellDepends = [ base hspec void ];
        homepage = "https://github.com/fpco/safe-exceptions#readme";
@@ -163557,22 +164142,23 @@ self: {
   "schematic" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, hspec-core
      , hspec-discover, hspec-smallcheck, HUnit, regex-compat, scientific
-     , singletons, smallcheck, smallcheck-series, text
+     , singletons, smallcheck, smallcheck-series, tagged, text
      , unordered-containers, validationt, vector, vinyl
      }:
      mkDerivation {
        pname = "schematic";
-       version = "0.1.1.0";
-       sha256 = "1g0myq6rslzn4q611r6wvcfdpvvfw8f85rck3ha7qhaw7vmm5vyb";
+       version = "0.1.4.0";
+       sha256 = "11dc24f657wh5g5yx256qnwmajxs5f6pv2ydzdqig3a7al32kvfb";
        libraryHaskellDepends = [
          aeson base bytestring regex-compat scientific singletons smallcheck
-         smallcheck-series text unordered-containers validationt vector
-         vinyl
+         smallcheck-series tagged text unordered-containers validationt
+         vector vinyl
        ];
        testHaskellDepends = [
          aeson base bytestring hspec hspec-core hspec-discover
          hspec-smallcheck HUnit regex-compat singletons smallcheck
-         smallcheck-series text unordered-containers validationt vinyl
+         smallcheck-series tagged text unordered-containers validationt
+         vinyl
        ];
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
@@ -163749,30 +164335,6 @@ self: {
      }) {};
 
   "scientific" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
-     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, vector
-     }:
-     mkDerivation {
-       pname = "scientific";
-       version = "0.3.4.13";
-       sha256 = "0fpn0mwv4rvvn44dn2lm5nxws8w90jv9vlwjy85xsvhn5dvv7bhq";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq ghc-prim hashable
-         integer-gmp integer-logarithms text vector
-       ];
-       testHaskellDepends = [
-         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-         tasty-hunit tasty-quickcheck tasty-smallcheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/basvandijk/scientific";
-       description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scientific_0_3_4_15" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms
      , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
@@ -163794,7 +164356,6 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -164452,8 +165013,8 @@ self: {
      }:
      mkDerivation {
        pname = "sdl2-compositor";
-       version = "1.2.0.6";
-       sha256 = "055hafyp8xrdy00fyp9r263nh5ga077q7cv5acb48sagy4fwxyij";
+       version = "1.2.0.7";
+       sha256 = "1yfbqxrfhy951qdcf43vx9gxd4jj3l2dq5bz04blchpq4qzm4876";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164948,18 +165509,20 @@ self: {
      }) {sedna = null;};
 
   "selda" = callPackage
-    ({ mkDerivation, base, exceptions, hashable, mtl, psqueues, text
-     , time, unordered-containers
+    ({ mkDerivation, base, bytestring, exceptions, hashable, mtl
+     , psqueues, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "selda";
-       version = "0.1.7.0";
-       sha256 = "0mg21i8aw4vmiwnflcmg8qkvqz8fx0j50z67hr2k9pvqld13vr5s";
+       version = "0.1.8.0";
+       sha256 = "13ccbpwsd2w6l534a9l6d1mmssfy1q9lh6df14zf2am8ph184av7";
+       revision = "1";
+       editedCabalFile = "1lqq7ik4s1xvbc94knv57h2k08r8rk4nyhxq6nlfy23spb56r0a6";
        libraryHaskellDepends = [
-         base exceptions hashable mtl psqueues text time
+         base bytestring exceptions hashable mtl psqueues text time
          unordered-containers
        ];
-       homepage = "https://github.com/valderman/selda";
+       homepage = "https://selda.link";
        description = "Type-safe, high-level EDSL for interacting with relational databases";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -164970,8 +165533,8 @@ self: {
      }:
      mkDerivation {
        pname = "selda-postgresql";
-       version = "0.1.4.0";
-       sha256 = "1zld5pwgfsm9rp8wads0k8dmfn2lbz6y093nj31gv1pkb8w392vs";
+       version = "0.1.5.0";
+       sha256 = "1ziavpl33m82xfv7528nvfgmlamz2rzmdd73gs7zbrvqnizjq4b5";
        libraryHaskellDepends = [
          base bytestring exceptions postgresql-libpq selda text
        ];
@@ -164986,8 +165549,8 @@ self: {
      }:
      mkDerivation {
        pname = "selda-sqlite";
-       version = "0.1.4.0";
-       sha256 = "0irx8j3akzyb325q75jlcjnkir0kp820knaqwn9j393g4v9g1i40";
+       version = "0.1.5.0";
+       sha256 = "10r0sqbps515qbcdfgsi9lkjx5axps02hbgrjgkc7djg01i3c6x1";
        libraryHaskellDepends = [
          base direct-sqlite directory exceptions selda text
        ];
@@ -165423,8 +165986,8 @@ self: {
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.1.1";
-       sha256 = "0gcwwb8w0rr0kjhp13afsszsb81qvnryb5qnhskyr9wpx8vvm9bk";
+       version = "0.1.1.3";
+       sha256 = "1zhhnddp81p42z243i10kma5jic283gqlg190lfifsg8kdg3yms1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -166899,6 +167462,8 @@ self: {
        pname = "servant-mock";
        version = "0.8.2";
        sha256 = "146z4n7ayg0347kabwdz1crha7ilfdcdx3pazdgsmq2bl8mwad3w";
+       revision = "1";
+       editedCabalFile = "19vvzy09wj0yxjz4sv417c45h1n34nd7zc9n8agxavr3wyi9lihh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167422,6 +167987,8 @@ self: {
        pname = "servant-subscriber";
        version = "0.6.0.0";
        sha256 = "0pa0zwb8qqs6y2fcs8acwljym9jmha273gb2v5nyhhfyimdl8x8q";
+       revision = "1";
+       editedCabalFile = "16r1ry5zd67mj5f2mi2sv9ls3vvc6y78ryijp8fcw1rif7mynf7h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167993,6 +168560,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "setlocale_1_0_0_5" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "setlocale";
+       version = "1.0.0.5";
+       sha256 = "1w4zgpjjy56bpgjjcxh2fj3v4pqwmfhfwwvs5nhys12h8y8q8hsp";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
+       description = "Haskell bindings to setlocale";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "setoid" = callPackage
     ({ mkDerivation, base, containers, mtl, smallcheck, tasty
      , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -170767,21 +171347,21 @@ self: {
   "siphon" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, colonnade
      , contravariant, either, HUnit, pipes, profunctors, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, vector
+     , streaming, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, transformers, vector
      }:
      mkDerivation {
        pname = "siphon";
-       version = "0.6";
-       sha256 = "04959v1dmfn5x6gdng3w2dyapr9yr34yqxkzmdw249pldsfbjxjp";
+       version = "0.7";
+       sha256 = "1k03gzgi9d27yzcvmxzibpgc5l6k7g41048x1qxd3l67qpxxbsl9";
        libraryHaskellDepends = [
-         attoparsec base bytestring colonnade contravariant pipes text
+         attoparsec base bytestring colonnade streaming text transformers
          vector
        ];
        testHaskellDepends = [
          base bytestring colonnade contravariant either HUnit pipes
-         profunctors QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 text
+         profunctors QuickCheck streaming test-framework
+         test-framework-hunit test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Encode and decode CSV files";
@@ -171709,6 +172289,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "smiles" = callPackage
+    ({ mkDerivation, base, hspec, megaparsec, QuickCheck, text }:
+     mkDerivation {
+       pname = "smiles";
+       version = "0.1.0.1";
+       sha256 = "1bmnzwb8i6l8frfwzac1lv6r2iwipd84pwchnl9pam6w7gj0ncck";
+       libraryHaskellDepends = [ base megaparsec text ];
+       testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
+       homepage = "https://github.com/zmactep/smiles#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smoothie" = callPackage
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
@@ -173995,8 +174587,8 @@ self: {
      }:
      mkDerivation {
        pname = "sound-collage";
-       version = "0.2";
-       sha256 = "1hishmz0mccxxgz99pda1gykz8iqv7lwjqlxcks940j576mcy1sw";
+       version = "0.2.0.1";
+       sha256 = "0ywsy3q8f6y6k0vg4g21v6cm3n7662ngbzvfx502makdkf47i75a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -177532,6 +178124,8 @@ self: {
        pname = "storable-endian";
        version = "0.2.6";
        sha256 = "12allvahkgx1nr10z4gp07gwaxqf52n4yyzihdxiilsf127sqhrp";
+       revision = "1";
+       editedCabalFile = "12f8sscsvsarlwz3p6kk9vbvqsbyhs8lhafgn9h7c0z6pz1amrya";
        libraryHaskellDepends = [ base byteorder ];
        description = "Storable instances with endianness";
        license = stdenv.lib.licenses.bsd3;
@@ -177942,6 +178536,8 @@ self: {
        pname = "stream-fusion";
        version = "0.1.2.5";
        sha256 = "006fz03jdwd9d0kwf8ma3077xxmg6zym94pwbb4sx1xcn7zf4yc6";
+       revision = "1";
+       editedCabalFile = "1jyb8mc99ag72y4bqxw997klrikhnxqrbacmx2ag5kmwsd1v1p12";
        libraryHaskellDepends = [ base ];
        homepage = "http://hackage.haskell.org/trac/ghc/ticket/915";
        description = "Faster Haskell lists using stream fusion";
@@ -178100,8 +178696,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-conduit";
-       version = "0.1.1.0";
-       sha256 = "1cj2p3c6rs5cbz0jdj7k8mxfnslk96966dshfhjxi56mrpjxmzjy";
+       version = "0.1.2.0";
+       sha256 = "1vzw0lfj8l4ic1fcw0iqiwygg4zrfxw9xdjbl7qpkfsjsbjqyg2q";
        libraryHaskellDepends = [
          base bytestring conduit streaming streaming-bytestring transformers
        ];
@@ -180197,8 +180793,8 @@ self: {
     ({ mkDerivation, base, diagrams-cairo, diagrams-lib, sym }:
      mkDerivation {
        pname = "sym-plot";
-       version = "0.2.0";
-       sha256 = "0186i6c3dyvs5pa4fh0b284wgpm10pgwax9prahirnq8whph94p2";
+       version = "0.3.0";
+       sha256 = "1ppq86fv5knfdcfn3pfiyg7v9k1aq47xp0b6yn8bwkfhcxxmbbhp";
        libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        homepage = "http://github.com/akc/sym-plot";
        description = "Plot permutations; an addition to the sym package";
@@ -182681,6 +183277,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-quickcheck_0_9" = callPackage
+    ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged
+     , tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "tasty-quickcheck";
+       version = "0.9";
+       sha256 = "00h7vvmadiq07bzd9dpi8maw1apshz66si9vkkqzxmgvnv9src33";
+       libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
+       testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
+       homepage = "http://documentup.com/feuerbach/tasty";
+       description = "QuickCheck support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-rerun" = callPackage
     ({ mkDerivation, base, containers, mtl, optparse-applicative
      , reducers, split, stm, tagged, tasty, transformers
@@ -183105,6 +183717,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "teardown" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, criterion, doctest, Glob
+     , protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit
+     , tasty-rerun, tasty-smallcheck, text, time
+     }:
+     mkDerivation {
+       pname = "teardown";
+       version = "0.0.0.2";
+       sha256 = "0d28sxx2krf3p5alj8gn8gs98slfs9fqwbaf6lyimayy2fx9d5jf";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base protolude text time
+       ];
+       testHaskellDepends = [
+         base doctest Glob protolude QuickCheck tasty tasty-hspec
+         tasty-hunit tasty-rerun tasty-smallcheck text time
+       ];
+       benchmarkHaskellDepends = [ base criterion protolude text time ];
+       homepage = "https://github.com/roman/Haskell-teardown#readme";
+       description = "Build composable, idempotent & transparent application cleanup sub-routines";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "teeth" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -183549,6 +184183,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "temporary_1_2_1" = callPackage
+    ({ mkDerivation, base, base-compat, directory, exceptions, filepath
+     , tasty, tasty-hunit, transformers, unix
+     }:
+     mkDerivation {
+       pname = "temporary";
+       version = "1.2.1";
+       sha256 = "1y54fx183sfmpd3xj94c74z9v42y1d7ski3jqrfrd7pnbh38ikwy";
+       libraryHaskellDepends = [
+         base directory exceptions filepath transformers unix
+       ];
+       testHaskellDepends = [
+         base base-compat directory filepath tasty tasty-hunit unix
+       ];
+       homepage = "https://github.com/feuerbach/temporary";
+       description = "Portable temporary file and directory support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "temporary-rc" = callPackage
     ({ mkDerivation, base, directory, exceptions, filepath
      , transformers, unix
@@ -183886,8 +184540,8 @@ self: {
      }:
      mkDerivation {
        pname = "terminal-progress-bar";
-       version = "0.1.1";
-       sha256 = "107kr4yii14fg1330i3n8w0hqhxswys4f945x1m8ldqkj6naflr0";
+       version = "0.1.1.1";
+       sha256 = "1y9mpmnbc12bbybaqq7cqwhvbbdbx31zxkb63mymiaz1bnhi58fp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base stm stm-chans ];
@@ -185048,6 +185702,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-metrics_0_3_0" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, hspec
+     , QuickCheck, text, vector, weigh
+     }:
+     mkDerivation {
+       pname = "text-metrics";
+       version = "0.3.0";
+       sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q";
+       libraryHaskellDepends = [ base containers text vector ];
+       testHaskellDepends = [ base hspec QuickCheck text ];
+       benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
+       homepage = "https://github.com/mrkkrp/text-metrics";
+       description = "Calculate various string metrics efficiently";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-normal" = callPackage
     ({ mkDerivation, base, deepseq, hspec, QuickCheck
      , quickcheck-instances, text, text-icu
@@ -185198,6 +185869,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-short" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, hashable
+     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "text-short";
+       version = "0.1";
+       sha256 = "0zlkvzh99dyrvvk4i9pbhwkj2kf8akc8j1g3z06saprl7kjz6sn0";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq hashable text
+       ];
+       testHaskellDepends = [
+         base binary quickcheck-instances tasty tasty-hunit tasty-quickcheck
+         text
+       ];
+       description = "Memory-efficient representation of Unicode text strings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "text-show" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, contravariant
@@ -185249,6 +185939,8 @@ self: {
        pname = "text-show";
        version = "3.6";
        sha256 = "0gvg1fpgvws75zhvxdkcg03m6sy5rv4m77fynjh8v6rakbiy7gb4";
+       revision = "1";
+       editedCabalFile = "052zp68y3fbwvg9xigngaqfv7afjw9prfns5qlx6s7mv3i8dc2mk";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers contravariant generic-deriving ghc-boot-th ghc-prim
@@ -185323,6 +186015,8 @@ self: {
        pname = "text-show-instances";
        version = "3.6.1";
        sha256 = "1ws5gkmb7y21aw6lrakjq760lgg7j8r5rfm45sdfalhgasxh54lz";
+       revision = "1";
+       editedCabalFile = "1zkncw3nflhqgs0wmfj4pz2jvbp2hq5xanyv3ggdbjff6zzpcx6m";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
@@ -185652,8 +186346,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
-       version = "0.2.1.0";
-       sha256 = "08kn5siadiz4zv1p03bcys1yzsdaac10l2rh017g2sxrb40hnffk";
+       version = "0.2.2.0";
+       sha256 = "00xnyknp1xgbr6rqbmdbpvxrnd3pw1wax46vv03g8bbjm0m4d7kd";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -186010,6 +186704,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-reify-many_0_1_7" = callPackage
+    ({ mkDerivation, base, containers, mtl, safe, template-haskell
+     , th-expand-syns
+     }:
+     mkDerivation {
+       pname = "th-reify-many";
+       version = "0.1.7";
+       sha256 = "1sa4gxkkv30h6g12cqss3qffmphcamfqmvnn69ix2w0wlsya81m8";
+       libraryHaskellDepends = [
+         base containers mtl safe template-haskell th-expand-syns
+       ];
+       testHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/mgsloan/th-reify-many";
+       description = "Recurseively reify template haskell datatype info";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-sccs" = callPackage
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
@@ -186221,6 +186933,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "these_0_7_4" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, binary, containers
+     , data-default-class, deepseq, hashable, keys, mtl, profunctors
+     , QuickCheck, quickcheck-instances, semigroupoids, tasty
+     , tasty-quickcheck, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "these";
+       version = "0.7.4";
+       sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw";
+       libraryHaskellDepends = [
+         aeson base bifunctors binary containers data-default-class deepseq
+         hashable keys mtl profunctors QuickCheck semigroupoids transformers
+         transformers-compat unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         aeson base bifunctors binary containers hashable QuickCheck
+         quickcheck-instances tasty tasty-quickcheck transformers
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/isomorphism/these";
+       description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "thespian" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -186444,8 +187183,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.2.0.10";
-       sha256 = "0hspg2zlkcmckdx2skgx3yh1sprx3a5fa57xspv4vcj0rws4kjr2";
+       version = "0.2.0.11";
+       sha256 = "0wq8s88l3pdl2n00gfyzg99dg2fd7d7gcq7pssxhg3z4rv72fdif";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186628,6 +187367,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "throwable-exceptions" = callPackage
+    ({ mkDerivation, base, either, safe-exceptions, tasty
+     , tasty-discover, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "throwable-exceptions";
+       version = "0.1.0.4";
+       sha256 = "1hpji5db3hg36f4ry3xsgl4cynw0djx3a61i19q4cy9sqbbdlw4c";
+       libraryHaskellDepends = [ base safe-exceptions ];
+       testHaskellDepends = [
+         base either safe-exceptions tasty tasty-discover tasty-hunit text
+       ];
+       homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md";
+       description = "throwable-exceptions gives the exception's value constructors";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "thumbnail" = callPackage
     ({ mkDerivation, base, bytestring, gd }:
      mkDerivation {
@@ -187697,24 +188453,6 @@ self: {
      }) {};
 
   "timezone-olson" = callPackage
-    ({ mkDerivation, base, binary, bytestring, extensible-exceptions
-     , time, timezone-series
-     }:
-     mkDerivation {
-       pname = "timezone-olson";
-       version = "0.1.7";
-       sha256 = "1am6vqq3zxrnb444waqfajk3s1wpynw9fszqnk9ww7akf2v5abr3";
-       revision = "2";
-       editedCabalFile = "1ss4ipn11m6y8bq9pw9i7cs3yciqacf7y281749xc77a1w2nw19b";
-       libraryHaskellDepends = [
-         base binary bytestring extensible-exceptions time timezone-series
-       ];
-       homepage = "http://projects.haskell.org/time-ng/";
-       description = "A pure Haskell parser and renderer for binary Olson timezone files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "timezone-olson_0_1_8" = callPackage
     ({ mkDerivation, base, binary, bytestring, extensible-exceptions
      , time, timezone-series
      }:
@@ -187728,7 +188466,6 @@ self: {
        homepage = "http://projects.haskell.org/time-ng/";
        description = "A pure Haskell parser and renderer for binary Olson timezone files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timezone-olson-th" = callPackage
@@ -189420,6 +190157,85 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "trasa" = callPackage
+    ({ mkDerivation, base, binary, bytestring, doctest, http-types
+     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+     , vinyl
+     }:
+     mkDerivation {
+       pname = "trasa";
+       version = "0.1";
+       sha256 = "118x1z2hwx5gagiw4fas30jsdn1igqry2gydpjfnn9nvzf639x6y";
+       libraryHaskellDepends = [
+         base binary bytestring http-types text unordered-containers vinyl
+       ];
+       testHaskellDepends = [
+         base bytestring doctest tasty tasty-hunit tasty-quickcheck text
+         vinyl
+       ];
+       homepage = "https://github.com/haskell-trasa/trasa#readme";
+       description = "Type Safe Web Routing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "trasa-client" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, http-client
+     , http-types, ip, text, trasa, unordered-containers
+     }:
+     mkDerivation {
+       pname = "trasa-client";
+       version = "0.1.0.0";
+       sha256 = "00vhl41al809njjl94j5prrbhihc02627qfsacqy294sdf5pf6kd";
+       libraryHaskellDepends = [
+         base binary bytestring http-client http-types text trasa
+       ];
+       testHaskellDepends = [
+         aeson base http-client http-types ip text trasa
+         unordered-containers
+       ];
+       description = "Type safe http requests";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "trasa-reflex" = callPackage
+    ({ mkDerivation, base, bytestring, containers, ghcjs-dom
+     , http-types, jsaddle, reflex, reflex-dom, text, trasa
+     }:
+     mkDerivation {
+       pname = "trasa-reflex";
+       version = "0.1.0.0";
+       sha256 = "10c9ssk5dzvqglhism3g3kpracaf4j913gd6m639ry8nkax0ndyv";
+       libraryHaskellDepends = [
+         base bytestring containers ghcjs-dom http-types jsaddle reflex
+         reflex-dom text trasa
+       ];
+       description = "Reactive Type Safe Routing";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "trasa-server" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , doctest, http-client, http-types, mtl, tasty, tasty-hunit
+     , tasty-quickcheck, text, trasa, vinyl, wai, warp
+     }:
+     mkDerivation {
+       pname = "trasa-server";
+       version = "0.1";
+       sha256 = "1pj0rlpn0625vxm5hzik1vj2yrfkc8dmf04hc6mcjrpb78yyd2ai";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-types mtl text
+         trasa wai
+       ];
+       testHaskellDepends = [
+         base bytestring doctest http-client tasty tasty-hunit
+         tasty-quickcheck text trasa vinyl warp
+       ];
+       homepage = "https://github.com/haskell-trasa/trasa#readme";
+       description = "Type safe web server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "traverse-with-class" = callPackage
     ({ mkDerivation, base, template-haskell, transformers }:
      mkDerivation {
@@ -190152,30 +190968,6 @@ self: {
      }) {};
 
   "tttool" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , directory, executable-path, filepath, hashable, haskeline, HPDF
-     , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
-     , process, random, split, spool, template-haskell, time, vector
-     , yaml, zlib
-     }:
-     mkDerivation {
-       pname = "tttool";
-       version = "1.7.0.2";
-       sha256 = "08h3s1jldrlz9im5bb7s83jgr9grc9sd0i6im49fsb54nmahc41p";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base binary bytestring containers directory executable-path
-         filepath hashable haskeline HPDF JuicyPixels mtl natural-sort
-         optparse-applicative parsec process random split spool
-         template-haskell time vector yaml zlib
-       ];
-       homepage = "https://github.com/entropia/tip-toi-reveng";
-       description = "Working with files for the Tiptoi® pen";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tttool_1_7_0_3" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline, HPDF
      , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
@@ -190197,7 +190989,6 @@ self: {
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tubes" = callPackage
@@ -190475,6 +191266,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_3_6" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , criterion, directory, doctest, foldl, hostname, managed
+     , optional-args, optparse-applicative, process, semigroups, stm
+     , system-fileio, system-filepath, temporary, text, time
+     , transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.3.6";
+       sha256 = "0fr8p6rnk2lrsgbfh60jlqcjr0nxrh3ywxsj5d4psck0kgyhvg1m";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock directory foldl hostname
+         managed optional-args optparse-applicative process semigroups stm
+         system-fileio system-filepath temporary text time transformers unix
+         unix-compat
+       ];
+       testHaskellDepends = [ base doctest system-filepath temporary ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -190545,26 +191360,23 @@ self: {
   "tweet-hs" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, composition, containers, criterion, data-default
-     , directory, extra, hspec, hspec-megaparsec, http-client
-     , http-client-tls, http-types, lens, megaparsec
-     , optparse-applicative, split, text
+     , directory, extra, hspec, http-client, http-client-tls, http-types
+     , lens, optparse-applicative, split, text
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "0.5.3.12";
-       sha256 = "0kscaq83m8yvnqpraq4m758r1q17cpqm6ks7c0lvknkgbv1f548v";
+       version = "0.6.0.0";
+       sha256 = "1myvwhyzw4a9xdrp16ibzgafdv84kwyvn0pqcsnq8kf3lnic60n3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint authenticate-oauth base bytestring composition
          containers data-default directory extra http-client http-client-tls
-         http-types lens megaparsec optparse-applicative split text
+         http-types lens optparse-applicative split text
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring hspec hspec-megaparsec megaparsec
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
+       testHaskellDepends = [ base bytestring hspec ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
@@ -190957,8 +191769,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-conduit";
-       version = "0.2.2";
-       sha256 = "0nzxzx4p0gxvn8w715ajivz8ddqgfs20n4g87hxwj9h8p2irlzw3";
+       version = "0.2.2.1";
+       sha256 = "06nbbh9lx816klc1hcd7rvqaxhshscc4bbq10mnhqrfzq69al695";
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base bytestring conduit
          conduit-extra containers data-default exceptions http-client
@@ -192460,6 +193272,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ulid" = callPackage
+    ({ mkDerivation, base, binary, bytestring, crockford, crypto-api
+     , deepseq, format-numbers, hashable, hspec, random, text, time
+     }:
+     mkDerivation {
+       pname = "ulid";
+       version = "0.2.0.0";
+       sha256 = "1fw50j6ajrrfc1nzgf814rzj1x06dls220ngpxpdvs278spc1hns";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring crockford crypto-api deepseq hashable random
+         time
+       ];
+       executableHaskellDepends = [ base crypto-api ];
+       testHaskellDepends = [
+         base binary bytestring hashable hspec random
+       ];
+       benchmarkHaskellDepends = [
+         base deepseq format-numbers text time
+       ];
+       homepage = "https://github.com/steven777400/ulid";
+       description = "Implementation of ULID, lexicographically sortable unique identifiers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "una" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, directory, filepath
      , io-storage, process
@@ -192993,16 +193831,22 @@ self: {
      }) {};
 
   "unicoder" = callPackage
-    ({ mkDerivation, attoparsec, base, directory, text }:
+    ({ mkDerivation, attoparsec, base, data-default, directory
+     , filepath, text, twitch
+     }:
      mkDerivation {
        pname = "unicoder";
-       version = "0.4.1";
-       sha256 = "17a2rxq5b4a66ia4jm1g0lmkvsanfc477567wygq9kz4w9q4xwc3";
+       version = "0.5.0";
+       sha256 = "1974birppkd49jwq31x8bcbmgnximh233salnyq47ikgxfp6x4c6";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ attoparsec base text ];
-       executableHaskellDepends = [ attoparsec base directory text ];
-       testHaskellDepends = [ attoparsec base text ];
+       libraryHaskellDepends = [
+         attoparsec base directory filepath text
+       ];
+       executableHaskellDepends = [
+         base data-default directory filepath text twitch
+       ];
+       testHaskellDepends = [ base text ];
        homepage = "https://github.com/Zankoku-Okuno/unicoder";
        description = "Make writing in unicode easy";
        license = stdenv.lib.licenses.bsd3;
@@ -194129,35 +194973,6 @@ self: {
      }) {};
 
   "uri-bytestring" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, criterion, deepseq, deepseq-generics, generics-sop
-     , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, th-lift-instances
-     }:
-     mkDerivation {
-       pname = "uri-bytestring";
-       version = "0.2.3.2";
-       sha256 = "0slchhhgwcig8ifla49r9j96cg5l1jf5gy9zzpvmmds0x3d42qh4";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder bytestring containers
-         template-haskell th-lift-instances
-       ];
-       testHaskellDepends = [
-         attoparsec base blaze-builder bytestring containers generics-sop
-         HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
-         tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion deepseq deepseq-generics
-         network-uri
-       ];
-       homepage = "https://github.com/Soostone/uri-bytestring";
-       description = "Haskell URI parsing as ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "uri-bytestring_0_2_3_3" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, blaze-builder
      , bytestring, containers, criterion, deepseq, deepseq-generics
      , generics-sop, HUnit, network-uri, QuickCheck
@@ -194185,7 +195000,6 @@ self: {
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-bytestring-aeson" = callPackage
@@ -195555,6 +196369,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "variation" = callPackage
+    ({ mkDerivation, base, cereal, containers, deepseq, semigroupoids
+     }:
+     mkDerivation {
+       pname = "variation";
+       version = "0.1.1.0";
+       sha256 = "05wkjr3sd4r3bid4n18qiblc8jvpzzdkh74f7qh3q1lfx8yv2133";
+       libraryHaskellDepends = [
+         base cereal containers deepseq semigroupoids
+       ];
+       description = "nominal value with possible variations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "varying" = callPackage
     ({ mkDerivation, base, criterion, hspec, QuickCheck, time
      , transformers
@@ -196427,15 +197255,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "versions_3_1_0_1" = callPackage
-    ({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit
-     , text
+  "versions_3_1_1" = callPackage
+    ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens
+     , tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "versions";
-       version = "3.1.0.1";
-       sha256 = "0r6dzf27bw2d0d0p48rv2vqkiw4dagdk6ka0hhisxz5ii4x6lvl7";
-       libraryHaskellDepends = [ base megaparsec text ];
+       version = "3.1.1";
+       sha256 = "1pnmbvlchjskavp6h04xdxwxg61aplqpxnawnbzflyf1mvpz0dm4";
+       libraryHaskellDepends = [ base deepseq hashable megaparsec text ];
        testHaskellDepends = [ base microlens tasty tasty-hunit text ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -196529,14 +197357,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "viewprof_0_0_0_2" = callPackage
+  "viewprof_0_0_0_3" = callPackage
     ({ mkDerivation, base, brick, containers, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.2";
-       sha256 = "1yxz4lfynq3smncaq0z845avzlvmsd44knrzf0dh0w39rag2z5jj";
+       version = "0.0.0.3";
+       sha256 = "13rb9cgi65vcc6y6rj79li1rywzb711ayl1dwsm97b7nqz4007rk";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -198021,6 +198849,8 @@ self: {
        pname = "wai-middleware-crowd";
        version = "0.1.4.2";
        sha256 = "0n5h4s3b2fdn2j0pl32bsdbf6wyyf2ms8qsbcs9r0wp7dhdbcdhi";
+       revision = "1";
+       editedCabalFile = "0qvh92p9s80kmzg5w7rga54kfqbwcrkkv5p03pd92px04j2h5lbm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200055,7 +200885,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets_0_11_1_0" = callPackage
+  "websockets_0_11_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers
      , criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -200064,8 +200894,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.11.1.0";
-       sha256 = "1qbslmgj7blnm4al414h76mn8adzydpw2mba4w9vgb4rgi0w6b9w";
+       version = "0.11.2.0";
+       sha256 = "0bncy78zjyhb961lhiklg2d1zh6vh03xq1zjj9js8904p75kvbaq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200079,7 +200909,11 @@ self: {
          SHA streaming-commons test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
-       benchmarkHaskellDepends = [ base bytestring criterion random ];
+       benchmarkHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers criterion entropy network random SHA
+         text
+       ];
        doCheck = false;
        homepage = "http://jaspervdj.be/websockets";
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
@@ -201236,8 +202070,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordchoice";
-       version = "0.1.0.4";
-       sha256 = "1k7vjn114qwi46mdnqszwc8q7lg6k8s0k4g9rj4hfv7w83a2w377";
+       version = "0.1.0.5";
+       sha256 = "0841dzjxnj9hm2lm31sa7xabaywdpnjjksy1c7b4idirdpmz9rhd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -202466,8 +203300,8 @@ self: {
        pname = "xdcc";
        version = "1.1.4";
        sha256 = "0r344vgkiwc7lkb7x78swnz0rimbgdcb0ki29dilqvdv0k4z9i59";
-       revision = "1";
-       editedCabalFile = "0zp24wny11q6firilvwc5fq9z4qycww6nspxfrczjmws3b60zxxd";
+       revision = "2";
+       editedCabalFile = "1r9vp01r8pym1skqy6ll632q5j4xbgsf6mf1n26rk296z2rqdvra";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -203045,6 +203879,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xml-conduit_1_5_1" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
+     , text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.5.1";
+       sha256 = "0d4pb9d0mdz9djh8aiy5r8088rqh7w34mbqmg8mmaq1i7vx2dzks";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         conduit conduit-extra containers data-default deepseq monad-control
+         resourcet text transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       homepage = "http://github.com/snoyberg/xml";
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-conduit-decode" = callPackage
     ({ mkDerivation, base, bifunctors, data-default, lens, semigroups
      , tasty, tasty-hunit, text, time, xml-conduit, xml-types
@@ -203906,17 +204765,16 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.1.1";
-       sha256 = "0f322aqfav3hzv9hh0krl778q25jq0m83lqdwzbymbgm4yy585y2";
+       version = "0.1.1.2";
+       sha256 = "065kcsr7s114sw8g8hdl2i5w0543r9f9ypirvh3bn38x2lv4f9ng";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers process transformers X11 xmonad xmonad-contrib
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec xmonad ];
-       homepage = "https://github.com/vmchale/xmonad-vanessa#readme";
-       description = "Custom xmonad, which uses stack and sets various defaults";
+       homepage = "https://hub.darcs.net/vmchale/xmonad-vanessa";
+       description = "Custom xmonad, which builds with stack or cabal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -204457,6 +205315,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_23_1" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, filepath, hspec
+     , HUnit, libyaml, mockery, resourcet, scientific, semigroups
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.23.1";
+       sha256 = "0sv01yzi08mr2r7wkjcrsl5pf02zzv3y2n7amznv0pdj82sw16sa";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         filepath resourcet scientific semigroups template-haskell text
+         transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       executableHaskellDepends = [ aeson base bytestring ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring conduit directory hspec
+         HUnit mockery resourcet temporary text transformers
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/snoyberg/yaml/";
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
      , scientific, tasty, tasty-hunit, text, transformers
@@ -204464,8 +205354,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml-combinators";
-       version = "1.0";
-       sha256 = "05xxv6dxkr4rn48kbzhh0nilpg42mg18s901wlnf1n3nb61dz5wr";
+       version = "1.0.1";
+       sha256 = "03y7z08ly3l5plh2c06i1p83c12s15fwshkl4nakqf1a6vb7bl48";
        libraryHaskellDepends = [
          aeson base bytestring generics-sop scientific text transformers
          unordered-containers vector yaml
@@ -205037,35 +205927,6 @@ self: {
      }) {};
 
   "yesod-auth" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptohash, data-default, email-validate, file-embed
-     , http-client, http-conduit, http-types, lifted-base, mime-mail
-     , network-uri, nonce, persistent, persistent-template, random
-     , resourcet, safe, shakespeare, template-haskell, text, time
-     , transformers, unordered-containers, wai, yesod-core, yesod-form
-     , yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.4.17.1";
-       sha256 = "0d9mwk7wxp3bl0d7v95qndps0i761f57ky7vy1h7n2smm1x7yy7q";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptohash data-default email-validate
-         file-embed http-client http-conduit http-types lifted-base
-         mime-mail network-uri nonce persistent persistent-template random
-         resourcet safe shakespeare template-haskell text time transformers
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_4_17_2" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -205092,7 +205953,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -205583,51 +206443,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
-     , cereal, clientsession, conduit, conduit-extra, containers, cookie
-     , criterion, data-default, deepseq, deepseq-generics, directory
-     , exceptions, fast-logger, hspec, hspec-expectations, http-types
-     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
-     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
-     , random, resourcet, safe, semigroups, shakespeare
-     , streaming-commons, template-haskell, text, time, transformers
-     , transformers-base, unix-compat, unordered-containers, vector, wai
-     , wai-extra, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.4.33";
-       sha256 = "1pk3bymlpzxsx54l5lzifrlgy2avsbdb917gqkn5jbnkbcf6mqmb";
-       revision = "1";
-       editedCabalFile = "0ryxcikbr70sp716bh43baayv9ay4hwm5d36i198vi4n4a9k1j0v";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-builder blaze-html blaze-markup
-         byteable bytestring case-insensitive cereal clientsession conduit
-         conduit-extra containers cookie data-default deepseq
-         deepseq-generics directory exceptions fast-logger http-types
-         lifted-base monad-control monad-logger mtl mwc-random old-locale
-         parsec path-pieces primitive random resourcet safe semigroups
-         shakespeare template-haskell text time transformers
-         transformers-base unix-compat unordered-containers vector wai
-         wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring clientsession conduit
-         conduit-extra containers cookie hspec hspec-expectations http-types
-         HUnit lifted-base mwc-random network path-pieces QuickCheck random
-         resourcet shakespeare streaming-commons template-haskell text
-         transformers wai wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion shakespeare text transformers
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_4_35" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -205670,7 +206485,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -206644,41 +207458,6 @@ self: {
      }) {};
 
   "yesod-static" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , blaze-builder, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptohash, cryptohash-conduit, css-text
-     , data-default, directory, exceptions, file-embed, filepath
-     , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time
-     , process, resourcet, template-haskell, text, transformers
-     , unix-compat, unordered-containers, wai, wai-app-static, wai-extra
-     , yesod-core, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-static";
-       version = "1.5.2";
-       sha256 = "17h9f95dqincb7zbqb6fw6xhbxhxgdjfsh9gzz3k57kx13vcajdr";
-       libraryHaskellDepends = [
-         async attoparsec base base64-bytestring blaze-builder byteable
-         bytestring conduit conduit-extra containers cryptohash
-         cryptohash-conduit css-text data-default directory exceptions
-         file-embed filepath hashable hjsmin http-types mime-types old-time
-         process resourcet template-haskell text transformers unix-compat
-         unordered-containers wai wai-app-static yesod-core
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring byteable bytestring conduit
-         conduit-extra containers cryptohash cryptohash-conduit data-default
-         directory exceptions file-embed filepath hjsmin hspec http-types
-         HUnit mime-types old-time process resourcet template-haskell text
-         transformers unix-compat unordered-containers wai wai-app-static
-         wai-extra yesod-core yesod-test
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Static file serving subsite for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-static_1_5_3" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, byteable, bytestring, conduit, conduit-extra
      , containers, cryptohash, cryptohash-conduit, css-text
@@ -206711,7 +207490,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-static-angular" = callPackage
@@ -206769,33 +207547,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, containers, cookie
-     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
-     , monad-control, network, persistent, pretty-show, text, time
-     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
-     , yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.5.5";
-       sha256 = "0f8adzhqkzw1bbvvks42q0bhq1imiinrfk5sn7q9yr22jpsmnhj4";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive containers cookie hspec-core html-conduit
-         http-types HUnit monad-control network persistent pretty-show text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit
-         lifted-base text wai xml-conduit yesod-core yesod-form
-       ];
-       homepage = "http://www.yesodweb.com";
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_5_6" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, containers, cookie
      , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
@@ -206820,7 +207571,6 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -208061,6 +208811,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) zeromq;};
 
+  "zeromq4-haskell_0_6_6" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, exceptions
+     , monad-control, QuickCheck, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, transformers, transformers-base, zeromq
+     }:
+     mkDerivation {
+       pname = "zeromq4-haskell";
+       version = "0.6.6";
+       sha256 = "1pblwyn2lly3px9843g4a2wpkqhnffd53kam1b9kx31zpplfhbx8";
+       libraryHaskellDepends = [
+         async base bytestring containers exceptions monad-control
+         semigroups transformers transformers-base
+       ];
+       libraryPkgconfigDepends = [ zeromq ];
+       testHaskellDepends = [
+         async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://gitlab.com/twittner/zeromq-haskell/";
+       description = "Bindings to ZeroMQ 4.x";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zeromq;};
+
   "zeroth" = callPackage
     ({ mkDerivation, base, Cabal, derive, directory, filepath
      , haskell-src-exts, hskeleton, monoid-record, process, syb
@@ -208258,6 +209031,8 @@ self: {
        pname = "zip";
        version = "0.1.11";
        sha256 = "0adflrr7h6aqq4nz0751chs65zfj0ljz1mjwyym3s080sbrwncjn";
+       revision = "1";
+       editedCabalFile = "0f97aidxiw149m64bv6qnb6ba2xlmllv3cwalihvccc0vh5kn0as";
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra containers digest exceptions filepath mtl path
@@ -208278,31 +209053,6 @@ self: {
      , digest, directory, filepath, HUnit, mtl, old-time, pretty
      , process, temporary, text, time, unix, zip, zlib
      }:
-     mkDerivation {
-       pname = "zip-archive";
-       version = "0.3.0.6";
-       sha256 = "1dnmmfqfvssx1saxwc3r6miazcnilrhy188jqa0195nj2m510h41";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers digest directory filepath
-         mtl old-time pretty text time unix zlib
-       ];
-       testHaskellDepends = [
-         base bytestring directory HUnit old-time process temporary time
-         unix
-       ];
-       testToolDepends = [ zip ];
-       homepage = "http://github.com/jgm/zip-archive";
-       description = "Library for creating and modifying zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) zip;};
-
-  "zip-archive_0_3_1" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , digest, directory, filepath, HUnit, mtl, old-time, pretty
-     , process, temporary, text, time, unix, zlib
-     }:
      mkDerivation {
        pname = "zip-archive";
        version = "0.3.1";
@@ -208317,11 +209067,11 @@ self: {
          base bytestring directory HUnit old-time process temporary time
          unix
        ];
+       testToolDepends = [ zip ];
        homepage = "http://github.com/jgm/zip-archive";
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) zip;};
 
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
@@ -208450,29 +209200,6 @@ self: {
      }) {};
 
   "ziptastic-client" = callPackage
-    ({ mkDerivation, base, base-compat, hspec, http-client
-     , http-client-tls, http-types, iso3166-country-codes, servant
-     , servant-client, text, ziptastic-core
-     }:
-     mkDerivation {
-       pname = "ziptastic-client";
-       version = "0.3.0.2";
-       sha256 = "1ara825win4zgngy5yhx16d8ffm94j1qlqha7b1s143dzk0vw8hs";
-       libraryHaskellDepends = [
-         base base-compat http-client iso3166-country-codes servant
-         servant-client text ziptastic-core
-       ];
-       testHaskellDepends = [
-         base base-compat hspec http-client http-client-tls http-types
-         iso3166-country-codes servant-client
-       ];
-       homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
-       description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "ziptastic-client_0_3_0_3" = callPackage
     ({ mkDerivation, base, base-compat, hspec, http-client
      , http-client-tls, http-types, iso3166-country-codes, servant
      , servant-client, text, ziptastic-core
@@ -208496,26 +209223,6 @@ self: {
      }) {};
 
   "ziptastic-core" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec
-     , http-api-data, iso3166-country-codes, servant, text, tz
-     }:
-     mkDerivation {
-       pname = "ziptastic-core";
-       version = "0.2.0.2";
-       sha256 = "1hrbzsb09vsl5amkzyhs50c0la17xbh11nhnw5h59rq3dcv3kkyk";
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring http-api-data
-         iso3166-country-codes servant text tz
-       ];
-       testHaskellDepends = [
-         aeson base base-compat here hspec iso3166-country-codes text tz
-       ];
-       homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
-       description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ziptastic-core_0_2_0_3" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec
      , http-api-data, iso3166-country-codes, servant, text, tz
      }:
@@ -208533,7 +209240,6 @@ self: {
        homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zlib_0_5_4_2" = callPackage
-- 
GitLab


From 35762f6ce3eed226f785cf4a54d2f9f0a7f7975d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 14 Jun 2017 09:52:44 +0200
Subject: [PATCH 0791/1490] git-annex: update hash for new version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ed99118850f..7b7099db0df 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -67,7 +67,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "1iwqxjvga0wam0dg1alwawvnz13hm7d7c9rfph0w6adrdgfmhnzc";
+      sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx";
     };
   }))).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
-- 
GitLab


From 7bcfdc1c1173322ad5f8363e1d987de2d9d597de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 16 Jun 2017 14:40:12 +0200
Subject: [PATCH 0792/1490] stack: build with hpack version 0.17.x

---
 pkgs/development/haskell-modules/configuration-common.nix       | 1 +
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7b7099db0df..464ea25aee1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -682,6 +682,7 @@ self: super: {
   stack = super.stack.overrideScope (self: super: {
     store-core = self.store-core_0_3;
     store = self.store_0_3_1;
+    hpack = self.hpack_0_17_1;
   });
 
   # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only.
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e4741017b1f..493181ea16c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2445,6 +2445,7 @@ extra-packages:
   - haddock-api == 2.16.*               # required on GHC 7.10.x
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
   - haskell-src-exts == 1.18.*          # required by hoogle-5.0.4
+  - hpack < 0.18                        # required by stack-1.4.0
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
-- 
GitLab


From 8a8f0408cd9b7fdda1095718107c800057658c44 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 8 Jun 2017 10:55:11 -0400
Subject: [PATCH 0793/1490] generic-builder: use buildInputs for Haskell
 dependencies

This actually will matter when I (soon) land cross-compilation support,
and native deps are compiled for the build, instead of host, platform.
But even now, it's good style do this, and one less thing to review
later.

The use of `$nativePkgs` is unfortunate, as it will need to be
swapped out for `$crossPkgs` for build != host builds. This will just a
temporarily cause pain, however, as eventually I will change stdenv to
use a `$runPkgs` (or moral equivalent) in both case.

Closes https://github.com/NixOS/nixpkgs/pull/26480.
---
 .../haskell-modules/generic-builder.nix          | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 9516aca5366..38d74178e2e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -144,9 +144,9 @@ let
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
                         optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends;
 
+  nativeBuildInputs = setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
-  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++
-                     buildTools ++ libraryToolDepends ++ executableToolDepends ++
+  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
                      # ghcjs's hsc2hs calls out to the native hsc2hs
@@ -181,8 +181,9 @@ stdenv.mkDerivation ({
 
   inherit src;
 
-  nativeBuildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs;
-  propagatedNativeBuildInputs = optionals hasActiveLibrary propagatedBuildInputs;
+  inherit nativeBuildInputs;
+  buildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs;
+  propagatedBuildInputs = optionals hasActiveLibrary propagatedBuildInputs;
 
   LANG = "en_US.UTF-8";         # GHC needs the locale configured during the Haddock phase.
 
@@ -209,11 +210,8 @@ stdenv.mkDerivation ({
     setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
     configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
 
-    local inputClosure=""
-    for i in $propagatedNativeBuildInputs $nativeBuildInputs; do
-      findInputs $i inputClosure propagated-native-build-inputs
-    done
-    for p in $inputClosure; do
+    # nativePkgs defined in stdenv/setup.hs
+    for p in $nativePkgs; do
       if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
         cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
         continue
-- 
GitLab


From 39fd9444020e2de89514db9297b27a57a9369eac Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Fri, 16 Jun 2017 01:49:50 -0400
Subject: [PATCH 0794/1490] chrome: fix fallout from #26512

Fixes broken save dialogue (causes chrome to crash) and missing icons.
---
 .../networking/browsers/chromium/default.nix  | 25 ++++++++++++++++---
 .../browsers/google-chrome/default.nix        | 19 ++++++++++++--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index cfc8951eef1..30a16d824d0 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,5 @@
 { newScope, stdenv, makeWrapper, makeDesktopItem, ed
+, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas
 
 # package customization
 , channel ? "stable"
@@ -62,10 +63,26 @@ let
 
   sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
 
+  version = chromium.browser.version;
+
+  inherit (stdenv.lib) versionAtLeast;
+
+  gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
+  gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
+
 in stdenv.mkDerivation {
-  name = "chromium${suffix}-${chromium.browser.version}";
+  name = "chromium${suffix}-${version}";
+  inherit version;
 
-  buildInputs = [ makeWrapper ed ];
+  buildInputs = [
+    makeWrapper ed
+
+    # needed for GSETTINGS_SCHEMAS_PATH
+    gsettings_desktop_schemas glib gtk
+
+    # needed for XDG_ICON_DIRS
+    gnome.defaultIconTheme
+  ];
 
   outputs = ["out" "sandbox"];
 
@@ -92,6 +109,8 @@ in stdenv.mkDerivation {
     # libredirect causes chromium to deadlock on startup
     export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')"
 
+    export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
+
     .
     w
     EOF
@@ -107,7 +126,7 @@ in stdenv.mkDerivation {
     cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
   '';
 
-  inherit (chromium.browser) meta packageName version;
+  inherit (chromium.browser) meta packageName;
 
   passthru = {
     inherit (chromium) upstream-info browser;
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index e7b74562bd5..9a4d90701b2 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -31,6 +31,9 @@
 
 # Only needed for getting information about upstream binaries
 , chromium
+
+, gsettings_desktop_schemas
+, gnome2, gnome3
 }:
 
 with stdenv.lib;
@@ -42,6 +45,9 @@ let
     withCustomModes = true;
   };
 
+  gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
+  gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
+
   deps = [
     glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
     libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
@@ -53,7 +59,7 @@ let
     flac harfbuzz icu libpng opusWithCustomModes snappy speechd
     bzip2 libcap
   ] ++ optional pulseSupport libpulseaudio
-    ++ (if (versionAtLeast version "59.0.0.0") then [gtk3] else [gtk2]);
+    ++ [ gtk ];
 
   suffix = if channel != "stable" then "-" + channel else "";
 
@@ -64,7 +70,15 @@ in stdenv.mkDerivation rec {
 
   src = binary;
 
-  buildInputs = [ patchelf ];
+  buildInputs = [
+    patchelf
+
+    # needed for GSETTINGS_SCHEMAS_PATH
+    gsettings_desktop_schemas glib gtk
+
+    # needed for XDG_ICON_DIRS
+    gnome.defaultIconTheme
+  ];
 
   unpackPhase = ''
     ar x $src
@@ -109,6 +123,7 @@ in stdenv.mkDerivation rec {
     #!${bash}/bin/sh
     export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
     export PATH=$binpath\''${PATH:+:\$PATH}
+    export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
     $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@"
     EOF
     chmod +x $exe
-- 
GitLab


From dda6daa4ff876d6f48cdd3538509c26c3e18af03 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Fri, 16 Jun 2017 14:19:57 -0400
Subject: [PATCH 0795/1490] flash: 26.0.0.126 -> 26.0.0.131

The previous releases were 404ing.
---
 .../networking/browsers/chromium/plugins.nix           |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 .../mozilla-plugins/flashplayer/standalone.nix         |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 01f4b03e4ca..4e2a2f84b96 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "26.0.0.126";
+    version = "26.0.0.131";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 =  "17ivhkdkbnzxr10ln1ix30k1hmaak5p9zzcchdyrjxdpzfk5qq7s";
+      sha256 = "1cw5pmzfyaaxxd3kf90nz8zn5r06qmkh8l793j3db4n0ffxg5c1s";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 5936c86c1cc..e7893d22717 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "26.0.0.126";
+  version = "26.0.0.131";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0i5rr8bymbdzwqpns854i2r9390av89v1ikh8msincczq5vpj012"
+          "0yqrw2gl9i0z33kcv5dpp3x3jyq9ksqfaqjgkk7xcy127ahric8s"
         else
-          "1mzq3wvq6rxqfdlapd0b1ymw7389414jxwhkd6wk3677qdhr1y42"
+          "0cmjqm5asqqcqavpkldm6wgjb49m9n018rixi7cj9zcwhfakm7zr"
       else
         if arch == "x86_64" then
-          "0684kizzfwfzaj0i54cdlkx3fqb3kyhb9jw88n031bjrzv7ddiz7"
+          "0agz4k5319m5bd0nqzkzvy8r28nr6c5j9b0jr6a8yh9s844aga8w"
         else
-          "1pn15wnldabacmahlqdsl8nd60982j77bghjlf2cdc7drysby3ns";
+          "0jzvhyi1qgfjp9l85ffgcxqa87ymi899q2j68b9hfsn9hlw1sc5f";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index e29af0eaf4e..b290caaee3e 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,7 +55,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "26.0.0.126";
+  version = "26.0.0.131";
 
   src = fetchurl {
     url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "17s55b1ncjj0hnldjmxm133z0i4jf49wbh4sn1cfwrw6xrhgbkiw"
+        "000a019x15yk6qkx8yg7l496lc5knvw0kqgzial491d73zw8qjhn"
       else
-        "02j98ji2jw2sxrs9hhlkkdrhpf2c4hc336cfvqzdf1iajza5was8";
+        "0rmsfi70hvp5vvdvcr8w7knz8bzf70r3ysnsgz3yv3b9p5dvsbjk";
   };
 
   nativeBuildInputs = [ unzip ];
-- 
GitLab


From 26e1664e88f79cf314a821575657fd42a15df51e Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Fri, 16 Jun 2017 18:55:48 +0000
Subject: [PATCH 0796/1490] flask-restplus: update to 0.10

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

diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
new file mode 100644
index 00000000000..f14c9982b6d
--- /dev/null
+++ b/pkgs/development/python-modules/flask-restplus/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, blinker
+, tzlocal
+, mock
+, rednose
+, flask
+, six
+, jsonschema
+, pytz
+, aniso8601
+, flask-restful
+}:
+
+buildPythonPackage rec {
+  pname = "flask-restplus";
+  version = "0.10.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qs9c3fzidd0m3r8rhw0zqrlsaqr2561z45xs6kg19l7c2x6g5qj";
+  };
+
+  checkInputs = [ nose blinker tzlocal mock rednose ];
+  propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ];
+
+  # RuntimeError: Working outside of application context.
+  doCheck = false;
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = {
+    homepage = "https://github.com/noirbizarre/flask-restplus";
+    description = "Fast, easy and documented API development with Flask";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 332fa5f83a0..56d1fb55b2d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10945,6 +10945,7 @@ in {
     };
   };
 
+  flask-restplus = callPackage ../development/python-modules/flask-restplus/default.nix { };
   # Exactly 0.8.6 is required by flexget
   flask-restplus_0_8 = callPackage ../development/python-modules/flask-restplus/0.8.nix { };
 
-- 
GitLab


From e0c1c51d738304e7851a547a992e0fc27d2a45c8 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Fri, 16 Jun 2017 16:32:30 +0200
Subject: [PATCH 0797/1490] ltris: init at 1.0.19

---
 pkgs/games/ltris/default.nix          |  22 ++
 pkgs/games/ltris/gcc5_compliance.diff | 299 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |   2 +
 3 files changed, 323 insertions(+)
 create mode 100644 pkgs/games/ltris/default.nix
 create mode 100644 pkgs/games/ltris/gcc5_compliance.diff

diff --git a/pkgs/games/ltris/default.nix b/pkgs/games/ltris/default.nix
new file mode 100644
index 00000000000..10a79a69673
--- /dev/null
+++ b/pkgs/games/ltris/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, SDL, SDL_mixer }:
+
+stdenv.mkDerivation rec {
+  name = "ltris-${version}";
+  version = "1.0.19";
+  buildInputs = [ SDL SDL_mixer ];
+
+  src = fetchurl {
+    url = "mirror://sourceforge/lgames/${name}.tar.gz";
+    sha256 = "1895wv1fqklrj4apkz47rnkcfhfav7zjknskw6p0886j35vrwslg";
+  };
+
+  patchPhase = "patch -p0 < ${./gcc5_compliance.diff}";
+
+  meta = with stdenv.lib; {
+    description = "Tetris clone from the LGames series";
+    homepage = http://lgames.sourceforge.net/LBreakout2/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ciil ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/games/ltris/gcc5_compliance.diff b/pkgs/games/ltris/gcc5_compliance.diff
new file mode 100644
index 00000000000..bf53fcf8467
--- /dev/null
+++ b/pkgs/games/ltris/gcc5_compliance.diff
@@ -0,0 +1,299 @@
+Index: ChangeLog
+===================================================================
+--- ChangeLog	(revision 163)
++++ ChangeLog	(revision 164)
+@@ -1,3 +1,5 @@
++- removed all inline keywords to work with GCC 5 (2015/05/16 MS)
++
+ 1.0.19:
+ - removed link to lib math as not needed (2013/10/29 MS)
+ - reset key states when unpausing to prevent unwanted movement (2013/10/29 MS)
+Index: src/bowl.c
+===================================================================
+--- src/bowl.c	(revision 163)
++++ src/bowl.c	(revision 164)
+@@ -333,7 +333,7 @@
+ Set a tile contents and pixel contents.
+ ====================================================================
+ */
+-inline void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id )
++void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id )
+ {
+     int i, j = y * bowl->block_size;
+     bowl->contents[x][y] = tile_id;
+Index: src/sdl.c
+===================================================================
+--- src/sdl.c	(revision 163)
++++ src/sdl.c	(revision 164)
+@@ -244,7 +244,7 @@
+ #endif
+ 
+ /* return full path of bitmap */
+-inline void get_full_bmp_path( char *full_path, char *file_name )
++void get_full_bmp_path( char *full_path, char *file_name )
+ {
+     sprintf(full_path,  "%s/gfx/%s", SRC_DIR, file_name );
+ }
+@@ -330,7 +330,7 @@
+ /*
+     lock surface
+ */
+-inline void lock_surf(SDL_Surface *sur)
++void lock_surf(SDL_Surface *sur)
+ {
+     if (SDL_MUSTLOCK(sur))
+         SDL_LockSurface(sur);
+@@ -339,7 +339,7 @@
+ /*
+     unlock surface
+ */
+-inline void unlock_surf(SDL_Surface *sur)
++void unlock_surf(SDL_Surface *sur)
+ {
+     if (SDL_MUSTLOCK(sur))
+         SDL_UnlockSurface(sur);
+@@ -666,7 +666,7 @@
+ /*
+     lock font surface
+ */
+-inline void lock_font(Font *fnt)
++void lock_font(Font *fnt)
+ {
+     if (SDL_MUSTLOCK(fnt->pic))
+         SDL_LockSurface(fnt->pic);
+@@ -675,7 +675,7 @@
+ /*
+     unlock font surface
+ */
+-inline void unlock_font(Font *fnt)
++void unlock_font(Font *fnt)
+ {
+     if (SDL_MUSTLOCK(fnt->pic))
+         SDL_UnlockSurface(fnt->pic);
+@@ -905,7 +905,7 @@
+ /*
+     update rectangle (0,0,0,0)->fullscreen
+ */
+-inline void refresh_screen(int x, int y, int w, int h)
++void refresh_screen(int x, int y, int w, int h)
+ {
+     SDL_UpdateRect(sdl.screen, x, y, w, h);
+ }
+@@ -1055,7 +1055,7 @@
+ /*
+     lock surface
+ */
+-inline void lock_screen()
++void lock_screen()
+ {
+     if (SDL_MUSTLOCK(sdl.screen))
+         SDL_LockSurface(sdl.screen);
+@@ -1064,7 +1064,7 @@
+ /*
+     unlock surface
+ */
+-inline void unlock_screen()
++void unlock_screen()
+ {
+     if (SDL_MUSTLOCK(sdl.screen))
+         SDL_UnlockSurface(sdl.screen);
+@@ -1073,7 +1073,7 @@
+ /*
+     flip hardware screens (double buffer)
+ */
+-inline void flip_screen()
++void flip_screen()
+ {
+     SDL_Flip(sdl.screen);
+ }
+@@ -1132,7 +1132,7 @@
+ /*
+     get milliseconds since last call
+ */
+-inline int get_time()
++int get_time()
+ {
+     int ms;
+     cur_time = SDL_GetTicks();
+@@ -1148,7 +1148,7 @@
+ /*
+     reset timer
+ */
+-inline void reset_timer()
++void reset_timer()
+ {
+     last_time = SDL_GetTicks();
+ }
+Index: src/sdl.h
+===================================================================
+--- src/sdl.h	(revision 163)
++++ src/sdl.h	(revision 164)
+@@ -41,8 +41,8 @@
+ SDL_Surface* load_surf(char *fname, int f);
+ SDL_Surface* create_surf(int w, int h, int f);
+ void free_surf( SDL_Surface **surf );
+-inline void lock_surf(SDL_Surface *sur);
+-inline void unlock_surf(SDL_Surface *sur);
++void lock_surf(SDL_Surface *sur);
++void unlock_surf(SDL_Surface *sur);
+ void blit_surf(void);
+ void alpha_blit_surf(int alpha);
+ void fill_surf(int c);
+@@ -86,8 +86,8 @@
+ Font* load_fixed_font(char *fname, int off, int len, int w);
+ void free_font(Font **sfnt);
+ int  write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha);
+-inline void lock_font(Font *sfnt);
+-inline void unlock_font(Font *sfnt);
++void lock_font(Font *sfnt);
++void unlock_font(Font *sfnt);
+ SDL_Rect last_write_rect(Font *fnt);
+ int  text_width(Font *fnt, char *str);
+ 
+@@ -132,14 +132,14 @@
+ char** get_mode_names( int *count );
+ int  set_video_mode( Video_Mode mode );
+ void hardware_cap();
+-inline void refresh_screen( int x, int y, int w, int h );
++void refresh_screen( int x, int y, int w, int h );
+ void refresh_rects();
+ void add_refresh_rect(int x, int y, int w, int h);
+ int  wait_for_key();
+ void wait_for_click();
+-inline void lock_screen();
+-inline void unlock_screen();
+-inline void flip_screen();
++void lock_screen();
++void unlock_screen();
++void flip_screen();
+ void fade_screen( int type, int ms );
+ void take_screenshot( int i );
+ 
+@@ -148,8 +148,8 @@
+ SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source );
+ 
+ /* timer */
+-inline int get_time();
+-inline void reset_timer();
++int get_time();
++void reset_timer();
+ 
+ #ifdef __cplusplus
+ };
+Index: src/tools.c
+===================================================================
+--- src/tools.c	(revision 163)
++++ src/tools.c	(revision 164)
+@@ -23,7 +23,7 @@
+ #include "ltris.h"
+ 
+ /* compares to strings and returns true if their first strlen(str1) chars are equal */
+-inline int strequal( char *str1, char *str2 )
++int strequal( char *str1, char *str2 )
+ {
+     if ( strlen( str1 ) != strlen( str2 ) ) return 0;
+     return ( !strncmp( str1, str2, strlen( str1 ) ) );
+@@ -30,7 +30,7 @@
+ }
+ 
+ /* set delay to ms milliseconds */
+-inline void delay_set( Delay *delay, int ms )
++void delay_set( Delay *delay, int ms )
+ {
+     delay->limit = ms;
+     delay->cur = 0;
+@@ -37,13 +37,13 @@
+ }
+ 
+ /* reset delay ( cur = 0 )*/
+-inline void delay_reset( Delay *delay )
++void delay_reset( Delay *delay )
+ {
+     delay->cur = 0;
+ }
+ 
+ /* check if times out and reset */
+-inline int delay_timed_out( Delay *delay, int ms )
++int delay_timed_out( Delay *delay, int ms )
+ {
+     delay->cur += ms;
+     if ( delay->cur >= delay->limit ) {
+@@ -56,12 +56,12 @@
+ }
+ 
+ /* set timer so that we have a time out next call of delay_timed_out() */
+-inline void delay_force_time_out( Delay *delay )
++void delay_force_time_out( Delay *delay )
+ {
+     delay->cur = delay->limit;
+ }
+ 
+-inline void goto_tile( int *x, int *y, int d )
++void goto_tile( int *x, int *y, int d )
+ {
+     /*  0 -up, clockwise, 5 - left up */
+     switch ( d ) {
+@@ -326,24 +326,24 @@
+ the target value until reached when counter_update() is called.
+ ====================================================================
+ */
+-inline void counter_set( Counter *counter, double value )
++void counter_set( Counter *counter, double value )
+ {
+     counter->value = value;
+     counter->approach = value;
+ }
+-inline void counter_add( Counter *counter, double add )
++void counter_add( Counter *counter, double add )
+ {
+     counter->value += add;
+ }
+-inline double counter_get_approach( Counter counter )
++double counter_get_approach( Counter counter )
+ {
+     return counter.approach;
+ }
+-inline double counter_get( Counter counter )
++double counter_get( Counter counter )
+ {
+     return counter.value;
+ }
+-inline void counter_update( Counter *counter, int ms )
++void counter_update( Counter *counter, int ms )
+ {
+     double change;
+     if ( counter->approach == counter->value ) return;
+Index: src/tools.h
+===================================================================
+--- src/tools.h	(revision 163)
++++ src/tools.h	(revision 164)
+@@ -33,7 +33,7 @@
+ #define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) )
+ 
+ /* compares to strings and returns true if their first strlen(str1) chars are equal */
+-inline int strequal( char *str1, char *str2 );
++int strequal( char *str1, char *str2 );
+ 
+ /* delete lines */
+ void delete_lines( char **lines, int line_number );
+@@ -45,16 +45,16 @@
+ } Delay;
+ 
+ /* set delay to ms milliseconds */
+-inline void delay_set( Delay *delay, int ms );
++void delay_set( Delay *delay, int ms );
+ 
+ /* reset delay ( cur = 0 )*/
+-inline void delay_reset( Delay *delay );
++void delay_reset( Delay *delay );
+ 
+ /* check if time's out ( add ms milliseconds )and reset */
+-inline int delay_timed_out( Delay *delay, int ms );
++int delay_timed_out( Delay *delay, int ms );
+ 
+ /* set timer so that we have a time out next call of delay_timed_out() */
+-inline void delay_force_time_out( Delay *delay );
++void delay_force_time_out( Delay *delay );
+ 
+ /* return distance betwteen to map positions */
+ int get_dist( int x1, int y1, int x2, int y2 );
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..a1b3c15a458 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2967,6 +2967,8 @@ with pkgs;
 
   lshw = callPackage ../tools/system/lshw { };
 
+  ltris = callPackage ../games/ltris { };
+
   lxc = callPackage ../os-specific/linux/lxc { };
   lxcfs = callPackage ../os-specific/linux/lxcfs { };
   lxd = callPackage ../tools/admin/lxd { };
-- 
GitLab


From 5ff8387f640aaaa44a69a7ccef607eccd46f4d06 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Jun 2017 16:20:06 -0500
Subject: [PATCH 0798/1490] sudo: fix attempt to set special perms

---
 pkgs/tools/security/sudo/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 785ba93f137..d6d979c9914 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "07fvh8qy0l1h93lccc625f48d8yp0pkp5rjjykq13pb07ar0x64y";
   };
 
+  prePatch = ''
+    substituteInPlace src/Makefile.in --replace 04755 0755
+  '';
+
   configureFlags = [
     "--with-env-editor"
     "--with-editor=/run/current-system/sw/bin/nano"
-- 
GitLab


From 6ee183b7f210a302d0f71e810dc4bf3a74d108e9 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 16 Jun 2017 22:00:14 +0200
Subject: [PATCH 0799/1490] musescore: 2.0.3 -> 2.1.0

---
 pkgs/applications/audio/musescore/default.nix | 10 ++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 463bd64495d..9d6f2fc9c8f 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchzip, cmake, pkgconfig
 , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
-, portaudio, qtbase, qtdeclarative, qtenginio, qtscript, qtsvg, qttools
+, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools
 , qtwebkit, qtxmlpatterns
 }:
 
 stdenv.mkDerivation rec {
   name = "musescore-${version}";
-  version = "2.0.3";
+  version = "2.1.0";
 
   src = fetchzip {
     url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
-    sha256 = "067f4li48qfhz2barj70zpf2d2mlii12npx07jx9xjkkgz84z4c9";
+    sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls";
   };
 
   hardeningDisable = [ "relro" "bindnow" ];
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
   ];
 
   preBuild = ''
-    make lupdate
     make lrelease
   '';
 
@@ -45,7 +44,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
-    portaudio qtbase qtdeclarative qtenginio qtscript qtsvg qttools
+    portaudio qtbase qtdeclarative qtscript qtsvg qttools
     qtwebkit qtxmlpatterns #tesseract
   ];
 
@@ -56,6 +55,5 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.vandenoever ];
     repositories.git = https://github.com/musescore/MuseScore;
-    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..8278266174f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15086,7 +15086,7 @@ with pkgs;
     if stdenv.isDarwin then
       callPackage ../applications/audio/musescore/darwin.nix { }
     else
-      libsForQt56.callPackage ../applications/audio/musescore { };
+      libsForQt5.callPackage ../applications/audio/musescore { };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
   mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {
-- 
GitLab


From f094fad7a9ea9a99d853b56c0eff937caffbcedb Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 16 Jun 2017 21:13:41 +0900
Subject: [PATCH 0800/1490] flashplayer: 26.0.0.126 -> 26.0.0.131

---
 .../networking/browsers/chromium/plugins.nix           |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 .../mozilla-plugins/flashplayer/standalone.nix         |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 01f4b03e4ca..4e2a2f84b96 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "26.0.0.126";
+    version = "26.0.0.131";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 =  "17ivhkdkbnzxr10ln1ix30k1hmaak5p9zzcchdyrjxdpzfk5qq7s";
+      sha256 = "1cw5pmzfyaaxxd3kf90nz8zn5r06qmkh8l793j3db4n0ffxg5c1s";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 5936c86c1cc..e7893d22717 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "26.0.0.126";
+  version = "26.0.0.131";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0i5rr8bymbdzwqpns854i2r9390av89v1ikh8msincczq5vpj012"
+          "0yqrw2gl9i0z33kcv5dpp3x3jyq9ksqfaqjgkk7xcy127ahric8s"
         else
-          "1mzq3wvq6rxqfdlapd0b1ymw7389414jxwhkd6wk3677qdhr1y42"
+          "0cmjqm5asqqcqavpkldm6wgjb49m9n018rixi7cj9zcwhfakm7zr"
       else
         if arch == "x86_64" then
-          "0684kizzfwfzaj0i54cdlkx3fqb3kyhb9jw88n031bjrzv7ddiz7"
+          "0agz4k5319m5bd0nqzkzvy8r28nr6c5j9b0jr6a8yh9s844aga8w"
         else
-          "1pn15wnldabacmahlqdsl8nd60982j77bghjlf2cdc7drysby3ns";
+          "0jzvhyi1qgfjp9l85ffgcxqa87ymi899q2j68b9hfsn9hlw1sc5f";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index e29af0eaf4e..b290caaee3e 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,7 +55,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "26.0.0.126";
+  version = "26.0.0.131";
 
   src = fetchurl {
     url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "17s55b1ncjj0hnldjmxm133z0i4jf49wbh4sn1cfwrw6xrhgbkiw"
+        "000a019x15yk6qkx8yg7l496lc5knvw0kqgzial491d73zw8qjhn"
       else
-        "02j98ji2jw2sxrs9hhlkkdrhpf2c4hc336cfvqzdf1iajza5was8";
+        "0rmsfi70hvp5vvdvcr8w7knz8bzf70r3ysnsgz3yv3b9p5dvsbjk";
   };
 
   nativeBuildInputs = [ unzip ];
-- 
GitLab


From 0d4431cfe90b2242723ccb1ccc90714f2f68a609 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 17 Jun 2017 11:36:39 +0200
Subject: [PATCH 0801/1490] fakeroot: apply patch to ignore EINVAL errors as
 well

Fixes #25901 the nixos.ova job.  See the referred links.
---
 pkgs/tools/system/fakeroot/default.nix  |  5 +--
 pkgs/tools/system/fakeroot/einval.patch | 47 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/system/fakeroot/einval.patch

diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 5286b6b2cbc..eca3977f459 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw";
   };
 
+  patches = stdenv.lib.optional stdenv.isLinux ./einval.patch
   # patchset from brew
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  ++ stdenv.lib.optionals stdenv.isDarwin [
     (fetchpatch {
       name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch";
       url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649";
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
       url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20";
       sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p";
     })
-    ];
+  ];
 
   buildInputs = [ getopt ]
     ++ stdenv.lib.optional (!stdenv.isDarwin) libcap
diff --git a/pkgs/tools/system/fakeroot/einval.patch b/pkgs/tools/system/fakeroot/einval.patch
new file mode 100644
index 00000000000..f8d4fb83d13
--- /dev/null
+++ b/pkgs/tools/system/fakeroot/einval.patch
@@ -0,0 +1,47 @@
+Ignore EINVAL errors.  This matters within user namespaces.
+
+See:
+https://github.com/NixOS/nixpkgs/issues/25901
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802612
+https://github.com/NixOS/nixpkgs/issues/10496
+
+diff --git a/libfakeroot.c b/libfakeroot.c
+index 68a95fb..70da8bc 100644
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -792,7 +792,7 @@ int chown(const char *path, uid_t owner, gid_t group){
+     r=next_lchown(path,owner,group);
+   else
+     r=0;
+-  if(r&&(errno==EPERM))
++  if(r&&(errno==EPERM||errno==EINVAL))
+     r=0;
+
+   return r;
+@@ -819,7 +819,7 @@ int lchown(const char *path, uid_t owner, gid_t group){
+     r=next_lchown(path,owner,group);
+   else
+     r=0;
+-  if(r&&(errno==EPERM))
++  if(r&&(errno==EPERM||errno==EINVAL))
+     r=0;
+
+   return r;
+@@ -843,7 +843,7 @@ int fchown(int fd, uid_t owner, gid_t group){
+   else
+     r=0;
+
+-  if(r&&(errno==EPERM))
++  if(r&&(errno==EPERM||errno==EINVAL))
+     r=0;
+
+   return r;
+@@ -870,7 +870,7 @@ int fchownat(int dir_fd, const char *path, uid_t owner, gid_t group, int flags)
+   else
+     r=0;
+
+-  if(r&&(errno==EPERM))
++  if(r&&(errno==EPERM||errno==EINVAL))
+     r=0;
+
+   return r;
-- 
GitLab


From 67655caf3707e846c754d905340cf3ff69d06b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 17 Jun 2017 10:37:21 +0100
Subject: [PATCH 0802/1490] cron: document patch

---
 pkgs/tools/system/cron/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index 13e55405d70..4a8babfd630 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
   hardeningEnable = [ "pie" ];
 
   preBuild = ''
+    # do not set sticky bit in /nix/store 
     substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755 --replace 4755 0755
     makeFlags="DESTROOT=$out CC=cc"
 
-- 
GitLab


From ae147e329f49f2b5c140115c1be3e787727b3d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 17 Jun 2017 10:38:50 +0100
Subject: [PATCH 0803/1490] logcheck: add remark to patch

---
 pkgs/tools/system/logcheck/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index d551738b1f3..f27a0cbcb99 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   prePatch = ''
+    # do not set sticky bit in nix store.
     substituteInPlace Makefile --replace 2750 0750
   '';
 
-- 
GitLab


From 9e2f08cdc265b0752f846228712ff891d0abed28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 17 Jun 2017 10:42:55 +0100
Subject: [PATCH 0804/1490] sudo: add remark to patch

---
 pkgs/tools/security/sudo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index d6d979c9914..840d24f6e67 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   prePatch = ''
+    # do not set sticky bit in nix store
     substituteInPlace src/Makefile.in --replace 04755 0755
   '';
 
-- 
GitLab


From cca6eb62c001f2fb5a06993979e717d04e0dcd7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 17 Jun 2017 10:43:50 +0100
Subject: [PATCH 0805/1490] super: add remark to patch

---
 pkgs/tools/security/super/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix
index 01e5dd4b20b..866e1f41028 100644
--- a/pkgs/tools/security/super/default.nix
+++ b/pkgs/tools/security/super/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   prePatch = ''
+    # do not set sticky bit in nix store
     substituteInPlace Makefile.in \
       --replace "-o root" "" \
       --replace 04755 755
-- 
GitLab


From ca6bb9098ca3f8fb8fe74de5b113478571010c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 17 Jun 2017 10:44:33 +0100
Subject: [PATCH 0806/1490] uucp: add remark to patch

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

diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix
index 39368da68be..acb42a7a8d2 100644
--- a/pkgs/tools/misc/uucp/default.nix
+++ b/pkgs/tools/misc/uucp/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   prePatch = ''
+    # do not set sticky bit in nix store
     substituteInPlace Makefile.in \
       --replace 4555 0555
     sed -i '/chown $(OWNER)/d' Makefile.in
-- 
GitLab


From 878381fd4d61433ba6c880983cd127e9641d38c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 17 Jun 2017 10:45:35 +0100
Subject: [PATCH 0807/1490] rewritefs: add remark to patch

---
 pkgs/os-specific/linux/rewritefs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
index ac796c1fe58..8ec46d64600 100644
--- a/pkgs/os-specific/linux/rewritefs/default.nix
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig fuse pcre ];
 
   prePatch = ''
+    # do not set sticky bit in nix store
     substituteInPlace Makefile --replace 6755 0755
   '';
 
-- 
GitLab


From aa49177091e7fc94b57fefef2f8e46c1ef824d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 17 Jun 2017 10:46:48 +0100
Subject: [PATCH 0808/1490] xconq: add remark to patch

---
 pkgs/games/xconq/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix
index 4bb39762939..e8e27d7afb6 100644
--- a/pkgs/games/xconq/default.nix
+++ b/pkgs/games/xconq/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     # Fix Makefiles
     find . -name 'Makefile.in' -exec sed -re 's@^        ( *)(cd|[&][&])@	\1\2@' -i '{}' ';'
     find . -name 'Makefile.in' -exec sed -e '/chown/d; /chgrp/d' -i '{}' ';'
+    # do not set sticky bit in nix store
     find . -name 'Makefile.in' -exec sed -e 's/04755/755/g' -i '{}' ';'
     sed -e '/^			* *[$][(]tcltkdir[)]\/[*][.][*]/d' -i tcltk/Makefile.in
 
-- 
GitLab


From 230c0d461a7941c770f358e2b0829fe344953027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 17 Jun 2017 10:47:42 +0100
Subject: [PATCH 0809/1490] udevil: add remark to patch

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

diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
index 83ebef7f10d..9a4b795061b 100644
--- a/pkgs/applications/misc/udevil/default.nix
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
   buildInputs = [ intltool glib pkgconfig udev ];
   configurePhase = ''
     substituteInPlace src/Makefile.in --replace "-o root -g root" ""
+    # do not set setuid bit in nix store
     substituteInPlace src/Makefile.in --replace 4755 0755
     ./configure \
       --prefix=$out \
-- 
GitLab


From efd2141b6019832cdeb4d52371f93505c624333c Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Sat, 17 Jun 2017 16:06:37 +0300
Subject: [PATCH 0810/1490] nodePackages.javascript-typescript-langserver: init
 at 2.0.0

---
 .../node-packages/node-packages-v4.nix        |  27 +-
 .../node-packages/node-packages-v6.json       |   1 +
 .../node-packages/node-packages-v6.nix        | 515 ++++++++++++++++--
 3 files changed, 491 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index bbc0f2b8ad0..c8e51f53a9a 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -2056,13 +2056,13 @@ let
         sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
       };
     };
-    "uuid-3.0.1" = {
+    "uuid-3.1.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
-        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
+        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
       };
     };
     "delayed-stream-1.0.0" = {
@@ -3874,6 +3874,15 @@ let
         sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9";
       };
     };
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+      };
+    };
     "validate-npm-package-name-3.0.0" = {
       name = "validate-npm-package-name";
       packageName = "validate-npm-package-name";
@@ -6044,7 +6053,7 @@ in
             ];
           })
           sources."tunnel-agent-0.6.0"
-          sources."uuid-3.0.1"
+          sources."uuid-3.1.0"
         ];
       })
       sources."rimraf-2.6.1"
@@ -6542,7 +6551,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.6.0"
-                  sources."uuid-3.0.1"
+                  sources."uuid-3.1.0"
                 ];
               })
               (sources."rimraf-2.6.1" // {
@@ -6784,7 +6793,7 @@ in
                     ];
                   })
                   sources."tunnel-agent-0.6.0"
-                  sources."uuid-3.0.1"
+                  sources."uuid-3.1.0"
                 ];
               })
               (sources."rimraf-2.6.1" // {
@@ -7099,7 +7108,7 @@ in
             ];
           })
           sources."tunnel-agent-0.6.0"
-          sources."uuid-3.0.1"
+          sources."uuid-3.1.0"
         ];
       })
       (sources."rimraf-2.6.1" // {
@@ -8107,7 +8116,7 @@ in
             ];
           })
           sources."tunnel-agent-0.4.3"
-          sources."uuid-3.0.1"
+          sources."uuid-3.1.0"
         ];
       })
       sources."semver-5.3.0"
diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 08b3445e3d4..b362281ee21 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -26,6 +26,7 @@
 , "htmlhint"
 , "ios-deploy"
 , "istanbul"
+, "javascript-typescript-langserver"
 , "jayschema"
 , "jshint"
 , "json"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 5387a2acd05..1fca6530808 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -1489,13 +1489,13 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
-    "uuid-3.0.1" = {
+    "uuid-3.1.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
-        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz";
+        sha1 = "3dd3d3e790abc24d7b0d3a034ffababe28ebbc04";
       };
     };
     "validator-5.2.0" = {
@@ -2767,13 +2767,13 @@ let
         sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb";
       };
     };
-    "promise-7.1.1" = {
+    "promise-7.3.0" = {
       name = "promise";
       packageName = "promise";
-      version = "7.1.1";
+      version = "7.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz";
-        sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
+        url = "https://registry.npmjs.org/promise/-/promise-7.3.0.tgz";
+        sha1 = "e7feec5aa87a2cbb81acf47d9a3adbd9d4642d7b";
       };
     };
     "asap-2.0.5" = {
@@ -7528,6 +7528,15 @@ let
         sha1 = "71766db352326928cf3a807242ba762322636723";
       };
     };
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
+      };
+    };
     "bplist-creator-0.0.7" = {
       name = "bplist-creator";
       packageName = "bplist-creator";
@@ -9053,13 +9062,13 @@ let
         sha1 = "cac328f7bee45730d404b692203fcb590e172d5e";
       };
     };
-    "aws-sdk-2.70.0" = {
+    "aws-sdk-2.72.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.70.0";
+      version = "2.72.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.70.0.tgz";
-        sha1 = "4163d94ac9e6a82f6a073ab74f8ae3c28a0a7534";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.72.0.tgz";
+        sha1 = "59021c14e354f34a4fb4f229ac10f8e36428f4d4";
       };
     };
     "request-2.81.0" = {
@@ -12231,6 +12240,231 @@ let
         sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d";
       };
     };
+    "@reactivex/rxjs-5.4.1" = {
+      name = "@reactivex/rxjs";
+      packageName = "@reactivex/rxjs";
+      version = "5.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.1.tgz";
+        sha1 = "e472c38c84eb411690f281253d3a93a3466ad041";
+      };
+    };
+    "chai-4.0.2" = {
+      name = "chai";
+      packageName = "chai";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chai/-/chai-4.0.2.tgz";
+        sha1 = "2f7327c4de6f385dd7787999e2ab02697a32b83b";
+      };
+    };
+    "chai-as-promised-7.0.0" = {
+      name = "chai-as-promised";
+      packageName = "chai-as-promised";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.0.0.tgz";
+        sha1 = "c87ee613eaa196766393da6fbb4052f112acf675";
+      };
+    };
+    "fast-json-patch-1.2.2" = {
+      name = "fast-json-patch";
+      packageName = "fast-json-patch";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-1.2.2.tgz";
+        sha1 = "d377d97c6911dbdd2a1c80bfacda048a4f83bbf9";
+      };
+    };
+    "iterare-0.0.8" = {
+      name = "iterare";
+      packageName = "iterare";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iterare/-/iterare-0.0.8.tgz";
+        sha1 = "a969a80a1fbff6b78f28776594d7bc2bdfab6aad";
+      };
+    };
+    "mz-2.6.0" = {
+      name = "mz";
+      packageName = "mz";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mz/-/mz-2.6.0.tgz";
+        sha1 = "c8b8521d958df0a4f2768025db69c719ee4ef1ce";
+      };
+    };
+    "object-hash-1.1.8" = {
+      name = "object-hash";
+      packageName = "object-hash";
+      version = "1.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-hash/-/object-hash-1.1.8.tgz";
+        sha1 = "28a659cf987d96a4dabe7860289f3b5326c4a03c";
+      };
+    };
+    "opentracing-0.14.1" = {
+      name = "opentracing";
+      packageName = "opentracing";
+      version = "0.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.1.tgz";
+        sha1 = "40d278beea417660a35dd9d3ee76511ffa911dcd";
+      };
+    };
+    "semaphore-async-await-1.5.1" = {
+      name = "semaphore-async-await";
+      packageName = "semaphore-async-await";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz";
+        sha1 = "857bef5e3644601ca4b9570b87e9df5ca12974fa";
+      };
+    };
+    "string-similarity-1.2.0" = {
+      name = "string-similarity";
+      packageName = "string-similarity";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-similarity/-/string-similarity-1.2.0.tgz";
+        sha1 = "d75153cb383846318b7a39a8d9292bb4db4e9c30";
+      };
+    };
+    "typescript-2.3.4" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "2.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz";
+        sha1 = "3d38321828231e434f287514959c37a82b629f42";
+      };
+    };
+    "vscode-jsonrpc-3.3.0" = {
+      name = "vscode-jsonrpc";
+      packageName = "vscode-jsonrpc";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.0.tgz";
+        sha1 = "03bdab0b10f04727ec3b8d403cd511a8a365b13d";
+      };
+    };
+    "vscode-languageserver-3.3.0" = {
+      name = "vscode-languageserver";
+      packageName = "vscode-languageserver";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.3.0.tgz";
+        sha1 = "f547d4f0e5702f88ff3695bae5905f9604c8cc62";
+      };
+    };
+    "vscode-languageserver-types-3.3.0" = {
+      name = "vscode-languageserver-types";
+      packageName = "vscode-languageserver-types";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.3.0.tgz";
+        sha1 = "8964dc7c2247536fbefd2d6836bf3febac80dd00";
+      };
+    };
+    "symbol-observable-1.0.4" = {
+      name = "symbol-observable";
+      packageName = "symbol-observable";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz";
+        sha1 = "29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d";
+      };
+    };
+    "assertion-error-1.0.2" = {
+      name = "assertion-error";
+      packageName = "assertion-error";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz";
+        sha1 = "13ca515d86206da0bac66e834dd397d87581094c";
+      };
+    };
+    "check-error-1.0.2" = {
+      name = "check-error";
+      packageName = "check-error";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz";
+        sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82";
+      };
+    };
+    "deep-eql-2.0.2" = {
+      name = "deep-eql";
+      packageName = "deep-eql";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-eql/-/deep-eql-2.0.2.tgz";
+        sha1 = "b1bac06e56f0a76777686d50c9feb75c2ed7679a";
+      };
+    };
+    "get-func-name-2.0.0" = {
+      name = "get-func-name";
+      packageName = "get-func-name";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz";
+        sha1 = "ead774abee72e20409433a066366023dd6887a41";
+      };
+    };
+    "pathval-1.1.0" = {
+      name = "pathval";
+      packageName = "pathval";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz";
+        sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0";
+      };
+    };
+    "type-detect-4.0.3" = {
+      name = "type-detect";
+      packageName = "type-detect";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.3.tgz";
+        sha1 = "0e3f2670b44099b0b46c284d136a7ef49c74c2ea";
+      };
+    };
+    "type-detect-3.0.0" = {
+      name = "type-detect";
+      packageName = "type-detect";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-detect/-/type-detect-3.0.0.tgz";
+        sha1 = "46d0cc8553abb7b13a352b0d6dea2fd58f2d9b55";
+      };
+    };
+    "any-promise-1.3.0" = {
+      name = "any-promise";
+      packageName = "any-promise";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz";
+        sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f";
+      };
+    };
+    "thenify-all-1.6.0" = {
+      name = "thenify-all";
+      packageName = "thenify-all";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz";
+        sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726";
+      };
+    };
+    "thenify-3.3.0" = {
+      name = "thenify";
+      packageName = "thenify";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz";
+        sha1 = "e69e38a1babe969b0108207978b9f62b88604839";
+      };
+    };
     "when-3.4.6" = {
       name = "when";
       packageName = "when";
@@ -14589,13 +14823,13 @@ let
         sha1 = "52c074f42a32140132baea108d42cbcd0ef397d2";
       };
     };
-    "node-red-node-rbe-0.1.10" = {
+    "node-red-node-rbe-0.1.11" = {
       name = "node-red-node-rbe";
       packageName = "node-red-node-rbe";
-      version = "0.1.10";
+      version = "0.1.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.10.tgz";
-        sha1 = "f05f72ace39b1b6158a48ee19d5c6cc426719a8f";
+        url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.11.tgz";
+        sha1 = "a670c1542a6eaf5e06db45490c2a7edf8a9f70b6";
       };
     };
     "bcrypt-1.0.2" = {
@@ -20605,7 +20839,7 @@ in
       sources."tunnel-0.0.2"
       sources."underscore-1.4.4"
       sources."user-home-2.0.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."validator-5.2.0"
       (sources."winston-2.1.1" // {
         dependencies = [
@@ -20795,7 +21029,7 @@ in
       sources."then-request-2.2.0"
       sources."typedarray-0.0.6"
       sources."http-basic-2.5.1"
-      sources."promise-7.1.1"
+      sources."promise-7.3.0"
       sources."asap-2.0.5"
       sources."os-homedir-1.0.2"
       sources."mute-stream-0.0.7"
@@ -21653,7 +21887,7 @@ in
         dependencies = [
           sources."form-data-2.1.4"
           sources."qs-6.3.2"
-          sources."uuid-3.0.1"
+          sources."uuid-3.1.0"
         ];
       })
       sources."tar-2.2.1"
@@ -22480,7 +22714,7 @@ in
       sources."JSONStream-1.3.1"
       sources."async-2.4.1"
       sources."aws4-1.6.0"
-      sources."aws-sdk-2.70.0"
+      sources."aws-sdk-2.72.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
       sources."request-2.81.0"
@@ -23249,7 +23483,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -23927,6 +24161,201 @@ in
     };
     production = true;
   };
+  javascript-typescript-langserver = nodeEnv.buildNodePackage {
+    name = "javascript-typescript-langserver";
+    packageName = "javascript-typescript-langserver";
+    version = "2.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.0.0.tgz";
+      sha1 = "aad1582560c53dc91c13be6c2abb76cebbc9c971";
+    };
+    dependencies = [
+      sources."@reactivex/rxjs-5.4.1"
+      sources."chai-4.0.2"
+      sources."chai-as-promised-7.0.0"
+      sources."chalk-1.1.3"
+      sources."commander-2.9.0"
+      sources."fast-json-patch-1.2.2"
+      sources."glob-7.1.2"
+      sources."iterare-0.0.8"
+      sources."lodash-4.17.4"
+      sources."mz-2.6.0"
+      sources."object-hash-1.1.8"
+      sources."opentracing-0.14.1"
+      sources."semaphore-async-await-1.5.1"
+      sources."string-similarity-1.2.0"
+      sources."typescript-2.3.4"
+      sources."vscode-jsonrpc-3.3.0"
+      sources."vscode-languageserver-3.3.0"
+      sources."vscode-languageserver-types-3.3.0"
+      sources."symbol-observable-1.0.4"
+      sources."assertion-error-1.0.2"
+      sources."check-error-1.0.2"
+      (sources."deep-eql-2.0.2" // {
+        dependencies = [
+          sources."type-detect-3.0.0"
+        ];
+      })
+      sources."get-func-name-2.0.0"
+      sources."pathval-1.1.0"
+      sources."type-detect-4.0.3"
+      sources."eslint-3.19.0"
+      sources."babel-code-frame-6.22.0"
+      sources."concat-stream-1.6.0"
+      sources."debug-2.6.8"
+      sources."doctrine-2.0.0"
+      sources."escope-3.6.0"
+      sources."espree-3.4.3"
+      sources."esquery-1.0.0"
+      sources."estraverse-4.2.0"
+      sources."esutils-2.0.2"
+      sources."file-entry-cache-2.0.0"
+      sources."globals-9.18.0"
+      sources."ignore-3.3.3"
+      sources."imurmurhash-0.1.4"
+      sources."inquirer-0.12.0"
+      sources."is-my-json-valid-2.16.0"
+      sources."is-resolvable-1.0.0"
+      sources."js-yaml-3.8.4"
+      sources."json-stable-stringify-1.0.1"
+      sources."levn-0.3.0"
+      sources."mkdirp-0.5.1"
+      sources."natural-compare-1.4.0"
+      sources."optionator-0.8.2"
+      sources."path-is-inside-1.0.2"
+      sources."pluralize-1.2.1"
+      sources."progress-1.1.8"
+      sources."require-uncached-1.0.3"
+      sources."shelljs-0.7.8"
+      sources."strip-bom-3.0.0"
+      sources."strip-json-comments-2.0.1"
+      (sources."table-3.8.3" // {
+        dependencies = [
+          sources."string-width-2.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
+      sources."text-table-0.2.0"
+      sources."user-home-2.0.0"
+      sources."js-tokens-3.0.1"
+      sources."inherits-2.0.3"
+      sources."typedarray-0.0.6"
+      sources."readable-stream-2.2.11"
+      sources."core-util-is-1.0.2"
+      sources."isarray-1.0.0"
+      sources."process-nextick-args-1.0.7"
+      sources."safe-buffer-5.0.1"
+      sources."string_decoder-1.0.2"
+      sources."util-deprecate-1.0.2"
+      sources."ms-2.0.0"
+      sources."es6-map-0.1.5"
+      sources."es6-weak-map-2.0.2"
+      (sources."esrecurse-4.1.0" // {
+        dependencies = [
+          sources."estraverse-4.1.1"
+        ];
+      })
+      sources."d-1.0.0"
+      sources."es5-ext-0.10.23"
+      sources."es6-iterator-2.0.1"
+      sources."es6-set-0.1.5"
+      sources."es6-symbol-3.1.1"
+      sources."event-emitter-0.3.5"
+      sources."object-assign-4.1.1"
+      sources."acorn-5.0.3"
+      (sources."acorn-jsx-3.0.1" // {
+        dependencies = [
+          sources."acorn-3.3.0"
+        ];
+      })
+      sources."flat-cache-1.2.2"
+      sources."circular-json-0.3.1"
+      sources."del-2.2.2"
+      sources."graceful-fs-4.1.11"
+      sources."write-0.2.1"
+      sources."globby-5.0.0"
+      sources."is-path-cwd-1.0.0"
+      sources."is-path-in-cwd-1.0.0"
+      sources."pify-2.3.0"
+      sources."pinkie-promise-2.0.1"
+      sources."rimraf-2.6.1"
+      sources."array-union-1.0.2"
+      sources."arrify-1.0.1"
+      sources."array-uniq-1.0.3"
+      sources."is-path-inside-1.0.0"
+      sources."pinkie-2.0.4"
+      sources."ansi-escapes-1.4.0"
+      sources."ansi-regex-2.1.1"
+      sources."cli-cursor-1.0.2"
+      sources."cli-width-2.1.0"
+      sources."figures-1.7.0"
+      sources."readline2-1.0.1"
+      sources."run-async-0.1.0"
+      sources."rx-lite-3.1.2"
+      sources."string-width-1.0.2"
+      sources."strip-ansi-3.0.1"
+      sources."through-2.3.8"
+      sources."restore-cursor-1.0.1"
+      sources."exit-hook-1.1.1"
+      sources."onetime-1.1.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."mute-stream-0.0.5"
+      sources."number-is-nan-1.0.1"
+      sources."once-1.4.0"
+      sources."wrappy-1.0.2"
+      sources."generate-function-2.0.0"
+      sources."generate-object-property-1.2.0"
+      sources."jsonpointer-4.0.1"
+      sources."xtend-4.0.1"
+      sources."is-property-1.0.2"
+      sources."tryit-1.0.3"
+      sources."argparse-1.0.9"
+      sources."esprima-3.1.3"
+      sources."sprintf-js-1.0.3"
+      sources."jsonify-0.0.0"
+      sources."prelude-ls-1.1.2"
+      sources."type-check-0.3.2"
+      sources."minimist-0.0.8"
+      sources."deep-is-0.1.3"
+      sources."wordwrap-1.0.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."caller-path-0.1.0"
+      sources."resolve-from-1.0.1"
+      sources."callsites-0.2.0"
+      sources."interpret-1.0.3"
+      sources."rechoir-0.6.2"
+      sources."resolve-1.3.3"
+      sources."path-parse-1.0.5"
+      sources."ajv-4.11.8"
+      sources."ajv-keywords-1.5.1"
+      sources."slice-ansi-0.0.4"
+      sources."co-4.6.0"
+      sources."os-homedir-1.0.2"
+      sources."ansi-styles-2.2.1"
+      sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
+      sources."graceful-readlink-1.0.1"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."minimatch-3.0.4"
+      sources."path-is-absolute-1.0.1"
+      sources."brace-expansion-1.1.8"
+      sources."balanced-match-1.0.0"
+      sources."concat-map-0.0.1"
+      sources."any-promise-1.3.0"
+      sources."thenify-all-1.6.0"
+      sources."thenify-3.3.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Implementation of the Language Server Protocol for JavaScript and TypeScript";
+      homepage = https://github.com/sourcegraph/javascript-typescript-langserver;
+      license = "Apache-2.0";
+    };
+    production = true;
+  };
   jayschema = nodeEnv.buildNodePackage {
     name = "jayschema";
     packageName = "jayschema";
@@ -24150,7 +24579,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -24534,7 +24963,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -25162,7 +25591,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -25339,7 +25768,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -25612,7 +26041,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -25751,7 +26180,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -25963,7 +26392,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -26162,7 +26591,7 @@ in
           sources."tunnel-agent-0.6.0"
         ];
       })
-      sources."node-red-node-rbe-0.1.10"
+      sources."node-red-node-rbe-0.1.11"
       sources."bcrypt-1.0.2"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
@@ -26471,7 +26900,7 @@ in
       sources."twitter-ng-0.6.2"
       sources."oauth-0.9.14"
       sources."performance-now-0.2.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
       sources."har-schema-1.0.5"
@@ -27089,7 +27518,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -27548,7 +27977,7 @@ in
           sources."punycode-1.3.2"
         ];
       })
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."xdg-basedir-2.0.0"
       sources."async-1.5.2"
       sources."cli-cursor-1.0.2"
@@ -27665,7 +28094,7 @@ in
       sources."is-utf8-0.2.1"
       sources."pseudomap-1.0.2"
       sources."yallist-2.1.2"
-      sources."promise-7.1.1"
+      sources."promise-7.3.0"
       sources."string-length-1.0.1"
       sources."duplexify-3.5.0"
       sources."infinity-agent-2.0.3"
@@ -27820,7 +28249,7 @@ in
         ];
       })
       sources."object.assign-4.0.4"
-      sources."promise-7.1.1"
+      sources."promise-7.3.0"
       sources."inflight-1.0.6"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
@@ -27883,7 +28312,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -29000,7 +29429,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -29199,7 +29628,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."ajv-4.11.8"
@@ -29637,10 +30066,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.0.16";
+    version = "3.0.17";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.16.tgz";
-      sha1 = "fe394c6708a79ffbf21ca15d6591b16334501aec";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.17.tgz";
+      sha1 = "d228cd55c2df9b3d2f53f147568cb4cc4a72cc06";
     };
     dependencies = [
       sources."commander-2.9.0"
@@ -30761,7 +31190,7 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.6.0"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."har-schema-1.0.5"
@@ -30911,7 +31340,7 @@ in
       sources."strip-bom-3.0.0"
       sources."tar-fs-1.15.3"
       sources."tar-stream-1.5.4"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       sources."v8-compile-cache-1.1.0"
       sources."validate-npm-package-license-3.0.1"
       sources."core-js-2.4.1"
@@ -31263,7 +31692,7 @@ in
       sources."os-name-1.0.3"
       sources."request-2.81.0"
       sources."tough-cookie-2.3.2"
-      sources."uuid-3.0.1"
+      sources."uuid-3.1.0"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
-- 
GitLab


From 9be1951a8ad67d1433b794de191688fb22d5a14a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 15:50:44 +0200
Subject: [PATCH 0811/1490] imagemagick7: 7.0.5-7 -> 7.0.6-0

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

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 7455736ed02..bcad077b38c 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -12,8 +12,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.5-7";
-    sha256 = "11k53193az0bvdhp4gz2g9p8fb6r5fr1h74dnfx6ijfnfj80hbgp";
+    version = "7.0.6-0";
+    sha256 = "1vl9mkdp5pskl4lxd1p79ayv1k3gxpa8iz992d302qyllhm7wn1i";
     patches = [];
   };
 in
-- 
GitLab


From 5f803db91f15bb99e8c78cca6d993c60ad5864bd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 15:51:05 +0200
Subject: [PATCH 0812/1490] imagemagick: 6.9.8-9 -> 6.9.8-10

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 052d424376d..8f4d44932f5 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -12,8 +12,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "6.9.8-9";
-    sha256 = "0wr6wcmvaw62f6pkgnpqnjmp331wfwmds9wmqzr4zv53s9k1lkzn";
+    version = "6.9.8-10";
+    sha256 = "040qs7nwcm84bjd9wryvd58zqfykbmn3y3qfc90lnldww7v6ihlg";
     patches = [];
   }
     # Freeze version on mingw so we don't need to port the patch too often.
-- 
GitLab


From de74d2015fa551c36cc250b196bc9f0d97f73f2d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 15:51:39 +0200
Subject: [PATCH 0813/1490] kernelPackages.zfs: 0.6.5.9 -> 0.6.5.10

---
 pkgs/os-specific/linux/spl/default.nix | 4 ++--
 pkgs/os-specific/linux/zfs/default.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index a67c9426844..26cc8ea7c71 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -62,8 +62,8 @@ in
   assert buildKernel -> kernel != null;
   {
     splStable = common {
-      version = "0.6.5.9";
-      sha256 = "15qpx2nhprmk14jgb7yqp9dvfb6i3hhhspi77kvian171b0a6112";
+      version = "0.6.5.10";
+      sha256 = "1zdxggpdz9j0lpcqfnkvf4iym7mp2k246sg1s4frqaw1pwwcw9vi";
     };
     splUnstable = common {
       version = "0.7.0-rc4";
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index b03da8869f7..8a6d727a696 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -123,12 +123,12 @@ in
     # to be adapted
     zfsStable = common {
       # comment/uncomment if breaking kernel versions are known
-      incompatibleKernelVersion = "4.11";
+      incompatibleKernelVersion = "4.12";
 
-      version = "0.6.5.9";
+      version = "0.6.5.10";
 
       # this package should point to the latest release.
-      sha256 = "1m8q39j13k46fn0pw3adq87c20rpkg28llxgv2a90994p4127xh0";
+      sha256 = "04gn5fj22z17zq2nazxwl3j9dr33l79clha6ipxvdz241bhjqrk3";
       extraPatches = [
         (fetchpatch {
           url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";
-- 
GitLab


From a071a06c61ff112f102d98f8ff4e29c1084f04fc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 17 Jun 2017 16:00:58 +0200
Subject: [PATCH 0814/1490] quiterss: 0.18.4 -> 0.18.5

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

diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 53520909b09..2f20710a909 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
-  version = "0.18.4";
+  version = "0.18.5";
 
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
     rev = "${version}";
-    sha256 = "0gk4s41npg8is0jf4yyqpn8ksqrhwxq97z40iqcbd7dzsiv7bkvj";
+    sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb";
   };
 
   buildInputs = [ qt5.qtbase qt5.qttools qt5.qtwebkit qmakeHook makeQtWrapper pkgconfig sqlite.dev ];
-- 
GitLab


From 7049e7a16ce6bc5d8f02daec62b18eeaf56fd38d Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sat, 17 Jun 2017 12:21:50 -0300
Subject: [PATCH 0815/1490] catch: 1.7.0 -> 1.9.5

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

diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 021512a40e7..66ed90a90b3 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -3,16 +3,16 @@
 stdenv.mkDerivation rec {
 
   name = "catch-${version}";
-  version = "1.7.0";
+  version = "1.9.5";
 
   src = fetchFromGitHub {
     owner = "philsquared";
     repo = "Catch";
-    rev = "v." + version;
-    sha256 = "0harki6irc4mqipjc24zyy0jimidr5ng3ss29bnpzbbwhrnkyrgm";
+    rev = "v${version}";
+    sha256 = "1in4f6w1pja8m1hvyiwx7s7gxnj6nlj1fgxw9blldffh09ikgpm2";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
   cmakeFlags = [ "-DUSE_CPP14=ON" ];
 
   doCheck = true;
-- 
GitLab


From af4056f22ba52762c669551d90a3ec4d650bb233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 17 Jun 2017 17:22:13 +0200
Subject: [PATCH 0816/1490] chromium: apply patch to fix chromecast

---
 .../networking/browsers/chromium/common.nix   |  3 +
 .../patches/fix_network_api_crash.patch       | 77 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index e747db6a8b7..4b31983322c 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -105,6 +105,9 @@ let
 
     patches = [
       ./patches/nix_plugin_paths_52.patch
+      # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
+      # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
+      ./patches/fix_network_api_crash.patch
     ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
       ++ optional enableWideVine ./patches/widevine.patch;
 
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch b/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch
new file mode 100644
index 00000000000..093598465c4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/fix_network_api_crash.patch
@@ -0,0 +1,77 @@
+Index: extensions/browser/api/networking_private/networking_private_linux.cc
+===================================================================
+--- a/extensions/browser/api/networking_private/networking_private_linux.cc.orig	2016-05-05 03:01:50.000000000 +0200
++++ b/extensions/browser/api/networking_private/networking_private_linux.cc	2016-05-10 16:16:42.431052917 +0200
+@@ -215,12 +215,14 @@ void NetworkingPrivateLinux::GetState(
+   std::unique_ptr<base::DictionaryValue> network_properties(
+       new base::DictionaryValue);
+ 
++  std::string* erp = error.get();
++  base::DictionaryValue* npp = network_properties.get();
+   // Runs GetCachedNetworkProperties on |dbus_thread|.
+   dbus_thread_.task_runner()->PostTaskAndReply(
+       FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetCachedNetworkProperties,
+                             base::Unretained(this), guid,
+-                            base::Unretained(network_properties.get()),
+-                            base::Unretained(error.get())),
++                            base::Unretained(npp),
++                            base::Unretained(erp)),
+       base::Bind(&GetCachedNetworkPropertiesCallback, base::Passed(&error),
+                  base::Passed(&network_properties), success_callback,
+                  failure_callback));
+@@ -301,11 +303,12 @@ void NetworkingPrivateLinux::GetNetworks
+ 
+   // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the
+   // results back to OnAccessPointsFound where the callback is fired.
++  NetworkMap* nmp = network_map.get();
+   dbus_thread_.task_runner()->PostTaskAndReply(
+       FROM_HERE,
+       base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints,
+                  base::Unretained(this), configured_only, visible_only, limit,
+-                 base::Unretained(network_map.get())),
++                 base::Unretained(nmp)),
+       base::Bind(&NetworkingPrivateLinux::OnAccessPointsFound,
+                  base::Unretained(this), base::Passed(&network_map),
+                  success_callback, failure_callback));
+@@ -321,11 +324,12 @@ bool NetworkingPrivateLinux::GetNetworks
+   // Runs GetAllWiFiAccessPoints on the dbus_thread and returns the
+   // results back to SendNetworkListChangedEvent to fire the event. No
+   // callbacks are used in this case.
++  NetworkMap* nmp = network_map.get();
+   dbus_thread_.task_runner()->PostTaskAndReply(
+       FROM_HERE, base::Bind(&NetworkingPrivateLinux::GetAllWiFiAccessPoints,
+                             base::Unretained(this), false /* configured_only */,
+                             false /* visible_only */, 0 /* limit */,
+-                            base::Unretained(network_map.get())),
++                            base::Unretained(nmp)),
+       base::Bind(&NetworkingPrivateLinux::OnAccessPointsFoundViaScan,
+                  base::Unretained(this), base::Passed(&network_map)));
+ 
+@@ -506,11 +510,12 @@ void NetworkingPrivateLinux::StartConnec
+ 
+   std::unique_ptr<std::string> error(new std::string);
+ 
++  std::string* erp = error.get();
+   // Runs ConnectToNetwork on |dbus_thread|.
+   dbus_thread_.task_runner()->PostTaskAndReply(
+       FROM_HERE,
+       base::Bind(&NetworkingPrivateLinux::ConnectToNetwork,
+-                 base::Unretained(this), guid, base::Unretained(error.get())),
++                 base::Unretained(this), guid, base::Unretained(erp)),
+       base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error),
+                  success_callback, failure_callback));
+ }
+@@ -524,11 +529,12 @@ void NetworkingPrivateLinux::StartDiscon
+ 
+   std::unique_ptr<std::string> error(new std::string);
+ 
++  std::string* erp = error.get();
+   // Runs DisconnectFromNetwork on |dbus_thread|.
+   dbus_thread_.task_runner()->PostTaskAndReply(
+       FROM_HERE,
+       base::Bind(&NetworkingPrivateLinux::DisconnectFromNetwork,
+-                 base::Unretained(this), guid, base::Unretained(error.get())),
++                 base::Unretained(this), guid, base::Unretained(erp)),
+       base::Bind(&OnNetworkConnectOperationCompleted, base::Passed(&error),
+                  success_callback, failure_callback));
+ }
-- 
GitLab


From 16118fede571909dd0c986d0c5a713fde88c9ecd Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Fri, 16 Jun 2017 17:14:22 -0500
Subject: [PATCH 0817/1490] libreoffice: fix #25831

Thanks to Linus Heckemann <git@sphalerite.org> for creating the patch.
---
 .../office/libreoffice/default.nix            |  2 ++
 .../applications/office/libreoffice/still.nix | 13 ++++++----
 .../office/libreoffice/xdg-open.patch         | 25 +++++++++++++++++++
 3 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/office/libreoffice/xdg-open.patch

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index ee59f0d078d..0f5f5920966 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -72,6 +72,8 @@ in stdenv.mkDerivation rec {
   configureScript = "./autogen.sh";
   dontUseCmakeConfigure = true;
 
+  patches = [ ./xdg-open.patch ];
+
   postUnpack = ''
     mkdir -v $sourceRoot/src
   '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 7a2174b557e..7c122c0725a 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -73,11 +73,14 @@ in stdenv.mkDerivation rec {
   dontUseCmakeConfigure = true;
 
   # ICU 58, included in 5.3.x
-  patches = [(fetchurl {
-    url = "https://gerrit.libreoffice.org/gitweb?p=core.git;a=patch;h=3e42714c76b1347babfdea0564009d8d82a83af4";
-    sha256 = "10bid0jdw1rpdsqwzzk3r4rp6bjs2cvi82h7anz2m1amfjdv86my";
-    name = "libreoffice-5.2.x-icu4c-58.patch";
-  })];
+  patches = [
+    (fetchurl {
+      url = "https://gerrit.libreoffice.org/gitweb?p=core.git;a=patch;h=3e42714c76b1347babfdea0564009d8d82a83af4";
+      sha256 = "10bid0jdw1rpdsqwzzk3r4rp6bjs2cvi82h7anz2m1amfjdv86my";
+      name = "libreoffice-5.2.x-icu4c-58.patch";}
+    )
+    ./xdg-open.patch
+  ];
 
   postUnpack = ''
     mkdir -v $sourceRoot/src
diff --git a/pkgs/applications/office/libreoffice/xdg-open.patch b/pkgs/applications/office/libreoffice/xdg-open.patch
new file mode 100644
index 00000000000..3ff7e5d80f7
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/xdg-open.patch
@@ -0,0 +1,25 @@
+diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
+--- a/shell/source/unix/exec/shellexec.cxx
++++ b/shell/source/unix/exec/shellexec.cxx
+@@ -150,7 +150,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
+         if (std::getenv("LIBO_FLATPAK") != nullptr) {
+             aBuffer.append("/app/bin/xdg-open");
+         } else {
+-            aBuffer.append("/usr/bin/xdg-open");
++            aBuffer.append("xdg-open");
+         }
+ #endif
+         aBuffer.append(" ");
+diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh
+index 4519e01f26e2..8985711a2c01 100755
+--- a/shell/source/unix/misc/senddoc.sh
++++ b/shell/source/unix/misc/senddoc.sh
+@@ -393,6 +393,8 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
+             MAILER=/usr/bin/kde-open
+         elif [ -x /usr/bin/xdg-open ] ; then
+             MAILER=/usr/bin/xdg-open
++        elif type -p xdg-open >/dev/null 2>&1 ; then
++            MAILER="$(type -p xdg-open)"
+         else
+             echo "Unsupported mail client: `basename $MAILER | sed 's/-.*^//'`"
+             exit 2
-- 
GitLab


From c973a4a8875a36bba856712f260b487eb0a91307 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 16:46:42 +0200
Subject: [PATCH 0818/1490] linux: 4.11.5 -> 4.11.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index d6d18319804..92525b115ee 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11.5";
+  version = "4.11.6";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0k3dy4izi56nfkp2r0cps817zfnc14czghr9l5z5k8j8x5blqipp";
+    sha256 = "0ccna0hrqcza3jz83gaxlcg5vijl83w5w3g87v93a5x06ky9nlr5";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From a470aa09244ff54a59e354f0e94dc722a27eec03 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 16:46:53 +0200
Subject: [PATCH 0819/1490] linux: 4.4.72 -> 4.4.73

---
 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 51cd396ac60..5328bb9a043 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.72";
+  version = "4.4.73";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1s7d6mw4vjsjwdyxbj0p04yq1nsxs3b0b7bi04ilcn2zhldv8cs1";
+    sha256 = "1dj4gpv01si4wiihm8wijkhx0l6ashvydniqrbpq78sby6sn5180";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From bbb9182cbc117df5bc7434d1b93d36fd65e5af46 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 16:47:03 +0200
Subject: [PATCH 0820/1490] linux: 4.9.32 -> 4.9.33

---
 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 ae1a4e4b120..521f53e309b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.32";
+  version = "4.9.33";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0r87c65gf9j6shavsr0zviibpbvngccppw5k3wfmmxfjpdsnayf3";
+    sha256 = "0d2cai3bq1bkmisbsl6l27di765xmzn3lscwray30ldbssijpjpm";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From d6e94684fb381d21b99421f402fd1f17ef85585f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 18:30:43 +0200
Subject: [PATCH 0821/1490] atlassian-confluence: 6.1.1 -> 6.2.2

---
 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 aafb30441d7..20b7250d75d 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-confluence-${version}";
-  version = "6.1.1";
+  version = "6.2.2";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
-    sha256 = "0klb8hxsmgcwjcp20xa7823jm040q7wdqicc6g7s27gjzvbqj800";
+    sha256 = "1fpn799382m8x7b0s3w4mxzlhy1s62ya287i622gbadqscprhagg";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];
-- 
GitLab


From c0a582f4bb45209d967a2f4ebab10f6ce6da5a68 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 18:31:07 +0200
Subject: [PATCH 0822/1490] atlassian-crowd: 2.11.1 -> 2.12.0

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

diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index d80691231c5..0d78f361525 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-crowd-${version}";
-  version = "2.11.1";
+  version = "2.12.0";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
-    sha256 = "12gb9p5npcdr7mxyyir3xgjkc6n05zfi4i5dqkg8f7jrhi49nas7";
+    sha256 = "1kfnsa25axlyhnapfza381p94pyfixh7j999qhpg3ii821n9sggm";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
-- 
GitLab


From aa06a6e00b7f021ecf5e057929db978d6485bb26 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 18:31:29 +0200
Subject: [PATCH 0823/1490] atlassian-jira: 7.3.4 -> 7.3.7

---
 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 1f2601ab0d5..48678804c56 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "7.3.4";
+  version = "7.3.7";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0xkwf8n37hwv52rl3dbqkacr1fyxz4bd7gkcmpg0wshnxmyq4vg7";
+    sha256 = "1ixnnw3yj2ip9ndr9pwxcmdy8gaixkmp517ahg3w8xzymr8wh2qp";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
-- 
GitLab


From 4e8d44c2cdaccc030bd30b3dd8b78eea68391fb5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jun 2017 19:06:20 +0200
Subject: [PATCH 0824/1490] feh: build and install man pages

---
 pkgs/applications/graphics/feh/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 035a275618c..b7949b4d4f9 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "man" "doc" ];
 
   nativeBuildInputs = [ makeWrapper xorg.libXt ]
     ++ optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ];
@@ -22,13 +22,20 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     makeFlags="PREFIX=$out exif=1"
-      '';
+  '';
+
+  postBuild = ''
+    pushd man
+    make
+    popd
+  '';
 
   postInstall = ''
     wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \
-                               --add-flags '--theme=feh' 
-        '';
-  
+                               --add-flags '--theme=feh'
+    install -D -m 644 man/*.1 $out/share/man/man1
+  '';
+
   checkPhase = ''
     PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test
   '';
-- 
GitLab


From 8506fc3653ecf83c56da5e8993a40174c25b9d32 Mon Sep 17 00:00:00 2001
From: Igor Sharonov <igsha@users.noreply.github.com>
Date: Sat, 17 Jun 2017 20:42:51 +0300
Subject: [PATCH 0825/1490] languagetool: fix arguments passing

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

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 62d544ff408..e08a5941ba9 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     for lt in languagetool{,-commandline,-server};do
     cat > $out/bin/$lt <<EXE
     #!${stdenv.shell}
-    ${jdk}/bin/java -cp $out/share/ -jar $out/share/$lt.jar $@
+    ${jdk}/bin/java -cp $out/share/ -jar $out/share/$lt.jar "\$@"
     EXE
     chmod +x $out/bin/$lt
     done
-- 
GitLab


From 2265f50a5144d69a6bead22d3cac29a590636fd2 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 17 Jun 2017 19:57:39 +0200
Subject: [PATCH 0826/1490] opencv-3.x: fix build on OS X

---
 pkgs/development/libraries/opencv/3.x.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 5c7972eb2fa..dc4a00e6dd9 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -36,6 +36,13 @@ let
     sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj";
   };
 
+  # This fixes the build on OS X.
+  # See: https://github.com/opencv/opencv_contrib/pull/926
+  contribOSXFix = fetchpatch {
+    url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch";
+    sha256 = "11dsq8dwh1k6f7zglbc26xwsjw184ggf2531mhf7v77kd72k19fm";
+  };
+
   vggFiles = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_3rdparty";
@@ -61,6 +68,9 @@ stdenv.mkDerivation rec {
     (lib.optionalString enableContrib ''
       cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
 
+      # This fixes the build on OS X.
+      patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}"
+
       for name in vgg_generated_48.i \
                   vgg_generated_64.i \
                   vgg_generated_80.i \
-- 
GitLab


From 2cb4b8fc701bc0a9f0f9cf6f4764cd199c0ec88d Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 17 Jun 2017 14:18:44 -0400
Subject: [PATCH 0827/1490] crashplan: move version and rev inside
 'mkDerivation rec', simplify src

---
 pkgs/applications/backup/crashplan/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index b5b4b23353a..25842d4a989 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -1,19 +1,15 @@
 { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
 
-let
+stdenv.mkDerivation rec {
   version = "4.8.2";
   rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
-
-in stdenv.mkDerivation rec {
   name = "crashplan-${version}-r${rev}";
 
-  crashPlanArchive = fetchurl {
+  src = fetchurl {
     url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
     sha256 = "0wh8lcm06ilcyncnp4ckg4yhyf9z3gb6v1kr111j4bpgmnd0v1yf";
   };
 
-  srcs = [ crashPlanArchive ];
-
   meta = with stdenv.lib; {
     description = "An online/offline backup solution";
     homepage = "http://www.crashplan.org";
-- 
GitLab


From dd99d1f8d0b8391e3a8057dceae11f71fff07ee9 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 17 Jun 2017 15:13:01 -0400
Subject: [PATCH 0828/1490] ghcHEAD: Split docs into their own output

This ghc was forgetten from 2089dd4ab6be089bda12a942846ab7954b28b459
---
 pkgs/development/compilers/ghc/head.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 006a9f8fbc4..3e1aada22eb 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -15,6 +15,8 @@ let
   version = "8.1.20170106";
   rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
 
+  outputs = [ "out" "doc" ];
+
   commonPreConfigure =  ''
     echo ${version} >VERSION
     echo ${rev} >GIT_COMMIT_ID
@@ -48,6 +50,7 @@ in stdenv.mkDerivation (rec {
   configureFlags = [
     "CC=${stdenv.cc}/bin/cc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+    "--datadir=$doc/share/doc/ghc"
   ] ++ stdenv.lib.optional (! enableIntegerSimple) [
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
-- 
GitLab


From 858c47c18e02535621b12ff3ceedf6c52efe39ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <maths@manuelbaerenz.de>
Date: Sat, 17 Jun 2017 21:37:25 +0200
Subject: [PATCH 0829/1490] Manual: Add paragraph on xserver keyboard layout

---
 nixos/doc/manual/configuration/x-windows.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 4a73695e094..fc6082ce3af 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -45,6 +45,13 @@ services.xserver.displayManager.lightdm.enable = true;
 </programlisting>
 </para>
 
+<para>You can set the keyboard layout (and optionally the layout variant):
+<programlisting>
+services.xserver.layout = "de";
+services.xserver.xkbVariant = "neo";
+</programlisting>
+</para>
+
 <para>The X server is started automatically at boot time.  If you
 don’t want this to happen, you can set:
 <programlisting>
-- 
GitLab


From 351b59be55851d94ea078f2a211c0706b317e979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 17 Jun 2017 13:56:18 +0200
Subject: [PATCH 0830/1490] cairo: bugfix 1.14.8 -> 1.14.10

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

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 3db8b719f77..7c0e36d4068 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -12,11 +12,11 @@ assert glSupport -> mesa_noglu != null;
 let inherit (stdenv.lib) optional optionals; in
 
 stdenv.mkDerivation rec {
-  name = "cairo-1.14.8";
+  name = "cairo-1.14.10";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.xz";
-    sha1 = "c6f7b99986f93c9df78653c3e6a3b5043f65145e";
+    sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy";
   };
 
   patches = [
-- 
GitLab


From ec65ef744bfef934cea0374122d830d4c3656223 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Fri, 30 Sep 2016 22:46:42 +0200
Subject: [PATCH 0831/1490] cockroachdb: beta-20160915 -> v1.0.2

---
 pkgs/servers/sql/cockroachdb/default.nix |  37 +-
 pkgs/servers/sql/cockroachdb/deps.nix    | 471 -----------------------
 pkgs/top-level/all-packages.nix          |   4 +-
 3 files changed, 24 insertions(+), 488 deletions(-)
 delete mode 100644 pkgs/servers/sql/cockroachdb/deps.nix

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 0a5e0d17040..01f92dfa2b9 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -1,27 +1,36 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, gcc }:
+{ stdenv, buildGoPackage, fetchurl, cmake, xz, which }:
 
 buildGoPackage rec {
   name = "cockroach-${version}";
-  version = "beta-20160915";
+  version = "v1.0.2";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
-  subPackages = [ "." ];
 
-  src = fetchFromGitHub {
-    owner = "cockroachdb";
-    repo = "cockroach";
-    rev = version;
-    sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3";
+  src = fetchurl {
+    url = "https://binaries.cockroachdb.com/cockroach-${version}.src.tgz";
+    sha256 = "0xq5lg9a2lxn89lilq3zzcd4kph0a5sga3b5bb9xv6af87igy6zp";
   };
 
-  buildFlagsArray = ''
-    -ldflags=
-      -X github.com/cockroachdb/cockroach/build.tag=${version}
-  '';
+  buildInputs = [ cmake xz which ];
 
-  buildInputs = [ gcc ];
+  buildPhase =
+    ''
+      cd $NIX_BUILD_TOP/go/src/${goPackagePath}
+      patchShebangs ./
+      make buildoss
+      cd src/${goPackagePath}
+      for asset in man autocomplete; do
+        ./cockroach gen $asset
+      done
+    '';
 
-  goDeps = ./deps.nix;
+  installPhase =
+    ''
+      mkdir -p $bin/{bin,share,etc/bash_completion.d}
+      mv cockroach $bin/bin
+      mv man $bin/share
+      mv cockroach.bash $bin/etc/bash_completion.d
+    '';
 
   meta = with stdenv.lib; {
     homepage = https://www.cockroachlabs.com;
diff --git a/pkgs/servers/sql/cockroachdb/deps.nix b/pkgs/servers/sql/cockroachdb/deps.nix
deleted file mode 100644
index da2ab57f91a..00000000000
--- a/pkgs/servers/sql/cockroachdb/deps.nix
+++ /dev/null
@@ -1,471 +0,0 @@
-# This file was generated by go2nix.
-[
-  {
-    goPackagePath = "github.com/VividCortex/ewma";
-    fetch = {
-      type = "git";
-      url = "https://github.com/VividCortex/ewma";
-      rev = "8b9f1311551e712ea8a06b494238b8a2351e1c33";
-      sha256 = "1w8gf6310dxl57jdq1b04wbh4ssb0nvck3926bbd86mnw78z0byl";
-    };
-  }
-  {
-    goPackagePath = "github.com/backtrace-labs/go-bcd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/backtrace-labs/go-bcd";
-      rev = "c5383e2df7004f8b2fb2f10a33167d757bb0fbfb";
-      sha256 = "0v7al14ql8vddj8bw2yp1pp47nfdhq6vglbv6fmpg5sf5yfsp9xa";
-    };
-  }
-  {
-    goPackagePath = "github.com/biogo/store";
-    fetch = {
-      type = "git";
-      url = "https://github.com/biogo/store";
-      rev = "913427a1d5e89604e50ea1db0f28f34966d61602";
-      sha256 = "0xgz1g9digvvw64rmzw90a6iyxlljiiz2i1x0x0d8mw4wyaxcipz";
-    };
-  }
-  {
-    goPackagePath = "github.com/cenk/backoff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cenk/backoff";
-      rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6";
-      sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh";
-    };
-  }
-  {
-    goPackagePath = "github.com/chzyer/readline";
-    fetch = {
-      type = "git";
-      url = "https://github.com/chzyer/readline";
-      rev = "a193146c91dea4b6cf30f355e99fb85f73d20f07";
-      sha256 = "0amg5p3xadmj4p58f63f8kkggs9q3f3jhi7ijzb79grbg1lj2rj2";
-    };
-  }
-  {
-    goPackagePath = "github.com/cockroachdb/c-jemalloc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cockroachdb/c-jemalloc";
-      rev = "42e6a32cd7a4dff9c70d80323681d46d046181ef";
-      sha256 = "16ddzw35xj2vz8324mac5bhhr9akvjrg14lgq2mn5nfw1zs42r7n";
-    };
-  }
-  {
-    goPackagePath = "github.com/cockroachdb/c-protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cockroachdb/c-protobuf";
-      rev = "951f3e665896e7ba939fd1f2db9aeaae6ca988f8";
-      sha256 = "032ncrq4p48riwk8zj6p3rp65p87k9793lg107ja6mf8nx0v3z3l";
-    };
-  }
-  {
-    goPackagePath = "github.com/cockroachdb/c-rocksdb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cockroachdb/c-rocksdb";
-      rev = "b5ca031b93fde49bfa2ba99aba423136aebf3c06";
-      sha256 = "1vwq8fbcgwvq2mqv1vwm3b671iklg26s7zd3bgxr5rl076mhn6s5";
-    };
-  }
-  {
-    goPackagePath = "github.com/cockroachdb/c-snappy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cockroachdb/c-snappy";
-      rev = "d4e7b428fe7fc09e93573df3448567a62df8c9fa";
-      sha256 = "09c1pnks51ypvqh97yf9mvi034cc3bb8dj3vkl9v959pg5ix91g4";
-    };
-  }
-  {
-    goPackagePath = "github.com/cockroachdb/cmux";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cockroachdb/cmux";
-      rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d";
-      sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh";
-    };
-  }
-  {
-    goPackagePath = "github.com/cockroachdb/cockroach";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cockroachdb/cockroach";
-      rev = "3fff05767cd3eda2197ce102391c0de447fef606";
-      sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3";
-    };
-  }
-  {
-    goPackagePath = "github.com/cockroachdb/pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cockroachdb/pq";
-      rev = "40c6b2414c76cdb84aacc955f79dc844e48ad0c0";
-      sha256 = "16pnyndzlsk5rbbrimpkg6mf9w2qf0z64pk2k70ja4a65kihlw9g";
-    };
-  }
-  {
-    goPackagePath = "github.com/codahale/hdrhistogram";
-    fetch = {
-      type = "git";
-      url = "https://github.com/codahale/hdrhistogram";
-      rev = "f8ad88b59a584afeee9d334eff879b104439117b";
-      sha256 = "1y1llqaczhc5hqa71pwa1ns8nchizpl678lp23vl51c04swn8h8n";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/etcd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/etcd";
-      rev = "656167d760543d442eae62f0c8c4f92c05f59508";
-      sha256 = "1v4bwfh7ziklfcdapnyky00gjivcn1n30b72pwmbdlk7283p555k";
-    };
-  }
-  {
-    goPackagePath = "github.com/cpuguy83/go-md2man";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cpuguy83/go-md2man";
-      rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599";
-      sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj";
-    };
-  }
-  {
-    goPackagePath = "github.com/dustin/go-humanize";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dustin/go-humanize";
-      rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8";
-      sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k";
-    };
-  }
-  {
-    goPackagePath = "github.com/elastic/gosigar";
-    fetch = {
-      type = "git";
-      url = "https://github.com/elastic/gosigar";
-      rev = "7c0ce0d4814c8d4950d7e7f40ed3b6359e757875";
-      sha256 = "1nar7jia3xfgwnvazp25m9b0kxxklarrq9fzdr63j3nqy2fnwvca";
-    };
-  }
-  {
-    goPackagePath = "github.com/elazarl/go-bindata-assetfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/elazarl/go-bindata-assetfs";
-      rev = "e1a2a7ec64b07d04ac9ebb072404fe8b7b60de1b";
-      sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk";
-    };
-  }
-  {
-    goPackagePath = "github.com/facebookgo/clock";
-    fetch = {
-      type = "git";
-      url = "https://github.com/facebookgo/clock";
-      rev = "600d898af40aa09a7a93ecb9265d87b0504b6f03";
-      sha256 = "1z3jxwsqll65il7rcdx5j4dggg6w143z24h3agk09xvsc2iyj7a2";
-    };
-  }
-  {
-    goPackagePath = "github.com/gogo/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogo/protobuf";
-      rev = "a4cceea7a401a73fefafd1a21fedbd4694124a82";
-      sha256 = "1b23izdgxlz010qrqgazm5yg0bc3pkni1qdf8n3z3xcn58hcx2yg";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "2c1988e8c18d14b142c0b472624f71647cf39adb";
-      sha256 = "176x3yv6l0i49ddv73r9v6w9qcmgrfzy8db26r01yk7sczq75nd5";
-    };
-  }
-  {
-    goPackagePath = "github.com/google/btree";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/btree";
-      rev = "7d79101e329e5a3adf994758c578dab82b90c017";
-      sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0";
-    };
-  }
-  {
-    goPackagePath = "github.com/grpc-ecosystem/grpc-gateway";
-    fetch = {
-      type = "git";
-      url = "https://github.com/grpc-ecosystem/grpc-gateway";
-      rev = "ccd4e6b091a44f9f6b32848ffc63b3e8f8e26092";
-      sha256 = "0nl9hddmxw2s4cqpg70k1913fna101lxrha6dgplw8g8rjikfna4";
-    };
-  }
-  {
-    goPackagePath = "github.com/julienschmidt/httprouter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/julienschmidt/httprouter";
-      rev = "d8ff598a019f2c7bad0980917a588193cf26666e";
-      sha256 = "11sdd5fi2w0szk850n4y35x4v2ndy62c3ss9alha5xcj4jh1j0yq";
-    };
-  }
-  {
-    goPackagePath = "github.com/kr/pretty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/pretty";
-      rev = "737b74a46c4bf788349f72cb256fed10aea4d0ac";
-      sha256 = "13bip4vamvij8dx0v0nhrikz6qhsimd0w4i55424c76ws6ph84i8";
-    };
-  }
-  {
-    goPackagePath = "github.com/kr/text";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/text";
-      rev = "7cafcd837844e784b526369c9bce262804aebc60";
-      sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx";
-    };
-  }
-  {
-    goPackagePath = "github.com/lib/pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lib/pq";
-      rev = "80f8150043c80fb52dee6bc863a709cdac7ec8f8";
-      sha256 = "0brk4di63f56x9fsidn8dk7c2azan1kjzrli79h262j9pd17c3jm";
-    };
-  }
-  {
-    goPackagePath = "github.com/lightstep/lightstep-tracer-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lightstep/lightstep-tracer-go";
-      rev = "f3c66066ce6023ad1bd721cfbd9fbd6292eb08cc";
-      sha256 = "1ci38j6d3spy2279l6anxxvm7k85h4fr08pdfw9ghrv96ajmaizb";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-isatty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-isatty";
-      rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
-      sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-runewidth";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-runewidth";
-      rev = "d6bea18f789704b5f83375793155289da36a3c7f";
-      sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
-    };
-  }
-  {
-    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
-    fetch = {
-      type = "git";
-      url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
-      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
-    };
-  }
-  {
-    goPackagePath = "github.com/olekukonko/tablewriter";
-    fetch = {
-      type = "git";
-      url = "https://github.com/olekukonko/tablewriter";
-      rev = "daf2955e742cf123959884fdff4685aa79b63135";
-      sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203";
-    };
-  }
-  {
-    goPackagePath = "github.com/opentracing/basictracer-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opentracing/basictracer-go";
-      rev = "c7c0202a8a77f658aeb2193a27b6c0cfcc821038";
-      sha256 = "09mh7dlhr3lyw8kwpa07ywjzr3bg7847ky4hvx551lhyqk0bfv0l";
-    };
-  }
-  {
-    goPackagePath = "github.com/opentracing/opentracing-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opentracing/opentracing-go";
-      rev = "855519783f479520497c6b3445611b05fc42f009";
-      sha256 = "15amxprc5n0dgr42jd1lkcn697m7pcvmksps9g1gw38ahyicxq8g";
-    };
-  }
-  {
-    goPackagePath = "github.com/petermattis/goid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/petermattis/goid";
-      rev = "208e1c5be6bf38853827abdc6290b5f6a0c404d5";
-      sha256 = "0d511pdyrv9lkzq04agnm7019c1769vmdq8kyh66pq2np1x6jsl2";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "a22138067af1c4942683050411a841ade67fe1eb";
-      sha256 = "0fay1zxi8y4kj1q33mqxdsbicg9cplknnmzz87c9saq7rb4k6f36";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
-      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/common";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/common";
-      rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8";
-      sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq";
-    };
-  }
-  {
-    goPackagePath = "github.com/rcrowley/go-metrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/rcrowley/go-metrics";
-      rev = "bdb33529eca3e55eac7328e07c57012a797af602";
-      sha256 = "146hfddgdi8rkg25v1f25klz3sy5slp0gny2lwjyi63jwly07512";
-    };
-  }
-  {
-    goPackagePath = "github.com/rubyist/circuitbreaker";
-    fetch = {
-      type = "git";
-      url = "https://github.com/rubyist/circuitbreaker";
-      rev = "7e3e7fbe9c62b943d487af023566a79d9eb22d3b";
-      sha256 = "01fshh514bq2bk7f6xv7zr781m23d3k1mla1lh8azqw5874m7a07";
-    };
-  }
-  {
-    goPackagePath = "github.com/russross/blackfriday";
-    fetch = {
-      type = "git";
-      url = "https://github.com/russross/blackfriday";
-      rev = "93622da34e54fb6529bfb7c57e710f37a8d9cbd8";
-      sha256 = "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2";
-    };
-  }
-  {
-    goPackagePath = "github.com/satori/go.uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/satori/go.uuid";
-      rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6";
-      sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w";
-    };
-  }
-  {
-    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shurcooL/sanitized_anchor_name";
-      rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
-      sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f";
-      sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev = "f676131e2660dc8cd88de99f7486d34aa8172635";
-      sha256 = "0gj4fpary501n32ag49mkd0vymqw01am0lv78l9db9dvd2im0i4m";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "a548aac93ed489257b9d959b40fe1e8c1e20778c";
-      sha256 = "022vl9s6hf8qzdrxfivzd3dg1gsr1vns0j3a3xfdkgv5z9qyvy83";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf";
-      sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8";
-      sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "2910a502d2bf9e43193af9d68ca516529614eed3";
-      sha256 = "1h2bxzsnqksnvrk2lplpqzzpp9m9zmd6f2aajyahc56bxb1804jq";
-    };
-  }
-  {
-    goPackagePath = "google.golang.org/grpc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/grpc/grpc-go";
-      rev = "79b7c349179cdd6efd8bac4a1ce7f01b98c16e9b";
-      sha256 = "0w2g3pcxxgnp3fk0qy7ail8mxdxv3cf1yavdx8rrjn9idyd261df";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/inf.v0";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/inf.v0";
-      rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
-      sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v1";
-      rev = "9f9df34309c04878acc86042b16630b0f696e1de";
-      sha256 = "1r8d346szqa9x8q03wiycik5qy3d6w8qq4hs99z1p64q5lm0g7gm";
-    };
-  }
-]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..ac9cdaf5b77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11544,9 +11544,7 @@ with pkgs;
 
   cifs-utils = callPackage ../os-specific/linux/cifs-utils { };
 
-  cockroachdb = callPackage ../servers/sql/cockroachdb {
-    gcc = gcc6; # needs gcc 6.0 and above
-  };
+  cockroachdb = callPackage ../servers/sql/cockroachdb { };
 
   conky = callPackage ../os-specific/linux/conky ({
     lua = lua5_1; # conky can use 5.2, but toluapp can not
-- 
GitLab


From b4b698248fcecfbf52f908810ea8f40eb74f1491 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Thu, 15 Jun 2017 01:45:06 +0200
Subject: [PATCH 0832/1490] qstopmotion: init -> 2.3.2

---
 .../video/qstopmotion/default.nix             | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/video/qstopmotion/default.nix

diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
new file mode 100644
index 00000000000..310ac974fca
--- /dev/null
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, qt5, gstreamer, gstreamermm, gst_plugins_bad
+, gst_plugins_base, gst_plugins_good, ffmpeg, guvcview, automoc4
+, cmake, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils
+, libv4l, pcre }:
+
+stdenv.mkDerivation rec {
+  pname = "qstopmotion";
+  version = "2.3.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/${pname}/Version_2_3_2/${name}-Source.tar.gz";
+    sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf";
+  };
+
+  buildInputs = [ qt5.qtbase gstreamer gstreamermm gst_plugins_bad gst_plugins_good
+                  gst_plugins_base ffmpeg guvcview v4l_utils libv4l pcre
+		];
+
+  nativeBuildInputs = [ pkgconfig cmake gettext libgphoto2 gphoto2 libxml2 libv4l ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.qstopmotion.org";
+    description = "Create stopmotion animation with a (web)camera";
+    longDescription = ''
+      Qstopmotion is a tool to create stopmotion
+      animation. Its users are able to create stop-motions from pictures
+      imported from a camera or from the harddrive and export the
+      animation to different video formats such as mpeg or avi.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ maintainers.leenaars ];
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8190a045dcd..bdd4604d161 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15541,6 +15541,8 @@ with pkgs;
   # 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
   qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { };
 
+  qstopmotion = callPackage ../applications/video/qstopmotion { };
+
   qsynth = callPackage ../applications/audio/qsynth { };
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
-- 
GitLab


From 478e88d13e9f9518694676dcfe5dac9ec41cacfe Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sat, 17 Jun 2017 19:31:25 -0500
Subject: [PATCH 0833/1490] polyml: 5.6 -> 5.7

- fetchurl -> fetchFromGitHub
- use `with stdenv.lib` in meta
- add darwin to platforms
- add yurrriq to maintainers
---
 pkgs/development/compilers/polyml/default.nix | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 8b5d14e7f5f..3ad8585edf3 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,11 +1,8 @@
-{stdenv, fetchurl, autoreconfHook}:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
-let
-  version = "5.6";
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "polyml-${version}";
+  version = "5.7";
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
@@ -13,21 +10,21 @@ stdenv.mkDerivation {
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
 
-  src = fetchurl {
-    url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
-    sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0";
+  src = fetchFromGitHub {
+    owner = "polyml";
+    repo = "polyml";
+    rev = "v${version}";
+    sha256 = "10nsljmcl0zjbcc7ifc991ypwfwq5gh4rcp5rg4nnb706c6bs16y";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Standard ML compiler and interpreter";
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
     '';
     homepage = http://www.polyml.org/;
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = [ #Add your name here!
-      stdenv.lib.maintainers.z77z
-    ];
+    license = licenses.lgpl21;
+    platforms = with platforms; (linux ++ darwin);
+    maintainers = with maintainers; [ z77z yurrriq ];
   };
 }
-- 
GitLab


From 63b8d659f6ab50871416262307e828191a7c2d0d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 16 Jun 2017 08:01:27 +0800
Subject: [PATCH 0834/1490] syncthing-inotify: 0.8.5 -> 0.8.6

---
 .../networking/syncthing/inotify-deps.nix     | 23 ++++++-------------
 .../networking/syncthing/inotify.nix          |  4 ++--
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix
index d8b087dcb80..e5e554db67b 100644
--- a/pkgs/applications/networking/syncthing/inotify-deps.nix
+++ b/pkgs/applications/networking/syncthing/inotify-deps.nix
@@ -1,30 +1,21 @@
-# This file was generated by go2nix.
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
 [
-  {
-    goPackagePath = "github.com/cenkalti/backoff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cenkalti/backoff";
-      rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3";
-      sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc";
-    };
-  }
   {
     goPackagePath = "github.com/syncthing/syncthing";
     fetch = {
       type = "git";
       url = "https://github.com/syncthing/syncthing";
-      rev = "fb6d453c74d8420af847460e42e05779e90311b6";
-      sha256 = "18fya44i80ij5wqpwg0bff2hp058rh87b9zld2rpw0z8r04bnsv0";
+      rev = "d0061c172caecd3baf61f3ff720f56fdb805186e";
+      sha256 = "08cn0ym4arjppbnfn2b37crarwmiqbj4yjr7kinhdxx9gqm5wkj1";
     };
   }
   {
-    goPackagePath = "github.com/zillode/notify";
+    goPackagePath = "golang.org/x/sys";
     fetch = {
       type = "git";
-      url = "https://github.com/zillode/notify";
-      rev = "df33c1a773b462f936a149c36696c018c047eaa9";
-      sha256 = "0ncfqnj5kvbyw630xsxqkxy3y6jv5hp89fqi9mzra3lr4zckiv3s";
+      url = "https://go.googlesource.com/sys";
+      rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a";
+      sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj";
     };
   }
 ]
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix
index 6e9c1ba1028..c83d9a2fcd0 100644
--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ b/pkgs/applications/networking/syncthing/inotify.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "syncthing-inotify-${version}";
-  version = "0.8.5";
+  version = "0.8.6";
 
   goPackagePath = "github.com/syncthing/syncthing-inotify";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "syncthing";
     repo   = "syncthing-inotify";
     rev    = "v${version}";
-    sha256 = "13qfppwlqrx3fs44ghnffdp9x0hs7mn1gal2316p7jb0klkcpfzh";
+    sha256 = "0z1zpb7av4q5nj2d4yda9jcbjdz4yj3823c29y73yf0gfp26lppl";
   };
 
   goDeps = ./inotify-deps.nix;
-- 
GitLab


From 7e10ecb763a1a6ce1de15066bcbfb04ab0c2dda1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 18 Jun 2017 04:29:22 +0200
Subject: [PATCH 0835/1490] chromium: Allow to put extensions in system path

This should allow us to easily add system-wide Chromium extensions via a
NixOS configuration similar to this:

{ pkgs, ... }: {
  environment.pathsToLink = [ "/share/chromium/extensions" ];
  environment.systemPackages = [ pkgs.my-shiny-extension ];
}

For more details about what Chromium expects within that directory, see:

https://developer.chrome.com/extensions/external_extensions

I've introduced this because of a personal desire to gain more control
about which extensions are installed and what they are able to do. All
of the extensions I use are free software, but despite that it's useful
to either easily patch them and also prevent unwanted automatic updates.

Tested this using the NixOS "chromium.stable" test on x86_64-linux.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @offlinehacker because of #21050
---
 pkgs/applications/networking/browsers/chromium/common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 4b31983322c..43b6da6bf34 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -132,6 +132,9 @@ let
         :l; n; bl
       }' gpu/config/gpu_control_list.cc
 
+      # Allow to put extensions into the system-path.
+      sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc
+
       patchShebangs .
       # use our own nodejs
       mkdir -p third_party/node/linux/node-linux-x64/bin
-- 
GitLab


From 41de162f0defe297403a811eabdb1dd8d17b35b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 09:05:59 +0100
Subject: [PATCH 0836/1490] eiskaltdcpp: fix miniupnpc build

---
 pkgs/applications/networking/p2p/eiskaltdcpp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
index 8d46cf62104..6b6f66e24d0 100644
--- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
+++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
     -DUSE_QT_QML=ON
     -DFREE_SPACE_BAR_C=ON
     -DUSE_MINIUPNP=ON
+    -DLOCAL_MINIUPNP=ON
     -DDBUS_NOTIFY=ON
     -DUSE_JS=ON
     -DPERL_REGEX=ON
-- 
GitLab


From 5b96398b4d65908cc47748f61ccde8ea57fdac1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 09:29:46 +0100
Subject: [PATCH 0837/1490] bitcoin-classic: fix checksum

---
 pkgs/applications/altcoins/bitcoin-classic.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 1cb9a77785e..5f17eb3a1cf 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "bitcoinclassic";
     repo = "bitcoinclassic";
     rev = "v${version}";
-    sha256 = "1z6g930csvx49krl34207yqwlr8dkxpi72k3msh15p1kjvv90nvz";
+    sha256 = "00spils0gv8krx2nyxrf6j1dl81wmxk8xjkqc22cv7nsdnakzrvm";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
@@ -32,12 +32,12 @@ stdenv.mkDerivation rec {
       parties. Users hold the crypto keys to their own money and transact directly
       with each other, with the help of a P2P network to check for double-spending.
 
-      Bitcoin Classic stands for the original Bitcoin as Satoshi described it, 
-      "A Peer-to-Peer Electronic Cash System". We are writing the software that 
+      Bitcoin Classic stands for the original Bitcoin as Satoshi described it,
+      "A Peer-to-Peer Electronic Cash System". We are writing the software that
       miners and users say they want. We will make sure it solves their needs, help
-      them deploy it, and gracefully upgrade the bitcoin network's capacity 
+      them deploy it, and gracefully upgrade the bitcoin network's capacity
       together. The data shows that Bitcoin can grow, on-chain, to welcome many
-      more users onto our coin in a safe and distributed manner. In the future we 
+      more users onto our coin in a safe and distributed manner. In the future we
       will continue to release updates that are in line with Satoshi’s whitepaper &
       vision, and are agreed upon by the community.
     '';
-- 
GitLab


From f43da049247aa704cacc8a9fa8777a0335759137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 09:46:31 +0100
Subject: [PATCH 0838/1490] freicoin: fix build by disabling miniupnpc support

development has stalled and miniupnpc library is incompatible with
freicoin.
---
 pkgs/applications/altcoins/freicoin.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
index f7cd04f1be4..e8a26365361 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -11,16 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z";
   };
 
+  qmakeFlags = ["USE_UPNP=-"];
+
   # I think that openssl and zlib are required, but come through other
   # packages
 
   installPhase = ''
     mkdir -p $out/bin
     cp freicoin-qt $out/bin
-    '';
+  '';
 
   nativeBuildInputs = [ qmake4Hook ];
-  buildInputs = [ db boost gmp mpfr miniupnpc qt4 ];
+  buildInputs = [ db boost gmp mpfr qt4 ];
 
   meta = with stdenv.lib; {
     description = "Peer-to-peer currency with demurrage fee";
-- 
GitLab


From 8a8cc0071e159db815cb6aebe7af70f60d68dd69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 09:55:58 +0100
Subject: [PATCH 0839/1490] memorycoin: fix build by disabling miniupnpc
 support

---
 pkgs/applications/altcoins/memorycoin.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix
index d30133fa551..2723bf9dabd 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, openssl, db48, boost
-, zlib, miniupnpc, qt4, qmake4Hook, utillinux, protobuf, qrencode
+, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode
 , withGui }:
 
 with stdenv.lib;
@@ -13,10 +13,12 @@ stdenv.mkDerivation rec{
     sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8";
   };
 
-  buildInputs = [ pkgconfig openssl db48 boost zlib
-                  miniupnpc utillinux protobuf ]
+  buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
                   ++ optionals withGui [ qt4 qmake4Hook qrencode ];
 
+  qmakeFlags = ["USE_UPNP=-"];
+  makeFlags = ["USE_UPNP=-"];
+
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
-- 
GitLab


From 4c4b1023399cdb111d528325cc757e3ff2cfce8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 09:58:38 +0100
Subject: [PATCH 0840/1490] primecoin: fix build by disabling upnp support

---
 pkgs/applications/altcoins/primecoin.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix
index 7d25a26fba2..31183670212 100644
--- a/pkgs/applications/altcoins/primecoin.nix
+++ b/pkgs/applications/altcoins/primecoin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, openssl, db48, boost
-, zlib, miniupnpc, qt4, qmake4Hook, utillinux, protobuf, qrencode
+, zlib, qt4, qmake4Hook, utillinux, protobuf, qrencode
 , withGui }:
 
 with stdenv.lib;
@@ -13,8 +13,10 @@ stdenv.mkDerivation rec{
     sha256 = "0cixnkici74204s9d5iqj5sccib5a8dig2p2fp1axdjifpg787i3";
   };
 
-  buildInputs = [ pkgconfig openssl db48 boost zlib
-                  miniupnpc utillinux protobuf ]
+  qmakeFlags = ["USE_UPNP=-"];
+  makeFlags = ["USE_UPNP=-"];
+
+  buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
                   ++ optionals withGui [ qt4 qmake4Hook qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
-- 
GitLab


From 3a15cdea6fd4dace6c98b2e3b20f52f435b872e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 10:27:13 +0100
Subject: [PATCH 0841/1490] amazon-glacier-cmd-interface: fix missing argparse
 dep

---
 pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
index d5f47f9a6c0..472b4a6508f 100644
--- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
+++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix
@@ -11,8 +11,12 @@ python2Packages.buildPythonApplication rec {
     sha256 = "1k5z8kda9v6klr4536pf5qbq9zklxvyysv7nc48gllschl09jywc";
   };
 
+  # argparse is part of the standardlib
+  prePatch = ''
+    substituteInPlace setup.py --replace "'argparse'," ""
+  '';
+
   propagatedBuildInputs = with python2Packages; [
-    argparse
     boto
     dateutil
     prettytable
-- 
GitLab


From 78b34f913be0c4a4c6bf83736908c10ce14e9f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 18 Jun 2017 06:36:41 -0300
Subject: [PATCH 0842/1490] qtcreator: 4.2.1 -> 4.3.0 (#26627)

* qtcreator: 4.2.1 -> 4.3.0

Update qtcreator to version 4.3.0.

Remove explicit creation and installation of a desktop file, since one
is already provided in the distribution package.

* qtcreator: use full executable path in the desktop file
---
 pkgs/development/qtcreator/default.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index f66070be694..6fadf530ed0 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -6,8 +6,8 @@
 with stdenv.lib;
 
 let
-  baseVersion = "4.2";
-  revision = "1";
+  baseVersion = "4.3";
+  revision = "0";
 in
 
 stdenv.mkDerivation rec {
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   version = "${baseVersion}.${revision}";
 
   src = fetchurl {
-    url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
-    sha256 = "0f2slaf579q2anflf524lbhmpwrwy3hzjfxzs10n44r7s7yc4dr5";
+    url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
+    sha256 = "1n3ihky72p6q69n6c8s5hacq8rxdqmmr6msg89w5amwd17sam7p9";
   };
 
   buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
@@ -36,18 +36,8 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    # Install desktop file
-    mkdir -p "$out/share/applications"
-    cat > "$out/share/applications/qtcreator.desktop" << __EOF__
-    [Desktop Entry]
-    Exec=$out/bin/qtcreator
-    Name=Qt Creator
-    GenericName=Cross-platform IDE for Qt
-    Icon=QtProject-qtcreator.png
-    Terminal=false
-    Type=Application
-    Categories=Qt;Development;IDE;
-    __EOF__
+    substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
+      --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
     wrapQtProgram $out/bin/qtcreator
   '';
 
-- 
GitLab


From 73744e700c5a42b81cdd1c99fc1910a4159d9b94 Mon Sep 17 00:00:00 2001
From: armijnhemel <armijnhemel@users.noreply.github.com>
Date: Sun, 18 Jun 2017 11:39:59 +0200
Subject: [PATCH 0843/1490] atril: init at 1.19.0 (#25765)

---
 pkgs/desktops/mate/atril/default.nix | 37 ++++++++++++++++++++++++++++
 pkgs/desktops/mate/default.nix       |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/desktops/mate/atril/default.nix

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
new file mode 100644
index 00000000000..197c5470d2b
--- /dev/null
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name = "atril-${version}";
+  version = "${major-ver}.${minor-ver}";
+  major-ver = "1.19";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0v829yvr738y5s2knyvimcgqv351qzb0rpw5il19qc27rbzyri1r";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gtk3
+    itstool
+    libsecret
+    libxml2
+    poppler
+    mate.mate-desktop
+  ];
+
+  configureFlags = [ "--disable-caja" ];
+  
+  meta = {
+    description = "A simple multi-page document viewer for the MATE desktop";
+    homepage = "http://mate-desktop.org";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index d9565e8f4d1..528f792a600 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,5 +1,6 @@
 { callPackage, pkgs }:
 rec {
+  atril = callPackage ./atril { };
   caja = callPackage ./caja { };
   mate-common = callPackage ./mate-common { };
   mate-desktop = callPackage ./mate-desktop { };
-- 
GitLab


From 123c05c8b5a487dea9330d259a7c85d1f4b52c41 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 18 Jun 2017 11:46:35 +0200
Subject: [PATCH 0844/1490] accountsservice: 0.6.43 -> 0.6.43

---
 pkgs/development/libraries/accountsservice/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 1a49913727d..d1b3b9b9827 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -3,15 +3,16 @@
 
 stdenv.mkDerivation rec {
   name = "accountsservice-${version}";
-  version = "0.6.43";
+  version = "0.6.45";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
-    sha256 = "1k6n9079001sgcwlkq0bz6mkn4m8y4dwf6hs1qm85swcld5ajfzd";
+    sha256 = "09pg25ir7kjigvp2cxd9fkfw8c8ql8vrswfvymg9zmbmma9w43zv";
   };
 
-  buildInputs = [ pkgconfig glib intltool libtool makeWrapper
-                  gobjectIntrospection polkit systemd ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  buildInputs = [ glib intltool libtool gobjectIntrospection polkit systemd ];
 
   configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
                      "--localstatedir=/var" ];
-- 
GitLab


From b49689e6f7236f94999bbc973439fd294e793d8e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 18 Jun 2017 11:48:33 +0200
Subject: [PATCH 0845/1490] parallel: 20170422 -> 20170522

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 8097902b0d9..07326e7a8ed 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20170422";
+  name = "parallel-20170522";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0afk1q8mqzz02h6imyykgi9gwk5gj08hzs6lwgd65ilj4slkh93s";
+    sha256 = "1k5wlcc0dr2fxna0vi48s0l6pvbyl4pbclbih4103f1155im23ca";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];
-- 
GitLab


From 2fd359c978eaf423a0e1ba8d89257149be1f9b92 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 18 Jun 2017 11:53:17 +0200
Subject: [PATCH 0846/1490] rrdtool: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 3d2666add42..6d961c69b13 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -2,11 +2,11 @@
 , tcl-8_5, darwin }:
 
 stdenv.mkDerivation rec {
-  name = "rrdtool-1.6.0";
+  name = "rrdtool-1.7.0";
 
   src = fetchurl {
     url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
-    sha256 = "1msj1qsy3sdmx2g2rngp9a9qv50hz0ih7yx6nkx2b21drn4qx56d";
+    sha256 = "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From f79d21da658869cfe09120f5dff4228224db8832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 10:47:42 +0100
Subject: [PATCH 0847/1490] oslo-config: fix argparse dependencies

---
 .../python-modules/oslo-config/default.nix    | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +-------------
 2 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/oslo-config/default.nix

diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
new file mode 100644
index 00000000000..7cdfb9061fb
--- /dev/null
+++ b/pkgs/development/python-modules/oslo-config/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock }:
+
+buildPythonPackage rec {
+  pname = "oslo.config";
+  version = "2.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz";
+  };
+
+  propagatedBuildInputs = [ pbr six netaddr stevedore ];
+  buildInputs = [ mock ];
+
+  # TODO: circular import on oslo-i18n
+  doCheck = false;
+
+  postPatch = ''
+    substituteInPlace requirements.txt --replace "argparse"
+  '';
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 332fa5f83a0..7aac6f2c306 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17006,21 +17006,7 @@ in {
     '';
   };
 
-  oslo-config = buildPythonPackage rec {
-    name = "oslo.config-${version}";
-    version = "2.5.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/oslo.config/${name}.tar.gz";
-      sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz";
-    };
-
-    propagatedBuildInputs = with self; [ argparse pbr six netaddr stevedore ];
-    buildInputs = [ self.mock ];
-
-    # TODO: circular import on oslo-i18n
-    doCheck = false;
-  };
+  oslo-config = callPackage ../development/python-modules/oslo-config { };
 
   oslotest = buildPythonPackage rec {
     name = "oslotest-${version}";
-- 
GitLab


From 76ea4df5f9aa27161d85d591b58fda6ed5c7b16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 10:59:17 +0100
Subject: [PATCH 0848/1490] pythonPackages.keystoneauth1: fix missing argparse
 dep

---
 .../python-modules/keystoneauth1/default.nix  | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +------------
 2 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/keystoneauth1/default.nix

diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
new file mode 100644
index 00000000000..033f08f9587
--- /dev/null
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage, isPyPy, fetchPypi, python
+, pbr, testtools, testresources, testrepository, mock
+, pep8, fixtures, mox3, requests-mock
+, iso8601, requests, six, stevedore, webob, oslo-config
+}:
+
+buildPythonPackage rec {
+  pname = "keystoneauth1";
+  version = "1.1.0";
+  name = "${pname}-${version}";
+  disabled = isPyPy; # a test fails
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
+  };
+
+  buildInputs = [ pbr testtools testresources testrepository mock
+                  pep8 fixtures mox3 requests-mock ];
+  propagatedBuildInputs = [ iso8601 requests six stevedore
+                            webob oslo-config ];
+
+  postPatch = ''
+    sed -i 's@python@${python.interpreter}@' .testr.conf
+    substituteInPlace requirements.txt --replace "argparse"
+  '';
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7aac6f2c306..e85fc22e3b9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17046,24 +17046,7 @@ in {
     '';
   };
 
-  keystoneauth1 = buildPythonPackage rec {
-    name = "keystoneauth1-${version}";
-    version = "1.1.0";
-    disabled = isPyPy; # a test fails
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/keystoneauth1/${name}.tar.gz";
-      sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
-    };
-
-    buildInputs = with self; [ pbr testtools testresources testrepository mock
-                               pep8 fixtures mox3 requests-mock ];
-    propagatedBuildInputs = with self; [ argparse iso8601 requests six stevedore
-                                         webob oslo-config ];
-    patchPhase = ''
-      sed -i 's@python@${python.interpreter}@' .testr.conf
-    '';
-  };
+  keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 {};
 
   requests-mock = buildPythonPackage rec {
     name = "requests-mock-${version}";
-- 
GitLab


From 72f8ba269c948b276c1f38d8aee32b8de7be97ef Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Sun, 18 Jun 2017 13:06:31 +0300
Subject: [PATCH 0849/1490] rustfmt: 0.8.3 -> 0.9.0

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

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index 3efc82a60c8..0e3802a214f 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rustfmt-${version}";
-  version = "0.8.3";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustfmt";
     rev = "${version}";
-    sha256 = "1nh0h8mncz5vnn5hmw74f8nnh5cxdlrg67891l4dyq0p38vjhimz";
+    sha256 = "12l3ff0s0pzhcf5jbs8wqawjk4jghhhz8j6dq1n5201yvny12jlr";
   };
 
-  depsSha256 = "002d7y33a0bavd07wl7xrignmyaamnzfabdnr7a2x3zfizkfnblb";
+  depsSha256 = "1nnb2lpzjf6hv1a7cw3cbkc22fb54rsp6h87wzmqi4hsy1csff7a";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";
-- 
GitLab


From 770845d372d1ace9df6347eff8947ed300cb8679 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 18 Jun 2017 12:19:16 +0200
Subject: [PATCH 0850/1490] zim: 0.65 -> 0.67-rc2

---
 pkgs/applications/office/zim/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index 227b982689e..18c4514c4de 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -9,11 +9,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "zim-${version}";
-  version = "0.65";
+  version = "0.67-rc2";
 
   src = fetchurl {
     url = "http://zim-wiki.org/downloads/${name}.tar.gz";
-    sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl";
+    sha256 = "0l4q2dfnvyn0jr1lggf8g7515q4z7qr1lnmy0lsyhjf477ldszqf";
   };
 
   propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ];
@@ -37,9 +37,10 @@ python2Packages.buildPythonApplication rec {
   '';
 
 
-  meta = {
-      description = "A desktop wiki";
-      homepage = http://zim-wiki.org;
-      license = stdenv.lib.licenses.gpl2Plus;
+  meta = with stdenv.lib; {
+    description = "A desktop wiki";
+    homepage = http://zim-wiki.org;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ pSub ];
   };
 }
-- 
GitLab


From c25b145815c1a7411621e33e69147c9545833509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 11:25:13 +0100
Subject: [PATCH 0851/1490] cli53: 0.4.4 -> 0.8.8

---
 pkgs/tools/admin/cli53/default.nix | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index bdb9fd2d477..5c80e76f482 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -1,21 +1,27 @@
-{ lib, python2Packages, fetchurl }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
-python2Packages.buildPythonApplication rec {
+buildGoPackage rec {
   name = "cli53-${version}";
-  version = "0.4.4";
+  version = "0.8.8";
 
-  src = fetchurl {
-    url = "mirror://pypi/c/cli53/${name}.tar.gz";
-    sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig";
+  goPackagePath = "github.com/barnybug/cli53";
+
+  src = fetchFromGitHub {
+    owner = "barnybug";
+    repo = "cli53";
+    rev = version;
+    sha256 = "1hbx64rn25qzp2xlfwv8xaqyfcax9b6pl30j9vciw7cb346i84gc";
   };
 
-  propagatedBuildInputs = with python2Packages; [
-    argparse
-    boto
-    dns
-  ];
+  buildPhase = ''
+    pushd go/src/${goPackagePath}/cmd/cli53
+    go get .
+    popd
+  '';
+
+  goDeps = ./deps.nix;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "CLI tool for the Amazon Route 53 DNS service";
     homepage = https://github.com/barnybug/cli53;
     license = lib.licenses.mit;
-- 
GitLab


From 4e89e18852b8fbe926f4ab8af008db17e58465ea Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 18 Jun 2017 12:33:25 +0200
Subject: [PATCH 0852/1490] shotwell: 0.26.1 -> 0.26.2

---
 pkgs/applications/graphics/shotwell/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index c020f7fc6ca..3f31b86fe49 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -8,12 +8,12 @@
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
   major = "0.26";
-  minor = "1";
+  minor = "2";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "0xak1f69lp1yx3p8jgmr9c0z3jypi8zjpy3kiknn5n9g2f5cqq0a";
+    sha256 = "0frjqa6nmh025clwnb74z2rzbdq65wjcp2lf9csgcbkpahyjhrag";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
@@ -24,11 +24,13 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
   buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala_0_28 sqlite webkitgtk
-                  pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
                   which udev libgudev gnome3.gexiv2 hicolor_icon_theme
                   libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
-                  wrapGAppsHook gnome_doc_utils gnome3.rest gnome3.gcr
+                  gnome_doc_utils gnome3.rest gnome3.gcr
                   gnome3.defaultIconTheme itstool libgdata ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 8a4a4efbe6c1632906f0c8cacccc0c16b428c630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 11:39:13 +0100
Subject: [PATCH 0853/1490] clooj: fix download src

---
 pkgs/development/interpreters/clojure/clooj.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
index 527a5b2e570..57ced325aad 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
   name = "clooj-${version}";
 
   jar = fetchurl {
-    url = "http://download1492.mediafire.com/5bbi05sxgxog/prkf64humftrmz3/clooj-0.4.4-standalone.jar";
+    # mirrored as original mediafire.com source does not work without user interaction
+    url = "https://archive.org/download/clooj-0.4.4-standalone/clooj-0.4.4-standalone.jar";
     sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
   };
 
-- 
GitLab


From 4eeefadf4f125f45b30b9ec790b9ef60679d3038 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 18 Jun 2017 18:38:33 +0800
Subject: [PATCH 0854/1490] krename: 20161228 -> 20170610

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

diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 1137d6c07f6..c6baab21ee0 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -6,15 +6,15 @@
 
 let
   pname = "krename";
-  version = "20161228";
+  version = "20170610";
   unwrapped = kdeDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchFromGitHub {
       owner  = "KDE";
       repo   = "krename";
-      rev    = "4e55c2bef50898eb4a6485ce068379b166121895";
-      sha256 = "09yz3sxy2l6radfybkj2f7224ggf315vnvyksk0aq8f03gan6cbp";
+      rev    = "18000edfec52de0b417d575e14eb078b4bd7b2f3";
+      sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j";
     };
 
     meta = with lib; {
-- 
GitLab


From ecc34cbdb3f04855f7140b96d3631f0f2a4bd9ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 11:50:03 +0100
Subject: [PATCH 0855/1490] glusterfs: do not set setuid in install

related to #26600
---
 pkgs/tools/filesystems/glusterfs/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 60e49486454..af76e429d31 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -65,6 +65,10 @@ rec {
   inherit (s) name version;
   inherit buildInputs propagatedBuildInputs;
 
+  postPatch = ''
+    sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
+  '';
+
   patches = [
     ./glusterfs-use-PATH-instead-of-hardcodes.patch
     ./glusterfs-fix-unsubstituted-autoconf-macros.patch
-- 
GitLab


From 91e08fe55b93058577253b65ab73121f4bca2763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 12:16:54 +0100
Subject: [PATCH 0856/1490] vulnix: fix deps

---
 pkgs/tools/security/vulnix/requirements.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
index 952dc1ce652..bf87fe1c64d 100644
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -26,6 +26,7 @@ rec {
       url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz";
       sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e";
     };
+    propagatedBuildInputs = with self; [ zope_testrunner ];
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
-- 
GitLab


From 130082d012869ab4634a04bfef75e8a5cf08bb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 12:39:18 +0100
Subject: [PATCH 0857/1490] communi: fix forbidden build references

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

diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index b292dd8f68e..c521084213e 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       --replace "/usr/bin" "$out/bin"
   '';
 
-  postFixup = ''
+  preFixup = ''
     patchelf --set-rpath "$out/lib:$(patchelf --print-rpath $out/bin/.communi-wrapped)" $out/bin/.communi-wrapped
   '';
 
-- 
GitLab


From b9eecf80e775f747d070cc7326ee5b3ee2ab76cd Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sun, 18 Jun 2017 20:45:51 +0900
Subject: [PATCH 0858/1490] tmuxinator: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index 5e896610866..5bf7dd49143 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -8,8 +8,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "tmuxinator";
-  version = "0.8.1";
-  sha256 = "1cpmlfa684j9r1hjya70nfcl5lzdbzmbi9hqbs5nhxha97b77qs5";
+  version = "0.9.0";
+  sha256 = "13p8rvf1naknjin1n97370ifyj475lyyh60cbw2v6gczi9rs84p3";
 
   erubis = buildRubyGem rec {
     inherit ruby;
@@ -33,7 +33,7 @@ buildRubyGem rec {
     description = "Manage complex tmux sessions easily";
     homepage    = https://github.com/tmuxinator/tmuxinator;
     license     = licenses.mit;
-    maintainers = with maintainers; [ auntie ];
+    maintainers = with maintainers; [ auntie ericsagnes ];
     platforms   = platforms.unix;
   };
-}
\ No newline at end of file
+}
-- 
GitLab


From abc374f1273585d0114affcbbbefdfadfc4169b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 12:52:02 +0100
Subject: [PATCH 0859/1490] ply: add kernel version constraint

---
 pkgs/os-specific/linux/ply/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 9d4bdb1e27d..a9c84516ef8 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -1,9 +1,12 @@
-{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison }:
+{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison, p7zip }:
+
+assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
+
 let
   version = "1.0.beta1-9e810b1";
 in stdenv.mkDerivation {
   name = "ply-${version}";
-  nativeBuildInputs = [ autoreconfHook flex yacc ];
+  nativeBuildInputs = [ autoreconfHook flex yacc p7zip ];
 
   src = fetchFromGitHub {
     owner = "iovisor";
@@ -14,7 +17,9 @@ in stdenv.mkDerivation {
 
   preAutoreconf = ''
     # ply wants to install header fails to its build directory
-    xz -d < ${kernel.src} | tar -xf -
+    # use 7z to handle multiple archive formats transparently
+    7z x ${kernel.src} -so | 7z x -aoa -si -ttar
+
     configureFlagsArray+=(--with-kerneldir=$(echo $(pwd)/linux-*))
     ./autogen.sh --prefix=$out
   '';
-- 
GitLab


From 66fdb94f5011a2087e237451555c64767c09357e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 18 Jun 2017 13:53:09 +0200
Subject: [PATCH 0860/1490] gawkInteractive: fix build after 04d4d14d6d

(Without causing a mass rebuild for now.)
---
 pkgs/tools/text/gawk/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index baaf7d4bb3b..dec7af04525 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -32,10 +32,17 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
     ++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")];
 
-  postInstall = ''
-    rm $out/bin/gawk-*
-    ln -s $man/share/man/man1/gawk.1 $man/share/man/man1/awk.1
-  '';
+  postInstall =
+    if interactive then
+      ''
+        rm "$out"/bin/gawk-*
+        ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
+      ''
+    else # TODO: remove this other branch on a stdenv rebuild
+      ''
+        rm $out/bin/gawk-*
+        ln -s $man/share/man/man1/gawk.1 $man/share/man/man1/awk.1
+      '';
 
   meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/gawk/;
-- 
GitLab


From 3477f560279e362477f2620b6f9b825e919629d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 12:56:45 +0100
Subject: [PATCH 0861/1490] vimPlugins.command-t: fix ruby build

---
 pkgs/misc/vim-plugins/default.nix                          | 7 +++----
 .../misc/vim-plugins/vim2nix/additional-nix-code/command-t | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 87d57e44182..c871e422638 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -5,7 +5,7 @@
 , python3, boost, icu
 , ycmd
 , pythonPackages, python3Packages
-, Cocoa ? null
+, Cocoa ? null, git
 }:
 
 let
@@ -1775,11 +1775,10 @@ rec {
       sha256 = "15wil973sqfgvix9li15qk49kv9l3rn8zqis2cl71k6xh1xvd9ff";
     };
     dependencies = [];
-    buildInputs = [ perl ruby ];
+    buildInputs = [ perl ruby git ];
     buildPhase = ''
       pushd ruby/command-t
-      ruby extconf.rb
-      make
+      gem build ./command-t.gemspec
       popd
     '';
   };
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
index a29c602b5d7..57aa35999dc 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
@@ -1,7 +1,6 @@
     buildInputs = [ perl ruby ];
     buildPhase = ''
       pushd ruby/command-t
-      ruby extconf.rb
-      make
+      gem build command-t.gemspec
       popd
     '';
-- 
GitLab


From 2c5de119792d0b9ceaa0005b12ea4f847c7ac295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:14:10 +0100
Subject: [PATCH 0862/1490] cli53: fix meta

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

diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index 5c80e76f482..4e284c46193 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -24,7 +24,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     description = "CLI tool for the Amazon Route 53 DNS service";
     homepage = https://github.com/barnybug/cli53;
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ benley ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ benley ];
   };
 }
-- 
GitLab


From 8581998d7fab76cd0565309a854ee006626fdbfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:14:26 +0100
Subject: [PATCH 0863/1490] vulnix: use zope-testrunner from pythonPackages

---
 pkgs/tools/security/vulnix/requirements.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
index bf87fe1c64d..c1cbf9c4d3b 100644
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -26,7 +26,7 @@ rec {
       url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz";
       sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e";
     };
-    propagatedBuildInputs = with self; [ zope_testrunner ];
+    propagatedBuildInputs = [ pythonPackages.zope_testrunner ];
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;
-- 
GitLab


From a9aefdeac9a8444b53931233b86f998561a9c89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:18:40 +0100
Subject: [PATCH 0864/1490] pythonPackages.rebulk: 0.8.2 -> 0.9.0

---
 .../python-modules/rebulk/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +----------------
 2 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/rebulk/default.nix

diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
new file mode 100644
index 00000000000..3dec364b292
--- /dev/null
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}:
+
+buildPythonPackage rec {
+  pname = "rebulk";
+  version = "0.9.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1sw516ihfrb7i9bfl1n3049akvb23mpsk3llh7w3xfnbvkfrpip0";
+  };
+
+  # Some kind of trickery with imports that doesn't work.
+  doCheck = false;
+  buildInputs = [ pytest pytestrunner ];
+  propagatedBuildInputs = [ six regex ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/Toilal/rebulk/";
+    license = licenses.mit;
+    description = "Advanced string matching from simple patterns";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e85fc22e3b9..d93a3a012c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11914,26 +11914,7 @@ in {
 
   guessit = callPackage ../development/python-modules/guessit { };
 
-  rebulk = buildPythonPackage rec {
-    version = "0.8.2";
-    name = "rebulk-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/rebulk/${name}.tar.gz";
-      sha256 = "8c09901bda7b79a21d46faf489d67d017aa54d38bdabdb53f824068a6640401a";
-    };
-
-    # Some kind of trickery with imports that doesn't work.
-    doCheck = false;
-    buildInputs = with self; [ pytest pytestrunner ];
-    propagatedBuildInputs = with self; [ six regex ];
-
-    meta = {
-      homepage = "https://github.com/Toilal/rebulk/";
-      license = licenses.mit;
-      description = "Advanced string matching from simple patterns";
-    };
-  };
+  rebulk = callPackage ../development/python-modules/rebulk { };
 
   gunicorn = callPackage ../development/python-modules/gunicorn.nix { };
 
-- 
GitLab


From 8b8a9b695a23d93765cec274422fbf25c028471e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:23:30 +0100
Subject: [PATCH 0865/1490] cli53: add missing deps.nix

---
 pkgs/tools/admin/cli53/deps.nix | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 pkgs/tools/admin/cli53/deps.nix

diff --git a/pkgs/tools/admin/cli53/deps.nix b/pkgs/tools/admin/cli53/deps.nix
new file mode 100644
index 00000000000..0cb0360e499
--- /dev/null
+++ b/pkgs/tools/admin/cli53/deps.nix
@@ -0,0 +1,3 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
+[
+]
-- 
GitLab


From 08d25152b85fb24f7b5b85efe25d6be4deb12227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:26:11 +0100
Subject: [PATCH 0866/1490] gdbGuile: mark as broken

does not compile anymore since gdb 8.0
---
 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 bdd4604d161..6ce2a8c3754 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7168,7 +7168,7 @@ with pkgs;
     inherit (gnu) mig;
   };
 
-  gdbGuile = lowPrio (gdb.override { inherit guile; });
+  gdbGuile = lowPrio (gdb.override { inherit guile; broken = true; });
 
   gdb-multitarget = lowPrio (gdb.override { multitarget = true; });
 
-- 
GitLab


From e66d2753f3a8a35bc8b96a0db054ed598d4df4f6 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 18 Jun 2017 15:31:34 +0300
Subject: [PATCH 0867/1490] nsd: Send stderr to /dev/null

nsd by default logs _both_ to syslog and to standard error which results
in all the messages ending up in the journal twice, the ones from stderr
with an ugly timestamp sticked in front of them.
---
 nixos/modules/services/networking/nsd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 0f01b9d4af0..c8b8ed547eb 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -811,6 +811,7 @@ in
 
       serviceConfig = {
         ExecStart = "${nsdPkg}/sbin/nsd -d -c ${nsdEnv}/nsd.conf";
+        StandardError = "null";
         PIDFile = pidFile;
         Restart = "always";
         RestartSec = "4s";
-- 
GitLab


From 3f3d33a07867116446ec9b5e2675ef1c8de8127d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 15 May 2017 06:44:33 -0500
Subject: [PATCH 0868/1490] qt5: use distinct `lib/qt-5.x` prefix for each
 minor version

Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
---
 .../services/x11/desktop-managers/plasma5.nix |  1 -
 .../display-managers/sddm/default.nix         |  2 +-
 .../science/programming/fdr/default.nix       |  2 +-
 .../robotics/qgroundcontrol/default.nix       |  6 ++---
 pkgs/desktops/lxqt/default.nix                |  2 +-
 pkgs/desktops/plasma-5/libkscreen/default.nix |  2 +-
 pkgs/desktops/plasma-5/startkde/default.nix   | 15 +----------
 pkgs/desktops/plasma-5/startkde/startkde.sh   |  4 +--
 .../extra-cmake-modules/setup-hook.sh         | 13 +++++++---
 .../kde-frameworks/kwindowsystem/default.nix  |  2 +-
 .../libraries/qmltermwidget/default.nix       |  2 +-
 .../libraries/qt-5/5.6/default.nix            |  9 ++++---
 .../libraries/qt-5/5.6/qtbase/default.nix     | 17 ++++++++-----
 .../qtbase/nix-profiles-library-paths.patch   |  8 +++---
 .../qt-5/5.6/qtdeclarative/default.nix        |  4 +++
 .../nix-profiles-import-paths.patch           | 20 +++++++--------
 .../qt-5/5.6/qtwebengine/default.nix          |  7 +++---
 .../libraries/qt-5/5.8/default.nix            |  9 ++++---
 .../libraries/qt-5/5.8/qtbase/default.nix     | 18 +++++++------
 .../qtbase/nix-profiles-library-paths.patch   |  8 +++---
 .../qt-5/5.8/qtdeclarative/default.nix        |  4 +++
 .../nix-profiles-import-paths.patch           | 20 +++++++--------
 .../libraries/qt-5/make-qt-wrapper-darwin.sh  |  7 ++----
 .../libraries/qt-5/make-qt-wrapper.sh         |  7 ++----
 pkgs/development/libraries/qt-5/qt-env.nix    |  7 +++---
 .../qt-5/qtbase-setup-hook-darwin.sh          | 25 ++++++++++---------
 .../libraries/qt-5/qtbase-setup-hook.sh       | 25 ++++++++++---------
 .../libraries/qtwebkit-plugins/default.nix    |  2 +-
 pkgs/development/qtcreator/default.nix        |  2 +-
 pkgs/tools/misc/qt5ct/default.nix             |  2 +-
 30 files changed, 129 insertions(+), 123 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 2216104be31..d981cd5328e 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -183,7 +183,6 @@ in
       environment.variables = {
         # Enable GTK applications to load SVG icons
         GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
-        QT_PLUGIN_PATH = "/run/current-system/sw/lib/qt5/plugins";
       };
 
       fonts.fonts = with pkgs; [ noto-fonts hack-font ];
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index d1f487b37ac..07c1e8cee33 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -53,7 +53,7 @@ let
     ];
 
     preConfigure = ''
-      export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
+      export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
     '';
 
     enableParallelBuilding = true;
diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix
index a82027a628f..8ed8e0e73b0 100644
--- a/pkgs/applications/science/programming/fdr/default.nix
+++ b/pkgs/applications/science/programming/fdr/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     cp -r * "$out"
     # Hack around lack of libtinfo in NixOS
     ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
-    ln -s ${qtbase.out}/lib/qt5/plugins $out/lib/qt_plugins
+    ln -s ${qtbase.out}/$qtPluginPrefix $out/lib/qt_plugins
     ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
 
     for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index e323b42d7ae..580d9f0e76e 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -56,10 +56,10 @@ stdenv.mkDerivation rec {
 
     # we need to link to our Qt deps in our own output if we want
     # this package to work without being installed as a system pkg
-    mkdir -p $out/lib/qt5 $out/etc/xdg
+    mkdir -p $out/lib/qt-$qtCompatVersion $out/etc/xdg
     for pkg in $qtInputs; do
-      if [[ -d $pkg/lib/qt5 ]]; then
-        for dir in lib/qt5 share etc/xdg; do
+      if [[ -d $pkg/lib/qt-$qtCompatVersion ]]; then
+        for dir in lib/qt-$qtCompatVersion share etc/xdg; do
           if [[ -d $pkg/$dir ]]; then
             ${lndir}/bin/lndir "$pkg/$dir" "$out/$dir"
           fi
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index fbcb286f5b2..735ba79b405 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -13,7 +13,7 @@ let
           --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
           --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \
           --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \
-          --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"lib/qt5/plugins" \
+          --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" \
           --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations
         echo ============================
         echo $file
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index afb2c20e90c..6881f95e6d5 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -14,6 +14,6 @@ plasmaPackage {
   ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/lib/qt5/plugins/kf5/kscreen\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/$qtPluginPrefix/kf5/kscreen\""
   '';
 }
diff --git a/pkgs/desktops/plasma-5/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix
index 87c72fdc599..25ebdd7f332 100644
--- a/pkgs/desktops/plasma-5/startkde/default.nix
+++ b/pkgs/desktops/plasma-5/startkde/default.nix
@@ -34,21 +34,8 @@ in runCommand "startkde" env ''
       addToSearchPath suffixPATH "$p/lib/libexec/kf5"
   done
 
-  # Configure Qt search paths
-  QT_PLUGIN_PATH=
-  QML_IMPORT_PATH=
-  QML2_IMPORT_PATH=
-  for p in $libs; do
-      addToSearchPath QT_PLUGIN_PATH "$p/lib/qt5/plugins"
-      addToSearchPath QML_IMPORT_PATH "$p/lib/qt5/imports"
-      addToSearchPath QML2_IMPORT_PATH "$p/lib/qt5/qml"
-  done
-
   substitute ${./startkde.sh} "$out" \
       --subst-var shell \
-      --subst-var suffixPATH \
-      --subst-var QT_PLUGIN_PATH \
-      --subst-var QML_IMPORT_PATH \
-      --subst-var QML2_IMPORT_PATH
+      --subst-var suffixPATH
   chmod +x "$out"
 ''
diff --git a/pkgs/desktops/plasma-5/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh
index c38450516e9..53e7fbb0569 100755
--- a/pkgs/desktops/plasma-5/startkde/startkde.sh
+++ b/pkgs/desktops/plasma-5/startkde/startkde.sh
@@ -2,9 +2,7 @@
 
 PATH="$PATH${PATH:+:}@suffixPATH@"
 
-export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@"
-export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@"
-export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@"
+echo "NIX_PROFILES=\"$NIX_PROFILES\""
 
 kbuildsycoca5
 
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index 9ee9ef90a44..a550cda1fa2 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@@ -13,10 +13,6 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
     cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputBin}/lib/libexec"
     cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
-    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputBin}/lib/qt5/imports"
-    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/lib/qt5/qml"
     cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
     cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
     cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share"
@@ -46,6 +42,15 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc"
     cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg"
     cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart"
+
+    if [ -n "$qtPluginPrefix" ]; then
+        cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix"
+        cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix"
+    fi
+
+    if [ -n "$qtQmlPrefix" ]; then
+        cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"
+    fi
 }
 
 preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 8a91bdbac52..4e02777e39c 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -14,6 +14,6 @@ kdeFramework {
   propagatedBuildInputs = [ qtx11extras ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/lib/qt5/plugins\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/$qtPluginPrefix\""
   '';
 }
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index bb058711b2e..88d942b9fd7 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace qmltermwidget.pro \
-      --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/"
+      --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/"
   '';
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index cc6475d31b6..2dccdd065df 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -18,8 +18,9 @@ existing packages here and modify it as necessary.
 1. Update the URL in `./fetch.sh`.
 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/`
    from the top of the Nixpkgs tree.
-3. Use `nox-review wip` to check that everything builds.
-4. Commit the changes and open a pull request.
+3. Update `qtCompatVersion` below if the minor version number changes.
+4. Check that the new packages build correctly.
+5. Commit the changes and open a pull request.
 
 */
 
@@ -38,6 +39,8 @@ with stdenv.lib;
 
 let
 
+  qtCompatVersion = "5.6";
+
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
@@ -70,7 +73,7 @@ let
 
   addPackages = self: with self;
     let
-      callPackage = self.newScope { inherit qtSubmodule srcs; };
+      callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
     in {
 
       qtbase = callPackage ./qtbase {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
index 289a1bbac6c..a4039714a60 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchgit, copyPathsToStore
-, srcs
+, srcs, qtCompatVersion
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
 , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
@@ -32,6 +32,7 @@ stdenv.mkDerivation {
 
   name = "qtbase-${srcs.qtbase.version}";
   inherit (srcs.qtbase) src version;
+  inherit qtCompatVersion;
 
   outputs = [ "out" "dev" ];
 
@@ -94,18 +95,22 @@ stdenv.mkDerivation {
     # Note on the above: \x27 is a way if including a single-quote
     # character in the sed string arguments.
 
+  qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins";
+  qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml";
+  qtDocPrefix = "share/doc/qt-${qtCompatVersion}";
+
   setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
     configureFlags+="\
-        -plugindir $out/lib/qt5/plugins \
-        -importdir $out/lib/qt5/imports \
-        -qmldir $out/lib/qt5/qml \
-        -docdir $out/share/doc/qt5"
+        -plugindir $out/$qtPluginPrefix \
+        -qmldir $out/$qtQmlPrefix \
+        -docdir $out/$qtDocPrefix"
 
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins/platforms\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\""
   '';
 
   prefixKey = "-prefix ";
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
index 68163fc0c31..dfc2dccdeb6 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
@@ -7,11 +7,11 @@ Index: qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
          coreappdata()->app_libpaths.reset(app_libpaths);
  
 +        // Add library paths derived from NIX_PROFILES.
-+        const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+        const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
-+        for (const QByteArray &profile: profiles) {
++        const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
++        const QString plugindir = QStringLiteral(NIXPKGS_QT_PLUGIN_PREFIX);
++        for (const QString &profile: profiles) {
 +            if (!profile.isEmpty()) {
-+                app_libpaths->append(QFile::decodeName(profile) + plugindir);
++                app_libpaths->append(profile + QDir::separator() + plugindir);
 +            }
 +        }
 +
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
index 9b6a6c46176..57b8e53b215 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
@@ -5,4 +5,8 @@ qtSubmodule {
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python2 ];
+
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
index 06b244b974f..50e9490b6d9 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
@@ -1,20 +1,20 @@
-Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
+Index: qtdeclarative-opensource-src-5.6.2/src/qml/qml/qqmlimport.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp
-+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
+--- qtdeclarative-opensource-src-5.6.2.orig/src/qml/qml/qqmlimport.cpp
++++ qtdeclarative-opensource-src-5.6.2/src/qml/qml/qqmlimport.cpp
+@@ -1568,6 +1568,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
      QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
      addImportPath(installImportsPath);
  
 +    // Add library paths derived from NIX_PROFILES.
-+    const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+    const QString qmldir = QString::fromLatin1("/lib/qt5/qml");
-+    Q_FOREACH (const QByteArray &profile, profiles) {
++    const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
++    const QString qmldir = QStringLiteral(NIXPKGS_QML2_IMPORT_PREFIX);
++    for (const QString &profile: profiles) {
 +        if (!profile.isEmpty()) {
-+            addImportPath(QFile::decodeName(profile) + qmldir);
++            addImportPath(profile + QDir::separator() + qmldir);
 +        }
 +    }
 +
      // env import paths
-     QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
-     if (!envImportPath.isEmpty()) {
+     if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
+         const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
index 1234c825b14..7ffc42fe7f6 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
@@ -42,10 +42,9 @@ qtSubmodule {
     sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
 
     configureFlags+="\
-        -plugindir $out/lib/qt5/plugins \
-        -importdir $out/lib/qt5/imports \
-        -qmldir $out/lib/qt5/qml \
-        -docdir $out/share/doc/qt5"
+        -plugindir $out/$qtPluginPrefix \
+        -qmldir $out/$qtQmlPrefix \
+        -docdir $out/$qtDocPrefix"
   '';
   propagatedBuildInputs = [
     # Image formats
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 2865a879f47..5a737441fa8 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -9,8 +9,9 @@ top-level attribute to `top-level/all-packages.nix`.
 1. Update the URL in `maintainers/scripts/generate-qt.sh`.
 2. From the top of the Nixpkgs tree, run
    `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
-3. Check that the new packages build correctly.
-4. Commit the changes and open a pull request.
+3. Update `qtCompatVersion` below if the minor version number changes.
+4. Check that the new packages build correctly.
+5. Commit the changes and open a pull request.
 
 */
 
@@ -29,6 +30,8 @@ with stdenv.lib;
 
 let
 
+  qtCompatVersion = "5.8";
+
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
@@ -61,7 +64,7 @@ let
 
   addPackages = self: with self;
     let
-      callPackage = self.newScope { inherit qtSubmodule srcs; };
+      callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
     in {
 
       qtbase = callPackage ./qtbase {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index ee6399c2bd4..008eb1e3709 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -1,6 +1,6 @@
 {
   stdenv, lib, copyPathsToStore,
-  src, version,
+  src, version, qtCompatVersion,
 
   coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
   ruby,
@@ -32,7 +32,7 @@ in
 stdenv.mkDerivation {
 
   name = "qtbase-${version}";
-  inherit src version;
+  inherit qtCompatVersion src version;
 
   propagatedBuildInputs =
     [
@@ -117,18 +117,22 @@ stdenv.mkDerivation {
      # Note on the above: \x27 is a way if including a single-quote
      # character in the sed string arguments.
 
+  qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins";
+  qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml";
+  qtDocPrefix = "share/doc/qt-${qtCompatVersion}";
+
   setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
     configureFlags+="\
-        -plugindir $out/lib/qt5/plugins \
-        -importdir $out/lib/qt5/imports \
-        -qmldir $out/lib/qt5/qml \
-        -docdir $out/share/doc/qt5"
+        -plugindir $out/$qtPluginPrefix \
+        -qmldir $out/$qtQmlPrefix \
+        -docdir $out/$qtDocPrefix"
 
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins/platforms\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\""
   '';
 
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
index 553c71d0ace..f626e399288 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
@@ -7,11 +7,11 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
          coreappdata()->app_libpaths.reset(app_libpaths);
  
 +        // Add library paths derived from NIX_PROFILES.
-+        const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+        const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
-+        for (const QByteArray &profile: profiles) {
++        const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
++        const QString plugindir = QStringLiteral(NIXPKGS_QT_PLUGIN_PREFIX);
++        for (const QString &profile: profiles) {
 +            if (!profile.isEmpty()) {
-+                app_libpaths->append(QFile::decodeName(profile) + plugindir);
++                app_libpaths->append(profile + QDir::separator() + plugindir);
 +            }
 +        }
 +
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
index acddbd9e365..28ea571adca 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
@@ -8,6 +8,10 @@ qtSubmodule {
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python2 makeQtWrapper ];
 
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
+  '';
+
   postInstall = ''
     wrapQtProgram $out/bin/qmleasing
     wrapQtProgram $out/bin/qmlscene
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
index 06b244b974f..2d51f7b6759 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
@@ -1,20 +1,20 @@
-Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
+Index: qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp
 ===================================================================
---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp
-+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
-@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
+--- qtdeclarative-opensource-src-5.8.0.orig/src/qml/qml/qqmlimport.cpp
++++ qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp
+@@ -1630,6 +1630,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
      QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
      addImportPath(installImportsPath);
  
 +    // Add library paths derived from NIX_PROFILES.
-+    const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+    const QString qmldir = QString::fromLatin1("/lib/qt5/qml");
-+    Q_FOREACH (const QByteArray &profile, profiles) {
++    const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
++    const QString qmldir = QStringLiteral(NIXPKGS_QML2_IMPORT_PREFIX);
++    for (const QString &profile: profiles) {
 +        if (!profile.isEmpty()) {
-+            addImportPath(QFile::decodeName(profile) + qmldir);
++            addImportPath(profile + QDir::separator() + qmldir);
 +        }
 +    }
 +
      // env import paths
-     QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
-     if (!envImportPath.isEmpty()) {
+     if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
+         const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
index 576c03d8c76..a42c418fde6 100644
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
+++ b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
@@ -3,7 +3,6 @@ wrapQtProgram() {
     shift
     wrapProgram "$prog" \
         --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \
         --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
         --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
@@ -18,7 +17,6 @@ makeQtWrapper() {
     shift
     makeWrapper "$old" "$new" \
         --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \
         --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
         --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
@@ -28,9 +26,8 @@ makeQtWrapper() {
 
 _makeQtWrapperSetup() {
     # cannot use addToSearchPath because these directories may not exist yet
-    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"
-    export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"
-    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
+    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
+    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
     export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
     export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
 }
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
index 4a5651f74c9..33dc8b6370f 100644
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
@@ -3,7 +3,6 @@ wrapQtProgram() {
     shift
     wrapProgram "$prog" \
         --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
-        --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
         --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
         --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
@@ -18,7 +17,6 @@ makeQtWrapper() {
     shift
     makeWrapper "$old" "$new" \
         --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
-        --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
         --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
         --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
@@ -28,9 +26,8 @@ makeQtWrapper() {
 
 _makeQtWrapperSetup() {
     # cannot use addToSearchPath because these directories may not exist yet
-    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"
-    export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"
-    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
+    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
+    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
     export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share${GSETTINGS_SCHEMAS_PATH:+:$GSETTINGS_SCHEMAS_PATH}"
     export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
 }
diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix
index fad68fbd745..728761689b4 100644
--- a/pkgs/development/libraries/qt-5/qt-env.nix
+++ b/pkgs/development/libraries/qt-5/qt-env.nix
@@ -13,10 +13,9 @@ buildEnv {
     cat >"$out/bin/qt.conf" <<EOF
     [Paths]
     Prefix = $out
-    Plugins = lib/qt5/plugins
-    Imports = lib/qt5/imports
-    Qml2Imports = lib/qt5/qml
-    Documentation = share/doc/qt5
+    Plugins = $qtPluginPrefix
+    Qml2Imports = $qtQmlPrefix
+    Documentation = $qtDocPrefix
     EOF
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
index aa2d24a741c..81fcf5fc3d3 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
@@ -1,3 +1,7 @@
+qtPluginPrefix=@qtPluginPrefix@
+qtQmlPrefix=@qtQmlPrefix@
+qtDocPrefix=@qtDocPrefix@
+
 addToSearchPathOnceWithCustomDelimiter() {
     local delim="$1"
     local search="$2"
@@ -25,30 +29,28 @@ propagateOnce() {
 }
 
 _qtPropagate() {
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+    for dir in $qtPluginPrefix $qtQmlPrefix; do
         if [ -d "$1/$dir" ]; then
             propagateOnce propagatedBuildInputs "$1"
             break
         fi
     done
-    addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-    addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
-    addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
 }
 
 crossEnvHooks+=(_qtPropagate)
 
 _qtPropagateNative() {
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+    for dir in $qtPluginPrefix $qtQmlPrefix; do
         if [ -d "$1/$dir" ]; then
             propagateOnce propagatedNativeBuildInputs "$1"
             break
         fi
     done
     if [ -z "$crossConfig" ]; then
-        addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-        addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
-        addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
     fi
 }
 
@@ -112,10 +114,9 @@ if [ -z "$NIX_QT5_TMP" ]; then
     cat >"$NIX_QT5_TMP/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $NIX_QT5_TMP
-Plugins = lib/qt5/plugins
-Imports = lib/qt5/imports
-Qml2Imports = lib/qt5/qml
-Documentation = share/doc/qt5
+Plugins = $qtPluginPrefix
+Qml2Imports = $qtQmlPrefix
+Documentation = $qtDocPrefix
 EOF
     echo "bin/qt.conf" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
 
diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
index 47d196cec26..66f5d3f5818 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
@@ -1,3 +1,7 @@
+qtPluginPrefix=@qtPluginPrefix@
+qtQmlPrefix=@qtQmlPrefix@
+qtDocPrefix=@qtDocPrefix@
+
 addToSearchPathOnceWithCustomDelimiter() {
     local delim="$1"
     local search="$2"
@@ -25,30 +29,28 @@ propagateOnce() {
 }
 
 _qtPropagate() {
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+    for dir in $qtPluginPrefix $qtQmlPrefix; do
         if [ -d "$1/$dir" ]; then
             propagateOnce propagatedBuildInputs "$1"
             break
         fi
     done
-    addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-    addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
-    addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
 }
 
 crossEnvHooks+=(_qtPropagate)
 
 _qtPropagateNative() {
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+    for dir in $qtPluginPrefix $qtQmlPrefix; do
         if [ -d "$1/$dir" ]; then
             propagateOnce propagatedNativeBuildInputs "$1"
             break
         fi
     done
     if [ -z "$crossConfig" ]; then
-        addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-        addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
-        addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
     fi
 }
 
@@ -111,10 +113,9 @@ if [ -z "$NIX_QT5_TMP" ]; then
     cat >"$NIX_QT5_TMP/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $NIX_QT5_TMP
-Plugins = lib/qt5/plugins
-Imports = lib/qt5/imports
-Qml2Imports = lib/qt5/qml
-Documentation = share/doc/qt5
+Plugins = $qtPluginPrefix
+Qml2Imports = $qtQmlPrefix
+Documentation = $qtDocPrefix
 EOF
     echo "bin/qt.conf" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
 
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index 73e62945113..716e6cb2809 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   postPatch = ''
     sed -i "s,-lhunspell,-lhunspell-1.6," src/spellcheck/spellcheck.pri
-    sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/lib/qt5/plugins," src/src.pro
+    sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 6fadf530ed0..d82098852cc 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
 
   preBuild = optional withDocumentation ''
-    ln -s ${qtbase}/share/doc $NIX_QT5_TMP/share
+    ln -s ${qtbase}/$qtDocPrefix $NIX_QT5_TMP/share
   '';
 
   postInstall = ''
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index 016e9726ad9..f6ba699211c 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase qtsvg ];
 
   preConfigure = ''
-    qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins"
+    qmakeFlags="$qmakeFlags PLUGINDIR=$out/$qtPluginPrefix"
   '';
 
   preFixup = ''
-- 
GitLab


From 210f6888023c1df8aff2d053a5e41f5e1effdfe7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 10:40:19 -0500
Subject: [PATCH 0869/1490] qt5: rename qmakeHook to qmake

---
 pkgs/applications/audio/dfasma/default.nix    |  6 +++---
 pkgs/applications/audio/fmit/default.nix      |  4 ++--
 pkgs/applications/audio/iannix/default.nix    |  5 +++--
 pkgs/applications/audio/keyfinder/default.nix |  5 +++--
 .../audio/sonic-visualiser/default.nix        |  7 +++----
 pkgs/applications/editors/rstudio/default.nix |  5 +++--
 pkgs/applications/editors/tiled/default.nix   |  4 ++--
 .../graphics/awesomebump/default.nix          |  5 +++--
 .../graphics/phototonic/default.nix           |  4 ++--
 pkgs/applications/graphics/rapcad/default.nix |  4 ++--
 pkgs/applications/misc/calibre/default.nix    |  4 ++--
 .../misc/cool-retro-term/default.nix          |  4 ++--
 .../misc/golden-cheetah/default.nix           |  4 ++--
 pkgs/applications/misc/goldendict/default.nix |  9 ++++++---
 pkgs/applications/misc/gpxsee/default.nix     |  4 ++--
 pkgs/applications/misc/openbrf/default.nix    |  4 ++--
 pkgs/applications/misc/qtpass/default.nix     |  4 ++--
 .../misc/redis-desktop-manager/default.nix    |  4 ++--
 pkgs/applications/misc/twmn/default.nix       |  5 +++--
 .../instant-messengers/ricochet/default.nix   |  4 ++--
 .../telegram/cutegram/default.nix             |  4 ++--
 .../libqtelegram-aseman-edition/default.nix   |  4 ++--
 .../telegram/telegram-qml/default.nix         |  4 ++--
 .../instant-messengers/tensor/default.nix     |  4 ++--
 .../networking/irc/communi/default.nix        |  4 ++--
 .../networking/linssid/default.nix            |  5 +++--
 .../networking/mumble/default.nix             |  2 +-
 .../newsreaders/quiterss/default.nix          |  5 +++--
 .../networking/p2p/qbittorrent/default.nix    |  6 +++---
 pkgs/applications/office/cb2bib/default.nix   |  4 ++--
 pkgs/applications/office/mytetra/default.nix  |  5 +++--
 .../science/electronics/fritzing/default.nix  |  4 ++--
 .../robotics/qgroundcontrol/default.nix       | 20 ++++++++-----------
 pkgs/applications/video/bomi/default.nix      |  4 ++--
 pkgs/applications/video/shotcut/default.nix   | 10 +++++++---
 pkgs/applications/video/smplayer/default.nix  |  4 ++--
 pkgs/applications/video/smtube/default.nix    |  5 +++--
 .../applications/video/vokoscreen/default.nix |  5 ++---
 pkgs/data/documentation/zeal/default.nix      |  5 +++--
 pkgs/desktops/lumina/default.nix              |  4 ++--
 .../libraries/accounts-qt/default.nix         |  4 ++--
 .../libraries/libcommuni/default.nix          |  4 ++--
 .../libraries/libkeyfinder/default.nix        |  5 +++--
 .../libraries/qmltermwidget/default.nix       |  4 ++--
 .../libraries/qscintilla/default.nix          |  4 ++--
 .../libraries/qt-5/5.6/default.nix            |  4 ++--
 .../libraries/qt-5/5.8/default.nix            |  4 ++--
 .../libraries/qtinstaller/default.nix         |  6 +++---
 .../libraries/qtstyleplugins/default.nix      |  5 +++--
 .../libraries/qtwebkit-plugins/default.nix    |  4 ++--
 pkgs/development/libraries/quazip/default.nix |  4 ++--
 pkgs/development/libraries/qwt/6.nix          |  4 ++--
 pkgs/development/python-modules/pyqt/5.x.nix  |  7 ++++---
 pkgs/development/qtcreator/default.nix        |  4 ++--
 .../tools/analysis/qcachegrind/default.nix    |  4 ++--
 pkgs/games/chessx/default.nix                 |  6 ++----
 .../dwarf-therapist/default.nix               |  4 ++--
 pkgs/games/mudlet/default.nix                 |  7 ++++---
 pkgs/os-specific/linux/wpa_supplicant/gui.nix |  4 ++--
 pkgs/tools/misc/ckb/default.nix               |  4 ++--
 pkgs/tools/misc/qt5ct/default.nix             |  5 +++--
 pkgs/tools/misc/radeon-profile/default.nix    |  4 ++--
 pkgs/tools/misc/rockbox-utility/default.nix   |  4 ++--
 pkgs/tools/networking/cmst/default.nix        |  4 ++--
 pkgs/top-level/all-packages.nix               |  4 ++--
 65 files changed, 165 insertions(+), 151 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index d006f2c0178..53ca8d316a2 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmakeHook, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake, makeQtWrapper }:
 
 let
 
@@ -37,9 +37,9 @@ in stdenv.mkDerivation rec {
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ fftw libsndfile qtbase qtmultimedia qmakeHook ];
+  buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
 
-  nativeBuildInputs = [ makeQtWrapper ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   postPatch = ''
     substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index bb4df5ea1db..e4c6c658efd 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmakeHook
+{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmake
 , alsaSupport ? true, alsaLib ? null
 , jackSupport ? false, libjack2 ? null
 , portaudioSupport ? false, portaudio ? null }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "gillesdegottex";
   };
 
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ fftw qtbase qtmultimedia ]
     ++ optionals alsaSupport [ alsaLib ]
     ++ optionals jackSupport [ libjack2 ]
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index 83fd2b14ed2..d72a2b13c42 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmakeHook
+{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
   };
 
-  buildInputs = [ alsaLib pkgconfig qtbase qtscript qmakeHook ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ alsaLib pkgconfig qtbase qtscript ];
 
   qmakeFlags = [ "PREFIX=/" ];
 
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 0cacd772493..6aaf14a5763 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmakeHook, taglib }:
+{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }:
 
 stdenv.mkDerivation rec {
   name = "keyfinder-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     owner = "ibsh";
   };
 
-  buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns qmakeHook taglib ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ];
 
   postPatch = ''
     substituteInPlace is_KeyFinder.pro \
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d48f1eb851b..d1e9b50dee3 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
 , libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland
-, qmakeHook, rubberband, serd, sord, vampSDK, fftwFloat
+, qmake, rubberband, serd, sord, vampSDK, fftwFloat
 }:
 
 stdenv.mkDerivation rec {
@@ -16,11 +16,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ libsndfile qtbase qmakeHook fftw fftwFloat bzip2 librdf rubberband
+    [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
       serd
       sord
-      pkgconfig
       # optional
       libjack2
       # portaudio
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
       libX11
     ];
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
 
   configurePhase = ''
     for i in sonic-visualiser svapp svcore svgui;
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index eab1228da1a..9ac91e7086a 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -10,7 +10,8 @@ in
 stdenv.mkDerivation rec {
   name = "RStudio-${version}";
 
-  buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qmakeHook libuuid unzip ant jdk makeWrapper pandoc ];
+  buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ];
+  nativeBuildInputs = [ qt5.qmake ];
 
   src = fetchurl {
     url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
@@ -90,7 +91,7 @@ stdenv.mkDerivation rec {
       cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
     '';
 
-  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmakeHook}/bin/qmake" ];
+  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ];
 
   desktopItem = makeDesktopItem {
     name = name;
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index be518b9336a..9bfa3998926 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmakeHook
+{ stdenv, fetchFromGitHub, pkgconfig, qmake
 , python, qtbase, qttools, zlib }:
 
 let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2";
   };
 
-  nativeBuildInputs = [ pkgconfig qmakeHook ];
+  nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [ python qtbase qttools ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index b89e18ed148..9e0916bab9c 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, qtbase, qmakeHook, makeWrapper }:
+{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "awesomebump-4.0";
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
 
   setSourceRoot = "sourceRoot=$(echo */Sources)";
 
-  buildInputs = [ qtbase qmakeHook makeWrapper ];
+  nativeBuildInputs = [ makeWrapper qmake ];
+  buildInputs = [ qtbase ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index 4782376d1e0..8ce9d407aad 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qmakeHook, exiv2 }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
 
 stdenv.mkDerivation rec {
   name = "phototonic-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase exiv2 ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   preConfigure = ''
     sed -i 's;/usr;$$PREFIX/;g' phototonic.pro
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index b7672a39d0d..451eaae79b2 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
-, qtbase, qmakeHook, mesa_glu
+, qtbase, qmake, mesa_glu
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 49c005cf739..5845fe85ccb 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite
+, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite
 , makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp
 , xdg_utils, makeDesktopItem, wrapGAppsHook
 }:
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];
+  nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
 
   buildInputs = [
     poppler_utils libpng imagemagick libjpeg
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 9ff27c74709..ccdedb23cb0 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
-qtquickcontrols, qtgraphicaleffects, qmakeHook }:
+qtquickcontrols, qtgraphicaleffects, qmake }:
 
 stdenv.mkDerivation rec {
   version = "1.0.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index d6da900656c..3472af27fea 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
-, yacc, flex, zlib, config, qmakeHook, makeQtWrapper
+, yacc, flex, zlib, config, qmake, makeQtWrapper
 }:
 stdenv.mkDerivation rec {
   name = "golden-cheetah-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib
     qtconnectivity
   ];
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ] ++ qtInputs;
+  nativeBuildInputs = [ makeQtWrapper qmake ] ++ qtInputs;
   preConfigure = ''
     cp src/gcconfig.pri.in src/gcconfig.pri
     cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index be36eeceb6b..278c685b7cf 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, pkgconfig, libXtst, libvorbis, hunspell
 , libao, ffmpeg, libeb, lzo, xz, libtiff
-, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmakeHook }:
+, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
 stdenv.mkDerivation rec {
+
   name = "goldendict-1.5.0.rc2";
   src = fetchurl {
     url = "https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz";
@@ -9,10 +10,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools libXtst libvorbis hunspell libao ffmpeg libeb
-    lzo xz libtiff qmakeHook
+    pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools
+    libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff
   ];
 
+  nativeBuildInputs = [ qmake ];
+
   qmakeFlags = [ "CONFIG+=zim_support" ];
 
   meta = {
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 42fc1e46e33..6d3193089c7 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmakeHook, qtbase, qttools, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
   };
 
-  nativeBuildInputs = [ qmakeHook qttools makeQtWrapper ];
+  nativeBuildInputs = [ qmake qttools makeQtWrapper ];
 
   preConfigure = ''
     substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 50c8fc7bcec..039b50b133a 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmakeHook, makeQtWrapper, mesa }:
+{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, makeQtWrapper, mesa }:
 
 
 stdenv.mkDerivation {
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ qtbase vcg glew ];
-  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
 
   enableParallelBuilding = true;
+  nativeBuildInputs = [ qmake makeQtWrapper ];
 
   qmakeFlags = [ "openBrf.pro" ];
 
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 4cdb6591465..a12467c55d4 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }:
+{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   preConfigure = ''
     qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 9d333da01cb..f9ca31eccfe 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchgit, pkgconfig , libssh2
 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
 , qtsvg, qttools, qtquick1
-, makeQtWrapper, qmakeHook
+, makeQtWrapper, qmake
 }:
 
 let
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   buildInputs = [
     pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index c38b97b0e98..7ec3d66f31c 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmakeHook, pkgconfig, boost }:
+{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }:
 
 stdenv.mkDerivation rec {
   name = "twmn-git-2014-09-23";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1a68gka9gyxyzhc9rn8df59rzcdwkjw90cxp1kk0rdfp6svhxhsa";
   };
 
-  buildInputs = [ qtbase qtx11extras pkgconfig boost qmakeHook ];
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ qtbase qtx11extras boost ];
 
   postPatch = ''
     sed -i s/-Werror// twmnd/twmnd.pro
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index d1af2ad70d1..b7566e0be4b 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
 , qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
-, openssl, protobuf, qmakeHook
+, openssl, protobuf, qmake
 }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     openssl protobuf
   ];
 
-  nativeBuildInputs = [ pkgconfig makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index a20119e0d73..c61c62dc8ba 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -3,7 +3,7 @@
 , qtimageformats, qtgraphicaleffects, qtwebkit
 , telegram-qml, libqtelegram-aseman-edition
 , gst_all_1
-, makeQtWrapper, qmakeHook }:
+, makeQtWrapper, qmake }:
 
 stdenv.mkDerivation rec {
   name = "cutegram-${meta.version}";
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
     telegram-qml libqtelegram-aseman-edition
   ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]);
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
 
   enableParallelBuilding = true;
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   fixupPhase = ''
     wrapQtProgram $out/bin/cutegram \
diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
index 322c40afc7d..ec2e65dc499 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, qtbase, qtmultimedia, qtquick1, qmakeHook }:
+, qtbase, qtmultimedia, qtquick1, qmake }:
 
 stdenv.mkDerivation rec {
   name = "libqtelegram-aseman-edition-${meta.version}";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qtmultimedia qtquick1 ];
-  nativeBuildInputs = [ qmakeHook ];
   enableParallelBuilding = true;
+  nativeBuildInputs = [ qmake ];
 
   patchPhase = ''
     substituteInPlace libqtelegram-ae.pro --replace "/libqtelegram-ae" ""
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
index 854648d9786..c8d24c9b28c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, qtbase, qtmultimedia, qtquick1, qmakeHook
+, qtbase, qtmultimedia, qtquick1, qmake
 , libqtelegram-aseman-edition }:
 
 stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ];
-  nativeBuildInputs = [ qmakeHook ];
   enableParallelBuilding = true;
+  nativeBuildInputs = [ qmake ];
 
   patchPhase = ''
     substituteInPlace telegramqml.pro --replace "/\$\$LIB_PATH" ""
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index 0dfda79e767..d602e887f26 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }:
+{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeQtWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   name = "tensor-git-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ qtbase qtquickcontrols ];
-  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+  nativeBuildInputs = [ qmake makeQtWrapper ];
 
   desktopItem = makeDesktopItem {
     name        = "tensor";
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index c521084213e..7b4d52b73c2 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmakeHook, stdenv }:
+{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmake, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "communi-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   buildInputs = [ libcommuni qtbase ];
 
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index d35c2e100e4..ad571888a9c 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qmakeHook, pkgconfig, boost, wirelesstools, iw, qwt6 }:
+{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }:
 
 stdenv.mkDerivation rec {
   name = "linssid-${version}";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
   };
 
-  buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 qmakeHook ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 ];
 
   patches = [ ./0001-unbundled-qwt.patch ];
 
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index fa8ccf60a2a..f08759514c3 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -20,7 +20,7 @@ let
     patches = optional jackSupport ./mumble-jack-support.patch;
 
     nativeBuildInputs = [ pkgconfig python ]
-      ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}"
+      ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}"
       ++ (overrides.nativeBuildInputs or [ ]);
     buildInputs = [ boost protobuf avahi ]
       ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}"
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 2f20710a909..21a55c4136c 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt5, qmakeHook, makeQtWrapper, pkgconfig, sqlite }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, makeQtWrapper, pkgconfig, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb";
   };
 
-  buildInputs = [ qt5.qtbase qt5.qttools qt5.qtwebkit qmakeHook makeQtWrapper pkgconfig sqlite.dev ];
+  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
 
   postInstall = ''
     wrapQtProgram "$out/bin/quiterss"
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index de05555633e..4db6c9dc16b 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, which
-, boost, libtorrentRasterbar, qmakeHook, qt5
+, boost, libtorrentRasterbar, qmake, qtbase, qttools
 , debugSupport ? false # Debugging
 , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
 , webuiSupport ? true # WebUI
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
     sha256 = "0vs626khavhqqnq2hrwrxyc8ihbngharcf1fd37nwccvy13qqljn";
   };
 
-  nativeBuildInputs = [ pkgconfig which ];
+  nativeBuildInputs = [ pkgconfig which qmake ];
 
-  buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ]
+  buildInputs = [ boost libtorrentRasterbar qtbase qttools ]
     ++ optional guiSupport dbus_libs;
 
   preConfigure = ''
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index abff61b881f..1004733a18b 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmakeHook, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
+{ stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
 
 stdenv.mkDerivation rec {
   name = pname + "-" + version;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin";
   };
   buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index b35e60cf2d6..be70cb89d6f 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmakeHook, makeQtWrapper, qtsvg }:
+{ stdenv, fetchurl, qmake, makeQtWrapper, qtsvg }:
 
 let
   version = "1.42.2";
@@ -9,7 +9,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804";
   };
 
-  buildInputs = [ qmakeHook makeQtWrapper qtsvg ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
+  buildInputs = [ qtsvg ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index 838697f1394..b978e644a8e 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmakeHook, pkgconfig
+{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmake, pkgconfig
 , qtbase, qtsvg, qtserialport, boost, libgit2
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
 
   qmakeFlags = [ "phoenix.pro" ];
 
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 580d9f0e76e..a4a08deb8e2 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,19 +1,16 @@
 { stdenv, fetchgit, git,  espeak, SDL, udev, doxygen, cmake
-  , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
-  , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook
-  , makeQtWrapper, lndir
-  , gst_all_1, qt-gstreamer1, pkgconfig, glibc
-  , version ? "2.9.4"
+, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
+, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake
+, makeQtWrapper, lndir
+, gst_all_1, qt-gstreamer1, pkgconfig, glibc
+, version ? "2.9.4"
 }:
 
 stdenv.mkDerivation rec {
   name = "qgroundcontrol-${version}";
-  buildInputs = [
-   SDL udev doxygen git
-  ] ++ gstInputs;
 
   qtInputs = [
-    qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg 
+    qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg
     qtquick1 qtquickcontrols qtgraphicaleffects
   ];
 
@@ -22,9 +19,8 @@ stdenv.mkDerivation rec {
   ];
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [
-    pkgconfig makeQtWrapper qmakeHook
- ] ++ qtInputs;
+  buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs;
+  nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
 
   patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
   postPatch = ''
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index c98e2747989..0995052cfc1 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper
 , libX11, libxcb, mesa
-, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmakeHook
+, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
 , libchardet
 , ffmpeg
 
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
                    ++ optional cddaSupport "--enable-cdda"
                    ;
 
-  nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmake ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 140c8e5863d..d9a38d88f95 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
 qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
 qtgraphicaleffects,
-qmakeHook, makeQtWrapper }:
+qmake, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
@@ -12,10 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr";
   };
 
-  buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit
-    qtx11extras qtwebsockets qtquickcontrols qtgraphicaleffects qmakeHook makeQtWrapper ];
 
   enableParallelBuilding = true;
+  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  buildInputs = [
+    SDL frei0r gettext mlt
+    qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
+    qtgraphicaleffects
+  ];
 
   prePatch = ''
     sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 146cb3b0e46..b7e4fe6b7c6 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmakeHook, qtscript }:
+{ stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
   name = "smplayer-17.6.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtscript ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   dontUseQmakeConfigure = true;
 
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 3f0aff6a15b..b0588796709 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }:
+{ stdenv, fetchurl, qmake, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
   version = "17.5.0";
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   dontUseQmakeConfigure = true;
 
-  buildInputs = [ qmakeHook qtscript qtwebkit ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ qtscript qtwebkit ];
 
   meta = with stdenv.lib; {
     description = "Play and download Youtube videos";
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index 204580b108f..b10495434b9 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit
-, pkgconfig, qtbase, qttools, qmakeHook, qtx11extras, alsaLib, libv4l, libXrandr
+, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr
 , ffmpeg
 }:
 
@@ -11,13 +11,12 @@ stdenv.mkDerivation {
     sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z";
   };
 
+  nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
     alsaLib
     libv4l
-    pkgconfig
     qtbase
     qttools
-    qmakeHook
     qtx11extras
     libXrandr
   ];
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 25a99789af5..36416c6f827 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase
-, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmakeHook }:
+, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmake }:
 
 stdenv.mkDerivation rec {
   version = "0.3.1";
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "14ld7zm15677jdlasnfa6c42kiswd4d6yg1db50xbk2yflzzwqqa";
   };
 
+  nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
-    xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive qmakeHook
+    xcbutilkeysyms qtbase qtimageformats qtwebkit qtx11extras libarchive
   ];
 
   qmakeFlags = [ "PREFIX=/" ];
diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix
index 2c80f5157b6..81ced85d462 100644
--- a/pkgs/desktops/lumina/default.nix
+++ b/pkgs/desktops/lumina/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
-  xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmakeHook, qttools, oxygen-icons5
+  xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools, oxygen-icons5
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmakeHook
+    qmake
     qttools
   ];
 
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index a6d9a9381f9..883d0d65aa5 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmakeHook }:
+{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "accounts-qt-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ glib libaccounts-glib qtbase ];
-  nativeBuildInputs = [ doxygen pkgconfig qmakeHook ];
+  nativeBuildInputs = [ doxygen pkgconfig qmake ];
 
   preConfigure = ''
     qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake"
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 3632fff43bd..2dc9c6577a4 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmakeHook, which
+{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmake, which
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qtdeclarative ];
-  nativeBuildInputs = [ qmakeHook which ];
+  nativeBuildInputs = [ qmake which ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index d95ada04a34..326d9c4f9d7 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, qtbase, qmakeHook }:
+{ stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "libkeyfinder-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     owner = "ibsh";
   };
 
-  buildInputs = [ fftw qtbase qmakeHook ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ fftw qtbase ];
 
   postPatch = ''
     substituteInPlace LibKeyFinder.pro \
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 88d942b9fd7..e8e0aba7a24 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook, qtmultimedia }:
+{ stdenv, fetchgit, qtbase, qtquick1, qmake, qtmultimedia }:
 
 stdenv.mkDerivation rec {
   version = "0.1.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qtquick1 qtmultimedia ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   patchPhase = ''
     substituteInPlace qmltermwidget.pro \
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 928ff5f788b..c2e6c3cb3b5 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip
 , qt4 ? null, qmake4Hook ? null
-, withQt5 ? false, qtbase ? null, qmakeHook ? null
+, withQt5 ? false, qtbase ? null, qmake ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
-  nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmakeHook ] else [ qmake4Hook ]);
+  nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 2dccdd065df..beb80bbd1b1 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -57,7 +57,7 @@ let
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
       nativeBuildInputs =
         (args.nativeBuildInputs or [])
-        ++ [ perl self.qmakeHook ];
+        ++ [ perl self.qmake ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
@@ -127,7 +127,7 @@ let
         { deps = [ makeWrapper ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
-      qmakeHook =
+      qmake =
         makeSetupHook
         { deps = [ self.qtbase.dev ]; }
         (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 5a737441fa8..129858f8ac9 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -48,7 +48,7 @@ let
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
       nativeBuildInputs =
         (args.nativeBuildInputs or [])
-        ++ [ perl self.qmakeHook ];
+        ++ [ perl self.qmake ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
@@ -114,7 +114,7 @@ let
         { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
-      qmakeHook =
+      qmake =
         makeSetupHook
         { deps = [ self.qtbase.dev ]; }
         (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix
index 3379cbc9acf..2fc8a894056 100644
--- a/pkgs/development/libraries/qtinstaller/default.nix
+++ b/pkgs/development/libraries/qtinstaller/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmakeHook }:
+{ stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qtinstaller";
 
-  propagatedBuildInputs = [qtdeclarative qttools];
-  nativeBuildInputs = [ qmakeHook ];
+  propagatedBuildInputs = [ qtdeclarative qttools ];
+  nativeBuildInputs = [ qmake ];
 
   version = "2.0.3";
   src = fetchurl {
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index dc27e2034f1..1be83731f20 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmakeHook, qtbase, pkgconfig, gtk2 }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "qtstyleplugins-2017-03-11";
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy";
   };
 
-  buildInputs = [ qmakeHook pkgconfig gtk2 ];
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ gtk2 ];
 
   installPhase = ''
     make INSTALL_ROOT=$NIX_QT5_TMP install
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index 716e6cb2809..201eb4e7ec9 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmakeHook, qtwebkit, hunspell }:
+{ stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }:
 
 stdenv.mkDerivation {
   name = "qtwebkit-plugins-2015-05-09";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0xyq25l56jgdxgqqv0380brhw9gg0hin5hyrf1j6d3c8k1gka20m";
   };
 
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   buildInputs = [ qtwebkit hunspell ];
 
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 7fbbf27c8eb..4379f5cf667 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zip, zlib, qtbase, qmakeHook }:
+{ fetchurl, stdenv, zip, zlib, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "quazip-0.7.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   preConfigure = "cd quazip";
 
   buildInputs = [ zlib qtbase ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   meta = {
     description = "Provides access to ZIP archives from Qt programs";
diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix
index cd940b818e9..314ab0f9e61 100644
--- a/pkgs/development/libraries/qwt/6.nix
+++ b/pkgs/development/libraries/qwt/6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook }:
+{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qwt-6.1.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ qtbase qtsvg qttools ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   postPatch = ''
     sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 880edfbab07..5d98544da88 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,5 +1,5 @@
 { lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
-, lndir, makeWrapper, qmakeHook }:
+, lndir, makeWrapper, qmake }:
 
 let
   version = "5.8.1";
@@ -21,9 +21,10 @@ in buildPythonPackage {
     sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy";
   };
 
+  nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
+
   buildInputs = [
-    pkgconfig makeWrapper lndir
-    qtbase qtsvg qtwebkit qtwebengine dbus_libs qmakeHook
+    lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs
   ];
 
   propagatedBuildInputs = [ sip ];
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index d82098852cc..df6a7fa5a15 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper
-, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmakeHook
+, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmake
 , withDocumentation ? false
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper makeWrapper ];
+  nativeBuildInputs = [ qmake makeQtWrapper makeWrapper ];
 
   doCheck = true;
 
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 64bb39aaf45..7caac253435 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qmakeHook, makeQtWrapper, qtbase, perl, python, php }:
+{ stdenv, fetchurl, cmake, qmake, makeQtWrapper, qtbase, perl, python, php }:
 
 stdenv.mkDerivation rec {
   name = "qcachegrind-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase perl python php ];
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+  nativeBuildInputs = [ qmake makeQtWrapper ];
 
   postInstall = ''
      mkdir -p $out/bin
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index f1dd86d67b9..e8daca26ef7 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmakeHook, fetchurl }:
+{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }:
 stdenv.mkDerivation rec {
   name = "chessx-${version}";
   version = "1.4.0";
@@ -7,15 +7,13 @@ stdenv.mkDerivation rec {
     sha256 = "1x10c9idj2qks8xk9dy7aw3alc5w7z1kvv6dnahs0428j0sp4a74";
   };
   buildInputs = [
-   stdenv
-   pkgconfig
    qtbase
    qtsvg
    qttools
    qtmultimedia
    zlib
-   qmakeHook
   ];
+  nativeBuildInputs = [ pkgconfig qmake ];
 
   # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm'
   #enableParallelBuilding = true;
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 57610fb1c1c..5be8c7d759e 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmakeHook, texlive }:
+{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }:
 
 stdenv.mkDerivation rec {
   name = "dwarf-therapist-original-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "layouts" ];
   buildInputs = [ qtbase qtdeclarative ];
-  nativeBuildInputs = [ texlive qmakeHook ];
+  nativeBuildInputs = [ texlive qmake ];
 
   enableParallelBuilding = false;
 
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index 99c06e56043..078075931da 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell
-, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmakeHook }:
+, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmake }:
 
 stdenv.mkDerivation rec {
   name = "mudlet-${version}";
@@ -10,9 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7";
   };
 
+  nativeBuildInputs = [ makeWrapper qmake ];
   buildInputs = [
-    unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper
-    luafilesystem luazip lrexlib luasqlite3 qmakeHook
+    unzip qtbase lua5_1 hunspell libzip yajl boost
+    luafilesystem luazip lrexlib luasqlite3
   ];
 
   preConfigure = "cd src";
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index d2bd6ff739f..06a38b29166 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qmakeHook, inkscape, imagemagick, wpa_supplicant }:
+{ stdenv, fetchurl, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
 
 stdenv.mkDerivation {
   name = "wpa_gui-${wpa_supplicant.version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   inherit (wpa_supplicant) src;
 
   buildInputs = [ qtbase ];
-  nativeBuildInputs = [ qmakeHook inkscape imagemagick ];
+  nativeBuildInputs = [ qmake inkscape imagemagick ];
 
   prePatch = ''
     cd wpa_supplicant/wpa_gui-qt4
diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix
index b90adfd5852..41116288e53 100644
--- a/pkgs/tools/misc/ckb/default.nix
+++ b/pkgs/tools/misc/ckb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmakeHook, zlib }:
+{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }:
 
 stdenv.mkDerivation rec {
   version = "0.2.6";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    qmakeHook
+    qmake
   ];
 
   patches = [
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index f6ba699211c..dce2392cc7b 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper }:
+{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0by0wz40rl9gxvwbd85j0y5xy9mjab1cya96rv48x677v95lhm9f";
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ];
+  propagatedBuildInputs = [ qtbase qtsvg qttools ];
+  nativeBuildInputs = [ qmake ];
 
   buildInputs = [ qtbase qtsvg ];
 
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index ab60bd97b35..f07e1d4adc7 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeQtWrapper, libXrandr }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, makeQtWrapper, libXrandr }:
 
 stdenv.mkDerivation rec {
 
   name = "radeon-profile-${version}";
   version = "20161221";
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+  nativeBuildInputs = [ qmake makeQtWrapper ];
   buildInputs = [ qtbase libXrandr ];
 
   src = (fetchFromGitHub {
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 2ec03094f9f..0538dd79508 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libusb1
-, qtbase, qttools, makeQtWrapper, qmakeHook
+, qtbase, qttools, makeQtWrapper, qmake
 , withEspeak ? false, espeak ? null }:
 
 stdenv.mkDerivation  rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation  rec {
 
   buildInputs = [ libusb1 qtbase qttools ]
     ++ stdenv.lib.optional withEspeak espeak;
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
 
   preConfigure = ''
     cd rbutil/rbutilqt
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index e5d404d65e1..8b99182242b 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeWrapper, libX11 }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, makeWrapper, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "cmst-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lsg8ya36df48ij0jawgli3f63hy6mn9zcla48whb1l4r7cih545";
   };
 
-  nativeBuildInputs = [ makeWrapper qmakeHook ];
+  nativeBuildInputs = [ makeWrapper qmake ];
 
   buildInputs = [ qtbase ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ce2a8c3754..d7ba1d6a289 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4049,7 +4049,7 @@ with pkgs;
   };
 
   quazip_qt4 = libsForQt5.quazip.override {
-    qtbase = qt4; qmakeHook = qmake4Hook;
+    qtbase = qt4; qmake = qmake4Hook;
   };
 
   scrot = callPackage ../tools/graphics/scrot { };
@@ -15665,7 +15665,7 @@ with pkgs;
 
   rofi-menugen = callPackage ../applications/misc/rofi-menugen { };
 
-  rstudio = callPackage ../applications/editors/rstudio { };
+  rstudio = libsForQt5.callPackage ../applications/editors/rstudio { };
 
   rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
-- 
GitLab


From 7b6f8dc77f7ba2cc28bdff390f5922befefa8b48 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 10:49:32 -0500
Subject: [PATCH 0870/1490] qt5: move kdeDerivation to qt5.mkDerivation

---
 .../kde/build-support/application.nix         |  9 ++----
 pkgs/applications/kde/default.nix             |  9 +++---
 pkgs/applications/misc/krename/default.nix    |  4 +--
 pkgs/applications/misc/krusader/default.nix   |  5 ++-
 pkgs/applications/misc/yakuake/default.nix    |  4 +--
 .../networking/irc/konversation/default.nix   |  4 +--
 pkgs/build-support/kde/derivation.nix         | 17 ----------
 .../plasma-5/build-support/package.nix        |  4 +--
 pkgs/desktops/plasma-5/default.nix            |  5 +--
 .../build-support/framework.nix               |  4 +--
 .../libraries/kde-frameworks/default.nix      |  5 +--
 .../libraries/qt-5/5.6/default.nix            | 32 ++++++++++++++++---
 .../libraries/qt-5/5.8/default.nix            | 32 ++++++++++++++++---
 pkgs/tools/misc/kronometer/default.nix        |  4 +--
 pkgs/tools/misc/partition-manager/default.nix |  9 +++---
 pkgs/tools/misc/peruse/default.nix            |  4 +--
 pkgs/tools/text/kdiff3/default.nix            |  6 ++--
 pkgs/top-level/all-packages.nix               |  9 ++----
 18 files changed, 93 insertions(+), 73 deletions(-)
 delete mode 100644 pkgs/build-support/kde/derivation.nix

diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix
index 92fdb439330..a5d1ccc3add 100644
--- a/pkgs/applications/kde/build-support/application.nix
+++ b/pkgs/applications/kde/build-support/application.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation, lib, debug, srcs }:
+{ mkDerivation, lib, srcs }:
 
 args:
 
@@ -7,15 +7,10 @@ let
   sname = args.sname or name;
   inherit (srcs."${sname}") src version;
 in
-kdeDerivation (args // {
+mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
-  cmakeFlags =
-    (args.cmakeFlags or [])
-    ++ [ "-DBUILD_TESTING=OFF" ]
-    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
   meta = {
     platforms = lib.platforms.linux;
     homepage = "http://www.kde.org";
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 81c50147cb6..5056cc8725e 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -27,9 +27,7 @@ still shows most of the available features is in `./gwenview.nix`.
 
 {
   stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs,
-  kdeDerivation, plasma5,
-  attica, phonon,
-  debug ? false,
+  plasma5, attica, phonon,
 }:
 
 let
@@ -43,8 +41,9 @@ let
     let
       callPackage = self.newScope {
         kdeApp = import ./build-support/application.nix {
-          inherit lib kdeDerivation;
-          inherit debug srcs;
+          inherit lib;
+          inherit srcs;
+          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
         };
       };
     in {
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index c6baab21ee0..05d1ce1a950 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchFromGitHub, lib,
+  mkDerivation, kdeWrapper, fetchFromGitHub, lib,
   extra-cmake-modules, kdoctools, kconfig, kinit, kjsembed,
   taglib, exiv2, podofo
 }:
@@ -7,7 +7,7 @@
 let
   pname = "krename";
   version = "20170610";
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index c085d916d86..df557f76e73 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchurl, lib,
+  mkDerivation, kdeWrapper, fetchurl, lib,
   extra-cmake-modules, kdoctools,
   kconfig, kinit, kparts
 }:
@@ -7,7 +7,7 @@
 let
   pname = "krusader";
   version = "2.6.0";
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "krusader-${version}";
 
     src = fetchurl {
@@ -24,7 +24,6 @@ let
 
     nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     propagatedBuildInputs = [ kconfig kinit kparts ];
-    enableParallelBuilding = true;
   };
 
 in kdeWrapper {
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index a70b4be287c..7df1c7383c7 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation
+{ mkDerivation
 , lib
 , fetchurl
 , kdoctools
@@ -21,7 +21,7 @@ let
   unwrapped = let
     pname = "yakuake";
     version = "3.0.3";
-  in kdeDerivation rec {
+  in mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 6f4bc2af79f..740f30874bf 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation
+{ mkDerivation
 , lib
 , fetchurl
 , extra-cmake-modules
@@ -31,7 +31,7 @@ let
   unwrapped = let
     pname = "konversation";
     version = "1.6.2";
-  in kdeDerivation rec {
+  in mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
diff --git a/pkgs/build-support/kde/derivation.nix b/pkgs/build-support/kde/derivation.nix
deleted file mode 100644
index 2e29a0a661e..00000000000
--- a/pkgs/build-support/kde/derivation.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, lib, debug ? false }:
-
-args:
-
-stdenv.mkDerivation (args // {
-
-  outputs = args.outputs or [ "out" "dev" ];
-
-  propagatedUserEnvPkgs =
-    builtins.map lib.getBin (args.propagatedBuildInputs or []);
-
-  cmakeFlags =
-    (args.cmakeFlags or [])
-    ++ [ "-DBUILD_TESTING=OFF" ]
-    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-})
diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix
index 1e9ba016c47..64c7934cc23 100644
--- a/pkgs/desktops/plasma-5/build-support/package.nix
+++ b/pkgs/desktops/plasma-5/build-support/package.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation, lib, fetchurl }:
+{ mkDerivation, lib, fetchurl }:
 
 let
   mirror = "mirror://kde";
@@ -12,7 +12,7 @@ let
   sname = args.sname or name;
   inherit (srcs."${sname}") src version;
 in
-kdeDerivation (args // {
+mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 1a8f1ed064b..83d7d39dd86 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -25,7 +25,7 @@ existing packages here and modify it as necessary.
 */
 
 {
-  libsForQt5, kdeDerivation, lib, fetchurl,
+  libsForQt5, lib, fetchurl,
   gconf,
   debug ? false,
 }:
@@ -35,7 +35,8 @@ let
     let
       callPackage = self.newScope {
         plasmaPackage = import ./build-support/package.nix {
-          inherit kdeDerivation lib fetchurl;
+          inherit lib fetchurl;
+          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
         };
       };
     in {
diff --git a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
index 5b6f2cc4b26..04832cf5608 100644
--- a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation, lib, fetchurl }:
+{ mkDerivation, lib, fetchurl }:
 
 let
   mirror = "mirror://kde";
@@ -10,7 +10,7 @@ args:
 let
   inherit (args) name;
   inherit (srcs."${name}") src version;
-in kdeDerivation (args // {
+in mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 221fba628ba..e5a765d7c16 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -24,14 +24,15 @@ existing packages here and modify it as necessary.
 
 */
 
-{ libsForQt5, kdeDerivation, lib, fetchurl }:
+{ libsForQt5, lib, fetchurl }:
 
 let
   packages = self: with self;
     let
       callPackage = self.newScope {
         kdeFramework = import ./build-support/framework.nix {
-          inherit kdeDerivation lib fetchurl;
+          inherit lib fetchurl;
+          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
         };
       };
     in {
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index beb80bbd1b1..586a8d584da 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -33,6 +33,7 @@ existing packages here and modify it as necessary.
   # options
   developerBuild ? false,
   decryptSslTraffic ? false,
+  debug ? null,
 }:
 
 with stdenv.lib;
@@ -44,12 +45,36 @@ let
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
+  mkDerivation = args:
+    stdenv.mkDerivation (args // {
+
+      outputs = args.outputs or [ "out" "dev" ];
+
+      propagatedUserEnvPkgs =
+        (args.propagatedUserEnvPkgs or [])
+        ++ map getBin (args.propagatedBuildInputs or []);
+
+      qmakeFlags =
+        (args.qmakeFlags or [])
+        ++ optional (debug != null)
+           (if debug then "CONFIG+=debug" else "CONFIG+=release");
+
+      cmakeFlags =
+        (args.cmakeFlags or [])
+        ++ [ "-DBUILD_TESTING=OFF" ]
+        ++ optional (debug != null)
+           (if debug then "-DCMAKE_BUILD_TYPE=Debug"
+                     else "-DCMAKE_BUILD_TYPE=Release");
+
+      enableParallelBuilding = args.enableParallelBuilding or true;
+
+    });
+
   qtSubmodule = args:
     let
       inherit (args) name;
       version = args.version or srcs."${name}".version;
       src = args.src or srcs."${name}".src;
-      inherit (stdenv) mkDerivation;
     in mkDerivation (args // {
       name = "${name}-${version}";
       inherit src;
@@ -61,13 +86,10 @@ let
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
-      outputs = args.outputs or [ "out" "dev" ];
       setOutputFlags = args.setOutputFlags or false;
 
       setupHook = ../qtsubmodule-setup-hook.sh;
 
-      enableParallelBuilding = args.enableParallelBuilding or true;
-
       meta = self.qtbase.meta // (args.meta or {});
     });
 
@@ -76,6 +98,8 @@ let
       callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
     in {
 
+      inherit mkDerivation;
+
       qtbase = callPackage ./qtbase {
         inherit bison cups harfbuzz mesa;
         inherit developerBuild decryptSslTraffic;
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 129858f8ac9..399c0415b11 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -24,6 +24,7 @@ top-level attribute to `top-level/all-packages.nix`.
   # options
   developerBuild ? false,
   decryptSslTraffic ? false,
+  debug ? null,
 }:
 
 with stdenv.lib;
@@ -35,12 +36,36 @@ let
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
+  mkDerivation = args:
+    stdenv.mkDerivation (args // {
+
+      outputs = args.outputs or [ "out" "dev" ];
+
+      propagatedUserEnvPkgs =
+        (args.propagatedUserEnvPkgs or [])
+        ++ map getBin (args.propagatedBuildInputs or []);
+
+      qmakeFlags =
+        (args.qmakeFlags or [])
+        ++ optional (debug != null)
+           (if debug then "CONFIG+=debug" else "CONFIG+=release");
+
+      cmakeFlags =
+        (args.cmakeFlags or [])
+        ++ [ "-DBUILD_TESTING=OFF" ]
+        ++ optional (debug != null)
+           (if debug then "-DCMAKE_BUILD_TYPE=Debug"
+                     else "-DCMAKE_BUILD_TYPE=Release");
+
+      enableParallelBuilding = args.enableParallelBuilding or true;
+
+    });
+
   qtSubmodule = args:
     let
       inherit (args) name;
       version = args.version or srcs."${name}".version;
       src = args.src or srcs."${name}".src;
-      inherit (stdenv) mkDerivation;
     in mkDerivation (args // {
       name = "${name}-${version}";
       inherit src;
@@ -52,13 +77,10 @@ let
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
-      outputs = args.outputs or [ "out" "dev" ];
       setOutputFlags = args.setOutputFlags or false;
 
       setupHook = ../qtsubmodule-setup-hook.sh;
 
-      enableParallelBuilding = args.enableParallelBuilding or true;
-
       meta = self.qtbase.meta // (args.meta or {});
     });
 
@@ -67,6 +89,8 @@ let
       callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
     in {
 
+      inherit mkDerivation;
+
       qtbase = callPackage ./qtbase {
         inherit (srcs.qtbase) src version;
         inherit bison cups harfbuzz mesa;
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 5ba2543e273..088d01b882d 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchurl, lib,
+  mkDerivation, kdeWrapper, fetchurl, lib,
   extra-cmake-modules, kdoctools,
   kconfig, kinit
 }:
@@ -7,7 +7,7 @@
 let
   pname = "kronometer";
   version = "2.1.3";
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index dcea9c47aec..ffee286f57f 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,11 +1,11 @@
-{ kdeDerivation, kdeWrapper, fetchurl, lib
-, ecm, kdoctools
+{ mkDerivation, kdeWrapper, fetchurl, lib
+, extra-cmake-modules, kdoctools
 , kconfig, kinit, kpmcore
 , eject, libatasmart }:
 
 let
   pname = "partitionmanager";
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "${pname}-${version}";
     version = "3.0.1";
 
@@ -19,11 +19,10 @@ let
       license = licenses.gpl2;
       maintainers = with maintainers; [ peterhoeg ];
     };
-    nativeBuildInputs = [ ecm kdoctools ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     # refer to kpmcore for the use of eject
     buildInputs = [ eject libatasmart ];
     propagatedBuildInputs = [ kconfig kinit kpmcore ];
-    enableParallelBuilding = true;
   };
 
 in kdeWrapper {
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 1c7a28e2975..5b5cbbf59cf 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
+  mkDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
   extra-cmake-modules, kdoctools,
   baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
@@ -13,7 +13,7 @@ let
     rev    = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
     sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
   };
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index 124855525ac..3263fe09f6f 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,10 +1,10 @@
 {
-  kdeDerivation, kdeWrapper, lib, fetchgit, fetchpatch,
+  mkDerivation, lib, kdeWrapper, fetchgit, fetchpatch,
   extra-cmake-modules, kdoctools, kconfig, kinit, kparts
 }:
 
 let
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "kdiff3-${version}";
     version = "1.7.0-2017-02-19";
 
@@ -34,8 +34,6 @@ let
 
     propagatedBuildInputs = [ kconfig kinit kparts ];
 
-    enableParallelBuilding = true;
-
     meta = with lib; {
       homepage = http://kdiff3.sourceforge.net/;
       license = licenses.gpl2Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7ba1d6a289..d730991ffdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -292,9 +292,6 @@ with pkgs;
       inherit kernel rootModules allowMissing;
     };
 
-  kdeDerivation = makeOverridable (import ../build-support/kde/derivation.nix)
-    { inherit stdenv lib; };
-
   kdeWrapper = callPackage ../build-support/kde/wrapper.nix {
     inherit (gnome3) dconf;
   };
@@ -8233,7 +8230,7 @@ with pkgs;
       mkFrameworks = import ../development/libraries/kde-frameworks;
       attrs = {
         inherit libsForQt5;
-        inherit kdeDerivation lib fetchurl;
+        inherit lib fetchurl;
       };
     in
       recurseIntoAttrs (makeOverridable mkFrameworks attrs);
@@ -14620,7 +14617,7 @@ with pkgs;
       mkApplications = import ../applications/kde;
       attrs = {
         inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
-        inherit kdeDerivation plasma5;
+        inherit plasma5;
         inherit attica phonon;
       };
     in
@@ -17570,7 +17567,7 @@ with pkgs;
     let
       mkPlasma5 = import ../desktops/plasma-5;
       attrs = {
-        inherit libsForQt5 kdeDerivation lib fetchurl;
+        inherit libsForQt5 lib fetchurl;
         inherit (gnome3) gconf;
       };
     in
-- 
GitLab


From 6beea32ab104af7aad43383513682198d2f01430 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 10:49:52 -0500
Subject: [PATCH 0871/1490] kdeApplications: rename kdeApp to mkDerivation

---
 pkgs/applications/editors/kile/default.nix         | 4 ++--
 pkgs/applications/kde/akonadi-contacts.nix         | 4 ++--
 pkgs/applications/kde/akonadi-mime.nix             | 4 ++--
 pkgs/applications/kde/akonadi.nix                  | 4 ++--
 pkgs/applications/kde/ark/default.nix              | 4 ++--
 pkgs/applications/kde/baloo-widgets.nix            | 4 ++--
 pkgs/applications/kde/default.nix                  | 2 +-
 pkgs/applications/kde/dolphin-plugins.nix          | 4 ++--
 pkgs/applications/kde/dolphin.nix                  | 4 ++--
 pkgs/applications/kde/ffmpegthumbs.nix             | 4 ++--
 pkgs/applications/kde/filelight.nix                | 4 ++--
 pkgs/applications/kde/gwenview.nix                 | 4 ++--
 pkgs/applications/kde/k3b.nix                      | 4 ++--
 pkgs/applications/kde/kate.nix                     | 4 ++--
 pkgs/applications/kde/kcachegrind.nix              | 4 ++--
 pkgs/applications/kde/kcalc.nix                    | 4 ++--
 pkgs/applications/kde/kcolorchooser.nix            | 4 ++--
 pkgs/applications/kde/kcontacts.nix                | 4 ++--
 pkgs/applications/kde/kde-locale-4.nix             | 4 ++--
 pkgs/applications/kde/kde-locale-5.nix             | 4 ++--
 pkgs/applications/kde/kdegraphics-mobipocket.nix   | 4 ++--
 pkgs/applications/kde/kdegraphics-thumbnailers.nix | 4 ++--
 pkgs/applications/kde/kdelibs/default.nix          | 4 ++--
 pkgs/applications/kde/kdenetwork-filesharing.nix   | 4 ++--
 pkgs/applications/kde/kdenlive.nix                 | 4 ++--
 pkgs/applications/kde/kdf.nix                      | 4 ++--
 pkgs/applications/kde/kgpg.nix                     | 4 ++--
 pkgs/applications/kde/khelpcenter.nix              | 4 ++--
 pkgs/applications/kde/kig.nix                      | 8 ++++----
 pkgs/applications/kde/kio-extras.nix               | 4 ++--
 pkgs/applications/kde/kmime.nix                    | 4 ++--
 pkgs/applications/kde/kmix.nix                     | 4 ++--
 pkgs/applications/kde/kolourpaint.nix              | 6 +++---
 pkgs/applications/kde/kompare.nix                  | 4 ++--
 pkgs/applications/kde/konsole.nix                  | 4 ++--
 pkgs/applications/kde/krfb.nix                     | 4 ++--
 pkgs/applications/kde/kwalletmanager.nix           | 4 ++--
 pkgs/applications/kde/libkcddb.nix                 | 5 ++---
 pkgs/applications/kde/libkdcraw.nix                | 4 ++--
 pkgs/applications/kde/libkexiv2.nix                | 4 ++--
 pkgs/applications/kde/libkipi.nix                  | 4 ++--
 pkgs/applications/kde/libkomparediff2.nix          | 4 ++--
 pkgs/applications/kde/marble.nix                   | 4 ++--
 pkgs/applications/kde/okteta.nix                   | 4 ++--
 pkgs/applications/kde/okular.nix                   | 4 ++--
 pkgs/applications/kde/print-manager.nix            | 4 ++--
 pkgs/applications/kde/spectacle.nix                | 4 ++--
 47 files changed, 96 insertions(+), 97 deletions(-)

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index fa8d4d8313e..3834269f180 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation
+{ mkDerivation
 , lib
 , fetchgit
 , extra-cmake-modules
@@ -23,7 +23,7 @@
 
 let
   unwrapped =
-    kdeDerivation rec {
+    mkDerivation rec {
       name = "kile-${version}";
       version = "2017-02-09";
 
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index 830c9e6899e..7d017f6496f 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
@@ -1,11 +1,11 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
   akonadi
 }:
 
-kdeApp {
+mkDerivation {
   name = "akonadi-contacts";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 ];
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index ba4b4b50242..390ef373528 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   akonadi, kdbusaddons, kio, kitemmodels, kmime
 }:
 
-kdeApp {
+mkDerivation {
   name = "akonadi-mime";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 ];
diff --git a/pkgs/applications/kde/akonadi.nix b/pkgs/applications/kde/akonadi.nix
index 284ed60a9cb..367fdd36fb8 100644
--- a/pkgs/applications/kde/akonadi.nix
+++ b/pkgs/applications/kde/akonadi.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
   kio,
   boost, kitemmodels
 }:
 
-kdeApp {
+mkDerivation {
   name = "akonadi";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 52cb403f202..d7a6ee2bdc7 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, config, kdeWrapper,
+  mkDerivation, lib, config, kdeWrapper,
 
   extra-cmake-modules, kdoctools, makeWrapper,
 
@@ -15,7 +15,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "ark";
       nativeBuildInputs = [
         extra-cmake-modules kdoctools makeWrapper
diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix
index bb680305709..17ae75cc479 100644
--- a/pkgs/applications/kde/baloo-widgets.nix
+++ b/pkgs/applications/kde/baloo-widgets.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice
 }:
 
-kdeApp {
+mkDerivation {
   name = "baloo-widgets";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5056cc8725e..931132cf428 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -40,7 +40,7 @@ let
   packages = self: with self;
     let
       callPackage = self.newScope {
-        kdeApp = import ./build-support/application.nix {
+        mkDerivation = import ./build-support/application.nix {
           inherit lib;
           inherit srcs;
           mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
index 7f436c7a55a..670b040f79f 100644
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ b/pkgs/applications/kde/dolphin-plugins.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   dolphin, kdelibs4support, ki18n, kio, kxmlgui
 }:
 
-kdeApp {
+mkDerivation {
   name = "dolphin-plugins";
   meta = {
     license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 6515c230c28..746afa2732d 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools, makeQtWrapper,
   baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
   kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "dolphin";
       meta = {
         license = with lib.licenses; [ gpl2 fdl12 ];
diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix
index 5dde6d8a64e..4e915422d14 100644
--- a/pkgs/applications/kde/ffmpegthumbs.nix
+++ b/pkgs/applications/kde/ffmpegthumbs.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   ffmpeg, kio
 }:
 
-kdeApp {
+mkDerivation {
   name = "ffmpegthumbs";
   meta = {
     license = with lib.licenses; [ gpl2 bsd3 ];
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index 71ab51320ab..c09b5f5106a 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kio, kparts, kxmlgui, qtscript, solid
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "filelight";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 0fa06ed0fbe..19b2fd751f7 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
   libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "gwenview";
       meta = {
         license = with lib.licenses; [ gpl2 fdl12 ];
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index d1cd33a5208..c21ce4a3e18 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,4 +1,4 @@
-{ kdeApp, lib, kdeWrapper, extra-cmake-modules
+{ mkDerivation, lib, kdeWrapper, extra-cmake-modules
 , qtwebkit
 , libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "k3b";
       meta = with lib; {
         license = with licenses; [ gpl2Plus ];
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index cd320afd8d3..7a138afb8ed 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kate";
       meta = {
         license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index d43de1fdc36..fd5c4502c9d 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kio, ki18n,
   perl, python, php
 }:
 
 kdeWrapper {
-  unwrapped = kdeApp {
+  unwrapped = mkDerivation {
     name = "kcachegrind";
     meta = {
       license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 8ec7591460e..6ce0722d3e4 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kcalc";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index c1266009b68..f910b99f603 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -1,11 +1,11 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kcolorchooser";
       meta = {
         license = with lib.licenses; [ mit ];
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index 5143df60ef4..d49ba125474 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, ki18n,
   kcoreaddons, kconfig, kcodecs
 }:
 
-kdeApp {
+mkDerivation {
   name = "kcontacts";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix
index e83794c60d8..daf0a55b19e 100644
--- a/pkgs/applications/kde/kde-locale-4.nix
+++ b/pkgs/applications/kde/kde-locale-4.nix
@@ -1,8 +1,8 @@
 name: args:
 
-{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }:
+{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }:
 
-kdeApp (args // {
+mkDerivation (args // {
   sname = "kde-l10n-${name}";
   name = "kde-l10n-${name}-qt4";
 
diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix
index 772ebe37e44..76d601cbdc0 100644
--- a/pkgs/applications/kde/kde-locale-5.nix
+++ b/pkgs/applications/kde/kde-locale-5.nix
@@ -1,8 +1,8 @@
 name: args:
 
-{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
+{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }:
 
-kdeApp (args // {
+mkDerivation (args // {
   sname = "kde-l10n-${name}";
   name = "kde-l10n-${name}-qt5";
 
diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix
index e50c92f8884..09f761df851 100644
--- a/pkgs/applications/kde/kdegraphics-mobipocket.nix
+++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   kio
 }:
 
-kdeApp {
+mkDerivation {
   name = "kdegraphics-mobipocket";
   meta = {
     license = [ lib.licenses.gpl2Plus ];
diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
index 5aa974a9c96..3302681bd85 100644
--- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix
+++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
@@ -1,9 +1,9 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, kio, libkexiv2, libkdcraw
 }:
 
-kdeApp {
+mkDerivation {
   name = "kdegraphics-thumbnailers";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
index cae1b9b7e7f..e3abe89eade 100644
--- a/pkgs/applications/kde/kdelibs/default.nix
+++ b/pkgs/applications/kde/kdelibs/default.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
   attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
   libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
   shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch
 }:
 
-kdeApp {
+mkDerivation {
   name = "kdelibs";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix
index 20f81563c3b..62176f3f3bb 100644
--- a/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ b/pkgs/applications/kde/kdenetwork-filesharing.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   kcoreaddons, ki18n, kio, kwidgetsaddons, samba
 }:
 
-kdeApp {
+mkDerivation {
   name = "kdenetwork-filesharing";
   meta = {
     license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index e543a3d84bf..4e59e12e8fd 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -1,4 +1,4 @@
-{ kdeApp
+{ mkDerivation
 , kdeWrapper
 , lib
 , extra-cmake-modules
@@ -32,7 +32,7 @@
 }:
 
 let
-unwrapped = kdeApp {
+unwrapped = mkDerivation {
   name = "kdenlive";
   patches = [
     ./kdenlive-cmake-concurrent-module.patch
diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
index 97e74eb2e12..aaeac0161f5 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kcmutils
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kdf";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index 58e9cb0d1e9..5b462c2712f 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, makeQtWrapper,
+  mkDerivation, lib, makeQtWrapper,
   extra-cmake-modules, kdoctools, ki18n,
   akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
   kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
   ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
 }:
 
-kdeApp {
+mkDerivation {
   name = "kgpg";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ];
   buildInputs = [
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index 0579faa72a0..e88bef4c652 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, kdeWrapper,
+  mkDerivation, kdeWrapper,
   extra-cmake-modules, kdoctools,
   grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
   kdelibs4support, khtml, kservice, xapian
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "khelpcenter";
       nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       buildInputs = [
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 9f38079316f..03229f9a150 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper
-  , extra-cmake-modules, kdoctools, kparts
-  , qtsvg, qtxmlpatterns, ktexteditor, boost
+  mkDerivation, lib, kdeWrapper,
+  extra-cmake-modules, kdoctools,
+  kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kig";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index 77f795167fc..50709a7ddef 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, extra-cmake-modules, kdoctools, shared_mime_info,
+  mkDerivation, lib, extra-cmake-modules, kdoctools, shared_mime_info,
   exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
   kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
   kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
   qtsvg, samba, solid
 }:
 
-kdeApp {
+mkDerivation {
   name = "kio-extras";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 ];
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index c17b3fdcd8e..5bd8762391c 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, ki18n,
   kcodecs
 }:
 
-kdeApp {
+mkDerivation {
   name = "kmime";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index 6ab653cfce0..483983571dd 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
   plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kmix";
       meta = {
         license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
index 75d5b6fca65..bdfeb233af3 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -1,5 +1,5 @@
 { lib
-, kdeApp
+, mkDerivation
 , kdeWrapper
 , extra-cmake-modules
 , kdoctools
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kolourpaint";
       nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
@@ -25,4 +25,4 @@ let
 in kdeWrapper {
   inherit unwrapped;
   targets = ["bin/kolourpaint"];
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index 660090dc84a..c14f15707aa 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kompare";
       meta = { license = with lib.licenses; [ gpl2 ]; };
       nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 15b6373bdb0..4eb45c74480 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "konsole";
       meta = {
         license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index ef5530be6fa..3ad7b436dbc 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kdelibs4support, kdnssd, libvncserver, libXtst
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "krfb";
       meta = {
         license = with lib.licenses; [ gpl2 fdl12 ];
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index afa870d90a5..efdcac650bb 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -1,5 +1,5 @@
 { lib
-, kdeApp
+, mkDerivation
 , kdeWrapper
 , extra-cmake-modules
 , kdoctools
@@ -13,7 +13,7 @@
 }:
 
 let
-  unwrapped = kdeApp {
+  unwrapped = mkDerivation {
     name = "kwalletmanager";
     meta = {
       license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix
index 3d05714e824..edd9732d051 100644
--- a/pkgs/applications/kde/libkcddb.nix
+++ b/pkgs/applications/kde/libkcddb.nix
@@ -1,8 +1,8 @@
-{ kdeApp, lib, extra-cmake-modules, qtbase, kdoctools
+{ mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools
 , kcodecs, ki18n, kio, kwidgetsaddons
 , libmusicbrainz5 }:
 
-kdeApp {
+mkDerivation {
   name = "libkcddb";
   meta = with lib; {
     license = with licenses; [ gpl2 lgpl21 bsd3 ];
@@ -14,5 +14,4 @@ kdeApp {
     kcodecs ki18n kio kwidgetsaddons
     libmusicbrainz5
   ];
-  enableParallelBuilding = true;
 }
diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix
index 179e9f414dc..383bd3b6703 100644
--- a/pkgs/applications/kde/libkdcraw.nix
+++ b/pkgs/applications/kde/libkdcraw.nix
@@ -1,6 +1,6 @@
-{ kdeApp, lib, extra-cmake-modules, libraw, qtbase }:
+{ mkDerivation, lib, extra-cmake-modules, libraw, qtbase }:
 
-kdeApp {
+mkDerivation {
   name = "libkdcraw";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix
index 0991c5df5ab..816d4168967 100644
--- a/pkgs/applications/kde/libkexiv2.nix
+++ b/pkgs/applications/kde/libkexiv2.nix
@@ -1,6 +1,6 @@
-{ kdeApp, lib, exiv2, extra-cmake-modules, qtbase }:
+{ mkDerivation, lib, exiv2, extra-cmake-modules, qtbase }:
 
-kdeApp {
+mkDerivation {
   name = "libkexiv2";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix
index 32eeb171ff8..3a28d8c2e8c 100644
--- a/pkgs/applications/kde/libkipi.nix
+++ b/pkgs/applications/kde/libkipi.nix
@@ -1,6 +1,6 @@
-{ kdeApp, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }:
+{ mkDerivation, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }:
 
-kdeApp {
+mkDerivation {
   name = "libkipi";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix
index aacc89a0efe..52aa2b10e24 100644
--- a/pkgs/applications/kde/libkomparediff2.nix
+++ b/pkgs/applications/kde/libkomparediff2.nix
@@ -1,6 +1,6 @@
-{ kdeApp, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
+{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
 
-kdeApp {
+mkDerivation {
   name = "libkomparediff2";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ];
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index 5322c66b01d..eb059a1b398 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,4 +1,4 @@
-{ kdeApp, lib, kdeWrapper
+{ mkDerivation, lib, kdeWrapper
 , extra-cmake-modules, kdoctools
 , qtscript, qtsvg, qtquickcontrols, qtwebkit
 , krunner, shared_mime_info, kparts, knewstuff
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "marble";
       meta.license = with lib.licenses; [ lgpl21 gpl3 ];
 
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 59520e28532..7fb4ffb7693 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kconfig, kinit,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "okteta";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index f5b3e38ca7c..3bed7454f42 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
@@ -8,7 +8,7 @@
 }:
 
 let
-  unwrapped = kdeApp {
+  unwrapped = mkDerivation {
     name = "okular";
     nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     propagatedBuildInputs = [
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index 0a3d311eb27..a2589f46bba 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -1,11 +1,11 @@
 {
-  kdeApp, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
   knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
   qtdeclarative
 }:
 
-kdeApp {
+mkDerivation {
   name = "print-manager";
   meta = {
     license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 30abfc23e83..a0c5ef58c9b 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
@@ -8,7 +8,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "spectacle";
       meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
       nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-- 
GitLab


From eaa644a5af59b1967fb464a61316a1004cb5e888 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 15 May 2017 11:44:58 -0500
Subject: [PATCH 0872/1490] plasma5: rename plasmaPackage to mkDerivation

---
 pkgs/desktops/plasma-5/bluedevil.nix          |  4 +--
 pkgs/desktops/plasma-5/breeze-grub.nix        |  4 +--
 pkgs/desktops/plasma-5/breeze-gtk.nix         |  7 ++---
 .../plasma-5/breeze-plymouth/default.nix      |  4 +--
 pkgs/desktops/plasma-5/breeze-qt4.nix         |  4 +--
 pkgs/desktops/plasma-5/breeze-qt5.nix         |  4 +--
 .../plasma-5/build-support/package.nix        | 27 ----------------
 pkgs/desktops/plasma-5/default.nix            | 31 ++++++++++++++++---
 pkgs/desktops/plasma-5/kactivitymanagerd.nix  |  4 +--
 pkgs/desktops/plasma-5/kde-cli-tools.nix      |  4 +--
 .../plasma-5/kde-gtk-config/default.nix       |  4 +--
 pkgs/desktops/plasma-5/kdecoration.nix        |  4 +--
 pkgs/desktops/plasma-5/kdeplasma-addons.nix   |  9 ++----
 pkgs/desktops/plasma-5/kgamma5.nix            |  4 +--
 pkgs/desktops/plasma-5/khotkeys.nix           |  4 +--
 pkgs/desktops/plasma-5/kinfocenter.nix        |  4 +--
 pkgs/desktops/plasma-5/kmenuedit.nix          |  4 +--
 pkgs/desktops/plasma-5/kscreen.nix            |  4 +--
 pkgs/desktops/plasma-5/kscreenlocker.nix      |  4 +--
 pkgs/desktops/plasma-5/ksshaskpass.nix        |  4 +--
 pkgs/desktops/plasma-5/ksysguard.nix          |  4 +--
 pkgs/desktops/plasma-5/kwallet-pam.nix        |  5 ++-
 .../plasma-5/kwayland-integration.nix         | 17 +++-------
 pkgs/desktops/plasma-5/kwin/default.nix       |  4 +--
 pkgs/desktops/plasma-5/kwrited.nix            |  4 +--
 pkgs/desktops/plasma-5/libkscreen/default.nix | 12 +++----
 .../plasma-5/libksysguard/default.nix         |  4 +--
 pkgs/desktops/plasma-5/milou.nix              |  4 +--
 pkgs/desktops/plasma-5/oxygen.nix             |  4 +--
 .../plasma-5/plasma-desktop/default.nix       |  4 +--
 pkgs/desktops/plasma-5/plasma-integration.nix |  4 +--
 pkgs/desktops/plasma-5/plasma-nm/default.nix  |  5 ++-
 pkgs/desktops/plasma-5/plasma-pa.nix          |  8 ++---
 .../plasma-5/plasma-workspace-wallpapers.nix  |  4 +--
 .../plasma-5/plasma-workspace/default.nix     |  4 +--
 pkgs/desktops/plasma-5/polkit-kde-agent.nix   |  4 +--
 pkgs/desktops/plasma-5/powerdevil.nix         |  4 +--
 pkgs/desktops/plasma-5/systemsettings.nix     |  6 ++--
 38 files changed, 106 insertions(+), 133 deletions(-)
 delete mode 100644 pkgs/desktops/plasma-5/build-support/package.nix

diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index d0e78499813..6db3e787911 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, extra-cmake-modules, shared_mime_info,
+  mkDerivation, extra-cmake-modules, shared_mime_info,
   bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
   knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "bluedevil";
   nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix
index da0fb6f73ad..e8ac5c1e208 100644
--- a/pkgs/desktops/plasma-5/breeze-grub.nix
+++ b/pkgs/desktops/plasma-5/breeze-grub.nix
@@ -1,8 +1,8 @@
 {
-  plasmaPackage
+  mkDerivation
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-grub";
   outputs = [ "out" ];
   installPhase = ''
diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index 4048d98431d..9c204e3acb8 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -1,9 +1,6 @@
-{ plasmaPackage
-, extra-cmake-modules
-, qtbase
-}:
+{ mkDerivation , extra-cmake-modules , qtbase }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-gtk";
   nativeBuildInputs = [ extra-cmake-modules ];
   cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ];
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index dfbdf48165a..898d9cd78a5 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
   plymouth
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-plymouth";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ plymouth ];
diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix
index adcc6110c4d..6c9d0c5c4ce 100644
--- a/pkgs/desktops/plasma-5/breeze-qt4.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt4.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, lib,
+  mkDerivation, lib,
   automoc4, cmake, perl, pkgconfig,
   kdelibs4, qt4, xproto
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-qt4";
   sname = "breeze";
   buildInputs = [ kdelibs4 qt4 xproto ];
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index a1b64a4656c..11af6fff04b 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -1,11 +1,11 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
   kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-qt5";
   sname = "breeze";
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix
deleted file mode 100644
index 64c7934cc23..00000000000
--- a/pkgs/desktops/plasma-5/build-support/package.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, lib, fetchurl }:
-
-let
-  mirror = "mirror://kde";
-  srcs = import ../srcs.nix { inherit fetchurl mirror; };
-in
-
-args:
-
-let
-  inherit (args) name;
-  sname = args.sname or name;
-  inherit (srcs."${sname}") src version;
-in
-mkDerivation (args // {
-  name = "${name}-${version}";
-  inherit src;
-
-  meta = {
-    license = with lib.licenses; [
-      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-    ];
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ttuegel ];
-    homepage = "http://www.kde.org";
-  } // (args.meta or {});
-})
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 83d7d39dd86..10d5a152f13 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -31,13 +31,36 @@ existing packages here and modify it as necessary.
 }:
 
 let
+  srcs = import ./srcs.nix {
+    inherit fetchurl;
+    mirror = "mirror://kde";
+  };
+
   packages = self: with self;
     let
       callPackage = self.newScope {
-        plasmaPackage = import ./build-support/package.nix {
-          inherit lib fetchurl;
-          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
-        };
+        mkDerivation = args:
+          let
+            inherit (args) name;
+            sname = args.sname or name;
+            inherit (srcs."${sname}") src version;
+            mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+          in
+          mkDerivation (args // {
+            name = "${name}-${version}";
+            inherit src;
+
+            outputs = args.outputs or [ "out" "dev" ];
+
+            meta = {
+              license = with lib.licenses; [
+                lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+              ];
+              platforms = lib.platforms.linux;
+              maintainers = with lib.maintainers; [ ttuegel ];
+              homepage = "http://www.kde.org";
+            } // (args.meta or {});
+          });
       };
     in {
       bluedevil = callPackage ./bluedevil.nix {};
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index 282e58ecf9e..27f977ea785 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -1,10 +1,10 @@
-{ plasmaPackage
+{ mkDerivation
 , extra-cmake-modules
 , boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel
 , kwindowsystem, kxmlgui
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kactivitymanagerd";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
index 87a46703997..e18481d6da9 100644
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, extra-cmake-modules,
+  mkDerivation, extra-cmake-modules,
   kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
   kwindowsystem, qtsvg, qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index f482f2a6a3f..eaa2a906f82 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage
+{ mkDerivation
 , extra-cmake-modules
 , glib
 , gtk2
@@ -12,7 +12,7 @@
 , knewstuff
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index 546f72c3f38..9efdb8cff81 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -1,6 +1,6 @@
-{ plasmaPackage, extra-cmake-modules, qtbase }:
+{ mkDerivation, extra-cmake-modules, qtbase }:
 
-plasmaPackage {
+mkDerivation {
   name = "kdecoration";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index 3371e17beaf..e3526d56c37 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,16 +1,13 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools
+{ mkDerivation, extra-cmake-modules, kdoctools
 , kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
 , kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
 , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
 , ibus
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kdeplasma-addons";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
     kross krunner kservice ksysguard kunitconversion plasma-framework
diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
index 965c33e6eef..8199b5d0330 100644
--- a/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/pkgs/desktops/plasma-5/kgamma5.nix
@@ -1,8 +1,8 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
+{ mkDerivation, extra-cmake-modules, kdoctools, kdelibs4support
 , qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kgamma5";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kdelibs4support qtx11extras ];
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index 2b02e5916b9..32d9c14ddef 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -1,10 +1,10 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+{ mkDerivation, extra-cmake-modules, kdoctools, kcmutils
 , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
 , plasma-framework, plasma-workspace, qtx11extras
 , fetchpatch
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
index b4c8dc99adc..ee6aa6aebda 100644
--- a/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
   kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice,
   kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kinfocenter";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
index a27dc5dd92a..164c378a60d 100644
--- a/pkgs/desktops/plasma-5/kmenuedit.nix
+++ b/pkgs/desktops/plasma-5/kmenuedit.nix
@@ -1,11 +1,11 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui,
   sonnet
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kmenuedit";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index e0fbea5d746..93dd0e71050 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
+{ mkDerivation, extra-cmake-modules, kconfig, kconfigwidgets
 , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
 , libkscreen, qtdeclarative, qtgraphicaleffects
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kscreen";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index 3551feab76f..64ea4690513 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -1,11 +1,11 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
   kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kscreenlocker";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
index f1a6b82ae93..94bc5a35da0 100644
--- a/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5/ksshaskpass.nix
@@ -1,8 +1,8 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
+{ mkDerivation, extra-cmake-modules, kdoctools, kcoreaddons
 , ki18n, kwallet, kwidgetsaddons
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "ksshaskpass";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index 366b154cae7..63aeda685ba 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   lm_sensors,
   kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
   knewstuff, libksysguard, qtwebkit
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "ksysguard";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ lm_sensors ];
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index 2789499c50a..b7a783f82a3 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -1,7 +1,6 @@
-{ plasmaPackage, extra-cmake-modules, pam, socat, libgcrypt
-}:
+{ mkDerivation, extra-cmake-modules, pam, socat, libgcrypt }:
 
-plasmaPackage {
+mkDerivation {
   name = "kwallet-pam";
 
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
index 9045227a51a..e5d00eb0800 100644
--- a/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/pkgs/desktops/plasma-5/kwayland-integration.nix
@@ -1,16 +1,7 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kidletime
-, kwayland
-, kwindowsystem
-}:
+{ mkDerivation , extra-cmake-modules , kidletime , kwayland , kwindowsystem }:
 
-plasmaPackage {
+mkDerivation {
   name = "kwayland-integration";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    kidletime kwindowsystem kwayland
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ kidletime kwindowsystem kwayland ];
 }
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index a14b6433a76..ab8cc4d2498 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,5 +1,5 @@
 {
-  plasmaPackage, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig,
   kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel,
@@ -10,7 +10,7 @@
   xcb-util-cursor, xwayland
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kwin";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
index 29498e93404..18c4a4af8db 100644
--- a/pkgs/desktops/plasma-5/kwrited.nix
+++ b/pkgs/desktops/plasma-5/kwrited.nix
@@ -1,8 +1,8 @@
-{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
+{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty
 , knotifications, kdbusaddons
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kwrited";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index 6881f95e6d5..82a254c3a37 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -1,17 +1,13 @@
-{ plasmaPackage, lib, copyPathsToStore
+{ mkDerivation, lib, copyPathsToStore
 , extra-cmake-modules
 , kwayland, libXrandr
 , qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "libkscreen";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    kwayland libXrandr qtx11extras
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ kwayland libXrandr qtx11extras ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/$qtPluginPrefix/kf5/kscreen\""
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index b67e041a782..e7cdf28a728 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules,
   kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
   kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
   qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "libksysguard";
   patches = [
     ./0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index 43f78d9e2a9..abc35279aba 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
+{ mkDerivation, extra-cmake-modules, qtscript, qtdeclarative
 , kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
 , krunner
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "milou";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index b4ff775264f..c50fd8b0514 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage, kdeWrapper,
+  mkDerivation, kdeWrapper,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
   ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
 }:
 
 let
-  unwrapped = plasmaPackage {
+  unwrapped = mkDerivation {
     name = "oxygen";
     nativeBuildInputs = [ extra-cmake-modules ];
     propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 1c152500b6a..a1ccaea6ea3 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -1,5 +1,5 @@
 {
-  plasmaPackage, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
   kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
@@ -12,7 +12,7 @@
   utillinux
 }:
 
-plasmaPackage rec {
+mkDerivation rec {
   name = "plasma-desktop";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix
index 97d30dcd773..2bca3943c34 100644
--- a/pkgs/desktops/plasma-5/plasma-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration.nix
@@ -1,11 +1,11 @@
-{ plasmaPackage, extra-cmake-modules
+{ mkDerivation, extra-cmake-modules
 , breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
 , libXcursor
 }:
 
 # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-integration";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 736d59b4041..5c343548fcf 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
+{ mkDerivation, substituteAll, extra-cmake-modules, kdoctools
 , kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
 , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
@@ -7,7 +7,7 @@
 , qca-qt5, qtdeclarative, solid, openvpn
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-nm";
   patches = [
     (substituteAll {
@@ -27,5 +27,4 @@ plasmaPackage {
     mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
     qca-qt5 solid
   ];
-  enableParallelBuilding = true;
 }
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index f398e1a9efc..ec40ffb9630 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,15 +1,13 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules,
   gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
   ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-pa";
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     gconf glib kconfigwidgets kcoreaddons kdeclarative
     kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework
diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index 8af9caaa579..fb0830eb59a 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
@@ -1,8 +1,8 @@
-{ plasmaPackage
+{ mkDerivation
 , extra-cmake-modules
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-workspace-wallpapers";
   outputs = [ "out" ];
   nativeBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 8759c7d8c1e..175a80fcb4c 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -1,5 +1,5 @@
 {
-  plasmaPackage, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
 
   extra-cmake-modules, kdoctools,
 
@@ -12,7 +12,7 @@
   libXcursor, pam, wayland
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-workspace";
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
index 1d7d20a7ffb..bd3e5d6e1f4 100644
--- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, extra-cmake-modules,
+  mkDerivation, extra-cmake-modules,
   kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
   kwidgetsaddons, kwindowsystem, polkit-qt
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "polkit-kde-agent";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
index c3469cc2ebc..4660efd66ab 100644
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
@@ -1,10 +1,10 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities
+{ mkDerivation, extra-cmake-modules, kdoctools, bluez-qt, kactivities
 , kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
 , kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
 , plasma-workspace, qtx11extras, solid, udev
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "powerdevil";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 4146e34c2f7..5ada154f77d 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage, extra-cmake-modules, kdoctools, makeQtWrapper,
+  mkDerivation, extra-cmake-modules, kdoctools, makeQtWrapper,
   kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
   kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "systemsettings";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
     kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
-- 
GitLab


From 945758f96030ee7762ccdab32a3ffddd028b37b6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 15 May 2017 12:05:35 -0500
Subject: [PATCH 0873/1490] kdeFrameworks: rename kdeFramework to mkDerivation

---
 .../libraries/kde-frameworks/attica.nix       |  4 +-
 .../libraries/kde-frameworks/baloo.nix        |  4 +-
 .../libraries/kde-frameworks/bluez-qt.nix     |  4 +-
 .../libraries/kde-frameworks/breeze-icons.nix |  4 +-
 .../build-support/framework.nix               | 24 -------
 .../libraries/kde-frameworks/default.nix      | 62 +++++++++++++++++--
 .../extra-cmake-modules/default.nix           |  4 +-
 .../kde-frameworks/frameworkintegration.nix   |  4 +-
 .../kde-frameworks/kactivities-stats.nix      |  4 +-
 .../libraries/kde-frameworks/kactivities.nix  |  4 +-
 .../libraries/kde-frameworks/kapidox.nix      |  4 +-
 .../libraries/kde-frameworks/karchive.nix     |  4 +-
 .../kde-frameworks/kauth/default.nix          |  7 ++-
 .../libraries/kde-frameworks/kbookmarks.nix   |  4 +-
 .../kde-frameworks/kcmutils/default.nix       | 10 +--
 .../libraries/kde-frameworks/kcodecs.nix      |  4 +-
 .../libraries/kde-frameworks/kcompletion.nix  | 11 ++--
 .../libraries/kde-frameworks/kconfig.nix      |  6 +-
 .../kde-frameworks/kconfigwidgets/default.nix |  4 +-
 .../libraries/kde-frameworks/kcoreaddons.nix  |  7 +--
 .../libraries/kde-frameworks/kcrash.nix       |  4 +-
 .../libraries/kde-frameworks/kdbusaddons.nix  |  4 +-
 .../libraries/kde-frameworks/kdeclarative.nix |  4 +-
 .../libraries/kde-frameworks/kded.nix         |  4 +-
 .../kdelibs4support/default.nix               | 21 +++----
 .../kde-frameworks/kdesignerplugin.nix        | 22 ++-----
 .../libraries/kde-frameworks/kdesu.nix        |  4 +-
 .../libraries/kde-frameworks/kdnssd.nix       | 12 ++--
 .../kde-frameworks/kdoctools/default.nix      |  8 ++-
 .../libraries/kde-frameworks/kemoticons.nix   | 12 ++--
 .../kde-frameworks/kfilemetadata/default.nix  |  8 ++-
 .../libraries/kde-frameworks/kglobalaccel.nix |  5 +-
 .../libraries/kde-frameworks/kguiaddons.nix   |  4 +-
 .../libraries/kde-frameworks/khtml.nix        | 12 ++--
 .../libraries/kde-frameworks/ki18n.nix        |  4 +-
 .../kde-frameworks/kiconthemes/default.nix    |  9 +--
 .../libraries/kde-frameworks/kidletime.nix    | 10 +--
 .../kde-frameworks/kimageformats.nix          |  4 +-
 .../kde-frameworks/kinit/default.nix          |  9 ++-
 .../libraries/kde-frameworks/kio/default.nix  | 16 ++---
 .../libraries/kde-frameworks/kitemmodels.nix  | 10 +--
 .../libraries/kde-frameworks/kitemviews.nix   | 10 +--
 .../libraries/kde-frameworks/kjobwidgets.nix  | 11 ++--
 .../libraries/kde-frameworks/kjs.nix          |  8 +--
 .../libraries/kde-frameworks/kjsembed.nix     |  5 +-
 .../libraries/kde-frameworks/kmediaplayer.nix |  4 +-
 .../libraries/kde-frameworks/knewstuff.nix    |  4 +-
 .../kde-frameworks/knotifications.nix         |  4 +-
 .../kde-frameworks/knotifyconfig.nix          |  4 +-
 .../kde-frameworks/kpackage/default.nix       |  4 +-
 .../libraries/kde-frameworks/kparts.nix       |  4 +-
 .../libraries/kde-frameworks/kpeople.nix      |  4 +-
 .../libraries/kde-frameworks/kplotting.nix    |  4 +-
 .../libraries/kde-frameworks/kpty.nix         |  4 +-
 .../libraries/kde-frameworks/kross.nix        |  4 +-
 .../libraries/kde-frameworks/krunner.nix      |  4 +-
 .../kde-frameworks/kservice/default.nix       |  4 +-
 .../libraries/kde-frameworks/ktexteditor.nix  |  4 +-
 .../libraries/kde-frameworks/ktextwidgets.nix |  4 +-
 .../kde-frameworks/kunitconversion.nix        |  4 +-
 .../libraries/kde-frameworks/kwallet.nix      |  4 +-
 .../libraries/kde-frameworks/kwayland.nix     |  4 +-
 .../kde-frameworks/kwidgetsaddons.nix         |  4 +-
 .../kde-frameworks/kwindowsystem/default.nix  |  4 +-
 .../libraries/kde-frameworks/kxmlgui.nix      |  4 +-
 .../kde-frameworks/kxmlrpcclient.nix          |  4 +-
 .../kde-frameworks/modemmanager-qt.nix        |  4 +-
 .../kde-frameworks/networkmanager-qt.nix      |  4 +-
 .../kde-frameworks/oxygen-icons5.nix          |  4 +-
 .../kde-frameworks/plasma-framework.nix       |  4 +-
 .../libraries/kde-frameworks/solid.nix        |  4 +-
 .../libraries/kde-frameworks/sonnet.nix       |  4 +-
 .../kde-frameworks/syntax-highlighting.nix    |  4 +-
 .../libraries/kde-frameworks/threadweaver.nix |  4 +-
 74 files changed, 275 insertions(+), 240 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks/build-support/framework.nix

diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index 6c120c20d3a..c70be1b877d 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase }:
 
-kdeFramework {
+mkDerivation {
   name = "attica";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix
index dc7b6af193b..9bbb9a1101b 100644
--- a/pkgs/development/libraries/kde-frameworks/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks/baloo.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
+{ mkDerivation, lib, extra-cmake-modules, kauth, kconfig
 , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
 , kio, lmdb, qtbase, solid
 }:
 
-kdeFramework {
+mkDerivation {
   name = "baloo";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index 261d9471a77..2f3b960f3bd 100644
--- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , qtbase, qtdeclarative
 }:
 
-kdeFramework {
+mkDerivation {
   name = "bluez-qt";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
index 9a18ade96a8..1c4ed2a9909 100644
--- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtsvg }:
+{ mkDerivation, lib, extra-cmake-modules, qtsvg }:
 
-kdeFramework {
+mkDerivation {
   name = "breeze-icons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   outputs = [ "out" ];
diff --git a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
deleted file mode 100644
index 04832cf5608..00000000000
--- a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, lib, fetchurl }:
-
-let
-  mirror = "mirror://kde";
-  srcs = import ../srcs.nix { inherit fetchurl mirror; };
-in
-
-args:
-
-let
-  inherit (args) name;
-  inherit (srcs."${name}") src version;
-in mkDerivation (args // {
-  name = "${name}-${version}";
-  inherit src;
-
-  meta = {
-    license = with lib.licenses; [
-      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-    ];
-    platforms = lib.platforms.linux;
-    homepage = "http://www.kde.org";
-  } // (args.meta or {});
-})
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index e5a765d7c16..abe17848f3b 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -27,14 +27,68 @@ existing packages here and modify it as necessary.
 { libsForQt5, lib, fetchurl }:
 
 let
+
+  srcs = import ./srcs.nix {
+    inherit fetchurl;
+    mirror = "mirror://kde";
+  };
+
+  mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+
   packages = self: with self;
     let
+
+      propagateBin =
+        let setupHook = { writeScript }:
+              writeScript "setup-hook.sh" ''
+                # Propagate $bin output
+                propagatedUserEnvPkgs+=" @bin@"
+
+                # Propagate $dev so that this setup hook is propagated
+                # But only if there is a separate $dev output
+                if [ "$outputDev" != out ]; then
+                    if [ -n "$crossConfig" ]; then
+                      propagatedBuildInputs+=" @dev@"
+                    else
+                      propagatedNativeBuildInputs+=" @dev@"
+                    fi
+                fi
+              '';
+        in callPackage setupHook {};
+
       callPackage = self.newScope {
-        kdeFramework = import ./build-support/framework.nix {
-          inherit lib fetchurl;
-          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
-        };
+
+        inherit propagateBin;
+
+        mkDerivation = args:
+          let
+
+            inherit (args) name;
+            inherit (srcs."${name}") src version;
+
+            outputs = args.outputs or [ "out" "dev" "bin" ];
+            hasBin = lib.elem "bin" outputs;
+            hasDev = lib.elem "dev" outputs;
+
+            defaultSetupHook = if hasBin && hasDev then propagateBin else null;
+            setupHook = args.setupHook or defaultSetupHook;
+
+            meta = {
+              homepage = "http://www.kde.org";
+              license = with lib.licenses; [
+                lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+              ];
+              maintainers = [ lib.maintainers.ttuegel ];
+              platforms = lib.platforms.linux;
+            } // (args.meta or {});
+
+          in mkDerivation (args // {
+            name = "${name}-${version}";
+            inherit meta outputs setupHook src;
+          });
+
       };
+
     in {
       attica = callPackage ./attica.nix {};
       baloo = callPackage ./baloo.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index f8a774b6855..dfdb6a11803 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig }:
+{ mkDerivation, lib, copyPathsToStore, cmake, pkgconfig }:
 
-kdeFramework {
+mkDerivation {
   name = "extra-cmake-modules";
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 325758bf91d..8f2d1446fcf 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -1,11 +1,11 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio,
   knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "frameworkintegration";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
index 25188b009b6..99737ea2b83 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kactivities, kconfig }:
+{ mkDerivation, lib, extra-cmake-modules, boost, kactivities, kconfig }:
 
-kdeFramework {
+mkDerivation {
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix
index 167c3f15bbd..59b5639c24f 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
+{ mkDerivation, lib, extra-cmake-modules, boost, kcmutils, kconfig
 , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
 , kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kactivities";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix
index 749cf9b2970..0d3ccc276fc 100644
--- a/pkgs/development/libraries/kde-frameworks/kapidox.nix
+++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, python }:
+{ mkDerivation, lib, extra-cmake-modules, python }:
 
-kdeFramework {
+mkDerivation {
   name = "kapidox";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules python ];
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index 71561b1109c..5f725a75d56 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase }:
 
-kdeFramework {
+mkDerivation {
   name = "karchive";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
index 7561575ae84..25cdb7f4a19 100644
--- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
@@ -1,6 +1,9 @@
-{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }:
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules, kcoreaddons, polkit-qt, qttools
+}:
 
-kdeFramework {
+mkDerivation {
   name = "kauth";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
index 36ea7405842..0873094af3d 100644
--- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
+++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
@@ -1,9 +1,9 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kbookmarks";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index fdf55174548..fb5779e10bc 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
@@ -1,9 +1,11 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
-, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
-, kpackage, kservice, kxmlgui
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
+  kpackage, kservice, kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kcmutils";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index fa1679519cc..f66c422a638 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }:
 
-kdeFramework {
+mkDerivation {
   name = "kcodecs";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index f143524889a..bf7556e94a6 100644
--- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
@@ -1,9 +1,12 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kconfig, kwidgetsaddons, qtbase, qttools
+}:
 
-kdeFramework {
+mkDerivation {
   name = "kcompletion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ kconfig kwidgetsaddons ];
+  propagatedBuildInputs = [ kconfig kwidgetsaddons qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index f6d38cd2336..f95b50f9de5 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -1,11 +1,11 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }:
 
-kdeFramework {
+mkDerivation {
   name = "kconfig";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
index c44473bb915..2b91e003764 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
@@ -1,9 +1,9 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kconfigwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index 4d35c0bbdea..8fa10bd767b 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -1,12 +1,11 @@
-{ kdeFramework, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
+{ mkDerivation, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
 
-kdeFramework {
+mkDerivation {
   name = "kcoreaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ shared_mime_info ];
+  propagatedBuildInputs = [ qtbase shared_mime_info ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix
index bd008c732af..c8e674c88c5 100644
--- a/pkgs/development/libraries/kde-frameworks/kcrash.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
 
-kdeFramework {
+mkDerivation {
   name = "kcrash";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index 2bbbf65f898..8169c89b5ba 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
 
-kdeFramework {
+mkDerivation {
   name = "kdbusaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index 05eaffb9fbf..4b9522ffa5d 100644
--- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
   kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdeclarative";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix
index 2da1bac8f39..18b8ccd0fb6 100644
--- a/pkgs/development/libraries/kde-frameworks/kded.nix
+++ b/pkgs/development/libraries/kde-frameworks/kded.nix
@@ -1,9 +1,9 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kded";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
index 1174972917e..cf94a706167 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
@@ -1,16 +1,15 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules, kdoctools,
+  docbook_xml_dtd_45, kauth, karchive, kcompletion, kconfig, kconfigwidgets,
+  kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons,
+  kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels, kinit,
+  knotifications, kparts, kservice, ktextwidgets, kunitconversion,
+  kwidgetsaddons, kwindowsystem, kxmlgui, networkmanager, qtsvg, qtx11extras,
+  xlibs
 }:
 
-# TODO: debug docbook detection
-
-kdeFramework {
+mkDerivation {
   name = "kdelibs4support";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
index 8e17a1a60c8..c732a6be22e 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
@@ -1,21 +1,11 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdoctools
-, kiconthemes
-, kio
-, kitemviews
-, kplotting
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-, sonnet
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
+  kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio,
+  kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, sonnet
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdesignerplugin";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix
index fcccea9161f..e8d72008507 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesu.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
 , kservice
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdesu";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 18a435139f6..1d7553090fc 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -1,15 +1,15 @@
-{ kdeFramework, lib
-, extra-cmake-modules, qttools
-, avahi, qtbase
+{
+  mkDerivation, lib,
+  extra-cmake-modules, qttools,
+  avahi, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdnssd";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ avahi ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ avahi qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 99fc4c7d023..991717cce8c 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -1,8 +1,10 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
-, docbook5_xsl, karchive, ki18n, perl, perlPackages
+{
+  mkDerivation, lib,
+  extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
+  karchive, ki18n, perl, perlPackages
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdoctools";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
index 1e31277172d..c2060e9c919 100644
--- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
@@ -1,12 +1,10 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kservice
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  karchive, kconfig, kcoreaddons, kservice
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kemoticons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index bc7349e7453..3fb81c28a7b 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
@@ -1,8 +1,10 @@
-{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
-, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules,
+  attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kfilemetadata";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index 1c1336dd4d0..cfe767b4d55 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -1,10 +1,11 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib,
+  extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
   qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kglobalaccel";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index f93aa0967f6..2b4e28ca492 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   qtbase, qtx11extras,
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kguiaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix
index 99f6fe31e0d..d6ec1ab901f 100644
--- a/pkgs/development/libraries/kde-frameworks/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks/khtml.nix
@@ -1,10 +1,12 @@
-{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
-, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
-, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
-, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
+{
+  mkDerivation, lib,
+  extra-cmake-modules, perl,
+  giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs,
+  knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem,
+  kxmlgui, phonon, qtx11extras, sonnet
 }:
 
-kdeFramework {
+mkDerivation {
   name = "khtml";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 68f29c8314f..649f1db3952 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules, gettext, python,
   qtbase, qtdeclarative, qtscript,
 }:
 
-kdeFramework {
+mkDerivation {
   name = "ki18n";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
index 6102bb0d4b5..f1d8503804e 100644
--- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
@@ -1,9 +1,10 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules,
+  karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kiconthemes";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index bfec344ca11..4139674cd39 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -1,10 +1,10 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtbase
-, qtx11extras
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kidletime";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index 2a8e825893b..b711328cf89 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   ilmbase, karchive, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kimageformats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index f5cfa166e91..51c0e40617a 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -1,13 +1,12 @@
 {
-  kdeFramework, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework
 }:
 
-let
-  inherit (lib) getLib;
-in
-kdeFramework {
+let inherit (lib) getLib; in
+
+mkDerivation {
   name = "kinit";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 3f4ae5a25c2..86cb72707a5 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -1,13 +1,13 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, acl, karchive
-, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
-, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
-, kwidgetsaddons, kwindowsystem, kxmlgui
-, qtscript, qtx11extras, solid, fetchpatch
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules, kdoctools,
+  acl, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
+  kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
+  kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
+  qtscript, qtx11extras, solid, fetchpatch
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kio";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index e2f0633da8c..a769d30b3c3 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -1,13 +1,15 @@
-{ kdeFramework, lib
-, extra-cmake-modules, qtbase
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kitemmodels";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index df420f8f4b9..7e317deef58 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -1,13 +1,15 @@
-{ kdeFramework, lib
-, extra-cmake-modules, qtbase, qttools
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kitemviews";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
index ddc66d2eb20..048f1290a99 100644
--- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
@@ -1,11 +1,10 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwidgetsaddons
-, qttools, qtx11extras
+{
+  mkDerivation, lib,
+  extra-cmake-modules, qttools,
+  kcoreaddons, kwidgetsaddons, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kjobwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix
index abdc15ce8df..20459498c3e 100644
--- a/pkgs/development/libraries/kde-frameworks/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjs.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kdoctools
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kjs";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
index 95bc02422f1..3a52761e259 100644
--- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
@@ -1,8 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
+{
+  mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kjs
 , qtsvg
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kjsembed";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
index 93a6b450f76..278a4240ab9 100644
--- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
+++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
@@ -1,10 +1,10 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , kparts
 , kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kmediaplayer";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
index 002418c65ad..b32a073fb33 100644
--- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix
+++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, karchive
+{ mkDerivation, lib, extra-cmake-modules, attica, karchive
 , kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
 , kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "knewstuff";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix
index c1c07957872..2532f5b4b4f 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , kcodecs, kconfig, kcoreaddons, kwindowsystem
 , libdbusmenu
@@ -6,7 +6,7 @@
 , qttools, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "knotifications";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
index 0e357aecb99..29c779e6598 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
 , ki18n, kio, phonon
 }:
 
-kdeFramework {
+mkDerivation {
   name = "knotifyconfig";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index 2953aea9a55..e83afaa8e82 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, fetchurl, lib, copyPathsToStore,
+  mkDerivation, fetchurl, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   karchive, kconfig, kcoreaddons, ki18n
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kpackage";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix
index ad6ea2dbc30..db0eb6c2a2c 100644
--- a/pkgs/development/libraries/kde-frameworks/kparts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kparts.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
 , ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
 , ktextwidgets, kwidgetsaddons, kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kparts";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix
index 6acb5e2eed5..e10abf6ab62 100644
--- a/pkgs/development/libraries/kde-frameworks/kpeople.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n
 , kitemviews, kservice, kwidgetsaddons, qtdeclarative
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kpeople";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index e132a45976f..a0d6b4625d9 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kplotting";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix
index 8bdaacb85f8..27acf536c36 100644
--- a/pkgs/development/libraries/kde-frameworks/kpty.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpty.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n }:
 
-kdeFramework {
+mkDerivation {
   name = "kpty";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix
index 0e66d95b5cc..6b37c118183 100644
--- a/pkgs/development/libraries/kde-frameworks/kross.nix
+++ b/pkgs/development/libraries/kde-frameworks/kross.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
+{ mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons
 , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
 , kxmlgui, qtscript
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kross";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index ec9ab7abe9f..2f542591e49 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
 , ki18n, kio, kservice, plasma-framework, solid
 , threadweaver
 }:
 
-kdeFramework {
+mkDerivation {
   name = "krunner";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index 2751a7f5d6e..2730cf53677 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   bison, extra-cmake-modules, flex,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kservice";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ];
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index fbd73c65eff..bc4dcf6916b 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, copyPathsToStore
+{ mkDerivation, lib, copyPathsToStore
 , extra-cmake-modules, perl
 , karchive, kconfig, kguiaddons, kiconthemes, kparts
 , libgit2
@@ -6,7 +6,7 @@
 , ki18n, kio, sonnet, syntax-highlighting
 }:
 
-kdeFramework {
+mkDerivation {
   name = "ktexteditor";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
index 25954c60397..695e7b991e7 100644
--- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
 , kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
 , sonnet
 }:
 
-kdeFramework {
+mkDerivation {
   name = "ktextwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
index c04ded722aa..e793bb8828f 100644
--- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, ki18n }:
 
-kdeFramework {
+mkDerivation {
   name = "kunitconversion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index 48181040a75..31a29dbff92 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
+{ mkDerivation, lib, extra-cmake-modules, kconfig, kconfigwidgets
 , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
 , knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kwallet";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index d34687def3e..87c0bf84706 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   qtbase, wayland
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kwayland";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index ce16e280faa..4375cf064e1 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules, qtbase, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kwidgetsaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 4e02777e39c..6fe57449b89 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
   qtbase, qttools, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kwindowsystem";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
index ea800bf58ae..80df93c61b8 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
+{ mkDerivation, lib, extra-cmake-modules, attica, kconfig
 , kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
 , ktextwidgets, kwindowsystem, sonnet
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kxmlgui";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
index f20f4a22394..714d768742e 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
+{ mkDerivation, lib, extra-cmake-modules, ki18n, kio }:
 
-kdeFramework {
+mkDerivation {
   name = "kxmlrpcclient";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index ea2e112ff67..c4edfeca5a3 100644
--- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , modemmanager, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "modemmanager-qt";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index 80085bb2072..340c76ef778 100644
--- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , qtbase, networkmanager
 }:
 
-kdeFramework {
+mkDerivation {
   name = "networkmanager-qt";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
index 1d45b51274c..919c4f36b15 100644
--- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
+++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
@@ -1,9 +1,9 @@
-{ kdeFramework
+{ mkDerivation
 , lib
 , extra-cmake-modules, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "oxygen-icons5";
   meta = {
     license = lib.licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index 2fd667af0dc..f47750145b5 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,11 +1,11 @@
-{ kdeFramework, lib, fetchurl, extra-cmake-modules, kactivities, karchive
+{ mkDerivation, lib, fetchurl, extra-cmake-modules, kactivities, karchive
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
 , knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui
 , qtscript, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "plasma-framework";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index d32acf598eb..f64b9936046 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   bison, extra-cmake-modules, flex,
   qtbase, qtdeclarative, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "solid";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index ae3e72e2a46..06165a57c3a 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , hunspell, qtbase, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "sonnet";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index f199321e674..ebc33a8346e 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules, perl, qtbase, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "syntax-highlighting";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index 4df3ff510cb..3afedf18ecb 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "threadweaver";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
-- 
GitLab


From f6763c80e1879775be563fc811455cc5c64e3d14 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 18 Jun 2017 08:45:17 -0300
Subject: [PATCH 0874/1490] vivaldi: 1.9.818.44-1 -> 1.10.867.38-1

- Update to version 1.10.867.38-1
- Drop i386 arch. Vivaldi has suspended support for Linux 32-bit for
  Vivaldi 1.10. Unfortunately, this is due to Chromium suspending support
  for it and maintaining it themselves would take too much resources.
  See https://forum.vivaldi.net/post/142489.
- Update dependency on gtk2 to gtk3.
- Move dependency patchelf from buildInputs to nativeBuildInputs.
---
 .../networking/browsers/vivaldi/default.nix   | 45 +++++++------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 3489aeb4cf5..749fc855788 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -4,31 +4,19 @@
 , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
 , libuuid, xz
 , gstreamer, gst-plugins-base, libxml2
-, glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3
+, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
 , nss, nspr
 , patchelf
 }:
 
-let
-  version = "1.9";
-  build = "818.44-1";
-  fullVersion = "stable_${version}.${build}";
-
-  info = if stdenv.is64bit then {
-      arch = "amd64";
-      sha256 = "0apkwgd98ld5k77nplzmk67nz6mb5pi8jyrnkp96m93mr41b08bq";
-    } else {
-      arch = "i386";
-      sha256 = "0xyf0z1cnzmb3pv6rgsbd7jdjf1v137priz4kkymr8jgmpq0mmfx";
-    };
-
-in stdenv.mkDerivation rec {
-  product    = "vivaldi";
-  name       = "${product}-${version}";
+stdenv.mkDerivation rec {
+  name = "${product}-${version}";
+  product = "vivaldi";
+  version = "1.10.867.38-1";
 
   src = fetchurl {
-    inherit (info) sha256;
-    url = "https://downloads.vivaldi.com/stable/${product}-${fullVersion}_${info.arch}.deb";
+    url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
+    sha256 = "1h3iygzvw3rb5kmn0pam6gqy9baq6l630yllff1vnvychdg8d9vi";
   };
 
   unpackPhase = ''
@@ -36,14 +24,15 @@ in stdenv.mkDerivation rec {
     tar -xvf data.tar.xz
   '';
 
-  buildInputs =
-    [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
-      libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
-      atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd
-      freetype fontconfig libXrender libuuid expat glib nss nspr
-      gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
-      patchelf
-    ];
+  nativeBuildInputs = [ patchelf ];
+
+  buildInputs = [
+    stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
+    libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
+    atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
+    freetype fontconfig libXrender libuuid expat glib nss nspr
+    gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
+  ];
 
   libPath = stdenv.lib.makeLibraryPath buildInputs
     + stdenv.lib.optionalString (stdenv.is64bit)
@@ -85,6 +74,6 @@ in stdenv.mkDerivation rec {
     homepage    = "https://vivaldi.com";
     license     = licenses.unfree;
     maintainers = with maintainers; [ otwieracz nequissimus ];
-    platforms   = platforms.linux;
+    platforms   = [ "x86_64-linux" ];
   };
 }
-- 
GitLab


From be7b7d908f82e8ab16c43ffd0e240addd6f4018a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 16 May 2017 10:56:41 -0500
Subject: [PATCH 0875/1490] Remove kdeWrapper

---
 .../services/x11/desktop-managers/plasma5.nix | 28 +-----
 .../editors/kdevelop5/kdevelop.nix            | 22 +++--
 pkgs/applications/editors/kile/default.nix    | 77 +++++++---------
 .../applications/graphics/digikam/default.nix | 57 ++++++------
 pkgs/applications/kde/ark/default.nix         | 57 +++++-------
 pkgs/applications/kde/dolphin-plugins.nix     |  2 +-
 pkgs/applications/kde/dolphin.nix             | 39 +++-----
 pkgs/applications/kde/filelight.nix           | 31 +++----
 pkgs/applications/kde/gwenview.nix            | 35 +++----
 pkgs/applications/kde/k3b.nix                 | 63 +++++++------
 pkgs/applications/kde/kate.nix                | 40 ++++----
 pkgs/applications/kde/kcachegrind.nix         | 34 +++----
 pkgs/applications/kde/kcalc.nix               | 32 +++----
 pkgs/applications/kde/kcolorchooser.nix       | 29 +++---
 pkgs/applications/kde/kcontacts.nix           |  5 +-
 pkgs/applications/kde/kdenlive.nix            | 27 ++----
 pkgs/applications/kde/kdf.nix                 | 29 ++----
 pkgs/applications/kde/kgpg.nix                | 12 +--
 pkgs/applications/kde/khelpcenter.nix         | 25 ++---
 pkgs/applications/kde/kig.nix                 | 32 +++----
 pkgs/applications/kde/kmix.nix                | 41 ++++-----
 pkgs/applications/kde/kolourpaint.nix         | 28 ++----
 pkgs/applications/kde/kompare.nix             | 25 ++---
 pkgs/applications/kde/konsole.nix             | 37 +++-----
 pkgs/applications/kde/krfb.nix                | 27 ++----
 pkgs/applications/kde/kwalletmanager.nix      | 32 +++----
 pkgs/applications/kde/marble.nix              | 32 ++-----
 pkgs/applications/kde/okteta.nix              | 33 +++----
 pkgs/applications/kde/okular.nix              | 38 ++++----
 pkgs/applications/kde/print-manager.nix       |  4 +-
 pkgs/applications/kde/spectacle.nix           | 29 +++---
 pkgs/applications/misc/krename/default.nix    | 43 ++++-----
 pkgs/applications/misc/krusader/default.nix   | 35 +++----
 pkgs/applications/misc/latte-dock/default.nix | 45 ++++-----
 pkgs/applications/misc/yakuake/default.nix    | 47 +++++-----
 .../networking/irc/konversation/default.nix   | 91 +++++++++----------
 pkgs/build-support/kde/wrapper.nix            | 68 --------------
 pkgs/desktops/plasma-5/oxygen.nix             | 22 ++---
 pkgs/tools/misc/kronometer/default.nix        | 32 +++----
 pkgs/tools/misc/partition-manager/default.nix | 39 ++++----
 pkgs/tools/misc/peruse/default.nix            | 41 ++++-----
 pkgs/tools/security/kwalletcli/default.nix    | 78 ++++++++--------
 pkgs/tools/text/kdiff3/default.nix            | 81 ++++++++---------
 pkgs/top-level/all-packages.nix               |  4 -
 44 files changed, 653 insertions(+), 975 deletions(-)
 delete mode 100644 pkgs/build-support/kde/wrapper.nix

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index d981cd5328e..27678fda1b5 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -7,7 +7,7 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.plasma5;
 
-  inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg;
+  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
 
 in
 
@@ -30,24 +30,12 @@ in
         '';
       };
 
-      extraPackages = mkOption {
-        type = types.listOf types.package;
-        default = [];
-        description = ''
-          KDE packages that need to be installed system-wide.
-        '';
-      };
-
     };
 
   };
 
 
   config = mkMerge [
-    (mkIf (cfg.extraPackages != []) {
-      environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ];
-    })
-
     (mkIf (xcfg.enable && cfg.enable) {
       services.xserver.desktopManager.session = singleton {
         name = "plasma5";
@@ -139,10 +127,14 @@ in
           plasma-workspace
           plasma-workspace-wallpapers
 
+          dolphin
           dolphin-plugins
           ffmpegthumbs
           kdegraphics-thumbnailers
+          khelpcenter
           kio-extras
+          konsole
+          oxygen
           print-manager
 
           breeze-icons
@@ -163,16 +155,6 @@ in
         ++ lib.optional config.services.colord.enable colord-kde
         ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
 
-      services.xserver.desktopManager.plasma5.extraPackages =
-        with kdeApplications; with plasma5;
-        [
-          khelpcenter
-          oxygen
-
-          dolphin
-          konsole
-        ];
-
       environment.pathsToLink = [ "/share" ];
 
       environment.etc = singleton {
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index c599666f4d5..d4f07d82bf0 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, wrapGAppsHook
 , qtquickcontrols, qtwebkit, qttools, kde-cli-tools
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
@@ -12,7 +12,7 @@ let
   version = "5.1.1";
 
 in
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -21,24 +21,26 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper
+    cmake gettext pkgconfig extra-cmake-modules makeWrapper wrapGAppsHook
   ];
 
   buildInputs = [
+    kdevelop-pg-qt
+    llvmPackages.llvm llvmPackages.clang-unwrapped
+  ];
+
+  propagatedBuildInputs = [
     qtquickcontrols qtwebkit
     kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
     kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
     threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
-    kdevplatform kdevelop-pg-qt shared_mime_info libksysguard konsole.unwrapped
-    llvmPackages.llvm llvmPackages.clang-unwrapped
+    kdevplatform shared_mime_info libksysguard konsole
   ];
 
   postInstall = ''
-    wrapQtProgram "$out/bin/kdevelop"
-    
     # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
     wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin"
-    
+
     # Fix the (now wrapped) kdevelop! to find things in right places:
     # - Make KDEV_BASEDIR point to bin directory of kdevplatform.
     kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|"
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
     sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = [ maintainers.ambrop72 ];
     platforms = platforms.linux;
     description = "KDE official IDE";
@@ -60,6 +62,6 @@ stdenv.mkDerivation rec {
         libraries and is under development since 1998.
       '';
     homepage = https://www.kdevelop.org;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    license = with licenses; [ gpl2Plus lgpl2Plus ];
   };
 }
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 3834269f180..259c319c70f 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -3,7 +3,7 @@
 , fetchgit
 , extra-cmake-modules
 , kdoctools
-, kdeWrapper
+, wrapGAppsHook
 , qtscript
 , kconfig
 , kcrash
@@ -21,50 +21,43 @@
 , poppler
 }:
 
-let
-  unwrapped =
-    mkDerivation rec {
-      name = "kile-${version}";
-      version = "2017-02-09";
+mkDerivation rec {
+  name = "kile-${version}";
+  version = "2017-02-09";
 
-      src = fetchgit {
-        url = git://anongit.kde.org/kile.git;
-        rev = "f77f6e627487c152f111e307ad6dc71699ade746";
-        sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
+  src = fetchgit {
+    url = git://anongit.kde.org/kile.git;
+    rev = "f77f6e627487c152f111e307ad6dc71699ade746";
+    sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
 
-      };
+  };
 
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
 
-      buildInputs = [
-        kconfig
-        kcrash
-        kdbusaddons
-        kdelibs4support
-        kdoctools
-        kguiaddons
-        kiconthemes
-        kinit
-        khtml
-        kparts
-        ktexteditor
-        kwindowsystem
-        okular.unwrapped
-        poppler
-        qtscript
-      ];
+  propagatedBuildInputs = [
+    kconfig
+    kcrash
+    kdbusaddons
+    kdelibs4support
+    kdoctools
+    kguiaddons
+    kiconthemes
+    kinit
+    khtml
+    kparts
+    ktexteditor
+    kwindowsystem
+    okular
+    poppler
+    qtscript
+  ];
 
-      meta = {
-        description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
-        homepage = https://www.kde.org/applications/office/kile/;
-        maintainers = with lib.maintainers; [ fridh ];
-        license = lib.licenses.gpl2Plus;
-      };
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kile" ];
-  paths = [ konsole.unwrapped okular.unwrapped ];
+  propagatedUserEnvPkgs = [ konsole ];
+
+  meta = {
+    description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
+    homepage = https://www.kde.org/applications/office/kile/;
+    maintainers = with lib.maintainers; [ fridh ];
+    license = lib.licenses.gpl2Plus;
+  };
 }
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index f1179101692..96b1ca54d55 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook
 
 # For `digitaglinktree`
 , perl, sqlite
@@ -44,7 +44,7 @@
 , oxygen
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name    = "digikam-${version}";
   version = "5.4.0";
 
@@ -53,26 +53,11 @@ stdenv.mkDerivation rec {
     sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ];
 
   patches = [ ./0001-Disable-fno-operator-names.patch ];
 
   buildInputs = [
-    qtbase
-    qtxmlpatterns
-    qtsvg
-    qtwebkit
-
-    kconfigwidgets
-    kcoreaddons
-    kdoctools
-    kfilemetadata
-    knotifications
-    knotifyconfig
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-
     bison
     boost
     eigen
@@ -86,12 +71,28 @@ stdenv.mkDerivation rec {
     liblqr1
     libqtav
     libusb1
-    marble.unwrapped
     mysql
     opencv
-    threadweaver
+  ];
 
+  propagatedBuildInputs = [
+    qtbase
+    qtxmlpatterns
+    qtsvg
+    qtwebkit
+
+    kconfigwidgets
+    kcoreaddons
+    kfilemetadata
+    knotifications
+    knotifyconfig
+    ktextwidgets
+    kwidgetsaddons
+    kxmlgui
+
+    marble
     oxygen
+    threadweaver
   ];
 
   enableParallelBuilding = true;
@@ -104,22 +105,18 @@ stdenv.mkDerivation rec {
     "-DENABLE_MEDIAPLAYER=1"
   ];
 
-  fixupPhase = ''
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
     substituteInPlace $out/bin/digitaglinktree \
       --replace "/usr/bin/perl" "${perl}/bin/perl" \
       --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
-
-    wrapQtProgram $out/bin/digikam \
-      --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"
-
-    wrapQtProgram $out/bin/showfoto
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Photo Management Program";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     homepage = http://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ the-kenny ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index d7a6ee2bdc7..f52f30c7917 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,7 +1,7 @@
 {
-  mkDerivation, lib, config, kdeWrapper,
+  mkDerivation, lib, config, wrapGAppsHook,
 
-  extra-cmake-modules, kdoctools, makeWrapper,
+  extra-cmake-modules, kdoctools,
 
   karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
   kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
@@ -13,35 +13,26 @@
   unfreeEnableUnrar ? false, unrar,
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "ark";
-      nativeBuildInputs = [
-        extra-cmake-modules kdoctools makeWrapper
-      ];
-      propagatedBuildInputs = [
-        khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
-        kpty kwidgetsaddons libarchive kitemmodels
-      ];
-      postInstall =
-        let
-          PATH =
-            lib.makeBinPath
-            ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
-        in ''
-          wrapProgram "$out/bin/ark" \
-              --prefix PATH : "${PATH}"
-        '';
-      meta = {
-        license = with lib.licenses;
-          [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/ark" ];
+mkDerivation {
+  name = "ark";
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools wrapGAppsHook
+  ];
+  propagatedBuildInputs = [
+    khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
+    kpty kwidgetsaddons libarchive kitemmodels
+  ];
+  preFixup =
+    let
+      PATH =
+        lib.makeBinPath
+        ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
+    in ''
+      gappsWrapperArgs+=(--prefix PATH : "${PATH}")
+    '';
+  meta = {
+    license = with lib.licenses;
+      [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
 }
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
index 670b040f79f..eb823641ae4 100644
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ b/pkgs/applications/kde/dolphin-plugins.nix
@@ -12,6 +12,6 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
-    dolphin.unwrapped kdelibs4support ki18n kio kxmlgui
+    dolphin kdelibs4support ki18n kio kxmlgui
   ];
 }
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 746afa2732d..ff5be6fdd88 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -1,32 +1,23 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools, makeQtWrapper,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
   baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
   kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
   kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
   konsole, kparts, ktexteditor, kwindowsystem, phonon, solid
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "dolphin";
-      meta = {
-        license = with lib.licenses; [ gpl2 fdl12 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-      propagatedBuildInputs = [
-        baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
-        kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
-        kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
-        phonon solid
-      ];
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/dolphin" ];
-  paths = [ dolphin-plugins konsole.unwrapped ];
+mkDerivation {
+  name = "dolphin";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [
+    baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
+    kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
+    kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
+    phonon solid
+  ];
 }
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index c09b5f5106a..d3925d54988 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -1,24 +1,17 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kio, kparts, kxmlgui, qtscript, solid
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "filelight";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = with lib.maintainers; [ fridh vcunat ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kio kparts kxmlgui qtscript solid
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/filelight" ];
+mkDerivation {
+  name = "filelight";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh vcunat ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kio kparts kxmlgui qtscript solid
+  ];
 }
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 19b2fd751f7..d206e901f8e 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -1,27 +1,20 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
   libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "gwenview";
-      meta = {
-        license = with lib.licenses; [ gpl2 fdl12 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
-        libkipi phonon qtimageformats qtsvg qtx11extras
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/gwenview" ];
-  paths = [ kipi-plugins ];
+mkDerivation {
+  name = "gwenview";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
+    libkipi phonon qtimageformats qtsvg qtx11extras
+  ];
+  propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index c21ce4a3e18..6fd6fbee9f5 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, kdeWrapper, extra-cmake-modules
+{ mkDerivation, lib, wrapGAppsHook, extra-cmake-modules
 , qtwebkit
 , libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
@@ -7,35 +7,34 @@
 , ffmpeg, libmusicbrainz2, normalize, sox, transcode
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "k3b";
-      meta = with lib; {
-        license = with licenses; [ gpl2Plus ];
-        maintainers = with maintainers; [ sander phreedom ];
-        platforms = platforms.linux;
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        # qt
-        qtwebkit
-        # kde
-        libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
-        # formats
-        flac lame libmad libmpcdec libvorbis
-        # sound utilities
-        libsamplerate libsndfile taglib
-        # cd/dvd
-        cdparanoia libdvdcss libdvdread
-        # others
-        ffmpeg libmusicbrainz2
-      ];
-      enableParallelBuilding = true;
-    };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/k3b" ];
-  paths = [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode vcdimager ];
+mkDerivation {
+  name = "k3b";
+  meta = with lib; {
+    license = with licenses; [ gpl2Plus ];
+    maintainers = with maintainers; [ sander phreedom ];
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    # qt
+    qtwebkit
+    # kde
+    libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
+    # formats
+    flac lame libmad libmpcdec libvorbis
+    # sound utilities
+    libsamplerate libsndfile taglib
+    # cd/dvd
+    cdparanoia libdvdcss libdvdread
+    # others
+    ffmpeg libmusicbrainz2
+  ];
+  preFixup =
+    let k3bPath = lib.makeBinPath [
+          cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
+          vcdimager
+        ];
+    in ''
+      gappsWrapperArgs+=(--prefix PATH : "${k3bPath}")
+    '';
 }
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index 7a138afb8ed..357abf96505 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,32 +1,24 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
   kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
   plasma-framework, qtscript, threadweaver
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kate";
-      meta = {
-        license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
-        qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
-        kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
-        knewstuff libgit2
-      ];
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kate" "bin/kwrite" ];
-  paths = [ konsole.unwrapped ];
+mkDerivation {
+  name = "kate";
+  meta = {
+    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
+    qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
+    kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
+    knewstuff libgit2
+  ];
+  propagatedUserEnvPkgs = [ konsole ];
 }
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index fd5c4502c9d..c45edc87f89 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,28 +1,20 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kio, ki18n,
   perl, python, php
 }:
 
-kdeWrapper {
-  unwrapped = mkDerivation {
-    name = "kcachegrind";
-    meta = {
-      license = with lib.licenses; [ gpl2 ];
-      maintainers = with lib.maintainers; [ orivej ];
-    };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    buildInputs = [ perl python php kio ki18n ];
-    enableParallelBuilding = true;
+mkDerivation {
+  name = "kcachegrind";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ orivej ];
   };
-
-  targets = [
-    "bin/kcachegrind"
-    "bin/dprof2calltree"    # perl
-    "bin/hotshot2calltree"  # python
-    "bin/memprof2calltree"  # perl
-    "bin/op2calltree"       # perl
-    "bin/pprof2calltree"    # php
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kio ];
+  buildInputs = [ perl python php ki18n ];
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ perl php python]}")
+  '';
 }
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 6ce0722d3e4..2a3d7e17a55 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,24 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kcalc";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = [ lib.maintainers.fridh ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        gmp kconfig kconfigwidgets kguiaddons kinit knotifications
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kcalc" ];
+mkDerivation {
+  name = "kcalc";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = [ lib.maintainers.fridh ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [ gmp ];
+  propagatedBuildInputs = [
+    kconfig kconfigwidgets kguiaddons kinit knotifications
+  ];
 }
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index f910b99f603..5f33611f29a 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -1,21 +1,16 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui
+  mkDerivation, lib,
+  extra-cmake-modules, wrapGAppsHook,
+  ki18n, kwidgetsaddons, kxmlgui
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kcolorchooser";
-      meta = {
-        license = with lib.licenses; [ mit ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules ];
-      propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kcolorchooser" ];
+mkDerivation {
+  name = "kcolorchooser";
+  meta = {
+    license = with lib.licenses; [ mit ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
 }
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index d49ba125474..a56ca684545 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -10,6 +10,7 @@ mkDerivation {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules ki18n ];
-  buildInputs = [ kcoreaddons kconfig kcodecs ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons kconfig kcodecs ];
 }
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 4e59e12e8fd..c9929026aa6 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -1,8 +1,8 @@
 { mkDerivation
-, kdeWrapper
 , lib
 , extra-cmake-modules
 , kdoctools
+, wrapGAppsHook
 , qtscript
 , kactivities
 , kconfig
@@ -31,8 +31,7 @@
 , qtquickcontrols
 }:
 
-let
-unwrapped = mkDerivation {
+mkDerivation {
   name = "kdenlive";
   patches = [
     ./kdenlive-cmake-concurrent-module.patch
@@ -40,6 +39,7 @@ unwrapped = mkDerivation {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    wrapGAppsHook
   ];
   buildInputs = [
     qtscript
@@ -61,25 +61,12 @@ unwrapped = mkDerivation {
     ffmpeg
   ];
   propagatedBuildInputs = [
-    kactivities
-    ki18n
-    kio
-    kio-extras
-    kwindowsystem
-    kfilemetadata
-    plasma-framework
-    phonon-backend-gstreamer
-    qtquickcontrols
+    kactivities kconfig kcrash kguiaddons kiconthemes kinit kio kio-extras
+    kdbusaddons kfilemetadata knotifications knewstuff karchive knotifyconfig
+    kplotting ktextwidgets kwindowsystem plasma-framework
+    phonon-backend-gstreamer qtquickcontrols shared_mime_info
   ];
-  enableParallelBuilding = true;
   meta = {
     license = with lib.licenses; [ gpl2Plus ];
   };
-};
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kdenlive" ];
-  paths = [ kinit ];
 }
diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
index aaeac0161f5..5a969aa15cf 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,24 +1,15 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kcmutils
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kdf";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = [ lib.maintainers.peterhoeg ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kcmutils
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kdf" ];
+mkDerivation {
+  name = "kdf";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = [ lib.maintainers.peterhoeg ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kcmutils ];
 }
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index 5b462c2712f..1a30b0685f8 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,6 +1,6 @@
 {
-  mkDerivation, lib, makeQtWrapper,
-  extra-cmake-modules, kdoctools, ki18n,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, ki18n, wrapGAppsHook,
   akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
   kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
   ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
@@ -8,14 +8,14 @@
 
 mkDerivation {
   name = "kgpg";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n wrapGAppsHook ];
   buildInputs = [
     akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
     kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
-    kwidgetsaddons kwindowsystem makeQtWrapper
+    kwidgetsaddons kwindowsystem
   ];
-  postInstall = ''
-    wrapQtProgram $out/bin/kgpg --suffix PATH : ${lib.makeBinPath [ gnupg1 ]}
+  preFixup = ''
+    gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gnupg1 ]})
   '';
   meta = {
     license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index e88bef4c652..9862d75fdf4 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,22 +1,15 @@
 {
-  mkDerivation, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
   kdelibs4support, khtml, kservice, xapian
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "khelpcenter";
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      buildInputs = [
-        grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
-        kinit kcmutils kservice xapian
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/khelpcenter" ];
+mkDerivation {
+  name = "khelpcenter";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [
+    grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
+    kinit kcmutils kservice xapian
+  ];
 }
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 03229f9a150..6fdad9766b2 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,26 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kig";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = with lib.maintainers; [ raskin ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      buildInputs = [
-        kparts qtsvg qtxmlpatterns ktexteditor boost
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kig" ];
+mkDerivation {
+  name = "kig";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [
+    kparts qtsvg qtxmlpatterns ktexteditor boost
+  ];
 }
 
-
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index 483983571dd..cc5e67a1ddc 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -1,30 +1,23 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
   plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kmix";
-      meta = {
-        license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
-        maintainers = [ lib.maintainers.rongcuid ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
-      propagatedBuildInputs = [
-        kglobalaccel kxmlgui kcoreaddons kdelibs4support
-        plasma-framework
-      ];
-      cmakeFlags = [
-        "-DKMIX_KF5_BUILD=1"
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kmix" ];
+mkDerivation {
+  name = "kmix";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = [ lib.maintainers.rongcuid ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
+  propagatedBuildInputs = [
+    kglobalaccel kxmlgui kcoreaddons kdelibs4support
+    plasma-framework
+  ];
+  cmakeFlags = [
+    "-DKMIX_KF5_BUILD=1"
+  ];
 }
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
index bdfeb233af3..a9e6904156a 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -1,28 +1,18 @@
 { lib
 , mkDerivation
-, kdeWrapper
 , extra-cmake-modules
 , kdoctools
+, wrapGAppsHook
 , kdelibs4support
 , libkexiv2
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kolourpaint";
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kdelibs4support
-        libkexiv2
-      ];
-
-      meta = {
-        maintainers = [ lib.maintainers.fridh ];
-        license = with lib.licenses; [ gpl2 ];
-      };
-    };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = ["bin/kolourpaint"];
+mkDerivation {
+  name = "kolourpaint";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
+  meta = {
+    maintainers = [ lib.maintainers.fridh ];
+    license = with lib.licenses; [ gpl2 ];
+  };
 }
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index c14f15707aa..1a0c2211c80 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,21 +1,14 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kompare";
-      meta = { license = with lib.licenses; [ gpl2 ]; };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kparts ktexteditor kwidgetsaddons libkomparediff2
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kompare" ];
+mkDerivation {
+  name = "kompare";
+  meta = { license = with lib.licenses; [ gpl2 ]; };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kparts ktexteditor kwidgetsaddons libkomparediff2
+  ];
 }
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 4eb45c74480..4a4a261c433 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -1,30 +1,23 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
   knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
   kwindowsystem, kxmlgui, qtscript
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "konsole";
-      meta = {
-        license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
-        kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
-        knotifications knotifyconfig kparts kpty kservice ktextwidgets
-        kwidgetsaddons kxmlgui
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/konsole" ];
+mkDerivation {
+  name = "konsole";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
+    kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
+    knotifications knotifyconfig kparts kpty kservice ktextwidgets
+    kwidgetsaddons kxmlgui
+  ];
 }
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index 3ad7b436dbc..a5a34b68460 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,22 +1,15 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kdelibs4support, kdnssd, libvncserver, libXtst
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "krfb";
-      meta = {
-        license = with lib.licenses; [ gpl2 fdl12 ];
-        maintainers = with lib.maintainers; [ jerith666 ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/krfb" ];
+mkDerivation {
+  name = "krfb";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = with lib.maintainers; [ jerith666 ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
 }
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index efdcac650bb..9194b45c401 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -1,8 +1,8 @@
 { lib
 , mkDerivation
-, kdeWrapper
 , extra-cmake-modules
 , kdoctools
+, wrapGAppsHook
 , kauth
 , kcmutils
 , kconfigwidgets
@@ -12,25 +12,15 @@
 , kxmlgui
 }:
 
-let
-  unwrapped = mkDerivation {
-    name = "kwalletmanager";
-    meta = {
-      license = with lib.licenses; [ gpl2 ];
-      maintainers = with lib.maintainers; [ fridh ];
-    };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [
-      kauth
-      kcmutils
-      kconfigwidgets
-      kcoreaddons
-      kdbusaddons
-      kdelibs4support
-      kxmlgui
-    ];
+mkDerivation {
+  name = "kwalletmanager";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh ];
   };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = ["bin/kwalletmanager5"];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
+    kxmlgui
+  ];
 }
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index eb059a1b398..169b801b30d 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,28 +1,16 @@
-{ mkDerivation, lib, kdeWrapper
-, extra-cmake-modules, kdoctools
+{ mkDerivation, lib
+, extra-cmake-modules, kdoctools, wrapGAppsHook
 , qtscript, qtsvg, qtquickcontrols, qtwebkit
 , krunner, shared_mime_info, kparts, knewstuff
 , gpsd, perl
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "marble";
-      meta.license = with lib.licenses; [ lgpl21 gpl3 ];
-
-      nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
-      propagatedBuildInputs = [
-        qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info
-        krunner kparts knewstuff
-        gpsd
-      ];
-
-      enableParallelBuilding = true;
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/marble-qt" "bin/marble" ];
-  paths = [ unwrapped ];
+mkDerivation {
+  name = "marble";
+  meta.license = with lib.licenses; [ lgpl21 gpl3 ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools perl wrapGAppsHook ];
+  propagatedBuildInputs = [
+    qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts
+    knewstuff gpsd
+  ];
 }
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 7fb4ffb7693..350630664d9 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,26 +1,19 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "okteta";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = with lib.maintainers; [ peterhoeg ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kconfig kinit
-        kcmutils kconfigwidgets knewstuff kparts qca-qt5
-      ];
-    };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/okteta" ];
+mkDerivation {
+  name = "okteta";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ peterhoeg ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kconfig kinit
+    kcmutils kconfigwidgets knewstuff kparts qca-qt5
+  ];
 }
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 3bed7454f42..12983519b26 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,31 +1,25 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
   kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
   libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
 }:
 
-let
-  unwrapped = mkDerivation {
-    name = "okular";
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [
-      djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
-      kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
-      kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
-      qca-qt5 qtdeclarative qtsvg threadweaver
-    ];
-    meta = {
-      platforms = lib.platforms.linux;
-      homepage = "http://www.kde.org";
-      license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
-      maintainers = [ lib.maintainers.ttuegel ];
-    };
+mkDerivation {
+  name = "okular";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
+    kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
+    kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
+    qca-qt5 qtdeclarative qtsvg threadweaver
+  ];
+  meta = {
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
   };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/okular" ];
 }
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index a2589f46bba..18a5da2ccca 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules, wrapGAppsHook,
   cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
   knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
   qtdeclarative
@@ -11,7 +11,7 @@ mkDerivation {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
   propagatedBuildInputs = [
     cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
     kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index a0c5ef58c9b..10d98d99b0b 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -1,25 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
   xcb-util-cursor
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "spectacle";
-      meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
-        kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/spectacle" ];
-  paths = [ kipi-plugins ];
+mkDerivation {
+  name = "spectacle";
+  meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
+  ];
+  propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 05d1ce1a950..22cd14c1952 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -1,35 +1,30 @@
 {
-  mkDerivation, kdeWrapper, fetchFromGitHub, lib,
-  extra-cmake-modules, kdoctools, kconfig, kinit, kjsembed,
-  taglib, exiv2, podofo
+  mkDerivation, fetchFromGitHub, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  kconfig, kinit, kjsembed, taglib, exiv2, podofo
 }:
 
 let
   pname = "krename";
   version = "20170610";
-  unwrapped = mkDerivation rec {
-    name = "${pname}-${version}";
+in mkDerivation rec {
+  name = "${pname}-${version}";
 
-    src = fetchFromGitHub {
-      owner  = "KDE";
-      repo   = "krename";
-      rev    = "18000edfec52de0b417d575e14eb078b4bd7b2f3";
-      sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j";
-    };
-
-    meta = with lib; {
-      homepage = http://www.krename.net;
-      description = "A powerful batch renamer for KDE";
-      inherit (kconfig.meta) platforms;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
+  src = fetchFromGitHub {
+    owner  = "KDE";
+    repo   = "krename";
+    rev    = "18000edfec52de0b417d575e14eb078b4bd7b2f3";
+    sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j";
+  };
 
-    buildInputs = [ taglib exiv2 podofo ];
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [ kconfig kinit kjsembed ];
+  meta = with lib; {
+    homepage = http://www.krename.net;
+    description = "A powerful batch renamer for KDE";
+    inherit (kconfig.meta) platforms;
+    maintainers = with maintainers; [ peterhoeg ];
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/krename" ];
+  buildInputs = [ taglib exiv2 podofo ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kconfig kinit kjsembed ];
 }
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index df557f76e73..7f5dad62d26 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -1,32 +1,27 @@
 {
-  mkDerivation, kdeWrapper, fetchurl, lib,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, fetchurl, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit, kparts
 }:
 
 let
   pname = "krusader";
   version = "2.6.0";
-  unwrapped = mkDerivation rec {
-    name = "krusader-${version}";
+in mkDerivation rec {
+  name = "krusader-${version}";
 
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
-      sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
-    };
-
-    meta = with lib; {
-      description = "Norton/Total Commander clone for KDE";
-      license = licenses.gpl2;
-      homepage = http://www.krusader.org;
-      maintainers = with maintainers; [ sander ];
-    };
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+    sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
+  };
 
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [ kconfig kinit kparts ];
+  meta = with lib; {
+    description = "Norton/Total Commander clone for KDE";
+    license = licenses.gpl2;
+    homepage = http://www.krusader.org;
+    maintainers = with maintainers; [ sander ];
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/krusader" ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kconfig kinit kparts ];
 }
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index cdde0beb827..1b2cf94d173 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,33 +1,26 @@
-{ stdenv, lib, cmake, xorg, plasma-framework, fetchFromGitHub, kdeWrapper }:
+{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub }:
 
-let version = "0.6.0";
+let version = "0.6.0"; in
 
-    unwrapped = stdenv.mkDerivation {
-      name = "latte-dock-${version}";
+mkDerivation {
+  name = "latte-dock-${version}";
 
-      src = fetchFromGitHub {
-        owner = "psifidotos";
-        repo = "Latte-Dock";
-        rev = "v${version}";
-        sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv";
-      };
+  src = fetchFromGitHub {
+    owner = "psifidotos";
+    repo = "Latte-Dock";
+    rev = "v${version}";
+    sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv";
+  };
 
-      buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
+  buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
 
-      nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-      enableParallelBuilding = true;
-
-      meta = with stdenv.lib; {
-        description = "Dock-style app launcher based on Plasma frameworks";
-        homepage = https://github.com/psifidotos/Latte-Dock;
-        license = licenses.gpl2;
-        platforms = platforms.unix;
-        maintainers = [ maintainers.benley ];
-      };
-    };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/latte-dock" ];
+  meta = with lib; {
+    description = "Dock-style app launcher based on Plasma frameworks";
+    homepage = https://github.com/psifidotos/Latte-Dock;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.benley ];
+  };
 }
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 7df1c7383c7..4a25f88ac75 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchurl
 , kdoctools
-, kdeWrapper
+, wrapGAppsHook
 , extra-cmake-modules
 , karchive
 , kcrash
@@ -18,11 +18,10 @@
 }:
 
 let
-  unwrapped = let
-    pname = "yakuake";
-    version = "3.0.3";
-  in mkDerivation rec {
-    name = "${pname}-${version}";
+  pname = "yakuake";
+  version = "3.0.3";
+in mkDerivation rec {
+  name = "${pname}-${version}";
 
     src = fetchurl {
       url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
@@ -42,22 +41,28 @@ let
       kwindowsystem
     ];
 
-    nativeBuildInputs = [
-      extra-cmake-modules kdoctools
-    ];
+  propagatedBuildInputs = [
+    karchive
+    kcrash
+    kdbusaddons
+    ki18n
+    kiconthemes
+    knewstuff
+    knotifications
+    knotifyconfig
+    kparts
+    kwindowsystem
+  ];
 
-    meta = {
-      homepage = https://yakuake.kde.org;
-      description = "Quad-style terminal emulator for KDE";
-      maintainers = with lib.maintainers; [ fridh ];
-    };
-  };
+  propagatedUserEnvPkgs = [ konsole ];
 
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools wrapGAppsHook
+  ];
 
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/yakuake" ];
-  paths = [ konsole.unwrapped ];
+  meta = {
+    homepage = https://yakuake.kde.org;
+    description = "Quad-style terminal emulator for KDE";
+    maintainers = with lib.maintainers; [ fridh ];
+  };
 }
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 740f30874bf..26e5911a85f 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -2,14 +2,14 @@
 , lib
 , fetchurl
 , extra-cmake-modules
+, kdoctools
+, wrapGAppsHook
 , kbookmarks
 , karchive
 , kconfig
 , kconfigwidgets
 , kcoreaddons
 , kdbusaddons
-, kdeWrapper
-, kdoctools
 , kemoticons
 , kglobalaccel
 , ki18n
@@ -28,55 +28,50 @@
 }:
 
 let
-  unwrapped = let
-    pname = "konversation";
-    version = "1.6.2";
-  in mkDerivation rec {
-    name = "${pname}-${version}";
+  pname = "konversation";
+  version = "1.6.2";
+in mkDerivation rec {
+  name = "${pname}-${version}";
 
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
-    };
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
+  };
 
-    buildInputs = [
-      kbookmarks
-      karchive
-      kconfig
-      kconfigwidgets
-      kcoreaddons
-      kdbusaddons
-      kdoctools
-      kemoticons
-      kglobalaccel
-      ki18n
-      kiconthemes
-      kidletime
-      kitemviews
-      knotifications
-      knotifyconfig
-      kio
-      kparts
-      kwallet
-      solid
-      sonnet
-      phonon
-    ];
+  buildInputs = [
+    kbookmarks
+    karchive
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kdbusaddons
+    kdoctools
+    kemoticons
+    kglobalaccel
+    ki18n
+    kiconthemes
+    kidletime
+    kitemviews
+    knotifications
+    knotifyconfig
+    kio
+    kparts
+    kwallet
+    solid
+    sonnet
+    phonon
+  ];
 
-    nativeBuildInputs = [
-      extra-cmake-modules
-      kdoctools
-    ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    wrapGAppsHook
+  ];
 
-    meta = {
-      description = "Integrated IRC client for KDE";
-      license = with lib.licenses; [ gpl2 ];
-      maintainers = with lib.maintainers; [ fridh ];
-      homepage = https://konversation.kde.org;
-    };
+  meta = {
+    description = "Integrated IRC client for KDE";
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh ];
+    homepage = https://konversation.kde.org;
   };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/konversation" ];
 }
-
diff --git a/pkgs/build-support/kde/wrapper.nix b/pkgs/build-support/kde/wrapper.nix
deleted file mode 100644
index 4442b111d79..00000000000
--- a/pkgs/build-support/kde/wrapper.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ stdenv, lib, makeWrapper, buildEnv, gtk3, dconf }:
-
-packages:
-
-let
-  packages_ = if builtins.isList packages then packages else [packages];
-
-  unwrapped = lib.concatMap (p: if builtins.isList p.unwrapped then p.unwrapped else [p.unwrapped]) packages_;
-  targets = lib.concatMap (p: p.targets) packages_;
-  paths = lib.concatMap (p: p.paths or []) packages_;
-
-  name =
-    if builtins.length unwrapped == 1
-    then (lib.head unwrapped).name
-    else "kde-application";
-  meta =
-    if builtins.length unwrapped == 1
-    then (lib.head unwrapped).meta
-    else {};
-
-  env = buildEnv {
-    inherit name meta;
-    paths = builtins.map lib.getBin (unwrapped ++ paths);
-    pathsToLink = [ "/bin" "/share" "/lib/qt5" "/etc/xdg" ];
-  };
-in
-
-stdenv.mkDerivation {
-  inherit name meta;
-  preferLocalBuild = true;
-
-  inherit unwrapped env targets;
-
-  passthru = {
-    inherit targets paths;
-    unwrapped = if builtins.length unwrapped == 1 then lib.head unwrapped else unwrapped;
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    for t in $targets; do
-        good=""
-        for drv in $unwrapped; do
-            if [ -a "$drv/$t" ]; then
-                makeWrapper "$drv/$t" "$out/$t" \
-                    --argv0 '"$0"' \
-                    --suffix PATH : "$env/bin" \
-                    --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
-                    --prefix XDG_DATA_DIRS : "$env/share:${gtk3}/share/gsettings-schemas/${gtk3.name}" \
-                    --prefix QML_IMPORT_PATH : "$env/lib/qt5/imports" \
-                    --prefix QML2_IMPORT_PATH : "$env/lib/qt5/qml" \
-                    --prefix QT_PLUGIN_PATH : "$env/lib/qt5/plugins" \
-                    --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules"
-                good="1"
-                break
-            fi
-        done
-        if [ -z "$good" ]; then
-            echo "file or directory not found in derivations: $t"
-            exit 1
-        fi
-    done
-
-    mkdir -p "$out/nix-support"
-    echo "$unwrapped" > "$out/nix-support/propagated-user-env-packages"
-  '';
-}
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index c50fd8b0514..483d987686a 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -1,21 +1,15 @@
 {
-  mkDerivation, kdeWrapper,
+  mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
   ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
 }:
 
-let
-  unwrapped = mkDerivation {
-    name = "oxygen";
-    nativeBuildInputs = [ extra-cmake-modules ];
-    propagatedBuildInputs = [
-      frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
-      ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
-    ];
-  };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ];
+mkDerivation {
+  name = "oxygen";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [
+    frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
+    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
+  ];
 }
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 088d01b882d..6db3278fade 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -1,29 +1,25 @@
 {
-  mkDerivation, kdeWrapper, fetchurl, lib,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, fetchurl, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit
 }:
 
 let
   pname = "kronometer";
   version = "2.1.3";
-  unwrapped = mkDerivation rec {
-    name = "${pname}-${version}";
+in
+mkDerivation rec {
+  name = "${pname}-${version}";
 
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i";
-    };
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i";
+  };
 
-    meta = with lib; {
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [ kconfig kinit ];
+  meta = with lib; {
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
   };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kronometer" ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kconfig kinit ];
 }
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index ffee286f57f..52183a3fff3 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,31 +1,26 @@
-{ mkDerivation, kdeWrapper, fetchurl, lib
-, extra-cmake-modules, kdoctools
+{ mkDerivation, fetchurl, lib
+, extra-cmake-modules, kdoctools, wrapGAppsHook
 , kconfig, kinit, kpmcore
 , eject, libatasmart }:
 
 let
   pname = "partitionmanager";
-  unwrapped = mkDerivation rec {
-    name = "${pname}-${version}";
-    version = "3.0.1";
+in mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "3.0.1";
 
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410";
-    };
-
-    meta = with lib; {
-      description = "KDE Partition Manager";
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    # refer to kpmcore for the use of eject
-    buildInputs = [ eject libatasmart ];
-    propagatedBuildInputs = [ kconfig kinit kpmcore ];
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410";
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/partitionmanager" ];
+  meta = with lib; {
+    description = "KDE Partition Manager";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  # refer to kpmcore for the use of eject
+  buildInputs = [ eject libatasmart ];
+  propagatedBuildInputs = [ kconfig kinit kpmcore ];
 }
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 5b5cbbf59cf..cd872fd966e 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,6 +1,6 @@
 {
-  mkDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, fetchFromGitHub, fetchurl, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
 
@@ -13,33 +13,28 @@ let
     rev    = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
     sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
   };
-  unwrapped = mkDerivation rec {
-    name = "${pname}-${version}";
+in mkDerivation rec {
+  name = "${pname}-${version}";
 
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${name}.tar.xz";
-      sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
-    };
-
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${name}.tar.xz";
+    sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
+  };
 
-    propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
 
-    pathsToLink = [ "/etc/xdg/peruse.knsrc"];
+  propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
 
-    preConfigure = ''
-      rm -rf src/qtquick/karchive-rar/external/unarr
-      ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
-    '';
+  pathsToLink = [ "/etc/xdg/peruse.knsrc"];
 
-    meta = with lib; {
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
+  preConfigure = ''
+    rm -rf src/qtquick/karchive-rar/external/unarr
+    ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
+  '';
 
+  meta = with lib; {
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/peruse" "bin/perusecreator" ];
 }
diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix
index c6217024f1b..c655e9aecf8 100644
--- a/pkgs/tools/security/kwalletcli/default.nix
+++ b/pkgs/tools/security/kwalletcli/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchurl, lib,
+  mkDerivation, fetchurl, lib,
   pkgconfig,
   kcoreaddons, ki18n, kwallet,
   mksh
@@ -8,48 +8,42 @@
 let
   pname = "kwalletcli";
   version = "3.00";
+in
+mkDerivation rec {
+  name = "${pname}-${version}";
 
-  unwrapped = kdeDerivation rec {
-    name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz";
-      sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98";
-    };
-
-    postPatch = ''
-      substituteInPlace GNUmakefile \
-        --replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \
-        --replace '-I/usr/include/KF5/KI18n'       '-I${ki18n.dev}/include/KF5/KI18n' \
-        --replace '-I/usr/include/KF5/KWallet'     '-I${kwallet.dev}/include/KF5/KWallet' \
-        --replace /usr/bin                         $out/bin \
-        --replace /usr/share/man                   $out/share/man
-    '';
-
-    makeFlags = [ "KDE_VER=5" ];
-
-    # we need this when building against qt 5.8+
-    NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
-
-    nativeBuildInputs = [ pkgconfig ];
-    # if using just kwallet, cmake will be added as a buildInput and fail the build
-    propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
-
-    preInstall = ''
-      mkdir -p $out/bin $out/share/man/man1
-    '';
-
-    meta = with lib; {
-      description = "Command-Line Interface to the KDE Wallet";
-      homepage = http://www.mirbsd.org/kwalletcli.htm;
-      license = licenses.miros;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
+  src = fetchurl {
+    url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz";
+    sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98";
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = map (b: "bin/" + b)
-    [ "kwalletaskpass" "kwalletcli" "kwalletcli_getpin" "pinentry-kwallet" ];
-  paths = [ mksh ];
+  postPatch = ''
+    substituteInPlace GNUmakefile \
+      --replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \
+      --replace '-I/usr/include/KF5/KI18n'       '-I${ki18n.dev}/include/KF5/KI18n' \
+      --replace '-I/usr/include/KF5/KWallet'     '-I${kwallet.dev}/include/KF5/KWallet' \
+      --replace /usr/bin                         $out/bin \
+      --replace /usr/share/man                   $out/share/man
+  '';
+
+  makeFlags = [ "KDE_VER=5" ];
+
+  # we need this when building against qt 5.8+
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  # if using just kwallet, cmake will be added as a buildInput and fail the build
+  propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
+  propagatedUserEnvPkgs = [ mksh ];
+
+  preInstall = ''
+    mkdir -p $out/bin $out/share/man/man1
+  '';
+
+  meta = with lib; {
+    description = "Command-Line Interface to the KDE Wallet";
+    homepage = http://www.mirbsd.org/kwalletcli.htm;
+    license = licenses.miros;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
 }
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index 3263fe09f6f..e1a2f157085 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,49 +1,44 @@
 {
-  mkDerivation, lib, kdeWrapper, fetchgit, fetchpatch,
-  extra-cmake-modules, kdoctools, kconfig, kinit, kparts
+  mkDerivation, lib, fetchgit, fetchpatch,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  kconfig, kinit, kparts
 }:
 
-let
-  unwrapped = mkDerivation rec {
-    name = "kdiff3-${version}";
-    version = "1.7.0-2017-02-19";
-
-    src = fetchgit {
-      # gitlab is outdated
-      url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git;
-      sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8";
-      rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f";
-    };
-
-    setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
-
-    patches = [
-      (fetchpatch {
-        name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
-        url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
-        sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
-      })
-    ];
-    patchFlags = "-p 2";
-
-    postPatch = ''
-      sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
-    '';
-
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-
-    propagatedBuildInputs = [ kconfig kinit kparts ];
-
-    meta = with lib; {
-      homepage = http://kdiff3.sourceforge.net/;
-      license = licenses.gpl2Plus;
-      description = "Compares and merges 2 or 3 files or directories";
-      maintainers = with maintainers; [ viric peterhoeg ];
-      platforms = with platforms; linux;
-    };
+mkDerivation rec {
+  name = "kdiff3-${version}";
+  version = "1.7.0-2017-02-19";
+
+  src = fetchgit {
+    # gitlab is outdated
+    url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git;
+    sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8";
+    rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f";
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kdiff3" ];
+  setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
+
+  patches = [
+    (fetchpatch {
+      name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
+      url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
+      sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
+    })
+  ];
+  patchFlags = "-p 2";
+
+  postPatch = ''
+    sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
+  '';
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+
+  propagatedBuildInputs = [ kconfig kinit kparts ];
+
+  meta = with lib; {
+    homepage = http://kdiff3.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    description = "Compares and merges 2 or 3 files or directories";
+    maintainers = with maintainers; [ viric peterhoeg ];
+    platforms = with platforms; linux;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d730991ffdf..ec153fd4666 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -292,10 +292,6 @@ with pkgs;
       inherit kernel rootModules allowMissing;
     };
 
-  kdeWrapper = callPackage ../build-support/kde/wrapper.nix {
-    inherit (gnome3) dconf;
-  };
-
   nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
-- 
GitLab


From 870c07cc2b020b507238ef6f71003add14ec5cfc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 17 May 2017 09:21:11 -0500
Subject: [PATCH 0876/1490] sddm: take themes from system environment

---
 .../services/x11/desktop-managers/plasma5.nix |   1 -
 .../services/x11/display-managers/sddm.nix    |  26 ++-
 .../display-managers/sddm/default.nix         | 159 ++++++------------
 ...e.patch => sddm-ignore-config-mtime.patch} |   0
 .../sddm/sddm-nix-profiles.patch              |  24 +++
 .../applications/display-managers/sddm/series |   2 +
 pkgs/top-level/all-packages.nix               |  11 +-
 7 files changed, 94 insertions(+), 129 deletions(-)
 rename pkgs/applications/display-managers/sddm/{0001-ignore-config-mtime.patch => sddm-ignore-config-mtime.patch} (100%)
 create mode 100644 pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
 create mode 100644 pkgs/applications/display-managers/sddm/series

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 27678fda1b5..0a64429c24f 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -190,7 +190,6 @@ in
 
       services.xserver.displayManager.sddm = {
         theme = "breeze";
-        package = pkgs.sddmPlasma5;
       };
 
       security.pam.services.kde = { allowNullPassword = true; };
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 2eb7ddcb1ec..bf516235eb2 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -9,7 +9,7 @@ let
   cfg = dmcfg.sddm;
   xEnv = config.systemd.services."display-manager".environment;
 
-  sddm = cfg.package;
+  inherit (pkgs) sddm;
 
   xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
     #!/bin/sh
@@ -37,8 +37,8 @@ let
 
     [Theme]
     Current=${cfg.theme}
-    ThemeDir=${sddm}/share/sddm/themes
-    FacesDir=${sddm}/share/sddm/faces
+    ThemeDir=/run/current-system/sw/share/sddm/themes
+    FacesDir=/run/current-system/sw/share/sddm/faces
 
     [Users]
     MaximumUid=${toString config.ids.uids.nixbld}
@@ -105,15 +105,6 @@ in
         '';
       };
 
-      package = mkOption {
-        type = types.package;
-        default = pkgs.sddm;
-        description = ''
-          The SDDM package to install.
-          The default package can be overridden to provide extra themes.
-        '';
-      };
-
       autoNumlock = mkOption {
         type = types.bool;
         default = false;
@@ -205,7 +196,13 @@ in
     services.xserver.displayManager.job = {
       logsXsession = true;
 
-      execCmd = "exec ${sddm}/bin/sddm";
+      environment = {
+        # Take themes system environment
+        NIX_PROFILES = "/run/current-system/sw";
+        XDG_DATA_DIRS = "/run/current-system/sw/share";
+      };
+
+      execCmd = "exec /run/current-system/sw/bin/sddm";
     };
 
     security.pam.services = {
@@ -254,7 +251,8 @@ in
 
     users.extraGroups.sddm.gid = config.ids.gids.sddm;
 
-    services.dbus.packages = [ sddm.unwrapped ];
+    environment.systemPackages = [ sddm ];
+    services.dbus.packages = [ sddm ];
 
     # To enable user switching, allow sddm to allocate TTYs/displays dynamically.
     services.xserver.tty = null;
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 07c1e8cee33..d54fb455fcb 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,121 +1,72 @@
-{ stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch
+{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch
 , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
-, themes
 }:
 
 let
-  version = "0.14.0";
-
-  unwrapped = stdenv.mkDerivation rec {
-    name = "sddm-unwrapped-${version}";
-
-    src = fetchFromGitHub {
-      owner = "sddm";
-      repo = "sddm";
-      rev = "v${version}";
-      sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
-    };
-
-    patches = [
-      ./0001-ignore-config-mtime.patch
-      (fetchpatch { /* Fix display of user avatars. */
-        url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
-        sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
-      })
-    ];
-
-    postPatch =
-      # Module Qt5::Test must be included in `find_package` before it is used.
-      ''
-        sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
-      '';
-
-    nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
-
-    buildInputs = [
-      libxcb libpthreadstubs libXdmcp libXau pam systemd
-    ];
-
-    propagatedBuildInputs = [
-      qtbase qtdeclarative
-    ];
-
-    cmakeFlags = [
-      "-DCONFIG_FILE=/etc/sddm.conf"
-      # Set UID_MIN and UID_MAX so that the build script won't try
-      # to read them from /etc/login.defs (fails in chroot).
-      # The values come from NixOS; they may not be appropriate
-      # for running SDDM outside NixOS, but that configuration is
-      # not supported anyway.
-      "-DUID_MIN=1000"
-      "-DUID_MAX=29999"
-    ];
-
-    preConfigure = ''
-      export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
-    '';
 
-    enableParallelBuilding = true;
-
-    postInstall = ''
-      # remove empty scripts
-      rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"
-    '';
+  version = "0.14.0";
 
-    meta = with stdenv.lib; {
-      description = "QML based X11 display manager";
-      homepage = "https://github.com/sddm/sddm";
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ abbradar ttuegel ];
-    };
+  /* Fix display of user avatars. */
+  patchFixUserAvatars = fetchpatch {
+    url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
+    sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
   };
 
-in
-
-stdenv.mkDerivation {
-  name = "sddm-${version}";
-
-  nativeBuildInputs = [ lndir makeQtWrapper ];
-  buildInputs = [ unwrapped ] ++ themes;
-  themes = map (pkg: pkg.out or pkg) themes;
-  inherit unwrapped;
-
-  unpackPhase = "true";
-  configurePhase = "runHook preConfigure; runHook postConfigure";
-  buildPhase = "runHook preBuild; runHook postBuild";
+in mkDerivation rec {
+  name = "sddm-unwrapped-${version}";
 
-  installPhase = ''
-    runHook preInstall
-
-    propagated=
-    for i in $unwrapped $themes; do
-      findInputs $i propagated propagated-user-env-packages
-      if [ -z "$crossConfig" ]; then
-          findInputs $i propagated propagated-native-build-inputs
-      else
-          findInputs $i propagated propagated-build-inputs
-      fi
-    done
+  src = fetchFromGitHub {
+    owner = "sddm";
+    repo = "sddm";
+    rev = "v${version}";
+    sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
+  };
 
-    for pkg in $propagated; do
-      addToSearchPath RUNTIME_XDG_DATA_DIRS "$pkg/share"
-      addToSearchPath RUNTIME_XDG_CONFIG_DIRS "$pkg/etc/xdg"
-    done
+  patches =
+    copyPathsToStore (lib.readPathsFromFile ./. ./series)
+    ++ [ patchFixUserAvatars ];
 
-    mkdir -p "$out/bin"
-    makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
+  postPatch =
+    # Module Qt5::Test must be included in `find_package` before it is used.
+    ''
+      sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
+    '';
 
-    mkdir -p "$out/share/sddm"
-    for pkg in $unwrapped $themes; do
-        local sddmDir="$pkg/share/sddm"
-        if [ -d "$sddmDir" ]; then
-            lndir -silent "$sddmDir" "$out/share/sddm"
-        fi
-    done
+  nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
+
+  buildInputs = [
+    libxcb libpthreadstubs libXdmcp libXau pam systemd
+  ];
+
+  propagatedBuildInputs = [
+    qtbase qtdeclarative
+  ];
+
+  cmakeFlags = [
+    "-DCONFIG_FILE=/etc/sddm.conf"
+    # Set UID_MIN and UID_MAX so that the build script won't try
+    # to read them from /etc/login.defs (fails in chroot).
+    # The values come from NixOS; they may not be appropriate
+    # for running SDDM outside NixOS, but that configuration is
+    # not supported anyway.
+    "-DUID_MIN=1000"
+    "-DUID_MAX=29999"
+  ];
+
+  preConfigure = ''
+    export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
+  '';
 
-    runHook postInstall
+  postInstall = ''
+    # remove empty scripts
+    rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"
   '';
 
-  inherit (unwrapped) meta;
+  meta = with lib; {
+    description = "QML based X11 display manager";
+    homepage = "https://github.com/sddm/sddm";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ttuegel ];
+  };
 }
diff --git a/pkgs/applications/display-managers/sddm/0001-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
similarity index 100%
rename from pkgs/applications/display-managers/sddm/0001-ignore-config-mtime.patch
rename to pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
diff --git a/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch b/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
new file mode 100644
index 00000000000..1783164af46
--- /dev/null
+++ b/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
@@ -0,0 +1,24 @@
+Index: sddm-0.14.0/src/daemon/Greeter.cpp
+===================================================================
+--- sddm-0.14.0.orig/src/daemon/Greeter.cpp
++++ sddm-0.14.0/src/daemon/Greeter.cpp
+@@ -157,18 +157,7 @@ namespace SDDM {
+                 << args;
+ 
+             // greeter environment
+-            QProcessEnvironment env;
+-            QProcessEnvironment sysenv = QProcessEnvironment::systemEnvironment();
+-
+-            insertEnvironmentList({QStringLiteral("LANG"), QStringLiteral("LANGUAGE"),
+-                                   QStringLiteral("LC_CTYPE"), QStringLiteral("LC_NUMERIC"), QStringLiteral("LC_TIME"), QStringLiteral("LC_COLLATE"),
+-                                   QStringLiteral("LC_MONETARY"), QStringLiteral("LC_MESSAGES"), QStringLiteral("LC_PAPER"), QStringLiteral("LC_NAME"),
+-                                   QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION"),
+-                                   QStringLiteral("LD_LIBRARY_PATH"),
+-                                   QStringLiteral("QML2_IMPORT_PATH"),
+-                                   QStringLiteral("QT_PLUGIN_PATH"),
+-                                   QStringLiteral("XDG_DATA_DIRS")
+-            }, sysenv, env);
++            QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+ 
+             env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());
+             env.insert(QStringLiteral("DISPLAY"), m_display->name());
diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series
new file mode 100644
index 00000000000..703fb6a3fe1
--- /dev/null
+++ b/pkgs/applications/display-managers/sddm/series
@@ -0,0 +1,2 @@
+sddm-ignore-config-mtime.patch
+sddm-nix-profiles.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec153fd4666..13ec940b1c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15866,16 +15866,7 @@ with pkgs;
 
   printrun = callPackage ../applications/misc/printrun { };
 
-  sddm = libsForQt5.callPackage ../applications/display-managers/sddm {
-    themes = [];  # extra themes, etc.
-  };
-
-  sddmPlasma5 = sddm.override {
-    themes = [
-      plasma5.plasma-workspace
-      pkgs.breeze-icons
-    ];
-  };
+  sddm = libsForQt5.callPackage ../applications/display-managers/sddm { };
 
   skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
 
-- 
GitLab


From 1607f51613fc63a6fbfc1884c55a9efea06161b3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 17 May 2017 14:25:42 -0500
Subject: [PATCH 0877/1490] qmake: unify Darwin and Linux setup hooks

---
 .../libraries/qt-5/5.6/default.nix            |  8 ++--
 .../libraries/qt-5/5.8/default.nix            |  8 ++--
 .../libraries/qt-5/qmake-hook-darwin.sh       | 42 -------------------
 pkgs/development/libraries/qt-5/qmake-hook.sh |  7 +++-
 4 files changed, 14 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/qmake-hook-darwin.sh

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 586a8d584da..37065edc440 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -151,10 +151,10 @@ let
         { deps = [ makeWrapper ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
-      qmake =
-        makeSetupHook
-        { deps = [ self.qtbase.dev ]; }
-        (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
+      qmake = makeSetupHook {
+        deps = [ self.qtbase.dev ];
+        substitutions = { inherit (stdenv) isDarwin; };
+      } ../qmake-hook.sh;
     };
 
    self = makeScope newScope addPackages;
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 399c0415b11..1000bf09b17 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -138,11 +138,11 @@ let
         { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
-      qmake =
-        makeSetupHook
-        { deps = [ self.qtbase.dev ]; }
-        (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
 
+      qmake = makeSetupHook {
+        deps = [ self.qtbase.dev ];
+        substitutions = { inherit (stdenv) isDarwin; };
+      } ../qmake-hook.sh;
     };
 
    self = makeScope newScope addPackages;
diff --git a/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh b/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh
deleted file mode 100644
index c359cb4ee6a..00000000000
--- a/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-qmakeConfigurePhase() {
-    runHook preConfigure
-
-    qmake PREFIX=$out $qmakeFlags
-
-    runHook postConfigure
-}
-
-if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then
-    configurePhase=qmakeConfigurePhase
-fi
-
-_qtModuleMultioutDevsPre() {
-    # We cannot simply set these paths in configureFlags because libQtCore retains
-    # references to the paths it was built with.
-    moveToOutput "bin" "${!outputDev}"
-    moveToOutput "include" "${!outputDev}"
-
-    # The destination directory must exist or moveToOutput will do nothing
-    mkdir -p "${!outputDev}/share"
-    moveToOutput "share/doc" "${!outputDev}"
-}
-
-_qtModuleMultioutDevsPost() {
-    # Move libtool archives and qmake project files to $dev/lib
-    if [ "z${!outputLib}" != "z${!outputDev}" ]; then
-        pushd "${!outputLib}"
-        if [ -d "lib" ]; then
-            find lib \( -name '*.a' -o -name '*.la' \) -print0 | \
-                while read -r -d $'\0' file; do
-                    mkdir -p "${!outputDev}/$(dirname "$file")"
-                    mv "${!outputLib}/$file" "${!outputDev}/$file"
-                done
-        fi
-        popd
-    fi
-}
-
-if [ -n "$NIX_QT_SUBMODULE" ]; then
-    preFixupHooks+=(_qtModuleMultioutDevsPre)
-    postFixupHooks+=(_qtModuleMultioutDevsPost)
-fi
diff --git a/pkgs/development/libraries/qt-5/qmake-hook.sh b/pkgs/development/libraries/qt-5/qmake-hook.sh
index 696b4ea8dad..c70410975ec 100644
--- a/pkgs/development/libraries/qt-5/qmake-hook.sh
+++ b/pkgs/development/libraries/qt-5/qmake-hook.sh
@@ -22,11 +22,16 @@ _qtModuleMultioutDevsPre() {
 }
 
 _qtModuleMultioutDevsPost() {
+    local -a findopts=(-name '*.a' -o -name '*.la')
+    if [ -z "@isDarwin@" ]; then
+        findopts+=(-o -name '*.prl')
+    fi
+
     # Move libtool archives and qmake project files to $dev/lib
     if [ "z${!outputLib}" != "z${!outputDev}" ]; then
         pushd "${!outputLib}"
         if [ -d "lib" ]; then
-            find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \
+            find lib \( "${findopts[@]}" \) -print0 | \
                 while read -r -d $'\0' file; do
                     mkdir -p "${!outputDev}/$(dirname "$file")"
                     mv "${!outputLib}/$file" "${!outputDev}/$file"
-- 
GitLab


From c816bbc8a86c7ea6c09ca42e1694fe08003a55fc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 17 May 2017 14:26:11 -0500
Subject: [PATCH 0878/1490] qt5: remove makeQtWrapper

---
 pkgs/applications/audio/audacious/qt-5.nix    | 18 +++-----
 pkgs/applications/audio/cantata/default.nix   |  8 +---
 pkgs/applications/audio/dfasma/default.nix    |  8 +---
 .../audio/sonic-visualiser/default.nix        |  5 +--
 .../editors/kdevelop5/kdevelop.nix            |  4 +-
 .../editors/kdevelop5/kdevplatform.nix        |  7 ++-
 pkgs/applications/editors/neovim/qt.nix       |  8 ++--
 pkgs/applications/graphics/ipe/default.nix    |  9 ++--
 pkgs/applications/graphics/krita/default.nix  | 16 ++-----
 .../applications/graphics/photoqt/default.nix |  9 ++--
 .../graphics/renderdoc/default.nix            |  8 ++--
 pkgs/applications/kde/ark/default.nix         | 10 ++---
 pkgs/applications/kde/filelight.nix           |  4 +-
 pkgs/applications/kde/gwenview.nix            | 14 +++---
 pkgs/applications/kde/k3b.nix                 | 11 ++---
 pkgs/applications/kde/kate.nix                |  7 +--
 pkgs/applications/kde/kcachegrind.nix         |  7 +--
 pkgs/applications/kde/kcalc.nix               |  4 +-
 pkgs/applications/kde/kcolorchooser.nix       |  4 +-
 pkgs/applications/kde/kcontacts.nix           |  3 +-
 pkgs/applications/kde/kdenlive.nix            | 21 ++++-----
 pkgs/applications/kde/kdf.nix                 |  4 +-
 pkgs/applications/kde/kgpg.nix                | 17 ++++----
 pkgs/applications/kde/khelpcenter.nix         | 11 ++---
 pkgs/applications/kde/kig.nix                 |  9 ++--
 pkgs/applications/kde/kmix.nix                |  4 +-
 pkgs/applications/kde/kolourpaint.nix         |  3 +-
 pkgs/applications/kde/kompare.nix             |  4 +-
 pkgs/applications/kde/konsole.nix             | 12 +++---
 pkgs/applications/kde/krfb.nix                |  7 +--
 pkgs/applications/kde/kwalletmanager.nix      |  3 +-
 pkgs/applications/kde/marble.nix              |  4 +-
 pkgs/applications/kde/okteta.nix              |  7 ++-
 pkgs/applications/kde/okular.nix              | 13 +++---
 pkgs/applications/kde/print-manager.nix       | 14 +++---
 pkgs/applications/kde/spectacle.nix           | 13 +++---
 pkgs/applications/misc/albert/default.nix     | 12 ++----
 .../misc/cool-retro-term/default.nix          |  6 +--
 pkgs/applications/misc/cura/default.nix       | 10 ++---
 .../misc/golden-cheetah/default.nix           | 10 ++---
 pkgs/applications/misc/gpxsee/default.nix     |  5 +--
 pkgs/applications/misc/kdeconnect/default.nix | 10 +----
 pkgs/applications/misc/openbrf/default.nix    |  6 +--
 .../misc/qsyncthingtray/default.nix           | 12 +++---
 pkgs/applications/misc/qtpass/default.nix     |  8 ++--
 .../misc/redis-desktop-manager/default.nix    |  5 +--
 pkgs/applications/misc/xca/default.nix        | 17 +++-----
 .../browsers/qutebrowser/default.nix          |  9 ++--
 .../networking/dropbox/default.nix            | 13 +++---
 .../instant-messengers/qtox/default.nix       | 13 +++---
 .../instant-messengers/quaternion/default.nix | 12 ++----
 .../instant-messengers/ricochet/default.nix   |  5 +--
 .../telegram/cutegram/default.nix             |  6 +--
 .../telegram/tdesktop/default.nix             | 11 +++--
 .../instant-messengers/tensor/default.nix     |  6 +--
 .../networking/irc/communi/default.nix        |  5 +--
 .../networking/irc/konversation/default.nix   |  3 --
 .../mailreaders/trojita/default.nix           | 18 +++-----
 .../networking/mumble/default.nix             |  6 +--
 .../newsreaders/quiterss/default.nix          |  8 +---
 pkgs/applications/office/mendeley/default.nix |  5 ++-
 pkgs/applications/office/mytetra/default.nix  |  6 +--
 pkgs/applications/office/skrooge/default.nix  | 16 +++----
 .../science/astronomy/stellarium/default.nix  | 27 +++++-------
 .../science/electronics/fritzing/default.nix  | 10 +----
 .../science/math/speedcrunch/default.nix      | 14 ++----
 .../robotics/qgroundcontrol/default.nix       |  6 +--
 pkgs/applications/video/bomi/default.nix      | 10 ++---
 .../video/openshot-qt/default.nix             |  2 +-
 pkgs/applications/video/shotcut/default.nix   |  6 +--
 .../virtualization/virt-manager/qt.nix        | 18 +++-----
 .../virtualization/virtualbox/default.nix     |  8 +---
 pkgs/desktops/plasma-5/systemsettings.nix     |  2 +-
 .../development/libraries/libqtav/default.nix | 14 ++----
 .../libraries/qt-5/5.6/default.nix            |  5 ---
 .../libraries/qt-5/5.8/default.nix            |  6 ---
 .../qt-5/5.8/qtdeclarative/default.nix        | 12 +-----
 .../libraries/qt-5/5.8/qttools/default.nix    | 16 +------
 .../libraries/qt-5/make-qt-wrapper-darwin.sh  | 35 ---------------
 .../libraries/qt-5/make-qt-wrapper.sh         | 43 -------------------
 pkgs/development/qtcreator/default.nix        |  5 +--
 .../tools/analysis/qcachegrind/default.nix    |  6 +--
 .../tools/database/sqlitebrowser/default.nix  | 18 +++-----
 pkgs/development/tools/tora/default.nix       | 12 +++---
 pkgs/development/tools/vogl/default.nix       | 20 ++++-----
 pkgs/os-specific/linux/v4l-utils/default.nix  |  8 +---
 pkgs/tools/audio/qastools/default.nix         | 11 +++--
 pkgs/tools/misc/antimicro/default.nix         | 13 +++---
 pkgs/tools/misc/qt5ct/default.nix             |  6 +--
 pkgs/tools/misc/radeon-profile/default.nix    |  5 +--
 pkgs/tools/misc/rockbox-utility/default.nix   |  6 +--
 pkgs/top-level/all-packages.nix               |  8 ++--
 92 files changed, 323 insertions(+), 582 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
 delete mode 100644 pkgs/development/libraries/qt-5/make-qt-wrapper.sh

diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index 663e0eb0cc8..da143c7d946 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -1,6 +1,6 @@
 {
-  stdenv, lib, fetchurl,
-  gettext, makeQtWrapper, pkgconfig,
+  mkDerivation, lib, fetchurl,
+  gettext, pkgconfig,
   qtbase,
   alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
   libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug,
@@ -24,16 +24,14 @@ let
   };
 in
 
-stdenv.mkDerivation {
+mkDerivation {
   inherit version;
   name = "audacious-qt5-${version}";
 
   sourceFiles = lib.attrValues sources;
   sourceRoots = lib.attrNames sources;
 
-  nativeBuildInputs = [
-    gettext makeQtWrapper pkgconfig
-  ];
+  nativeBuildInputs = [ gettext pkgconfig ];
 
   buildInputs = [
     # Core dependencies
@@ -68,15 +66,9 @@ stdenv.mkDerivation {
       fi
 
     done
-
-    source $stdenv/setup
-    wrapQtProgram $out/bin/audacious
-    wrapQtProgram $out/bin/audtool
   '';
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Audio player";
     homepage = http://audacious-media-player.org/;
     maintainers = with maintainers; [ ttuegel ];
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 3231e3e5301..82a6d44f643 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, vlc
 , withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper
+, withQt5 ? true, qtbase, qtsvg, qttools
 
 # Cantata doesn't build with cdparanoia enabled so we disable that
 # default for now until I (or someone else) figure it out.
@@ -63,8 +63,6 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
     ++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
 
-  nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;
-
   cmakeFlags = stdenv.lib.flatten [
     (fstat withQt5 "QT5")
     (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
@@ -88,10 +86,6 @@ stdenv.mkDerivation rec {
     sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
   '';
 
-  postInstall = stdenv.lib.optionalString withQt5 ''
-    wrapQtProgram "$out/bin/cantata"
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://github.com/cdrummond/cantata;
     description = "A graphical client for MPD";
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 53ca8d316a2..918accb4e16 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
 
 let
 
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
 
   postPatch = ''
     substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
@@ -53,10 +53,6 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = ''
-    wrapQtProgram "$out/bin/dfasma"
-  '';
-
   meta = with stdenv.lib; {
     description = "Analyse and compare audio files in time and frequency";
     longDescription = ''
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d1e9b50dee3..bdb9911d365 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -2,7 +2,7 @@
 
 { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland
+, libsndfile, pkgconfig, libpulseaudio, qtbase, redland
 , qmake, rubberband, serd, sord, vampSDK, fftwFloat
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       libX11
     ];
 
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  nativeBuildInputs = [ pkgconfig qmake ];
 
   configurePhase = ''
     for i in sonic-visualiser svapp svcore svgui;
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,share/sonic-visualiser}
     cp sonic-visualiser $out/bin/
     cp -r samples $out/share/sonic-visualiser/
-    wrapQtProgram "$out/bin/sonic-visualiser"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index d4f07d82bf0..bbd9be22074 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules
 , qtquickcontrols, qtwebkit, qttools, kde-cli-tools
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
@@ -21,7 +21,7 @@ mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cmake gettext pkgconfig extra-cmake-modules makeWrapper wrapGAppsHook
+    cmake gettext pkgconfig extra-cmake-modules makeWrapper
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index d3680aff3d8..3efc1335c07 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
+{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules
 , boost, subversion, apr, aprutil
 , qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
 , kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  
+
   src = fetchurl {
     url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz";
     sha256 = "3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726";
@@ -25,9 +25,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ];
 
-  propagatedBuildInputs = [ ];
   buildInputs = [
     boost subversion apr aprutil
     qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 57f52f0e5fc..e24ca50a024 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen
-, libmsgpack, makeQtWrapper, neovim, pythonPackages, qtbase }:
+{ stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper
+, libmsgpack, neovim, pythonPackages, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "neovim-qt-${version}";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     jinja2 msgpack python
   ]);
 
-  nativeBuildInputs = [ cmake doxygen makeQtWrapper ];
+  nativeBuildInputs = [ cmake doxygen makeWrapper ];
 
   enableParallelBuilding = true;
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapQtProgram "$out/bin/nvim-qt" \
+    wrapProgram "$out/bin/nvim-qt" \
       --prefix PATH : "${neovim}/bin"
   '';
 
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 4a99d0ea4a1..2b1b1f8da8a 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
+{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
 , libjpeg, qtbase
-, makeQtWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -28,14 +27,14 @@ stdenv.mkDerivation rec {
   LUA_PACKAGE = "lua";
 
   buildInputs = [
-    libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript
+    libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript
   ];
 
-  nativeBuildInputs = [ makeQtWrapper ];
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
 
   postFixup = ''
     for prog in $out/bin/*; do
-      wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin"
+      wrapProgram "$prog" --prefix PATH : "${texlive}/bin"
     done
   '';
 
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index c82d1565a55..121afdf2084 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules
 , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
 , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
 , kio, kcrash
@@ -6,7 +6,7 @@
 , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "krita-${version}";
   ver_min = "3.1.3";
   version = "${ver_min}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "125js6c8aw4bqhs28pwnl3rbgqx5yx4zsklw7bfdhy3vf6lrysw1";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
 
   buildInputs = [
     karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
@@ -27,15 +27,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
 
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    for i in $out/bin/*; do
-      wrapQtProgram "$i"
-    done
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free an open source painting application";
     homepage = "https://krita.org/";
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index f9b24581929..d6bcdee4137 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, makeQtWrapper, exiv2, graphicsmagick
+{ stdenv, fetchurl, cmake, exiv2, graphicsmagick
 , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools
 }:
 
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [
-    cmake makeQtWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick
+    qtbase qtquickcontrols qttools exiv2 graphicsmagick
     qtmultimedia qtdeclarative
   ];
 
@@ -21,10 +22,6 @@ stdenv.mkDerivation rec {
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
   '';
 
-  postInstall = ''
-    wrapQtProgram $out/bin/photoqt
-  '';
-
   meta = {
     homepage = "http://photoqt.org/";
     description = "Simple, yet powerful and good looking image viewer";
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index be4457c932f..d69f9a676c1 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras
-, pkgconfig, xorg, makeQtWrapper, vulkan-loader
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig
+, qtbase, qtx11extras, vulkan-loader, xorg
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader
   ];
-  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
 
   cmakeFlags = [
     "-DBUILD_VERSION_HASH=${src.rev}-distro-nix"
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     mkdir $out/bin/.bin
     mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc
     ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc
-    wrapQtProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+    wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
     mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd
     ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd
     wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index f52f30c7917..f2976c38c39 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, config, wrapGAppsHook,
+  mkDerivation, lib, config, makeWrapper,
 
   extra-cmake-modules, kdoctools,
 
@@ -15,20 +15,18 @@
 
 mkDerivation {
   name = "ark";
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools wrapGAppsHook
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
   propagatedBuildInputs = [
     khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
     kpty kwidgetsaddons libarchive kitemmodels
   ];
-  preFixup =
+  postFixup =
     let
       PATH =
         lib.makeBinPath
         ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
     in ''
-      gappsWrapperArgs+=(--prefix PATH : "${PATH}")
+      wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
     '';
   meta = {
     license = with lib.licenses;
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index d3925d54988..6eb219d8da9 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kio, kparts, kxmlgui, qtscript, solid
 }:
 
@@ -10,7 +10,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ fridh vcunat ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kio kparts kxmlgui qtscript solid
   ];
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index d206e901f8e..99be13ba7f8 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -1,8 +1,9 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
-  baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
-  libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
+  extra-cmake-modules, kdoctools,
+  exiv2, lcms2,
+  baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
+  phonon, qtimageformats, qtsvg, qtx11extras
 }:
 
 mkDerivation {
@@ -11,10 +12,11 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ exiv2 lcms2 ];
   propagatedBuildInputs = [
-    baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
-    libkipi phonon qtimageformats qtsvg qtx11extras
+    baloo kactivities kdelibs4support kio libkdcraw libkipi phonon
+    qtimageformats qtsvg qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index 6fd6fbee9f5..e1f1132a08f 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,6 +1,7 @@
-{ mkDerivation, lib, wrapGAppsHook, extra-cmake-modules
+{ mkDerivation, lib
+, extra-cmake-modules, kdoctools, makeWrapper
 , qtwebkit
-, libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
+, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
@@ -14,7 +15,7 @@ mkDerivation {
     maintainers = with maintainers; [ sander phreedom ];
     platforms = platforms.linux;
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
   propagatedBuildInputs = [
     # qt
     qtwebkit
@@ -29,12 +30,12 @@ mkDerivation {
     # others
     ffmpeg libmusicbrainz2
   ];
-  preFixup =
+  postFixup =
     let k3bPath = lib.makeBinPath [
           cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
           vcdimager
         ];
     in ''
-      gappsWrapperArgs+=(--prefix PATH : "${k3bPath}")
+      wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}"
     '';
 }
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index 357abf96505..e6b4f6b6bdd 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
   kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
@@ -13,12 +13,13 @@ mkDerivation {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ libgit2 ];
   propagatedBuildInputs = [
     kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
     qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
     kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
-    knewstuff libgit2
+    knewstuff
   ];
   propagatedUserEnvPkgs = [ konsole ];
 }
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index c45edc87f89..a8833cfbf59 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kio, ki18n,
   perl, python, php
 }:
@@ -11,10 +11,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ orivej ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kio ];
   buildInputs = [ perl python php ki18n ];
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ perl php python]}")
-  '';
 }
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 2a3d7e17a55..856da42c835 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
 }:
 
@@ -10,7 +10,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.fridh ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ gmp ];
   propagatedBuildInputs = [
     kconfig kconfigwidgets kguiaddons kinit knotifications
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index 5f33611f29a..186505a050c 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, wrapGAppsHook,
+  extra-cmake-modules,
   ki18n, kwidgetsaddons, kxmlgui
 }:
 
@@ -10,7 +10,7 @@ mkDerivation {
     license = with lib.licenses; [ mit ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ ki18n ];
   propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
 }
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index a56ca684545..e7876d0d43e 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,6 +1,7 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, ki18n,
+  extra-cmake-modules,
+  ki18n,
   kcoreaddons, kconfig, kcodecs
 }:
 
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index c9929026aa6..854e346e290 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -2,7 +2,6 @@
 , lib
 , extra-cmake-modules
 , kdoctools
-, wrapGAppsHook
 , qtscript
 , kactivities
 , kconfig
@@ -39,16 +38,16 @@ mkDerivation {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    wrapGAppsHook
   ];
   buildInputs = [
-    qtscript
     kconfig
     kcrash
+    kdbusaddons
+    kfilemetadata
     kguiaddons
+    ki18n
     kiconthemes
     kinit
-    kdbusaddons
     knotifications
     knewstuff
     karchive
@@ -56,16 +55,18 @@ mkDerivation {
     kplotting
     ktextwidgets
     mlt
+    phonon-backend-gstreamer
+    qtquickcontrols
+    qtscript
     shared_mime_info
     libv4l
     ffmpeg
   ];
-  propagatedBuildInputs = [
-    kactivities kconfig kcrash kguiaddons kiconthemes kinit kio kio-extras
-    kdbusaddons kfilemetadata knotifications knewstuff karchive knotifyconfig
-    kplotting ktextwidgets kwindowsystem plasma-framework
-    phonon-backend-gstreamer qtquickcontrols shared_mime_info
-  ];
+  postPatch =
+    # Module Qt5::Concurrent must be included in `find_package` before it is used.
+    ''
+      sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
+    '';
   meta = {
     license = with lib.licenses; [ gpl2Plus ];
   };
diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
index 5a969aa15cf..333fea3df53 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kcmutils
 }:
 
@@ -10,6 +10,6 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.peterhoeg ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kcmutils ];
 }
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index 1a30b0685f8..ca495a1ae26 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,21 +1,22 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, ki18n, wrapGAppsHook,
-  akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
-  kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
+  extra-cmake-modules, kdoctools, ki18n, makeWrapper,
+  akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons,
+  kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
   ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
 }:
 
 mkDerivation {
   name = "kgpg";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n wrapGAppsHook ];
-  buildInputs = [
-    akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
+  buildInputs = [ gnupg1 gpgme ki18n ];
+  propagatedBuildInputs = [
+    akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
     kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
     kwidgetsaddons kwindowsystem
   ];
-  preFixup = ''
-    gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gnupg1 ]})
+  postFixup = ''
+    wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}"
   '';
   meta = {
     license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index 9862d75fdf4..db68cec976e 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,15 +1,16 @@
 {
   mkDerivation,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
   kdelibs4support, khtml, kservice, xapian
 }:
 
 mkDerivation {
   name = "khelpcenter";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  buildInputs = [
-    grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
-    kinit kcmutils kservice xapian
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ ki18n xapian ];
+  propagatedBuildInputs = [
+    grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons
+    kinit kcmutils kservice
   ];
 }
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 6fdad9766b2..f2a1d275f6e 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
 }:
 
@@ -10,9 +10,10 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ raskin ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  buildInputs = [
-    kparts qtsvg qtxmlpatterns ktexteditor boost
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ boost ];
+  propagatedBuildInputs = [
+    kparts qtsvg qtxmlpatterns ktexteditor
   ];
 }
 
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index cc5e67a1ddc..058fd8178c4 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
   plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
 }:
@@ -11,7 +11,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.rongcuid ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
   propagatedBuildInputs = [
     kglobalaccel kxmlgui kcoreaddons kdelibs4support
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
index a9e6904156a..db4cb75cc35 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -2,14 +2,13 @@
 , mkDerivation
 , extra-cmake-modules
 , kdoctools
-, wrapGAppsHook
 , kdelibs4support
 , libkexiv2
 }:
 
 mkDerivation {
   name = "kolourpaint";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
   meta = {
     maintainers = [ lib.maintainers.fridh ];
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index 1a0c2211c80..cf2fa2e6a10 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,13 +1,13 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
 mkDerivation {
   name = "kompare";
   meta = { license = with lib.licenses; [ gpl2 ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kparts ktexteditor kwidgetsaddons libkomparediff2
   ];
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 4a4a261c433..bd026c6f039 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
   knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
@@ -13,11 +13,11 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ ki18n ];
   propagatedBuildInputs = [
-    kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
-    kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
-    knotifications knotifyconfig kparts kpty kservice ktextwidgets
-    kwidgetsaddons kxmlgui
+    kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
+    kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty
+    kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
   ];
 }
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index a5a34b68460..0f4aecb83d4 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kdelibs4support, kdnssd, libvncserver, libXtst
 }:
 
@@ -10,6 +10,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = with lib.maintainers; [ jerith666 ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ libvncserver libXtst ];
+  propagatedBuildInputs = [ kdelibs4support kdnssd ];
 }
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index 9194b45c401..75420b6600f 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -2,7 +2,6 @@
 , mkDerivation
 , extra-cmake-modules
 , kdoctools
-, wrapGAppsHook
 , kauth
 , kcmutils
 , kconfigwidgets
@@ -18,7 +17,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ fridh ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
     kxmlgui
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index 169b801b30d..1217c29032b 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib
-, extra-cmake-modules, kdoctools, wrapGAppsHook
+, extra-cmake-modules, kdoctools
 , qtscript, qtsvg, qtquickcontrols, qtwebkit
 , krunner, shared_mime_info, kparts, knewstuff
 , gpsd, perl
@@ -8,7 +8,7 @@
 mkDerivation {
   name = "marble";
   meta.license = with lib.licenses; [ lgpl21 gpl3 ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools perl wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
   propagatedBuildInputs = [
     qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts
     knewstuff gpsd
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 350630664d9..deeffa3207b 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kconfig, kinit,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
 }:
@@ -11,9 +11,8 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ peterhoeg ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
-    kconfig kinit
-    kcmutils kconfigwidgets knewstuff kparts qca-qt5
+    kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
   ];
 }
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 12983519b26..8cfd946b810 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
   kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
@@ -9,12 +9,13 @@
 
 mkDerivation {
   name = "okular";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ djvulibre ebook_tools ];
   propagatedBuildInputs = [
-    djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
-    kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
-    kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
-    qca-qt5 qtdeclarative qtsvg threadweaver
+    kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
+    kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio
+    kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler qca-qt5
+    qtdeclarative qtsvg threadweaver
   ];
   meta = {
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index 18a5da2ccca..085b53de0f3 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -1,6 +1,8 @@
 {
-  mkDerivation, lib, extra-cmake-modules, wrapGAppsHook,
-  cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
+  mkDerivation, lib,
+  extra-cmake-modules,
+  cups, ki18n,
+  kconfig, kconfigwidgets, kdbusaddons, kiconthemes, kcmutils, kio,
   knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
   qtdeclarative
 }:
@@ -11,10 +13,10 @@ mkDerivation {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ cups ki18n ];
   propagatedBuildInputs = [
-    cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
-    kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
-    qtdeclarative
+    kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
+    kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative
   ];
 }
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 10d98d99b0b..7fa18289ae1 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -1,18 +1,19 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
-  kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
+  extra-cmake-modules, kdoctools,
+  ki18n, xcb-util-cursor,
+  kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
-  xcb-util-cursor
 }:
 
 mkDerivation {
   name = "spectacle";
   meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ ki18n xcb-util-cursor ];
   propagatedBuildInputs = [
-    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
-    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
+    kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index f3c011e3333..854408e6e3e 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qtbase, qtsvg, qtx11extras, makeQtWrapper, muparser, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qtsvg, qtx11extras, muparser, cmake }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name    = "albert-${version}";
   version = "0.11.3";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5";
   };
 
-  nativeBuildInputs = [ cmake makeQtWrapper ];
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [ qtbase qtsvg qtx11extras muparser ];
 
@@ -31,11 +31,7 @@ stdenv.mkDerivation rec {
     rm "$out/lib"
   '';
 
-  fixupPhase = ''
-    wrapQtProgram $out/bin/albert
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = https://albertlauncher.github.io/;
     description = "Desktop agnostic launcher";
     license     = licenses.gpl3Plus;
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index ccdedb23cb0..48e08be5474 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
+{ stdenv, fetchgit, qtbase, qtquick1, qmltermwidget,
 qtquickcontrols, qtgraphicaleffects, qmake }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
     mv $out/usr/share $out/share
     mv $out/usr/bin $out/bin
     rmdir $out/usr
-
-    wrapQtProgram $out/bin/cool-retro-term
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index ff18796e39d..e33edfb0a44 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, cmake, python3, qtbase, makeQtWrapper, curaengine }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, curaengine }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "cura-${version}";
   version = "2.4.0";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase ];
   propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
-  nativeBuildInputs = [ cmake python3.pkgs.wrapPython makeQtWrapper ];
+  nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
 
   cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ];
 
@@ -24,11 +24,9 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapPythonPrograms
-    mv $out/bin/cura $out/bin/.cura-noqtpath
-    makeQtWrapper $out/bin/.cura-noqtpath $out/bin/cura
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "3D printer / slicing GUI built on top of the Uranium framework";
     homepage = "https://github.com/Ultimaker/Cura";
     license = licenses.agpl3;
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 3472af27fea..358d9dff44a 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
-, yacc, flex, zlib, config, qmake, makeQtWrapper
+, yacc, flex, zlib, config, qmake, makeWrapper
 }:
 stdenv.mkDerivation rec {
   name = "golden-cheetah-${version}";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz";
     sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf";
   };
-  qtInputs = [
-    qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib
+  buildInputs = [
+    qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib
     qtconnectivity
   ];
-  nativeBuildInputs = [ makeQtWrapper qmake ] ++ qtInputs;
+  nativeBuildInputs = [ flex makeWrapper qmake yacc ];
   preConfigure = ''
     cp src/gcconfig.pri.in src/gcconfig.pri
     cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/bin
     cp src/GoldenCheetah $out/bin
-    wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
+    wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
 
     runHook postInstall
   '';
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 6d3193089c7..16147715705 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
   };
 
-  nativeBuildInputs = [ qmake qttools makeQtWrapper ];
+  nativeBuildInputs = [ qmake qttools ];
 
   preConfigure = ''
     substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     install -Dm755 GPXSee $out/bin/GPXSee
-    wrapQtProgram $out/bin/GPXSee
 
     mkdir -p $out/share/gpxsee
     cp pkg/maps.txt $out/share/gpxsee
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 22c9cfc7e98..743a20b6bfc 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -2,7 +2,6 @@
 , lib
 , fetchurl
 , extra-cmake-modules
-, makeQtWrapper
 , kcmutils
 , kconfigwidgets
 , kdbusaddons
@@ -35,14 +34,7 @@ stdenv.mkDerivation rec {
     libXtst
   ];
 
-  nativeBuildInputs = [
-    extra-cmake-modules
-    makeQtWrapper
-  ];
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/kdeconnect-cli"
-  '';
+  nativeBuildInputs = [ extra-cmake-modules ];
 
   meta = {
     description = "KDE Connect provides several features to integrate your phone and your computer";
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 039b50b133a..5016acfff12 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, makeQtWrapper, mesa }:
+{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }:
 
 
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ qtbase vcg glew ];
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ qmake makeQtWrapper ];
+  nativeBuildInputs = [ qmake ];
 
   qmakeFlags = [ "openBrf.pro" ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
       --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \
       $out/share/openBrf/openBrf
 
-    makeQtWrapper "$out/share/openBrf/openBrf" "$out/bin/openBrf"
+    ln -s "$out/share/openBrf/openBrf" "$out/bin/openBrf"
   '';
 
   dontPatchELF = true;
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index d6aea74d997..671370252a7 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, procps ? null
+{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null
 , qtbase, qtwebengine, qtwebkit
-, cmake, makeQtWrapper
+, cmake
 , syncthing, syncthing-inotify ? null
 , preferQWebView ? false }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   version = "0.5.7";
   name = "qsyncthingtray-${version}";
 
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit;
-  nativeBuildInputs = [ cmake makeQtWrapper ];
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1";
 
@@ -41,12 +40,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     install -m755 QSyncthingTray $out/bin/${qst}
     ln -s $out/bin/${qst} $out/bin/QSyncthingTray
-    wrapQtProgram $out/bin/qsyncthingtray
 
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/sieren/QSyncthingTray/;
     description = "A Traybar Application for Syncthing written in C++";
     longDescription = ''
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index a12467c55d4..d300e411c94 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmake }:
+{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ makeWrapper qmake ];
 
   preConfigure = ''
-    qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
+    qmakeFlags="$qmakeFlags DESTDIR=$out"
   '';
 
   installPhase = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapQtProgram $out/bin/qtpass \
+    wrapProgram $out/bin/qtpass \
       --suffix PATH : ${git}/bin \
       --suffix PATH : ${gnupg}/bin \
       --suffix PATH : ${pass}/bin
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index f9ca31eccfe..0ba850a3460 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchgit, pkgconfig , libssh2
 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
 , qtsvg, qttools, qtquick1
-, makeQtWrapper, qmake
+, qmake
 }:
 
 let
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
 
   buildInputs = [
     pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
@@ -68,7 +68,6 @@ EOF
     mkdir -p $out/bin
     instdir="$srcdir/bin/linux/release"
     cp $instdir/rdm $out/bin
-    wrapQtProgram $out/bin/rdm
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 09da875e236..80ecbdeba77 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, which, makeQtWrapper,
-  libtool, openssl, qtbase, qttools }:
+{ mkDerivation, lib, fetchurl, pkgconfig, which
+, libtool, openssl, qtbase, qttools }:
 
-with stdenv.lib;
+with lib;
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "xca-${version}";
   version = "1.3.2";
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libtool openssl qtbase qttools ];
 
-  nativeBuildInputs = [ makeQtWrapper pkgconfig which ];
+  nativeBuildInputs = [ pkgconfig which ];
 
   configureFlags = [ "CXXFLAGS=-std=c++11" ];
 
@@ -26,12 +26,7 @@ stdenv.mkDerivation rec {
       --replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic
   '';
 
-  postInstall = ''
-    wrapQtProgram "$out/bin/xca"
-    wrapQtProgram "$out/bin/xca_db_stat"
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interface for managing asymetric keys like RSA or DSA";
     homepage = http://xca.sourceforge.net/;
     platforms = platforms.all;
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index a8c49b9fd4a..614473d39ee 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook
+{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook
 , qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
 , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav
@@ -44,7 +44,7 @@ in buildPythonApplication rec {
   ];
 
   nativeBuildInputs = [
-    makeQtWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
+    makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
   ];
 
   propagatedBuildInputs = [
@@ -73,9 +73,8 @@ in buildPythonApplication rec {
     install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
   '';
 
-  postFixup = ''
-    wrapQtProgram $out/bin/qutebrowser \
-      ${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''}
+  postFixup = lib.optionalString withWebEngineDefault ''
+    wrapProgram $out/bin/qutebrowser --add-flags "--backend webengine"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 12ed28979d2..cda86d2e652 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeDesktopItem, patchelf, makeWrapper, makeQtWrapper
+{ mkDerivation, stdenv, lib, fetchurl, makeDesktopItem
+, makeWrapper, patchelf
 , dbus_libs, fontconfig, freetype, gcc, glib
 , libdrm, libffi, libICE, libSM
 , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
@@ -58,7 +59,7 @@ let
     startupNotify = "false";
   };
 
-in stdenv.mkDerivation {
+in mkDerivation {
   name = "dropbox-${version}";
   src = fetchurl {
     name = "dropbox-${version}.tar.gz";
@@ -68,7 +69,7 @@ in stdenv.mkDerivation {
 
   sourceRoot = ".dropbox-dist";
 
-  nativeBuildInputs = [ makeQtWrapper patchelf ];
+  nativeBuildInputs = [ makeWrapper patchelf ];
   dontStrip = true; # already done
 
   installPhase = ''
@@ -94,7 +95,7 @@ in stdenv.mkDerivation {
 
     mkdir -p "$out/bin"
     RPATH="${ldpath}:$out/${appdir}"
-    makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+    makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
       --prefix LD_LIBRARY_PATH : "$RPATH"
 
     chmod 755 $out/${appdir}/dropbox
@@ -137,8 +138,8 @@ in stdenv.mkDerivation {
   meta = {
     homepage = "http://www.dropbox.com";
     description = "Online stored folders (daemon version)";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    maintainers = with lib.maintainers; [ ttuegel ];
     platforms = [ "i686-linux" "x86_64-linux" ];
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index d1773456df2..2c6cf473f1c 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
   libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg,
-  pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper,
+  pango, atk, qrencode, ffmpeg, filter-audio,
   qtbase, qtsvg, qttools, qttranslations, sqlcipher,
   libvpx, libopus }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "qtox-${version}";
   version = "1.10.2";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     libpthreadstubs libXdmcp
   ]);
 
-  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   cmakeFlags = [
     "-DGIT_DESCRIBE=${version}"
@@ -35,14 +35,11 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     install -Dm755 qtox $out/bin/qtox
-    wrapQtProgram $out/bin/qtox
 
     runHook postInstall
   '';
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt Tox client";
     license = licenses.gpl3;
     maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 781a4a18b9c..03fc0d85292 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, qtbase, qtquickcontrols, cmake, makeQtWrapper }:
+{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, cmake }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "quaternion-git-${version}";
   version = "2017-04-15";
 
@@ -18,25 +18,21 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  enableParallelBuilding = true;
-
   buildInputs = [ qtbase qtquickcontrols ];
-  nativeBuildInputs = [ cmake makeQtWrapper ];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
     "-Wno-dev"
   ];
 
   postInstall = ''
-    wrapQtProgram $out/bin/quaternion
-
     substituteInPlace $out/share/applications/quaternion.desktop \
       --replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
 
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://matrix.org/docs/projects/client/quaternion.html;
     description = "Cross-platform desktop IM client for the Matrix protocol";
     license = licenses.gpl3;
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index b7566e0be4b..b1dd7a4c90f 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
-, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
+, qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
 , openssl, protobuf, qmake
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     openssl protobuf
   ];
 
-  nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
+  nativeBuildInputs = [ pkgconfig qmake ];
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cp ricochet $out/bin
-    wrapQtProgram $out/bin/ricochet
 
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications"/"* $out/share/applications
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index c61c62dc8ba..67d1f55f2fe 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -3,7 +3,7 @@
 , qtimageformats, qtgraphicaleffects, qtwebkit
 , telegram-qml, libqtelegram-aseman-edition
 , gst_all_1
-, makeQtWrapper, qmake }:
+, makeWrapper, qmake }:
 
 stdenv.mkDerivation rec {
   name = "cutegram-${meta.version}";
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
 
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ makeWrapper qmake ];
 
   fixupPhase = ''
-    wrapQtProgram $out/bin/cutegram \
+    wrapProgram $out/bin/cutegram \
       --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index d64b5be816a..0af0c0b1d1b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
-, qtbase, qtimageformats, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
+, qtbase, qtimageformats
 , breakpad, gtk3, libappindicator-gtk3, dee
 , ffmpeg, openalSoft, minizip
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "telegram-desktop-${version}";
   version = "1.0.27";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip
   ];
 
-  nativeBuildInputs = [ pkgconfig gyp cmake makeQtWrapper ];
+  nativeBuildInputs = [ pkgconfig gyp cmake ];
 
   patches = [ "${tgaur}/aur-build-fixes.patch" ];
 
@@ -86,10 +86,9 @@ stdenv.mkDerivation rec {
     for icon_size in 16 32 48 64 128 256 512; do
       install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
     done
-    wrapQtProgram $out/bin/telegram-desktop
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Telegram Desktop messaging app";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index d602e887f26..0571946061b 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeQtWrapper, makeDesktopItem }:
+{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   name = "tensor-git-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ qtbase qtquickcontrols ];
-  nativeBuildInputs = [ qmake makeQtWrapper ];
+  nativeBuildInputs = [ qmake ];
 
   desktopItem = makeDesktopItem {
     name        = "tensor";
@@ -36,8 +36,6 @@ stdenv.mkDerivation rec {
     install -Dm644 ${desktopItem}/share/applications/tensor.desktop \
                    $out/share/applications/tensor.desktop
 
-    wrapQtProgram $out/bin/tensor
-
     substituteInPlace $out/share/applications/tensor.desktop \
       --subst-var-by bin $out/bin/tensor
 
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 7b4d52b73c2..9bfdd8408da 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmake, stdenv }:
+{ fetchgit, libcommuni, qtbase, qmake, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "communi-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
 
   buildInputs = [ libcommuni qtbase ];
 
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapQtProgram "$out/bin/communi"
     substituteInPlace "$out/share/applications/communi.desktop" \
       --replace "/usr/bin" "$out/bin"
   '';
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 26e5911a85f..4cfde1f9b07 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -3,7 +3,6 @@
 , fetchurl
 , extra-cmake-modules
 , kdoctools
-, wrapGAppsHook
 , kbookmarks
 , karchive
 , kconfig
@@ -21,7 +20,6 @@
 , kio
 , kparts
 , kwallet
-, makeQtWrapper
 , solid
 , sonnet
 , phonon
@@ -65,7 +63,6 @@ in mkDerivation rec {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    wrapGAppsHook
   ];
 
   meta = {
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
index fa6e4db0a0d..26cb9e40a26 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -1,13 +1,12 @@
-{ stdenv
+{ mkDerivation
 , lib
 , fetchgit
 , cmake
 , qtbase
 , qtwebkit
-, makeQtWrapper
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "trojita-${version}";
   version = "0.7";
 
@@ -18,25 +17,20 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake
     qtbase
     qtwebkit
   ];
 
   nativeBuildInputs = [
-    makeQtWrapper
+    cmake
   ];
 
-  postInstall = ''
-    wrapQtProgram "$out/bin/trojita"
-  '';
-
 
-  meta = {
+  meta = with lib; {
     description = "A Qt IMAP e-mail client";
     homepage = http://trojita.flaska.net/;
-    license = with lib.licenses; [ gpl2 gpl3 ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; [ gpl2 gpl3 ];
+    platforms = platforms.linux;
   };
 
 }
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index f08759514c3..696681dce27 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -70,7 +70,7 @@ let
   client = source: generic {
     type = "mumble";
 
-    nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools qt5.makeQtWrapper ];
+    nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools ];
     buildInputs = [ libopus libsndfile speex ]
       ++ optional (source.qtVersion == 5) qt5.qtsvg
       ++ optional stdenv.isLinux alsaLib
@@ -91,10 +91,6 @@ let
       mkdir -p $out/share/icons{,/hicolor/scalable/apps}
       cp icons/mumble.svg $out/share/icons
       ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps
-
-      ${optionalString (source.qtVersion == 5) ''
-        wrapQtProgram $out/bin/mumble
-      ''}
     '';
   } source;
 
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 21a55c4136c..4bf571a93d8 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, makeQtWrapper, pkgconfig, sqlite }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, pkgconfig, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
@@ -11,13 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb";
   };
 
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
 
-  postInstall = ''
-    wrapQtProgram "$out/bin/quiterss"
-  '';
-
   meta = with stdenv.lib; {
     description = "A Qt-based RSS/Atom news feed reader";
     longDescription = ''
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 95286f3ab65..7178a0930e7 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,4 +1,5 @@
 { fetchurl, stdenv, dpkg, which
+, makeWrapper
 , alsaLib
 , desktop_file_utils
 , dbus
@@ -92,7 +93,7 @@ stdenv.mkDerivation {
     sha256 = sha256;
   };
 
-  nativeBuildInputs = [ qt5.makeQtWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ dpkg which ] ++ deps;
 
   unpackPhase = "true";
@@ -107,7 +108,7 @@ stdenv.mkDerivation {
              $out/bin/mendeleydesktop
     paxmark m $out/bin/mendeleydesktop
 
-    wrapQtProgram $out/bin/mendeleydesktop \
+    wrapProgram $out/bin/mendeleydesktop \
       --add-flags "--unix-distro-build" \
       ${stdenv.lib.optionalString autorunLinkHandler
       ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop"''}
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index be70cb89d6f..9f54f2df6bf 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmake, makeQtWrapper, qtsvg }:
+{ stdenv, fetchurl, qmake, qtsvg }:
 
 let
   version = "1.42.2";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804";
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ qtsvg ];
 
   hardeningDisable = [ "format" ];
@@ -23,8 +23,6 @@ in stdenv.mkDerivation rec {
       --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png"
   '';
 
-  postInstall = "wrapQtProgram $out/bin/mytetra";
-
   meta = with stdenv.lib; {
     description = "Smart manager for information collecting";
     homepage = http://webhamster.ru/site/page/index/articles/projectcode/138;
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index acf60bd0375..38ec107bcf7 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper, qtwebkit, qtscript, grantlee,
+{ mkDerivation, lib, fetchurl,
+  cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee,
   kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
   kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
   knotifyconfig, krunner, libofx }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "skrooge-${version}";
   version = "2.7.0";
 
@@ -12,21 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
 
   buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
     kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
     kdelibs4support kactivities knotifyconfig krunner libofx
   ];
 
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/skrooge"
-    wrapQtProgram "$out/bin/skroogeconvert"
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A personal finances manager, powered by KDE";
     license = with licenses; [ gpl3 ];
     maintainers = with maintainers; [ joko ];
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 49c774f7039..da6aa38d746 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
-, qtscript, qtserialport, qttools, makeQtWrapper
+{ mkDerivation, lib, fetchurl
+, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
+, qtscript, qtserialport, qttools
 , qtmultimedia
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "stellarium-${version}";
   version = "0.15.0";
 
@@ -12,25 +13,19 @@ stdenv.mkDerivation rec {
     sha256 = "0il751lgnfkx35h1m8fzwwnrygpxjx2a80gng1i1rbybkykf7l3l";
   };
 
-  nativeBuildInputs = [ makeQtWrapper ];
+  nativeBuildInputs = [ cmake perl ];
 
   buildInputs = [
-    cmake freetype libpng mesa gettext openssl perl libiconv qtscript
-    qtserialport qttools qtmultimedia
+    freetype libpng mesa openssl libiconv qtscript qtserialport qttools
+    qtmultimedia
   ];
 
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/stellarium"
-  '';
-
-  meta = {
+  meta = with lib; {
     description = "Free open-source planetarium";
     homepage = "http://stellarium.org/";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
 
-    platforms = stdenv.lib.platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
+    maintainers = [ maintainers.peti ];
   };
 }
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index b978e644a8e..ab508854310 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmake, pkgconfig
+{ stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig
 , qtbase, qtsvg, qtserialport, boost, libgit2
 }:
 
@@ -28,20 +28,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
 
-  nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ qmake pkgconfig ];
 
   qmakeFlags = [ "phoenix.pro" ];
 
-  enableParallelBuilding = true;
-
   preConfigure = ''
     ln -s "$parts" parts
   '';
 
-  postInstall = ''
-    wrapQtProgram $out/bin/Fritzing
-  '';
-
   meta = {
     description = "An open source prototyping tool for Arduino-based projects";
     homepage = http://fritzing.org/;
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 861deaff741..d36b135531c 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, cmake, makeQtWrapper, qtbase, qttools }:
+{ mkDerivation, lib, fetchgit, cmake, qtbase, qttools }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "speedcrunch-${version}";
   version = "0.12.0";
 
@@ -11,21 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
   };
 
-  enableParallelBuilding = true;
-
   buildInputs = [ qtbase qttools ];
 
-  nativeBuildInputs = [ cmake makeQtWrapper ];
+  nativeBuildInputs = [ cmake ];
 
   preConfigure = ''
     cd src
   '';
 
-  postFixup = ''
-    wrapQtProgram $out/bin/speedcrunch
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = http://speedcrunch.org;
     license     = licenses.gpl2Plus;
     description = "A fast power user calculator";
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index a4a08deb8e2..98ec39eb206 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, git,  espeak, SDL, udev, doxygen, cmake
 , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
 , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake
-, makeQtWrapper, lndir
+, makeWrapper, lndir
 , gst_all_1, qt-gstreamer1, pkgconfig, glibc
 , version ? "2.9.4"
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs;
-  nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
+  nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
 
   patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
   postPatch = ''
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
 
   postInstall = ''
-    wrapQtProgram "$out/bin/qgroundcontrol" \
+    wrapProgram "$out/bin/qgroundcontrol" \
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
   '';
   
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 0995052cfc1..bffb038f653 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which
 , libX11, libxcb, mesa
-, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
+, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
 , libchardet
 , ffmpeg
 
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapQtProgram $out/bin/bomi \
+    wrapProgram $out/bin/bomi \
       ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
   '';
 
@@ -104,9 +104,7 @@ stdenv.mkDerivation rec {
                    ++ optional cddaSupport "--enable-cdda"
                    ;
 
-  nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmake ];
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ];
 
   meta = with stdenv.lib; {
     description = "Powerful and easy-to-use multimedia player";
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 656ec1163dc..f67ab412c26 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , doxygen, python3Packages, libopenshot
-, makeQtWrapper, wrapGAppsHook, gtk3 }:
+, wrapGAppsHook, gtk3 }:
 
 python3Packages.buildPythonApplication rec {
   name = "openshot-qt-${version}";
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index d9a38d88f95..4ca31916965 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
 qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
 qtgraphicaleffects,
-qmake, makeQtWrapper }:
+qmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
   buildInputs = [
     SDL frei0r gettext mlt
     qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/share/shotcut
     cp -r src/qml $out/share/shotcut/
-    wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
+    wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 7e05324a046..783a424e18c 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
-, qtbase, qtmultimedia, qtsvg, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
+, qtbase, qtmultimedia, qtsvg
 , lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "virt-manager-qt-${version}";
   version = "0.43.70.2";
 
@@ -23,17 +23,9 @@ stdenv.mkDerivation rec {
     libvirt libvncserver pixman spice_gtk spice_protocol
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig makeQtWrapper ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  postFixup = ''
-    for f in $out/bin/* ; do
-      wrapQtProgram $f
-    done
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://f1ash.github.io/qt-virt-manager;
     description = "Desktop user interface for managing virtual machines (QT)";
     longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6c49e95b6b9..32e8f9d23f4 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
     ++ optional pythonBindings python # Python is needed even when not building bindings
     ++ optional pulseSupport libpulseaudio
     ++ optionals (headless) [ libXrandr ]
-    ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras qt5.makeQtWrapper libXinerama SDL ];
+    ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
 
   hardeningDisable = [ "fortify" "pic" "stackprotector" ];
 
@@ -153,12 +153,8 @@ in stdenv.mkDerivation {
     find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \
       -name src -o -exec cp -avt "$libexec" {} +
 
-    # Create wrapper script
     mkdir -p $out/bin
-    ${optionalString (!headless) ''
-      makeQtWrapper "$libexec/VirtualBox" $out/bin/VirtualBox
-    ''}
-    for file in ${optionalString (!headless) "VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
+    for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
         echo "Linking $file to /bin"
         test -x "$libexec/$file"
         ln -s "$libexec/$file" $out/bin/$file
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 5ada154f77d..10fc7a3a5b7 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, extra-cmake-modules, kdoctools, makeQtWrapper,
+  mkDerivation, extra-cmake-modules, kdoctools,
   kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
   kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2
 }:
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index 7b421f4ca36..a79e6d90384 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, lib, fetchFromGitHub, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
 , qtbase, qtmultimedia, qtquick1, qttools
 , mesa, libX11
 , libass, openal, ffmpeg, libuchardet
 , alsaLib, libpulseaudio, libva
 }:
 
-with stdenv.lib;
+with lib;
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "libqtav-${version}";
 
   # Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the
   # the reason behind taking an unstable git rev. 
   version = "unstable-2017-03-30";
 
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper qttools ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ 
     qtbase qtmultimedia qtquick1
     mesa libX11
@@ -45,12 +45,6 @@ stdenv.mkDerivation rec {
     cp -a "./bin/"* "$out/bin"
   '';
 
-  postFixup = ''
-    for i in `find $out/bin -maxdepth 1 -xtype f -executable`; do
-      wrapQtProgram "$i"
-    done
-  '';
-
   meta = {
     description = "A multimedia playback framework based on Qt + FFmpeg.";
     #license = licenses.lgpl21; # For the libraries / headers only.
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 37065edc440..7996a316bdb 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -146,11 +146,6 @@ let
         qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns
       ];
 
-      makeQtWrapper =
-        makeSetupHook
-        { deps = [ makeWrapper ]; }
-        (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
-
       qmake = makeSetupHook {
         deps = [ self.qtbase.dev ];
         substitutions = { inherit (stdenv) isDarwin; };
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 1000bf09b17..b7d141fd5a2 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -133,12 +133,6 @@ let
       ] ++ optional (!stdenv.isDarwin) qtwayland
         ++ optional (stdenv.isDarwin) qtmacextras);
 
-      makeQtWrapper =
-        makeSetupHook
-        { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
-        (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
-
-
       qmake = makeSetupHook {
         deps = [ self.qtbase.dev ];
         substitutions = { inherit (stdenv) isDarwin; };
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
index 28ea571adca..6f2ff593f1e 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
+{ stdenv, qtSubmodule, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
 
 with stdenv.lib;
 
@@ -6,17 +6,9 @@ qtSubmodule {
   name = "qtdeclarative";
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
-  nativeBuildInputs = [ python2 makeQtWrapper ];
+  nativeBuildInputs = [ python2 ];
 
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
   '';
-
-  postInstall = ''
-    wrapQtProgram $out/bin/qmleasing
-    wrapQtProgram $out/bin/qmlscene
-    wrapQtProgram $out/bin/qmltestrunner
-  '' + optionalString (stdenv.isDarwin) ''
-    wrapQtProgram $out/bin/qml.app/Contents/MacOS/qml
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
index 6b97c2d85cd..6fa5390855d 100644
--- a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
@@ -1,28 +1,14 @@
-{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, qtbase }:
+{ stdenv, qtSubmodule, copyPathsToStore, qtbase }:
 
 with stdenv.lib;
 
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
-  nativeBuildInputs = [ makeQtWrapper ];
 
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
   postFixup = ''
     moveToOutput "bin/qdbus" "$out"
     moveToOutput "bin/qtpaths" "$out"
   '';
-
-  postInstall =   ''
-    wrapQtProgram $out/bin/qcollectiongenerator
-    wrapQtProgram $out/bin/qhelpconverter
-    wrapQtProgram $out/bin/qhelpgenerator
-    wrapQtProgram $out/bin/qtdiag
-  '' + optionalString (stdenv.isDarwin) ''
-    wrapQtProgram $out/bin/Assistant.app/Contents/MacOS/Assistant
-    wrapQtProgram $out/bin/Designer.app/Contents/MacOS/Designer
-    wrapQtProgram $out/bin/Linguist.app/Contents/MacOS/Linguist
-    wrapQtProgram $out/bin/pixeltool.app/Contents/MacOS/pixeltool
-    wrapQtProgram $out/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
deleted file mode 100644
index a42c418fde6..00000000000
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-wrapQtProgram() {
-    local prog="$1"
-    shift
-    wrapProgram "$prog" \
-        --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
-        --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
-        --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
-        --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
-        "$@"
-}
-
-makeQtWrapper() {
-    local old="$1"
-    local new="$2"
-    shift
-    shift
-    makeWrapper "$old" "$new" \
-        --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
-        --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
-        --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
-        --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
-        "$@"
-}
-
-_makeQtWrapperSetup() {
-    # cannot use addToSearchPath because these directories may not exist yet
-    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
-    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
-    export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
-    export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
-}
-
-prePhases+=(_makeQtWrapperSetup)
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
deleted file mode 100644
index 33dc8b6370f..00000000000
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-wrapQtProgram() {
-    local prog="$1"
-    shift
-    wrapProgram "$prog" \
-        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
-        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
-        --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
-        --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
-        "$@"
-}
-
-makeQtWrapper() {
-    local old="$1"
-    local new="$2"
-    shift
-    shift
-    makeWrapper "$old" "$new" \
-        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
-        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
-        --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
-        --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
-        "$@"
-}
-
-_makeQtWrapperSetup() {
-    # cannot use addToSearchPath because these directories may not exist yet
-    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
-    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
-    export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share${GSETTINGS_SCHEMAS_PATH:+:$GSETTINGS_SCHEMAS_PATH}"
-    export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
-}
-
-prePhases+=(_makeQtWrapperSetup)
-
-_findGioModules() {
-    if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
-        export GIO_EXTRA_MODULES="$GIO_EXTRA_MODULES${GIO_EXTRA_MODULES:+:}$1/lib/gio/modules"
-    fi
-}
-
-envHooks+=(_findGioModules)
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index df6a7fa5a15..ff4341c6783 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper
-, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmake
+, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake
 , withDocumentation ? false
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
 
-  nativeBuildInputs = [ qmake makeQtWrapper makeWrapper ];
+  nativeBuildInputs = [ qmake makeWrapper ];
 
   doCheck = true;
 
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
   postInstall = ''
     substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
       --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
-    wrapQtProgram $out/bin/qtcreator
   '';
 
   meta = {
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 7caac253435..395f720906c 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qmake, makeQtWrapper, qtbase, perl, python, php }:
+{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php }:
 
 stdenv.mkDerivation rec {
   name = "qcachegrind-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase perl python php ];
 
-  nativeBuildInputs = [ qmake makeQtWrapper ];
+  nativeBuildInputs = [ qmake ];
 
   postInstall = ''
      mkdir -p $out/bin
@@ -25,10 +25,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/Applications
     cp cgview/cgview.app/Contents/MacOS/cgview $out/bin
     cp -a qcachegrind/qcachegrind.app $out/Applications
-    wrapQtProgram $out/Applications/qcachegrind.app/Contents/MacOS/qcachegrind
   '' else ''
     install qcachegrind/qcachegrind cgview/cgview -t "$out/bin"
-    wrapQtProgram "$out/bin/qcachegrind"
     install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications"
     install -Dm644 kcachegrind/hi32-app-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png"
     install -Dm644 kcachegrind/hi48-app-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 28c618c29a0..a43d3928980 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qtbase, qttools, makeQtWrapper, sqlite, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   version = "3.9.1";
   name = "sqlitebrowser-${version}";
 
@@ -12,23 +12,17 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qttools sqlite ];
-  nativeBuildInputs = [ makeQtWrapper cmake ];
-  
-  enableParallelBuilding = true;
-  
+  nativeBuildInputs = [ cmake ];
+
   cmakeFlags = [ "-DUSE_QT5=TRUE" ];
-  
+
   # A regression was introduced in CMakeLists.txt on v3.9.x
   # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755
   postPatch = ''
     substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)'
   '';
 
-  postInstall = ''
-    wrapQtProgram $out/bin/sqlitebrowser
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DB Browser for SQLite";
     homepage = "http://sqlitebrowser.org/";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 350cda4e263..578e759548a 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
 , boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
 
 let
   qscintillaLib = (qscintilla.override { withQt5 = true; });
 
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   name = "tora-${version}";
   version = "3.1";
 
@@ -15,10 +15,8 @@ in stdenv.mkDerivation rec {
     sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7";
   };
 
-  enableParallelBuilding = true;
-
+  nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
   buildInputs = [
-    cmake extra-cmake-modules makeQtWrapper
     boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase
   ];
 
@@ -54,11 +52,11 @@ in stdenv.mkDerivation rec {
   ];
 
   postFixup = ''
-    wrapQtProgram $out/bin/tora \
+    wrapProgram $out/bin/tora \
       --prefix PATH : ${lib.getBin graphviz}/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tora SQL tool";
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index 56f15d62154..e351a75db4b 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -1,11 +1,12 @@
-{ fetchFromGitHub, stdenv
+{ mkDerivation, lib, fetchFromGitHub
 , cmake, git, pkgconfig, wget, zip
-, makeQtWrapper, qtbase, qtx11extras
+, qtbase, qtx11extras
 , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
 , freeglut, mesa_glu
 }:
-stdenv.mkDerivation rec {
+
+mkDerivation rec {
   name = "vogl-${version}";
   version = "2016-05-13";
 
@@ -16,9 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n";
   };
 
-  nativeBuildInputs = [
-    cmake makeQtWrapper pkgconfig
-  ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
     git wget zip
@@ -28,16 +27,17 @@ stdenv.mkDerivation rec {
     freeglut mesa_glu
   ];
 
-  enableParallelBuilding = true;
-
   dontUseCmakeBuildDir = true;
   preConfigure = ''
     cmakeDir=$PWD
     mkdir -p vogl/vogl_build/release64 && cd $_
   '';
-  cmakeFlags = '' -DCMAKE_VERBOSE=On -DCMAKE_BUILD_TYPE=Release -DBUILD_X64=On'';
+  cmakeFlags = [
+    "-DCMAKE_VERBOSE=On"
+    "-DBUILD_X64=On"
+  ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenGL capture / playback debugger.";
     homepage = https://github.com/ValveSoftware/vogl;
     license = licenses.mit;
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index c0e065b3b55..622bf4fbd5c 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, perl, makeQtWrapper
+{ stdenv, lib, fetchurl, pkgconfig, perl
 , libjpeg, udev
 , withUtils ? true
 , withGUI ? true, alsaLib, libX11, qtbase, mesa_glu
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h"
   '';
 
-  nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional (withUtils && withGUI) makeQtWrapper;
+  nativeBuildInputs = [ pkgconfig perl ];
 
   buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ];
 
@@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  postInstall = lib.optionalString (withUtils && withGUI) ''
-    wrapQtProgram $out/bin/qv4l2
-  '';
-
   meta = with stdenv.lib; {
     description = "V4L utils and libv4l, provide common image formats regardless of the v4l device";
     homepage = http://linuxtv.org/projects.php;
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index 3456f098648..d86a0b09c26 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, cmake, alsaLib, udev, qtbase,
-  qtsvg, qttools, makeQtWrapper }:
+{ mkDerivation, lib, fetchurl, cmake, alsaLib, udev, qtbase, qtsvg, qttools }:
 
 let
   version = "0.21.0";
 in
 
-stdenv.mkDerivation {
+mkDerivation {
   name = "qastools-${version}";
 
   src = fetchurl {
@@ -14,15 +13,15 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    cmake alsaLib udev qtbase qtsvg qttools makeQtWrapper
+    alsaLib udev qtbase qtsvg qttools
   ];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
-    "-DCMAKE_INSALL_PREFIX=$out"
     "-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of desktop applications for ALSA configuration";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 02d65597f74..ee0accac2d9 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, makeQtWrapper, xorg, fetchFromGitHub }:
+{ mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "antimicro-${version}";
   version = "2.23";
 
@@ -11,15 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v";
   };
 
+  nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [
-    cmake pkgconfig SDL2 qtbase qttools xorg.libXtst makeQtWrapper
+    SDL2 qtbase qttools xorg.libXtst
   ];
 
-  postInstall = ''
-    wrapQtProgram $out/bin/antimicro
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GUI for mapping keyboard and mouse controls to a gamepad";
     inherit (src.meta) homepage;
     maintainers = with maintainers; [ jb55 ];
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index dce2392cc7b..86750518bb5 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake, makeQtWrapper }:
+{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
@@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
     qmakeFlags="$qmakeFlags PLUGINDIR=$out/$qtPluginPrefix"
   '';
 
-  preFixup = ''
-    wrapQtProgram $out/bin/qt5ct
-  '';
-
   meta = with stdenv.lib; {
     description = "Qt5 Configuration Tool";
     homepage = https://www.opendesktop.org/content/show.php?content=168066;
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index f07e1d4adc7..63f32763f22 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, qtbase, qmake, makeQtWrapper, libXrandr }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, libXrandr }:
 
 stdenv.mkDerivation rec {
 
   name = "radeon-profile-${version}";
   version = "20161221";
 
-  nativeBuildInputs = [ qmake makeQtWrapper ];
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase libXrandr ];
 
   src = (fetchFromGitHub {
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/bin
     cp ./radeon-profile $out/bin/radeon-profile
-    wrapQtProgram  $out/bin/radeon-profile
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 0538dd79508..f84b9563967 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libusb1
-, qtbase, qttools, makeQtWrapper, qmake
+, qtbase, qttools, makeWrapper, qmake
 , withEspeak ? false, espeak ? null }:
 
 stdenv.mkDerivation  rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation  rec {
 
   buildInputs = [ libusb1 qtbase qttools ]
     ++ stdenv.lib.optional withEspeak espeak;
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
 
   preConfigure = ''
     cd rbutil/rbutilqt
@@ -24,7 +24,7 @@ stdenv.mkDerivation  rec {
 
     install -Dm755 RockboxUtility $out/bin/rockboxutility
     ln -s $out/bin/rockboxutility $out/bin/RockboxUtility
-    wrapQtProgram $out/bin/rockboxutility \
+    wrapProgram $out/bin/rockboxutility \
     ${stdenv.lib.optionalString withEspeak ''
       --prefix PATH : ${espeak}/bin
     ''}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13ec940b1c9..68a1c2d29ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14620,10 +14620,10 @@ with pkgs;
       recurseIntoAttrs (makeOverridable mkApplications attrs);
 
   inherit (kdeApplications)
-    akonadi ark dolphin ffmpegthumbs filelight gwenview kate
-    kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig
-    kolourpaint konsole krfb marble
-    okteta okular spectacle;
+    akonadi ark dolphin ffmpegthumbs filelight gwenview kate kdenlive
+    kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmix
+    kolourpaint kompare konsole krfb kwalletmanager marble okteta okular
+    spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 
-- 
GitLab


From 5a8295e5965a2c86062e5d554e8b8cdec3082716 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 08:01:54 -0500
Subject: [PATCH 0879/1490] qtbase: setup required environment in GTK3 platform
 theme plugin

---
 .../libraries/qt-5/5.8/default.nix            |  1 +
 .../libraries/qt-5/5.8/qtbase/default.nix     |  8 ++++-
 .../libraries/qt-5/5.8/qtbase/qgtk-env.patch  | 36 +++++++++++++++++++
 .../libraries/qt-5/5.8/qtbase/series          |  1 +
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index b7d141fd5a2..57728ad13ce 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -94,6 +94,7 @@ let
       qtbase = callPackage ./qtbase {
         inherit (srcs.qtbase) src version;
         inherit bison cups harfbuzz mesa;
+        inherit dconf gtk3;
         inherit developerBuild decryptSslTraffic;
       };
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 008eb1e3709..64e208a22b0 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -7,7 +7,7 @@
   # darwin support
   darwin, libiconv, libcxx,
 
-  dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite,
+  dbus, dconf, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite,
   libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
   libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, sqlite, udev,
   xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs,
@@ -147,6 +147,12 @@ stdenv.mkDerivation {
     ++ lib.optional mesaSupported
        ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"''
 
+    ++ lib.optionals (!stdenv.isDarwin)
+    [
+      ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
+      ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
+    ]
+
     ++ lib.optionals stdenv.isDarwin
     [
       "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090"
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
new file mode 100644
index 00000000000..6a22b203afc
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
@@ -0,0 +1,36 @@
+Index: qtbase-opensource-src-5.8.0/src/plugins/platformthemes/gtk3/main.cpp
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/plugins/platformthemes/gtk3/main.cpp
++++ qtbase-opensource-src-5.8.0/src/plugins/platformthemes/gtk3/main.cpp
+@@ -39,6 +39,7 @@
+ 
+ #include <qpa/qplatformthemeplugin.h>
+ #include "qgtk3theme.h"
++#include <QFile>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -54,8 +55,22 @@ public:
+ QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList &params)
+ {
+     Q_UNUSED(params);
+-    if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive))
++    if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) {
++
++#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS
++        QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':');
++        XDG_DATA_DIRS << QStringLiteral(NIXPKGS_QGTK3_XDG_DATA_DIRS);
++        qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':')));
++#endif
++
++#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES
++        QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':');
++        GIO_EXTRA_MODULES << QStringLiteral(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
++        qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':')));
++#endif
++
+         return new QGtk3Theme;
++    }
+ 
+     return 0;
+ }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 47400cf7aa3..03f5e6b1002 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -8,3 +8,4 @@ qpa-platform-plugin-path.patch
 dlopen-gl.patch
 compose-search-path.patch
 cmake-paths.patch
+qgtk-env.patch
-- 
GitLab


From 6fa41788be7e020b5e551f7b89601cad2c277b12 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 18:19:42 -0500
Subject: [PATCH 0880/1490] qt5: separate plugins from libraries

---
 .../libraries/qt-5/5.6/default.nix            |  12 +-
 .../libraries/qt-5/5.8/default.nix            |  12 +-
 .../libraries/qt-5/5.8/qtbase/default.nix     |  41 ++--
 .../libraries/qt-5/5.8/qtconnectivity.nix     |   4 +
 .../qt-5/5.8/qtdeclarative/default.nix        |   6 +
 pkgs/development/libraries/qt-5/5.8/qtdoc.nix |   1 +
 .../libraries/qt-5/5.8/qtlocation.nix         |   5 +
 .../libraries/qt-5/5.8/qtmultimedia.nix       |   5 +
 .../libraries/qt-5/5.8/qtquickcontrols2.nix   |   4 +
 .../libraries/qt-5/5.8/qtsensors.nix          |   5 +
 pkgs/development/libraries/qt-5/5.8/qtsvg.nix |   4 +
 .../libraries/qt-5/5.8/qttools/default.nix    |   8 +-
 .../libraries/qt-5/5.8/qtwayland.nix          |   5 +
 .../libraries/qt-5/5.8/qtwebchannel.nix       |   4 +
 .../qt-5/5.8/qtwebengine/default.nix          |   3 +
 .../libraries/qt-5/5.8/qtwebsockets.nix       |   4 +
 .../libraries/qt-5/qtbase-setup-hook.sh       | 178 ++++++++----------
 17 files changed, 167 insertions(+), 134 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 7996a316bdb..b286f8c5298 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -50,10 +50,6 @@ let
 
       outputs = args.outputs or [ "out" "dev" ];
 
-      propagatedUserEnvPkgs =
-        (args.propagatedUserEnvPkgs or [])
-        ++ map getBin (args.propagatedBuildInputs or []);
-
       qmakeFlags =
         (args.qmakeFlags or [])
         ++ optional (debug != null)
@@ -90,7 +86,13 @@ let
 
       setupHook = ../qtsubmodule-setup-hook.sh;
 
-      meta = self.qtbase.meta // (args.meta or {});
+      meta = {
+        homepage = http://www.qt.io;
+        description = "A cross-platform application framework for C++";
+        license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
+        maintainers = with maintainers; [ qknight ttuegel periklis ];
+        platforms = platforms.unix;
+      } // (args.meta or {});
     });
 
   addPackages = self: with self;
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 57728ad13ce..034c7fd10e1 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -41,10 +41,6 @@ let
 
       outputs = args.outputs or [ "out" "dev" ];
 
-      propagatedUserEnvPkgs =
-        (args.propagatedUserEnvPkgs or [])
-        ++ map getBin (args.propagatedBuildInputs or []);
-
       qmakeFlags =
         (args.qmakeFlags or [])
         ++ optional (debug != null)
@@ -81,7 +77,13 @@ let
 
       setupHook = ../qtsubmodule-setup-hook.sh;
 
-      meta = self.qtbase.meta // (args.meta or {});
+      meta = {
+        homepage = http://www.qt.io;
+        description = "A cross-platform application framework for C++";
+        license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
+        maintainers = with maintainers; [ qknight ttuegel periklis ];
+        platforms = platforms.unix;
+      } // (args.meta or {});
     });
 
   addPackages = self: with self;
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 64e208a22b0..a627bcbee52 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     [ bison flex gperf lndir perl pkgconfig python2 ]
     ++ lib.optional (!stdenv.isDarwin) patchelf;
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "bin" ];
 
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series);
@@ -264,29 +264,32 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  postInstall = ''
-    find "$out" -name "*.cmake" | while read file; do
-        substituteInPlace "$file" \
-            --subst-var-by NIX_OUT "$out" \
-            --subst-var-by NIX_DEV "$dev"
-    done
-  '';
+  postInstall =
+    # Hardcode some CMake module paths.
+    ''
+      find "$out" -name "*.cmake" | while read file; do
+          substituteInPlace "$file" \
+              --subst-var-by NIX_OUT "$out" \
+              --subst-var-by NIX_DEV "$dev"
+      done
+    '';
 
-  preFixup = ''
-    # We cannot simply set these paths in configureFlags because libQtCore retains
-    # references to the paths it was built with.
-    moveToOutput "bin" "$dev"
-    moveToOutput "include" "$dev"
-    moveToOutput "mkspecs" "$dev"
+  preFixup =
+    # Move selected outputs.
+    ''
+      moveToOutput "bin" "$dev"
+      moveToOutput "include" "$dev"
+      moveToOutput "mkspecs" "$dev"
 
-    # The destination directory must exist or moveToOutput will do nothing
-    mkdir -p "$dev/share"
-    moveToOutput "share/doc" "$dev"
-  '';
+      mkdir -p "$dev/share"
+      moveToOutput "share/doc" "$dev"
+
+      moveToOutput "$qtPluginPrefix" "$bin"
+    '';
 
   postFixup =
+    # Don't retain build-time dependencies like gdb.
     ''
-      # Don't retain build-time dependencies like gdb.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
     ''
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
index 95cd6fea79b..1c10535c785 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
index 6f2ff593f1e..cc665334885 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
@@ -7,8 +7,14 @@ qtSubmodule {
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python2 ];
+  outputs = [ "out" "dev" "bin" ];
 
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
   '';
+
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdoc.nix b/pkgs/development/libraries/qt-5/5.8/qtdoc.nix
index 578ea6ba0b2..7f979ee94c0 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdoc.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdoc.nix
@@ -3,4 +3,5 @@
 qtSubmodule {
   name = "qtdoc";
   qtInputs = [ qtdeclarative ];
+  outputs = [ "out" ];
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix b/pkgs/development/libraries/qt-5/5.8/qtlocation.nix
index 1e134057c4b..0eabe04e478 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtlocation.nix
@@ -3,4 +3,9 @@
 qtSubmodule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
index 1c2dcc90d41..e133256e900 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
@@ -10,6 +10,11 @@ qtSubmodule {
   qtInputs = [ qtbase qtdeclarative ];
   buildInputs = [ pkgconfig gstreamer gst-plugins-base libpulseaudio]
     ++ optional (stdenv.isLinux) alsaLib;
+  outputs = [ "out" "dev" "bin" ];
   qmakeFlags = [ "GST_VERSION=1.0" ];
   NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc";
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
index 19750f2fd99..1a52d1802ce 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtquickcontrols2";
   qtInputs = [ qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix b/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
index 7bb18f56fe2..75829d3f0aa 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
@@ -5,4 +5,9 @@ with stdenv.lib;
 qtSubmodule {
   name = "qtsensors";
   qtInputs = [ qtbase qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtsvg.nix b/pkgs/development/libraries/qt-5/5.8/qtsvg.nix
index b9ccac7cf93..0e21cf89340 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtsvg.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtsvg.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtsvg";
   qtInputs = [ qtbase ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
index 6fa5390855d..6c0f540e79b 100644
--- a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
@@ -5,10 +5,10 @@ with stdenv.lib;
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
-
+  outputs = [ "out" "dev" "bin" ];
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
-  postFixup = ''
-    moveToOutput "bin/qdbus" "$out"
-    moveToOutput "bin/qtpaths" "$out"
+  postInstall = ''
+    moveToOutput "bin/qdbus" "$bin"
+    moveToOutput "bin/qtpaths" "$bin"
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix b/pkgs/development/libraries/qt-5/5.8/qtwayland.nix
index 6d887f7c650..7b7bd2f6ebc 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwayland.nix
@@ -5,4 +5,9 @@ qtSubmodule {
   qtInputs = [ qtbase qtquickcontrols ];
   buildInputs = [ wayland ];
   nativeBuildInputs = [ pkgconfig ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
index fd7a3c52026..50a539dbe72 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
@@ -3,5 +3,9 @@
 qtSubmodule {
   name = "qtwebchannel";
   qtInputs = [ qtbase qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
index 37f12eed758..871fb21c106 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
@@ -25,6 +25,7 @@ qtSubmodule {
   buildInputs = [ bison flex git which gperf ];
   nativeBuildInputs = [ pkgconfig python2 coreutils ];
   doCheck = true;
+  outputs = [ "out" "dev" "bin" ];
 
   enableParallelBuilding = true;
 
@@ -90,5 +91,7 @@ qtSubmodule {
     EOF
 
     paxmark m $out/libexec/QtWebEngineProcess
+
+    moveToOutput "$qtQmlPrefix" "$bin"
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
index fbdfbbcf0db..925adce75a9 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtwebsockets";
   qtInputs = [ qtbase qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
index 66f5d3f5818..35df52d7a08 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
@@ -2,72 +2,54 @@ qtPluginPrefix=@qtPluginPrefix@
 qtQmlPrefix=@qtQmlPrefix@
 qtDocPrefix=@qtDocPrefix@
 
-addToSearchPathOnceWithCustomDelimiter() {
-    local delim="$1"
-    local search="$2"
-    local target="$3"
-    local dirs
-    local exported
-    IFS="$delim" read -a dirs <<< "${!search}"
-    local canonical
-    if canonical=$(readlink -e "$target"); then
-        for dir in ${dirs[@]}; do
-            if [ "z$dir" == "z$canonical" ]; then exported=1; fi
-        done
-        if [ -z $exported ]; then
-            eval "export ${search}=\"${!search}${!search:+$delim}$canonical\""
-        fi
-    fi
-}
-
-addToSearchPathOnce() {
-    addToSearchPathOnceWithCustomDelimiter ':' "$@"
-}
+NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"
+NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"
 
-propagateOnce() {
-    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
+providesQtRuntime() {
+    [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ]
 }
 
-_qtPropagate() {
-    for dir in $qtPluginPrefix $qtQmlPrefix; do
-        if [ -d "$1/$dir" ]; then
-            propagateOnce propagatedBuildInputs "$1"
-            break
-        fi
-    done
-    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
-    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
+# Propagate any runtime dependency of the building package.
+# Each dependency is propagated to the user environment and as a build
+# input so that it will be re-propagated to the user environment by any
+# package depending on the building package. (This is necessary in case
+# the building package does not provide runtime dependencies itself and so
+# would not be propagated to the user environment.)
+_qtCrossEnvHook() {
+    if providesQtRuntime "$1"; then
+        propagatedBuildInputs+=" $1"
+        propagatedUserEnvPkgs+=" $1"
+    fi
 }
+if [ -z "$NIX_QT5_TMP" ]; then
+    crossEnvHooks+=(_qtCrossEnvHook)
+fi
 
-crossEnvHooks+=(_qtPropagate)
-
-_qtPropagateNative() {
-    for dir in $qtPluginPrefix $qtQmlPrefix; do
-        if [ -d "$1/$dir" ]; then
-            propagateOnce propagatedNativeBuildInputs "$1"
-            break
+_qtEnvHook() {
+    if providesQtRuntime "$1"; then
+        propagatedNativeBuildInputs+=" $1"
+        if [ -z "$crossConfig" ]; then
+        propagatedUserEnvPkgs+=" $1"
         fi
-    done
-    if [ -z "$crossConfig" ]; then
-    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
-    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
     fi
 }
+if [ -z "$NIX_QT5_TMP" ]; then
+    envHooks+=(_qtEnvHook)
+fi
 
-envHooks+=(_qtPropagateNative)
-
-_qtMultioutDevs() {
-    # This is necessary whether the package is a Qt module or not
+_qtPreFixupHook() {
     moveToOutput "mkspecs" "${!outputDev}"
 }
+if [ -z "$NIX_QT5_TMP" ]; then
+    preFixupHooks+=(_qtPreFixupHook)
+fi
 
-preFixupHooks+=(_qtMultioutDevs)
-
-_qtSetCMakePrefix() {
-    export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}"
-}
-
-_qtRmTmp() {
+_qtPostInstallHook() {
+    # Clean up temporary installation files created by this setup hook.
+    # For building Qt modules, this is necessary to prevent including
+    # dependencies in the output. For all other packages, this is necessary
+    # to induce patchelf to remove the temporary paths from the RPATH of
+    # dynamically-linked objects.
     if [ -z "$NIX_QT_SUBMODULE" ]; then
         rm -fr "$NIX_QT5_TMP"
     else
@@ -85,11 +67,51 @@ _qtRmTmp() {
 
         rm "$NIX_QT5_TMP/nix-support/qt-inputs"
     fi
+
+    # Patch CMake modules
+    if [ -n "$NIX_QT_SUBMODULE" ]; then
+        find "${!outputLib}" -name "*.cmake" | while read file; do
+            substituteInPlace "$file" \
+                              --subst-var-by NIX_OUT "${!outputLib}" \
+                              --subst-var-by NIX_DEV "${!outputDev}"
+        done
+    fi
+}
+if [ -z "$NIX_QT5_TMP" ]; then
+    preConfigureHooks+=(_qtPreConfigureHook)
+fi
+
+_qtLinkModuleDir() {
+    if [ -d "$1/$2" ]; then
+        @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2"
+        find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
+    fi
 }
 
-_qtSetQmakePath() {
+_qtPreConfigureHook() {
+    # Find the temporary qmake executable first.
+    # This must run after all the environment hooks!
     export PATH="$NIX_QT5_TMP/bin${PATH:+:}$PATH"
+
+    # Link all runtime module dependencies into the temporary directory.
+    IFS=: read -a modules <<< $NIX_QT5_MODULES
+    for module in ${modules[@]}; do
+        _qtLinkModuleDir "$module" "lib"
+    done
+
+    # Link all the build-time module dependencies into the temporary directory.
+    IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV
+    for module in ${modules[@]}; do
+        _qtLinkModuleDir "$module" "bin"
+        _qtLinkModuleDir "$module" "include"
+        _qtLinkModuleDir "$module" "lib"
+        _qtLinkModuleDir "$module" "mkspecs"
+        _qtLinkModuleDir "$module" "share"
+    done
 }
+if [ -z "$NIX_QT5_TMP" ]; then
+    postInstallHooks+=(_qtPostInstallHook)
+fi
 
 if [ -z "$NIX_QT5_TMP" ]; then
     if [ -z "$NIX_QT_SUBMODULE" ]; then
@@ -97,7 +119,6 @@ if [ -z "$NIX_QT5_TMP" ]; then
     else
         NIX_QT5_TMP=$out
     fi
-    postInstallHooks+=(_qtRmTmp)
 
     mkdir -p "$NIX_QT5_TMP/nix-support"
     for subdir in bin include lib mkspecs share; do
@@ -105,8 +126,6 @@ if [ -z "$NIX_QT5_TMP" ]; then
         echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
     done
 
-    postHooks+=(_qtSetCMakePrefix)
-
     cp "@dev@/bin/qmake" "$NIX_QT5_TMP/bin"
     echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
 
@@ -120,48 +139,5 @@ EOF
     echo "bin/qt.conf" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
 
     export QMAKE="$NIX_QT5_TMP/bin/qmake"
-
-    # Set PATH to find qmake first in a preConfigure hook
-    # It must run after all the envHooks!
-    preConfigureHooks+=(_qtSetQmakePath)
 fi
 
-qt5LinkModuleDir() {
-    if [ -d "$1/$2" ]; then
-        @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2"
-        find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
-    fi
-}
-
-NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"
-NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"
-
-_qtLinkAllModules() {
-    IFS=: read -a modules <<< $NIX_QT5_MODULES
-    for module in ${modules[@]}; do
-        qt5LinkModuleDir "$module" "lib"
-    done
-
-    IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV
-    for module in ${modules[@]}; do
-        qt5LinkModuleDir "$module" "bin"
-        qt5LinkModuleDir "$module" "include"
-        qt5LinkModuleDir "$module" "lib"
-        qt5LinkModuleDir "$module" "mkspecs"
-        qt5LinkModuleDir "$module" "share"
-    done
-}
-
-preConfigureHooks+=(_qtLinkAllModules)
-
-_qtFixCMakePaths() {
-    find "${!outputLib}" -name "*.cmake" | while read file; do
-        substituteInPlace "$file" \
-            --subst-var-by NIX_OUT "${!outputLib}" \
-            --subst-var-by NIX_DEV "${!outputDev}"
-    done
-}
-
-if [ -n "$NIX_QT_SUBMODULE" ]; then
-    postInstallHooks+=(_qtFixCMakePaths)
-fi
-- 
GitLab


From d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 20:08:10 -0500
Subject: [PATCH 0881/1490] qt5: use one output by default

---
 pkgs/applications/kde/build-support/application.nix | 2 ++
 pkgs/development/libraries/qt-5/5.6/default.nix     | 3 +--
 pkgs/development/libraries/qt-5/5.8/default.nix     | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix
index a5d1ccc3add..892d82fb51e 100644
--- a/pkgs/applications/kde/build-support/application.nix
+++ b/pkgs/applications/kde/build-support/application.nix
@@ -11,6 +11,8 @@ mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
+  outputs = args.outputs or [ "out" "dev" ];
+
   meta = {
     platforms = lib.platforms.linux;
     homepage = "http://www.kde.org";
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index b286f8c5298..b250ae8b952 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -48,8 +48,6 @@ let
   mkDerivation = args:
     stdenv.mkDerivation (args // {
 
-      outputs = args.outputs or [ "out" "dev" ];
-
       qmakeFlags =
         (args.qmakeFlags or [])
         ++ optional (debug != null)
@@ -82,6 +80,7 @@ let
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
+      outputs = args.outputs or [ "out" "dev" ];
       setOutputFlags = args.setOutputFlags or false;
 
       setupHook = ../qtsubmodule-setup-hook.sh;
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 034c7fd10e1..fd4769a02c6 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -39,8 +39,6 @@ let
   mkDerivation = args:
     stdenv.mkDerivation (args // {
 
-      outputs = args.outputs or [ "out" "dev" ];
-
       qmakeFlags =
         (args.qmakeFlags or [])
         ++ optional (debug != null)
@@ -73,6 +71,7 @@ let
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
+      outputs = args.outputs or [ "out" "dev" ];
       setOutputFlags = args.setOutputFlags or false;
 
       setupHook = ../qtsubmodule-setup-hook.sh;
-- 
GitLab


From dea7372ebfe197dfe722bc375e415020a3cf6d96 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 21:04:39 -0500
Subject: [PATCH 0882/1490] qtbase: fix plugin path in CMake modules

---
 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix       | 5 +++--
 pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch | 4 ++--
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix       | 5 +++--
 pkgs/development/libraries/qt-5/qtbase-setup-hook.sh         | 5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
index a4039714a60..4e7c7ea5456 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -237,8 +237,9 @@ stdenv.mkDerivation {
   postInstall = ''
     find "$out" -name "*.cmake" | while read file; do
         substituteInPlace "$file" \
-            --subst-var-by NIX_OUT "$out" \
-            --subst-var-by NIX_DEV "$dev"
+            --subst-var-by NIX_OUT "''${!outputLib}" \
+            --subst-var-by NIX_DEV "''${!outputDev}" \
+            --subst-var-by NIX_BIN "''${!outputBin}"
     done
   '';
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
index c43653558e3..3408b235e0c 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
@@ -306,11 +306,11 @@ Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.c
  
  !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_BIN@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
  !!ENDIF
  !!IF !isEmpty(CMAKE_DEBUG_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_BIN@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
  !!ENDIF
  
  list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index a627bcbee52..3048baeb327 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -269,8 +269,9 @@ stdenv.mkDerivation {
     ''
       find "$out" -name "*.cmake" | while read file; do
           substituteInPlace "$file" \
-              --subst-var-by NIX_OUT "$out" \
-              --subst-var-by NIX_DEV "$dev"
+              --subst-var-by NIX_OUT "''${!outputLib}" \
+              --subst-var-by NIX_DEV "''${!outputDev}" \
+              --subst-var-by NIX_BIN "''${!outputBin}"
       done
     '';
 
diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
index 35df52d7a08..e7752af4397 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
@@ -72,8 +72,9 @@ _qtPostInstallHook() {
     if [ -n "$NIX_QT_SUBMODULE" ]; then
         find "${!outputLib}" -name "*.cmake" | while read file; do
             substituteInPlace "$file" \
-                              --subst-var-by NIX_OUT "${!outputLib}" \
-                              --subst-var-by NIX_DEV "${!outputDev}"
+                --subst-var-by NIX_OUT "${!outputLib}" \
+                --subst-var-by NIX_DEV "${!outputDev}" \
+                --subst-var-by NIX_BIN "${!outputBin}"
         done
     fi
 }
-- 
GitLab


From b9ae0c7185c500f8f2d6688c96f59777493dc229 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 May 2017 15:47:39 -0500
Subject: [PATCH 0883/1490] kwallet-pam: set path to socat

---
 pkgs/desktops/plasma-5/kwallet-pam.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index b7a783f82a3..d555701c76d 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -1,10 +1,11 @@
-{ mkDerivation, extra-cmake-modules, pam, socat, libgcrypt }:
+{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, }:
 
 mkDerivation {
   name = "kwallet-pam";
 
   nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [ pam socat libgcrypt ];
-
+  buildInputs = [ pam socat libgcrypt qtbase ];
+  postPatch = ''
+    sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|"
+  '';
 }
-- 
GitLab


From 078c88a7a715ed5b0245d46c0ce6776cb5e73a8b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 19 May 2017 07:42:08 -0500
Subject: [PATCH 0884/1490] startkde: use absolute paths to required programs

The dependency on socat is removed because kwallet setup is deferred to kwallet-pam.
---
 pkgs/desktops/plasma-5/startkde/default.nix | 62 +++++++++---------
 pkgs/desktops/plasma-5/startkde/startkde.sh | 72 +++++++++------------
 2 files changed, 61 insertions(+), 73 deletions(-)

diff --git a/pkgs/desktops/plasma-5/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix
index 25ebdd7f332..3b04c037073 100644
--- a/pkgs/desktops/plasma-5/startkde/default.nix
+++ b/pkgs/desktops/plasma-5/startkde/default.nix
@@ -1,41 +1,41 @@
 {
-  stdenv, lib, runCommand, dbus, qttools, socat, gnugrep, gnused, kconfig,
-  kinit, kservice, plasma-workspace, xmessage, xprop, xsetroot, qtbase,
-  qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2,
-  qtscript, qtsvg, qtx11extras, qtxmlpatterns
+  stdenv, lib, runCommand, substituteAll, dbus, gnugrep, gnused, kconfig,
+  kinit, kservice, plasma-desktop, plasma-workspace, xmessage, xprop, xrdb,
+  xsetroot, qttools,
 }:
 
 let
 
-  env = {
+  inherit (lib) getBin getLib;
+
+  script = substituteAll {
+    src = ./startkde.sh;
     inherit (stdenv) shell;
-    bins = builtins.map (pkg: pkg.out or pkg)
-      [
-        dbus qttools socat
-        gnugrep gnused
-        kconfig kinit kservice
-        plasma-workspace
-        xmessage xprop xsetroot
-      ];
-    libs = builtins.map (pkg: pkg.out or pkg)
-      [
-        qtbase qtdeclarative qtgraphicaleffects qtquickcontrols qtquickcontrols2
-        qtscript qtsvg qtx11extras qtxmlpatterns
-      ];
+    kbuildsycoca5 = "${getBin kservice}/bin/kbuildsycoca5";
+    sed = "${getBin gnused}/bin/sed";
+    kcheckrunning = "${getBin plasma-workspace}/bin/kcheckrunning";
+    xmessage = "${getBin xmessage}/bin/xmessage";
+    kstartupconfig5 = "${getBin plasma-workspace}/bin/kstartupconfig5";
+    kapplymousetheme = "${getBin plasma-desktop}/bin/kapplymousetheme";
+    xsetroot = "${getBin xsetroot}/bin/xsetroot";
+    xrdb = "${getBin xrdb}/bin/xrdb";
+    ksplashqml = "${getBin plasma-workspace}/bin/ksplashqml";
+    qdbus = "${getBin qttools}/bin/qdbus";
+    xprop = "${getBin xprop}/bin/xprop";
+    qtpaths = "${getBin qttools}/bin/qtpaths";
+    dbus_update_activation_environment = "${getBin dbus}/bin/dbus-update-activation-environment";
+    start_kdeinit_wrapper = "${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper";
+    kwrapper5 = "${getBin kinit}/bin/kwrapper5";
+    ksmserver = "${getBin plasma-workspace}/bin/ksmserver";
+    kreadconfig5 = "${getBin kconfig}/bin/kreadconfig5";
+    kdeinit5_shutdown = "${getBin kinit}/bin/kdeinit5_shutdown";
   };
 
-in runCommand "startkde" env ''
-
-  # Configure PATH variable
-  suffixPATH=
-  for p in $bins; do
-      addToSearchPath suffixPATH "$p/bin"
-      addToSearchPath suffixPATH "$p/lib/libexec"
-      addToSearchPath suffixPATH "$p/lib/libexec/kf5"
-  done
+in
 
-  substitute ${./startkde.sh} "$out" \
-      --subst-var shell \
-      --subst-var suffixPATH
-  chmod +x "$out"
+runCommand "startkde.sh"
+{ preferLocalBuild = true; allowSubstitutes = false; }
+''
+  cp ${script} $out
+  chmod +x $out
 ''
diff --git a/pkgs/desktops/plasma-5/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh
index 53e7fbb0569..f8b4f4844e2 100755
--- a/pkgs/desktops/plasma-5/startkde/startkde.sh
+++ b/pkgs/desktops/plasma-5/startkde/startkde.sh
@@ -1,10 +1,6 @@
 #!@shell@
 
-PATH="$PATH${PATH:+:}@suffixPATH@"
-
-echo "NIX_PROFILES=\"$NIX_PROFILES\""
-
-kbuildsycoca5
+@kbuildsycoca5@
 
 # Set the default GTK 2 theme
 if ! [ -e $HOME/.gtkrc-2.0 ] \
@@ -30,6 +26,7 @@ fi
 
 if ! [ -e $HOME/.config/gtk-3.0/settings.ini ] \
        && [ -e /run/current-system/sw/share/themes/Breeze/gtk-3.0 ]; then
+    mkdir -p $HOME/.config/gtk-3.0
     cat >$HOME/.config/gtk-3.0/settings.ini <<EOF
 [Settings]
 gtk-font-name=Sans Serif Regular 10
@@ -61,7 +58,7 @@ rm -fv $HOME/.cache/icon-cache.kcache
 # in Trolltech.conf.  A better solution would be to stop
 # Qt from doing this wackiness in the first place.
 if [ -e $HOME/.config/Trolltech.conf ]; then
-    sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
 fi
 
 if test "x$1" = x--failsafe; then
@@ -79,11 +76,11 @@ trap 'echo GOT SIGHUP' HUP
 unset DYLD_FORCE_FLAT_NAMESPACE
 
 # Check if a KDE session already is running and whether it's possible to connect to X
-kcheckrunning
+@kcheckrunning@
 kcheckrunning_result=$?
 if test $kcheckrunning_result -eq 0 ; then
     echo "KDE seems to be already running on this display."
-    xmessage -geometry 500x100 "KDE seems to be already running on this display."
+    @xmessage@ -geometry 500x100 "KDE seems to be already running on this display."
     exit 1
 elif test $kcheckrunning_result -eq 2 ; then
     echo "\$DISPLAY is not set or cannot connect to the X server."
@@ -105,7 +102,7 @@ fi
 # * Then ksmserver is started which takes control of the rest of the startup sequence
 
 # We need to create config folder so we can write startupconfigkeys
-configDir=$(qtpaths --writable-path GenericConfigLocation)
+configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
 mkdir -p "$configDir"
 
 if ! [ -e $configDir/kcminputrc ]; then
@@ -162,10 +159,10 @@ activeFont=Noto Sans,12,-1,5,50,0,0,0,0,0,Bold
 EOF
 }
 
-kstartupconfig5
+@kstartupconfig5@
 returncode=$?
 if test $returncode -ne 0; then
-    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
+    @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
     exit 1
 fi
 [ -r $configDir/startupconfig ] && . $configDir/startupconfig
@@ -187,7 +184,7 @@ export XCURSOR_PATH
 # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
 if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
 
-    kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+    @kapplymousetheme@ "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
     if test $? -eq 10; then
         XCURSOR_THEME=breeze_cursors
         export XCURSOR_THEME
@@ -211,10 +208,10 @@ unset THEME
 # If the user has overwritten fonts, the cursor font may be different now
 # so don't move this up.
 #
-xsetroot -cursor_name left_ptr
+@xsetroot@ -cursor_name left_ptr
 
 if test "$kcmfonts_general_forcefontdpi" -ne 0; then
-    xrdb -quiet -merge -nocpp <<EOF
+    @xrdb@ -quiet -merge -nocpp <<EOF
 Xft.dpi: $kcmfonts_general_forcefontdpi
 EOF
 fi
@@ -227,7 +224,7 @@ if test -z "$dl"; then
   # the splashscreen and progress indicator
   case "$ksplashrc_ksplash_engine" in
     KSplashQML)
-      ksplash_pid=$(ksplashqml "${ksplashrc_ksplash_theme}" --pid)
+      ksplash_pid=$(@ksplashqml@ "${ksplashrc_ksplash_theme}" --pid)
       ;;
     None)
       ;;
@@ -239,12 +236,12 @@ fi
 echo 'startkde: Starting up...'  1>&2
 
 # Make sure that D-Bus is running
-if qdbus >/dev/null 2>/dev/null; then
+if @qdbus@ >/dev/null 2>/dev/null; then
     : # ok
 else
     echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
     test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
     exit 1
 fi
 
@@ -272,11 +269,11 @@ fi
 #
 KDE_FULL_SESSION=true
 export KDE_FULL_SESSION
-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
 
 KDE_SESSION_VERSION=5
 export KDE_SESSION_VERSION
-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
 
 KDE_SESSION_UID=$(id -ru)
 export KDE_SESSION_UID
@@ -298,7 +295,7 @@ export XDG_CURRENT_DESKTOP
 # For anything else (that doesn't set env vars, or that needs a window manager),
 # better use the Autostart folder.
 
-IFS=":" read -r -a scriptpath <<< $(qtpaths --paths GenericConfigLocation)
+IFS=":" read -r -a scriptpath <<< $(@qtpaths@ --paths GenericConfigLocation)
 # Add /env/ to the directory to locate the scripts to be sourced
 for prefix in "${scriptpath[@]}"; do
   for file in "$prefix"/plasma-workspace/env/*.sh; do
@@ -306,37 +303,28 @@ for prefix in "${scriptpath[@]}"; do
   done
 done
 
-# At this point all the environment is ready, let's send it to kwalletd if running
-if test -n "$PAM_KWALLET_LOGIN" ; then
-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
-fi
-# ...and also to kwalletd5
-if test -n "$PAM_KWALLET5_LOGIN" ; then
-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
-fi
-
 # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-dbus-update-activation-environment --systemd --all
+@dbus_update_activation_environment@ --systemd --all
 if test $? -ne 0; then
   # Startup error
   echo 'startkde: Could not sync environment to dbus.'  1>&2
   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  xmessage -geometry 500x100 "Could not sync environment to dbus."
+  @xmessage@ -geometry 500x100 "Could not sync environment to dbus."
   exit 1
 fi
 
 # We set LD_BIND_NOW to increase the efficiency of kdeinit.
 # kdeinit unsets this variable before loading applications.
-LD_BIND_NOW=true start_kdeinit_wrapper --kded +kcminit_startup
+LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup
 if test $? -ne 0; then
   # Startup error
   echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
+  @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation."
   exit 1
 fi
 
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+@qdbus@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
 
 # finally, give the session control to the session manager
 # see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -353,15 +341,15 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
 # lock now and do the rest of the KDE startup underneath the locker.
 KSMSERVEROPTIONS=""
 test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
-kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
+@kwrapper5@ @ksmserver@ $KDEWM $KSMSERVEROPTIONS
 if test $? -eq 255; then
   # Startup error
   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
+  @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation."
 fi
 
-wait_drkonqi=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true)
+wait_drkonqi=$(@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true)
 
 if test x"$wait_drkonqi"x = x"true"x ; then
     # wait for remaining drkonqi instances with timeout (in seconds)
@@ -372,8 +360,8 @@ if test x"$wait_drkonqi"x = x"true"x ; then
         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
             # ask remaining drkonqis to die in a graceful way
-            qdbus | grep 'org.kde.drkonqi-' | while read address ; do
-                qdbus "$address" "/MainApplication" "quit"
+            @qdbus@ | grep 'org.kde.drkonqi-' | while read address ; do
+                @qdbus@ "$address" "/MainApplication" "quit"
             done
             break
         fi
@@ -385,12 +373,12 @@ echo 'startkde: Shutting down...'  1>&2
 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
 
 # Clean up
-kdeinit5_shutdown
+@kdeinit5_shutdown@
 
 unset KDE_FULL_SESSION
-xprop -root -remove KDE_FULL_SESSION
+@xprop@ -root -remove KDE_FULL_SESSION
 unset KDE_SESSION_VERSION
-xprop -root -remove KDE_SESSION_VERSION
+@xprop@ -root -remove KDE_SESSION_VERSION
 unset KDE_SESSION_UID
 
 echo 'startkde: Done.'  1>&2
-- 
GitLab


From 7dc961b310f377e31850e38472afc729b3c3085b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 19 May 2017 07:43:02 -0500
Subject: [PATCH 0885/1490] qttools: move runtime tools in postFixup

---
 pkgs/development/libraries/qt-5/5.8/qttools/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
index 6c0f540e79b..8c231271607 100644
--- a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
@@ -7,7 +7,8 @@ qtSubmodule {
   qtInputs = [ qtbase ];
   outputs = [ "out" "dev" "bin" ];
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
-  postInstall = ''
+  # qmake moves all binaries to $dev in preFixup
+  postFixup = ''
     moveToOutput "bin/qdbus" "$bin"
     moveToOutput "bin/qtpaths" "$bin"
   '';
-- 
GitLab


From da942ea23f28c5a29882a802b728add1b6f309a6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 09:20:39 -0500
Subject: [PATCH 0886/1490] breeze-gtk: bump GTK3 version

---
 pkgs/desktops/plasma-5/breeze-gtk.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index 9c204e3acb8..3ba952811cf 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -3,6 +3,6 @@
 mkDerivation {
   name = "breeze-gtk";
   nativeBuildInputs = [ extra-cmake-modules ];
-  cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ];
+  cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
   buildInputs = [ qtbase ];
 }
-- 
GitLab


From 30ff56a20fede60f37285abe7e1609d68b965757 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 09:20:59 -0500
Subject: [PATCH 0887/1490] breeze-gtk: patch builder to find GTK2 pixmap
 engine

This does not seem to be strictly necessary, but it also cannot hurt.
---
 pkgs/desktops/plasma-5/breeze-gtk.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index 3ba952811cf..f2d76fe19e6 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -1,8 +1,14 @@
-{ mkDerivation , extra-cmake-modules , qtbase }:
+{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, }:
+
+let inherit (lib) getLib; in
 
 mkDerivation {
   name = "breeze-gtk";
   nativeBuildInputs = [ extra-cmake-modules ];
   cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
   buildInputs = [ qtbase ];
+  postPatch = ''
+    sed -i cmake/FindGTKEngine.cmake \
+      -e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|"
+  '';
 }
-- 
GitLab


From 05ef92e53a325aabd51bd7820a46d1359a53de2e Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Thu, 6 Apr 2017 22:35:12 +0200
Subject: [PATCH 0888/1490] gpgme: enable Qt 5 bindings

---
 pkgs/development/libraries/gpgme/default.nix         |  6 ++++--
 .../libraries/gpgme/gpgme_libsuffix.patch            | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/gpgme/gpgme_libsuffix.patch

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 5601a8854ef..36d90604a82 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
+{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "gpgme-1.9.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "info" ];
   outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
 
-  propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
+  propagatedBuildInputs = [ libgpgerror glib libassuan pth qt5.qtbase ];
 
   nativeBuildInputs = [ pkgconfig gnupg ];
 
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
     "--enable-fixed-path=${gnupg}/bin"
   ];
 
+  patches = [ ./gpgme_libsuffix.patch ];
+
   # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
   NIX_CFLAGS_COMPILE =
     with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
diff --git a/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch b/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch
new file mode 100644
index 00000000000..4abc2757cf6
--- /dev/null
+++ b/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch
@@ -0,0 +1,12 @@
+diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 928d19f..cbe9713 100644 (file)
+--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
+ 
+ set_target_properties(Gpgmepp PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
++  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
+   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
+ )
-- 
GitLab


From f5c00c43bb6d4a4a09e4b4a8a273833deba994cc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 10:31:12 -0500
Subject: [PATCH 0889/1490] qgpgme: init at 1.9.0

---
 pkgs/development/libraries/gpgme/default.nix | 21 +++++++++++++++-----
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 36d90604a82..8ae88944dd1 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan, qt5 }:
+{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
+, qtbase ? null }:
+
+let inherit (stdenv) lib system; in
 
 stdenv.mkDerivation rec {
   name = "gpgme-1.9.0";
@@ -8,10 +11,20 @@ stdenv.mkDerivation rec {
     sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6";
+      sha256 = "0swpxzd3x3b6h2ry2py9j8l0xp3vdw8rixxhgfavzia5p869qyyx";
+      name = "qgpgme-format-security.patch";
+    })
+  ];
+
   outputs = [ "out" "dev" "info" ];
   outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
 
-  propagatedBuildInputs = [ libgpgerror glib libassuan pth qt5.qtbase ];
+  propagatedBuildInputs =
+    [ libgpgerror glib libassuan pth ]
+    ++ lib.optional (qtbase != null) qtbase;
 
   nativeBuildInputs = [ pkgconfig gnupg ];
 
@@ -19,11 +32,9 @@ stdenv.mkDerivation rec {
     "--enable-fixed-path=${gnupg}/bin"
   ];
 
-  patches = [ ./gpgme_libsuffix.patch ];
-
   # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
   NIX_CFLAGS_COMPILE =
-    with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
+    lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
 
   meta = with stdenv.lib; {
     homepage = "https://gnupg.org/software/gpgme/index.html";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68a1c2d29ea..153f6c0a7f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9773,6 +9773,8 @@ with pkgs;
 
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
 
+    qgpgme = callPackage ../development/libraries/gpgme { };
+
     grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
 
     inherit (callPackage ../development/libraries/kirigami { })
-- 
GitLab


From 3acfd310507bb6f41dfa947524dbb329714d2e79 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:24:46 -0500
Subject: [PATCH 0890/1490] akonadi: fix runtime paths

---
 pkgs/applications/kde/akonadi.nix             |  20 ----
 .../kde/akonadi/akonadi-paths.patch           | 105 ++++++++++++++++++
 .../kde/akonadi/akonadi-timestamps.patch      |  14 +++
 pkgs/applications/kde/akonadi/default.nix     |  36 ++++++
 pkgs/applications/kde/akonadi/series          |   2 +
 pkgs/applications/kde/default.nix             |   2 +-
 6 files changed, 158 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/kde/akonadi.nix
 create mode 100644 pkgs/applications/kde/akonadi/akonadi-paths.patch
 create mode 100644 pkgs/applications/kde/akonadi/akonadi-timestamps.patch
 create mode 100644 pkgs/applications/kde/akonadi/default.nix
 create mode 100644 pkgs/applications/kde/akonadi/series

diff --git a/pkgs/applications/kde/akonadi.nix b/pkgs/applications/kde/akonadi.nix
deleted file mode 100644
index 367fdd36fb8..00000000000
--- a/pkgs/applications/kde/akonadi.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules,
-  kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
-  kio,
-  boost, kitemmodels
-}:
-
-mkDerivation {
-  name = "akonadi";
-  meta = {
-    license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
-  ];
-  propagatedBuildInputs = [ boost kitemmodels ];
-}
diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
new file mode 100644
index 00000000000..690664791f4
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -0,0 +1,105 @@
+Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+@@ -76,20 +76,11 @@ bool DbConfigMysql::init(QSettings &sett
+         defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
+     }
+ #endif
+-    const QStringList mysqldSearchPath = QStringList()
+-                                         << QStringLiteral("/usr/bin")
+-                                         << QStringLiteral("/usr/sbin")
+-                                         << QStringLiteral("/usr/local/sbin")
+-                                         << QStringLiteral("/usr/local/libexec")
+-                                         << QStringLiteral("/usr/libexec")
+-                                         << QStringLiteral("/opt/mysql/libexec")
+-                                         << QStringLiteral("/opt/local/lib/mysql5/bin")
+-                                         << QStringLiteral("/opt/mysql/sbin");
+     if (defaultServerPath.isEmpty()) {
+-        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath);
++        defaultServerPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
+     }
+ 
+-    const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
++    const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);
+     if (!mysqladminPath.isEmpty()) {
+ #ifndef Q_OS_WIN
+         defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
+@@ -99,10 +90,10 @@ bool DbConfigMysql::init(QSettings &sett
+ #endif
+     }
+ 
+-    mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath);
++    mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
+     qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
+ 
+-    mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath);
++    mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK);
+     qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
+ 
+     mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
+@@ -119,7 +110,7 @@ bool DbConfigMysql::init(QSettings &sett
+     mUserName = settings.value(QStringLiteral("User")).toString();
+     mPassword = settings.value(QStringLiteral("Password")).toString();
+     mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
+-    mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
++    mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
+     mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
+     settings.endGroup();
+ 
+@@ -196,7 +187,7 @@ bool DbConfigMysql::startInternalServer(
+ #endif
+ 
+     // generate config file
+-    const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
++    const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
+     const QString localConfig  = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf"));
+     const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
+     if (globalConfig.isEmpty()) {
+Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp
++++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
+@@ -97,8 +97,8 @@ bool DbConfigPostgresql::init(QSettings
+         }
+         postgresSearchPath.append(postgresVersionedSearchPaths);
+ 
+-        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
+-        defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
++        defaultServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
++        defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB);
+         defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
+         defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
+     }
+Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp
++++ akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
+@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A
+     } else {
+         Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
+         const QStringList arguments = QStringList() << executable << identifier();
+-        const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher"));
++        const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher");
+         mController->start(agentLauncherExec, arguments);
+     }
+     return true;
+Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/akonadicontrol/agentmanager.cpp
++++ akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
+@@ -102,12 +102,12 @@ AgentManager::AgentManager(bool verbose,
+     mStorageController = new Akonadi::ProcessControl;
+     mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld
+     connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
+-    mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++    mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+ 
+     if (mAgentServerEnabled) {
+         mAgentServer = new Akonadi::ProcessControl;
+         connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
+-        mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++        mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+     }
+ 
+ #ifndef QT_NO_DEBUG
diff --git a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
new file mode 100644
index 00000000000..25a835f5ba2
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
@@ -0,0 +1,14 @@
+Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+@@ -229,8 +229,7 @@ bool DbConfigMysql::startInternalServer(
+     bool confUpdate = false;
+     QFile actualFile(actualConfig);
+     // update conf only if either global (or local) is newer than actual
+-    if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) ||
+-            (QFileInfo(localConfig).lastModified()  > QFileInfo(actualFile).lastModified())) {
++    if (true) {
+         QFile globalFile(globalConfig);
+         QFile localFile(localConfig);
+         if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
new file mode 100644
index 00000000000..a264ebc9f09
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -0,0 +1,36 @@
+{
+  mkDerivation, copyPathsToStore, lib,
+  extra-cmake-modules,
+  kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
+  kio,
+  boost, kitemmodels,
+  mysql
+}:
+
+mkDerivation {
+  name = "akonadi";
+  meta = {
+    license = [ lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
+  ];
+  propagatedBuildInputs = [ boost kitemmodels ];
+  cmakeFlags = [
+    "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld"
+  ];
+  NIX_CFLAGS_COMPILE = [
+    ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"''
+    ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"''
+    ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB="${lib.getBin mysql}/bin/mysql_install_db"''
+    ''-DNIXPKGS_MYSQL_MYSQLCHECK="${lib.getBin mysql}/bin/mysqlcheck"''
+    ''-DNIXPKGS_POSTGRES_PG_CTL=""''
+    ''-DNIXPKGS_POSTGRES_INITDB=""''
+  ];
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DNIX_OUT=\"$out\""
+  '';
+}
diff --git a/pkgs/applications/kde/akonadi/series b/pkgs/applications/kde/akonadi/series
new file mode 100644
index 00000000000..9e067f0a000
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/series
@@ -0,0 +1,2 @@
+akonadi-paths.patch
+akonadi-timestamps.patch
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 931132cf428..d8b8c4242cb 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -48,7 +48,7 @@ let
       };
     in {
       kdelibs = callPackage ./kdelibs { inherit attica phonon; };
-      akonadi = callPackage ./akonadi.nix {};
+      akonadi = callPackage ./akonadi {};
       akonadi-contacts = callPackage ./akonadi-contacts.nix {};
       akonadi-mime = callPackage ./akonadi-mime.nix {};
       ark = callPackage ./ark/default.nix {};
-- 
GitLab


From be9a4fe6ca399364e732e14a69075bc3a23047d8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 18:28:17 -0500
Subject: [PATCH 0891/1490] akonadi: do not store path to mysqld in
 configuration

---
 .../kde/akonadi/akonadi-paths.patch           | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index 690664791f4..782b6cede9a 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -2,10 +2,23 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
 ===================================================================
 --- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
 +++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
-@@ -76,20 +76,11 @@ bool DbConfigMysql::init(QSettings &sett
-         defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
-     }
+@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett
+     // determine default settings depending on the driver
+     QString defaultHostName;
+     QString defaultOptions;
+-    QString defaultServerPath;
+     QString defaultCleanShutdownCommand;
+ 
+ #ifndef Q_OS_WIN
+@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett
  #endif
+ 
+     const bool defaultInternalServer = true;
+-#ifdef MYSQLD_EXECUTABLE
+-    if (QFile::exists(QStringLiteral(MYSQLD_EXECUTABLE))) {
+-        defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
+-    }
+-#endif
 -    const QStringList mysqldSearchPath = QStringList()
 -                                         << QStringLiteral("/usr/bin")
 -                                         << QStringLiteral("/usr/sbin")
@@ -15,17 +28,16 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
 -                                         << QStringLiteral("/opt/mysql/libexec")
 -                                         << QStringLiteral("/opt/local/lib/mysql5/bin")
 -                                         << QStringLiteral("/opt/mysql/sbin");
-     if (defaultServerPath.isEmpty()) {
+-    if (defaultServerPath.isEmpty()) {
 -        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath);
-+        defaultServerPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
-     }
+-    }
  
 -    const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
 +    const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);
      if (!mysqladminPath.isEmpty()) {
  #ifndef Q_OS_WIN
          defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
-@@ -99,10 +90,10 @@ bool DbConfigMysql::init(QSettings &sett
+@@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett
  #endif
      }
  
@@ -38,7 +50,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
      qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
  
      mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -119,7 +110,7 @@ bool DbConfigMysql::init(QSettings &sett
+@@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett
      mUserName = settings.value(QStringLiteral("User")).toString();
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -47,7 +59,27 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
      mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
      settings.endGroup();
  
-@@ -196,7 +187,7 @@ bool DbConfigMysql::startInternalServer(
+@@ -129,9 +111,6 @@ bool DbConfigMysql::init(QSettings &sett
+         // intentionally not namespaced as we are the only one in this db instance when using internal mode
+         mDatabaseName = QStringLiteral("akonadi");
+     }
+-    if (mInternalServer && (mMysqldPath.isEmpty() || !QFile::exists(mMysqldPath))) {
+-        mMysqldPath = defaultServerPath;
+-    }
+ 
+     qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
+ 
+@@ -140,9 +119,6 @@ bool DbConfigMysql::init(QSettings &sett
+     settings.setValue(QStringLiteral("Name"), mDatabaseName);
+     settings.setValue(QStringLiteral("Host"), mHostName);
+     settings.setValue(QStringLiteral("Options"), mConnectionOptions);
+-    if (!mMysqldPath.isEmpty()) {
+-        settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
+-    }
+     settings.setValue(QStringLiteral("StartServer"), mInternalServer);
+     settings.endGroup();
+     settings.sync();
+@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer(
  #endif
  
      // generate config file
-- 
GitLab


From fceb3794a209437d9c557f0e69a80ad97631a18b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 18:30:35 -0500
Subject: [PATCH 0892/1490] akonadi: do not store path to pg_ctl in
 configuration

---
 .../kde/akonadi/akonadi-paths.patch           | 62 +++++++++++++++++--
 1 file changed, 58 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index 782b6cede9a..f1ae1f23cc9 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -92,17 +92,71 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
 ===================================================================
 --- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp
 +++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
-@@ -97,8 +97,8 @@ bool DbConfigPostgresql::init(QSettings
-         }
-         postgresSearchPath.append(postgresVersionedSearchPaths);
+@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings
+     // determine default settings depending on the driver
+     QString defaultHostName;
+     QString defaultOptions;
+-    QString defaultServerPath;
+     QString defaultInitDbPath;
+     QString defaultPgData;
  
+@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings
+ 
+     mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
+     if (mInternalServer) {
+-        QStringList postgresSearchPath;
+-
+-#ifdef POSTGRES_PATH
+-        const QString dir(QStringLiteral(POSTGRES_PATH));
+-        if (QDir(dir).exists()) {
+-            postgresSearchPath << QStringLiteral(POSTGRES_PATH);
+-        }
+-#endif
+-        postgresSearchPath << QStringLiteral("/usr/sbin")
+-                           << QStringLiteral("/usr/local/sbin");
+-        // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed
+-        // sorted order, so we search from the newest one to the oldest.
+-        QStringList postgresVersionedSearchPaths;
+-        QDir versionedDir(QStringLiteral("/usr/lib/postgresql"));
+-        if (versionedDir.exists()) {
+-            const auto versionedDirs = versionedDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed);
+-            for (const auto &path : versionedDirs) {
+-                // Don't break once PostgreSQL 10 is released, but something more future-proof will be needed
+-                if (path.fileName().startsWith(QLatin1String("10."))) {
+-                    postgresVersionedSearchPaths.prepend(path.absoluteFilePath() + QStringLiteral("/bin"));
+-                } else {
+-                    postgresVersionedSearchPaths.append(path.absoluteFilePath() + QStringLiteral("/bin"));
+-                }
+-            }
+-        }
+-        postgresSearchPath.append(postgresVersionedSearchPaths);
+-
 -        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
 -        defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
-+        defaultServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
 +        defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB);
          defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
          defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
      }
+@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings
+     mUserName = settings.value(QStringLiteral("User")).toString();
+     mPassword = settings.value(QStringLiteral("Password")).toString();
+     mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
+-    mServerPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
+-    if (mInternalServer && mServerPath.isEmpty()) {
+-        mServerPath = defaultServerPath;
+-    }
++    mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
+     qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
+     mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
+     if (mInternalServer && mInitDbPath.isEmpty()) {
+@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings
+         settings.setValue(QStringLiteral("Port"), mHostPort);
+     }
+     settings.setValue(QStringLiteral("Options"), mConnectionOptions);
+-    settings.setValue(QStringLiteral("ServerPath"), mServerPath);
+     settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
+     settings.setValue(QStringLiteral("StartServer"), mInternalServer);
+     settings.endGroup();
 Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
 ===================================================================
 --- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp
-- 
GitLab


From 9149faf6a9701fc3faa45f83fad3282f03d994ea Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 19 May 2017 09:31:44 -0500
Subject: [PATCH 0893/1490] prison: init at 5.33.0

---
 .../development/libraries/kde-frameworks/default.nix |  1 +
 pkgs/development/libraries/kde-frameworks/prison.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks/prison.nix

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index abe17848f3b..3010a211db2 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -158,6 +158,7 @@ let
       networkmanager-qt = callPackage ./networkmanager-qt.nix {};
       oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
       plasma-framework = callPackage ./plasma-framework.nix {};
+      prison = callPackage ./prison.nix {};
       solid = callPackage ./solid.nix {};
       sonnet = callPackage ./sonnet.nix {};
       syntax-highlighting = callPackage ./syntax-highlighting.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix
new file mode 100644
index 00000000000..905321235c7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/prison.nix
@@ -0,0 +1,12 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  libdmtx, qrencode, qtbase,
+}:
+
+mkDerivation {
+  name = "prison";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ libdmtx qrencode qtbase ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 153f6c0a7f7..3be50635f8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9754,7 +9754,7 @@ with pkgs;
       knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner
       kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
       kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
-      networkmanager-qt plasma-framework solid sonnet syntax-highlighting
+      networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting
       threadweaver;
 
     ### KDE PLASMA 5
-- 
GitLab


From 087f20e8c66372bdba86fa309dd4e1be3f35d821 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 24 May 2017 13:20:10 -0500
Subject: [PATCH 0894/1490] kdeFrameworks: sort according to tier

---
 .../libraries/kde-frameworks/default.nix      | 98 +++++++++++--------
 1 file changed, 55 insertions(+), 43 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 3010a211db2..71b24a0da6b 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -36,6 +36,7 @@ let
   mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
 
   packages = self: with self;
+    # SUPPORT
     let
 
       propagateBin =
@@ -90,79 +91,90 @@ let
       };
 
     in {
+      extra-cmake-modules = callPackage ./extra-cmake-modules {};
+
+    # TIER 1
       attica = callPackage ./attica.nix {};
-      baloo = callPackage ./baloo.nix {};
       bluez-qt = callPackage ./bluez-qt.nix {};
       breeze-icons = callPackage ./breeze-icons.nix {};
-      extra-cmake-modules = callPackage ./extra-cmake-modules {};
-      frameworkintegration = callPackage ./frameworkintegration.nix {};
-      kactivities = callPackage ./kactivities.nix {};
-      kactivities-stats = callPackage ./kactivities-stats.nix {};
       kapidox = callPackage ./kapidox.nix {};
       karchive = callPackage ./karchive.nix {};
-      kauth = callPackage ./kauth {};
-      kbookmarks = callPackage ./kbookmarks.nix {};
-      kcmutils = callPackage ./kcmutils {};
       kcodecs = callPackage ./kcodecs.nix {};
-      kcompletion = callPackage ./kcompletion.nix {};
       kconfig = callPackage ./kconfig.nix {};
-      kconfigwidgets = callPackage ./kconfigwidgets {};
       kcoreaddons = callPackage ./kcoreaddons.nix {};
-      kcrash = callPackage ./kcrash.nix {};
       kdbusaddons = callPackage ./kdbusaddons.nix {};
+      kdnssd = callPackage ./kdnssd.nix {};
+      kguiaddons = callPackage ./kguiaddons.nix {};
+      ki18n = callPackage ./ki18n.nix {};
+      kidletime = callPackage ./kidletime.nix {};
+      kitemmodels = callPackage ./kitemmodels.nix {};
+      kitemviews = callPackage ./kitemviews.nix {};
+      kplotting = callPackage ./kplotting.nix {};
+      kwayland = callPackage ./kwayland.nix {};
+      kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
+      kwindowsystem = callPackage ./kwindowsystem {};
+      modemmanager-qt = callPackage ./modemmanager-qt.nix {};
+      networkmanager-qt = callPackage ./networkmanager-qt.nix {};
+      oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
+      prison = callPackage ./prison.nix {};
+      solid = callPackage ./solid.nix {};
+      sonnet = callPackage ./sonnet.nix {};
+      syntax-highlighting = callPackage ./syntax-highlighting.nix {};
+      threadweaver = callPackage ./threadweaver.nix {};
+
+    # TIER 2
+      kactivities = callPackage ./kactivities.nix {};
+      kactivities-stats = callPackage ./kactivities-stats.nix {};
+      kauth = callPackage ./kauth {};
+      kcompletion = callPackage ./kcompletion.nix {};
+      kcrash = callPackage ./kcrash.nix {};
+      kdoctools = callPackage ./kdoctools {};
+      kfilemetadata = callPackage ./kfilemetadata {};
+      kimageformats = callPackage ./kimageformats.nix {};
+      kjobwidgets = callPackage ./kjobwidgets.nix {};
+      knotifications = callPackage ./knotifications.nix {};
+      kpackage = callPackage ./kpackage {};
+      kpty = callPackage ./kpty.nix {};
+      kunitconversion = callPackage ./kunitconversion.nix {};
+
+    # TIER 3
+      baloo = callPackage ./baloo.nix {};
+      kbookmarks = callPackage ./kbookmarks.nix {};
+      kcmutils = callPackage ./kcmutils {};
+      kconfigwidgets = callPackage ./kconfigwidgets {};
       kdeclarative = callPackage ./kdeclarative.nix {};
       kded = callPackage ./kded.nix {};
-      kdelibs4support = callPackage ./kdelibs4support {};
       kdesignerplugin = callPackage ./kdesignerplugin.nix {};
       kdesu = callPackage ./kdesu.nix {};
-      kdnssd = callPackage ./kdnssd.nix {};
-      kdoctools = callPackage ./kdoctools {};
       kemoticons = callPackage ./kemoticons.nix {};
-      kfilemetadata = callPackage ./kfilemetadata {};
       kglobalaccel = callPackage ./kglobalaccel.nix {};
-      kguiaddons = callPackage ./kguiaddons.nix {};
-      khtml = callPackage ./khtml.nix {};
-      ki18n = callPackage ./ki18n.nix {};
       kiconthemes = callPackage ./kiconthemes {};
-      kidletime = callPackage ./kidletime.nix {};
-      kimageformats = callPackage ./kimageformats.nix {};
       kinit = callPackage ./kinit {};
       kio = callPackage ./kio {};
-      kitemmodels = callPackage ./kitemmodels.nix {};
-      kitemviews = callPackage ./kitemviews.nix {};
-      kjobwidgets = callPackage ./kjobwidgets.nix {};
-      kjs = callPackage ./kjs.nix {};
-      kjsembed = callPackage ./kjsembed.nix {};
-      kmediaplayer = callPackage ./kmediaplayer.nix {};
       knewstuff = callPackage ./knewstuff.nix {};
-      knotifications = callPackage ./knotifications.nix {};
       knotifyconfig = callPackage ./knotifyconfig.nix {};
-      kpackage = callPackage ./kpackage {};
       kparts = callPackage ./kparts.nix {};
       kpeople = callPackage ./kpeople.nix {};
-      kplotting = callPackage ./kplotting.nix {};
-      kpty = callPackage ./kpty.nix {};
-      kross = callPackage ./kross.nix {};
       krunner = callPackage ./krunner.nix {};
       kservice = callPackage ./kservice {};
       ktexteditor = callPackage ./ktexteditor.nix {};
       ktextwidgets = callPackage ./ktextwidgets.nix {};
-      kunitconversion = callPackage ./kunitconversion.nix {};
       kwallet = callPackage ./kwallet.nix {};
-      kwayland = callPackage ./kwayland.nix {};
-      kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-      kwindowsystem = callPackage ./kwindowsystem {};
       kxmlgui = callPackage ./kxmlgui.nix {};
       kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
-      modemmanager-qt = callPackage ./modemmanager-qt.nix {};
-      networkmanager-qt = callPackage ./networkmanager-qt.nix {};
-      oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
       plasma-framework = callPackage ./plasma-framework.nix {};
-      prison = callPackage ./prison.nix {};
-      solid = callPackage ./solid.nix {};
-      sonnet = callPackage ./sonnet.nix {};
-      syntax-highlighting = callPackage ./syntax-highlighting.nix {};
-      threadweaver = callPackage ./threadweaver.nix {};
+
+    # TIER 4
+      frameworkintegration = callPackage ./frameworkintegration.nix {};
+
+    # PORTING AIDS
+      kdelibs4support = callPackage ./kdelibs4support {};
+      khtml = callPackage ./khtml.nix {};
+      kjs = callPackage ./kjs.nix {};
+      kjsembed = callPackage ./kjsembed.nix {};
+      kmediaplayer = callPackage ./kmediaplayer.nix {};
+      kross = callPackage ./kross.nix {};
+
     };
 
 in lib.makeScope libsForQt5.newScope packages
-- 
GitLab


From faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 22 May 2017 13:49:07 -0500
Subject: [PATCH 0895/1490] kdeFrameworks: fixup inputs and outputs

- Reduce environment pollution with a separate $bin output containing programs,
  plugins, and shared data. Libraries remain in $out and are not installed into
  the environment.
- Only propagate build inputs as required.
---
 .../services/x11/desktop-managers/plasma5.nix |  4 +--
 pkgs/applications/kde/akonadi-contacts.nix    |  8 +++--
 pkgs/applications/kde/akonadi-mime.nix        |  5 ++--
 pkgs/applications/kde/ark/default.nix         |  9 +++---
 pkgs/applications/kde/baloo-widgets.nix       |  1 +
 pkgs/applications/kde/dolphin.nix             |  1 +
 pkgs/applications/kde/gwenview.nix            |  5 ++--
 pkgs/applications/kde/kcontacts.nix           |  6 ++--
 pkgs/applications/kde/kmime.nix               |  4 +--
 pkgs/applications/kde/kwalletmanager.nix      |  5 ++--
 pkgs/applications/kde/okular.nix              | 11 ++++---
 pkgs/applications/kde/spectacle.nix           |  3 +-
 pkgs/desktops/plasma-5/bluedevil.nix          |  3 +-
 pkgs/desktops/plasma-5/breeze-qt5.nix         |  6 ++--
 pkgs/desktops/plasma-5/kactivitymanagerd.nix  |  2 +-
 pkgs/desktops/plasma-5/kde-cli-tools.nix      | 10 +++----
 .../plasma-5/kde-gtk-config/default.nix       |  2 +-
 pkgs/desktops/plasma-5/kdeplasma-addons.nix   | 16 +++++-----
 pkgs/desktops/plasma-5/kgamma5.nix            |  8 +++--
 pkgs/desktops/plasma-5/khotkeys.nix           |  6 ++--
 pkgs/desktops/plasma-5/kinfocenter.nix        |  2 +-
 pkgs/desktops/plasma-5/kscreen.nix            |  6 ++--
 pkgs/desktops/plasma-5/kscreenlocker.nix      |  5 ++--
 pkgs/desktops/plasma-5/ksshaskpass.nix        |  8 +++--
 pkgs/desktops/plasma-5/kwallet-pam.nix        |  1 -
 .../plasma-5/kwayland-integration.nix         |  8 +++--
 pkgs/desktops/plasma-5/kwrited.nix            |  8 +++--
 pkgs/desktops/plasma-5/milou.nix              | 14 +++++----
 pkgs/desktops/plasma-5/oxygen.nix             |  7 +++--
 pkgs/desktops/plasma-5/plasma-integration.nix | 14 ++++-----
 pkgs/desktops/plasma-5/plasma-nm/default.nix  | 19 ++++++------
 pkgs/desktops/plasma-5/plasma-pa.nix          | 12 ++++----
 .../libraries/kde-frameworks/attica.nix       |  1 +
 .../libraries/kde-frameworks/baloo.nix        | 15 ++++++----
 .../libraries/kde-frameworks/bluez-qt.nix     |  5 ++--
 .../libraries/kde-frameworks/breeze-icons.nix |  3 +-
 .../libraries/kde-frameworks/default.nix      | 10 ++++---
 .../extra-cmake-modules/setup-hook.sh         | 14 ++++-----
 .../kde-frameworks/frameworkintegration.nix   |  7 +++--
 .../kde-frameworks/kactivities-stats.nix      | 10 +++++--
 .../libraries/kde-frameworks/kactivities.nix  | 13 +++++----
 .../libraries/kde-frameworks/kapidox.nix      |  3 ++
 .../libraries/kde-frameworks/karchive.nix     | 10 +++++--
 .../kde-frameworks/kauth/default.nix          | 11 +++++--
 .../libraries/kde-frameworks/kbookmarks.nix   | 12 +++++---
 .../kde-frameworks/kcmutils/default.nix       |  9 +++---
 .../libraries/kde-frameworks/kcodecs.nix      |  6 ++--
 .../libraries/kde-frameworks/kcompletion.nix  |  6 ++--
 .../libraries/kde-frameworks/kconfig.nix      |  3 +-
 .../kde-frameworks/kconfigwidgets/default.nix | 13 +++++----
 .../libraries/kde-frameworks/kcoreaddons.nix  | 11 +++++--
 .../libraries/kde-frameworks/kcrash.nix       | 10 +++++--
 .../libraries/kde-frameworks/kdbusaddons.nix  | 11 +++++--
 .../libraries/kde-frameworks/kdeclarative.nix |  7 +++--
 .../libraries/kde-frameworks/kded.nix         | 11 ++++---
 .../kdelibs4support/default.nix               | 29 ++++++++++---------
 .../kde-frameworks/kdesignerplugin.nix        |  8 ++---
 .../libraries/kde-frameworks/kdesu.nix        | 10 +++++--
 .../libraries/kde-frameworks/kdnssd.nix       | 10 ++++---
 .../kde-frameworks/kdoctools/default.nix      | 16 ++++++++--
 .../libraries/kde-frameworks/kemoticons.nix   |  5 ++--
 .../kde-frameworks/kfilemetadata/default.nix  |  7 +++--
 .../libraries/kde-frameworks/kglobalaccel.nix | 13 ++++++---
 .../libraries/kde-frameworks/kguiaddons.nix   |  4 ++-
 .../libraries/kde-frameworks/khtml.nix        |  9 +++---
 .../libraries/kde-frameworks/ki18n.nix        |  2 +-
 .../kde-frameworks/kiconthemes/default.nix    |  8 +++--
 .../libraries/kde-frameworks/kidletime.nix    |  3 +-
 .../kde-frameworks/kimageformats.nix          | 10 ++++---
 .../kde-frameworks/kinit/default.nix          | 18 ++++++++++--
 .../libraries/kde-frameworks/kio/default.nix  | 14 +++++----
 .../libraries/kde-frameworks/kitemmodels.nix  |  1 +
 .../libraries/kde-frameworks/kitemviews.nix   |  4 ++-
 .../libraries/kde-frameworks/kjobwidgets.nix  |  2 +-
 .../libraries/kde-frameworks/kjs.nix          |  4 ++-
 .../libraries/kde-frameworks/kjsembed.nix     | 10 ++++---
 .../libraries/kde-frameworks/kmediaplayer.nix |  2 +-
 .../libraries/kde-frameworks/knewstuff.nix    | 16 ++++++----
 .../kde-frameworks/knotifications.nix         |  2 +-
 .../kde-frameworks/knotifyconfig.nix          | 10 +++++--
 .../kde-frameworks/kpackage/default.nix       |  4 +--
 .../libraries/kde-frameworks/kparts.nix       | 15 ++++++----
 .../libraries/kde-frameworks/kpeople.nix      | 10 +++++--
 .../libraries/kde-frameworks/kplotting.nix    |  3 +-
 .../libraries/kde-frameworks/kpty.nix         |  5 ++--
 .../libraries/kde-frameworks/kross.nix        |  6 ++--
 .../libraries/kde-frameworks/krunner.nix      | 13 +++++----
 .../kde-frameworks/kservice/default.nix       | 12 +++++---
 .../libraries/kde-frameworks/ktexteditor.nix  | 16 +++++-----
 .../libraries/kde-frameworks/ktextwidgets.nix | 14 +++++----
 .../kde-frameworks/kunitconversion.nix        |  5 ++--
 .../libraries/kde-frameworks/kwallet.nix      | 14 +++++----
 .../libraries/kde-frameworks/kwayland.nix     |  7 +++--
 .../kde-frameworks/kwidgetsaddons.nix         | 12 +++++---
 .../kde-frameworks/kwindowsystem/default.nix  |  7 +++--
 .../libraries/kde-frameworks/kxmlgui.nix      | 15 ++++++----
 .../kde-frameworks/kxmlrpcclient.nix          |  4 ++-
 .../kde-frameworks/modemmanager-qt.nix        | 11 +++----
 .../kde-frameworks/networkmanager-qt.nix      | 11 +++----
 .../kde-frameworks/oxygen-icons5.nix          |  2 +-
 .../kde-frameworks/plasma-framework.nix       | 17 ++++++-----
 .../libraries/kde-frameworks/prison.nix       |  4 ++-
 .../libraries/kde-frameworks/solid.nix        |  8 +++--
 .../libraries/kde-frameworks/sonnet.nix       |  5 ++--
 .../kde-frameworks/syntax-highlighting.nix    |  5 ++--
 .../libraries/kde-frameworks/threadweaver.nix |  9 ++++--
 106 files changed, 533 insertions(+), 338 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 0a64429c24f..f099117f477 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -52,8 +52,8 @@ in
       };
 
       security.wrappers = {
-        kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass";
-        "start_kdeinit".source = "${pkgs.kinit.out}/lib/libexec/kf5/start_kdeinit";
+        kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass";
+        "start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
       };
 
       environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index 7d017f6496f..3f410b7b8b9 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
@@ -1,8 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
-  akonadi
+  akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes,
+  kio, kitemmodels, kmime, ktextwidgets, qtwebengine,
 }:
 
 mkDerivation {
@@ -13,7 +13,9 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine
+    akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio
+    kitemmodels kmime ktextwidgets qtwebengine
   ];
   propagatedBuildInputs = [ akonadi ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index 390ef373528..1fb50756665 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  akonadi, kdbusaddons, kio, kitemmodels, kmime
+  akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
 }:
 
 mkDerivation {
@@ -11,5 +11,6 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ];
+  buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index f2976c38c39..df15f6b0f18 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -3,8 +3,8 @@
 
   extra-cmake-modules, kdoctools,
 
-  karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
-  kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
+  karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, kitemmodels,
+  khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive,
 
   # Archive tools
   p7zip, unzipNLS, zip,
@@ -17,9 +17,10 @@ mkDerivation {
   name = "ark";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
   propagatedBuildInputs = [
-    khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
-    kpty kwidgetsaddons libarchive kitemmodels
+    karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio kitemmodels
+    kparts kpty kservice kwidgetsaddons libarchive
   ];
+  outputs = [ "out" "dev" ];
   postFixup =
     let
       PATH =
diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix
index 17ae75cc479..3479b6600fc 100644
--- a/pkgs/applications/kde/baloo-widgets.nix
+++ b/pkgs/applications/kde/baloo-widgets.nix
@@ -14,4 +14,5 @@ mkDerivation {
   propagatedBuildInputs = [
     baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index ff5be6fdd88..2570e37bf2c 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -20,4 +20,5 @@ mkDerivation {
     kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
     phonon solid
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 99be13ba7f8..233566c1bda 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -13,9 +13,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ exiv2 lcms2 ];
-  propagatedBuildInputs = [
-    baloo kactivities kdelibs4support kio libkdcraw libkipi phonon
+  buildInputs = [
+    baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon
     qtimageformats qtsvg qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index e7876d0d43e..96828af9d17 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,8 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ki18n,
-  kcoreaddons, kconfig, kcodecs
+  kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
 }:
 
 mkDerivation {
@@ -12,6 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n ];
-  propagatedBuildInputs = [ kcoreaddons kconfig kcodecs ];
+  buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
 }
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index 5bd8762391c..b14e0abcc3f 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, ki18n,
-  kcodecs
+  kcodecs, qtbase,
 }:
 
 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ki18n ];
-  buildInputs = [ kcodecs ];
+  buildInputs = [ kcodecs qtbase ];
 }
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index 75420b6600f..e39e7e5157d 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -8,6 +8,7 @@
 , kcoreaddons
 , kdbusaddons
 , kdelibs4support
+, kwallet
 , kxmlgui
 }:
 
@@ -18,8 +19,8 @@ mkDerivation {
     maintainers = with lib.maintainers; [ fridh ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
-    kxmlgui
+    kwallet kxmlgui
   ];
 }
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 8cfd946b810..99b69f45e1e 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -4,18 +4,17 @@
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
   kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
-  libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
+  libspectre, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
 }:
 
 mkDerivation {
   name = "okular";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ djvulibre ebook_tools ];
-  propagatedBuildInputs = [
-    kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
+  buildInputs = [
+    djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
     kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio
-    kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler qca-qt5
-    qtdeclarative qtsvg threadweaver
+    kparts kpty kwallet kwindowsystem libkexiv2 libspectre phonon poppler
+    qca-qt5 qtdeclarative qtsvg threadweaver
   ];
   meta = {
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 7fa18289ae1..db1bf2aee65 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -4,6 +4,7 @@
   ki18n, xcb-util-cursor,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -13,7 +14,7 @@ mkDerivation {
   buildInputs = [ ki18n xcb-util-cursor ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
-    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index 6db3e787911..44e8a26eee1 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -7,11 +7,10 @@
 mkDerivation {
   name = "bluedevil";
   nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
-  propagatedBuildInputs = [
+  buildInputs = [
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
     kdbusaddons kded kiconthemes knotifications kwidgetsaddons
   ];
-  propagatedUserEnvPkgs = [ bluez-qt.out ];
   postInstall = ''
     # Fix the location of logic.js for the plasmoid
     ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index 11af6fff04b..b1cb3b7f8fc 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
-  kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
+  kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -11,7 +12,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration
-    kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras
+    kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
+    qtx11extras
   ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
 }
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index 27f977ea785..629718ab5a0 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -7,7 +7,7 @@
 mkDerivation {
   name = "kactivitymanagerd";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
     kxmlgui
   ];
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
index e18481d6da9..6bcafc5813a 100644
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -1,14 +1,14 @@
 {
-  mkDerivation, extra-cmake-modules,
-  kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
-  kwindowsystem, qtsvg, qtx11extras
+  mkDerivation, extra-cmake-modules, kdoctools,
+  kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
+  qtsvg, qtx11extras,
 }:
 
 mkDerivation {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg
+  buildInputs = [
+    kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
     qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index eaa2a906f82..5e959ac8b79 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -16,7 +16,7 @@ mkDerivation {
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
   ];
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index e3526d56c37..b9f40563ef6 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, extra-cmake-modules, kdoctools
-, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
-, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
-, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
-, ibus
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio,
+  knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
+  plasma-framework, plasma-workspace, qtdeclarative, qtx11extras,
 }:
 
 mkDerivation {
   name = "kdeplasma-addons";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
-    kross krunner kservice ksysguard kunitconversion plasma-framework
+    kross krunner kservice ksysguard kunitconversion ibus plasma-framework
     plasma-workspace qtdeclarative qtx11extras
-    ibus
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
index 8199b5d0330..ea58cad12ae 100644
--- a/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/pkgs/desktops/plasma-5/kgamma5.nix
@@ -1,9 +1,11 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, kdelibs4support
-, qtx11extras
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kconfig, kconfigwidgets, ki18n, qtx11extras,
 }:
 
 mkDerivation {
   name = "kgamma5";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
+  buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ];
 }
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index 32d9c14ddef..be4ccc7b230 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -7,8 +7,8 @@
 mkDerivation {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
-    qtx11extras kcmutils kdbusaddons kxmlgui
+  buildInputs = [
+    kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
+    plasma-framework plasma-workspace qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
index ee6aa6aebda..d366aa4b36e 100644
--- a/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -9,7 +9,7 @@
 mkDerivation {
   name = "kinfocenter";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
     kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index 93dd0e71050..fcdc922ff94 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -6,8 +6,8 @@
 mkDerivation {
   name = "kscreen";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
-    kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
+  buildInputs = [
+    kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui
+    libkscreen qtdeclarative qtgraphicaleffects
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index 64ea4690513..631719fb535 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules, kdoctools,
   kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
-  kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
+  kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras,
+  wayland,
 }:
 
 mkDerivation {
@@ -10,6 +11,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
-    libXcursor pam plasma-framework qtdeclarative wayland
+    libXcursor pam plasma-framework qtdeclarative qtx11extras wayland
   ];
 }
diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
index 94bc5a35da0..39e260f6c70 100644
--- a/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5/ksshaskpass.nix
@@ -1,9 +1,11 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, kcoreaddons
-, ki18n, kwallet, kwidgetsaddons
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase,
 }:
 
 mkDerivation {
   name = "ksshaskpass";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
+  buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ];
 }
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index d555701c76d..1cbfb87ea56 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -2,7 +2,6 @@
 
 mkDerivation {
   name = "kwallet-pam";
-
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ pam socat libgcrypt qtbase ];
   postPatch = ''
diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
index e5d00eb0800..1344b477f73 100644
--- a/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/pkgs/desktops/plasma-5/kwayland-integration.nix
@@ -1,7 +1,11 @@
-{ mkDerivation , extra-cmake-modules , kidletime , kwayland , kwindowsystem }:
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kidletime, kwayland, kwindowsystem, qtbase,
+}:
 
 mkDerivation {
   name = "kwayland-integration";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kidletime kwindowsystem kwayland ];
+  buildInputs = [ kidletime kwindowsystem kwayland qtbase ];
 }
diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
index 18c4a4af8db..f6f6187e946 100644
--- a/pkgs/desktops/plasma-5/kwrited.nix
+++ b/pkgs/desktops/plasma-5/kwrited.nix
@@ -1,9 +1,11 @@
-{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, knotifications, kdbusaddons
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase,
 }:
 
 mkDerivation {
   name = "kwrited";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
+  buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ];
 }
diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index abc35279aba..7f38b74423c 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -1,6 +1,8 @@
-{ mkDerivation, extra-cmake-modules, qtscript, qtdeclarative
-, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
-, krunner
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework,
+  qtscript, qtdeclarative,
 }:
 
 mkDerivation {
@@ -8,8 +10,8 @@ mkDerivation {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  propagatedBuildInputs = [
-    kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
-    kcoreaddons kservice
+  buildInputs = [
+    kcoreaddons kdeclarative ki18n krunner kservice plasma-framework
+    qtdeclarative qtscript
   ];
 }
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index 483d987686a..97421191d90 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
-  ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
+  ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -10,6 +11,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
-    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
+    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
+    qtx11extras
   ];
+  outputs = [ "out" "dev" "bin" ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix
index 2bca3943c34..de46bb4373c 100644
--- a/pkgs/desktops/plasma-5/plasma-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, extra-cmake-modules
-, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
-, libXcursor
+{
+  mkDerivation,
+  extra-cmake-modules,
+  breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications,
+  kwayland, libXcursor
 }:
 
 # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
 
 mkDerivation {
   name = "plasma-integration";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland
+    breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
     libXcursor
   ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 5c343548fcf..8ff98ecfc1d 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -1,10 +1,11 @@
-{ mkDerivation, substituteAll, extra-cmake-modules, kdoctools
-, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
-, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
-, kxmlgui, mobile_broadband_provider_info
-, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
-, qca-qt5, qtdeclarative, solid, openvpn
+{
+  mkDerivation, substituteAll,
+  extra-cmake-modules, kdoctools,
+  kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
+  kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications,
+  kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
+  mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt,
+  openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid
 }:
 
 mkDerivation {
@@ -19,8 +20,8 @@ mkDerivation {
       inherit openvpn;
     })
   ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
+  buildInputs = [
     kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
     qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
     kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index ec40ffb9630..50f53d70a98 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,15 +1,15 @@
 {
   mkDerivation,
-  extra-cmake-modules,
-  gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
-  ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
+  extra-cmake-modules, kdoctools,
+  gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,
+  libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative
 }:
 
 mkDerivation {
   name = "plasma-pa";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    gconf glib kconfigwidgets kcoreaddons kdeclarative
-    kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework
+  buildInputs = [
+    gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n
+    libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index c70be1b877d..3c725223979 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -8,4 +8,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix
index 9bbb9a1101b..d5da9f5af17 100644
--- a/pkgs/development/libraries/kde-frameworks/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks/baloo.nix
@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kauth, kconfig
-, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
-, kio, lmdb, qtbase, solid
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n,
+  kidletime, kio, lmdb, qtbase, qtdeclarative, solid,
 }:
 
 mkDerivation {
   name = "baloo";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
-    kidletime lmdb qtbase solid
+  buildInputs = [
+    kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative
+    solid
   ];
+  propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index 2f3b960f3bd..ec4deae6cb4 100644
--- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
@@ -10,9 +10,10 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtdeclarative ];
+  buildInputs = [ qtdeclarative ];
+  propagatedBuildInputs = [ qtbase ];
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
-      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+      --replace /lib/udev/rules.d "$bin/lib/udev/rules.d"
   '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
index 1c4ed2a9909..9e4a40b22ab 100644
--- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
@@ -3,8 +3,7 @@
 mkDerivation {
   name = "breeze-icons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtsvg ];
-  propagatedUserEnvPkgs = [ qtsvg.out ];
+  outputs = [ "out" ]; # only runtime outputs
 }
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 71b24a0da6b..8ab1d1b99b6 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -39,11 +39,11 @@ let
     # SUPPORT
     let
 
-      propagateBin =
+      propagate = out:
         let setupHook = { writeScript }:
               writeScript "setup-hook.sh" ''
-                # Propagate $bin output
-                propagatedUserEnvPkgs+=" @bin@"
+                # Propagate $${out} output
+                propagatedUserEnvPkgs+=" @${out}@"
 
                 # Propagate $dev so that this setup hook is propagated
                 # But only if there is a separate $dev output
@@ -57,9 +57,11 @@ let
               '';
         in callPackage setupHook {};
 
+      propagateBin = propagate "bin";
+
       callPackage = self.newScope {
 
-        inherit propagateBin;
+        inherit propagate propagateBin;
 
         mkDerivation = args:
           let
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index a550cda1fa2..c1b1e21852c 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@@ -1,17 +1,16 @@
-_ecmSetXdgDirs() {
+_ecmEnvHook() {
     addToSearchPath XDG_DATA_DIRS "$1/share"
     addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
 }
+envHooks+=(_ecmEnvHook)
 
-envHooks+=(_ecmSetXdgDirs)
-
-_ecmConfig() {
+_ecmPreConfigureHook() {
     # Because we need to use absolute paths here, we must set *all* the paths.
     cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
     cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
     cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
     cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
-    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputBin}/lib/libexec"
+    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
     cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
     cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
     cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
@@ -25,7 +24,7 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5"
     cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5"
     cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputBin}/share/locale"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
     cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds"
     cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates"
     cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers"
@@ -52,5 +51,4 @@ _ecmConfig() {
         cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"
     fi
 }
-
-preConfigureHooks+=(_ecmConfig)
+preConfigureHooks+=(_ecmPreConfigureHook)
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 8f2d1446fcf..58b064806e5 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -9,8 +9,9 @@ mkDerivation {
   name = "frameworkintegration";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
-    knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras
+  buildInputs = [
+    kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage
+    kwidgetsaddons libXcursor qtx11extras
   ];
+  propagatedBuildInputs = [ kconfigwidgets kiconthemes ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
index 99737ea2b83..b558306248a 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
@@ -1,8 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, boost, kactivities, kconfig }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  boost, kactivities, kconfig, qtbase,
+}:
 
 mkDerivation {
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ boost kactivities kconfig ];
+  buildInputs = [ boost kactivities kconfig ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix
index 59b5639c24f..eabac6aadd7 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix
@@ -1,14 +1,15 @@
-{ mkDerivation, lib, extra-cmake-modules, boost, kcmutils, kconfig
-, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
-, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  boost, kconfig, kcoreaddons, kio, kwindowsystem, qtbase, qtdeclarative,
 }:
 
 mkDerivation {
   name = "kactivities";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
-    ki18n kio kservice kwindowsystem kxmlgui qtdeclarative
+  buildInputs = [
+    boost kconfig kcoreaddons kio kwindowsystem qtdeclarative
   ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix
index 0d3ccc276fc..ca5e773a45b 100644
--- a/pkgs/development/libraries/kde-frameworks/kapidox.nix
+++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix
@@ -4,4 +4,7 @@ mkDerivation {
   name = "kapidox";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules python ];
+  postFixup = ''
+    moveToOutput bin $bin
+  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index 5f725a75d56..1f90db2bc02 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -1,4 +1,8 @@
-{ mkDerivation, lib, extra-cmake-modules, qtbase }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  bzip2, lzma, qtbase, zlib,
+}:
 
 mkDerivation {
   name = "karchive";
@@ -7,5 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ bzip2 lzma zlib ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
index 25cdb7f4a19..c94c8b91ecd 100644
--- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
@@ -1,12 +1,17 @@
 {
-  mkDerivation, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore, propagate,
   extra-cmake-modules, kcoreaddons, polkit-qt, qttools
 }:
 
 mkDerivation {
   name = "kauth";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ kcoreaddons polkit-qt ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ polkit-qt qttools ];
+  propagatedBuildInputs = [ kcoreaddons ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  # library stores reference to plugin path,
+  # separating $out from $bin would create a reference cycle
+  outputs = [ "out" "dev" ];
+  setupHook = propagate "out";
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
index 0873094af3d..dc2339632e4 100644
--- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
+++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
@@ -1,13 +1,17 @@
 {
-  mkDerivation, lib, extra-cmake-modules,
-  kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui
+  mkDerivation, lib,
+  extra-cmake-modules, qttools,
+  kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kwidgetsaddons,
+  kxmlgui, qtbase,
 }:
 
 mkDerivation {
   name = "kbookmarks";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  buildInputs = [
     kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
   ];
+  propagatedBuildInputs = [ kwidgetsaddons qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index fb5779e10bc..023a5b5c003 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
@@ -2,16 +2,17 @@
   mkDerivation, lib,
   extra-cmake-modules,
   kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
-  kpackage, kservice, kxmlgui
+  kpackage, kservice, kxmlgui, qtdeclarative,
 }:
 
 mkDerivation {
   name = "kcmutils";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
-    kpackage kservice kxmlgui
+  buildInputs = [
+    kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui
+    qtdeclarative
   ];
+  propagatedBuildInputs = [ kconfigwidgets kservice ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index f66c422a638..90c9a963a60 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -6,6 +6,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index bf7556e94a6..fdfe28db6c0 100644
--- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
@@ -7,6 +7,8 @@
 mkDerivation {
   name = "kcompletion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ kconfig kwidgetsaddons qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kwidgetsaddons qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index f95b50f9de5..78b554017ee 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -6,6 +6,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
index 2b91e003764..3943e5d6d49 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
@@ -1,17 +1,20 @@
 {
   mkDerivation, lib, extra-cmake-modules,
-  kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons
+  kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons, qtbase,
 }:
 
 mkDerivation {
   name = "kconfigwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons
-  ];
+  buildInputs = [ kguiaddons ki18n qtbase ];
+  propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  outputs = [ "out" "dev" ];
+  preConfigure = ''
+    outputBin=dev
+  '';
   postInstall = ''
-    moveToOutput "bin/preparetips5" "$dev"
+    moveToOutput share/man $dev
   '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index 8fa10bd767b..34073d64f89 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -1,4 +1,8 @@
-{ mkDerivation, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
+{
+  mkDerivation, lib, fetchurl, writeScript,
+  extra-cmake-modules,
+  qtbase, qttools, shared_mime_info
+}:
 
 mkDerivation {
   name = "kcoreaddons";
@@ -6,6 +10,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ qtbase shared_mime_info ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools shared_mime_info ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix
index c8e674c88c5..d45d73d33e4 100644
--- a/pkgs/development/libraries/kde-frameworks/kcrash.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix
@@ -1,8 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcoreaddons, kwindowsystem, qtbase, qtx11extras,
+}:
 
 mkDerivation {
   name = "kcrash";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
+  buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index 8169c89b5ba..d0c744da886 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -1,4 +1,8 @@
-{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qttools, qtx11extras
+}:
 
 mkDerivation {
   name = "kdbusaddons";
@@ -6,6 +10,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ qtx11extras ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index 4b9522ffa5d..7aabeb02154 100644
--- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
@@ -8,8 +8,9 @@ mkDerivation {
   name = "kdeclarative";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
-    kwidgetsaddons kwindowsystem qtdeclarative
+  buildInputs = [
+    epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
+    kwindowsystem
   ];
+  propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix
index 18b8ccd0fb6..65377789582 100644
--- a/pkgs/development/libraries/kde-frameworks/kded.nix
+++ b/pkgs/development/libraries/kde-frameworks/kded.nix
@@ -1,13 +1,16 @@
 {
-  mkDerivation, lib, extra-cmake-modules,
-  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice
+  mkDerivation, lib, propagate,
+  extra-cmake-modules, kdoctools,
+  kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase,
 }:
 
 mkDerivation {
   name = "kded";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons kcrash kdbusaddons kinit kservice
+  buildInputs = [
+    kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase
   ];
+  outputs = [ "out" "dev" ];
+  setupHook = propagate "out";
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
index cf94a706167..6937a4056b2 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
@@ -1,12 +1,11 @@
 {
   mkDerivation, lib, copyPathsToStore,
-  extra-cmake-modules, kdoctools,
-  docbook_xml_dtd_45, kauth, karchive, kcompletion, kconfig, kconfigwidgets,
-  kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons,
-  kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels, kinit,
-  knotifications, kparts, kservice, ktextwidgets, kunitconversion,
-  kwidgetsaddons, kwindowsystem, kxmlgui, networkmanager, qtsvg, qtx11extras,
-  xlibs
+  docbook_xml_dtd_45, extra-cmake-modules, kdoctools,
+  kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash,
+  kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons,
+  ki18n, kiconthemes, kio, kitemmodels, kinit, knotifications, kparts, kservice,
+  ktextwidgets, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui,
+  networkmanager, qtbase, qtsvg, qttools, qtx11extras, xlibs
 }:
 
 mkDerivation {
@@ -14,16 +13,20 @@ mkDerivation {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  propagatedNativeBuildInputs = [ kdoctools ];
+  buildInputs = [
+    kcompletion kconfig kded kglobalaccel ki18n kio kservice kwidgetsaddons
+    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
+  ];
   propagatedBuildInputs = [
-    kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash
-    kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n
-    kio kiconthemes kitemmodels kinit knotifications kparts kservice
-    ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui
-    networkmanager qtsvg qtx11extras xlibs.libSM
+    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons kdesignerplugin
+    kemoticons kguiaddons kiconthemes kitemmodels kinit knotifications kparts
+    ktextwidgets kunitconversion kwindowsystem qtbase
   ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXML4_DTD_VERSION=4.5"
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
index c732a6be22e..91b596cc4d3 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
@@ -2,15 +2,15 @@
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio,
-  kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, sonnet
+  kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, qttools, sonnet,
 }:
 
 mkDerivation {
   name = "kdesignerplugin";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio
-    kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews
+    kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix
index e8d72008507..df60511b511 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesu.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix
@@ -1,10 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, kservice
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcoreaddons, ki18n, kpty, kservice, qtbase,
 }:
 
 mkDerivation {
   name = "kdesu";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
+  buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ];
+  propagatedBuildInputs = [ kpty ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 1d7553090fc..9382db43e2d 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, qttools,
-  avahi, qtbase
+  extra-cmake-modules,
+  avahi, qtbase, qttools,
 }:
 
 mkDerivation {
@@ -10,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ avahi qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ avahi qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 991717cce8c..55d719e8d8c 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -1,18 +1,28 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
-  karchive, ki18n, perl, perlPackages
+  karchive, ki18n, qtbase,
+  perl, perlPackages
 }:
 
 mkDerivation {
   name = "kdoctools";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ karchive ki18n ];
   propagatedNativeBuildInputs = [ perl perlPackages.URI ];
+  buildInputs = [ karchive ki18n ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
+  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
+  preConfigure = ''
+    outputBin=dev
+  '';
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
   ];
-  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
+  postFixup = ''
+    moveToOutput "share/doc" "$dev"
+    moveToOutput "share/man" "$dev"
+  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
index c2060e9c919..b7f4f036db5 100644
--- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
@@ -1,12 +1,13 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  karchive, kconfig, kcoreaddons, kservice
+  karchive, kcoreaddons, kservice, qtbase,
 }:
 
 mkDerivation {
   name = "kemoticons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
+  buildInputs = [ karchive kcoreaddons ];
+  propagatedBuildInputs = [ kservice qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index 3fb81c28a7b..7f325c88049 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
@@ -7,9 +7,10 @@
 mkDerivation {
   name = "kfilemetadata";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
+  buildInputs = [
+    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler taglib
   ];
+  propagatedBuildInputs = [ qtbase ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index cfe767b4d55..05fde45f17d 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -2,14 +2,19 @@
   mkDerivation, lib,
   extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
-  qtx11extras
+  qtbase, qttools, qtx11extras,
 }:
 
 mkDerivation {
   name = "kglobalaccel";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras
+  buildInputs = [
+    kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools
+    qtx11extras
   ];
+  propagatedBuildInputs = [ qtbase ];
+  postPatch = ''
+    sed -i src/runtime/org.kde.kglobalaccel.service.in \
+        -e "s|@CMAKE_INSTALL_PREFIX@|''${!outputBin}|"
+  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index 2b4e28ca492..5cc7e360782 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -11,5 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtx11extras ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix
index d6ec1ab901f..3724d078aff 100644
--- a/pkgs/development/libraries/kde-frameworks/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks/khtml.nix
@@ -10,9 +10,10 @@ mkDerivation {
   name = "khtml";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
-  propagatedBuildInputs = [
-    giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs
-    knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem
-    kxmlgui phonon qtx11extras sonnet
+  buildInputs = [
+    giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications
+    kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui phonon
+    qtx11extras sonnet
   ];
+  propagatedBuildInputs = [ kjs ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 649f1db3952..805cb201bd7 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -12,5 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedNativeBuildInputs = [ gettext python ];
-  propagatedBuildInputs = [ qtdeclarative qtscript ];
+  buildInputs = [ qtdeclarative qtscript ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
index f1d8503804e..4b8e0059377 100644
--- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
@@ -1,7 +1,8 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
-  karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
+  breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews,
+  qtbase, qtsvg,
 }:
 
 mkDerivation {
@@ -9,5 +10,8 @@ mkDerivation {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ];
+  buildInputs = [
+    breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews
+  ];
+  propagatedBuildInputs = [ qtbase qtsvg ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index 4139674cd39..69d83eb0ff5 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -11,5 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtbase qtx11extras ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index b711328cf89..26a8637bafc 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -1,14 +1,16 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ilmbase, karchive, qtbase
+  ilmbase, karchive, openexr, qtbase
 }:
 
+let inherit (lib) getDev; in
+
 mkDerivation {
   name = "kimageformats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ilmbase qtbase ];
-  propagatedBuildInputs = [ karchive ];
-  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
+  buildInputs = [ karchive openexr qtbase ];
+  outputs = [ "out" ]; # plugins only
+  NIX_CFLAGS_COMPILE = "-I${getDev ilmbase}/include/OpenEXR";
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index 51c0e40617a..1036ea27745 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore, writeScript,
   extra-cmake-modules, kdoctools,
   kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework
 }:
@@ -10,7 +10,7 @@ mkDerivation {
   name = "kinit";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kcrash ki18n kio kservice kwindowsystem
   ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
@@ -19,4 +19,18 @@ mkDerivation {
     ''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"''
     ''-DNIXPKGS_KF5_PLASMA="${getLib plasma-framework}/lib/libKF5Plasma.so.5"''
   ];
+  postFixup = ''
+    moveToOutput "lib/libexec/kf5/start_kdeinit" "$bin"
+  '';
+  setupHook = writeScript "setup-hook.sh" ''
+    kinitFixupOutputHook() {
+        if [ $prefix != ''${!outputBin} ] && [ -d $prefix/lib ]; then
+            mkdir -p ''${!outputBin}/lib
+            find $prefix/lib -maxdepth 1 -name 'libkdeinit5_*.so' -exec ln -s \{\} ''${!outputBin}/lib \;
+            rmdir --ignore-fail-on-non-empty ''${!outputBin}/lib
+        fi
+    }
+
+    fixupOutputHooks+=(kinitFixupOutputHook)
+  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 86cb72707a5..e4e4c90bfe1 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -1,21 +1,23 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  acl, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
+  karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
   kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
   kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
-  qtscript, qtx11extras, solid, fetchpatch
+  qtbase, qtscript, qtx11extras, solid,
 }:
 
 mkDerivation {
   name = "kio";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
+    ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras
+  ];
   propagatedBuildInputs = [
-    acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
-    kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
-    ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
-    qtx11extras
+    kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice
+    kxmlgui qtbase solid
   ];
   patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index a769d30b3c3..faeb5b16c34 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -12,4 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index 7e317deef58..c4c0e804e2d 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -10,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
index 048f1290a99..810e2bf8c84 100644
--- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
@@ -8,5 +8,5 @@ mkDerivation {
   name = "kjobwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
+  buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix
index 20459498c3e..62bcc0065b3 100644
--- a/pkgs/development/libraries/kde-frameworks/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjs.nix
@@ -1,10 +1,12 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools
+  extra-cmake-modules, kdoctools,
+  qtbase,
 }:
 
 mkDerivation {
   name = "kjs";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
index 3a52761e259..e8cd5070ae5 100644
--- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
@@ -1,11 +1,13 @@
 {
-  mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kjs
-, qtsvg
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, qttools,
+  ki18n, kjs, qtsvg,
 }:
 
 mkDerivation {
   name = "kjsembed";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ ki18n kjs qtsvg ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
+  buildInputs = [ ki18n qtsvg ];
+  propagatedBuildInputs = [ kjs ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
index 278a4240ab9..a4714c9e4ad 100644
--- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
+++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
@@ -8,5 +8,5 @@ mkDerivation {
   name = "kmediaplayer";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kparts kxmlgui ];
+  buildInputs = [ kparts kxmlgui ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
index b32a073fb33..70f3cbb3c37 100644
--- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix
+++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
@@ -1,14 +1,18 @@
-{ mkDerivation, lib, extra-cmake-modules, attica, karchive
-, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
-, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes,
+  kio, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase,
+  qtdeclarative,
 }:
 
 mkDerivation {
   name = "knewstuff";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
-    kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui
+  buildInputs = [
+    karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews
+    ktextwidgets kwidgetsaddons qtbase qtdeclarative
   ];
+  propagatedBuildInputs = [ attica kservice kxmlgui ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix
index 2532f5b4b4f..964e1b44115 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix
@@ -10,7 +10,7 @@ mkDerivation {
   name = "knotifications";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
index 29c779e6598..6739f96183c 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
@@ -1,10 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
-, ki18n, kio, phonon
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcompletion, kconfig, ki18n, kio, phonon, qtbase,
 }:
 
 mkDerivation {
   name = "knotifyconfig";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ];
+  buildInputs = [ kcompletion kconfig ki18n kio phonon ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index e83afaa8e82..c0b4b631286 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,13 +1,13 @@
 {
   mkDerivation, fetchurl, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  karchive, kconfig, kcoreaddons, ki18n
+  karchive, kconfig, kcoreaddons, ki18n, qtbase,
 }:
 
 mkDerivation {
   name = "kpackage";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
+  buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix
index db0eb6c2a2c..f657569277a 100644
--- a/pkgs/development/libraries/kde-frameworks/kparts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kparts.nix
@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
-, ktextwidgets, kwidgetsaddons, kxmlgui
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kconfig, kcoreaddons, ki18n, kiconthemes, kio, kjobwidgets, knotifications,
+  kservice, ktextwidgets, kwidgetsaddons, kxmlgui
 }:
 
 mkDerivation {
   name = "kparts";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications
-    kservice ktextwidgets kwidgetsaddons kxmlgui
+  buildInputs = [
+    kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice
+    kwidgetsaddons
   ];
+  propagatedBuildInputs = [ kio ktextwidgets kxmlgui ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix
index e10abf6ab62..04181fd3e13 100644
--- a/pkgs/development/libraries/kde-frameworks/kpeople.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix
@@ -1,12 +1,16 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n
-, kitemviews, kservice, kwidgetsaddons, qtdeclarative
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcoreaddons, ki18n, kitemviews, kservice, kwidgetsaddons, qtbase,
+  qtdeclarative,
 }:
 
 mkDerivation {
   name = "kpeople";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
   ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index a0d6b4625d9..5ff37fb1db1 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -9,5 +9,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix
index 27acf536c36..150c5b3d2b2 100644
--- a/pkgs/development/libraries/kde-frameworks/kpty.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpty.nix
@@ -1,8 +1,9 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }:
 
 mkDerivation {
   name = "kpty";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  buildInputs = [ kcoreaddons ki18n qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix
index 6b37c118183..f45fb5ecd1d 100644
--- a/pkgs/development/libraries/kde-frameworks/kross.nix
+++ b/pkgs/development/libraries/kde-frameworks/kross.nix
@@ -1,14 +1,14 @@
 { mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons
 , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
-, kxmlgui, qtscript
+, kxmlgui, qtbase, qtscript, qtxmlpatterns,
 }:
 
 mkDerivation {
   name = "kross";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
   propagatedBuildInputs = [
-    kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui
-    qtscript
+    ki18n kiconthemes kio kparts kwidgetsaddons qtbase qtscript qtxmlpatterns
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index 2f542591e49..9782320a487 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kservice, plasma-framework, solid
-, threadweaver
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase,
+  qtdeclarative, solid, threadweaver
 }:
 
 mkDerivation {
   name = "krunner";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons ki18n kio kservice plasma-framework solid
+  buildInputs = [
+    kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
     threadweaver
   ];
+  propagatedBuildInputs = [ plasma-framework qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index 2730cf53677..e6822dc2afb 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
@@ -1,14 +1,18 @@
 {
   mkDerivation, lib, copyPathsToStore,
   bison, extra-cmake-modules, flex,
-  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
+  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem,
+  qtbase,
 }:
 
 mkDerivation {
   name = "kservice";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ];
-  nativeBuildInputs = [ kdoctools ];
-  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedNativeBuildInputs = [ bison flex ];
+  buildInputs = [
+    kcrash kdbusaddons ki18n kwindowsystem qtbase
+  ];
+  propagatedBuildInputs = [ kconfig kcoreaddons ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index bc4dcf6916b..ae4d3a71d53 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, lib, copyPathsToStore
-, extra-cmake-modules, perl
-, karchive, kconfig, kguiaddons, kiconthemes, kparts
-, libgit2
-, qtscript, qtxmlpatterns
-, ki18n, kio, sonnet, syntax-highlighting
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules, perl,
+  karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
+  qtscript, qtxmlpatterns, sonnet, syntax-highlighting
 }:
 
 mkDerivation {
   name = "ktexteditor";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
-  propagatedBuildInputs = [
-    karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
+  buildInputs = [
+    karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript
     qtxmlpatterns sonnet syntax-highlighting
   ];
+  propagatedBuildInputs = [ kparts ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
index 695e7b991e7..8b082f7f365 100644
--- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
@@ -1,14 +1,16 @@
-{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
-, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
-, sonnet
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kservice,
+  kwindowsystem, qtbase, sonnet,
 }:
 
 mkDerivation {
   name = "ktextwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem
-    sonnet
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem
   ];
+  propagatedBuildInputs = [ ki18n qtbase sonnet ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
index e793bb8828f..d6c079fd83b 100644
--- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
@@ -1,8 +1,9 @@
-{ mkDerivation, lib, extra-cmake-modules, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, ki18n, qtbase, }:
 
 mkDerivation {
   name = "kunitconversion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n ];
+  buildInputs = [ ki18n qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index 31a29dbff92..fca0dedd083 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -1,14 +1,18 @@
-{ mkDerivation, lib, extra-cmake-modules, kconfig, kconfigwidgets
-, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
-, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
+  kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n,
+  kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem,
+  libgcrypt, qgpgme, qtbase,
 }:
 
 mkDerivation {
   name = "kwallet";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
-    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt gpgme
+    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme
   ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index 87c0bf84706..096100980d6 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, propagateBin,
   extra-cmake-modules,
   qtbase, wayland
 }:
@@ -11,6 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ wayland ];
+  buildInputs = [ wayland ];
+  propagatedBuildInputs = [ qtbase ];
+  setupHook = propagateBin; # XDG_CONFIG_DIRS
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index 4375cf064e1..e607f90de8d 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -1,5 +1,7 @@
-{ mkDerivation, lib
-, extra-cmake-modules, qtbase, qttools
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qttools
 }:
 
 mkDerivation {
@@ -8,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 6fe57449b89..ba43a5668a7 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -10,10 +10,11 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ qtx11extras ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/$qtPluginPrefix\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
   '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
index 80df93c61b8..b9aede81f9a 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, attica, kconfig
-, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
-, ktextwidgets, kwindowsystem, sonnet
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  attica, kconfig, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews,
+  ktextwidgets, kwindowsystem, qtbase, sonnet,
 }:
 
 mkDerivation {
   name = "kxmlgui";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews
-    ktextwidgets kwindowsystem sonnet
+  buildInputs = [
+    attica kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem
+    sonnet
   ];
+  propagatedBuildInputs = [ kconfig kconfigwidgets qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
index 714d768742e..acffde6a7cf 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
@@ -4,5 +4,7 @@ mkDerivation {
   name = "kxmlrpcclient";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n kio ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kio ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index c4edfeca5a3..cdf09a48b4f 100644
--- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
@@ -1,6 +1,7 @@
-{ mkDerivation, lib
-, extra-cmake-modules
-, modemmanager, qtbase
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  modemmanager, qtbase
 }:
 
 mkDerivation {
@@ -10,6 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ modemmanager ];
+  propagatedBuildInputs = [ modemmanager qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index 340c76ef778..3ed56bbf718 100644
--- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
@@ -1,6 +1,7 @@
-{ mkDerivation, lib
-, extra-cmake-modules
-, qtbase, networkmanager
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  networkmanager, qtbase,
 }:
 
 mkDerivation {
@@ -10,6 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ networkmanager ];
+  propagatedBuildInputs = [ networkmanager qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
index 919c4f36b15..2d795bfc50c 100644
--- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
+++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
@@ -9,7 +9,7 @@ mkDerivation {
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
+  outputs = [ "out" ]; # only runtime outputs
 }
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index f47750145b5..d3a81b50bf1 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,17 +1,20 @@
-{ mkDerivation, lib, fetchurl, extra-cmake-modules, kactivities, karchive
-, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
-, knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui
-, qtscript, qtx11extras
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
+  kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
+  kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio,
+  knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui,
+  qtbase, qtdeclarative, qtscript, qtx11extras,
 }:
 
 mkDerivation {
   name = "plasma-framework";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
-    kpackage kservice kwayland kwindowsystem kxmlgui qtscript qtx11extras
+    kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras
   ];
+  propagatedBuildInputs = [ kpackage kservice qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix
index 905321235c7..2d86f3fbf05 100644
--- a/pkgs/development/libraries/kde-frameworks/prison.nix
+++ b/pkgs/development/libraries/kde-frameworks/prison.nix
@@ -8,5 +8,7 @@ mkDerivation {
   name = "prison";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ libdmtx qrencode qtbase ];
+  buildInputs = [ libdmtx qrencode ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index f64b9936046..24705d6c114 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   bison, extra-cmake-modules, flex,
-  qtbase, qtdeclarative, qttools
+  media-player-info, qtbase, qtdeclarative, qttools
 }:
 
 mkDerivation {
@@ -10,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ bison extra-cmake-modules flex qttools ];
-  propagatedBuildInputs = [ qtdeclarative ];
+  nativeBuildInputs = [ bison extra-cmake-modules flex ];
+  buildInputs = [ qtdeclarative qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  propagatedUserEnvPkgs = [ media-player-info ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 06165a57c3a..90e2169c166 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -9,6 +9,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ hunspell qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ hunspell qttools ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index ebc33a8346e..82c8f323a0d 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -8,6 +8,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules perl qttools ];
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules perl ];
+  buildInputs = [ qttools ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index 3afedf18ecb..8861d2853ba 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -1,5 +1,7 @@
-{ mkDerivation, lib
-, extra-cmake-modules, qtbase
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase
 }:
 
 mkDerivation {
@@ -9,5 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
-- 
GitLab


From fc72335570e7063d9dfffef3635e3384a56de4bb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 25 May 2017 13:28:16 -0500
Subject: [PATCH 0896/1490] kio: print plugin name when loading fails

---
 .../kio/kio-debug-module-loader.patch               | 13 +++++++++++++
 .../development/libraries/kde-frameworks/kio/series |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch

diff --git a/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
new file mode 100644
index 00000000000..d26af49e5eb
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
@@ -0,0 +1,13 @@
+Index: kio-5.33.0/src/kiod/kiod_main.cpp
+===================================================================
+--- kio-5.33.0.orig/src/kiod/kiod_main.cpp
++++ kio-5.33.0/src/kiod/kiod_main.cpp
+@@ -60,7 +60,7 @@ void KIOD::loadModule(const QString &nam
+         module = factory->create<KDEDModule>();
+     }
+     if (!module) {
+-        qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString();
++        qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString();
+         return;
+     }
+     module->setModuleName(name); // makes it register to DBus
diff --git a/pkgs/development/libraries/kde-frameworks/kio/series b/pkgs/development/libraries/kde-frameworks/kio/series
index 77ca1545004..5330c40a330 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/series
+++ b/pkgs/development/libraries/kde-frameworks/kio/series
@@ -1 +1,2 @@
 samba-search-path.patch
+kio-debug-module-loader.patch
-- 
GitLab


From 7af16e5bd79295e16c8ec4c47cac0136cf91d0d1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 25 May 2017 13:32:15 -0500
Subject: [PATCH 0897/1490] kcmutils: print plugin name when loading fails

---
 .../kde-frameworks/kcmutils/default.nix       |  4 ++--
 .../kcmutils-debug-module-loader.patch        | 13 +++++++++++
 ...s.patch => kcmutils-follow-symlinks.patch} | 22 +++++--------------
 .../libraries/kde-frameworks/kcmutils/series  |  2 ++
 4 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
 rename pkgs/development/libraries/kde-frameworks/kcmutils/{0001-qdiriterator-follow-symlinks.patch => kcmutils-follow-symlinks.patch} (54%)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kcmutils/series

diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index 023a5b5c003..0c661dcdd48 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
   kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
   kpackage, kservice, kxmlgui, qtdeclarative,
@@ -14,5 +14,5 @@ mkDerivation {
     qtdeclarative
   ];
   propagatedBuildInputs = [ kconfigwidgets kservice ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
new file mode 100644
index 00000000000..0411755f45a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
@@ -0,0 +1,13 @@
+Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
+===================================================================
+--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
++++ kcmutils-5.33.0/src/kcmoduleloader.cpp
+@@ -96,7 +96,7 @@ KCModule *KCModuleLoader::loadModule(con
+             KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
+             KPluginFactory* factory = loader.factory();
+             if (!factory) {
+-                qWarning() << "Error loading plugin:" << loader.errorString();
++                qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
+             } else {
+                 KQuickAddons::ConfigModule *cm = factory->create<KQuickAddons::ConfigModule >();
+                 if (!cm) {
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
similarity index 54%
rename from pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
index 0d861fa9501..5e1007b7fc0 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
@@ -1,17 +1,8 @@
-From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:43:53 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/kpluginselector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index 9c3431d..d6b1ee2 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
+Index: kcmutils-5.33.0/src/kpluginselector.cpp
+===================================================================
+--- kcmutils-5.33.0.orig/src/kpluginselector.cpp
++++ kcmutils-5.33.0/src/kpluginselector.cpp
+@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const Q
      QStringList desktopFileNames;
      const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
      Q_FOREACH (const QString &dir, dirs) {
@@ -20,6 +11,3 @@ index 9c3431d..d6b1ee2 100644
          while (it.hasNext()) {
              desktopFileNames.append(it.next());
          }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/series b/pkgs/development/libraries/kde-frameworks/kcmutils/series
new file mode 100644
index 00000000000..f2c22554a45
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/series
@@ -0,0 +1,2 @@
+kcmutils-follow-symlinks.patch
+kcmutils-debug-module-loader.patch
-- 
GitLab


From 86dac81a706fa7015522eb6b3da8f951200f4b21 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 27 May 2017 07:57:31 -0500
Subject: [PATCH 0898/1490] kcmutils: fix kcm plugin path

---
 .../kcmutils/kcmutils-fix-plugin-path.patch         | 13 +++++++++++++
 .../libraries/kde-frameworks/kcmutils/series        |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch

diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch
new file mode 100644
index 00000000000..e82ce7d592c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch
@@ -0,0 +1,13 @@
+Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
+===================================================================
+--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
++++ kcmutils-5.33.0/src/kcmoduleloader.cpp
+@@ -93,7 +93,7 @@ KCModule *KCModuleLoader::loadModule(con
+         if (module) {
+             return module;
+         } else {
+-            KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
++            KPluginLoader loader(KPluginLoader::findPlugin(mod.service()->library()));
+             KPluginFactory* factory = loader.factory();
+             if (!factory) {
+                 qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/series b/pkgs/development/libraries/kde-frameworks/kcmutils/series
index f2c22554a45..6fbc4ca6563 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/series
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/series
@@ -1,2 +1,3 @@
 kcmutils-follow-symlinks.patch
 kcmutils-debug-module-loader.patch
+kcmutils-fix-plugin-path.patch
-- 
GitLab


From a4be1a68f8d45d87e9dec36dc81070ed1f2b722e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 May 2017 15:43:31 -0500
Subject: [PATCH 0899/1490] plasma-desktop: pass path to hwclock through
 preprocessor macro

---
 pkgs/desktops/plasma-5/plasma-desktop/default.nix        | 5 ++++-
 pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index a1ccaea6ea3..377bc4cdd14 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -32,7 +32,10 @@ mkDerivation rec {
 
     sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
   '';
-  NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];
+  NIX_CFLAGS_COMPILE = [
+    "-I${lib.getDev xorgserver}/include/xorg"
+    ''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"''
+  ];
   cmakeFlags = [
     "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
     "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg"
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
index 5623de84668..a46212af10f 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
+++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
@@ -18,7 +18,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
  void ClockHelper::toHwclock()
  {
 -    QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath);
-+    QString hwclock = "@hwclock@";
++    QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
      if (!hwclock.isEmpty()) {
          KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
      }
-- 
GitLab


From 7f95d4834f772607fb4c9b2ffa4611ccd0a1006f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 May 2017 15:44:07 -0500
Subject: [PATCH 0900/1490] kwin: pass path to Xwayland through preprocessor
 macro

---
 pkgs/desktops/plasma-5/kwin/default.nix    | 7 +++----
 pkgs/desktops/plasma-5/kwin/xwayland.patch | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index ab8cc4d2498..08f0e346855 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -25,10 +25,9 @@ mkDerivation {
     udev wayland xcb-util-cursor xwayland
   ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  postPatch = ''
-    substituteInPlace main_wayland.cpp \
-        --subst-var-by xwayland ${lib.getBin xwayland}/bin/Xwayland
-  '';
+  NIX_CFLAGS_COMPILE = [
+    ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''
+  ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
   postInstall = ''
     # Some package(s) refer to these service types by the wrong name.
diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch
index 5fde01d08bf..51f15c87d27 100644
--- a/pkgs/desktops/plasma-5/kwin/xwayland.patch
+++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch
@@ -7,7 +7,7 @@ Index: kwin-5.7.3/main_wayland.cpp
      m_xwaylandProcess = new Process(kwinApp());
      m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
 -    m_xwaylandProcess->setProgram(QStringLiteral("Xwayland"));
-+    m_xwaylandProcess->setProgram(QStringLiteral("@xwayland@"));
++    m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND));
      QProcessEnvironment env = m_environment;
      env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
      m_xwaylandProcess->setProcessEnvironment(env);
-- 
GitLab


From 8538d75734e4776807203b66f91a281f4da4e801 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 May 2017 15:44:36 -0500
Subject: [PATCH 0901/1490] plasma5: fixup inputs and outputs

---
 pkgs/desktops/plasma-5/breeze-grub.nix        |  1 -
 pkgs/desktops/plasma-5/breeze-gtk.nix         |  2 +-
 .../plasma-5/breeze-plymouth/default.nix      |  1 -
 pkgs/desktops/plasma-5/breeze-qt4.nix         |  1 +
 pkgs/desktops/plasma-5/breeze-qt5.nix         |  1 +
 pkgs/desktops/plasma-5/default.nix            | 40 +++++++++++++---
 pkgs/desktops/plasma-5/kactivitymanagerd.nix  |  9 ++--
 .../plasma-5/kde-gtk-config/default.nix       | 19 +++-----
 pkgs/desktops/plasma-5/kdecoration.nix        |  1 +
 pkgs/desktops/plasma-5/khotkeys.nix           | 10 ++--
 pkgs/desktops/plasma-5/kmenuedit.nix          |  2 +-
 pkgs/desktops/plasma-5/kscreen.nix            |  8 ++--
 pkgs/desktops/plasma-5/kscreenlocker.nix      |  3 +-
 pkgs/desktops/plasma-5/ksysguard.nix          |  5 +-
 pkgs/desktops/plasma-5/kwin/default.nix       | 45 ++++++++++--------
 pkgs/desktops/plasma-5/libkscreen/default.nix | 13 +++---
 .../plasma-5/libksysguard/default.nix         |  3 +-
 pkgs/desktops/plasma-5/milou.nix              |  4 +-
 .../plasma-5/plasma-desktop/default.nix       | 46 ++++++++++---------
 pkgs/desktops/plasma-5/plasma-nm/default.nix  | 16 +++----
 .../plasma-5/plasma-workspace-wallpapers.nix  |  9 +---
 .../plasma-5/plasma-workspace/default.nix     | 35 +++++++-------
 pkgs/desktops/plasma-5/powerdevil.nix         | 12 +++--
 pkgs/desktops/plasma-5/systemsettings.nix     |  3 +-
 24 files changed, 162 insertions(+), 127 deletions(-)

diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix
index e8ac5c1e208..eed396b5437 100644
--- a/pkgs/desktops/plasma-5/breeze-grub.nix
+++ b/pkgs/desktops/plasma-5/breeze-grub.nix
@@ -4,7 +4,6 @@
 
 mkDerivation {
   name = "breeze-grub";
-  outputs = [ "out" ];
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index f2d76fe19e6..cc51c4b0471 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -5,10 +5,10 @@ let inherit (lib) getLib; in
 mkDerivation {
   name = "breeze-gtk";
   nativeBuildInputs = [ extra-cmake-modules ];
-  cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
   buildInputs = [ qtbase ];
   postPatch = ''
     sed -i cmake/FindGTKEngine.cmake \
       -e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|"
   '';
+  cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
 }
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index 898d9cd78a5..41a4dd66b2c 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -8,7 +8,6 @@ mkDerivation {
   name = "breeze-plymouth";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ plymouth ];
-  outputs = [ "out" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postPatch = ''
       substituteInPlace cmake/FindPlymouth.cmake --subst-var out
diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix
index 6c9d0c5c4ce..6c31398037b 100644
--- a/pkgs/desktops/plasma-5/breeze-qt4.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt4.nix
@@ -9,6 +9,7 @@ mkDerivation {
   sname = "breeze";
   buildInputs = [ kdelibs4 qt4 xproto ];
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+  outputs = [ "out" "dev" ];
   cmakeFlags = [
     "-DUSE_KDE4=ON"
     "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index b1cb3b7f8fc..c0e55dec76d 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -15,5 +15,6 @@ mkDerivation {
     kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
     qtx11extras
   ];
+  outputs = [ "out" "dev" "bin" ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
 }
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 10d5a152f13..e101d4e14c5 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -36,21 +36,44 @@ let
     mirror = "mirror://kde";
   };
 
+  mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+
   packages = self: with self;
     let
+
+      propagate = out:
+        let setupHook = { writeScript }:
+              writeScript "setup-hook.sh" ''
+                # Propagate $${out} output
+                propagatedUserEnvPkgs+=" @${out}@"
+
+                # Propagate $dev so that this setup hook is propagated
+                # But only if there is a separate $dev output
+                if [ "$outputDev" != out ]; then
+                    if [ -n "$crossConfig" ]; then
+                      propagatedBuildInputs+=" @dev@"
+                    else
+                      propagatedNativeBuildInputs+=" @dev@"
+                    fi
+                fi
+              '';
+        in callPackage setupHook {};
+
+      propagateBin = propagate "bin";
+
       callPackage = self.newScope {
         mkDerivation = args:
           let
             inherit (args) name;
             sname = args.sname or name;
             inherit (srcs."${sname}") src version;
-            mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
-          in
-          mkDerivation (args // {
-            name = "${name}-${version}";
-            inherit src;
 
-            outputs = args.outputs or [ "out" "dev" ];
+            outputs = args.outputs or [ "out" ];
+            hasBin = lib.elem "bin" outputs;
+            hasDev = lib.elem "dev" outputs;
+
+            defaultSetupHook = if hasBin && hasDev then propagateBin else null;
+            setupHook = args.setupHook or defaultSetupHook;
 
             meta = {
               license = with lib.licenses; [
@@ -60,8 +83,13 @@ let
               maintainers = with lib.maintainers; [ ttuegel ];
               homepage = "http://www.kde.org";
             } // (args.meta or {});
+          in
+          mkDerivation (args // {
+            name = "${name}-${version}";
+            inherit meta outputs setupHook src;
           });
       };
+
     in {
       bluedevil = callPackage ./bluedevil.nix {};
       breeze-gtk = callPackage ./breeze-gtk.nix {};
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index 629718ab5a0..ae2736fde11 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -1,7 +1,8 @@
-{ mkDerivation
-, extra-cmake-modules
-, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel
-, kwindowsystem, kxmlgui
+{
+  mkDerivation,
+  extra-cmake-modules,
+  boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel,
+  kwindowsystem, kxmlgui
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 5e959ac8b79..38bab58c829 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -1,25 +1,18 @@
-{ mkDerivation
-, extra-cmake-modules
-, glib
-, gtk2
-, gtk3
-, karchive
-, kcmutils
-, kconfigwidgets
-, ki18n
-, kiconthemes
-, kio
-, knewstuff
+{
+  mkDerivation,
+  extra-cmake-modules,
+  glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
+  knewstuff
 }:
 
 mkDerivation {
   name = "kde-gtk-config";
-  patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
   ];
+  patches = [ ./0001-follow-symlinks.patch ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index 9efdb8cff81..d8f996421ac 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -4,4 +4,5 @@ mkDerivation {
   name = "kdecoration";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index be4ccc7b230..abfb85a867c 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -1,7 +1,8 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, kcmutils
-, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
-, plasma-framework, plasma-workspace, qtx11extras
-, fetchpatch
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui,
+  plasma-framework, plasma-workspace, qtx11extras
 }:
 
 mkDerivation {
@@ -11,4 +12,5 @@ mkDerivation {
     kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
     plasma-framework plasma-workspace qtx11extras
   ];
+  outputs = [ "out" "dev" "bin" ];
 }
diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
index 164c378a60d..016ea940d99 100644
--- a/pkgs/desktops/plasma-5/kmenuedit.nix
+++ b/pkgs/desktops/plasma-5/kmenuedit.nix
@@ -8,7 +8,7 @@
 mkDerivation {
   name = "kmenuedit";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index fcdc922ff94..7fdaedbb78d 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -1,6 +1,8 @@
-{ mkDerivation, extra-cmake-modules, kconfig, kconfigwidgets
-, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
-, libkscreen, qtdeclarative, qtgraphicaleffects
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons,
+  kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index 631719fb535..e748121132c 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -9,8 +9,9 @@
 mkDerivation {
   name = "kscreenlocker";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
     libXcursor pam plasma-framework qtdeclarative qtx11extras wayland
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index 63aeda685ba..150b97be50d 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -9,9 +9,8 @@
 mkDerivation {
   name = "ksysguard";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ lm_sensors ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
-    kdelibs4support ki18n qtwebkit
+    kdelibs4support ki18n lm_sensors qtwebkit
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 08f0e346855..09708b65487 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,29 +1,34 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig,
-  kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel,
-  ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications,
-  kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem,
-  kxmlgui, libICE, libSM, libinput, libxkbcommon, plasma-framework,
-  qtdeclarative, qtmultimedia, qtscript, qtx11extras, udev, wayland,
-  xcb-util-cursor, xwayland
+
+  epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
+  xwayland,
+
+  qtdeclarative, qtmultimedia, qtscript, qtx11extras,
+
+  breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
+  kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
+  kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
+  kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
+  plasma-framework,
 }:
 
 mkDerivation {
   name = "kwin";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor
+    xwayland
+
+    qtdeclarative qtmultimedia qtscript qtx11extras
+
+    breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
     kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
     kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
-    kwayland kwidgetsaddons kwindowsystem kxmlgui libICE libSM libxkbcommon
-    libinput plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras
-    udev wayland xcb-util-cursor xwayland
+    kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
   ];
+  outputs = [ "out" "dev" "bin" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   NIX_CFLAGS_COMPILE = [
     ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''
@@ -32,9 +37,9 @@ mkDerivation {
   postInstall = ''
     # Some package(s) refer to these service types by the wrong name.
     # I would prefer to patch those packages, but I cannot find them!
-    ln -s $out/share/kservicetypes5/kwineffect.desktop \
-          $out/share/kservicetypes5/kwin-effect.desktop
-    ln -s $out/share/kservicetypes5/kwinscript.desktop \
-          $out/share/kservicetypes5/kwin-script.desktop
+    ln -s ''${!outputBin}/share/kservicetypes5/kwineffect.desktop \
+          ''${!outputBin}/share/kservicetypes5/kwin-effect.desktop
+    ln -s ''${!outputBin}/share/kservicetypes5/kwinscript.desktop \
+          ''${!outputBin}/share/kservicetypes5/kwin-script.desktop
   '';
 }
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index 82a254c3a37..b81755ed757 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -1,15 +1,16 @@
-{ mkDerivation, lib, copyPathsToStore
-, extra-cmake-modules
-, kwayland, libXrandr
-, qtx11extras
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules,
+  kwayland, libXrandr, qtx11extras
 }:
 
 mkDerivation {
   name = "libkscreen";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kwayland libXrandr qtx11extras ];
+  buildInputs = [ kwayland libXrandr qtx11extras ];
+  outputs = [ "out" "dev" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/$qtPluginPrefix/kf5/kscreen\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\""
   '';
 }
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index e7cdf28a728..4e88cd3df0e 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -12,9 +12,10 @@ mkDerivation {
     ./0001-qdiriterator-follow-symlinks.patch
   ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
     kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
     qtwebkit
   ];
+  outputs = [ "out" "dev" "bin" ];
 }
diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index 7f38b74423c..fa4ad3fcd29 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -7,9 +7,7 @@
 
 mkDerivation {
   name = "milou";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kcoreaddons kdeclarative ki18n krunner kservice plasma-framework
     qtdeclarative qtscript
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 377bc4cdd14..18675159df6 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -1,35 +1,37 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
-  kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
-  kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
-  kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft,
-  libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework,
-  plasma-workspace, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg,
-  qtx11extras, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
-  xorgserver,
-  utillinux
+
+  boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
+  libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
+  xorgserver, utillinux,
+
+  qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtx11extras,
+
+  attica, baloo, kactivities, kactivities-stats, kauth, kcmutils, kdbusaddons,
+  kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n,
+  kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner,
+  kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework,
+  plasma-workspace,
 }:
 
 mkDerivation rec {
   name = "plasma-desktop";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff
-    knotifications knotifyconfig kwallet libcanberra_kde libXcursor
-    libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
-    xf86inputsynaptics xkeyboard_config xinput baloo kactivities
-    kactivities-stats kauth kdeclarative kdelibs4support kemoticons kglobalaccel
-    ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative
-    qtquickcontrols qtquickcontrols2 qtx11extras ksysguard
+    boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft
+    libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config
+
+    qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras
+
+    attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons
+    kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels
+    knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker
+    ksysguard kwallet kwin plasma-framework plasma-workspace
   ];
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postPatch = ''
-    substituteInPlace kcms/dateandtime/helper.cpp \
-        --subst-var hwclock "${utillinux}/sbin/hwclock"
-
     sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
   '';
   NIX_CFLAGS_COMPILE = [
@@ -37,12 +39,12 @@ mkDerivation rec {
     ''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"''
   ];
   cmakeFlags = [
-    "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
-    "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg"
+    "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg"
+    "-DSynaptics_INCLUDE_DIRS=${lib.getDev xf86inputsynaptics}/include/xorg"
   ];
   postInstall = ''
     # Display ~/Desktop contents on the desktop by default.
-    sed -i "$out/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
+    sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
         -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/'
   '';
 }
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 8ff98ecfc1d..cc1dcb7ee9f 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -10,6 +10,14 @@
 
 mkDerivation {
   name = "plasma-nm";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
+  buildInputs = [
+    kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
+    qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
+    mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
+    qca-qt5 solid
+  ];
   patches = [
     (substituteAll {
       src = ./0001-mobile-broadband-provider-info-path.patch;
@@ -20,12 +28,4 @@ mkDerivation {
       inherit openvpn;
     })
   ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
-  buildInputs = [
-    kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
-    qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
-    mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
-    qca-qt5 solid
-  ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index fb0830eb59a..cb068166c1d 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
@@ -1,11 +1,6 @@
-{ mkDerivation
-, extra-cmake-modules
-}:
+{ mkDerivation , extra-cmake-modules }:
 
 mkDerivation {
   name = "plasma-workspace-wallpapers";
-  outputs = [ "out" ];
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 175a80fcb4c..29d92f9a9df 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -3,13 +3,15 @@
 
   extra-cmake-modules, kdoctools,
 
+  isocodes, libdbusmenu, libSM, libXcursor, pam, wayland,
+
   baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
   kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
-  knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet,
-  kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt,
-  phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols,
-  qtquickcontrols2, qtscript, qtx11extras, solid, isocodes, libdbusmenu, libSM,
-  libXcursor, pam, wayland
+  knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets,
+  kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard,
+  networkmanager-qt, phonon, plasma-framework, prison, solid,
+
+  qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qtx11extras,
 }:
 
 mkDerivation {
@@ -18,27 +20,28 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     isocodes libdbusmenu libSM libXcursor pam wayland
-  ];
-  propagatedBuildInputs = [
+
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
-    knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
-    kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon
-    plasma-framework solid qtgraphicaleffects qtquickcontrols qtquickcontrols2
-    qtscript qtx11extras
+    knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
+    kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
+    networkmanager-qt phonon plasma-framework prison solid
+
+    qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtx11extras
   ];
+  outputs = [ "out" "dev" "bin" ];
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 
   postPatch = ''
     substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+        --replace kdostartupconfig5 ''${!outputBin}/bin/kdostartupconfig5
   '';
 
   postInstall = ''
-    rm "$out/bin/startkde"
-    rm "$out/bin/startplasmacompositor"
-    rm "$out/lib/libexec/startplasma"
-    rm -r "$out/share/wayland-sessions"
+    rm "''${!outputBin}/bin/startkde"
+    rm "''${!outputBin}/bin/startplasmacompositor"
+    rm "''${!outputLib}/lib/libexec/startplasma"
+    rm -r "''${!outputBin}/share/wayland-sessions"
   '';
 }
diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
index 4660efd66ab..65fc5446c16 100644
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
@@ -1,13 +1,15 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, bluez-qt, kactivities
-, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
-, kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
-, plasma-workspace, qtx11extras, solid, udev
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kdelibs4support,
+  kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen,
+  networkmanager-qt, plasma-workspace, qtx11extras, solid, udev
 }:
 
 mkDerivation {
   name = "powerdevil";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
     kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
     networkmanager-qt plasma-workspace qtx11extras
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 10fc7a3a5b7..a24eabc39f3 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -7,8 +7,9 @@
 mkDerivation {
   name = "systemsettings";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
     kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
   ];
+  outputs = [ "out" "dev" "bin" ];
 }
-- 
GitLab


From acc45767c511946907257aeea27ff9e53975e108 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 27 May 2017 11:14:20 -0500
Subject: [PATCH 0902/1490] kservice: propagate shared_mime_info to environment

---
 pkgs/development/libraries/kde-frameworks/kservice/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index e6822dc2afb..3ac4f4dc268 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, copyPathsToStore,
   bison, extra-cmake-modules, flex,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem,
-  qtbase,
+  qtbase, shared_mime_info,
 }:
 
 mkDerivation {
@@ -14,5 +14,6 @@ mkDerivation {
     kcrash kdbusaddons ki18n kwindowsystem qtbase
   ];
   propagatedBuildInputs = [ kconfig kcoreaddons ];
+  propagatedUserEnvPkgs = [ shared_mime_info ]; # for kbuildsycoca5
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
-- 
GitLab


From d9094c087e73ebc4aca615a354ec58194d2c1bc3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:01:19 -0500
Subject: [PATCH 0903/1490] libkscreen: use QLatin1String instead of
 QStringLiteral

QStringLiteral stores strings in UTF-16 format, preventing Nix from detecting
dependencies.
---
 .../desktops/plasma-5/libkscreen/libkscreen-backends-path.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
index 9d3cf49b9cd..48be0d037df 100644
--- a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
+++ b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
@@ -17,7 +17,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
 -        finfos.append(dir.entryInfoList());
 -    }
 -    return finfos;
-+    const QDir dir(QStringLiteral(NIXPKGS_LIBKSCREEN_BACKENDS),
++    const QDir dir(QLatin1String(NIXPKGS_LIBKSCREEN_BACKENDS),
 +                   QStringLiteral("KSC_*"),
 +                   QDir::SortFlags(QDir::QDir::Name),
 +                   QDir::NoDotAndDotDot | QDir::Files);
-- 
GitLab


From b7f895d9725fd17c682f2f2625656c8816354a9f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:02:49 -0500
Subject: [PATCH 0904/1490] kwindowsystem: use QLatin1String instead of
 QStringLiteral

---
 .../libraries/kde-frameworks/kwindowsystem/default.nix          | 1 +
 .../kde-frameworks/kwindowsystem/platform-plugins-path.patch    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index ba43a5668a7..fa9078eeb20 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -17,4 +17,5 @@ mkDerivation {
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
   '';
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
index ed24897d342..ae0da37922e 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
@@ -14,7 +14,7 @@ Index: kwindowsystem-5.32.0/src/pluginwrapper.cpp
 -        foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
 -            ret << pluginDir.absoluteFilePath(entry);
 -        }
-+    QDir pluginDir(QStringLiteral(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
++    QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
 +    foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
 +        ret << pluginDir.absoluteFilePath(entry);
      }
-- 
GitLab


From f392614251e9162fbf75f601c1e3bb8dd948029c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:06:31 -0500
Subject: [PATCH 0905/1490] qt58.qtbase: use QLatin1String instead of
 QStringLiteral

---
 .../libraries/qt-5/5.8/qtbase/compose-search-path.patch       | 2 +-
 pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch     | 4 ++--
 .../libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
index d0bea4afaa3..225d47f8e22 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
@@ -12,7 +12,7 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/gen
 -    m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
      m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
      m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
-+    m_possibleLocations.append(QStringLiteral(NIXPKGS_QTCOMPOSE));
++    m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));
  }
  
  QString TableGenerator::findComposeFile()
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
index 6a22b203afc..8e5e2c71828 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
@@ -19,13 +19,13 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platformthemes/gtk3/main.cpp
 +
 +#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS
 +        QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':');
-+        XDG_DATA_DIRS << QStringLiteral(NIXPKGS_QGTK3_XDG_DATA_DIRS);
++        XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS);
 +        qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':')));
 +#endif
 +
 +#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES
 +        QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':');
-+        GIO_EXTRA_MODULES << QStringLiteral(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
++        GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
 +        qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':')));
 +#endif
 +
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
index 270116e1978..18780db05e7 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
@@ -9,7 +9,7 @@ Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cp
 -        if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
 -            return ret;
      }
-+    QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
++    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
 +    if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
 +        return ret;
  #else
@@ -29,7 +29,7 @@ Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cp
 -                (*it).append(postFix);
 -        }
 +    }
-+    QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
++    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
 +    list = directLoader()->keyMap().values();
 +    if (!list.isEmpty()) {
 +        const QString postFix = QLatin1String(" (from ")
-- 
GitLab


From b1dcd271d1cd752ea720ca4ac8c8d07d7a7cdb6c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:09:04 -0500
Subject: [PATCH 0906/1490] qt58.qtserialport: use QLatin1String instead of
 QStringLiteral

---
 .../0001-dlopen-serialport-udev.patch         | 28 -------------------
 .../qt-5/5.8/qtserialport/default.nix         | 14 ++++------
 .../qtserialport-dlopen-udev.patch            | 22 +++++++++++++++
 .../libraries/qt-5/5.8/qtserialport/series    |  1 +
 4 files changed, 29 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtserialport/series

diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
deleted file mode 100644
index 3a813dc8007..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:16:02 -0500
-Subject: [PATCH] dlopen serialport udev
-
----
- src/serialport/qtudev_p.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
-index 6f2cabd..81b9849 100644
---- a/src/serialport/qtudev_p.h
-+++ b/src/serialport/qtudev_p.h
-@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
- inline bool resolveSymbols(QLibrary *udevLibrary)
- {
-     if (!udevLibrary->isLoaded()) {
--        udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
-         if (!udevLibrary->load()) {
--            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+            udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
-             if (!udevLibrary->load()) {
-                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
-                 return false;
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
index 1fde2c2bd18..925e8a808f2 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, qtSubmodule, qtbase, substituteAll, systemd }:
+{ stdenv, qtSubmodule, lib, copyPathsToStore, qtbase, substituteAll, systemd }:
 
-with stdenv.lib;
+let inherit (lib) getLib optional; in
 
 qtSubmodule {
   name = "qtserialport";
   qtInputs = [ qtbase ];
-  patches = optionals (stdenv.isLinux) [
-    (substituteAll {
-      src = ./0001-dlopen-serialport-udev.patch;
-      libudev = systemd.lib;
-    })
-  ];
+  patches =  copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  NIX_CFLAGS_COMPILE =
+    optional stdenv.isLinux
+    ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch
new file mode 100644
index 00000000000..65bb64710eb
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch
@@ -0,0 +1,22 @@
+Index: qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
+===================================================================
+--- qtserialport-opensource-src-5.8.0.orig/src/serialport/qtudev_p.h
++++ qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
+@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QL
+ inline bool resolveSymbols(QLibrary *udevLibrary)
+ {
+     if (!udevLibrary->isLoaded()) {
++#ifdef NIXPKGS_LIBUDEV
++        udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
++#else
+         udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
++#endif
+         if (!udevLibrary->load()) {
++#ifdef NIXPKGS_LIBUDEV
++            udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
++#else
+             udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
++#endif
+             if (!udevLibrary->load()) {
+                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
+                 return false;
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/series b/pkgs/development/libraries/qt-5/5.8/qtserialport/series
new file mode 100644
index 00000000000..83f4abf094e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtserialport/series
@@ -0,0 +1 @@
+qtserialport-dlopen-udev.patch
-- 
GitLab


From c546c26e3a7c20e23d82209176e378ccbb00fdb8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:12:19 -0500
Subject: [PATCH 0907/1490] qt58.qtwebkit: use QLatin1String instead of
 QStringLiteral

---
 .../0001-dlopen-webkit-nsplugin.patch         | 53 ---------------
 .../5.8/qtwebkit/0002-dlopen-webkit-gtk.patch | 25 --------
 .../qtwebkit/0003-dlopen-webkit-udev.patch    | 31 ---------
 .../libraries/qt-5/5.8/qtwebkit/default.nix   | 31 ++++-----
 .../5.8/qtwebkit/qtwebkit-dlopen-gtk.patch    | 64 +++++++++++++++++++
 .../5.8/qtwebkit/qtwebkit-dlopen-udev.patch   |  0
 ...in.patch => qtwebkit-icucore-darwin.patch} |  4 +-
 .../libraries/qt-5/5.8/qtwebkit/series        |  3 +
 8 files changed, 82 insertions(+), 129 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0002-dlopen-webkit-gtk.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0003-dlopen-webkit-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-udev.patch
 rename pkgs/development/libraries/qt-5/5.8/qtwebkit/{0004-icucore-darwin.patch => qtwebkit-icucore-darwin.patch} (75%)
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/series

diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch
deleted file mode 100644
index 0eeacce1bc0..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:18:54 -0500
-Subject: [PATCH 1/3] dlopen webkit nsplugin
-
----
- Source/WebCore/plugins/qt/PluginPackageQt.cpp                        | 2 +-
- Source/WebCore/plugins/qt/PluginViewQt.cpp                           | 2 +-
- Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index a923d49..2731d05 100644
---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0)
-         }
-     }
- 
--    QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (library.load()) {
-         typedef void *(*gtk_init_check_ptr)(int*, char***);
-         gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index de06a2f..363bde5 100644
---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
-     // support gdk based plugins (like flash) that use a different X connection.
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
--    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
-diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index d734ff6..62a2197 100644
---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- 
--    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0002-dlopen-webkit-gtk.patch
deleted file mode 100644
index bb5d1f74364..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0002-dlopen-webkit-gtk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:19:16 -0500
-Subject: [PATCH 2/3] dlopen webkit gtk
-
----
- Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-index 8de6521..0b25748 100644
---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
- 
- static bool initializeGtk()
- {
--    QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (!gtkLibrary.load())
-         return false;
-     typedef void* (*gtk_init_ptr)(void*, void*);
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0003-dlopen-webkit-udev.patch
deleted file mode 100644
index 1c360cd81aa..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0003-dlopen-webkit-udev.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:19:29 -0500
-Subject: [PATCH 3/3] dlopen webkit udev
-
----
- Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp
-index 60ff317..da8ac69 100644
---- a/Source/WebCore/platform/qt/GamepadsQt.cpp
-+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp
-@@ -111,12 +111,12 @@ private:
-     bool load()
-     {
-         m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
--        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
-         m_loaded = m_libUdev.load();
-         if (resolveMethods())
-             return true;
- 
--        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
-         m_loaded = m_libUdev.load();
-         return resolveMethods();
-     }
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
index bee3786ef32..664281aac31 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
@@ -1,4 +1,5 @@
-{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
+{ qtSubmodule, stdenv, copyPathsToStore, lib
+, qtdeclarative, qtlocation, qtsensors
 , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
 , sqlite, systemd, glib, gst_all_1
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
@@ -7,7 +8,7 @@
 , flashplayerFix ? false
 }:
 
-with stdenv.lib;
+let inherit (lib) optional optionals getLib; in
 
 qtSubmodule {
   name = "qtwebkit";
@@ -22,23 +23,15 @@ qtSubmodule {
     "/usr/lib/libicucore.dylib"
   ];
 
-  patches =
-    let dlopen-webkit-nsplugin = substituteAll {
-          src = ./0001-dlopen-webkit-nsplugin.patch;
-          gtk = gtk2.out;
-          gdk_pixbuf = gdk_pixbuf.out;
-        };
-        dlopen-webkit-gtk = substituteAll {
-          src = ./0002-dlopen-webkit-gtk.patch;
-          gtk = gtk2.out;
-        };
-        dlopen-webkit-udev = substituteAll {
-          src = ./0003-dlopen-webkit-udev.patch;
-          libudev = systemd.lib;
-        };
-    in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
-    ++ optionals (!stdenv.isDarwin) [ dlopen-webkit-udev ]
-    ++ optionals (stdenv.isDarwin) [ ./0004-icucore-darwin.patch ];
+  patches =  copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  NIX_CFLAGS_COMPILE =
+    optionals flashplayerFix
+      [
+        ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''
+        ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"''
+      ]
+    ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch
new file mode 100644
index 00000000000..e34eda592af
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch
@@ -0,0 +1,64 @@
+Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginPackageQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* modu
+         }
+     }
+ 
++#ifdef NIXPKGS_LIBGTK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0);
++#else
+     QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
++#endif
+     if (library.load()) {
+         typedef void *(*gtk_init_check_ptr)(int*, char***);
+         gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
+Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginViewQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp
+@@ -697,7 +697,11 @@ static Display *getPluginDisplay()
+     // support gdk based plugins (like flash) that use a different X connection.
+     // The code below has the same effect as this one:
+     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
++#ifdef NIXPKGS_LIBGDK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
++#else
+     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
++#endif
+     if (!library.load())
+         return 0;
+ 
+Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+@@ -64,7 +64,11 @@ static Display* getPluginDisplay()
+     // The code below has the same effect as this one:
+     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
+ 
++#ifdef NIXPKGS_LIBGDK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
++#else
+     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
++#endif
+     if (!library.load())
+         return 0;
+ 
+Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType typ
+ 
+ static bool initializeGtk()
+ {
++#ifdef NIXPKGS_LIBGTK2
++    QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0);
++#else
+     QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
++#endif
+     if (!gtkLibrary.load())
+         return false;
+     typedef void* (*gtk_init_ptr)(void*, void*);
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-udev.patch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-icucore-darwin.patch
similarity index 75%
rename from pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch
rename to pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-icucore-darwin.patch
index a1cc1892288..63c653da94e 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-icucore-darwin.patch
@@ -1,6 +1,8 @@
+Index: qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri
+===================================================================
 --- qtwebkit-opensource-src-5.8.0.orig/Source/WTF/WTF.pri
 +++ qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ mac {
      # Mac OS does ship libicu but not the associated header files.
      # Therefore WebKit provides adequate header files.
      INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/series b/pkgs/development/libraries/qt-5/5.8/qtwebkit/series
new file mode 100644
index 00000000000..140e2a3dd4e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/series
@@ -0,0 +1,3 @@
+qtwebkit-dlopen-gtk.patch
+qtwebkit-dlopen-udev.patch
+qtwebkit-icucore-darwin.patch
-- 
GitLab


From 8cc09c9e3e2d84042adde250ac9b983316feb0c2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:13:27 -0500
Subject: [PATCH 0908/1490] qt56.qtwebkit: use QLatin1String instead of
 QStringLiteral

---
 .../qtwebkit/0003-dlopen-webkit-udev.patch    |  6 +-
 .../libraries/qt-5/5.6/qtwebkit/default.nix   | 41 ++++++------
 .../5.6/qtwebkit/qtwebkit-dlopen-gtk.patch    | 64 +++++++++++++++++++
 .../5.6/qtwebkit/qtwebkit-dlopen-udev.patch   |  0
 .../qtwebkit/qtwebkit-icucore-darwin.patch    | 13 ++++
 .../libraries/qt-5/5.6/qtwebkit/series        |  3 +
 6 files changed, 104 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/series

diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch
index 1c360cd81aa..19de7d99c85 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch
@@ -11,18 +11,18 @@ diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform
 index 60ff317..da8ac69 100644
 --- a/Source/WebCore/platform/qt/GamepadsQt.cpp
 +++ b/Source/WebCore/platform/qt/GamepadsQt.cpp
-@@ -111,12 +111,12 @@ private:
+@@ -111,13 +111,12 @@ private:
      bool load()
      {
          m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
 -        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
++        m_libUdev.setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
          m_loaded = m_libUdev.load();
          if (resolveMethods())
              return true;
  
 -        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
++        m_libUdev.setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
          m_loaded = m_libUdev.load();
          return resolveMethods();
      }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
index 23a45dd44ed..664281aac31 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
@@ -1,39 +1,40 @@
-{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
+{ qtSubmodule, stdenv, copyPathsToStore, lib
+, qtdeclarative, qtlocation, qtsensors
 , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
 , sqlite, systemd, glib, gst_all_1
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
+, darwin
 , substituteAll
 , flashplayerFix ? false
 }:
 
-with stdenv.lib;
+let inherit (lib) optional optionals getLib; in
 
 qtSubmodule {
   name = "qtwebkit";
   qtInputs = [ qtdeclarative qtlocation qtsensors ];
-  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
+    ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ]);
   nativeBuildInputs = [
     bison2 flex gdb gperf perl pkgconfig python2 ruby
   ];
-  patches =
-    let dlopen-webkit-nsplugin = substituteAll {
-          src = ./0001-dlopen-webkit-nsplugin.patch;
-          gtk = gtk2.out;
-          gdk_pixbuf = gdk_pixbuf.out;
-        };
-        dlopen-webkit-gtk = substituteAll {
-          src = ./0002-dlopen-webkit-gtk.patch;
-          gtk = gtk2.out;
-        };
-        dlopen-webkit-udev = substituteAll {
-          src = ./0003-dlopen-webkit-udev.patch;
-          libudev = systemd.lib;
-        };
-    in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
-    ++ [ dlopen-webkit-udev ];
+
+  __impureHostDeps = optionals (stdenv.isDarwin) [
+    "/usr/lib/libicucore.dylib"
+  ];
+
+  patches =  copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  NIX_CFLAGS_COMPILE =
+    optionals flashplayerFix
+      [
+        ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''
+        ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"''
+      ]
+    ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
 
-  meta.maintainers = with stdenv.lib.maintainers; [ abbradar ];
+  meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch
new file mode 100644
index 00000000000..e34eda592af
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch
@@ -0,0 +1,64 @@
+Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginPackageQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* modu
+         }
+     }
+ 
++#ifdef NIXPKGS_LIBGTK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0);
++#else
+     QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
++#endif
+     if (library.load()) {
+         typedef void *(*gtk_init_check_ptr)(int*, char***);
+         gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
+Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginViewQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp
+@@ -697,7 +697,11 @@ static Display *getPluginDisplay()
+     // support gdk based plugins (like flash) that use a different X connection.
+     // The code below has the same effect as this one:
+     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
++#ifdef NIXPKGS_LIBGDK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
++#else
+     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
++#endif
+     if (!library.load())
+         return 0;
+ 
+Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+@@ -64,7 +64,11 @@ static Display* getPluginDisplay()
+     // The code below has the same effect as this one:
+     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
+ 
++#ifdef NIXPKGS_LIBGDK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
++#else
+     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
++#endif
+     if (!library.load())
+         return 0;
+ 
+Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType typ
+ 
+ static bool initializeGtk()
+ {
++#ifdef NIXPKGS_LIBGTK2
++    QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0);
++#else
+     QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
++#endif
+     if (!gtkLibrary.load())
+         return false;
+     typedef void* (*gtk_init_ptr)(void*, void*);
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-udev.patch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch
new file mode 100644
index 00000000000..63c653da94e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch
@@ -0,0 +1,13 @@
+Index: qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WTF/WTF.pri
++++ qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri
+@@ -12,7 +12,7 @@ mac {
+     # Mac OS does ship libicu but not the associated header files.
+     # Therefore WebKit provides adequate header files.
+     INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
+-    LIBS += -licucore
++    LIBS += /usr/lib/libicucore.dylib
+ } else:!use?(wchar_unicode): {
+     win32 {
+         CONFIG(static, static|shared) {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/series b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series
new file mode 100644
index 00000000000..140e2a3dd4e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series
@@ -0,0 +1,3 @@
+qtwebkit-dlopen-gtk.patch
+qtwebkit-dlopen-udev.patch
+qtwebkit-icucore-darwin.patch
-- 
GitLab


From 99ed5853eb0a051d43c51df4dae353ac952baaf8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:14:07 -0500
Subject: [PATCH 0909/1490] qt56.qtserialport: use QLatin1String instead of
 QStringLiteral

---
 .../0001-dlopen-serialport-udev.patch         |  6 ++---
 .../qt-5/5.6/qtserialport/default.nix         | 14 ++++++------
 .../qtserialport-dlopen-udev.patch            | 22 +++++++++++++++++++
 .../libraries/qt-5/5.6/qtserialport/series    |  1 +
 4 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtserialport/series

diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch
index 3a813dc8007..9893fdff9a5 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch
@@ -11,15 +11,15 @@ diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
 index 6f2cabd..81b9849 100644
 --- a/src/serialport/qtudev_p.h
 +++ b/src/serialport/qtudev_p.h
-@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
+@@ -105,10 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
  inline bool resolveSymbols(QLibrary *udevLibrary)
  {
      if (!udevLibrary->isLoaded()) {
 -        udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
++        udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
          if (!udevLibrary->load()) {
 -            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+            udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
++            udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
              if (!udevLibrary->load()) {
                  qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
                  return false;
diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
index 2bffd0a2bd6..925e8a808f2 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
@@ -1,12 +1,12 @@
-{ qtSubmodule, qtbase, substituteAll, systemd }:
+{ stdenv, qtSubmodule, lib, copyPathsToStore, qtbase, substituteAll, systemd }:
+
+let inherit (lib) getLib optional; in
 
 qtSubmodule {
   name = "qtserialport";
   qtInputs = [ qtbase ];
-  patches = [
-    (substituteAll {
-      src = ./0001-dlopen-serialport-udev.patch;
-      libudev = systemd.lib;
-    })
-  ];
+  patches =  copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  NIX_CFLAGS_COMPILE =
+    optional stdenv.isLinux
+    ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch
new file mode 100644
index 00000000000..65bb64710eb
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch
@@ -0,0 +1,22 @@
+Index: qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
+===================================================================
+--- qtserialport-opensource-src-5.8.0.orig/src/serialport/qtudev_p.h
++++ qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
+@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QL
+ inline bool resolveSymbols(QLibrary *udevLibrary)
+ {
+     if (!udevLibrary->isLoaded()) {
++#ifdef NIXPKGS_LIBUDEV
++        udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
++#else
+         udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
++#endif
+         if (!udevLibrary->load()) {
++#ifdef NIXPKGS_LIBUDEV
++            udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
++#else
+             udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
++#endif
+             if (!udevLibrary->load()) {
+                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
+                 return false;
diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/series b/pkgs/development/libraries/qt-5/5.6/qtserialport/series
new file mode 100644
index 00000000000..83f4abf094e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/series
@@ -0,0 +1 @@
+qtserialport-dlopen-udev.patch
-- 
GitLab


From f3ce852355bee730427326b2f76e09a96d39d17a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 08:51:47 -0500
Subject: [PATCH 0910/1490] nixpkgs: remove comments from manual about wrapping
 Qt packages

It is no longer necessary to wrap Qt packages
---
 doc/languages-frameworks/qt.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml
index b6c8f0e899e..4193fc5f16e 100644
--- a/doc/languages-frameworks/qt.xml
+++ b/doc/languages-frameworks/qt.xml
@@ -20,13 +20,11 @@
 
 <para>It is generally best to build an application package against the <varname>libsForQt5</varname> library set. In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.</para>
 
-<para>Qt-based applications require that several paths be set at runtime. This is accomplished by wrapping the provided executables in a package with <literal>wrapQtProgram</literal> or <literal>makeQtWrapper</literal> during the <literal>postFixup</literal> phase. To use the wrapper generators, add <literal>makeQtWrapper</literal> to <literal>nativeBuildInputs</literal>. The wrapper generators support the same options as <literal>wrapProgram</literal> and <literal>makeWrapper</literal> respectively. It is usually only necessary to generate wrappers for programs intended to be invoked by the user.</para>
-
 </section>
 
 <section xml:id="ssec-qt-kde"><title>KDE</title>
 
-<para>The KDE Frameworks are a set of libraries for Qt 5 which form the basis of the Plasma desktop environment and the KDE Applications suite. Packaging a Frameworks-based library does not require any steps beyond those described above for general Qt-based libraries. Frameworks-based applications should not use <literal>makeQtWrapper</literal>; instead, use <literal>kdeWrapper</literal> to create the necessary wrappers: <literal>kdeWrapper { unwrapped = <replaceable>expr</replaceable>; targets = <replaceable>exes</replaceable>; }</literal>, where <replaceable>expr</replaceable> is the un-wrapped package expression and <replaceable>exes</replaceable> is a list of strings giving the relative paths to programs in the package which should be wrapped.</para>
+<para>The KDE Frameworks are a set of libraries for Qt 5 which form the basis of the Plasma desktop environment and the KDE Applications suite. Packaging a Frameworks-based package does not require any steps beyond those described above for general Qt-based packages.</para>
 
 </section>
 
-- 
GitLab


From ce28d8947d3e698f48cbbf4c3291c9427124886e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 08:59:18 -0500
Subject: [PATCH 0911/1490] nixpkgs: remark about running Qt applications

---
 doc/languages-frameworks/qt.xml | 66 +++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 20 deletions(-)

diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml
index 4193fc5f16e..1dbbb5341ba 100644
--- a/doc/languages-frameworks/qt.xml
+++ b/doc/languages-frameworks/qt.xml
@@ -2,29 +2,55 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-qt">
 
-<title>Qt and KDE</title>
-
-<para>Qt is a comprehensive desktop and mobile application development toolkit for C++. Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features, but older versions are typically retained to support packages that may not be compatible with the latest version. When packaging applications and libraries for Nixpkgs, it is important to ensure that compatible versions of Qt 5 are used throughout; this consideration motivates the tools described below.</para>
-
-<section xml:id="ssec-qt-libraries"><title>Libraries</title>
-
-<para>Libraries that depend on Qt 5 should be built with each available version to avoid linking a dependent package against incompatible versions of Qt 5. (Although Qt 5 maintains backward ABI compatibility, linking against multiple versions at once is generally not possible; at best it will lead to runtime faults.) Packages that provide libraries should be added to the top-level function <varname>mkLibsForQt5</varname>, which is used to build a set of libraries for every Qt 5 version. The <varname>callPackage</varname> provided in this scope will ensure that only one Qt version will be used throughout the dependency tree. Dependencies should be imported unqualified, i.e. <literal>qtbase</literal> not <literal>qt5.qtbase</literal>, so that <varname>callPackage</varname> can do its work. <emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal> into your package; although it may work fine in the moment, it could well break at the next Qt update.</para>
-
-<para>If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its <literal>meta.broken</literal> attribute. A package may be marked broken for certain versions by testing the <literal>qtbase.version</literal> attribute, which will always give the current Qt 5 version.</para>
-
-</section>
-
-<section xml:id="ssec-qt-applications"><title>Applications</title>
-
-<para>Applications generally do not need to be built with every Qt version because they do not provide any libraries for dependent packages to link against. The primary consideration is merely ensuring that the application itself and its dependencies are linked against only one version of Qt. To call your application expression, use <literal>libsForQt5.callPackage</literal> instead of <literal>callPackage</literal>. Dependencies should be imported unqualified, i.e. <literal>qtbase</literal> not <literal>qt5.qtbase</literal>. <emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal> into your package; although it may work fine in the moment, it could well break at the next Qt update.</para>
-
-<para>It is generally best to build an application package against the <varname>libsForQt5</varname> library set. In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.</para>
+<title>Qt</title>
+
+<para>
+Qt is a comprehensive desktop and mobile application development toolkit for C++.
+Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5.
+The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features,
+but older versions are typically retained until their support window ends.
+The most important consideration in packaging Qt-based software is ensuring that each package and all its dependencies use the same version of Qt 5;
+this consideration motivates most of the tools described below.
+</para>
+
+<section xml:id="ssec-qt-libraries"><title>Packaging Libraries for Nixpkgs</title>
+
+<para>
+Whenever possible, libraries that use Qt 5 should be built with each available version.
+Packages providing libraries should be added to the top-level function <varname>mkLibsForQt5</varname>,
+which is used to build a set of libraries for every Qt 5 version.
+A special <varname>callPackage</varname> function is used in this scope to ensure that the entire dependency tree uses the same Qt 5 version.
+Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>.
+<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
+</para>
+
+<para>
+If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its <literal>meta.broken</literal> attribute.
+A package may be marked broken for certain versions by testing the <literal>qtbase.version</literal> attribute, which will always give the current Qt 5 version.
+</para>
 
 </section>
 
-<section xml:id="ssec-qt-kde"><title>KDE</title>
-
-<para>The KDE Frameworks are a set of libraries for Qt 5 which form the basis of the Plasma desktop environment and the KDE Applications suite. Packaging a Frameworks-based package does not require any steps beyond those described above for general Qt-based packages.</para>
+<section xml:id="ssec-qt-applications"><title>Packaging Applications for Nixpkgs</title>
+
+<para>
+Call your application expression using <literal>libsForQt5.callPackage</literal> instead of <literal>callPackage</literal>.
+Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>.
+<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
+</para>
+
+<para>
+Qt 5 maintains strict backward compatibility, so it is generally best to build an application package against the latest version using the <varname>libsForQt5</varname> library set.
+In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.
+If a package must be pinned to an older Qt version, be sure to file a bug upstream;
+because Qt is strictly backwards-compatible, any incompatibility is by definition a bug in the application.
+</para>
+
+<para>
+When testing applications in Nixpkgs, it is a common practice to build the package with <literal>nix-build</literal> and run it using the created symbolic link.
+This will not work with Qt applications, however, because they have many hard runtime requirements that can only be guaranteed if the package is actually installed.
+To test a Qt application, install it with <literal>nix-env</literal> or run it inside <literal>nix-shell</literal>.
+</para>
 
 </section>
 
-- 
GitLab


From dab7700f6ce9266e02a630eea0c4440470ba58e5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 15 Jun 2017 07:58:55 -0500
Subject: [PATCH 0912/1490] qt58: determine plugin and import paths from PATH

Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further
modification.
---
 .../services/x11/display-managers/sddm.nix    |  6 ++-
 .../sddm/sddm-nix-profiles.patch              | 24 -----------
 .../applications/display-managers/sddm/series |  3 +-
 .../libraries/qt-5/5.8/qtbase/default.nix     |  1 -
 ...ibrary-paths.patch => library-paths.patch} | 12 +++---
 .../5.8/qtbase/qpa-platform-plugin-path.patch | 43 -------------------
 .../libraries/qt-5/5.8/qtbase/series          |  3 +-
 ...-import-paths.patch => import-paths.patch} | 12 +++---
 .../libraries/qt-5/5.8/qtdeclarative/series   |  2 +-
 9 files changed, 19 insertions(+), 87 deletions(-)
 delete mode 100644 pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
 rename pkgs/development/libraries/qt-5/5.8/qtbase/{nix-profiles-library-paths.patch => library-paths.patch} (64%)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
 rename pkgs/development/libraries/qt-5/5.8/qtdeclarative/{nix-profiles-import-paths.patch => import-paths.patch} (64%)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index bf516235eb2..e6cc02e4d49 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -197,8 +197,10 @@ in
       logsXsession = true;
 
       environment = {
-        # Take themes system environment
-        NIX_PROFILES = "/run/current-system/sw";
+        # Load themes from system environment
+        QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix;
+        QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix;
+
         XDG_DATA_DIRS = "/run/current-system/sw/share";
       };
 
diff --git a/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch b/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
deleted file mode 100644
index 1783164af46..00000000000
--- a/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: sddm-0.14.0/src/daemon/Greeter.cpp
-===================================================================
---- sddm-0.14.0.orig/src/daemon/Greeter.cpp
-+++ sddm-0.14.0/src/daemon/Greeter.cpp
-@@ -157,18 +157,7 @@ namespace SDDM {
-                 << args;
- 
-             // greeter environment
--            QProcessEnvironment env;
--            QProcessEnvironment sysenv = QProcessEnvironment::systemEnvironment();
--
--            insertEnvironmentList({QStringLiteral("LANG"), QStringLiteral("LANGUAGE"),
--                                   QStringLiteral("LC_CTYPE"), QStringLiteral("LC_NUMERIC"), QStringLiteral("LC_TIME"), QStringLiteral("LC_COLLATE"),
--                                   QStringLiteral("LC_MONETARY"), QStringLiteral("LC_MESSAGES"), QStringLiteral("LC_PAPER"), QStringLiteral("LC_NAME"),
--                                   QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION"),
--                                   QStringLiteral("LD_LIBRARY_PATH"),
--                                   QStringLiteral("QML2_IMPORT_PATH"),
--                                   QStringLiteral("QT_PLUGIN_PATH"),
--                                   QStringLiteral("XDG_DATA_DIRS")
--            }, sysenv, env);
-+            QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- 
-             env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());
-             env.insert(QStringLiteral("DISPLAY"), m_display->name());
diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series
index 703fb6a3fe1..cb6ea65fedb 100644
--- a/pkgs/applications/display-managers/sddm/series
+++ b/pkgs/applications/display-managers/sddm/series
@@ -1,2 +1 @@
-sddm-ignore-config-mtime.patch
-sddm-nix-profiles.patch
+sddm-ignore-config-mtime.patch
\ No newline at end of file
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 3048baeb327..93be661b7da 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -132,7 +132,6 @@ stdenv.mkDerivation {
         -docdir $out/$qtDocPrefix"
 
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\""
   '';
 
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch
similarity index 64%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
rename to pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch
index f626e399288..38eecbe2c64 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch
@@ -6,12 +6,12 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
-+        // Add library paths derived from NIX_PROFILES.
-+        const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
-+        const QString plugindir = QStringLiteral(NIXPKGS_QT_PLUGIN_PREFIX);
-+        for (const QString &profile: profiles) {
-+            if (!profile.isEmpty()) {
-+                app_libpaths->append(profile + QDir::separator() + plugindir);
++        // Add library paths derived from PATH
++        const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++        const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);
++        for (const QString &path: paths) {
++            if (!path.isEmpty()) {
++                app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));
 +            }
 +        }
 +
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
deleted file mode 100644
index 18780db05e7..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/gui/kernel/qplatformintegrationfactory.cpp
-+++ qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp
-@@ -62,9 +62,10 @@ QPlatformIntegration *QPlatformIntegrati
-     // Try loading the plugin from platformPluginPath first:
-     if (!platformPluginPath.isEmpty()) {
-         QCoreApplication::addLibraryPath(platformPluginPath);
--        if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
--            return ret;
-     }
-+    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
-+    if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
-+        return ret;
- #else
-     Q_UNUSED(platformPluginPath);
- #endif
-@@ -84,15 +85,16 @@ QStringList QPlatformIntegrationFactory:
- #ifndef QT_NO_LIBRARY
-     if (!platformPluginPath.isEmpty()) {
-         QCoreApplication::addLibraryPath(platformPluginPath);
--        list = directLoader()->keyMap().values();
--        if (!list.isEmpty()) {
--            const QString postFix = QLatin1String(" (from ")
--                                    + QDir::toNativeSeparators(platformPluginPath)
--                                    + QLatin1Char(')');
--            const QStringList::iterator end = list.end();
--            for (QStringList::iterator it = list.begin(); it != end; ++it)
--                (*it).append(postFix);
--        }
-+    }
-+    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
-+    list = directLoader()->keyMap().values();
-+    if (!list.isEmpty()) {
-+        const QString postFix = QLatin1String(" (from ")
-+            + QDir::toNativeSeparators(platformPluginPath)
-+            + QLatin1Char(')');
-+        const QStringList::iterator end = list.end();
-+        for (QStringList::iterator it = list.begin(); it != end; ++it)
-+            (*it).append(postFix);
-     }
- #else
-     Q_UNUSED(platformPluginPath);
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 03f5e6b1002..f3387694518 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -2,9 +2,8 @@ dlopen-resolv.patch
 tzdir.patch
 dlopen-libXcursor.patch
 xdg-config-dirs.patch
-nix-profiles-library-paths.patch
+library-paths.patch
 libressl.patch
-qpa-platform-plugin-path.patch
 dlopen-gl.patch
 compose-search-path.patch
 cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch
similarity index 64%
rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
rename to pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch
index 2d51f7b6759..d50ee823a78 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch
@@ -6,12 +6,12 @@ Index: qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp
      QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
      addImportPath(installImportsPath);
  
-+    // Add library paths derived from NIX_PROFILES.
-+    const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
-+    const QString qmldir = QStringLiteral(NIXPKGS_QML2_IMPORT_PREFIX);
-+    for (const QString &profile: profiles) {
-+        if (!profile.isEmpty()) {
-+            addImportPath(profile + QDir::separator() + qmldir);
++    // Add import paths derived from PATH
++    const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++    const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
++    for (const QString &path: paths) {
++        if (!path.isEmpty()) {
++            addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
 +        }
 +    }
 +
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
index 7dbe197c56e..38abb916a50 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
@@ -1 +1 @@
-nix-profiles-import-paths.patch
+import-paths.patch
-- 
GitLab


From e6cf9b9df0dbb8aa2b0db9d797645b2bd4b827ab Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 16 Jun 2017 08:27:05 -0500
Subject: [PATCH 0913/1490] qt56: determine plugin and import paths from PATH

Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further modification.
---
 .../libraries/qt-5/5.6/qtbase/dlopen-resolv.patch  | 14 +++++++-------
 ...les-library-paths.patch => library-paths.patch} | 12 ++++++------
 pkgs/development/libraries/qt-5/5.6/qtbase/series  |  3 +--
 .../libraries/qt-5/5.6/qtbase/tzdir.patch          | 10 +++++-----
 ...files-import-paths.patch => import-paths.patch} | 12 ++++++------
 .../libraries/qt-5/5.6/qtdeclarative/series        |  2 +-
 6 files changed, 26 insertions(+), 27 deletions(-)
 rename pkgs/development/libraries/qt-5/5.6/qtbase/{nix-profiles-library-paths.patch => library-paths.patch} (64%)
 rename pkgs/development/libraries/qt-5/5.6/qtdeclarative/{nix-profiles-import-paths.patch => import-paths.patch} (64%)

diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
index a0b546aaa3a..e9d3c2734d1 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp
+Index: qtbase-opensource-src-5.6.2/src/network/kernel/qdnslookup_unix.cpp
 ===================================================================
---- qtbase-opensource-src-5.6.1.orig/src/network/kernel/qdnslookup_unix.cpp
-+++ qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp
-@@ -78,7 +78,7 @@ static bool resolveLibraryInternal()
+--- qtbase-opensource-src-5.6.2.orig/src/network/kernel/qdnslookup_unix.cpp
++++ qtbase-opensource-src-5.6.2/src/network/kernel/qdnslookup_unix.cpp
+@@ -83,7 +83,7 @@ static bool resolveLibraryInternal()
      if (!lib.load())
  #endif
      {
@@ -11,10 +11,10 @@ Index: qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp
          if (!lib.load())
              return false;
      }
-Index: qtbase-opensource-src-5.6.1/src/network/kernel/qhostinfo_unix.cpp
+Index: qtbase-opensource-src-5.6.2/src/network/kernel/qhostinfo_unix.cpp
 ===================================================================
---- qtbase-opensource-src-5.6.1.orig/src/network/kernel/qhostinfo_unix.cpp
-+++ qtbase-opensource-src-5.6.1/src/network/kernel/qhostinfo_unix.cpp
+--- qtbase-opensource-src-5.6.2.orig/src/network/kernel/qhostinfo_unix.cpp
++++ qtbase-opensource-src-5.6.2/src/network/kernel/qhostinfo_unix.cpp
 @@ -94,7 +94,7 @@ static bool resolveLibraryInternal()
      if (!lib.load())
  #endif
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/library-paths.patch
similarity index 64%
rename from pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
rename to pkgs/development/libraries/qt-5/5.6/qtbase/library-paths.patch
index dfc2dccdeb6..fecbce59050 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/library-paths.patch
@@ -6,12 +6,12 @@ Index: qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
-+        // Add library paths derived from NIX_PROFILES.
-+        const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
-+        const QString plugindir = QStringLiteral(NIXPKGS_QT_PLUGIN_PREFIX);
-+        for (const QString &profile: profiles) {
-+            if (!profile.isEmpty()) {
-+                app_libpaths->append(profile + QDir::separator() + plugindir);
++        // Add library paths derived from PATH
++        const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++        const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);
++        for (const QString &path: paths) {
++            if (!path.isEmpty()) {
++                app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));
 +            }
 +        }
 +
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series
index 3527a91c84d..bacb3a4ed89 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series
@@ -4,7 +4,6 @@ dlopen-libXcursor.patch
 dlopen-openssl.patch
 dlopen-dbus.patch
 xdg-config-dirs.patch
-nix-profiles-library-paths.patch
+library-paths.patch
 compose-search-path.patch
 libressl.patch
-qpa-platform-plugin-path.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
index 16e88d7c4f0..f197211ded7 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
+Index: qtbase-opensource-src-5.6.2/src/corelib/tools/qtimezoneprivate_tz.cpp
 ===================================================================
---- qtbase-opensource-src-5.6.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
+--- qtbase-opensource-src-5.6.2.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
++++ qtbase-opensource-src-5.6.2/src/corelib/tools/qtimezoneprivate_tz.cpp
+@@ -64,7 +64,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
  // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
  static QTzTimeZoneHash loadTzTimeZones()
  {
@@ -14,7 +14,7 @@ Index: qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
      if (!QFile::exists(path))
          path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
  
-@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt
+@@ -636,12 +639,18 @@ void QTzTimeZonePrivate::init(const QByt
          if (!tzif.open(QIODevice::ReadOnly))
              return;
      } else {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/import-paths.patch
similarity index 64%
rename from pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
rename to pkgs/development/libraries/qt-5/5.6/qtdeclarative/import-paths.patch
index 50e9490b6d9..a942d837c30 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/import-paths.patch
@@ -6,12 +6,12 @@ Index: qtdeclarative-opensource-src-5.6.2/src/qml/qml/qqmlimport.cpp
      QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
      addImportPath(installImportsPath);
  
-+    // Add library paths derived from NIX_PROFILES.
-+    const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
-+    const QString qmldir = QStringLiteral(NIXPKGS_QML2_IMPORT_PREFIX);
-+    for (const QString &profile: profiles) {
-+        if (!profile.isEmpty()) {
-+            addImportPath(profile + QDir::separator() + qmldir);
++    // Add import paths derived from PATH
++    const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++    const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
++    for (const QString &path: paths) {
++        if (!path.isEmpty()) {
++            addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
 +        }
 +    }
 +
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series
index 7dbe197c56e..38abb916a50 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series
@@ -1 +1 @@
-nix-profiles-import-paths.patch
+import-paths.patch
-- 
GitLab


From 92fc4a374f572c4ca4d5cb48195776441ae0f905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 14:52:11 +0100
Subject: [PATCH 0914/1490] Revert "gdbGuile: mark as broken"

This reverts commit 08d25152b85fb24f7b5b85efe25d6be4deb12227.
---
 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 3be50635f8c..25824654fa1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7161,7 +7161,7 @@ with pkgs;
     inherit (gnu) mig;
   };
 
-  gdbGuile = lowPrio (gdb.override { inherit guile; broken = true; });
+  gdbGuile = lowPrio (gdb.override { inherit guile; });
 
   gdb-multitarget = lowPrio (gdb.override { multitarget = true; });
 
-- 
GitLab


From 13d026e219c2f6c6f35f39abf5c911eca4884355 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 17 Jun 2017 22:05:07 +0300
Subject: [PATCH 0915/1490] bind: Use rndc to control the daemon

---
 nixos/modules/services/networking/bind.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 0272b6ceff2..e6d9e67116b 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -10,6 +10,11 @@ let
 
   confFile = pkgs.writeText "named.conf"
     ''
+      include "/etc/bind/rndc.key";
+      controls {
+        inet 127.0.0.1 allow {localhost;} keys {"rndc-key";};
+      };
+
       acl cachenetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} };
       acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
 
@@ -151,11 +156,21 @@ in
       wantedBy = [ "multi-user.target" ];
 
       preStart = ''
+        mkdir -m 0755 -p /etc/bind
+        if ! [ -f "/etc/bind/rndc.key" ]; then
+          ${pkgs.bind.out}/sbin/rndc-confgen -r /dev/urandom -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null
+        fi
+
         ${pkgs.coreutils}/bin/mkdir -p /var/run/named
         chown ${bindUser} /var/run/named
       '';
 
-      script = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
+      serviceConfig = {
+        ExecStart  = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
+        ExecReload = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";
+        ExecStop   = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
+      };
+
       unitConfig.Documentation = "man:named(8)";
     };
   };
-- 
GitLab


From fd072b98d082edf7841f515b9d27f22608684c2f Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 18 Jun 2017 18:15:42 +0300
Subject: [PATCH 0916/1490] ps_mem: init at 3.9

---
 pkgs/tools/system/ps_mem/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/system/ps_mem/default.nix

diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix
new file mode 100644
index 00000000000..bbac78f4864
--- /dev/null
+++ b/pkgs/tools/system/ps_mem/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+let
+  version = "3.9";
+  pname = "ps_mem";
+in pythonPackages.buildPythonApplication rec {
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pixelb";
+    repo = "${pname}";
+    rev = "f0891def54f1edb78a70006603d2b025236b830f";
+    sha256 = "1vy0z5nhia61hpqndf7kkjm12mgi0kh33jx5g1glggy45ymcisif";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A utility to accurately report the in core memory usage for a program";
+    homepage = https://github.com/pixelb/ps_mem;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..89a3edc361d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1066,6 +1066,8 @@ with pkgs;
 
   playerctl = callPackage ../tools/audio/playerctl { };
 
+  ps_mem = callPackage ../tools/system/ps_mem { };
+
   socklog = callPackage ../tools/system/socklog { };
 
   staccato = callPackage ../tools/text/staccato { };
-- 
GitLab


From 6818848facb2648952e9186120573862ef12e69c Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sun, 18 Jun 2017 11:32:18 -0500
Subject: [PATCH 0917/1490] polyml: enable libffi and gmp

Thanks, @Mic92.
---
 pkgs/development/compilers/polyml/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 3ad8585edf3..1ffc08e969e 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
   name = "polyml-${version}";
@@ -8,7 +8,14 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  buildInputs = [ libffi gmp ] ++
+    stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+
+  configureFlags = [
+    "--enable-shared"
+    "--with-system-libffi"
+    "--with-gmp"
+  ];
 
   src = fetchFromGitHub {
     owner = "polyml";
-- 
GitLab


From 0f51a2a0294d9141edfc6592f98ed500f38e0c61 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sun, 18 Jun 2017 11:39:01 -0500
Subject: [PATCH 0918/1490] polyml: autoreconfHook -> nativeBuildInputs

Thanks, @peterhoeg.
---
 pkgs/development/compilers/polyml/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 1ffc08e969e..390d37dd245 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
-  buildInputs = [ libffi gmp ] ++
-    stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  buildInputs = [ libffi gmp ];
+
+  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
 
   configureFlags = [
     "--enable-shared"
-- 
GitLab


From 2fb67d9b83f2b6ab1632c3e89c7a91aae603ee7e Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sun, 18 Jun 2017 19:32:51 +0200
Subject: [PATCH 0919/1490] qt: fix qmakeHook -> qmake in few packages.

This seem to have been broken in #26336.
---
 pkgs/applications/networking/feedreaders/rssguard/default.nix | 4 ++--
 pkgs/tools/misc/ultrastar-creator/default.nix                 | 4 ++--
 pkgs/tools/misc/ultrastar-manager/default.nix                 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index a9e3c1d74e2..d1c272fc383 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }:
+{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "rssguard-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =  [ qtwebengine qttools ];
-  nativeBuildInputs = [ qmakeHook wrapGAppsHook ];
+  nativeBuildInputs = [ qmake wrapGAppsHook ];
   qmakeFlags = [ "CONFIG+=release" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index 0700c43b26e..197c0536603 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, qmakeHook, qtbase, makeQtWrapper
+, qmake, qtbase, makeQtWrapper
 , pkgconfig, taglib, libbass, libbass_fx }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
   buildInputs = [ qtbase taglib libbass libbass_fx ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
index 61b2c6aaa22..503ffe735fd 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmakeHook, diffPlugins
+{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
 , qtbase, qtmultimedia, makeQtWrapper
 , taglib, libmediainfo, libzen, libbass }:
 
@@ -60,7 +60,7 @@ let
     name = "ultrastar-manager-${name}-plugin-${version}";
     src = patchedSrc;
 
-    buildInputs = [ qmakeHook ] ++ buildInputs;
+    buildInputs = [ qmake ] ++ buildInputs;
 
     postPatch = ''
       sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \
-- 
GitLab


From 89e02c7516ff301d28301926e9d7b373f29836fe Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 18 Jun 2017 20:04:30 +0200
Subject: [PATCH 0920/1490] lean: 3.1.0 -> 3.2.0

---
 pkgs/applications/science/logic/lean/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index a863b01f43a..08861341a1a 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "0w4cdai6mzx4wr7gscv4sl5q4mxx1agjbpp4smvrslav7gpbz025";
+    sha256 = "13sb9rwgc9ni2j5zx77imjhkzhix9d7klsdb8cg68c17b20sy1g3";
   };
 
   buildInputs = [ gmp cmake ];
-- 
GitLab


From f8d79426fadfd2c66fb82d1be1248f8ab4b81c56 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 18 Jun 2017 22:00:58 +0200
Subject: [PATCH 0921/1490] youtubeDL: 2017.05.29 -> 2017.06.18

---
 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 853f644634d..0af3b72f6af 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.05.29";
+  version = "2017.06.18";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "11zh0h4hwwx39iv6qbkqbvf5a5mgj71ngj2kp7zmq7g0qh37x9rx";
+    sha256 = "16az9rwr71hvs2z2xagnk71xqs7si0nb8rkn63r7pfv4rb134ggm";
   };
 
   nativeBuildInputs = [ makeWrapper ];
-- 
GitLab


From 558b5fbd534d7a9d68938ce304e0c97aaafa90ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 22:32:30 +0100
Subject: [PATCH 0922/1490] ultrastar-creator: remove makeQtWrapper

---
 pkgs/tools/misc/ultrastar-creator/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index 197c0536603..30473059d6d 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub
-, qmake, qtbase, makeQtWrapper
-, pkgconfig, taglib, libbass, libbass_fx }:
+, qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }:
 
 stdenv.mkDerivation rec {
   name = "ultrastar-creator-${version}";
@@ -29,7 +28,7 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
-  nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [ qtbase taglib libbass libbass_fx ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From 9f14594cbc7313f6aac5ad58c1f789ad45ac6f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 22:38:33 +0100
Subject: [PATCH 0923/1490] ultrastar-manager: remove makeQtWrapper

---
 pkgs/tools/misc/ultrastar-manager/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
index 503ffe735fd..af443661b6c 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
-, qtbase, qtmultimedia, makeQtWrapper
-, taglib, libmediainfo, libzen, libbass }:
+, qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }:
 
 let
   version = "2017-05-24";
@@ -109,7 +108,7 @@ in stdenv.mkDerivation {
     make install
   '';
 
-  nativeBuildInputs = [ makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
   inherit buildInputs;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 5fc48529bc8dcdd578b71c9fdb919fefba0f8c74 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 18 Jun 2017 23:49:24 +0200
Subject: [PATCH 0924/1490] expat: 2.2.0 -> 2.2.1

Includes fixes for CVE-2017-9233 and CVE-2016-9063.
---
 pkgs/development/libraries/expat/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 1001afff0d4..3cbfc4c568d 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.0";
+  name = "expat-2.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "1zq4lnwjlw8s9mmachwfvfjf2x3lk24jm41746ykhdcvs7r0zrfr";
+    sha256 = "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  preCheck = "patchShebangs ./run.sh";
+
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
     description = "A stream-oriented XML parser library written in C";
-- 
GitLab


From 3d5a0f8c2f2efbb252d21e11738394489d8cff73 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 18 Jun 2017 16:12:46 -0500
Subject: [PATCH 0925/1490] mopidy-spotify: 3.0.0 -> 3.1.0

---
 pkgs/applications/audio/mopidy-spotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix
index 045c400a17f..999883dc26c 100644
--- a/pkgs/applications/audio/mopidy-spotify/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-spotify-${version}";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
-    sha256 = "0w7bhq6nz2xly5g72xd98r7lyzmx7nzfdpghk7vklkx0x41qccz8";
+    sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl";
   };
 
   propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];
-- 
GitLab


From 5eac427ff27a75b919050f38645ad0196572812c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 18 Jun 2017 13:52:49 +0800
Subject: [PATCH 0926/1490] kde-frameworks: 5.33 -> 5.34

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 592 +++++++++---------
 2 files changed, 297 insertions(+), 297 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 361426d1de6..1be04bf3cb7 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.33/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index ebcc4fc7c38..88a943c4fcd 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,595 +3,595 @@
 
 {
   attica = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/attica-5.33.0.tar.xz";
-      sha256 = "1dr5yhg0cy4b6k91mk6w090zjizgxaa808h799m14jqzgj63z5d6";
-      name = "attica-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/attica-5.34.0.tar.xz";
+      sha256 = "0l8gmsmpwzg6nzwwlnsdl6r6qkhnhirpmrkag9xpd2sbmy734x53";
+      name = "attica-5.34.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/baloo-5.33.0.tar.xz";
-      sha256 = "174my99i5mggab98l38y2bk27xp25mpz58rl8rhnb3wsbgxcx7iz";
-      name = "baloo-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/baloo-5.34.0.tar.xz";
+      sha256 = "0z53lnniq9xdk09d73z0p1xs1qmaf71m4znm4hmq956yg4yqa1ya";
+      name = "baloo-5.34.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/bluez-qt-5.33.0.tar.xz";
-      sha256 = "0cpkdv4k68f0rcg3j91418i59dmc94qlnv3xk1chq0fdi0cssrri";
-      name = "bluez-qt-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/bluez-qt-5.34.0.tar.xz";
+      sha256 = "040gs2a1fx996gqdx2pwxh00szb1vb85055z946nqvqfn01921df";
+      name = "bluez-qt-5.34.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/breeze-icons-5.33.0.tar.xz";
-      sha256 = "07nb4xq00fw50r4vf10npa2z690rwkmlxdy42lxx3ixci4qw4204";
-      name = "breeze-icons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/breeze-icons-5.34.0.tar.xz";
+      sha256 = "1znzlggb6yrkw5rr2n75g7cfv9x5p9d55hss09c4i79lxrh1bk4a";
+      name = "breeze-icons-5.34.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/extra-cmake-modules-5.33.0.tar.xz";
-      sha256 = "013adgrz8s0w7a7z2ahkv28cq4c2cy00cw6y8akpkxazqhv5xzzk";
-      name = "extra-cmake-modules-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/extra-cmake-modules-5.34.0.tar.xz";
+      sha256 = "1r3dyvrv77xrpjlzpa6yazwkknirvx1ccvdyj9x0mlk4vfi05nh5";
+      name = "extra-cmake-modules-5.34.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/frameworkintegration-5.33.0.tar.xz";
-      sha256 = "01c1jq77hm3v5xi84gn5hymlnnn1igcpz9v49yxgyvnihlblb1ll";
-      name = "frameworkintegration-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/frameworkintegration-5.34.0.tar.xz";
+      sha256 = "0hq1r2znjzy0wzm3nsclqmih1aia5300bsf87a2l4919q0ildb20";
+      name = "frameworkintegration-5.34.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kactivities-5.33.0.tar.xz";
-      sha256 = "092gk0zn15qm4pihxf1h4qn2n618wp43k67ffy3saw4fadqmxpsz";
-      name = "kactivities-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kactivities-5.34.0.tar.xz";
+      sha256 = "0dg6bkdxf4sicij4szmi55npn6chp0sfmw27qi1s582ymqzjgf5m";
+      name = "kactivities-5.34.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kactivities-stats-5.33.0.tar.xz";
-      sha256 = "1269nh4l94b3yxyvzdjw6vb8pxjylrvnrv28vnar8dmx0sbh5jpf";
-      name = "kactivities-stats-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kactivities-stats-5.34.0.tar.xz";
+      sha256 = "1dfaq4hsd9wm1ka45dkxbl9wwr7s5ixbnnghqwxhl7a60imc680r";
+      name = "kactivities-stats-5.34.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kapidox-5.33.0.tar.xz";
-      sha256 = "162x868dwl92361ss1dxv0gqh8g4apshcgb1ww4nizy239mfj8h0";
-      name = "kapidox-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kapidox-5.34.0.tar.xz";
+      sha256 = "190d5z6i71jrvfna6vnlim2p9rgc33s1fxl0zarn276683i1rwvg";
+      name = "kapidox-5.34.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/karchive-5.33.0.tar.xz";
-      sha256 = "0i5grm0dhm9z6fd63ppykd6vl45k5nam4q8w1psrz7vjmr6sd924";
-      name = "karchive-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/karchive-5.34.0.tar.xz";
+      sha256 = "0g8jskdar2znviwh9bs3kia093wgfnhl04x4jcg2rvh78ylkpvxw";
+      name = "karchive-5.34.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kauth-5.33.0.tar.xz";
-      sha256 = "1lfi4w4jgc9m83q6v3jf8p91x12vvcc3g59dlg7dh2agrh07r9y7";
-      name = "kauth-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kauth-5.34.0.tar.xz";
+      sha256 = "06cw1bsp7inh5wglajm8aahy17p35ixgnijb7d74gjqzbj4cv93d";
+      name = "kauth-5.34.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kbookmarks-5.33.0.tar.xz";
-      sha256 = "186difbzrpqlbi140ylkzb50d3fmn2pdz8i0r3gbc71726fqld82";
-      name = "kbookmarks-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kbookmarks-5.34.0.tar.xz";
+      sha256 = "0ggn4rz8ch82ph64q6yik9fb1mp6kmsd7n33p769zl1lw7fldn0v";
+      name = "kbookmarks-5.34.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcmutils-5.33.0.tar.xz";
-      sha256 = "0n0cmjxlp0kkgrxng2ympnl1v5a1bjr2d9c20hf31xhvmya3y9nd";
-      name = "kcmutils-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcmutils-5.34.0.tar.xz";
+      sha256 = "1b52lwn7qjqrn06va7j1jswlzs6bx0drs90myf3607k52ffbf4hy";
+      name = "kcmutils-5.34.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcodecs-5.33.0.tar.xz";
-      sha256 = "1pdijdlrl9p5w6dixqx0lmkzwsk5xarzjhpwh616j2sinfra0w31";
-      name = "kcodecs-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcodecs-5.34.0.tar.xz";
+      sha256 = "0k51s4qlf0kq6i8f3wrsz5lrkzjqb1j26hrmlmg57vn91r58iash";
+      name = "kcodecs-5.34.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcompletion-5.33.0.tar.xz";
-      sha256 = "13mv5mm90jv4k56h4n6d7r2a0pax2mhdrm51xd99fjynad129lhi";
-      name = "kcompletion-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcompletion-5.34.0.tar.xz";
+      sha256 = "18hvdk5b1nkh6b3vx0jajri57rl266b0qjsiwirh5wmjc81xbpcw";
+      name = "kcompletion-5.34.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kconfig-5.33.0.tar.xz";
-      sha256 = "1inhpil19pv3jjf7mz4f5g367n1ciiixndij10p1zxk5zy46zzmf";
-      name = "kconfig-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kconfig-5.34.0.tar.xz";
+      sha256 = "0blbx6b3fk6p8cv2iywk2avn9w1411bb0g5wwv456a9ggi01988x";
+      name = "kconfig-5.34.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kconfigwidgets-5.33.0.tar.xz";
-      sha256 = "0sd974r7xrpnhyqabgix0zb1rlis32ijj0wiabbqi4ns0nhhi3qf";
-      name = "kconfigwidgets-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kconfigwidgets-5.34.0.tar.xz";
+      sha256 = "0h4kappsffrp2qgg8wza1ybgah2dlcgpz591llfvaz31ldsml9hk";
+      name = "kconfigwidgets-5.34.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcoreaddons-5.33.0.tar.xz";
-      sha256 = "1906jscfc2kpd22d7yk88ziy3ky3hcfxy5y593pfzjl41gyhsiyl";
-      name = "kcoreaddons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcoreaddons-5.34.0.tar.xz";
+      sha256 = "1ybr4bv8rhp4cxpf8mfsc4dk0klzrfh1z8g2cw6zasmksxmmwi90";
+      name = "kcoreaddons-5.34.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcrash-5.33.0.tar.xz";
-      sha256 = "136wlvaf4r54k8x0z0jvs7l35m0v22y6zqkhc8f91dr1y2ym2jnk";
-      name = "kcrash-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcrash-5.34.0.tar.xz";
+      sha256 = "1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3";
+      name = "kcrash-5.34.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdbusaddons-5.33.0.tar.xz";
-      sha256 = "1xxbmr88w7hqxsrhjbgic0pn4adkydhv9xd77vwbzjj47123mph2";
-      name = "kdbusaddons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdbusaddons-5.34.0.tar.xz";
+      sha256 = "1skblxfnjhbyiwavsfhksc2ybc2sikw3xr0js6mlfbpmvqzghn6h";
+      name = "kdbusaddons-5.34.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdeclarative-5.33.0.tar.xz";
-      sha256 = "1333vv6kbdk4sdkkc8lnncgmm3203ca8ybn9nj6ch3zqwyxcaagk";
-      name = "kdeclarative-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdeclarative-5.34.0.tar.xz";
+      sha256 = "1mfj32p631zvwz9ldk8536ifb4n825zxbhx69bfllhw2vn1am7z2";
+      name = "kdeclarative-5.34.0.tar.xz";
     };
   };
   kded = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kded-5.33.0.tar.xz";
-      sha256 = "02g66ip0d0cwb8grb6f3z1j7178w76pfs2f8d2dl1rax4hnjppd0";
-      name = "kded-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kded-5.34.0.tar.xz";
+      sha256 = "0qy4w7bcg60gyf6y6c11kqcshnld55a8w4fzglpwgqfbliyi5yzq";
+      name = "kded-5.34.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kdelibs4support-5.33.0.tar.xz";
-      sha256 = "1gyyvp4kqnjaf764y2z24jk68h5h0ax1z9h25msczy6bd4ify5v9";
-      name = "kdelibs4support-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kdelibs4support-5.34.0.tar.xz";
+      sha256 = "0q9jjsjcvc43va4yvfay2xi40vb95lnqhgzavpqcndzjihixwmi0";
+      name = "kdelibs4support-5.34.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdesignerplugin-5.33.0.tar.xz";
-      sha256 = "1f4f53xag6xbvacpn5j0zrsdwimksnckdza6kswcri5q258yb6ks";
-      name = "kdesignerplugin-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdesignerplugin-5.34.0.tar.xz";
+      sha256 = "1jnarg7wrhdjfq73q4wplazxsz927mpf0l6m0i4akq4dlp1b7aah";
+      name = "kdesignerplugin-5.34.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdesu-5.33.0.tar.xz";
-      sha256 = "06scns6jgs372xx7fssdj63110nrnvy9dmm1k7gc0pyhn0a5yk8a";
-      name = "kdesu-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdesu-5.34.0.tar.xz";
+      sha256 = "04mx0d6kf8slgkkgbna3cyv4c491jvlwcwqxc7zikz0i03l341id";
+      name = "kdesu-5.34.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdewebkit-5.33.0.tar.xz";
-      sha256 = "0lxca56ib5pldc6f3z2gw05jbi2kyd9rqp52pgzfs4kgvvs6gblh";
-      name = "kdewebkit-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdewebkit-5.34.0.tar.xz";
+      sha256 = "155rn5bib4jq1ml35l4hll9cv30bp83wva4kgrhfc4y8cp46p9wk";
+      name = "kdewebkit-5.34.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdnssd-5.33.0.tar.xz";
-      sha256 = "11pnh18z030zzkiibvd9lfp5i194qwk3pccncc9968nnc0bgghxa";
-      name = "kdnssd-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdnssd-5.34.0.tar.xz";
+      sha256 = "082mdim9wykdap4fmjfayk443rbarsk1p8cn3mspx2nw047yja80";
+      name = "kdnssd-5.34.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdoctools-5.33.0.tar.xz";
-      sha256 = "04d48gi5d273x3p7572szlpyiz8iyw1ic53b9jblhyfyp93gvpb9";
-      name = "kdoctools-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdoctools-5.34.0.tar.xz";
+      sha256 = "145jjhsd0whmcj91zbjz2b1jyj4wasw60hbwyd4xvqds8cp0l02h";
+      name = "kdoctools-5.34.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kemoticons-5.33.0.tar.xz";
-      sha256 = "0p9320zln553wi055ql04j8kk329l3wiksprg9rkgzya2gynflyl";
-      name = "kemoticons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kemoticons-5.34.0.tar.xz";
+      sha256 = "02h12qy0w6mcgkczi3md1znnvp7r47l8h416nd080ljpsydalgx8";
+      name = "kemoticons-5.34.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kfilemetadata-5.33.0.tar.xz";
-      sha256 = "1bbw1h8kml8glnck8hh4s13abbksw2fa7g93p25vbhdcyr7zgkr0";
-      name = "kfilemetadata-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kfilemetadata-5.34.0.tar.xz";
+      sha256 = "1rvlg6by8daiq5ff3qlxcw9k2iq4qicsj0c8a00xfy3w4h9ip9h5";
+      name = "kfilemetadata-5.34.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kglobalaccel-5.33.0.tar.xz";
-      sha256 = "0hc46vwiz81iqzkrc0qahd7gn71kh5wc32kjvh6h4ijlnfmdih07";
-      name = "kglobalaccel-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kglobalaccel-5.34.0.tar.xz";
+      sha256 = "1i32dq70qxjbfvlw0wqxvqvl6ysydmpg3zbiflff4z1qrmvmpw6a";
+      name = "kglobalaccel-5.34.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kguiaddons-5.33.0.tar.xz";
-      sha256 = "171lvykvznrrqdi1frm9akzx5rsrj04vvav3sv64x7hfsas0a7p1";
-      name = "kguiaddons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kguiaddons-5.34.0.tar.xz";
+      sha256 = "1nmlwvy2jdmh0m6bmahvk68vl2rs9s28c10dkncpi6gvhsdkigqx";
+      name = "kguiaddons-5.34.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/khtml-5.33.0.tar.xz";
-      sha256 = "0j9viw8fydh1x548wx39bphk5bf11fyrghshxz14a79rll8w7qmc";
-      name = "khtml-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/khtml-5.34.0.tar.xz";
+      sha256 = "0j490jfnz8pbfl1i11wj514nw0skpnxr2fvi9pqpfql9lfhsanxv";
+      name = "khtml-5.34.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/ki18n-5.33.0.tar.xz";
-      sha256 = "02xf9q3vnw8nn2if6a3pfj8v96414j7gnc6097k0wxfyis9i46k1";
-      name = "ki18n-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/ki18n-5.34.0.tar.xz";
+      sha256 = "0glvmmy01mp6hnix79aichgwjq842kgf5q5zynkg6mch85y4ary7";
+      name = "ki18n-5.34.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kiconthemes-5.33.0.tar.xz";
-      sha256 = "1zys55d7jjjjllyi9p4difnr6xg9580bgcg5pnm966ak6zhj6682";
-      name = "kiconthemes-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kiconthemes-5.34.0.tar.xz";
+      sha256 = "0hbl82r6qc8dh9v9n9xjkx966czkq5yjxx2rx7sbilj2p9v3saii";
+      name = "kiconthemes-5.34.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kidletime-5.33.0.tar.xz";
-      sha256 = "0z6i224kmj9l15x923pa30mlhjw66chm9v8qvzg1vhmk36jyw789";
-      name = "kidletime-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kidletime-5.34.0.tar.xz";
+      sha256 = "0z8x6iz52y2m8llsp2q4qayxswkzay7ksimzy47crfag442bw24g";
+      name = "kidletime-5.34.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kimageformats-5.33.0.tar.xz";
-      sha256 = "1m9d51pvrc7fa38mp4jn4cdn558nd6kvik3ry6gvv8im67qyq4ga";
-      name = "kimageformats-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kimageformats-5.34.0.tar.xz";
+      sha256 = "0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw";
+      name = "kimageformats-5.34.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kinit-5.33.0.tar.xz";
-      sha256 = "0v3dcgbi5qwg9nmn668r2v1b257qhmkdb2l3p7hhx06ygypk4yjp";
-      name = "kinit-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kinit-5.34.0.tar.xz";
+      sha256 = "08429kjihpaip73wszr3rsii8sdlwgm3kxx7g0hpjhkj9d2jq3m1";
+      name = "kinit-5.34.0.tar.xz";
     };
   };
   kio = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kio-5.33.0.tar.xz";
-      sha256 = "1pls5yjkhz7fkawks4c0lmsix0nafv7hyp33yh7dm4hijd8zy5cf";
-      name = "kio-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kio-5.34.0.tar.xz";
+      sha256 = "1i23ld5b9gafh2x3lv79jbggbd92xyhk7rg3n765w3bsfpg2ijva";
+      name = "kio-5.34.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kitemmodels-5.33.0.tar.xz";
-      sha256 = "1ma21qydbmj2qr4ib4qv13wip99lq3lm8d6p137bg9x6nqfa4qzn";
-      name = "kitemmodels-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kitemmodels-5.34.0.tar.xz";
+      sha256 = "1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5";
+      name = "kitemmodels-5.34.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kitemviews-5.33.0.tar.xz";
-      sha256 = "1nc07lxh37l1fwz6xmsrcplimgmrna9ij2dq3pnfrxr319c29890";
-      name = "kitemviews-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kitemviews-5.34.0.tar.xz";
+      sha256 = "054accbis471zj1gbfxbc99062r2hvpb04i6w3r8fa4ml8s6brqk";
+      name = "kitemviews-5.34.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kjobwidgets-5.33.0.tar.xz";
-      sha256 = "01adg7axi1bp59z1c7xnxg2p1ahhrzxwxrjn3ci805m8ns6d40cz";
-      name = "kjobwidgets-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kjobwidgets-5.34.0.tar.xz";
+      sha256 = "0lrx761vf947mb2q1l2jgi0wgwj8cz2nn1xg0j38bh99sgddmzpf";
+      name = "kjobwidgets-5.34.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kjs-5.33.0.tar.xz";
-      sha256 = "1w0kdxnzcwmgskl4qsw6aq5189yxqyhq9qajihr2yga0hyglf3iv";
-      name = "kjs-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kjs-5.34.0.tar.xz";
+      sha256 = "18b7k1hi73iqn06c1ryy9lcmvscr9d08q7n1wwkrn0l2xmy05xsq";
+      name = "kjs-5.34.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kjsembed-5.33.0.tar.xz";
-      sha256 = "1vk2m8i315nrys9c4kk3hdlp8hdn2ils0lb8v4nnkvbj3s1f4a8p";
-      name = "kjsembed-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kjsembed-5.34.0.tar.xz";
+      sha256 = "17w8i370pqks1fj3pcziz7j014chnc6yi7md7w2p4xprw54pbmbk";
+      name = "kjsembed-5.34.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kmediaplayer-5.33.0.tar.xz";
-      sha256 = "13xpvi0vxd3vva2d64x8l1knj270al4329kwf9xaays66g6gshgs";
-      name = "kmediaplayer-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kmediaplayer-5.34.0.tar.xz";
+      sha256 = "1mq87qf86sdvwhas4w7rspd221qp4x9kds4nd0lpldiay4483k86";
+      name = "kmediaplayer-5.34.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/knewstuff-5.33.0.tar.xz";
-      sha256 = "1j4jj2k6jngcp98mfxq1cdp7x0j43rgr5gxn9viqp92liak68lsh";
-      name = "knewstuff-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/knewstuff-5.34.0.tar.xz";
+      sha256 = "19d53ylwr92dzl9agk4j765zvb897rcm55z7pr6841aj58jk9b82";
+      name = "knewstuff-5.34.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/knotifications-5.33.0.tar.xz";
-      sha256 = "17ppfwhl3mqd3l4r56whqcxagx6br02hdwlqy7npn32g797hkayd";
-      name = "knotifications-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/knotifications-5.34.0.tar.xz";
+      sha256 = "12z5hza0n5zr6mv3gkwhzb8zkrmk6dvgq8hrzwm8rzkgphjr6pi9";
+      name = "knotifications-5.34.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/knotifyconfig-5.33.0.tar.xz";
-      sha256 = "0m9fdvbakv0plq3m7sj6wj980wfd3m37cabximz9gmi0zkcadzmw";
-      name = "knotifyconfig-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/knotifyconfig-5.34.0.tar.xz";
+      sha256 = "0lwl22vq770jyp45j32s0ss8yiqdwbink6cdhkbapg3pzbiwklyk";
+      name = "knotifyconfig-5.34.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kpackage-5.33.0.tar.xz";
-      sha256 = "03ls567fj54fzibc8fafffas97abyanl0sn041z51sr7mjp425cs";
-      name = "kpackage-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kpackage-5.34.0.tar.xz";
+      sha256 = "0wdymhcrjggxb7andz36cfk9f240vvbq5yahlxyhfp9z69lriw5q";
+      name = "kpackage-5.34.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kparts-5.33.0.tar.xz";
-      sha256 = "0fd0dqmaf8ksx3czzihjd4z0yg682a9bcy09vdhj2grki7w9fxha";
-      name = "kparts-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kparts-5.34.0.tar.xz";
+      sha256 = "1a5n0f7ljdc2bm6vggzwbvpblyxjqn9m9pam70iab964pqqalgp7";
+      name = "kparts-5.34.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kpeople-5.33.0.tar.xz";
-      sha256 = "19vag6ci82jh5lw5c7734rlp89wr7xb0d8as98ykz2wmkk0mqql7";
-      name = "kpeople-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kpeople-5.34.0.tar.xz";
+      sha256 = "0krm74dl80s48nhiygga4dvkvqqimxdx4nczbk4qvj7j1g9p2rsh";
+      name = "kpeople-5.34.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kplotting-5.33.0.tar.xz";
-      sha256 = "0niqhj270l36il3ql6xljg9gbb0yw25ky8wsc7l0021mxvhficri";
-      name = "kplotting-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kplotting-5.34.0.tar.xz";
+      sha256 = "1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh";
+      name = "kplotting-5.34.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kpty-5.33.0.tar.xz";
-      sha256 = "0xcmqdphqy2a44bksqiv8cjlzfkjpbpazfk5f8ml97vdqvwa6qp5";
-      name = "kpty-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kpty-5.34.0.tar.xz";
+      sha256 = "00k5hhz7nf3nf47xb003ni1chi03imyrfajap6ay4zp90l8fr950";
+      name = "kpty-5.34.0.tar.xz";
     };
   };
   kross = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kross-5.33.0.tar.xz";
-      sha256 = "13dldb4df4spsqr3878bimv009fzq4pdvmwlaw753c0lrp97pd9l";
-      name = "kross-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kross-5.34.0.tar.xz";
+      sha256 = "092qz8vyiialv9fvk4wvn8mrfhz5i5hnbq0xnz6nvi1pk3db6bxq";
+      name = "kross-5.34.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/krunner-5.33.0.tar.xz";
-      sha256 = "0za052rsqf5kaz1c48k63a905b3x953wi6f07m44m6dm38p5ixq8";
-      name = "krunner-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/krunner-5.34.0.tar.xz";
+      sha256 = "0n527p708k719zgmvvbmp20xmg72f85cll05q05p4h317g7wz6i5";
+      name = "krunner-5.34.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kservice-5.33.0.tar.xz";
-      sha256 = "0jqq4ahscnqvzv8inhfzb9s6x97s60c4w8chpg16qwc7dqag887h";
-      name = "kservice-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kservice-5.34.0.tar.xz";
+      sha256 = "0sikwn49s2iq1nj518q55m2p0hvdvwm98cpf0dkjb1z1v6fgjc37";
+      name = "kservice-5.34.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/ktexteditor-5.33.0.tar.xz";
-      sha256 = "12fcqcxamkxv38w4j9waqmim7k801v6r6izlyg59iiy56yks4ms5";
-      name = "ktexteditor-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/ktexteditor-5.34.0.tar.xz";
+      sha256 = "182a0swfgdqr0faq3ksk6hlfvdi1afd0hpys5vayjjf263m19xxw";
+      name = "ktexteditor-5.34.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/ktextwidgets-5.33.0.tar.xz";
-      sha256 = "09rjr3655pbzwgjsmwbjsm7jwrxydl2jwhgbk8ziv1bgcg6cjrjy";
-      name = "ktextwidgets-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/ktextwidgets-5.34.0.tar.xz";
+      sha256 = "1hri34b373bww5gv14qli2nm77k05pk170nbb2vv2zvzv93g25gw";
+      name = "ktextwidgets-5.34.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kunitconversion-5.33.0.tar.xz";
-      sha256 = "0bflic2va9bc17q0smc4dzmgh72cjfjjaahhsvvnj54g2qggznkq";
-      name = "kunitconversion-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kunitconversion-5.34.0.tar.xz";
+      sha256 = "0v4x0flbfavrzfiqh71mdkqgp1fzk4f52msvq6w60i2s3sz7hcsm";
+      name = "kunitconversion-5.34.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kwallet-5.33.0.tar.xz";
-      sha256 = "1jpybsksai9gm2bihcgl5m56rjfd0crj9i8j0l2s4vmmzxyflczj";
-      name = "kwallet-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kwallet-5.34.0.tar.xz";
+      sha256 = "08z3ddsam5n5qn2svscp4hgksf6qd1h8lqw1v382p01nnmhxadz5";
+      name = "kwallet-5.34.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kwayland-5.33.0.tar.xz";
-      sha256 = "18nvdhfijnvzjiy0vjmqvf2nwz64ymxpnhlhs75y1d2ib8rm8qfq";
-      name = "kwayland-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kwayland-5.34.0.tar.xz";
+      sha256 = "1zxb9ram47vbiik8h0czyvacrdiijhnslkpcm61l4r1rb0ybb0ib";
+      name = "kwayland-5.34.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kwidgetsaddons-5.33.0.tar.xz";
-      sha256 = "1dnspi7zf57lsihdynbik2iwvnhv8098vqyz0rps8s8pnjl7x8k4";
-      name = "kwidgetsaddons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kwidgetsaddons-5.34.0.tar.xz";
+      sha256 = "0hw87iig75mfgl5p3ph6zkwap31h357bm7rlyv5d9nnp10bq0hfg";
+      name = "kwidgetsaddons-5.34.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kwindowsystem-5.33.0.tar.xz";
-      sha256 = "1dj18774rlpxh9p8a07shhb4dzc0zpv4qvmh4j2y4c1g6v7n6b3p";
-      name = "kwindowsystem-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kwindowsystem-5.34.0.tar.xz";
+      sha256 = "1sp2x7afhw19vmhdp2qyrmljz8h0875xjk95n8c5gzypk7sr0l83";
+      name = "kwindowsystem-5.34.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kxmlgui-5.33.0.tar.xz";
-      sha256 = "1q89xsrdhrsz7jb68hq8r3xdmhz0s19zwvd06skn6cfqx7r32ng0";
-      name = "kxmlgui-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kxmlgui-5.34.0.tar.xz";
+      sha256 = "1v8m6qzjqg3ic14a5ki37bf13kifzcbhly68zcxgs5b92hr953iy";
+      name = "kxmlgui-5.34.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kxmlrpcclient-5.33.0.tar.xz";
-      sha256 = "1zc6pn412day923k22br82xypvk24znb0ns1qsdlmrd2cnmv8l28";
-      name = "kxmlrpcclient-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kxmlrpcclient-5.34.0.tar.xz";
+      sha256 = "0kp3ab50m5jl2jgw883ip67s6gs0l3saprzrqa9r3hydn2c4s3md";
+      name = "kxmlrpcclient-5.34.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/modemmanager-qt-5.33.0.tar.xz";
-      sha256 = "098l3plck45bn7lph7mfkm03q18zxl1s8aa3pyh6b69wk45r7j54";
-      name = "modemmanager-qt-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/modemmanager-qt-5.34.0.tar.xz";
+      sha256 = "1cf5nsc8h7djvr19fm5dphzplh1wm3asvn0a7r71spg0i7lzi89h";
+      name = "modemmanager-qt-5.34.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/networkmanager-qt-5.33.0.tar.xz";
-      sha256 = "0pc4n4m93ypx1ryasw8n3bqll7v4yqa3749ir0qi096y5vysdd2m";
-      name = "networkmanager-qt-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/networkmanager-qt-5.34.0.tar.xz";
+      sha256 = "05s0irvkg0g57acriablyha2wb9c7w3xhq223vdddjqpcdx0pnkl";
+      name = "networkmanager-qt-5.34.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/oxygen-icons5-5.33.0.tar.xz";
-      sha256 = "17kp66hra0vfkcvd7fh5q23wr040h0z6di4gdrm2zi1w5jbhw9kn";
-      name = "oxygen-icons5-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/oxygen-icons5-5.34.0.tar.xz";
+      sha256 = "0cmxxssir5zbp5nlxq81h2xfd6wrxbbkydyw93dby7r56isl7ga5";
+      name = "oxygen-icons5-5.34.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/plasma-framework-5.33.0.tar.xz";
-      sha256 = "0rqm773n2r6vwmv41x27lr2zmx26s5s27ym3a6qy0w18fr86fxsd";
-      name = "plasma-framework-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/plasma-framework-5.34.0.tar.xz";
+      sha256 = "0waicqskfwc8xpmrym165hwlfv6nzbwc783sac5vrhbyk4bwk8x9";
+      name = "plasma-framework-5.34.0.tar.xz";
     };
   };
   prison = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/prison-5.33.0.tar.xz";
-      sha256 = "0hh065294s7sjj34vfwwb8zgagf1sa09l9filadl1ly0ig9f6h1r";
-      name = "prison-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/prison-5.34.0.tar.xz";
+      sha256 = "00wj4yyfhhcq9b54civ5hy1grz70mmi676x50y12crcbbgkxm1lx";
+      name = "prison-5.34.0.tar.xz";
     };
   };
   solid = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/solid-5.33.0.tar.xz";
-      sha256 = "0jb8jjv6mhwriqxfkd9fj0b7y1ab6vnwqi53sk4w4vw53d0wkqxm";
-      name = "solid-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/solid-5.34.0.tar.xz";
+      sha256 = "02kz21p3p1s1rg7gf34fr6ynhji6x97yvsfdpvbfxbhijabbh4ib";
+      name = "solid-5.34.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/sonnet-5.33.0.tar.xz";
-      sha256 = "096ybf95rx5ybvl74nlnn9x2yb2j1akn8g8ywv1vwi2ckfpnp3sd";
-      name = "sonnet-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/sonnet-5.34.0.tar.xz";
+      sha256 = "06gxrh8rb75ydkqxk5dhlmwndnczp264jx588ryfwlf3vlnk99vs";
+      name = "sonnet-5.34.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/syntax-highlighting-5.33.0.tar.xz";
-      sha256 = "0nn078sw0bkw1m5vsv02n46sc05blg3qnhxpmph2cikz5y86x9jq";
-      name = "syntax-highlighting-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/syntax-highlighting-5.34.0.tar.xz";
+      sha256 = "0ryfwblvzj9rd5jj7l8scmbb49ygzk77ng05hrznsipczin2cjw8";
+      name = "syntax-highlighting-5.34.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/threadweaver-5.33.0.tar.xz";
-      sha256 = "16y7irjyyp4smy7nm7j4zc3gk9a046bwxvv51l7rfs7n4z0550ki";
-      name = "threadweaver-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/threadweaver-5.34.0.tar.xz";
+      sha256 = "1gylpl283qf1jcfyib4q5xwnpdq13hnd2cp2i7xjazdw2jp40zhr";
+      name = "threadweaver-5.34.0.tar.xz";
     };
   };
 }
-- 
GitLab


From f151daaa67c63f287066d2c28f85a7820106d30a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 15 Jun 2017 13:48:48 +0800
Subject: [PATCH 0927/1490] plasma: 5.9.5 -> 5.10.2

---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 336 +++++++++++++++++---------------
 2 files changed, 177 insertions(+), 161 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 3553d0f01ea..29a3e3726ad 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.5/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.10.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 678c44d6e69..899f6a3f63c 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,323 +3,339 @@
 
 {
   bluedevil = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/bluedevil-5.9.5.tar.xz";
-      sha256 = "0szdfim94c9zjq6jl7n6xpnxf7c4b62wk5b6vv1yfday51gi643r";
-      name = "bluedevil-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/bluedevil-5.10.2.tar.xz";
+      sha256 = "1510gjbvyjr4bg00m28hz9ynz7m7h35c859ksq7r1y102kjxgyr7";
+      name = "bluedevil-5.10.2.tar.xz";
     };
   };
   breeze = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/breeze-5.9.5.tar.xz";
-      sha256 = "0g9y0lsx5c3r7qzrdxbanya86lqkbaf5f7has736nqw28a2jncc3";
-      name = "breeze-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/breeze-5.10.2.tar.xz";
+      sha256 = "1wywa8y07ssxvl59xw4xifi41wj9dd594hy17vjigfp1xi7h62br";
+      name = "breeze-5.10.2.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/breeze-grub-5.9.5.tar.xz";
-      sha256 = "02ml0v3srim4vdw1bwycb3wi6ijdvmf1ph0my3w5ci1k5fj402s4";
-      name = "breeze-grub-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/breeze-grub-5.10.2.tar.xz";
+      sha256 = "0xb7gvl1yrh8g75w1f97wvwig99fwqfk8azkpxxhrg8j5nr4vaz2";
+      name = "breeze-grub-5.10.2.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/breeze-gtk-5.9.5.tar.xz";
-      sha256 = "0na40qrgyml0fc3p8lgxls4zy7ifigns0594q9i3jwfz1izsiprj";
-      name = "breeze-gtk-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/breeze-gtk-5.10.2.tar.xz";
+      sha256 = "06pgbkf078zl57vyfvsmm1bll8g2x419fy2waqh9n7jkycihlinx";
+      name = "breeze-gtk-5.10.2.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/breeze-plymouth-5.9.5.tar.xz";
-      sha256 = "1fnqq4f7pr7bwfgrgk1d2qjai178lxsfsxr1jjdx61wrn1fnc3yk";
-      name = "breeze-plymouth-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/breeze-plymouth-5.10.2.tar.xz";
+      sha256 = "0db00k3h7vsp3pf7xnix8kazsw5wcjzkcj1wfkn4c7vdcvfv48pd";
+      name = "breeze-plymouth-5.10.2.tar.xz";
     };
   };
   discover = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/discover-5.9.5.tar.xz";
-      sha256 = "0846xskdy0sv9p76i78cbj7qy2xcq90lir78haiy6s8pfnxc27i3";
-      name = "discover-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/discover-5.10.2.tar.xz";
+      sha256 = "0ky5yk5nknipxy4hamy6i6m46jhv3n1lsmcs149j687jw2l6ryls";
+      name = "discover-5.10.2.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kactivitymanagerd-5.9.5.tar.xz";
-      sha256 = "0jf0kxwgyc0b3fkr05mz678p99fkr42rljqw57sjq7qhypknzd07";
-      name = "kactivitymanagerd-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kactivitymanagerd-5.10.2.tar.xz";
+      sha256 = "1x7fc3nszg9fcksyf2c9dyagsa9486ybh6yrrn4c6d6z813479qj";
+      name = "kactivitymanagerd-5.10.2.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kde-cli-tools-5.9.5.tar.xz";
-      sha256 = "196h4gsfqx1338jps1rkvaabi6zmsncv7ywylqvirn6mxrfq7r2n";
-      name = "kde-cli-tools-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kde-cli-tools-5.10.2.tar.xz";
+      sha256 = "0d1vfxgi0anggjirp1ncaqr1l7rlbniiv74gf5npb3f260h6yr0h";
+      name = "kde-cli-tools-5.10.2.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kdecoration-5.9.5.tar.xz";
-      sha256 = "1vjj8gjh8ig0bxbfjjmyga7rl497yzqdprgpqfkg92g9pxhr2lnl";
-      name = "kdecoration-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kdecoration-5.10.2.tar.xz";
+      sha256 = "05mg8aacayfx63mx8yb6g1j6wx7kkk21msl33krks7bdqx0jx9kw";
+      name = "kdecoration-5.10.2.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kde-gtk-config-5.9.5.tar.xz";
-      sha256 = "1aafc9zrraqz9x830v9fgyygsqy17iwr2hf2vrcn2ffhw6ix47cy";
-      name = "kde-gtk-config-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kde-gtk-config-5.10.2.tar.xz";
+      sha256 = "096dfl5nm65v6m4m6r1smwbcxv5fkxnbgrgi17x5lfipa9mmrf58";
+      name = "kde-gtk-config-5.10.2.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kdeplasma-addons-5.9.5.tar.xz";
-      sha256 = "107j3szxslc4cqin2f32y25lbwyi0a6lqsp9739113zr0jjrwlll";
-      name = "kdeplasma-addons-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kdeplasma-addons-5.10.2.tar.xz";
+      sha256 = "1yznzz0yrjckv4b1h58fsn0sww5iwmkqvsajdqhgzqw1cs4v98p0";
+      name = "kdeplasma-addons-5.10.2.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kgamma5-5.9.5.tar.xz";
-      sha256 = "1kzqix97qh17lfz9ksqywmas630aw0z4y44mcwp34w9gp79i5dj5";
-      name = "kgamma5-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kgamma5-5.10.2.tar.xz";
+      sha256 = "0hwnn057jbqpzbp8jryfcdp2qlypmyvh5zmfay8iy9vy068zzcmc";
+      name = "kgamma5-5.10.2.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/khotkeys-5.9.5.tar.xz";
-      sha256 = "05y6kbcbalvlrldm9kfkj9aj0r6nbyj1gbj28g37jv58l6qc75d9";
-      name = "khotkeys-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/khotkeys-5.10.2.tar.xz";
+      sha256 = "1kdvdb5i0mjrv4h4m539kikdrb0vybgphaahxk4392npv2zqz1xs";
+      name = "khotkeys-5.10.2.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kinfocenter-5.9.5.tar.xz";
-      sha256 = "0jbi3qavqwvx691biy8gbq4m2c3ksy6p1hpyi41qaaczksr3fvsg";
-      name = "kinfocenter-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kinfocenter-5.10.2.tar.xz";
+      sha256 = "1r0q8xmb9m0xgcw21a6klagfh560ywzdcnly6r36fpwj0hjv60hj";
+      name = "kinfocenter-5.10.2.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kmenuedit-5.9.5.tar.xz";
-      sha256 = "1mfy1z70zfw3x40h8qjp49i7pp5c5fprh7znwwj4hk2qkn1zrn0j";
-      name = "kmenuedit-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kmenuedit-5.10.2.tar.xz";
+      sha256 = "0dcy5r829dpzfmkqzmcbwxv5bqdamq0lvz7khd0n08f4h7a32wnz";
+      name = "kmenuedit-5.10.2.tar.xz";
     };
   };
   kscreen = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kscreen-5.9.5.tar.xz";
-      sha256 = "1df0h1js6b6060cxm27sp70lvk8fak14ibzzrm6f3yv32wlzxwfi";
-      name = "kscreen-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kscreen-5.10.2.tar.xz";
+      sha256 = "0304vi87xq7p8l6dibgb74dzcf7721nps18cm6p9a05nnlvpr1l7";
+      name = "kscreen-5.10.2.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kscreenlocker-5.9.5.tar.xz";
-      sha256 = "1hf0zgfdgd7vinmbk2k73w6mpfbfv830kqfvw23qk4nrrap131bi";
-      name = "kscreenlocker-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kscreenlocker-5.10.2.tar.xz";
+      sha256 = "079vkca9q509qg5qq4kwlzl3dmnqrigs0xm6vyz000589cpg6ib5";
+      name = "kscreenlocker-5.10.2.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/ksshaskpass-5.9.5.tar.xz";
-      sha256 = "1ilydfc64s2yc5xrqcc0k2s9ijnppql32dkb9cpmwfqi608digi1";
-      name = "ksshaskpass-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/ksshaskpass-5.10.2.tar.xz";
+      sha256 = "1mjbpsaj3qyrd7f5yqnw0y81d8srjjd537sx7yjgvyijaf2v0vyz";
+      name = "ksshaskpass-5.10.2.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/ksysguard-5.9.5.tar.xz";
-      sha256 = "1dhzkm3rc8rl92ym0mampf49p8ippbpfbwcvwzg6rakhxxifd4q6";
-      name = "ksysguard-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/ksysguard-5.10.2.tar.xz";
+      sha256 = "1ndz3l91chq1n3p9xrw57mkdxa7hw778baydk8y9pbdr2yr961cv";
+      name = "ksysguard-5.10.2.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kwallet-pam-5.9.5.tar.xz";
-      sha256 = "0nchpbw5yxy7vsz3mx1mx5hk36yvwqarnzzigssh1kz1r19jn6rn";
-      name = "kwallet-pam-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kwallet-pam-5.10.2.tar.xz";
+      sha256 = "01ki2rfn4sw8m8qh7lwwikcr9kxwiv9x7mv86h86ssd1hfzwzhda";
+      name = "kwallet-pam-5.10.2.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kwayland-integration-5.9.5.tar.xz";
-      sha256 = "07la7q6dvmysdv6clk2siq1c3b9jbx5kblgc5qf3233bg57hqw7r";
-      name = "kwayland-integration-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kwayland-integration-5.10.2.tar.xz";
+      sha256 = "1fna7llnimcqvzhmxb93m92gvicjiddqxd9lwqgyv7fww6bhsj3a";
+      name = "kwayland-integration-5.10.2.tar.xz";
     };
   };
   kwin = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kwin-5.9.5.tar.xz";
-      sha256 = "13f9drny8lxpxmgqmirk7k0zapx6bp74jyxxzh7ii36davlhckjd";
-      name = "kwin-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kwin-5.10.2.tar.xz";
+      sha256 = "1gvby6k865snh6hsrnk53hwhb3242iamclz9nq9fzgy23a6g8mzj";
+      name = "kwin-5.10.2.tar.xz";
     };
   };
   kwrited = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kwrited-5.9.5.tar.xz";
-      sha256 = "1spcsixpcn4g4dm5c1hfqfpkkmma3fgdx0bkm2zzh5q72jzl3bda";
-      name = "kwrited-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kwrited-5.10.2.tar.xz";
+      sha256 = "1hz6p6il839c28bkf2bn9fqjpipiqdxk603v0h0iqvspfj00z7n8";
+      name = "kwrited-5.10.2.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/libkscreen-5.9.5.tar.xz";
-      sha256 = "1sq078ri8vz3s4r606n3i9j9cb4drga2mwwa5glkirnazps32004";
-      name = "libkscreen-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/libkscreen-5.10.2.tar.xz";
+      sha256 = "0w1adz5c32si1kcmxy015wzjxkln68f0inya2499jag2v9hd3vhn";
+      name = "libkscreen-5.10.2.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/libksysguard-5.9.5.tar.xz";
-      sha256 = "0b0lvpss5sdjnxbrwaa5w7x87mzpbk23n2ly5vyg6imcycnxh7kw";
-      name = "libksysguard-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/libksysguard-5.10.2.tar.xz";
+      sha256 = "1x13mb3c5bzbi5nw3ahgy12x1df50qirr2h4c7igacxrv4m3zrih";
+      name = "libksysguard-5.10.2.tar.xz";
     };
   };
   milou = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/milou-5.9.5.tar.xz";
-      sha256 = "1qzqa26sxggpqw4jkrjasf20xfijpjyjg7x96bvbjs1gcp1fi9gw";
-      name = "milou-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/milou-5.10.2.tar.xz";
+      sha256 = "06c4pb3gls1bgk1sffh6vj035i5vhiy04rmifypcp8gps98j6izw";
+      name = "milou-5.10.2.tar.xz";
     };
   };
   oxygen = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/oxygen-5.9.5.tar.xz";
-      sha256 = "0p73dyyg887by1yi8gjaj366l7vm0p19z10m5fkmhylhmzihv4z3";
-      name = "oxygen-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/oxygen-5.10.2.tar.xz";
+      sha256 = "08d3rdj5vabrxrrlbzhw3ixnb3msm99idbhnpyzdkaw00l444f1p";
+      name = "oxygen-5.10.2.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-desktop-5.9.5.tar.xz";
-      sha256 = "1f9mq7q05abj6xgpchzkhghs0mwf7qycjvg3l4c7y7p9hsn3gx71";
-      name = "plasma-desktop-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-desktop-5.10.2.tar.xz";
+      sha256 = "1mjz52n6jm1vi3v7432g9v9rh6bbgcwkrg12yahpzlz026hsyxrn";
+      name = "plasma-desktop-5.10.2.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-integration-5.9.5.tar.xz";
-      sha256 = "05qxrrrfhq0m2xq9ig0cgxrl692hmv9lhckhs22m8a1dppsgv10w";
-      name = "plasma-integration-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-integration-5.10.2.tar.xz";
+      sha256 = "0gzrv3plcn35rkwr7izn0363zbp91rdjw9k8n9s50p9rdx3rx8ly";
+      name = "plasma-integration-5.10.2.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-nm-5.9.5.tar.xz";
-      sha256 = "1bdg7mnfxffzwp7s4hbmk8zj17408fnwj5z4j68l64lbn1lmwq0w";
-      name = "plasma-nm-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-nm-5.10.2.tar.xz";
+      sha256 = "0bw5vyzzvpklhgq02yhcq1sv7pz00kffvgvfjkgk45g5x47h7hw1";
+      name = "plasma-nm-5.10.2.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-pa-5.9.5.tar.xz";
-      sha256 = "0xam3rnd36mvn7021zzs9y5i02ac8c15alnpag8shrsbdv2cbyry";
-      name = "plasma-pa-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-pa-5.10.2.tar.xz";
+      sha256 = "1bbmlp5i2k4ygcn76frijjxzy88v3m5cpydslv7i5y41apm8bvip";
+      name = "plasma-pa-5.10.2.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-sdk-5.9.5.tar.xz";
-      sha256 = "0dvxw7b65pn86qzf9j30c4pw0vi12kasgf7idbgmhzwl17k4i1mx";
-      name = "plasma-sdk-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-sdk-5.10.2.tar.xz";
+      sha256 = "0npccg4zzrd2cx4qa5qi0yr722x2yh8v0zd8dv76znqf8lsgwpj4";
+      name = "plasma-sdk-5.10.2.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-tests-5.9.5.tar.xz";
-      sha256 = "06sn7gz5psmnsilhaprqag2ma03kzj24m7r0gf8wdaqgsla05vwg";
-      name = "plasma-tests-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-tests-5.10.2.tar.xz";
+      sha256 = "1kyah0r138x3i35glb2slacwivdwbwvq19xp1hz2zrmiy52zq65i";
+      name = "plasma-tests-5.10.2.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.9.5.1";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-workspace-5.9.5.1.tar.xz";
-      sha256 = "07lbq3b3h0ibf4xbk4mxyi3kx17wrqv0s1bqf01azm1wgni70xw5";
-      name = "plasma-workspace-5.9.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-workspace-5.10.2.tar.xz";
+      sha256 = "11q1p3ifs2fwrhm8ylvqacshz746dhl68w0s4dfykvr2r7mqqqf2";
+      name = "plasma-workspace-5.10.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-workspace-wallpapers-5.9.5.tar.xz";
-      sha256 = "05k56vsmhxh0wdz9msk1x3lq2dblladl4002111fi9s92hg4dmsn";
-      name = "plasma-workspace-wallpapers-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-workspace-wallpapers-5.10.2.tar.xz";
+      sha256 = "1hsm731fckv5bnl7faz7bbizi80df5zb35hmiz90fhdz4x2i7krp";
+      name = "plasma-workspace-wallpapers-5.10.2.tar.xz";
+    };
+  };
+  plymouth-kcm = {
+    version = "5.10.2";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.10.2/plymouth-kcm-5.10.2.tar.xz";
+      sha256 = "1fxz15yc081i6y3qvpxqy8ca6khm492hxxmji87ds30634d0033a";
+      name = "plymouth-kcm-5.10.2.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.9.5";
+    version = "1-5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/polkit-kde-agent-1-5.9.5.tar.xz";
-      sha256 = "05qzq07g7wb6942p6yyrah37vyadbfyz7akk87zrxwiahiighy42";
-      name = "polkit-kde-agent-1-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/polkit-kde-agent-1-5.10.2.tar.xz";
+      sha256 = "04s9338c8y7krqsp5k812vrwphx0ibplh5gg0w6n38m8am78cxnz";
+      name = "polkit-kde-agent-1-5.10.2.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/powerdevil-5.9.5.tar.xz";
-      sha256 = "0i8rri9ndm9ins4ii4qmdsmjkxqf69xpz85lwcdsv0sci6imxhcz";
-      name = "powerdevil-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/powerdevil-5.10.2.tar.xz";
+      sha256 = "1gw9swqi2wsdb8wbjf3ns7j4bj3a1mc06ynk7xklb7wan5psa9my";
+      name = "powerdevil-5.10.2.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/sddm-kcm-5.9.5.tar.xz";
-      sha256 = "0q0q3c439dbrvb4snfjfymgf8pld26gdqbak4gyp3j7nc2gjisk6";
-      name = "sddm-kcm-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/sddm-kcm-5.10.2.tar.xz";
+      sha256 = "10pg414ddx86nx46zkhl3fbvsijk4sifsh5cim17rp4b5wjay38y";
+      name = "sddm-kcm-5.10.2.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/systemsettings-5.9.5.tar.xz";
-      sha256 = "0xg8y8hpm0v2bflsh6l85yx969jn1nqlszwydp3ryvdwliv5hgg9";
-      name = "systemsettings-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/systemsettings-5.10.2.tar.xz";
+      sha256 = "1p6jg1vaa9svz4liqpb2435wbirdhjsqd6l1qd1lsp1r5szmwpz8";
+      name = "systemsettings-5.10.2.tar.xz";
     };
   };
   user-manager = {
-    version = "5.9.5";
+    version = "5.10.2";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.10.2/user-manager-5.10.2.tar.xz";
+      sha256 = "1ac10z44y7d2n618j04r00cnklxglyk7xdh5vp0pl4zfcm4cx98w";
+      name = "user-manager-5.10.2.tar.xz";
+    };
+  };
+  xdg-desktop-portal-kde = {
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/user-manager-5.9.5.tar.xz";
-      sha256 = "056rnca3v6vs7sjqz9drndir3csz457qkzf30rp0dh5dl9k9cxxn";
-      name = "user-manager-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/xdg-desktop-portal-kde-5.10.2.tar.xz";
+      sha256 = "16qdvds3k4cjv3dvvxr26r5rjnysqabv4zqf18g52z9lsbc46imv";
+      name = "xdg-desktop-portal-kde-5.10.2.tar.xz";
     };
   };
 }
-- 
GitLab


From 359aff876c86b7e38dee5bd952cc6e1a66905046 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 18 Jun 2017 16:59:15 +0800
Subject: [PATCH 0928/1490] plasma-workspace: requires libXtst

---
 pkgs/desktops/plasma-5/plasma-workspace/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 29d92f9a9df..b866ebab0e5 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -3,7 +3,7 @@
 
   extra-cmake-modules, kdoctools,
 
-  isocodes, libdbusmenu, libSM, libXcursor, pam, wayland,
+  isocodes, libdbusmenu, libSM, libXcursor, libXtst, pam, wayland,
 
   baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
   kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
@@ -19,8 +19,9 @@ mkDerivation {
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    isocodes libdbusmenu libSM libXcursor pam wayland
-
+    isocodes libdbusmenu libSM libXcursor libXtst pam wayland
+  ];
+  propagatedBuildInputs = [
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
     knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
-- 
GitLab


From d454675ef6e6d06a933ce471c3ff69643138a1a8 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 01:42:55 +0200
Subject: [PATCH 0929/1490] faust: 2.0.a51 -> 2.1.0

---
 pkgs/applications/audio/faust/faust2.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 6289688c53c..274f7c9c3b8 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -1,6 +1,6 @@
 { stdenv
 , coreutils
-, fetchurl
+, fetchFromGitHub
 , makeWrapper
 , pkgconfig
 , clang
@@ -16,11 +16,13 @@ with stdenv.lib.strings;
 
 let
 
-  version = "2.0.a51";
+  version = "2.1.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz";
-    sha256 = "1yryjqfqmxs7lxy95hjgmrncvl9kig3rcsmg0v49ghzz7vs7haxf";
+  src = fetchFromGitHub {
+    owner = "grame-cncm";
+    repo = "faust";
+    rev = "v${builtins.replaceStrings ["."] ["-"] version}";
+    sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m";
   };
 
   meta = with stdenv.lib; {
@@ -67,7 +69,7 @@ let
       #
       # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION
       # to something the makefile will recognize.
-      sed '52iLLVM_VERSION=3.8.0' -i compiler/Makefile.unix
+      sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix
     '';
 
     # Remove most faust2appl scripts since they won't run properly
@@ -194,8 +196,8 @@ let
         # export parts of the build environment
         for script in "$out"/bin/*; do
           wrapProgram "$script" \
-            --set FAUSTLIB "${faust}/lib/faust" \
-            --set FAUST_LIB_PATH "${faust}/lib/faust" \
+            --set FAUSTLIB "${faust}/share/faust" \
+            --set FAUST_LIB_PATH "${faust}/share/faust" \
             --set FAUSTINC "${faust}/include/faust" \
             --prefix PATH : "$PATH" \
             --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
-- 
GitLab


From c1e5ca92b774325f6779bda203e3c04e60ed087d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 16 Jun 2017 20:25:05 +0200
Subject: [PATCH 0930/1490] aws-sdk-cpp: Better fix for the failing credentials
 test

---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 434c685e823..974989dc24b 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -43,8 +43,11 @@ in stdenv.mkDerivation rec {
       for i in testing-resources aws-cpp-sdk-*; do
         export ${loaderVar}=$(pwd)/$i:''${${loaderVar}}
       done
+    '';
 
-      export HOME=$TMPDIR
+  preConfigure =
+    ''
+      rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
     '';
 
   NIX_LDFLAGS = lib.concatStringsSep " " (
-- 
GitLab


From d7d6bacfbb377de21fa4c56d34526ab7a4c9496f Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Mon, 19 Jun 2017 13:10:35 +0300
Subject: [PATCH 0931/1490] rust-bindgen: 0.24.0 -> 0.25.5

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

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 79c400fd334..6ac192e6375 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -4,13 +4,13 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.24.0";
+  version = "0.25.5";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "1nzva8g5nj7m2w8vax86p4rd02ci8793nhnm7sf76ajr4hfnx323";
+    sha256 = "0hv90h279frbxjay5g5vphds6wj3fiid9f2vmg1nr8887y4nif0k";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib"
   '';
 
-  depsSha256 = "1l8c48y67azzwmv4hzghia1c53b5dw6qiv22cgv8zbyrg20aj8as";
+  depsSha256 = "0ylm1wzf9aqcyfmmgpb18bdp5c5d73pnnjw13cv373511mkj1y0m";
 
   doCheck = false; # A test fails because it can't find standard headers in NixOS
 
-- 
GitLab


From 9ea503fa55763f52b5a750fd440e270fb41326c1 Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Mon, 19 Jun 2017 13:24:46 +0200
Subject: [PATCH 0932/1490] python-modules/protobuf: fix darwin build by
 passing C++ includes explicitly

Fixes #26531.

Copies the matplotlib solution, as mentioned by @knedlsepp.
---
 pkgs/development/python-modules/protobuf.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix
index f2f0f5025d1..44b9ed70a18 100644
--- a/pkgs/development/python-modules/protobuf.nix
+++ b/pkgs/development/python-modules/protobuf.nix
@@ -1,5 +1,5 @@
 { stdenv, python, buildPythonPackage
-, protobuf, google_apputils, pyext
+, protobuf, google_apputils, pyext, libcxx
 , disabled, doCheck ? true }:
 
 with stdenv.lib;
@@ -8,6 +8,9 @@ buildPythonPackage rec {
   inherit (protobuf) name src;
   inherit disabled doCheck;
 
+  # work around python distutils compiling C++ with $CC
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+
   propagatedBuildInputs = [ protobuf google_apputils ];
   buildInputs = [ google_apputils pyext ];
 
-- 
GitLab


From 63011015b93986a98760b7553cf0a8938d1d74bb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Jun 2017 19:26:13 +0800
Subject: [PATCH 0933/1490] virtmanager-qt: 0.43.70.2 -> 0.43.72

---
 pkgs/applications/virtualization/virt-manager/qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 783a424e18c..fe885d86456 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   name = "virt-manager-qt-${version}";
-  version = "0.43.70.2";
+  version = "0.43.72";
 
   src = fetchFromGitHub {
     owner  = "F1ash";
     repo   = "qt-virt-manager";
     rev    = "${version}";
-    sha256 = "06123bywzgs5y2yskqm8qypj9diym5xip2bdlghfhw30957pcxxg";
+    sha256 = "0m8aqs58wnk404z2hav5j4yjsy8f0vfsm771pm0gprsfbx4sm3qg";
   };
 
   cmakeFlags = [
-- 
GitLab


From 392f4acee9b1ed4ef6a6b617932be8dd5b1cba71 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Jun 2017 12:31:26 +0800
Subject: [PATCH 0934/1490] kde-applications: fix command in doc

---
 pkgs/applications/kde/fetch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index d0f31d6a2a5..c270e196f8c 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/17.04.1/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' )
-- 
GitLab


From 9193bcb6b4488a768ca96dc542f16866758a4b74 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Jun 2017 12:31:42 +0800
Subject: [PATCH 0935/1490] kde-applications: 17.04.1 -> 17.04.2

use https as the remote server expects it
---
 pkgs/applications/kde/default.nix             |    2 +-
 pkgs/applications/kde/fetch.sh                |    2 +-
 pkgs/applications/kde/srcs.nix                | 2232 ++++++++---------
 pkgs/desktops/plasma-5/fetch.sh               |    2 +-
 .../libraries/kde-frameworks/fetch.sh         |    2 +-
 5 files changed, 1120 insertions(+), 1120 deletions(-)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index d8b8c4242cb..207228a65b0 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -18,7 +18,7 @@ still shows most of the available features is in `./gwenview.nix`.
 # Updates
 
 1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde`
    from the top of the Nixpkgs tree.
 3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index c270e196f8c..ad521a2b038 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index fa8bfa687e1..0fa168e0a23 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
 
 {
   akonadi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-17.04.1.tar.xz";
-      sha256 = "0dsxbc03rwd3rrcq4kvadcfwbfgpbgl41735j68mhb9y8gfdniyj";
-      name = "akonadi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-17.04.2.tar.xz";
+      sha256 = "08b3xyrff3y3s3c39l1fv3i55rdz6fq9mrsi3g80vs4i4x70f46d";
+      name = "akonadi-17.04.2.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-calendar-17.04.1.tar.xz";
-      sha256 = "1xcmy0a305r94yns9mq2fcm9aix1djdk7xc73kfxs5n1jk5w44pl";
-      name = "akonadi-calendar-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-17.04.2.tar.xz";
+      sha256 = "17nx990k3l0mgwssrdg9avvp4yf6ichakx0cq4yg4mif5rc4angd";
+      name = "akonadi-calendar-17.04.2.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-calendar-tools-17.04.1.tar.xz";
-      sha256 = "1aslp4grljmn19zxxcfwylwsifimbgvj4r1zjnwfd9mx1d8m60cm";
-      name = "akonadi-calendar-tools-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-tools-17.04.2.tar.xz";
+      sha256 = "1qbj5fkzia0bjzyv8mybqf2gg917dyjqmiywf4asr0xlqxwydccj";
+      name = "akonadi-calendar-tools-17.04.2.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadiconsole-17.04.1.tar.xz";
-      sha256 = "14hybly50bckpjam7f9fndqgj99pwinc5cm7z62bj5d76r5bma7c";
-      name = "akonadiconsole-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadiconsole-17.04.2.tar.xz";
+      sha256 = "00wps8p6094bywkc6yrh9rpqp0q49nq68kmnbm7jqd9k07g93mxz";
+      name = "akonadiconsole-17.04.2.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-contacts-17.04.1.tar.xz";
-      sha256 = "0ab3i5aw38igi32zqw6i7lcqbhmac9flr1m5mqsrjb50m40xd5sk";
-      name = "akonadi-contacts-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-contacts-17.04.2.tar.xz";
+      sha256 = "0fnmfcfxzjghfh3plliksa7sffjy8m2hif1s8gsdv2bl5v13gxbz";
+      name = "akonadi-contacts-17.04.2.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-import-wizard-17.04.1.tar.xz";
-      sha256 = "1a7a0fm7y97znja3wpx49lpz4m8351ybf3bqragklkjp9649j2j3";
-      name = "akonadi-import-wizard-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-import-wizard-17.04.2.tar.xz";
+      sha256 = "0wg1nnrfafmpdb0li7d9i3qfdam4v2ybkbrbwgdwiawdqs9znaaa";
+      name = "akonadi-import-wizard-17.04.2.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-mime-17.04.1.tar.xz";
-      sha256 = "0g4mb0y0npn4cplw64dwm6qyjrvrdj8af229nv7zhlkdw74x1xhf";
-      name = "akonadi-mime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-mime-17.04.2.tar.xz";
+      sha256 = "1ariwnjgsyccfa3iky3sf8lz08hv44jd6xa4hjfyz4bkp822grld";
+      name = "akonadi-mime-17.04.2.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-notes-17.04.1.tar.xz";
-      sha256 = "0ycw2cync7r03vvpcx9640dv9j66fala2060dawsv5xynr3x4qcq";
-      name = "akonadi-notes-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-notes-17.04.2.tar.xz";
+      sha256 = "00p7sksfid7lln43f65jna8dr4w47wkxqyls2gzbgnblpd7m2rqg";
+      name = "akonadi-notes-17.04.2.tar.xz";
     };
   };
   akonadi-search = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-search-17.04.1.tar.xz";
-      sha256 = "0jrphb4s8i4rij88s1l4vvx3nk8giw5hshpd1ad69nabdb60flvk";
-      name = "akonadi-search-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-search-17.04.2.tar.xz";
+      sha256 = "111r1fplrd13xb7s36cm9bk5zkj8ap33d252xarwmzpj51q0l3vh";
+      name = "akonadi-search-17.04.2.tar.xz";
     };
   };
   akregator = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akregator-17.04.1.tar.xz";
-      sha256 = "1i3d59fcd6ca1pw52np540dbkhka2xsczxilqb21rlqji2a9v7vz";
-      name = "akregator-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akregator-17.04.2.tar.xz";
+      sha256 = "0ngpw432pm57p34y4wcvrxlrlmixlgrpqawgn2b73dhvb2m8ypvy";
+      name = "akregator-17.04.2.tar.xz";
     };
   };
   analitza = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/analitza-17.04.1.tar.xz";
-      sha256 = "1zjz7dy4ihicirwfkz7zfg5w4gm8avgps9qamvggy6h1j027wp6i";
-      name = "analitza-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/analitza-17.04.2.tar.xz";
+      sha256 = "0qs2mp7nlca9y8lpycwfsmdd33ficz36z2fbmqzqm837w1r5jplp";
+      name = "analitza-17.04.2.tar.xz";
     };
   };
   ark = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ark-17.04.1.tar.xz";
-      sha256 = "08rjkm6k1vl29svh7vqp56yr2fns6m51blspjyyf08hsm9bxqhmn";
-      name = "ark-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ark-17.04.2.tar.xz";
+      sha256 = "0zdyxd7ghwrj48avyqv4q6dpyrxryzrg8v5ljwwsizlb7lp25afx";
+      name = "ark-17.04.2.tar.xz";
     };
   };
   artikulate = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/artikulate-17.04.1.tar.xz";
-      sha256 = "11xyiclc47mdh89in3lhapxn7kr54bzc58jx3nxb85vsyxvpmy5k";
-      name = "artikulate-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/artikulate-17.04.2.tar.xz";
+      sha256 = "0rjqpn8aa0y3v2940qgfxl9xdrls1jw6yfvgqdsicrhd9qwpr6i2";
+      name = "artikulate-17.04.2.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/audiocd-kio-17.04.1.tar.xz";
-      sha256 = "07b9k4nry6825yd0fmaib39wfxfzh63vilm2x8j2irw8bs2j9ban";
-      name = "audiocd-kio-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/audiocd-kio-17.04.2.tar.xz";
+      sha256 = "0h6zvlhyi9dxmcxgcnn12pj056r62a6389nd9dnqzcc3m7jp0ypi";
+      name = "audiocd-kio-17.04.2.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/baloo-widgets-17.04.1.tar.xz";
-      sha256 = "0sc0iysxcxwqjpkvdbxrpvw01pr86jzimf89l1px4v2q36x1s61s";
-      name = "baloo-widgets-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/baloo-widgets-17.04.2.tar.xz";
+      sha256 = "1fspq5n53zgnwpvnq0z9g77xhfspd3indcvim8j8ls5qhmn4c8g9";
+      name = "baloo-widgets-17.04.2.tar.xz";
     };
   };
   blinken = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/blinken-17.04.1.tar.xz";
-      sha256 = "1mip3j21d9m16cj5km08k45svqb8ax7qz3dsdljia5q04x0lxibl";
-      name = "blinken-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/blinken-17.04.2.tar.xz";
+      sha256 = "12pzbgxhdrzjnzg02hd96pxcqpjnzfrlv2bjpkpzb7ng70wb50ia";
+      name = "blinken-17.04.2.tar.xz";
     };
   };
   blogilo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/blogilo-17.04.1.tar.xz";
-      sha256 = "1r5i5877aywmgk4pw194ha534wamj79zgky2xb0qgd7s1qvgi6m8";
-      name = "blogilo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/blogilo-17.04.2.tar.xz";
+      sha256 = "14pn6l2qvgf7ab05i93lnhm6fjhy41xwnxa5v7an7xc8ismi5ric";
+      name = "blogilo-17.04.2.tar.xz";
     };
   };
   bomber = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/bomber-17.04.1.tar.xz";
-      sha256 = "0iy0y3wwdlgskg2lgnfi678y9rnix8w13piqc1hyj31ad77nld4c";
-      name = "bomber-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/bomber-17.04.2.tar.xz";
+      sha256 = "19c5ak9cw3ybcvw21rzjh7k0q7g1j9dv060pvjdfsphfyzkym5m3";
+      name = "bomber-17.04.2.tar.xz";
     };
   };
   bovo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/bovo-17.04.1.tar.xz";
-      sha256 = "0bh3q7dgimi4mnb7bh3viiwyj68r9fvkwd3va56znl9j97ggjl2p";
-      name = "bovo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/bovo-17.04.2.tar.xz";
+      sha256 = "0z4ajphzrnag1zqv3d9i6cvrfn5b74sklacxhn09hgjgx6ihps77";
+      name = "bovo-17.04.2.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/calendarsupport-17.04.1.tar.xz";
-      sha256 = "0h3p5l3xw0jjcz22f8wz57xy9q5k32asl4xq57j7k4bg4rn0cbhq";
-      name = "calendarsupport-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/calendarsupport-17.04.2.tar.xz";
+      sha256 = "1n2nb15fn3v6hlp8ya3ah3pdyjjss1632a51k696lg474dhxvlzk";
+      name = "calendarsupport-17.04.2.tar.xz";
     };
   };
   cantor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/cantor-17.04.1.tar.xz";
-      sha256 = "140rhfd2yi4blikj1ybqkvfwvzd7i1hm4qgpd25jv3n1hc0i9b41";
-      name = "cantor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/cantor-17.04.2.tar.xz";
+      sha256 = "0811770qn76ri11mgx2pac7vg67mj5qg3v3zhx4ym3f072lfp57i";
+      name = "cantor-17.04.2.tar.xz";
     };
   };
   cervisia = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/cervisia-17.04.1.tar.xz";
-      sha256 = "0fps66icbkns0r4qvzs50772f9nd8ydkali8695vwza4b5mixgvr";
-      name = "cervisia-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/cervisia-17.04.2.tar.xz";
+      sha256 = "1gar8rx9vknpc7fnwlg7kvwj90wv9wd8c3dd59fj55d9fpwin3qg";
+      name = "cervisia-17.04.2.tar.xz";
     };
   };
   dolphin = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/dolphin-17.04.1.tar.xz";
-      sha256 = "1rrb6ncyykf0dj3fx9qzpcac2yn12rrxnkpnnaiw84aqxdg0gbi7";
-      name = "dolphin-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/dolphin-17.04.2.tar.xz";
+      sha256 = "1yd0fawz9n64gsd868qzp424h653f5lf22r5mf116bkgxia59b25";
+      name = "dolphin-17.04.2.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/dolphin-plugins-17.04.1.tar.xz";
-      sha256 = "0nr82063805axbhmisim97w4zzvi30jp0a0q7xxgnrp80b89zqam";
-      name = "dolphin-plugins-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/dolphin-plugins-17.04.2.tar.xz";
+      sha256 = "1h8g962pmpwahhrnzzd7x15j7p3bcxg92csfkd0y2mn6pfl9zb5s";
+      name = "dolphin-plugins-17.04.2.tar.xz";
     };
   };
   dragon = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/dragon-17.04.1.tar.xz";
-      sha256 = "1wlf9z4qqhvg60x5x3k813k1lhvhkn25dsifwjprg6239fhayy7p";
-      name = "dragon-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/dragon-17.04.2.tar.xz";
+      sha256 = "0yp0bswjq9zymczyscy3y186d7g921jmah6i5wd36j1vgff3i0ry";
+      name = "dragon-17.04.2.tar.xz";
     };
   };
   eventviews = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/eventviews-17.04.1.tar.xz";
-      sha256 = "01nsj4mzz5ck677zma3zhz0gq9bnx7il8mhgrnwk5gjkr7hdnzhh";
-      name = "eventviews-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/eventviews-17.04.2.tar.xz";
+      sha256 = "0rf87q002ax5r6qh99hmbdrm528grw3ib5zi5pnjai3l403vd6g6";
+      name = "eventviews-17.04.2.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ffmpegthumbs-17.04.1.tar.xz";
-      sha256 = "0wa1k1ns8jxywkrvzbdy1av4lb21r7pb23i7gac7l2508gmdsy3n";
-      name = "ffmpegthumbs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ffmpegthumbs-17.04.2.tar.xz";
+      sha256 = "02i9x2amkwc40a7fpk939spgwbrcfm1s9swgmp1wzyg7arrf4qz3";
+      name = "ffmpegthumbs-17.04.2.tar.xz";
     };
   };
   filelight = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/filelight-17.04.1.tar.xz";
-      sha256 = "0hfa1c2c81jfxgfgr68dkacgbikpymyhb4n2kg9ld5710zid02bd";
-      name = "filelight-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/filelight-17.04.2.tar.xz";
+      sha256 = "0wpcmk6i8hfalzymj8m1hsg1qi2hil8x51nvxg0c55x1cqg6k9a0";
+      name = "filelight-17.04.2.tar.xz";
     };
   };
   granatier = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/granatier-17.04.1.tar.xz";
-      sha256 = "0dyj49x1rfcxr1wpmkzcwl2nnxvpx7j3b3n9kd5m0ggql3xq6wl7";
-      name = "granatier-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/granatier-17.04.2.tar.xz";
+      sha256 = "0bxf4cv1351bzz3yafdadih8bdcjjn0119zazmll2jjdnh4qiq0z";
+      name = "granatier-17.04.2.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/grantlee-editor-17.04.1.tar.xz";
-      sha256 = "00hbymma9b836a5313aj6k29cyzivzf1j0izxyd3xdwk1lzcxpyx";
-      name = "grantlee-editor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/grantlee-editor-17.04.2.tar.xz";
+      sha256 = "1sjrsljp0g53gi4vlcmz6r9k657k4wr1l10743sfmg268skvs84b";
+      name = "grantlee-editor-17.04.2.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/grantleetheme-17.04.1.tar.xz";
-      sha256 = "0sl01blx5wba6y492fazk1srm60hyjqggwglx9cxpf9kyy0480f7";
-      name = "grantleetheme-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/grantleetheme-17.04.2.tar.xz";
+      sha256 = "102a49ifkvjpz2703fr6dv45ksyg7y1yjc6xm0im95vb66aw3cb5";
+      name = "grantleetheme-17.04.2.tar.xz";
     };
   };
   gwenview = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/gwenview-17.04.1.tar.xz";
-      sha256 = "04fh4x15w1f5afscn70ayd87q8hr4jdcj2l3j4bw4s9zbl1rbmch";
-      name = "gwenview-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/gwenview-17.04.2.tar.xz";
+      sha256 = "0x9pxw33ahzn0h4klgiw7ifcgkdwv7l1zzfapbh9gr9h3rbrpsra";
+      name = "gwenview-17.04.2.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/incidenceeditor-17.04.1.tar.xz";
-      sha256 = "0mhkqyhwnjpjlcqvlcff10rdyismr7n08vyhkv4xgvwxpin5rwcd";
-      name = "incidenceeditor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/incidenceeditor-17.04.2.tar.xz";
+      sha256 = "1qhkmw6n402xnv5ggpfp586gii5z6r5gqmgfd0jzxlnygslqd784";
+      name = "incidenceeditor-17.04.2.tar.xz";
     };
   };
   jovie = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/jovie-17.04.1.tar.xz";
-      sha256 = "0kip2736g5bw92i6x0ivm4hjb7dkdmipprrn6k3m0r72ib3k98a5";
-      name = "jovie-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/jovie-17.04.2.tar.xz";
+      sha256 = "0mcv00hk1h1hl7hg4n2pcbsjw1g21k98fls7424jjh6vgvarbxmg";
+      name = "jovie-17.04.2.tar.xz";
     };
   };
   juk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/juk-17.04.1.tar.xz";
-      sha256 = "0bi37n7wlfwxmy1r4b5cv1729p1331dwpasl8hwh295z6s1fgwjn";
-      name = "juk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/juk-17.04.2.tar.xz";
+      sha256 = "01lsmfd5h1km5w9xz9bwh07qvxlgh2j8nl638bxx6k9vydg53gll";
+      name = "juk-17.04.2.tar.xz";
     };
   };
   k3b = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/k3b-17.04.1.tar.xz";
-      sha256 = "0mxwja0fdk55x2bq7vgwgpgankfryzdzankx4xj8jxcvz5xhzn1v";
-      name = "k3b-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/k3b-17.04.2.tar.xz";
+      sha256 = "1yv2rgwsvabyj7pj91yir6zj7bc4n9psazg0q658pyqbdkgwrkx8";
+      name = "k3b-17.04.2.tar.xz";
     };
   };
   kaccessible = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kaccessible-17.04.1.tar.xz";
-      sha256 = "1qr4vif0a5427d7mrgn0fyq1dkjpqy0fvalbwxca6ax0rgkjixn2";
-      name = "kaccessible-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kaccessible-17.04.2.tar.xz";
+      sha256 = "00m2ya93isyhr9cbx7fa79pi1iqnj5nqqnjmh8kqx9abkpvy2yff";
+      name = "kaccessible-17.04.2.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kaccounts-integration-17.04.1.tar.xz";
-      sha256 = "1zizqd2smr00nyvl55g5w3g21h2zfjz4f6vybwav3s4kwmixzp49";
-      name = "kaccounts-integration-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kaccounts-integration-17.04.2.tar.xz";
+      sha256 = "0wrfyfczm92qz0w6gyvaac8n0763fviglji7ls73y0gy7xm1lfmj";
+      name = "kaccounts-integration-17.04.2.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kaccounts-providers-17.04.1.tar.xz";
-      sha256 = "1zp6rj0wz4wdx0sph3abz4k3rqzrgj301rq74ijgjx0qf0w5z1mg";
-      name = "kaccounts-providers-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kaccounts-providers-17.04.2.tar.xz";
+      sha256 = "0y2y231f0xyysxnwdprlffp3m4wxyxabc2d4j8sr9w9gn0qfzdkj";
+      name = "kaccounts-providers-17.04.2.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kaddressbook-17.04.1.tar.xz";
-      sha256 = "14hd7vaznw3k7znlvi8mly9gq4gcqd1mrfb3in8hxp9vh8w2bxbr";
-      name = "kaddressbook-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kaddressbook-17.04.2.tar.xz";
+      sha256 = "0y44b3wwpgpzim3an8kvrhqnw1wg0m2fcmanm2sj9vvccayy9fl6";
+      name = "kaddressbook-17.04.2.tar.xz";
     };
   };
   kajongg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kajongg-17.04.1.tar.xz";
-      sha256 = "0n7xq1jqa7slh7537my13mhym8fzbvzs0qj07acwrgi278x6pq2x";
-      name = "kajongg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kajongg-17.04.2.tar.xz";
+      sha256 = "08wzxkhfwagh2awcs4wdg56ks628bwysim5whwhrvw3rzc30v2ig";
+      name = "kajongg-17.04.2.tar.xz";
     };
   };
   kalarm = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kalarm-17.04.1.tar.xz";
-      sha256 = "1vprwk17b6gyxdsf8wgcmayvy4ryi2rdq0bwxhmlv8a1zhpbra4r";
-      name = "kalarm-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kalarm-17.04.2.tar.xz";
+      sha256 = "0km7fzhd8iskg4bkn6x62y9pgcvq8zwrjk3w7qvrx5j6dszjw11w";
+      name = "kalarm-17.04.2.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kalarmcal-17.04.1.tar.xz";
-      sha256 = "0bj1sgfavm7hcmr0rz4i9cn2xhr36yksllxfc1i1dys5b1ag13gr";
-      name = "kalarmcal-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kalarmcal-17.04.2.tar.xz";
+      sha256 = "0rca71h85rd88fkx0pkxj40c8fnyiwfcnvmczkd9xb729hvrfblk";
+      name = "kalarmcal-17.04.2.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kalgebra-17.04.1.tar.xz";
-      sha256 = "1dg6rylry1nfri8ffzg7szkcl3ffzh482lnbri8zbrnly551g6mk";
-      name = "kalgebra-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kalgebra-17.04.2.tar.xz";
+      sha256 = "12496gk238ipi2zmxx4njwc58mx9q3w463qp9ji23abv3c59g44f";
+      name = "kalgebra-17.04.2.tar.xz";
     };
   };
   kalzium = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kalzium-17.04.1.tar.xz";
-      sha256 = "0mg4kypwy1mmx87zbmqgla9mqq1pbv6ac59pqwxw6bkb8k37ya8z";
-      name = "kalzium-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kalzium-17.04.2.tar.xz";
+      sha256 = "0gckmnbgym09kq53q0n3jsqfiaz4g7235ylpnwsaids3243jpa06";
+      name = "kalzium-17.04.2.tar.xz";
     };
   };
   kamera = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kamera-17.04.1.tar.xz";
-      sha256 = "04smnjlq28k6x4z0sgxj2jgvn2gr240zsgp39ylnxhaddy94xmaw";
-      name = "kamera-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kamera-17.04.2.tar.xz";
+      sha256 = "1ikniri791v63zzsng7yjvdil6vz08cw2iz9f0dwxzldlwws41j6";
+      name = "kamera-17.04.2.tar.xz";
     };
   };
   kanagram = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kanagram-17.04.1.tar.xz";
-      sha256 = "0g9kkvxfi66sn1a3mywvbncda4q58y3qkkrjn3kw830xwqlk8sa0";
-      name = "kanagram-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kanagram-17.04.2.tar.xz";
+      sha256 = "06yqc197yzzzzga45db8i05q2yr4jyjf5bvry0k22nss3wgsy8mk";
+      name = "kanagram-17.04.2.tar.xz";
     };
   };
   kapman = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kapman-17.04.1.tar.xz";
-      sha256 = "0g04la8fpbcvrlpk4xr1y1i2c4dmka3fj87fi0nvl9p2gnjp569h";
-      name = "kapman-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kapman-17.04.2.tar.xz";
+      sha256 = "15yyp69m096wbmpi52fi2ca6i83w0agjgsy1j6qiy6ki0fj2xyry";
+      name = "kapman-17.04.2.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kapptemplate-17.04.1.tar.xz";
-      sha256 = "1pvnlay791mpfvpjmgzbrfvb3yd20y58awar86dm1ylqwm0mm7vs";
-      name = "kapptemplate-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kapptemplate-17.04.2.tar.xz";
+      sha256 = "0v5v6m0z7jgq5lzlpa3qkza3s0amx6xikwcg1lbzivnwfjvyb9nj";
+      name = "kapptemplate-17.04.2.tar.xz";
     };
   };
   kate = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kate-17.04.1.tar.xz";
-      sha256 = "1lpz5aw0qf4hvk4ph9dqxjywsc772xr5xdhagmn7ghp2hk1ydvil";
-      name = "kate-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kate-17.04.2.tar.xz";
+      sha256 = "1bya5xh57icsbx9jmk5w330xm97bjs3amvlnj0i8rplawjzcai8h";
+      name = "kate-17.04.2.tar.xz";
     };
   };
   katomic = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/katomic-17.04.1.tar.xz";
-      sha256 = "0widwj9qpai0ir97gz58kc43752dskylrs5dflsv9agrjld3cplk";
-      name = "katomic-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/katomic-17.04.2.tar.xz";
+      sha256 = "06bdvc8nckckd3rin7q7cjajxv0yzsq6m1jwzmyh90mm2sbq5g0j";
+      name = "katomic-17.04.2.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kblackbox-17.04.1.tar.xz";
-      sha256 = "02k53virnylfsm79cn7995qcdpl5hbnj325j6fbfhqb0c5420gcw";
-      name = "kblackbox-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kblackbox-17.04.2.tar.xz";
+      sha256 = "1z6ladzhd1mgcqv0y199wv3dafpmy7h6yfgy7hgl26pqgw2qpz9z";
+      name = "kblackbox-17.04.2.tar.xz";
     };
   };
   kblocks = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kblocks-17.04.1.tar.xz";
-      sha256 = "17nb3k4skarnzzz9xlw8iyviws9avlka6fs20ziigza7ickk9r8l";
-      name = "kblocks-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kblocks-17.04.2.tar.xz";
+      sha256 = "0a3d4q2kph192zp6lcm2wxh8f55s3wj3wvxvfjk3v5vwjld6a298";
+      name = "kblocks-17.04.2.tar.xz";
     };
   };
   kblog = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kblog-17.04.1.tar.xz";
-      sha256 = "15hf4y2s25kvdn6wbck116xp6jaxn86h53plkxirjczszfwg3dyj";
-      name = "kblog-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kblog-17.04.2.tar.xz";
+      sha256 = "1w97qkp2mwf7wqjwrrq94sah32cdybgxp2rzs5ypwaszka77xcd9";
+      name = "kblog-17.04.2.tar.xz";
     };
   };
   kbounce = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kbounce-17.04.1.tar.xz";
-      sha256 = "0yjmh48x6gsrc6kplc8yii49cp9lwyafc48vmnhmjdda5akwiqvz";
-      name = "kbounce-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kbounce-17.04.2.tar.xz";
+      sha256 = "1mgbjgbp2wmghvjgyf1s3gjwnwg4c8h6ni01mazqv8jlf0v14g1j";
+      name = "kbounce-17.04.2.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kbreakout-17.04.1.tar.xz";
-      sha256 = "15avdlg6mnzanq7lpygwcsykzjh1w7k3niwkiw3d9x9mc80sbw9h";
-      name = "kbreakout-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kbreakout-17.04.2.tar.xz";
+      sha256 = "1pydl6p7f8f1jxd6k8d563wwigx52fg850d2x736wzw1nk4vwg8b";
+      name = "kbreakout-17.04.2.tar.xz";
     };
   };
   kbruch = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kbruch-17.04.1.tar.xz";
-      sha256 = "1lj2sx6627a99yikz55wkr29mdjdywb5ipdimck8g5lfw125micw";
-      name = "kbruch-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kbruch-17.04.2.tar.xz";
+      sha256 = "0kpzqlnx3wzygnna5l1rssclz9fkvl6mzr5jnr730d5c3r7hymby";
+      name = "kbruch-17.04.2.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcachegrind-17.04.1.tar.xz";
-      sha256 = "0y0qx773fjqfvrnp0625hcxhzs0f318580m92n09spgc71x5b9zf";
-      name = "kcachegrind-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcachegrind-17.04.2.tar.xz";
+      sha256 = "148wmzq482jarpg0sywdlrjc0bgb2vkg0g2pn7wqj1czijs5l0rv";
+      name = "kcachegrind-17.04.2.tar.xz";
     };
   };
   kcalc = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcalc-17.04.1.tar.xz";
-      sha256 = "1fsd3rspdjwf3q4rh76wpqp8aw3r0fiidjg5qhxm1w1gzsygmvvy";
-      name = "kcalc-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcalc-17.04.2.tar.xz";
+      sha256 = "03lzvhs4kyj9cvhw6kh1xmhs2r9vaa4a9ibqnkjb6xx1nx4cpm84";
+      name = "kcalc-17.04.2.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcalcore-17.04.1.tar.xz";
-      sha256 = "0bl4qykivavzyvcdd74s47p40bl4mghgyjd15hkarsg875h5867s";
-      name = "kcalcore-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcalcore-17.04.2.tar.xz";
+      sha256 = "05v1w8k70cdvvw5kv4994llbifrq2almir74i44v4i1449x7ziqn";
+      name = "kcalcore-17.04.2.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcalutils-17.04.1.tar.xz";
-      sha256 = "1xpq3kb4vwx71l4yxm2676rj7s1vv5vkp3c6swq42hpfyvv2h8iq";
-      name = "kcalutils-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcalutils-17.04.2.tar.xz";
+      sha256 = "1hj3k4lqj019cy8p7j6f20lkc75g8wma1p8vwynzlclnz43bsikp";
+      name = "kcalutils-17.04.2.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcharselect-17.04.1.tar.xz";
-      sha256 = "0q5zmqbhchj2j8l8a17n0sf59apmwg5pyac7n8wp1y9bamli51w1";
-      name = "kcharselect-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcharselect-17.04.2.tar.xz";
+      sha256 = "1xw5sd93zkkkp3v75p718bwrd9m391pryb12slrk66nsq1lbw1wn";
+      name = "kcharselect-17.04.2.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcolorchooser-17.04.1.tar.xz";
-      sha256 = "1l2f61f81kagfpxkpl5pka603j4f7qcx4sndzcqjbir6wa505h1d";
-      name = "kcolorchooser-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcolorchooser-17.04.2.tar.xz";
+      sha256 = "156w22x3hx244l6v1zlndl45bxq25nnagji6zl0jspsa4csbzfrn";
+      name = "kcolorchooser-17.04.2.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcontacts-17.04.1.tar.xz";
-      sha256 = "0wcgqdkz2xil699jy7jmkywih7wc9p4b2z7xjbwwxb77dfvrk1gp";
-      name = "kcontacts-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcontacts-17.04.2.tar.xz";
+      sha256 = "0nj7kff7yk7pbmq8g65qpj4g489mxfgwh8axbxsz8z31fgsg1i7s";
+      name = "kcontacts-17.04.2.tar.xz";
     };
   };
   kcron = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcron-17.04.1.tar.xz";
-      sha256 = "1pvfsyqc73gswiwc8m5d6iiw1jsmjksybzqdqhc8c80ykdvg3iwq";
-      name = "kcron-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcron-17.04.2.tar.xz";
+      sha256 = "1k3ya01icz65zyl33p3668p6ivkrlfpp95aydfmnfcd2q365vksx";
+      name = "kcron-17.04.2.tar.xz";
     };
   };
   kdav = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdav-17.04.1.tar.xz";
-      sha256 = "06a5v505sdqh58vmgxq9pbqk1v773mlh2b9ikj8spc270y228frk";
-      name = "kdav-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdav-17.04.2.tar.xz";
+      sha256 = "0yhjl9p4rnd6r5jwscxhwgv9d2xkj34mx4hh3rk4mc28bhy3yw9w";
+      name = "kdav-17.04.2.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdebugsettings-17.04.1.tar.xz";
-      sha256 = "1h9iswm306ipx5dk3f6d89dfj0g1819nxjkap03h0b4819xk653s";
-      name = "kdebugsettings-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdebugsettings-17.04.2.tar.xz";
+      sha256 = "1c05zh66ahnm1ann35bm9q93lg6cylrfsyawki8g5485ivxfs5xh";
+      name = "kdebugsettings-17.04.2.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-dev-scripts-17.04.1.tar.xz";
-      sha256 = "0b5qkg27x61m487lrdp78zbgk11p6q5j7fcqxajfhyh05a007ybz";
-      name = "kde-dev-scripts-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-dev-scripts-17.04.2.tar.xz";
+      sha256 = "1vid5j08x8pkzzhqr78nsn4r9nnhisvsb7bfl9a1pc609y461y31";
+      name = "kde-dev-scripts-17.04.2.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-dev-utils-17.04.1.tar.xz";
-      sha256 = "1l441qha293yx45i7awsnzz0hzh20izrhzlm48biw787qqmd03mn";
-      name = "kde-dev-utils-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-dev-utils-17.04.2.tar.xz";
+      sha256 = "1xf20zdlrinp9kxdky9a5lvflxikzdzv2yj211nlir8a63iv0bz7";
+      name = "kde-dev-utils-17.04.2.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdeedu-data-17.04.1.tar.xz";
-      sha256 = "012h97wkxqbk2yij4yirmd30gv92yixnhdn6zcmfps5m1ndjzj4v";
-      name = "kdeedu-data-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdeedu-data-17.04.2.tar.xz";
+      sha256 = "1bdh14d9ypai97jcxf1sfaw6ccfnf2ckj677fc8gl8g7fid094np";
+      name = "kdeedu-data-17.04.2.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdegraphics-mobipocket-17.04.1.tar.xz";
-      sha256 = "1gmb7i7bckaa481lxadzm34bzda1qfbaz5a1hc37cihj8p2avlpl";
-      name = "kdegraphics-mobipocket-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-mobipocket-17.04.2.tar.xz";
+      sha256 = "0qyv804a9cvqm0dm77zd79jj27i09jbw2cpgmazg3jn0plb5lkm6";
+      name = "kdegraphics-mobipocket-17.04.2.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdegraphics-thumbnailers-17.04.1.tar.xz";
-      sha256 = "1mmkg73bg1jxr6l3idrkgq97csyahrlv7k1780jy0202x1avswda";
-      name = "kdegraphics-thumbnailers-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-thumbnailers-17.04.2.tar.xz";
+      sha256 = "06vr377nr59n599dsmi250nak78ka1zkfa8ckp93sasp5nlilbnp";
+      name = "kdegraphics-thumbnailers-17.04.2.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ar-17.04.1.tar.xz";
-      sha256 = "1a3vssv88746dwwdwbnm4ydqxsmfj88g64cw7iarw77wchhx7g3v";
-      name = "kde-l10n-ar-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ar-17.04.2.tar.xz";
+      sha256 = "0w675vdbvms758y9hywjkg72sl37i2q1n8wq7mrqkvbgd7fri198";
+      name = "kde-l10n-ar-17.04.2.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ast-17.04.1.tar.xz";
-      sha256 = "06cxr26bwf7s4lcqs3v72ygn6ss3hlz150fz08qzxqlg5i8ddwql";
-      name = "kde-l10n-ast-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ast-17.04.2.tar.xz";
+      sha256 = "0v6qsn1x6rgll1hpr482jis0pljmqw0bax31a7vvr16ahp0rlrmk";
+      name = "kde-l10n-ast-17.04.2.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-bg-17.04.1.tar.xz";
-      sha256 = "14d1609bdhavpmxkww3bainbd8sxg033d4ljnnfygysfz58dsgc9";
-      name = "kde-l10n-bg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bg-17.04.2.tar.xz";
+      sha256 = "0hi7dvv25yji3924983k3fjgxynz1avp6l9amj7frn6g0c68lbp4";
+      name = "kde-l10n-bg-17.04.2.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-bs-17.04.1.tar.xz";
-      sha256 = "14a03pg5am75vcdgc6x0ig4rfy2yz46f47svdmhadlw5fx88h011";
-      name = "kde-l10n-bs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bs-17.04.2.tar.xz";
+      sha256 = "11sikg952dv75f12rd7sky9rwamr9w4szdqkd9zw9kdgy6q2izn7";
+      name = "kde-l10n-bs-17.04.2.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ca-17.04.1.tar.xz";
-      sha256 = "16r3pz3ksky7l02kpqy8c6a5w8qy4ilbx6ak43sf299a83mf5z0j";
-      name = "kde-l10n-ca-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca-17.04.2.tar.xz";
+      sha256 = "0s4j2vqxbpbsira0zyxz13kd59iicam2fhqz6xnlrd769vbfcbbv";
+      name = "kde-l10n-ca-17.04.2.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-17.04.1";
+    version = "ca_valencia-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ca@valencia-17.04.1.tar.xz";
-      sha256 = "04nrxwpi1zkpq6h6q1w7yjm4n98ymwvpscbzr0201hhf8lr1vrlf";
-      name = "kde-l10n-ca_valencia-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca@valencia-17.04.2.tar.xz";
+      sha256 = "1dib0xvjcpg996smni56vncdq9wb9jcfr4abvqm7x3v50ip95f7f";
+      name = "kde-l10n-ca_valencia-17.04.2.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-cs-17.04.1.tar.xz";
-      sha256 = "1nkhqhl9p5hliynlq3magcwcxkgg7x5wrfm80dxj9bivbq9sxi5c";
-      name = "kde-l10n-cs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-cs-17.04.2.tar.xz";
+      sha256 = "05hjzfrzafb9xabsb15lq5hl152brqf68hvl3h0vsmxyw7hqzxrj";
+      name = "kde-l10n-cs-17.04.2.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-da-17.04.1.tar.xz";
-      sha256 = "1wb6yb8d3wyz1zl0g6zfszd8k7svgazphghnc0fp97rngbjfdfmm";
-      name = "kde-l10n-da-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-da-17.04.2.tar.xz";
+      sha256 = "05g8vh33fxvi6dmj6ryr6i2j3l4fd4cj3dkzch76bgvi00750fah";
+      name = "kde-l10n-da-17.04.2.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-de-17.04.1.tar.xz";
-      sha256 = "0nxkyky0rlsia80k6h91qh4fkdbdy4x9rbg01xw3cgcskj61198m";
-      name = "kde-l10n-de-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-de-17.04.2.tar.xz";
+      sha256 = "1hiqbscd2py88z45g7blbj74ayqj4mmgy0b8z6hcxn9n0ph4sidb";
+      name = "kde-l10n-de-17.04.2.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-el-17.04.1.tar.xz";
-      sha256 = "14vsbgp8mjzwwzcfmyadcdd6q26viqffzc7q25k9as1m3a5ibxsd";
-      name = "kde-l10n-el-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-el-17.04.2.tar.xz";
+      sha256 = "066n3r1vi9j8nln4xyhgpjhsl7gwhl6q7gqbdcp6zpwgxhwv6zic";
+      name = "kde-l10n-el-17.04.2.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-17.04.1";
+    version = "en_GB-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-en_GB-17.04.1.tar.xz";
-      sha256 = "08h7qzy22lbfn8rri7646fpy9ydchaw7xr59pccyck385ini7cbz";
-      name = "kde-l10n-en_GB-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-en_GB-17.04.2.tar.xz";
+      sha256 = "1307v713djkhny8rcg2schcwljn1cp728yllh227m30znprrqn41";
+      name = "kde-l10n-en_GB-17.04.2.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-eo-17.04.1.tar.xz";
-      sha256 = "1g487qr0yj2mi68zac9wj6bijrghb9id94yy1m6sdynjlwd27ik5";
-      name = "kde-l10n-eo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eo-17.04.2.tar.xz";
+      sha256 = "06i2m3g4s4raa1vzynfw5m89ydkcgjlbd96a4qxx76v888q65lsl";
+      name = "kde-l10n-eo-17.04.2.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-es-17.04.1.tar.xz";
-      sha256 = "00yx9mlym8icsjsl6fl6sd3na7wzk8912518a35q54sgp6kg3g57";
-      name = "kde-l10n-es-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-es-17.04.2.tar.xz";
+      sha256 = "1al4figznf5f6lgpz2l57x01n87jlaqxldgp7gi545672lxzyx44";
+      name = "kde-l10n-es-17.04.2.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-et-17.04.1.tar.xz";
-      sha256 = "0z5i3hsb24jigixvsk9byknnvia7xwqbwl94qfnvj6zfs4qw1aiv";
-      name = "kde-l10n-et-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-et-17.04.2.tar.xz";
+      sha256 = "1dhqk1sj32pij4wc4pgfih3i8g3jf9b223rnraymhbsima200hx4";
+      name = "kde-l10n-et-17.04.2.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-eu-17.04.1.tar.xz";
-      sha256 = "00b04kwgv1d7r8vwyxq8lbb1fpf1vc1qbly0brx4vgimkir875nk";
-      name = "kde-l10n-eu-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eu-17.04.2.tar.xz";
+      sha256 = "0kix9qs15488ns71hv67yvp3w03n68lxjll6cjxhyhrfcji9ldwc";
+      name = "kde-l10n-eu-17.04.2.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fa-17.04.1.tar.xz";
-      sha256 = "06hsj30na3l5rmx1kknfca3qqzwp9378nragdsd4bjkcd7qgfcrr";
-      name = "kde-l10n-fa-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fa-17.04.2.tar.xz";
+      sha256 = "1867hgiqh51f6nzdmkq6nplnq7hs22lvzpishckhzw8x770sv10b";
+      name = "kde-l10n-fa-17.04.2.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fi-17.04.1.tar.xz";
-      sha256 = "1jxzh32wzggr7757yz6l63pgzgdclq797ml75kfd252k08s4fmz1";
-      name = "kde-l10n-fi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fi-17.04.2.tar.xz";
+      sha256 = "1p4agangwvdzcx9029wslq5228wkgk4kpxddi2alzhlcxd25fk7b";
+      name = "kde-l10n-fi-17.04.2.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fr-17.04.1.tar.xz";
-      sha256 = "0wxrjwxjc78sr9s3s5fhm52q2igqhb3im7qfxsp9wnqrl2hib026";
-      name = "kde-l10n-fr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fr-17.04.2.tar.xz";
+      sha256 = "0lby60rklzcjk62qw2inslvhv4fli57kjn6a76hidcwvwmi3kcyh";
+      name = "kde-l10n-fr-17.04.2.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ga-17.04.1.tar.xz";
-      sha256 = "14zp828861bbfymvrkn6rmzcrd6lmy46pklaapwpvr49janmvwww";
-      name = "kde-l10n-ga-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ga-17.04.2.tar.xz";
+      sha256 = "06xkiizvcsg61ww8gdqjn84ymhwcxr9pkf8p0g5mrplvnxc9v1ys";
+      name = "kde-l10n-ga-17.04.2.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-gl-17.04.1.tar.xz";
-      sha256 = "1p76kw6x956p8jyvqfj2660n3qb71w07p47x4ad183zswq3i5rgd";
-      name = "kde-l10n-gl-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-gl-17.04.2.tar.xz";
+      sha256 = "059xv4a7mgf16h3wj2m4j1f32r8msvk0fdw62dlfypk0xi8lnzch";
+      name = "kde-l10n-gl-17.04.2.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-he-17.04.1.tar.xz";
-      sha256 = "1sp8k3hw6c1mxglyh6gsa468cs9mf12fsmf033v5ccdmqslxv0cn";
-      name = "kde-l10n-he-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-he-17.04.2.tar.xz";
+      sha256 = "1w3rc832ngw91m1yrd988hxp8y0aaqgvkizkgmjiki0gqk3fkj25";
+      name = "kde-l10n-he-17.04.2.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hi-17.04.1.tar.xz";
-      sha256 = "11dbisbgs309mr233x01qxmzqsm0xwsdvkbbkidl9cxfplgfmach";
-      name = "kde-l10n-hi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hi-17.04.2.tar.xz";
+      sha256 = "1kd4yxq3m5kg3crn6w86aiipslkfa4z79prm3fd6d4a5zpacmqbf";
+      name = "kde-l10n-hi-17.04.2.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hr-17.04.1.tar.xz";
-      sha256 = "1iizjqldw44dpsilb6x524d4xib6bb67rp9czjc0b3hkibjbjhzy";
-      name = "kde-l10n-hr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hr-17.04.2.tar.xz";
+      sha256 = "1m3avcrbyz31ir8qwwf9lhl4xr4qg241j99jbv28mgmsiv73ifji";
+      name = "kde-l10n-hr-17.04.2.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hu-17.04.1.tar.xz";
-      sha256 = "0ab3p8q72vhxc2angfwyyvwxs9j5m47325d36vsmdvh8ny0hsx2b";
-      name = "kde-l10n-hu-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hu-17.04.2.tar.xz";
+      sha256 = "1vh94d0ffjak5gwf4flgc2giq6vswyh57i334sq7n3vbpg6rwh7s";
+      name = "kde-l10n-hu-17.04.2.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ia-17.04.1.tar.xz";
-      sha256 = "1ss1vhg728qx4a4hbqjxbj8cqfajsxp2vifinax1ndhlyzrd8i63";
-      name = "kde-l10n-ia-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ia-17.04.2.tar.xz";
+      sha256 = "0k391rwrrj6bd86nd791pk0ih7g3z1b7vva43dmlishh5xind12p";
+      name = "kde-l10n-ia-17.04.2.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-id-17.04.1.tar.xz";
-      sha256 = "17v0dr8pcm23jd2wa8pppzmswn5l4gbnirrp2nczbr5ffpymiqlx";
-      name = "kde-l10n-id-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-id-17.04.2.tar.xz";
+      sha256 = "13pfybpngzv1lscd3q4x4qh8kxs2k7md9biyibrs1vpyr28jw01c";
+      name = "kde-l10n-id-17.04.2.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-is-17.04.1.tar.xz";
-      sha256 = "088ksp2z55w18yiknk4wz8mlfgnjgks3ncyc4qn8lh1p790ispv8";
-      name = "kde-l10n-is-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-is-17.04.2.tar.xz";
+      sha256 = "19cngzf26438amwfc7prz6hrszlqr78j2w9djm7y24gy7r6blfjq";
+      name = "kde-l10n-is-17.04.2.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-it-17.04.1.tar.xz";
-      sha256 = "064b6gd391z0kwadr9lcn1kzshn1gzdhbkllsvqjhadz3r9p6fsj";
-      name = "kde-l10n-it-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-it-17.04.2.tar.xz";
+      sha256 = "0wfsvrhmmarl277qvgwh4w9nl3rcqslkd4fjsl88m7230xzcjy6k";
+      name = "kde-l10n-it-17.04.2.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ja-17.04.1.tar.xz";
-      sha256 = "015y0a9r8h91j4g8ly4jc269pnw97iv1npczpn4jpqxd4b9gj3ag";
-      name = "kde-l10n-ja-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ja-17.04.2.tar.xz";
+      sha256 = "1b41f8pki75rc2swjaf1hvdvvjqvfz0glawrh4dda872naw65mhy";
+      name = "kde-l10n-ja-17.04.2.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-kk-17.04.1.tar.xz";
-      sha256 = "097ms01vx5ibrpdmcnshsg44vild3a8gkkh2lwkdcn2h1dm4f8dz";
-      name = "kde-l10n-kk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-kk-17.04.2.tar.xz";
+      sha256 = "01jrsjwlv10qdyzlwljf74cdwxprmsfvhi1pdlhv271z2ix661w5";
+      name = "kde-l10n-kk-17.04.2.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-km-17.04.1.tar.xz";
-      sha256 = "01x46n9schmbsamickxdqmnq6prywpn1i7l1izqmicgbwrik4jy3";
-      name = "kde-l10n-km-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-km-17.04.2.tar.xz";
+      sha256 = "1fw62awnkmk7q4ybjqiszj8d0jkmm247lq25l6h8zsmidc9x4xz9";
+      name = "kde-l10n-km-17.04.2.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ko-17.04.1.tar.xz";
-      sha256 = "1nfahnsrlvmf8mxjs0m6zs6sz3b5kv117sgz1c7cf1bb07qjldmg";
-      name = "kde-l10n-ko-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ko-17.04.2.tar.xz";
+      sha256 = "1b5pqr5q7kn4vh7p8kngsw82ya7lv1jzbn8ngzrr8qkf6hh6ig2a";
+      name = "kde-l10n-ko-17.04.2.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-lt-17.04.1.tar.xz";
-      sha256 = "035nxx0psh77xv5mfiyjkfdz9m0pgk5ghbid4rrp8qhhw4zn9iq9";
-      name = "kde-l10n-lt-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lt-17.04.2.tar.xz";
+      sha256 = "06pn3dx7dx26w16lfcwdrzphakvnk709bs5mki9p08pdmamjdr7w";
+      name = "kde-l10n-lt-17.04.2.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-lv-17.04.1.tar.xz";
-      sha256 = "150av9ah9xqkzsw2y555yh41y8gy3r494mx29fnwjvnc699yl7w2";
-      name = "kde-l10n-lv-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lv-17.04.2.tar.xz";
+      sha256 = "0a2kchx1qkyqzmqa7ajadfpxa5zywyhv55db5qax2xncz1w7v515";
+      name = "kde-l10n-lv-17.04.2.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-mr-17.04.1.tar.xz";
-      sha256 = "17zcfxpws1q1cw286xx2zzv3pykx4830lv44vpr7b9aqnkj8i2r4";
-      name = "kde-l10n-mr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-mr-17.04.2.tar.xz";
+      sha256 = "0mjg9v484ayafgdz0z6ahsqsdlyn3iv9sa0xwg2x2fc04r5k5dni";
+      name = "kde-l10n-mr-17.04.2.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nb-17.04.1.tar.xz";
-      sha256 = "1cgc6k22iazikvwsdj0jfssx0gajiz414bcq9fffpdzsxvjqjll3";
-      name = "kde-l10n-nb-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nb-17.04.2.tar.xz";
+      sha256 = "0bxq83qg39ivcr0qvxb0cd0q9mkjwp9j4h86s14wp5yq6jp0vcni";
+      name = "kde-l10n-nb-17.04.2.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nds-17.04.1.tar.xz";
-      sha256 = "0k4li1kzk728h9vqy3wzqxpwwmsk6qgl4dpp9q4drvb74iwjm0hs";
-      name = "kde-l10n-nds-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nds-17.04.2.tar.xz";
+      sha256 = "0rpdbk83rmj24m3by7igvab5aaskizfqxwfyvcjj0zhxpals0px4";
+      name = "kde-l10n-nds-17.04.2.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nl-17.04.1.tar.xz";
-      sha256 = "0gbwg30lf5w5dvrxi3kzwbwwiglb0247pqybva5irvprw9vcnfsi";
-      name = "kde-l10n-nl-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nl-17.04.2.tar.xz";
+      sha256 = "180dsd92qap14pkqr4xv63zdaqz4s1jyx590d705yvbf3mkc1bwx";
+      name = "kde-l10n-nl-17.04.2.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nn-17.04.1.tar.xz";
-      sha256 = "16chm04bi7bjjbw9d3w9ljj6cd21k29qmsy6d7sdnhqxda8lv74q";
-      name = "kde-l10n-nn-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nn-17.04.2.tar.xz";
+      sha256 = "1vbb3jvhhv8pksff8330i2b2qjksb4lksw3pb52ph2h77gb36bh3";
+      name = "kde-l10n-nn-17.04.2.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pa-17.04.1.tar.xz";
-      sha256 = "1hg1sz2jr2v1w4gal2zr4k4vbx6fidns1hdx04ain2qmm4qxi1yq";
-      name = "kde-l10n-pa-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pa-17.04.2.tar.xz";
+      sha256 = "0v0a6bcrnrpy2ayj7d4v6lfgaxly3nk3d6dgmy26nydgmyg0xfsa";
+      name = "kde-l10n-pa-17.04.2.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pl-17.04.1.tar.xz";
-      sha256 = "0j3nwkadncw2bqf06cznhy7n1zcksk1x11sq3yz3ykssplbf3gr7";
-      name = "kde-l10n-pl-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pl-17.04.2.tar.xz";
+      sha256 = "0chzlzyxjhh1rv4gl7pbph7fs09p932mkl7az8yihj3zl5cvw82n";
+      name = "kde-l10n-pl-17.04.2.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pt-17.04.1.tar.xz";
-      sha256 = "183lwmdy5lq1picvvl1607xq8zj9lp5b9nc3lz93jswkd266707l";
-      name = "kde-l10n-pt-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt-17.04.2.tar.xz";
+      sha256 = "14yp29l7fb2jlpx2dd12zn64q39yf7p9p79iynjsg3spwfdm5zpi";
+      name = "kde-l10n-pt-17.04.2.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-17.04.1";
+    version = "pt_BR-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pt_BR-17.04.1.tar.xz";
-      sha256 = "0sc6hr35ly9jxm8wqnw2y1y94xcyba74qfpr19pr53791bcnrdaw";
-      name = "kde-l10n-pt_BR-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt_BR-17.04.2.tar.xz";
+      sha256 = "12g1mbdhw18pga063gczsxvmigdwgncc0qk8vy1rj6h5q3w6kkfm";
+      name = "kde-l10n-pt_BR-17.04.2.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ro-17.04.1.tar.xz";
-      sha256 = "0v98kgm6x1anld8yqykkwf2c30y9qh8sr9nv6v3ipxrf02pz67g7";
-      name = "kde-l10n-ro-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ro-17.04.2.tar.xz";
+      sha256 = "0sqym2mx927pfvdq5lny64scg80xyrz3q1vlg3sk8gyil0n942gv";
+      name = "kde-l10n-ro-17.04.2.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ru-17.04.1.tar.xz";
-      sha256 = "01cdgj50vz47pa4k25l6ykax9jfvjbg5gsc8cf5ibl5rp57fxxfc";
-      name = "kde-l10n-ru-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ru-17.04.2.tar.xz";
+      sha256 = "1gcy1ssir2fgg1djv7jbh9jv3y1pxs3yrxaqdd0m4zdkva1knx5p";
+      name = "kde-l10n-ru-17.04.2.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sk-17.04.1.tar.xz";
-      sha256 = "1jq9rj8xb1z3992sakm47y95v0kyfx5535wn882kxx3ac18pyflh";
-      name = "kde-l10n-sk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sk-17.04.2.tar.xz";
+      sha256 = "0yq5b9z77bijfa3y1dx2d6avpirwzbdsz9zng93r8a3lzyv3syfi";
+      name = "kde-l10n-sk-17.04.2.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sl-17.04.1.tar.xz";
-      sha256 = "0zpj50sf9vn9dkdrvf533wrlxivqxz1xdavkmasnjbpf6w910rr3";
-      name = "kde-l10n-sl-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sl-17.04.2.tar.xz";
+      sha256 = "1k117r37waxlxhdhlh7s2fii2iyv8himfkxnbm4lcxfbmhqj82cn";
+      name = "kde-l10n-sl-17.04.2.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sr-17.04.1.tar.xz";
-      sha256 = "1r6i7qy19k4m13vrv6sysqb308kgaqqfbcszm2xw9dvlwcl0xsi8";
-      name = "kde-l10n-sr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sr-17.04.2.tar.xz";
+      sha256 = "17xpb1q7qamz70qbg2k9i4jfbz1qsv4n0j5hw4ix9bm2dncaaqa9";
+      name = "kde-l10n-sr-17.04.2.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sv-17.04.1.tar.xz";
-      sha256 = "0chpjchpcjk3jvrs9fgc48aw1j54nxp8q8p5z2p534c6ncwgqjh4";
-      name = "kde-l10n-sv-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sv-17.04.2.tar.xz";
+      sha256 = "1xlzc96pcwlbja3m0m15ii8n4lxf8h8ganyyh43zgxikcibcny70";
+      name = "kde-l10n-sv-17.04.2.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-tr-17.04.1.tar.xz";
-      sha256 = "0k3bsfjqkgqyk2vnzpzkp5m5006vbxgkxn5fahjybj4p206ry2j6";
-      name = "kde-l10n-tr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-tr-17.04.2.tar.xz";
+      sha256 = "1fmmwv85cgazk655hdaykljjrh4cgghh0wkjf57n8lkkc7503278";
+      name = "kde-l10n-tr-17.04.2.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ug-17.04.1.tar.xz";
-      sha256 = "0dx9yv7680aqmbfqzmn2kv5kvfx4w776ihw3ag8z0m6acjzk7k4m";
-      name = "kde-l10n-ug-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ug-17.04.2.tar.xz";
+      sha256 = "0l350qq3bfbvs7621lrl9azlx4mw5vdlrndp606v878abxaw16bh";
+      name = "kde-l10n-ug-17.04.2.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-uk-17.04.1.tar.xz";
-      sha256 = "1iq84dpsj49wb0qp37hykjfw391pffsrdjngv5jh5p6hiq1k6ajj";
-      name = "kde-l10n-uk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-uk-17.04.2.tar.xz";
+      sha256 = "1xnkknd2k8zdiq322nbiim9hg7gvww5zv3x7gqjrrqy7nha75mh4";
+      name = "kde-l10n-uk-17.04.2.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-wa-17.04.1.tar.xz";
-      sha256 = "02b2yvi3r014h2vya54p42lwwk75zxg2dqhs920mc4sydnbrc90s";
-      name = "kde-l10n-wa-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-wa-17.04.2.tar.xz";
+      sha256 = "1f9sphx3rlc5m1ji0ihxs3p6wb7b53acfjyd5vps3b3cbf3j4aa3";
+      name = "kde-l10n-wa-17.04.2.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-17.04.1";
+    version = "zh_CN-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-zh_CN-17.04.1.tar.xz";
-      sha256 = "1bggh1p2ahcjnslcgrikdk0954xyqkls32w1ckmfp1ixc1g4bkxh";
-      name = "kde-l10n-zh_CN-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_CN-17.04.2.tar.xz";
+      sha256 = "1258f5s3pg6a9mfniwdf44w3y6pnf14m8nmqpfy534z68ypw6ymw";
+      name = "kde-l10n-zh_CN-17.04.2.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-17.04.1";
+    version = "zh_TW-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-zh_TW-17.04.1.tar.xz";
-      sha256 = "0c5h3q39hb3qbjcbh09gwiw2mqb2sd16jrb69r1xf0vxxmam5xvq";
-      name = "kde-l10n-zh_TW-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_TW-17.04.2.tar.xz";
+      sha256 = "0qz66hz1yabdgx3yq7cc6i5w9m01yp8pjrh46blskq6apwfwdhmg";
+      name = "kde-l10n-zh_TW-17.04.2.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.32";
+    version = "4.14.33";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdelibs-4.14.32.tar.xz";
-      sha256 = "10xxhgs0k2k2qyw5gjrsqckg0bj2fc3wcskapmspq68wn9iyhcr1";
-      name = "kdelibs-4.14.32.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdelibs-4.14.33.tar.xz";
+      sha256 = "0594ak7d93sqk293p3jdi0mad2wwglk7m7x6sgj2jgaxjn3c5amq";
+      name = "kdelibs-4.14.33.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdenetwork-filesharing-17.04.1.tar.xz";
-      sha256 = "14rnggp7dc99ac8gf83njw28ihw621dsawk361gf5b5x9kjcc8yx";
-      name = "kdenetwork-filesharing-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdenetwork-filesharing-17.04.2.tar.xz";
+      sha256 = "1fac78wbh61vsk1ibkvhffgnlpds9a6ax6jyly2n9lrcqifann64";
+      name = "kdenetwork-filesharing-17.04.2.tar.xz";
     };
   };
   kdenlive = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdenlive-17.04.1.tar.xz";
-      sha256 = "027d9azwg5mghj7a2v3z579vyp2vvzsp55crz19ansszsbapj70v";
-      name = "kdenlive-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdenlive-17.04.2.tar.xz";
+      sha256 = "1jzwar4bdjrbf97i9g6njzibv3ywcwha4cjkmj70pql67d5nmki9";
+      name = "kdenlive-17.04.2.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdepim-addons-17.04.1.tar.xz";
-      sha256 = "07s9sn012vscxabj4y5kvjg3qcjx4i8bzg9mxzvspkal1kq32nip";
-      name = "kdepim-addons-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdepim-addons-17.04.2.tar.xz";
+      sha256 = "08hcgkjk3mwlg07g5k2b02kc67xyp2kxgh80f0v342kg455lq3fw";
+      name = "kdepim-addons-17.04.2.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdepim-apps-libs-17.04.1.tar.xz";
-      sha256 = "17rsw0471398ramyp8n1xipxlkrcfxdbx3a1yf65r3d0bvayl542";
-      name = "kdepim-apps-libs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdepim-apps-libs-17.04.2.tar.xz";
+      sha256 = "1ala5hqzhpny0sncm96kpalj7dxkh06p6j0sk3725lpjqhr1ng15";
+      name = "kdepim-apps-libs-17.04.2.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdepim-runtime-17.04.1.tar.xz";
-      sha256 = "07wjz79l02cnjk5jg5bw9ind0braypd9gssc18larhr8086h8722";
-      name = "kdepim-runtime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdepim-runtime-17.04.2.tar.xz";
+      sha256 = "16crq3yc7djsas9klg1vl9nmk27fqj9770lfpysgz0pglb6j6k92";
+      name = "kdepim-runtime-17.04.2.tar.xz";
     };
   };
   kde-runtime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-runtime-17.04.1.tar.xz";
-      sha256 = "0rradnyh2mn3nk1z7xxda6dbh4jls7rblh2sz6rvr90cgr5iv80l";
-      name = "kde-runtime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-runtime-17.04.2.tar.xz";
+      sha256 = "1885cyarf6g460mnfl1wij0xg5n4z7w406lmlrk1w4h90ql48j69";
+      name = "kde-runtime-17.04.2.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdesdk-kioslaves-17.04.1.tar.xz";
-      sha256 = "09jc1nxrbmzylhp7367g9r38dww3i9q3q7vhy3piwgnhn5jyba8h";
-      name = "kdesdk-kioslaves-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdesdk-kioslaves-17.04.2.tar.xz";
+      sha256 = "10sigid2zwgjfw737gr4wmm2ajx31v1y8y28l7dqd6y4jlkzf34j";
+      name = "kdesdk-kioslaves-17.04.2.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdesdk-thumbnailers-17.04.1.tar.xz";
-      sha256 = "0c6zg5cb3mg0qzpzrq8f885invqjdzcws50z21klbg2d4fvz2qx9";
-      name = "kdesdk-thumbnailers-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdesdk-thumbnailers-17.04.2.tar.xz";
+      sha256 = "1bq36gqqkf2cklj6rh35r88d4vknn22p0x3p6mq9ixca0sw7yc4a";
+      name = "kdesdk-thumbnailers-17.04.2.tar.xz";
     };
   };
   kdf = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdf-17.04.1.tar.xz";
-      sha256 = "1shb4zk27v5mr5v8iag9dw58g8x649pdvdbq1y7cnphg8xsgk3v6";
-      name = "kdf-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdf-17.04.2.tar.xz";
+      sha256 = "00g9jyl4bxmrbxri1q3893gw362v4rzp0gpc94d46v2vi6xqb501";
+      name = "kdf-17.04.2.tar.xz";
     };
   };
   kdialog = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdialog-17.04.1.tar.xz";
-      sha256 = "004wj2q0ljcbmzb1m3gmfaawb6b8pxsfzzw3bbcsm5qcniky8lap";
-      name = "kdialog-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdialog-17.04.2.tar.xz";
+      sha256 = "184fyajhv4isirlv4sp8w2zxr7zkijknhsh6a1qpvr1r48ivw5aw";
+      name = "kdialog-17.04.2.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdiamond-17.04.1.tar.xz";
-      sha256 = "0dqvxxdimhr4ax3cpc3jx18p56rqc4jrfky5zw9h4zznn2f3g17n";
-      name = "kdiamond-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdiamond-17.04.2.tar.xz";
+      sha256 = "0krnb2g63zww655xmx1yn1105zkqryid5ip2vkn3cva2l1x8zfwr";
+      name = "kdiamond-17.04.2.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/keditbookmarks-17.04.1.tar.xz";
-      sha256 = "0h7h6czfjbjw24rs03xsbx7ygad85ymmsbz2sff2s3nwf7qpzdh1";
-      name = "keditbookmarks-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/keditbookmarks-17.04.2.tar.xz";
+      sha256 = "12s9v5m681f9sz49h1xdnpriik8q2zswgr051kvvckbdrxj46rqc";
+      name = "keditbookmarks-17.04.2.tar.xz";
     };
   };
   kfilereplace = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kfilereplace-17.04.1.tar.xz";
-      sha256 = "11qmxdv7pnsadk698223a8bcg4fsk7fyjcz39ms6g0wy5i8h3qc1";
-      name = "kfilereplace-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kfilereplace-17.04.2.tar.xz";
+      sha256 = "1das2szmhw3lcpl2r3cqcylx3dx3xnvqclnasr3h5ahg4z86aqhn";
+      name = "kfilereplace-17.04.2.tar.xz";
     };
   };
   kfind = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kfind-17.04.1.tar.xz";
-      sha256 = "0kic45g57fnbvszg8yk86v9wxb34xwljypnxga30i37hbr589cnn";
-      name = "kfind-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kfind-17.04.2.tar.xz";
+      sha256 = "0d04p14fzwryf9kjx7ancqi9cfhsmy9xc9ylyi7frbafr6kac5va";
+      name = "kfind-17.04.2.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kfloppy-17.04.1.tar.xz";
-      sha256 = "1faxviqz8shmh2msphglrc77h6srj0055qgsbms9cikp2pk1lybb";
-      name = "kfloppy-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kfloppy-17.04.2.tar.xz";
+      sha256 = "1f2aah2kskvyxpwkglv38ql955x1870saycym20b058dirinxg42";
+      name = "kfloppy-17.04.2.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kfourinline-17.04.1.tar.xz";
-      sha256 = "1gh2d883vicpp19ag4yk7n82w2mi25sxw4kl46kk070dj8k1448x";
-      name = "kfourinline-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kfourinline-17.04.2.tar.xz";
+      sha256 = "1423hcikj2fyy26vm5nl5q5pg6xbsjppkvd6qhjwzj9csd9m2ysr";
+      name = "kfourinline-17.04.2.tar.xz";
     };
   };
   kgeography = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kgeography-17.04.1.tar.xz";
-      sha256 = "0hifb15fnvmj0w9119v66cybf0971r4s88yfa6b3rq4nc6m59zal";
-      name = "kgeography-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kgeography-17.04.2.tar.xz";
+      sha256 = "1f7g9i4a2phi5gi5h6phn4w8l1yw2hf862yl6wwsgp4lb3agwcjb";
+      name = "kgeography-17.04.2.tar.xz";
     };
   };
   kget = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kget-17.04.1.tar.xz";
-      sha256 = "11sxrq6fpx30xfn3z8yi6isa7i2fbx36bfcphmwy0nq9xalzmwf3";
-      name = "kget-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kget-17.04.2.tar.xz";
+      sha256 = "0hnizzplcmhvkyl270bbsi587f6adb1n6vpjji1scwnfjz42pjma";
+      name = "kget-17.04.2.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kgoldrunner-17.04.1.tar.xz";
-      sha256 = "1hnz1nkv3m4127vk15wvp2rcy02by7ps87pmm7yjg3lwz9fgxr64";
-      name = "kgoldrunner-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kgoldrunner-17.04.2.tar.xz";
+      sha256 = "0ihh2qr7dn5ibax0ljh7ahzhr193a5ghmzgaxkfk4649qc34vnx5";
+      name = "kgoldrunner-17.04.2.tar.xz";
     };
   };
   kgpg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kgpg-17.04.1.tar.xz";
-      sha256 = "1gdfrrk724kr5jpwpf5q7sqyqqig0rq7bzp0r2nknq42p29ssd79";
-      name = "kgpg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kgpg-17.04.2.tar.xz";
+      sha256 = "0svr1qv9g6dm1m5ilbyws1mhrdjjq31iw0dwza3fri3vsmhhqpmx";
+      name = "kgpg-17.04.2.tar.xz";
     };
   };
   khangman = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/khangman-17.04.1.tar.xz";
-      sha256 = "12dxbj07qk5zqfw6x6prb7kap9vk8h1q5a0n7k81a0vsp5qqqpqr";
-      name = "khangman-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/khangman-17.04.2.tar.xz";
+      sha256 = "1g06sm5fwdhysj7hjsrdj19hdf0q1kzc5li4h6klp4gim8hzji7w";
+      name = "khangman-17.04.2.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/khelpcenter-17.04.1.tar.xz";
-      sha256 = "1h6sl83dcycpi8k5mv2q8dgqf73kgpbkbr5l1if4znicsy7k52a5";
-      name = "khelpcenter-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/khelpcenter-17.04.2.tar.xz";
+      sha256 = "0zggqlyfgmpxgvjy83lqah9y927xzj8dy13pih0slnk01z50386c";
+      name = "khelpcenter-17.04.2.tar.xz";
     };
   };
   kholidays = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kholidays-17.04.1.tar.xz";
-      sha256 = "09j7594yd54pz187qg4lxm82jf9043nk79y4s9x7xgz708wvy911";
-      name = "kholidays-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kholidays-17.04.2.tar.xz";
+      sha256 = "1cyncg08binky75n93r0l5qlx1zw73dqx3xp4i7xajc7qkmiy1x9";
+      name = "kholidays-17.04.2.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kidentitymanagement-17.04.1.tar.xz";
-      sha256 = "15mbd1a7ix028r3my22r34f5i2q31wq39zqlbf5hr0vq9kh0a10w";
-      name = "kidentitymanagement-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kidentitymanagement-17.04.2.tar.xz";
+      sha256 = "00pxbbnl4l4cq5mlmgf89ndfy4wykbfvhslws4is6wm3qf9v99gm";
+      name = "kidentitymanagement-17.04.2.tar.xz";
     };
   };
   kig = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kig-17.04.1.tar.xz";
-      sha256 = "1rxdqdgy93l0j37ycqlhm6cnjmy8jrvyhj85hw14b083nbrng7hj";
-      name = "kig-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kig-17.04.2.tar.xz";
+      sha256 = "0w1gl28rqqprijlqsfc8x6qjjc6nylniqvlpm71rgiwyq0zpyl1p";
+      name = "kig-17.04.2.tar.xz";
     };
   };
   kigo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kigo-17.04.1.tar.xz";
-      sha256 = "0ghpnngpgqcbsh2n9sh9vnglig5zcwcwksfad8kwivs72ks5989j";
-      name = "kigo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kigo-17.04.2.tar.xz";
+      sha256 = "01yjdwcfwibw1c7dgk2alyp9mj9vy70fki0zf85gi91cwkrqklsi";
+      name = "kigo-17.04.2.tar.xz";
     };
   };
   killbots = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/killbots-17.04.1.tar.xz";
-      sha256 = "1kbh25hzzgdbcn29wxa3pj4fnw0zxvnvxjn1ivfr7srqfhdqcpq7";
-      name = "killbots-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/killbots-17.04.2.tar.xz";
+      sha256 = "09a6h7q0nwj4lk81mrh1cpi27pjyxpdrk9lr2kgmjxgksavsi1p6";
+      name = "killbots-17.04.2.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kimagemapeditor-17.04.1.tar.xz";
-      sha256 = "1q54zrmsjmrsmlinagzg8szbwp6mw9vbwx60fhmnrsbshp85mldv";
-      name = "kimagemapeditor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kimagemapeditor-17.04.2.tar.xz";
+      sha256 = "00ln9mkmsky4fjn931d6y94f34fp7p11cx2vg1rafxzygr4zv0wz";
+      name = "kimagemapeditor-17.04.2.tar.xz";
     };
   };
   kimap = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kimap-17.04.1.tar.xz";
-      sha256 = "1wd445s14kl2lk7f3fk2pn0qdwy3pahmc7izzxh66jrrvbwg34jn";
-      name = "kimap-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kimap-17.04.2.tar.xz";
+      sha256 = "1g0j3n1ybx4vwyil7nic4rva2xn0dc86kbh1awcrk5q61pvkwmlr";
+      name = "kimap-17.04.2.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kio-extras-17.04.1.tar.xz";
-      sha256 = "14gw6wrhbc7lw8pjdv9z38spnciw24566b6flzbbkx29vl9m8rdq";
-      name = "kio-extras-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kio-extras-17.04.2.tar.xz";
+      sha256 = "1k84yn9q5w0wsa0rfr5rkz9pnsnhpn0xmdxx2r3kriq866iy2wfh";
+      name = "kio-extras-17.04.2.tar.xz";
     };
   };
   kiriki = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kiriki-17.04.1.tar.xz";
-      sha256 = "033g2v76ryjzsyv6scv4j5k7b9wdszycsw4zxdlp6zslbmsfi1lr";
-      name = "kiriki-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kiriki-17.04.2.tar.xz";
+      sha256 = "116llc5p785h17wlqmy7hhjm3h8cbzsa8wh5hc13g3db58zyy3l4";
+      name = "kiriki-17.04.2.tar.xz";
     };
   };
   kiten = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kiten-17.04.1.tar.xz";
-      sha256 = "10xc1zmyq0byzvpaqk3k5mrs54d7rcixsb5x8ga1axhya25n2nbi";
-      name = "kiten-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kiten-17.04.2.tar.xz";
+      sha256 = "0khyg5m13ax2i7ml7cf23jq5zr090vdqm03b6m1959lhk3warvjw";
+      name = "kiten-17.04.2.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kjumpingcube-17.04.1.tar.xz";
-      sha256 = "1qvkwdnpq50waycizdp0m91ypydsh2718shz8dk586ka314jhw17";
-      name = "kjumpingcube-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kjumpingcube-17.04.2.tar.xz";
+      sha256 = "073hdjv6aa6lannn2avanjcxzgsz5pdfh5xi3r1hlmcwzwx4ydis";
+      name = "kjumpingcube-17.04.2.tar.xz";
     };
   };
   kldap = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kldap-17.04.1.tar.xz";
-      sha256 = "13dnbxz57idslqsawgkrf4qahipdxi3hl8lzzzh6342dmy7pfm2s";
-      name = "kldap-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kldap-17.04.2.tar.xz";
+      sha256 = "1d5fbw11hz071rk814pfqa8gy8plznnr5wx5y16vb75a4sll1iw4";
+      name = "kldap-17.04.2.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kleopatra-17.04.1.tar.xz";
-      sha256 = "1s6fwlpq4ljhfr0kxdvzzgqp78sq4rh9wr9xz68xrq76i6r71zkh";
-      name = "kleopatra-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kleopatra-17.04.2.tar.xz";
+      sha256 = "0ph1rmxgq8n3yb61rhphw3b3kv8drdw13a418xwzc1kddpksa8r8";
+      name = "kleopatra-17.04.2.tar.xz";
     };
   };
   klettres = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/klettres-17.04.1.tar.xz";
-      sha256 = "0ai4hlc8fd1r82mn2qws3dbm6wm6rc9cwbni74ahbv6y7qdlsn8x";
-      name = "klettres-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/klettres-17.04.2.tar.xz";
+      sha256 = "093fb3n6dza44v3dqjragwkirid86frdv2v4yf54smpj8i5ykz21";
+      name = "klettres-17.04.2.tar.xz";
     };
   };
   klickety = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/klickety-17.04.1.tar.xz";
-      sha256 = "1y1nlg1hmr0020qx605r71q9b7q6nmrifacw66bh52yvscrjh8bk";
-      name = "klickety-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/klickety-17.04.2.tar.xz";
+      sha256 = "18xian4xwsj7wm5i6239cnabigzy05w02gwall884xk61mjwgqi7";
+      name = "klickety-17.04.2.tar.xz";
     };
   };
   klines = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/klines-17.04.1.tar.xz";
-      sha256 = "0dnvm0xmj6n3g23fcabmqnh6qjszv12yjq7pmhg0zy7bmf6rvg5g";
-      name = "klines-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/klines-17.04.2.tar.xz";
+      sha256 = "0va4ia1za6mynb0xxyn1z9xag0vs3pscgwkq1jfjyrd1k5inribr";
+      name = "klines-17.04.2.tar.xz";
     };
   };
   klinkstatus = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/klinkstatus-17.04.1.tar.xz";
-      sha256 = "06qhkc7hm79fda2a5afl4b8dqck8m56yqcajpn679324847qg4hx";
-      name = "klinkstatus-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/klinkstatus-17.04.2.tar.xz";
+      sha256 = "0mx16r98nr8ic5j9aqy32sz946v58cdzvhja4hxy56a2619pn7p8";
+      name = "klinkstatus-17.04.2.tar.xz";
     };
   };
   kmag = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmag-17.04.1.tar.xz";
-      sha256 = "1aqfm6nsanzym2n20spkkm21mrvjmnnb8mysv9ll6zg32qpbyyak";
-      name = "kmag-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmag-17.04.2.tar.xz";
+      sha256 = "1aswvc7zy8sd2jplyjmn05yvz4zjsjxy7arpzr5pb6q0za1fx1f0";
+      name = "kmag-17.04.2.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmahjongg-17.04.1.tar.xz";
-      sha256 = "0wgrx88alkk3w3hm4dv3rv0nv06zhxq5v35ywrd2xjhlnfp8aqbi";
-      name = "kmahjongg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmahjongg-17.04.2.tar.xz";
+      sha256 = "116ahf9yaw23bxz0hvfd8bs8276vc2nr3b383vahsgywakvcq71q";
+      name = "kmahjongg-17.04.2.tar.xz";
     };
   };
   kmail = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmail-17.04.1.tar.xz";
-      sha256 = "0jfs12k2kf3rxliq0v1hl622vgz8as5zw0qpp8k063m26x54ymb4";
-      name = "kmail-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmail-17.04.2.tar.xz";
+      sha256 = "0vqhfnr9jz2yfjbk5cghmdxhdxlhk3x6mw9b33xq2cn9iink0n4l";
+      name = "kmail-17.04.2.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmail-account-wizard-17.04.1.tar.xz";
-      sha256 = "0h0716cmpcymi47xqdpg2bm6ggz57vzlfahjpr6apcxmxv1fg812";
-      name = "kmail-account-wizard-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmail-account-wizard-17.04.2.tar.xz";
+      sha256 = "1l7fq7yzhp9ad1ij8fj47j9pq7adl9p2jgwsyg7gkhrfa8s02ygv";
+      name = "kmail-account-wizard-17.04.2.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmailtransport-17.04.1.tar.xz";
-      sha256 = "193azi5n134kicpwa08g2vkcwjcnjhsb4dl8fwk99wyvnjd2b79j";
-      name = "kmailtransport-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmailtransport-17.04.2.tar.xz";
+      sha256 = "0yjzvfwyz546486n9d1r8lr0q41ffjlg5c3klg8zc54d8290ghdw";
+      name = "kmailtransport-17.04.2.tar.xz";
     };
   };
   kmbox = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmbox-17.04.1.tar.xz";
-      sha256 = "16fq3m8m2wqa9xzfxggsq9r5jggax27nxlw6dn0ryg7fcbn1bdr7";
-      name = "kmbox-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmbox-17.04.2.tar.xz";
+      sha256 = "0p1pf1a96h5bqhs5lmid0z9nd613x9vlwpraqdym5kyrzndvccys";
+      name = "kmbox-17.04.2.tar.xz";
     };
   };
   kmime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmime-17.04.1.tar.xz";
-      sha256 = "0blskiiiihnkyn353iajlfydqsqk01b2yvmz1hf4v2219f2cgyr8";
-      name = "kmime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmime-17.04.2.tar.xz";
+      sha256 = "1jz4bj2rgcn4fmjybvrlq5i6fpx1jzqlzk0z5dv0yrqrln20lmw8";
+      name = "kmime-17.04.2.tar.xz";
     };
   };
   kmines = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmines-17.04.1.tar.xz";
-      sha256 = "1wwk8phpljccqdiyzr6156pc5a86zbag1x20r7jkzv4q1r8mm3mn";
-      name = "kmines-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmines-17.04.2.tar.xz";
+      sha256 = "0py92mbjqni0zpds8lf5wmirjwf8cw84ybirba73x6w40ysl3ny8";
+      name = "kmines-17.04.2.tar.xz";
     };
   };
   kmix = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmix-17.04.1.tar.xz";
-      sha256 = "1zkzcmd8x76ijnhbnam3pd0dbb41m5s0g6j39f1hk37bp5d4l2md";
-      name = "kmix-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmix-17.04.2.tar.xz";
+      sha256 = "1dgxz6c2mm5wnmap6pj3pbiajgpm5xx1q2kklhqxc2gkqxrz25a2";
+      name = "kmix-17.04.2.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmousetool-17.04.1.tar.xz";
-      sha256 = "1g17jhwwqfzf8d73c4bj22c4z83v147n3x97y5yr8ybj2yfw2fpa";
-      name = "kmousetool-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmousetool-17.04.2.tar.xz";
+      sha256 = "065s73yksb39yawdz2ai221jncphanmxpxirdfnhljbg8d551k30";
+      name = "kmousetool-17.04.2.tar.xz";
     };
   };
   kmouth = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmouth-17.04.1.tar.xz";
-      sha256 = "1k4k3n2127qr1bldvvqfxii3qk61z49jnyn3660q8xy7d2hlgrhn";
-      name = "kmouth-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmouth-17.04.2.tar.xz";
+      sha256 = "1iqa059169w4r94r99w338z5mbkxhcfz6xjycrw2nkvnp5spc4mw";
+      name = "kmouth-17.04.2.tar.xz";
     };
   };
   kmplot = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmplot-17.04.1.tar.xz";
-      sha256 = "10iqlm72i69wg6m1zx64bqijpvfvg9gg4f91ais5raacw4fzxz66";
-      name = "kmplot-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmplot-17.04.2.tar.xz";
+      sha256 = "0rdg9ywmxd0bicb030kpyhcrgbhpvaac339gxwq1q2arrczds38x";
+      name = "kmplot-17.04.2.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/knavalbattle-17.04.1.tar.xz";
-      sha256 = "1j0ivzjxi15yxv2nsbnypp7i3vq4c71n0rra7nr2mds29n33vrw3";
-      name = "knavalbattle-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/knavalbattle-17.04.2.tar.xz";
+      sha256 = "091wvhnj98s1c0as90h6qy0sx47bb95gbczljq2rrnxz6sjw3x52";
+      name = "knavalbattle-17.04.2.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/knetwalk-17.04.1.tar.xz";
-      sha256 = "0m0ywdh6hyl06cypq0ql4pzxrwpwcpzdd1q54a02z7vhz3pg4y7i";
-      name = "knetwalk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/knetwalk-17.04.2.tar.xz";
+      sha256 = "0g0q9m63qc33gfklpqpncvd3qdjpbjb53701ypiby3dlyb1znf3d";
+      name = "knetwalk-17.04.2.tar.xz";
     };
   };
   knotes = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/knotes-17.04.1.tar.xz";
-      sha256 = "1iv7r1ick6m3692l0p3hjval4g5swbg55ac3mrp5nxxczwl2m9h1";
-      name = "knotes-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/knotes-17.04.2.tar.xz";
+      sha256 = "1ypl677rhgq8hmy9y5zryfs4zcyzj88ajlwvsxd3lv9ybkc7ymhy";
+      name = "knotes-17.04.2.tar.xz";
     };
   };
   kolf = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kolf-17.04.1.tar.xz";
-      sha256 = "0g6j8irmbs7j2h4bdjixqxl25wbk672cdlfj0r6icv7s43cbkm61";
-      name = "kolf-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kolf-17.04.2.tar.xz";
+      sha256 = "157gppkzgv3394pcxr3mc9vi0bd8hy9bjmmjcq9g8p5gdpj148ag";
+      name = "kolf-17.04.2.tar.xz";
     };
   };
   kollision = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kollision-17.04.1.tar.xz";
-      sha256 = "0h50dg4ch7ll8naz3ivvlwn4bk686322064ycggbb77nqny9pjlx";
-      name = "kollision-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kollision-17.04.2.tar.xz";
+      sha256 = "065h6lm71h4184jk8lh1gz5bq1kyxnpyf7jg0y50q9g8fm147s5j";
+      name = "kollision-17.04.2.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kolourpaint-17.04.1.tar.xz";
-      sha256 = "1mzp0v5l4y45zdb4y4qwy6blnv3ndw009dcsgaylzb4vx7d39j3f";
-      name = "kolourpaint-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kolourpaint-17.04.2.tar.xz";
+      sha256 = "09kgmkqzcr534vz24w9p27zzd0hwh43cz09pjfdcgcwq5bsnni3s";
+      name = "kolourpaint-17.04.2.tar.xz";
     };
   };
   kompare = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kompare-17.04.1.tar.xz";
-      sha256 = "1y19xx5sgnl8p5kvpyqcrgji8ccrkj0m24lbli3scqwngqvv4qj9";
-      name = "kompare-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kompare-17.04.2.tar.xz";
+      sha256 = "0q6mi2l3bvl15qrylngdrngsvzv2dc26550pkjm1db94byx1qfk2";
+      name = "kompare-17.04.2.tar.xz";
     };
   };
   konqueror = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/konqueror-17.04.1.tar.xz";
-      sha256 = "12i82amdi9lpq1iwbmzq975190vssl99bw76mbf285r2bk3w0m5c";
-      name = "konqueror-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/konqueror-17.04.2.tar.xz";
+      sha256 = "0f36frk1wzw75w982clzlfxic7nj8nmslwy2wk855p3arcrg2dcq";
+      name = "konqueror-17.04.2.tar.xz";
     };
   };
   konquest = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/konquest-17.04.1.tar.xz";
-      sha256 = "08r3kanqhvfkfr7mk9c5xdlcag6knmqhbldvxj5f6ikf3al61n7g";
-      name = "konquest-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/konquest-17.04.2.tar.xz";
+      sha256 = "10apw2dj9xxrv4rw200lxb1iiqd2kpikb7njkf1x0h7c6lp7isxc";
+      name = "konquest-17.04.2.tar.xz";
     };
   };
   konsole = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/konsole-17.04.1.tar.xz";
-      sha256 = "0km8w0mjzywpzz7qq7fchm0s9q2pzrq72wsqsc5gbd1ip5wlgcmk";
-      name = "konsole-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/konsole-17.04.2.tar.xz";
+      sha256 = "1v37v4shq0k3kv8vqnp9b1ghdirjj3vsjcvalkiagz94w1g61vyl";
+      name = "konsole-17.04.2.tar.xz";
     };
   };
   kontact = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kontact-17.04.1.tar.xz";
-      sha256 = "1ik4qib3wsqw5vwnd794w3jig9zngsv3ss9jdlkw0y4q5695wrxi";
-      name = "kontact-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kontact-17.04.2.tar.xz";
+      sha256 = "12gd453gdxmwbnqrlnbbqnqxd8chpf57mnjv498nhjv6sfj6mshv";
+      name = "kontact-17.04.2.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kontactinterface-17.04.1.tar.xz";
-      sha256 = "1yb3dmfhsgm2pmbha3q22lzpfgj63d6qhanrwpmc2zy67r7r26ap";
-      name = "kontactinterface-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kontactinterface-17.04.2.tar.xz";
+      sha256 = "1q4fdf4lglq84n0pva7fdqq4fqbwkq9g0qyp5mfq3fhvzbba3as1";
+      name = "kontactinterface-17.04.2.tar.xz";
     };
   };
   kopete = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kopete-17.04.1.tar.xz";
-      sha256 = "1cv9fg4jr88w60ajgnbfhbvlylvxbv6r4j01sqmljwn8gsgbhpyi";
-      name = "kopete-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kopete-17.04.2.tar.xz";
+      sha256 = "0bicwm8r4rl4awxkpi4hin95n37yj4ln29gp0z6j97fzc7kpiqlj";
+      name = "kopete-17.04.2.tar.xz";
     };
   };
   korganizer = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/korganizer-17.04.1.tar.xz";
-      sha256 = "1dlv5gcv4ic7np4raxirgjcrlvmqkzmblhws1v0hwy49dximic88";
-      name = "korganizer-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/korganizer-17.04.2.tar.xz";
+      sha256 = "0lrxy232v2gn40sd63xspyszkmqn1v6l40zcxpv9r7x62wn4v55r";
+      name = "korganizer-17.04.2.tar.xz";
     };
   };
   kpat = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kpat-17.04.1.tar.xz";
-      sha256 = "15sxp8f7cr91s1iczqqnh92zsj027r67hq8a6sgkrkvsb5f3j9a8";
-      name = "kpat-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kpat-17.04.2.tar.xz";
+      sha256 = "1r8i5aisllg9ykgy75gfnma2y8v6y67fa91z6r0q16bg66l2ij44";
+      name = "kpat-17.04.2.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kpimtextedit-17.04.1.tar.xz";
-      sha256 = "1lazicp6a2j9pj4sh0q8cnd6k9imcr8j0l9y7ix3gad3mfh9m0y4";
-      name = "kpimtextedit-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kpimtextedit-17.04.2.tar.xz";
+      sha256 = "0d739nadn8n2393hq9rm2v8qx8l9jk7n1wgpbdbsddfq2lxz8g39";
+      name = "kpimtextedit-17.04.2.tar.xz";
     };
   };
   kppp = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kppp-17.04.1.tar.xz";
-      sha256 = "1wqam64c2gmmf1ckwwyhaf7n8sqzn7liy5jx0dr4icppxpprc6ki";
-      name = "kppp-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kppp-17.04.2.tar.xz";
+      sha256 = "1nm6kzjdwrl7206gwd47irhkj94vifxqhikc4g8jkvfh60rh87j8";
+      name = "kppp-17.04.2.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kqtquickcharts-17.04.1.tar.xz";
-      sha256 = "10bmkwq58yqkhchgz59gi3x8lb4lr8rhpwji3jysz3sfkvz765pi";
-      name = "kqtquickcharts-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kqtquickcharts-17.04.2.tar.xz";
+      sha256 = "0zjb7p3yxlpz8cyczsr9xwh44l7k1ddg1zwxqah91igdk7mc620x";
+      name = "kqtquickcharts-17.04.2.tar.xz";
     };
   };
   krdc = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/krdc-17.04.1.tar.xz";
-      sha256 = "0d5m8sizvjn6pbn63686vhfkh1cklxwjlphs2zrg0yaa00c71k2f";
-      name = "krdc-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/krdc-17.04.2.tar.xz";
+      sha256 = "0y8s28rwxjbpgq6kfhmrq9qr4h19iplfrgab7rb25zl881g9wycg";
+      name = "krdc-17.04.2.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kremotecontrol-17.04.1.tar.xz";
-      sha256 = "1855hsz5cndc26g7x0rw2k2mdvix80bi251dh5gz92w5d3jms9mz";
-      name = "kremotecontrol-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kremotecontrol-17.04.2.tar.xz";
+      sha256 = "1lw45vnarqw975zz38z9nnmqvk91j2viijl0sf4h2ikx0myqiif7";
+      name = "kremotecontrol-17.04.2.tar.xz";
     };
   };
   kreversi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kreversi-17.04.1.tar.xz";
-      sha256 = "1x99b5q03vhxxr3xy2qxh6rglcz3qld62s29bnykpbzl2h2wdy63";
-      name = "kreversi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kreversi-17.04.2.tar.xz";
+      sha256 = "1xhw4i4s7g7k3v4siprg2d1h9g4smqjwhz4qjzz236wmgky7na1b";
+      name = "kreversi-17.04.2.tar.xz";
     };
   };
   krfb = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/krfb-17.04.1.tar.xz";
-      sha256 = "115jrbf4nfdyks90gf1lmz7fl3cj07kqn0pg8mq1dhrv8vh4v6ys";
-      name = "krfb-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/krfb-17.04.2.tar.xz";
+      sha256 = "17lcv2kplawmvakashvrpk50g5ycw5fai4fiz0ijsj05ivqmrb6z";
+      name = "krfb-17.04.2.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kross-interpreters-17.04.1.tar.xz";
-      sha256 = "0mnfj0rjy6lv5ps6rmxr2ci16bsialpinnr7imh493rxhpnkaqa3";
-      name = "kross-interpreters-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kross-interpreters-17.04.2.tar.xz";
+      sha256 = "0m2adnwhdclhhql0v3g2ay31g7ly67m3782ryq0vp9r8rcd5ga1b";
+      name = "kross-interpreters-17.04.2.tar.xz";
     };
   };
   kruler = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kruler-17.04.1.tar.xz";
-      sha256 = "1dc4n8awj5hj8z843a4x10ijx4p5y5v1w26zvw5mfixznv3csry4";
-      name = "kruler-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kruler-17.04.2.tar.xz";
+      sha256 = "175c67m1wi9sl6is9f5pbsb3p6siyi9w7219p4ff6wbbjqjxpj2f";
+      name = "kruler-17.04.2.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksaneplugin-17.04.1.tar.xz";
-      sha256 = "1b35jksdyvqaqchdgixx7arbgwd9p6wpsqgvs3br4za4z2mccrvw";
-      name = "ksaneplugin-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksaneplugin-17.04.2.tar.xz";
+      sha256 = "16j4mpl9ick5d43rxnwmvfsb2wr5zgpmr3mlnmn99cvpr27v9mkg";
+      name = "ksaneplugin-17.04.2.tar.xz";
     };
   };
   kscd = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kscd-17.04.1.tar.xz";
-      sha256 = "18mdkkwr843kpb1hf45lvmmbl9m5nyzxx6i1yd3nllcja8ybdx0j";
-      name = "kscd-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kscd-17.04.2.tar.xz";
+      sha256 = "0cgxbhmmw8n7fwin3glzgfx0m1sdx2k4yhkrjislni3raiq4rv9x";
+      name = "kscd-17.04.2.tar.xz";
     };
   };
   kshisen = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kshisen-17.04.1.tar.xz";
-      sha256 = "0xpnn1hg73lmb1zhdzdq4wj99fmyn085n3kggqzb8w2mspl431r7";
-      name = "kshisen-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kshisen-17.04.2.tar.xz";
+      sha256 = "0644aadh6svdhxb64hzhnvm11w071gax6bj30r0ad3zbqljzhnfv";
+      name = "kshisen-17.04.2.tar.xz";
     };
   };
   ksirk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksirk-17.04.1.tar.xz";
-      sha256 = "0rjjgz6s05zv2clh9h75qlmdqq2dijd3avpg7hdczx425ji96fgh";
-      name = "ksirk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksirk-17.04.2.tar.xz";
+      sha256 = "0zh304xwknka6336avzpc5dvv2v6sl474d5q9vqzj8h0ybhdr5pb";
+      name = "ksirk-17.04.2.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksnakeduel-17.04.1.tar.xz";
-      sha256 = "10lqvf9904yc9rbmhicjbsq2dhnar55kk4dfp4w9lwy39snjpaxl";
-      name = "ksnakeduel-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksnakeduel-17.04.2.tar.xz";
+      sha256 = "137am9qi5wfg90b7zf4hk0nsa8pm9f8cj7iraij492d6naif8an5";
+      name = "ksnakeduel-17.04.2.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kspaceduel-17.04.1.tar.xz";
-      sha256 = "00sghhxbkpcig2r9sdhyfqkmlk03f34vf44iwma1lyi2vb22bjsj";
-      name = "kspaceduel-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kspaceduel-17.04.2.tar.xz";
+      sha256 = "0jkr7xbgrgnwa94fdr1w03xxy75nksr31wb1sr2b3kpwp5ax1380";
+      name = "kspaceduel-17.04.2.tar.xz";
     };
   };
   ksquares = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksquares-17.04.1.tar.xz";
-      sha256 = "11y7m98x1zxk3wk9bc91y9m9j5d4bhgzk504k0zq0nm4hbxrvj81";
-      name = "ksquares-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksquares-17.04.2.tar.xz";
+      sha256 = "07fn872d126wv0gcfd58jd72ypajlpkfcd4njzj0v05x6i0njir0";
+      name = "ksquares-17.04.2.tar.xz";
     };
   };
   kstars = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kstars-17.04.1.tar.xz";
-      sha256 = "0n2yjnaks4l2irfh978bdmifvrpfwgqlanvssibnnnarlq99mmbb";
-      name = "kstars-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kstars-17.04.2.tar.xz";
+      sha256 = "1r47l3zifb0carmgn0rv6wddqn483q9jadrwbahqp7b1yy14rkcj";
+      name = "kstars-17.04.2.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksudoku-17.04.1.tar.xz";
-      sha256 = "1ba79iy8qly5js7ak2gycvmbhqzh3wk3xkms5fphav06f9xxapd4";
-      name = "ksudoku-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksudoku-17.04.2.tar.xz";
+      sha256 = "11cvix24p1lpiss472yflcrwvygn0cxw4b5p9qhra643sx6bw5h5";
+      name = "ksudoku-17.04.2.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksystemlog-17.04.1.tar.xz";
-      sha256 = "0jjy6l8dvs56qn1gnb3zz5aigy3lz89f3xb412k500mx8sghlghn";
-      name = "ksystemlog-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksystemlog-17.04.2.tar.xz";
+      sha256 = "1sw5f89khflmcbwwd1z399bwlnnl2lqp2qrj7wfdxb7s91j4jk2m";
+      name = "ksystemlog-17.04.2.tar.xz";
     };
   };
   kteatime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kteatime-17.04.1.tar.xz";
-      sha256 = "1dnkpjxs5a1s5lz1kdxp51yaix5wbcxd93hljzv82kr8j60jgi06";
-      name = "kteatime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kteatime-17.04.2.tar.xz";
+      sha256 = "10yqww3hybjirncjsxpya08c49ca0ac6zn6anjc1mb9nvji203xb";
+      name = "kteatime-17.04.2.tar.xz";
     };
   };
   ktimer = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktimer-17.04.1.tar.xz";
-      sha256 = "0l34i73464jc2ij6ain01wg91047vfi020bxd3kn056064pv0fz7";
-      name = "ktimer-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktimer-17.04.2.tar.xz";
+      sha256 = "19b27l308xb70wbx06fxykdwzcan3cjf7naj51fgma4qcm6xjdir";
+      name = "ktimer-17.04.2.tar.xz";
     };
   };
   ktnef = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktnef-17.04.1.tar.xz";
-      sha256 = "1x112a71b2ccmhd9i3rpp7fjdns4338c3cwd3w6ajq5rwiw5nkw7";
-      name = "ktnef-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktnef-17.04.2.tar.xz";
+      sha256 = "0vpq81gyjr14xf94h654v8cmfvndhc9wn8zznp9a7jbpzp4wdfnj";
+      name = "ktnef-17.04.2.tar.xz";
     };
   };
   ktouch = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktouch-17.04.1.tar.xz";
-      sha256 = "1jx915vxln4iyxkv01fnpqsy3mwiyds1shpxah7ldm2jwxffb672";
-      name = "ktouch-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktouch-17.04.2.tar.xz";
+      sha256 = "17chk2vzvb8manyfcsnr73pfnvy128fi8g20r1gnidhgw6ix0s1r";
+      name = "ktouch-17.04.2.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-accounts-kcm-17.04.1.tar.xz";
-      sha256 = "1mgkbgj61y4y5jwi8mm7i94wgrdk4xm541srvyi2qj6hif6m46zg";
-      name = "ktp-accounts-kcm-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-accounts-kcm-17.04.2.tar.xz";
+      sha256 = "0kbnhkhw787bbgkpnchxkmwnzr2s4nqwmknzf34h613mlv7wspvg";
+      name = "ktp-accounts-kcm-17.04.2.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-approver-17.04.1.tar.xz";
-      sha256 = "03m7fp3bas46v9qf0mdcy429nmbbng12ypc73prw1y46i8qxhf5b";
-      name = "ktp-approver-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-approver-17.04.2.tar.xz";
+      sha256 = "0986j2yy57jzg5z4czmrjw625ihw1393mv8h8kqipw727vvchka9";
+      name = "ktp-approver-17.04.2.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-auth-handler-17.04.1.tar.xz";
-      sha256 = "0pd803ygjdv1ip27ipjwygzv0gs7a9wjkiv97cs0z5pwvy9aa9gl";
-      name = "ktp-auth-handler-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-auth-handler-17.04.2.tar.xz";
+      sha256 = "0hlch8d2fj6xnnd39v5q9vri8svn1852am1kbvvyws770kgldj49";
+      name = "ktp-auth-handler-17.04.2.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-call-ui-17.04.1.tar.xz";
-      sha256 = "0knn3nz6fml04yg8j9sl39w3c2kgnlhp416vsp0flnxaqlh2jpb2";
-      name = "ktp-call-ui-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-call-ui-17.04.2.tar.xz";
+      sha256 = "070ms5wyifqnc64x3r835vvbvn0l253qkn1li7bkqmsjg50q5sm7";
+      name = "ktp-call-ui-17.04.2.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-common-internals-17.04.1.tar.xz";
-      sha256 = "1jb3xjdr6jmawc5rdd6fp0di2gw0hqkqffbxnjvszdpnck2dk550";
-      name = "ktp-common-internals-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-common-internals-17.04.2.tar.xz";
+      sha256 = "01xrdn1609ag2kha3wp756fh4kszvcp8biky3cgp52qasmp6k4k2";
+      name = "ktp-common-internals-17.04.2.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-contact-list-17.04.1.tar.xz";
-      sha256 = "16qwkbhxk5n11j6f02wjq2sjid7apn8xxcn157pinhg0wfkvbysz";
-      name = "ktp-contact-list-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-list-17.04.2.tar.xz";
+      sha256 = "03iwx1xsd1scgw20s7n8cj7ai6cnlna19dd93s2a7r3z4jhwxkx0";
+      name = "ktp-contact-list-17.04.2.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-contact-runner-17.04.1.tar.xz";
-      sha256 = "1x7zkylc4p1al3ikb0srf4yx3p3qdwi2jas88pz7gyrs8sk1d3l0";
-      name = "ktp-contact-runner-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-runner-17.04.2.tar.xz";
+      sha256 = "1fal6g5zrh0s4wcxsqgps3a20xfdjc3pyw4dhdpgnsr6ig1z7rwn";
+      name = "ktp-contact-runner-17.04.2.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-desktop-applets-17.04.1.tar.xz";
-      sha256 = "0djjcd4rnqvjqijyygcaiv0p0yga5gx28lfqa3pjbwfqnqwp1r2q";
-      name = "ktp-desktop-applets-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-desktop-applets-17.04.2.tar.xz";
+      sha256 = "0306lar375vh2wr9g2iicjawd5rm5zh7vp81jl0hgmzx7kxcjxgz";
+      name = "ktp-desktop-applets-17.04.2.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-filetransfer-handler-17.04.1.tar.xz";
-      sha256 = "1f3ks1m30k496yxlhjnbxnnqmj6y3arxw0m2fwjykk5c4jxq6h3a";
-      name = "ktp-filetransfer-handler-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-filetransfer-handler-17.04.2.tar.xz";
+      sha256 = "044sr00rlcvxfw59f5m4i33jg4f8i77a8yjf3sdwjrnh03nsbjxz";
+      name = "ktp-filetransfer-handler-17.04.2.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-kded-module-17.04.1.tar.xz";
-      sha256 = "0smgqwbkfnkcyk86whrb1mazmglrmgczd5y3a0ah4ry5z0bqgv4m";
-      name = "ktp-kded-module-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-kded-module-17.04.2.tar.xz";
+      sha256 = "19f5kdd3g54791a7ilsaas5ibj3f8gb889n82gh88lq7q9zrs5f3";
+      name = "ktp-kded-module-17.04.2.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-send-file-17.04.1.tar.xz";
-      sha256 = "0pjc1qpx4jnvvpjvc5np3w2bsvkaryb8fa1zkx5a0dzcg0dwr7ab";
-      name = "ktp-send-file-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-send-file-17.04.2.tar.xz";
+      sha256 = "1ydwnmyqwbf5qjhy9w2z2788p7maa591nlc946ar32wg2sc6ik57";
+      name = "ktp-send-file-17.04.2.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-text-ui-17.04.1.tar.xz";
-      sha256 = "0jmpnv2mb4s9pxyifggj5qaafw9l54af3dgmgmpyhjyhl3g8rpcb";
-      name = "ktp-text-ui-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-text-ui-17.04.2.tar.xz";
+      sha256 = "1s5dhhc1ihnlz08a2vwalzmk6zm2kb157smn07a9ilq0l64psdqa";
+      name = "ktp-text-ui-17.04.2.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktuberling-17.04.1.tar.xz";
-      sha256 = "0plzn26j9kinaq2amm9x6mr57zl5mp79k7g74mrnpw1qbvvfbnsf";
-      name = "ktuberling-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktuberling-17.04.2.tar.xz";
+      sha256 = "18krcrj9xlajj3q6vspw79snwnliqc00djpq8ra6yg2l56xqbwym";
+      name = "ktuberling-17.04.2.tar.xz";
     };
   };
   kturtle = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kturtle-17.04.1.tar.xz";
-      sha256 = "0i8h202irr40lw5n1rwq4vzwd6ifmbhww8yfj4jlm2vacsc9qs7a";
-      name = "kturtle-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kturtle-17.04.2.tar.xz";
+      sha256 = "140j7xws7kfw0cf4axf0jgfk9ywvrds79906iwzf1nig8rbxrfy1";
+      name = "kturtle-17.04.2.tar.xz";
     };
   };
   kubrick = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kubrick-17.04.1.tar.xz";
-      sha256 = "0jasrbiafhxv5fdcmsrhwfszq5il6671ng4wlngmny660y850zh5";
-      name = "kubrick-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kubrick-17.04.2.tar.xz";
+      sha256 = "0pli70hkmb973j935fnjsaaml4gnck4jmzh3kph78wrhlxwqanqh";
+      name = "kubrick-17.04.2.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kwalletmanager-17.04.1.tar.xz";
-      sha256 = "0wn0z48nnay2ch6nqnkfz8lbwajcdy84xhxi1wbr7xm8w2qy07f1";
-      name = "kwalletmanager-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kwalletmanager-17.04.2.tar.xz";
+      sha256 = "1y1h7j6jg0nm5kfw03k5b9m39v5vfyflcfrfcqz4q19c3zx7msrw";
+      name = "kwalletmanager-17.04.2.tar.xz";
     };
   };
   kwave = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kwave-17.04.1.tar.xz";
-      sha256 = "1rzm48n3kgh8xhpvjg9r4ifa67v800q3km8fblznqzkarihmaiff";
-      name = "kwave-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kwave-17.04.2.tar.xz";
+      sha256 = "0zk3xq76asz1lq1bvn5xyrly9qwz1bvipwsj03psckzzm0j2wx2j";
+      name = "kwave-17.04.2.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kwordquiz-17.04.1.tar.xz";
-      sha256 = "024hypbi1d2j8vj2fnv1smqc0avp9b24lm6v15g50rhzrlzhz71s";
-      name = "kwordquiz-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kwordquiz-17.04.2.tar.xz";
+      sha256 = "00x9l00d3aq8jcg4522faj9mp94k0526i41ls3wvmfd7q1i18viz";
+      name = "kwordquiz-17.04.2.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libgravatar-17.04.1.tar.xz";
-      sha256 = "170ddmgclpw3ww1d7ars96ccygr9zpd9b8wxw2c93gjc2w92b9gd";
-      name = "libgravatar-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libgravatar-17.04.2.tar.xz";
+      sha256 = "1w36qj6n40k2yxva1qw9naag6zz05gcnia3sqmfamzxdji4l3nis";
+      name = "libgravatar-17.04.2.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkcddb-17.04.1.tar.xz";
-      sha256 = "1xyyy74nx8h0zljj0mf2i88jj6wrawi2n9wlzbcb5qn2jxbswkjk";
-      name = "libkcddb-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkcddb-17.04.2.tar.xz";
+      sha256 = "0cvy01krgvayc3hmsv55rrqjp72d27fz58clzw51p6zf2kvjn4q3";
+      name = "libkcddb-17.04.2.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkcompactdisc-17.04.1.tar.xz";
-      sha256 = "0s0a84vxy3lahjdsa18cwx1pm5pdlrrx780plw1phs0vv1wwyhiq";
-      name = "libkcompactdisc-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkcompactdisc-17.04.2.tar.xz";
+      sha256 = "1ywpghj4dy8ly15g55q8mhmx85xlxz3zasblhzsyxqh6rgwhnab6";
+      name = "libkcompactdisc-17.04.2.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkdcraw-17.04.1.tar.xz";
-      sha256 = "1a0qz0zrplyzfcsfgajflfxb0yiz51chfkjy2b9nmnrp43qbjrpy";
-      name = "libkdcraw-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkdcraw-17.04.2.tar.xz";
+      sha256 = "17dd68wlc7528prywps7slv6f9jfzbfhfmdlv20q0lzrjlxb2jxk";
+      name = "libkdcraw-17.04.2.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkdegames-17.04.1.tar.xz";
-      sha256 = "1zccwm3cdwdqimq6q0rbz6kcwqig721fq2gz6vip7ywv79f0a4rm";
-      name = "libkdegames-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkdegames-17.04.2.tar.xz";
+      sha256 = "07vs2077w7g6hvzaa9m7p6w3qc9daly174x7sq5an3wxb78zaj4k";
+      name = "libkdegames-17.04.2.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkdepim-17.04.1.tar.xz";
-      sha256 = "10dlvlh01c3mm84sbk9zkmcfclzs2n38ga0w1p7cnqj1ln7p497x";
-      name = "libkdepim-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkdepim-17.04.2.tar.xz";
+      sha256 = "1s6vvbxjrhvgc147ila9ryy5z1c76dqc9nrxdblkdk36kgj193xs";
+      name = "libkdepim-17.04.2.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkeduvocdocument-17.04.1.tar.xz";
-      sha256 = "008d1cpxv9by2b4a7bbf0k0g9pib5nc22k6hxcpg6qds2wivdgxn";
-      name = "libkeduvocdocument-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkeduvocdocument-17.04.2.tar.xz";
+      sha256 = "1lakkz3ffp3qkhp15l8g04f1izgigv96ravj13yqvlafcj0l4wwh";
+      name = "libkeduvocdocument-17.04.2.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkexiv2-17.04.1.tar.xz";
-      sha256 = "1a01y4hd4ysz3icp2l88qly2mzpy5kgr97zs8ck62p4dr8p06q62";
-      name = "libkexiv2-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkexiv2-17.04.2.tar.xz";
+      sha256 = "113gfmdvk85mlgq97hi5n4sn0ar55qy4lvrngzp70hr5gyk6jx87";
+      name = "libkexiv2-17.04.2.tar.xz";
     };
   };
   libkface = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkface-17.04.1.tar.xz";
-      sha256 = "0hjq0zv36fp2yyryiz3bbq0v15xl6qhnlpj1ixx3d6krmc5pkyia";
-      name = "libkface-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkface-17.04.2.tar.xz";
+      sha256 = "04cp6fqji8s6zsv09nbdkv9ikff5df5gb2nqbfdhh5hdyl5k9a6y";
+      name = "libkface-17.04.2.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkgapi-17.04.1.tar.xz";
-      sha256 = "19iv2mzmr3wp1grnjdmck4i22jagjzr49lnpdb5ljgyf0xlqzwir";
-      name = "libkgapi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkgapi-17.04.2.tar.xz";
+      sha256 = "1awcfwf1haa38vnr5273y5xk9b64s7m139aqgyr7r72czm96ql8s";
+      name = "libkgapi-17.04.2.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkgeomap-17.04.1.tar.xz";
-      sha256 = "1bh4h2ymb4gh0bhqg8akwpq9d8a5vcwiscavnnc9ihjjhnhzz79w";
-      name = "libkgeomap-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkgeomap-17.04.2.tar.xz";
+      sha256 = "0gbri3vfan9n3za0qd5bzbwvmkslbsylg5rw11zlcl9r8c5yz23p";
+      name = "libkgeomap-17.04.2.tar.xz";
     };
   };
   libkipi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkipi-17.04.1.tar.xz";
-      sha256 = "0bqxjhj9h22r7i770ibfsxzyxp9y81174xvn9fvi0v77m2myfnb4";
-      name = "libkipi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkipi-17.04.2.tar.xz";
+      sha256 = "0spy876l7mzpb1kgbwxpi8nfyysd1xijg2ilbvbiisxf92krvxny";
+      name = "libkipi-17.04.2.tar.xz";
     };
   };
   libkleo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkleo-17.04.1.tar.xz";
-      sha256 = "1541aalr8pw690qp2rh133yyby877c5fiz1x3qmzhznm7jhjh293";
-      name = "libkleo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkleo-17.04.2.tar.xz";
+      sha256 = "05pz45g11sxjcmijdklb4kp2n7ydi33vbdfl43fjl0s7rv7vmzr4";
+      name = "libkleo-17.04.2.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkmahjongg-17.04.1.tar.xz";
-      sha256 = "0wjyy5ic7draw09s8kfcng6m0bp0sxd0nr1vqgfcjg4gqicdqpc7";
-      name = "libkmahjongg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkmahjongg-17.04.2.tar.xz";
+      sha256 = "1dd58zz8zlcrwwn1zkhp2lw8h83fwiajaxf2yibwbk0bza1ydp3r";
+      name = "libkmahjongg-17.04.2.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkomparediff2-17.04.1.tar.xz";
-      sha256 = "1rc0kvxjmnwhaadl6f9x61n4lnr50g7w0k8d7k9y73fib60wjcvp";
-      name = "libkomparediff2-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkomparediff2-17.04.2.tar.xz";
+      sha256 = "156s5lyna9wgj1cfqm36snyax9hybsr9xa72n246a94z81r6afsz";
+      name = "libkomparediff2-17.04.2.tar.xz";
     };
   };
   libksane = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libksane-17.04.1.tar.xz";
-      sha256 = "15qmlrxhs45xscjsrnr8c0ag20l4wclmbbmsb3cpa35lrfh5ybp0";
-      name = "libksane-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libksane-17.04.2.tar.xz";
+      sha256 = "12h6l6wa8g2qfddl9ylm9q4f8f2w7bgmii1v6yrmfb4nyr4bflda";
+      name = "libksane-17.04.2.tar.xz";
     };
   };
   libksieve = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libksieve-17.04.1.tar.xz";
-      sha256 = "0i5qy9skd100y4khsr8wnyibz2jmjk5gwz21afhx6hrrv5sv8bbg";
-      name = "libksieve-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libksieve-17.04.2.tar.xz";
+      sha256 = "0kz8nzd3cgipc3s3zif57d681ddb6xmb7kid25j3aypcz0i7gck1";
+      name = "libksieve-17.04.2.tar.xz";
     };
   };
   lokalize = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/lokalize-17.04.1.tar.xz";
-      sha256 = "06kvrg6dm4hm7dz2lkxmqk5q2nqpxhwcqfwgh1bzlp7lydych5nx";
-      name = "lokalize-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/lokalize-17.04.2.tar.xz";
+      sha256 = "0a85gjj40r5iw6mf190s4r4c4xsh1nfixj15g86acz02dn43zapn";
+      name = "lokalize-17.04.2.tar.xz";
     };
   };
   lskat = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/lskat-17.04.1.tar.xz";
-      sha256 = "1062qyih9dsybkp5njd6r71r6hz6ymm60gga7v17sfj98995znwb";
-      name = "lskat-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/lskat-17.04.2.tar.xz";
+      sha256 = "0blnnyb7q6vxblvi6f1xigln70m1vjfpwav05qhm7msblhh5qp2j";
+      name = "lskat-17.04.2.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/mailcommon-17.04.1.tar.xz";
-      sha256 = "15gykamn47cc2n9k7b7dwly3h1s6j3j9hqr68p2bv6sf11jg32sn";
-      name = "mailcommon-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/mailcommon-17.04.2.tar.xz";
+      sha256 = "1f826r9m0xb418sqgx9lb23zf5am6cmgvcrx2d54c2va2vq97xgk";
+      name = "mailcommon-17.04.2.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/mailimporter-17.04.1.tar.xz";
-      sha256 = "0h7hy57sm9f2wivwd82fpw6jrrl546hapca2bxmnm1z654amh480";
-      name = "mailimporter-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/mailimporter-17.04.2.tar.xz";
+      sha256 = "06q8k3x2nvhbgk1kh542rmqnc5c0hj4yzwl1c1clvjwlw7vpxdwh";
+      name = "mailimporter-17.04.2.tar.xz";
     };
   };
   marble = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/marble-17.04.1.tar.xz";
-      sha256 = "1hr8lgc23m7lbai92nh8jms4v1iqw4gj8yh78manyhdam42h1vm5";
-      name = "marble-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz";
+      sha256 = "1z24infjp65d2s2zlcvr0v9425a6wxwkaz262mvqqvx64qmhd6ca";
+      name = "marble-17.04.2.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/mbox-importer-17.04.1.tar.xz";
-      sha256 = "1bndznqwhgn5cpp06wdq5qap324cmh2yqxcmrbfz2cf2hb1bdqgs";
-      name = "mbox-importer-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/mbox-importer-17.04.2.tar.xz";
+      sha256 = "1mq3wbj9fcrcny4m9vs4gk0cw7xyxv1sbpby0wl6a63hb6r4nvca";
+      name = "mbox-importer-17.04.2.tar.xz";
     };
   };
   messagelib = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/messagelib-17.04.1.tar.xz";
-      sha256 = "17fdz2c4n7wl3895cmxs245bzv6w7g6sgz95fs1il94ghj70ldqc";
-      name = "messagelib-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/messagelib-17.04.2.tar.xz";
+      sha256 = "1fxajqxigfknl7ll755blz1ypy99idgr3gmi3p37ca3ld10f7ffv";
+      name = "messagelib-17.04.2.tar.xz";
     };
   };
   minuet = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/minuet-17.04.1.tar.xz";
-      sha256 = "0qqgld8rf99n9djbkz1i2s5d2kx163hpc6fpk5gabjkkm7m0rsbn";
-      name = "minuet-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/minuet-17.04.2.tar.xz";
+      sha256 = "0p2ii0wfqswliqf4fk04mx9z6nfhifa11l2w7bid4aj78b29138g";
+      name = "minuet-17.04.2.tar.xz";
     };
   };
   okteta = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/okteta-17.04.1.tar.xz";
-      sha256 = "1kg4s88vfapdn349jl76l4rdhvp45hzb6chs00akb3n40migx7yn";
-      name = "okteta-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/okteta-17.04.2.tar.xz";
+      sha256 = "0w1xi3kd083dss69gnq4ghmhfr3w2cz42jbfjsaidzf4qcqlfr40";
+      name = "okteta-17.04.2.tar.xz";
     };
   };
   okular = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/okular-17.04.1.tar.xz";
-      sha256 = "17mw0j3ngrwj39bjr0nsx3jl4vq8sra7x13zldy2pjryx236hh7g";
-      name = "okular-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/okular-17.04.2.tar.xz";
+      sha256 = "0rqc6h3zb48smrmp835zk4agvlwnmjwmzwv3rh3lgwfw9i3jq2zf";
+      name = "okular-17.04.2.tar.xz";
     };
   };
   palapeli = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/palapeli-17.04.1.tar.xz";
-      sha256 = "0mx60j52i8dr9wq6hhls8zvrrlc42j3f1fc8zqz1mmvqyym8053j";
-      name = "palapeli-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/palapeli-17.04.2.tar.xz";
+      sha256 = "0lcdkpvqmlsj73z88pi8v2hxd57bbbxlvf5yqj3zw33xb4nxw9bd";
+      name = "palapeli-17.04.2.tar.xz";
     };
   };
   parley = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/parley-17.04.1.tar.xz";
-      sha256 = "0is581jhb17zzhy7jbrqfy1r33wcrficfbvrv989i45jhcp3hr2h";
-      name = "parley-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/parley-17.04.2.tar.xz";
+      sha256 = "02pcyl8lnpxi936k6i7hah7vzlwzsag7lpsc0ly6q6q9rm4iwkqj";
+      name = "parley-17.04.2.tar.xz";
     };
   };
   picmi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/picmi-17.04.1.tar.xz";
-      sha256 = "0byhmm9sczl0swibg89hl6sq9m8hba6pn9q0sfjsa1y8k3h34mi7";
-      name = "picmi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/picmi-17.04.2.tar.xz";
+      sha256 = "0dqqaqfrqxwcp9daxfs8qmbf4kj6gn68v6l7dhj5r9mjvva0r4p5";
+      name = "picmi-17.04.2.tar.xz";
     };
   };
   pimcommon = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/pimcommon-17.04.1.tar.xz";
-      sha256 = "16x789mf7zgxdig48ixz0n4x4iq3ik4dgr60ka2qwfvcqgli4sx2";
-      name = "pimcommon-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/pimcommon-17.04.2.tar.xz";
+      sha256 = "1yvhf7hd2gm734i7k4smg57xq15wspbiq909crxs0ga82qx09hcg";
+      name = "pimcommon-17.04.2.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/pim-data-exporter-17.04.1.tar.xz";
-      sha256 = "03wj8hjn1d6jkamh1p06jcpm8f2sxdimkxdzhd7s08rhdi3pz90n";
-      name = "pim-data-exporter-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/pim-data-exporter-17.04.2.tar.xz";
+      sha256 = "1q5qb4jbfdwp7h8d0drx0fyzmb7ffpcfrmirw22z8xk50r2r4v0i";
+      name = "pim-data-exporter-17.04.2.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/pim-sieve-editor-17.04.1.tar.xz";
-      sha256 = "0cfc0hj3d5xgq4v8z9pmzwb161qvvrcsrg5wsk99hw05dydz6sfc";
-      name = "pim-sieve-editor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/pim-sieve-editor-17.04.2.tar.xz";
+      sha256 = "17aymflaqwci21h70s3lb8cfmh1qkynaswfkjqipravk58a302ni";
+      name = "pim-sieve-editor-17.04.2.tar.xz";
     };
   };
   poxml = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/poxml-17.04.1.tar.xz";
-      sha256 = "00hljgjacsmr8kjh37m7bsvk3a0h35q8zjrdj2m2wdj65x7hw517";
-      name = "poxml-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/poxml-17.04.2.tar.xz";
+      sha256 = "1cv7k4xilpx75z07l6mpzwinxn1cdw6h1qglqhs5i35ii4cbbw40";
+      name = "poxml-17.04.2.tar.xz";
     };
   };
   print-manager = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/print-manager-17.04.1.tar.xz";
-      sha256 = "1hjnfzihcn9mh9k9w6a2zjzly2cd2xn8fc96sa4c82pvb0606a7b";
-      name = "print-manager-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/print-manager-17.04.2.tar.xz";
+      sha256 = "19hs25cgf54c6igm0sp5by4fayaz1w793drwz1szcl5b631sdywj";
+      name = "print-manager-17.04.2.tar.xz";
     };
   };
   rocs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/rocs-17.04.1.tar.xz";
-      sha256 = "0jja9nd8c8i06vmc2n71d4pynxp868zzahcr3mvf3s4cvm6ysq6l";
-      name = "rocs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/rocs-17.04.2.tar.xz";
+      sha256 = "0ahrbxs675zvwb81fmlp55hz72xx8zlzwjgq01p03ih8jsq71s4j";
+      name = "rocs-17.04.2.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/signon-kwallet-extension-17.04.1.tar.xz";
-      sha256 = "0m91afp5haissvi8jl0mk0b6q55hm9vkjya0dff4vgzlsas5kilg";
-      name = "signon-kwallet-extension-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/signon-kwallet-extension-17.04.2.tar.xz";
+      sha256 = "1qcv8b5bmjd2dklbd4msp3cmh61qp6z6ml2ps6gzx4la1vp6qfmv";
+      name = "signon-kwallet-extension-17.04.2.tar.xz";
     };
   };
   spectacle = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/spectacle-17.04.1.tar.xz";
-      sha256 = "0jzcc63xlpmp88af381nrckqd0yd6hbbh0a8jhipxcf6p3f13sjw";
-      name = "spectacle-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/spectacle-17.04.2.tar.xz";
+      sha256 = "1hab13wky0i7688jrzqy2m4kc49mz7fxjjk8z1rw2f4dxxaiymhf";
+      name = "spectacle-17.04.2.tar.xz";
     };
   };
   step = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/step-17.04.1.tar.xz";
-      sha256 = "1rln0vczinvk2hm0hvmy62rk5yywdik8kprjs1axdhm9l4rnvy2h";
-      name = "step-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/step-17.04.2.tar.xz";
+      sha256 = "16mhi1z5x403764k5csnr60zg2nwkjj7b3b39kqv1qb9540dmb2y";
+      name = "step-17.04.2.tar.xz";
     };
   };
   svgpart = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/svgpart-17.04.1.tar.xz";
-      sha256 = "1aqnn5s275rz7axgmn1w6zv4109m2kbmw0lk2g1179vfgip8zwss";
-      name = "svgpart-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/svgpart-17.04.2.tar.xz";
+      sha256 = "1cns31z5pr78ilc1mhls31dchddwwzzwvbfddhygy2513067pca4";
+      name = "svgpart-17.04.2.tar.xz";
     };
   };
   sweeper = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/sweeper-17.04.1.tar.xz";
-      sha256 = "176qx6g6mamqkzsyi2vn4574h5dgcci4hmx4nxq4zcdzxamixq78";
-      name = "sweeper-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/sweeper-17.04.2.tar.xz";
+      sha256 = "0zarr01q1v3yq0ipb213i48q27qivrgcrhvynw7livs5s35mx844";
+      name = "sweeper-17.04.2.tar.xz";
     };
   };
   syndication = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/syndication-17.04.1.tar.xz";
-      sha256 = "0hw22qvlslichvjgpis1zwmj1cbk2fwkmkshwpf02bz38kzpls1m";
-      name = "syndication-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/syndication-17.04.2.tar.xz";
+      sha256 = "19flj4f552yvvaih3wvw3i2p2nl60f5pgnl1ylimz5ga0c074vqq";
+      name = "syndication-17.04.2.tar.xz";
     };
   };
   umbrello = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/umbrello-17.04.1.tar.xz";
-      sha256 = "0dmkdzrgn004j59s97m34mz54zs23rkbp70cypksvl1mc0vg1h3v";
-      name = "umbrello-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/umbrello-17.04.2.tar.xz";
+      sha256 = "0jhxifv8s9a0pg6g2vlla901fwral8gyzzhy1mxbah907mj912k1";
+      name = "umbrello-17.04.2.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/zeroconf-ioslave-17.04.1.tar.xz";
-      sha256 = "1yqpkmvcx7zbx17qlcimqshn2iivyji70zwb8g3lg78asxil02n2";
-      name = "zeroconf-ioslave-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/zeroconf-ioslave-17.04.2.tar.xz";
+      sha256 = "10fm62dik7a0pnram7mdraryrbk1sscsp9i46j6sp243ndd13015";
+      name = "zeroconf-ioslave-17.04.2.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 29a3e3726ad..1ebc6553ff2 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.10.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.2/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 1be04bf3cb7..480b11622c0 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' )
-- 
GitLab


From 76beb0831384b5ae53592513507524990017e973 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 19 Jun 2017 13:43:19 +0200
Subject: [PATCH 0936/1490] python.pkgs: several maintenance bumps

---
 pkgs/development/python-modules/Nikola/default.nix       | 4 ++--
 pkgs/development/python-modules/aenum/default.nix        | 4 ++--
 pkgs/development/python-modules/asgi_redis/default.nix   | 4 ++--
 pkgs/development/python-modules/channels/default.nix     | 4 ++--
 pkgs/development/python-modules/edward/default.nix       | 4 ++--
 pkgs/development/python-modules/fonttools/default.nix    | 4 ++--
 pkgs/development/python-modules/keras/default.nix        | 4 ++--
 pkgs/development/python-modules/markdown2.nix            | 4 ++--
 pkgs/development/python-modules/netcdf4/default.nix      | 4 ++--
 pkgs/development/python-modules/phonenumbers/default.nix | 4 ++--
 pkgs/development/python-modules/plotly/default.nix       | 4 ++--
 pkgs/development/python-modules/pyroute2/default.nix     | 4 ++--
 pkgs/development/python-modules/trezor/default.nix       | 4 ++--
 pkgs/development/python-modules/typed-ast/default.nix    | 4 ++--
 pkgs/development/python-modules/xarray/default.nix       | 4 ++--
 pkgs/development/python-modules/yarl/default.nix         | 4 ++--
 16 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index 5ba7c0d0413..a4127806853 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -30,7 +30,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Nikola";
-  version = "7.8.7";
+  version = "7.8.8";
 
   # Nix contains only Python 3 supported version of doit, which is a dependency
   # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d9c77ce9758cc0e848d4c99229a28314e8bd2a590c77c56540fa919fca4d779f";
+    sha256 = "a45272e96ea8311e79ab6ea5523d792207d549cba418d623f03bf80d5e5e3e5a";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index 61edcca4804..3aa03aaa599 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aenum";
-  version = "2.0.7";
+  version = "2.0.8";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c5db863b5531cc059313018e57bc765b0ef1fc96ba799f105ea45d99b1c2d23";
+    sha256 = "3209fa41b8c41345442e8d9b5158a57d3e96d84c3d5ebbe8e521e1e2eff1598d";
   };
 
   doCheck = !isPy3k;
diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
index 1ca6f417bd8..c289a096d83 100644
--- a/pkgs/development/python-modules/asgi_redis/default.nix
+++ b/pkgs/development/python-modules/asgi_redis/default.nix
@@ -2,13 +2,13 @@
   asgiref, asgi_ipc, msgpack, six, redis, cryptography
 }:
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.4.1";
   pname = "asgi_redis";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";
-    sha256 = "ec137829a9ebfb0de1c034bc699240c9747b97a3eb2dc4df6c812f82290a0f9f";
+    sha256 = "71a6147c8b08833815993f16e2b665a0e5483fae392f03decb8da54ed0882904";
   };
 
   # Requires a redis server available
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index e99fcdc4802..0a445b4c651 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   pname = "channels";
   name = "${pname}-${version}";
-  version = "1.1.3";
+  version = "1.1.5";
 
   src = fetchurl {
     url = "mirror://pypi/c/channels/${name}.tar.gz";
-    sha256 = "182war437i6wsxwf2v4szn8ig0nkpinpn4n27fxhh5q8w832hj93";
+    sha256 = "a9005bcb6104d26a7f93d9cf012bcf6765a0ff444a449ac68d6e1f16721f8ed3";
   };
 
   # Files are missing in the distribution
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index 4d78acf78de..93ac292282a 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "edward";
-  version = "1.3.2";
+  version = "1.3.3";
   name  = "${pname}-${version}";
 
   disabled = !(isPy27 || pythonAtLeast "3.4");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "24aa0bf237965f47dd39d2b2ff43718ba75cb12c471b26ff80a972a66ff32de3";
+    sha256 = "104d58321c5040235b3039ae3215c3c7881073e6aa88bb0b8ca1141ca87c4891";
   };
 
   # disabled for now due to Tensorflow trying to create files in $HOME:
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index b9ef3ba94b6..602fa50d00c 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.13.0";
+  version = "3.13.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5ec278ff231d0c88afe8266e911ee0f8e66c8501c53f5f144a1a0abbc936c6b8";
+    sha256 = "ded1f9a6cdd6ed19a3df05ae40066d579ffded17369b976f9e701cf31b7b1f2d";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index c397ff43074..43e576b1b31 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.0.4";
+  version = "2.0.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cbe62af6821963321b275d5598fd94e63c11feaa1d4deaa79c9eb9ee0e1d68a";
+    sha256 = "cbce24758530e070fe1b403d6d21391cbea78c037b70bf6afc1ca9f1f8269eff";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2.nix
index e5c22bc4dc6..f614eb0747b 100644
--- a/pkgs/development/python-modules/markdown2.nix
+++ b/pkgs/development/python-modules/markdown2.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "markdown2";
-  version = "2.3.1";
+  version = "2.3.4";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/m/markdown2/${name}.zip";
-    sha256 = "03nqcx79r9lr5gp2zpqa1n54hnxqczdq27f2j3aazr3r9rsxsqs4";
+    sha256 = "264731e7625402227ff6fb01f2d814882da7705432659a18a419c508e8bfccb1";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 8f06957bf22..75b4723b0b5 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -4,13 +4,13 @@
 buildPythonPackage rec {
   pname = "netCDF4";
   name = "${pname}-${version}";
-  version = "1.2.8";
+  version = "1.2.9";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
-    sha256 = "31eb4eae5fd3b2bd8f828721142ddcefdbf10287281bf6f636764dd7957f8450";
+    sha256 = "259edab1f03b1c1b93bdbaa804d50211a0c9d8a15eee4f23988b5685c6c0d2c0";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 5c1d69b00be..aba0631a536 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.5.0";
+  version = "8.5.1";
   name = "${pname}-${version}";
 
   meta = {
@@ -14,6 +14,6 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
-    sha256 = "6d3d82a3dcb0418431099d1b1c24efb280cbec8f81c7ce3d1abf417c238b8859";
+    sha256 = "b7d1a5832650fad633d1e4159873788ebfb15e053292c20ab9f5119a574f3a67";
   };
 }
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 4c78ac63d30..383dbd1e08f 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.0.9";
+  version = "2.0.10";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b82ec9e09179b5191297b82a3f89f61055b730b09a1821c71fac18e82857e8f";
+    sha256 = "8c013a01bb11c4c269c38a7086ffb92d6a2827922c49706131842498a49b3b81";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 757933bd6b6..de1651ec2b0 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.4.15";
+  version = "0.4.16";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-    sha256 = "273530e78261ac5e9e2985f12fad9e6c4231f8e49b8c285c05a23dcda5afce58";
+    sha256 = "5c692efd83369cb44086572b3e1e95ab11f1bc516a89c8ca2429795a789f32a9";
   };
 
   # requires root priviledges
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 6fc6622cf3f..29e6a7d1743 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "trezor";
-  version = "0.7.13";
+  version = "0.7.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d05f388bb56b6f61cc727999cc725078575238a0b6172450322bc55c437fefe5";
+    sha256 = "f7e4f509263ca172532b4c0a440d164add7cdc021b4370a253d51eba5806b618";
   };
 
   propagatedBuildInputs = [ protobuf3_0 hidapi ];
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 213f2d33f3b..45aea2de1a4 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,11 +1,11 @@
 { buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }:
 buildPythonPackage rec {
   pname = "typed-ast";
-  version = "1.0.3";
+  version = "1.0.4";
   name = "${pname}-${version}";
   src = fetchPypi{
     inherit pname version;
-    sha256 = "67184179697ea9128fa8fec1d3b4e26b41d6a2eceab4674c6e3da4b024309862";
+    sha256 = "73f09aac0119f6664a3f471a1ec1c9b719f572bc9212913cea96a78b22c2e96e";
   };
   # Only works with Python 3.3 and newer;
   disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index fe0497bc0e8..7b9712dfd02 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "0.9.5";
+  version = "0.9.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d23bfcc317829570daa1fe8306ad7ff62cd77847bbd68e3ffc53d847bff7c36d";
+    sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 03732c5343b..0455efc3127 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -8,12 +8,12 @@
 
 let
   pname = "yarl";
-  version = "0.10.2";
+  version = "0.10.3";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "a042c5b3584531cd09cd5ca647f71553df7caaa3359b9b3f7eb34c3b1045b38d";
+    sha256 = "27b24ba3ef3cb8475aea1a655a1750bb11918ba139278af21db5846ee9643138";
   };
 
   buildInputs = [ pytest pytestrunner ];
-- 
GitLab


From 56be4bee34ad4913f5697f6c920090ab5651c668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 19 Jun 2017 13:54:55 +0200
Subject: [PATCH 0937/1490] cabal-install: fix closure size on OSX

---
 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 bf94bb7045a..642da50bd49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5427,7 +5427,7 @@ with pkgs;
 
   inherit (haskellPackages) ghc;
 
-  cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install;
+  cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install;
 
   stack = haskell.lib.justStaticExecutables haskellPackages.stack;
   hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
-- 
GitLab


From 7f89293051e96549bd7f1ef0f0a148d459a16766 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Fri, 16 Jun 2017 12:58:02 +0200
Subject: [PATCH 0938/1490] gnash: init at 0.8.11-2017-03-08

---
 pkgs/misc/gnash/default.nix     | 120 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |   2 +
 2 files changed, 122 insertions(+)
 create mode 100644 pkgs/misc/gnash/default.nix

diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
new file mode 100644
index 00000000000..d7a6cebcc56
--- /dev/null
+++ b/pkgs/misc/gnash/default.nix
@@ -0,0 +1,120 @@
+{ stdenv, fetchgit, autoreconfHook
+, pkgconfig, libtool, boost, SDL
+, glib, pango, gettext, curl, xorg
+, libpng, libjpeg, giflib, speex, atk
+
+# renderers
+, enableAGG    ? true,  agg   ? null
+, enableCairo  ? false, cairo ? null
+, enableOpenGL ? false, mesa  ? null
+
+# GUI toolkits
+, enableGTK ? true,  gtk2 ? null, gnome2 ? null, gnome3 ? null
+, enableSDL ? false
+, enableQt  ? false, qt4  ? null
+
+# media
+, enableFFmpeg    ? true,  ffmpeg_2 ? null
+, enableGstreamer ? false, gst-plugins-base ? null
+                         , gst-plugins-ugly ? null
+                         , gst-ffmpeg ? null
+
+# misc
+, enableJemalloc ? true, jemalloc  ? null
+, enableHwAccel  ? true
+, enablePlugins  ? false, xulrunner ? null, npapi_sdk ? null
+}:
+
+with stdenv.lib;
+
+let 
+  available = x: x != null;
+
+  sound =
+    if enableFFmpeg    then "ffmpeg" else
+    if enableGstreamer then "gst"    else "none";
+
+  renderers = []
+    ++ optional enableAGG    "agg"
+    ++ optional enableCairo  "cairo"
+    ++ optional enableOpenGL "opengl";
+
+  toolkits = []
+    ++ optional enableGTK "gtk"
+    ++ optional enableSDL "sdl"
+    ++ optional enableQt  "qt4";
+
+in
+
+# renderers
+assert enableAGG    -> available agg;
+assert enableCairo  -> available cairo;
+assert enableOpenGL -> available mesa;
+
+# GUI toolkits
+assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ];
+assert enableSDL -> available SDL;
+assert enableQt  -> available qt4;
+
+# media libraries
+assert enableFFmpeg    -> available ffmpeg_2 ;
+assert enableGstreamer -> all available [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
+
+# misc
+assert enableJemalloc -> available jemalloc;
+assert enableHwAccel  -> available mesa;
+assert enablePlugins  -> all available [ xulrunner npapi_sdk ];
+
+assert length toolkits  == 0 -> throw "at least one GUI toolkit must be enabled";
+assert length renderers == 0 -> throw "at least one renderer must be enabled";
+
+
+stdenv.mkDerivation rec {
+  name = "gnash-${version}";
+  version = "0.8.11-2017-03-08";
+
+  src = fetchgit {
+    url = "git://git.sv.gnu.org/gnash.git";
+    rev = "8a11e60585db4ed6bc4eafadfbd9b3123ced45d9";
+    sha256 = "1qas084gc4s9cb2jbwi2s1h4hk7m92xmrsb596sd14h0i44dai02";
+  };
+
+  postPatch = ''
+    sed -i 's|jemalloc.h|jemalloc/jemalloc.h|' libbase/jemalloc_gnash.c
+  '';
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
+  buildInputs = [
+    glib gettext boost curl SDL speex
+    xorg.libXmu xorg.libSM xorg.libXt
+    libpng libjpeg giflib pango atk
+  ] ++ optional  enableAGG       agg
+    ++ optional  enableCairo     cairo
+    ++ optional  enableOpenGL    mesa
+    ++ optional  enableQt        qt4
+    ++ optional  enableFFmpeg    ffmpeg_2
+    ++ optional  enableJemalloc  jemalloc
+    ++ optional  enableHwAccel   mesa
+    ++ optionals enablePlugins   [ xulrunner npapi_sdk ]
+    ++ optionals enableGTK       [ gtk2 gnome2.gtkglext gnome3.gconf ]
+    ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
+
+  configureFlags = with stdenv.lib; [
+    "--with-boost-incl=${boost.dev}/include"
+    "--with-boost-lib=${boost.out}/lib"
+    "--enable-renderer=${concatStringsSep "," renderers}"
+    "--enable-gui=${concatStringsSep "," toolkits}"
+    "--enable-media=${sound}"
+    "--with-npapi-install=prefix"
+    (enableFeature enablePlugins  "plugins")
+    (enableFeature enableJemalloc "jemalloc")
+    (optionalString enableHwAccel "--enable-device=egl")
+  ];
+
+  meta = {
+    homepage    = https://savannah.gnu.org/projects/gnash;
+    description = "A flash (SWF) player and browser plugin";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ rnhmjoj ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf94bb7045a..da2d7b967a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2082,6 +2082,8 @@ with pkgs;
 
   gmvault = callPackage ../tools/networking/gmvault { };
 
+  gnash = callPackage ../misc/gnash { };
+
   gnaural = callPackage ../applications/audio/gnaural {
     stdenv = overrideCC stdenv gcc49;
   };
-- 
GitLab


From 9d0441434db401bf5fbfb0b8681e17ce7a04f3cb Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 01:47:09 +0200
Subject: [PATCH 0939/1490] jackaudio: 1.9.10 -> 1.9.11-RC1

---
 .../libraries/libsoundio/default.nix          |  4 +-
 pkgs/misc/jackaudio/default.nix               | 20 ++---
 pkgs/misc/jackaudio/jack-gcc5.patch           | 26 -------
 pkgs/misc/jackaudio/unstable.nix              | 78 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 5 files changed, 8 insertions(+), 121 deletions(-)
 delete mode 100644 pkgs/misc/jackaudio/jack-gcc5.patch
 delete mode 100644 pkgs/misc/jackaudio/unstable.nix

diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index 788a5db13cd..18d18941b88 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2Unstable, libpulseaudio }:
+{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   version = "1.1.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p";
   };
 
-  buildInputs = [ cmake alsaLib libjack2Unstable libpulseaudio ];
+  buildInputs = [ cmake alsaLib libjack2 libpulseaudio ];
 
   meta = with stdenv.lib; {
     description = "Cross platform audio input and output";
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index a38c9b76410..62c734859d5 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper
-, bash, libsamplerate, libsndfile, readline
+{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
+, bash, libsamplerate, libsndfile, readline, eigen, celt
 
 # Optional Dependencies
 , dbus ? null, libffado ? null, alsaLib ? null
@@ -24,32 +24,24 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}jack2-${version}";
-  version = "1.9.10";
+  version = "1.9.11-RC1";
 
   src = fetchFromGitHub {
     owner = "jackaudio";
     repo = "jack2";
     rev = "v${version}";
-    sha256 = "1a2213l7x6sgqg2hq3yhnpvvvqyskhsmx8j3z0jgjsqwz9xa3wbr";
+    sha256 = "0i708ar3ll5p8yj0h7ffg84nrn49ap47l2yy75rxyw30cyywhxp4";
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
-  buildInputs = [ python libsamplerate libsndfile readline
+  buildInputs = [ python libsamplerate libsndfile readline eigen celt
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ];
 
-  prePatch = ''
+  patchPhase = ''
     substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
   '';
 
-  patches = [
-    ./jack-gcc5.patch
-    (fetchpatch {
-      url = "https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch";
-      sha256 = "0vywakbmlskvs9ginij9ilk39wjyzg7w6cf1qxp11hb0hj69fir5";
-    })
-  ];
-
   configurePhase = ''
     python waf configure --prefix=$out \
       ${optionalString (optDbus != null) "--dbus"} \
diff --git a/pkgs/misc/jackaudio/jack-gcc5.patch b/pkgs/misc/jackaudio/jack-gcc5.patch
deleted file mode 100644
index f18042c6e32..00000000000
--- a/pkgs/misc/jackaudio/jack-gcc5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
-From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
-Date: Thu, 18 Sep 2014 18:29:23 +0200
-Subject: [PATCH] Fix FTBFS with clang++
-
-Forwarded from http://bugs.debian.org/757820
----
- common/memops.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common/memops.c b/common/memops.c
-index 27f6194..2d416b6 100644
---- a/common/memops.c
-+++ b/common/memops.c
-@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
-  */
- static unsigned int seed = 22222;
- 
--inline unsigned int fast_rand() {
-+static inline unsigned int fast_rand() {
- 	seed = (seed * 96314165) + 907633515;
- 	return seed;
- }
--- 
-2.4.0
-
diff --git a/pkgs/misc/jackaudio/unstable.nix b/pkgs/misc/jackaudio/unstable.nix
deleted file mode 100644
index a2026dacc93..00000000000
--- a/pkgs/misc/jackaudio/unstable.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
-, bash, libsamplerate, libsndfile, readline, eigen, celt
-
-# Optional Dependencies
-, dbus ? null, libffado ? null, alsaLib ? null
-, libopus ? null
-
-# Extra options
-, prefix ? ""
-}:
-
-with stdenv.lib;
-let
-  inherit (python2Packages) python dbus-python;
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  libOnly = prefix == "lib";
-
-  optDbus = shouldUsePkg dbus;
-  optPythonDBus = if libOnly then null else shouldUsePkg dbus-python;
-  optLibffado = if libOnly then null else shouldUsePkg libffado;
-  optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
-  optLibopus = shouldUsePkg libopus;
-in
-stdenv.mkDerivation rec {
-  name = "${prefix}jack2-unstable-${version}";
-  version = "2017-02-23";
-
-  src = fetchFromGitHub {
-    owner = "jackaudio";
-    repo = "jack2";
-    rev = "4cf826c82c8f865c281833f92f8182d457277b3a";
-    sha256 = "100pkc324m57ci3fb99d3api6wh6g58lya6ssly9hxyhdsa3i7bk";
-  };
-
-  nativeBuildInputs = [ pkgconfig python makeWrapper ];
-  buildInputs = [
-    python
-
-    libsamplerate libsndfile readline eigen celt
-
-    optDbus optPythonDBus optLibffado optAlsaLib optLibopus
-  ];
-
-  patchPhase = ''
-    substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
-  '';
-
-  configurePhase = ''
-    python waf configure --prefix=$out \
-      ${optionalString (optDbus != null) "--dbus"} \
-      --classic \
-      ${optionalString (optLibffado != null) "--firewire"} \
-      ${optionalString (optAlsaLib != null) "--alsa"} \
-      --autostart=${if (optDbus != null) then "dbus" else "classic"} \
-  '';
-
-  buildPhase = ''
-    python waf build
-  '';
-
-  installPhase = ''
-    python waf install
-  '' + (if libOnly then ''
-    rm -rf $out/{bin,share}
-    rm -rf $out/lib/{jack,libjacknet*,libjackserver*}
-  '' else ''
-    wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
-  '');
-
-  meta = {
-    description = "JACK audio connection kit, version 2 with jackdbus";
-    homepage = "http://jackaudio.org";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ goibhniu wkennington ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..c9858b2dbca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18380,7 +18380,6 @@ with pkgs;
     libopus = libopus.override { withCustomModes = true; };
   };
   libjack2 = jack2Full.override { prefix = "lib"; };
-  libjack2Unstable = callPackage ../misc/jackaudio/unstable.nix { };
 
   keynav = callPackage ../tools/X11/keynav { };
 
-- 
GitLab


From 55844c8380b2f86bd23458a72abe473775a5136c Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Sun, 23 Apr 2017 15:51:21 +0200
Subject: [PATCH 0940/1490] piwik & piwik service: init at 3.0.4

---
 lib/maintainers.nix                           |   1 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/web-apps/piwik-doc.xml |  97 ++++++++
 nixos/modules/services/web-apps/piwik.nix     | 219 ++++++++++++++++++
 pkgs/servers/web-apps/piwik/bootstrap.php     |   6 +
 pkgs/servers/web-apps/piwik/default.nix       |  60 +++++
 pkgs/top-level/all-packages.nix               |   2 +
 7 files changed, 386 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/piwik-doc.xml
 create mode 100644 nixos/modules/services/web-apps/piwik.nix
 create mode 100644 pkgs/servers/web-apps/piwik/bootstrap.php
 create mode 100644 pkgs/servers/web-apps/piwik/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d4f9d1c31a8..55435189d26 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -181,6 +181,7 @@
   fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
   fare = "Francois-Rene Rideau <fahree@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
+  florianjacob = "Florian Jacob <projects+nixos@florianjacob.de>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
   fmthoma = "Franz Thoma <f.m.thoma@googlemail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7f94d6569e9..7d5d922dd05 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -575,6 +575,7 @@
   ./services/web-apps/frab.nix
   ./services/web-apps/mattermost.nix
   ./services/web-apps/nixbot.nix
+  ./services/web-apps/piwik.nix
   ./services/web-apps/pump.io.nix
   ./services/web-apps/tt-rss.nix
   ./services/web-apps/selfoss.nix
diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/piwik-doc.xml
new file mode 100644
index 00000000000..a1d8a5b7556
--- /dev/null
+++ b/nixos/modules/services/web-apps/piwik-doc.xml
@@ -0,0 +1,97 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="module-services-piwik">
+
+  <title>Piwik</title>
+  <para>
+    Piwik is a real-time web analytics application.
+    This module configures php-fpm as backend for piwik, optionally configuring an nginx vhost as well.
+  </para>
+
+  <para>
+    An automatic setup is not suported by piwik, so you need to configure piwik itself in the browser-based piwik setup.
+  </para>
+
+
+  <section>
+    <title>Database Setup</title>
+
+    <para>
+      You also need to configure a MariaDB or MySQL database and -user for piwik yourself,
+      and enter those credentials in your browser.
+      You can use passwordless database authentication via the UNIX_SOCKET authentication plugin
+      with the following SQL commands:
+      <programlisting>
+        INSTALL PLUGIN unix_socket SONAME 'auth_socket';
+        ALTER USER root IDENTIFIED VIA unix_socket;
+        CREATE DATABASE piwik;
+        CREATE USER 'piwik'@'localhost' IDENTIFIED VIA unix_socket;
+        GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost';
+      </programlisting>
+      Then fill in <literal>piwik</literal> as database user and database name, and leave the password field blank.
+      This works with MariaDB and MySQL. This authentication works by allowing only the <literal>piwik</literal> unix
+      user to authenticate as <literal>piwik</literal> database (without needing a password), but no other users.
+      For more information on passwordless login, see
+      <link xlink:href="https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/" />.
+    </para>
+
+    <para>
+      Of course, you can use password based authentication as well, e.g. when the database is not on the same host.
+    </para>
+  </section>
+
+
+  <section>
+    <title>Backup</title>
+    <para>
+      You only need to take backups of your MySQL database and the
+      <filename>/var/lib/piwik/config/config.ini.php</filename> file.
+      Use a user in the <literal>piwik</literal> group or root to access the file.
+      For more information, see <link xlink:href="https://piwik.org/faq/how-to-install/faq_138/" />.
+    </para>
+  </section>
+
+
+  <section>
+    <title>Issues</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          Piwik's file integrity check will warn you.
+          This is due to the patches necessary for NixOS, you can safely ignore this.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Piwik will warn you that the JavaScript tracker is not writable.
+          This is because it's located in the read-only nix store.
+          You can safely ignore this, unless you need a plugin that needs JavaScript tracker access.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          Sending mail from piwik, e.g. for the password reset function, might not work out of the box:
+          There's a problem with using <command>sendmail</command> from <literal>php-fpm</literal> that is
+          being investigated at <link xlink:href="https://github.com/NixOS/nixpkgs/issues/26611" />.
+          If you have (or don't have) this problem as well, please report it. You can enable SMTP as method
+          to send mail in piwik's <quote>General Settings</quote> > <quote>Mail Server Settings</quote> instead.
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+
+  <section>
+    <title>Using other Web Servers than nginx</title>
+
+    <para>
+      You can use other web servers by forwarding calls for <filename>index.php</filename> and
+      <filename>piwik.php</filename> to the <literal>/run/phpfpm-piwik.sock</literal> fastcgi unix socket.
+      You can use the nginx configuration in the module code as a reference to what else should be configured.
+    </para>
+  </section>
+</chapter>
diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/piwik.nix
new file mode 100644
index 00000000000..26342a9c5f0
--- /dev/null
+++ b/nixos/modules/services/web-apps/piwik.nix
@@ -0,0 +1,219 @@
+{ config, lib, pkgs, services, ... }:
+with lib;
+let
+  cfg = config.services.piwik;
+
+  user = "piwik";
+  dataDir = "/var/lib/${user}";
+
+  pool = user;
+  # it's not possible to use /run/phpfpm/${pool}.sock because /run/phpfpm/ is root:root 0770,
+  # and therefore is not accessible by the web server.
+  phpSocket = "/run/phpfpm-${pool}.sock";
+  phpExecutionUnit = "phpfpm-${pool}";
+  databaseService = "mysql.service";
+
+in {
+  options = {
+    services.piwik = {
+      # NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963
+      # piwik issue for automatic piwik setup: https://github.com/piwik/piwik/issues/10257
+      # TODO: find a nice way to do this when more NixOS MySQL and / or piwik automatic setup stuff is implemented.
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable piwik web analytics with php-fpm backend.
+        '';
+      };
+
+      webServerUser = mkOption {
+        type = types.str;
+        example = "nginx";
+        description = ''
+          Name of the owner of the ${phpSocket} fastcgi socket for piwik.
+          If you want to use another webserver than nginx, you need to set this to that server's user
+          and pass fastcgi requests to `index.php` and `piwik.php` to this socket.
+        '';
+      };
+
+      phpfpmProcessManagerConfig = mkOption {
+        type = types.str;
+        default = ''
+          ; default phpfpm process manager settings
+          pm = dynamic
+          pm.max_children = 75
+          pm.start_servers = 10
+          pm.min_spare_servers = 5
+          pm.max_spare_servers = 20
+          pm.max_requests = 500
+
+          ; log worker's stdout, but this has a performance hit
+          catch_workers_output = yes
+        '';
+        description = ''
+          Settings for phpfpm's process manager. You might need to change this depending on the load for piwik.
+        '';
+      };
+
+      nginx = mkOption {
+        # TODO: for maximum flexibility, it would be nice to use nginx's vhost_options module
+        #       but this only makes sense if we can somehow specify defaults suitable for piwik.
+        #       But users can always copy the piwik nginx config to their configuration.nix and customize it.
+        type = types.nullOr (types.submodule {
+          options = {
+            virtualHost = mkOption {
+              type = types.str;
+              default = "piwik.${config.networking.hostName}";
+              example = "piwik.$\{config.networking.hostName\}";
+              description = ''
+                  Name of the nginx virtualhost to use and set up.
+              '';
+            };
+            enableSSL = mkOption {
+              type = types.bool;
+              default = true;
+              description = "Whether to enable https.";
+            };
+            forceSSL = mkOption {
+              type = types.bool;
+              default = true;
+              description = "Whether to always redirect to https.";
+            };
+            enableACME = mkOption {
+              type = types.bool;
+              default = true;
+              description = "Whether to ask Let's Encrypt to sign a certificate for this vhost.";
+            };
+          };
+        });
+        default = null;
+        example = { virtualHost = "stats.$\{config.networking.hostName\}"; };
+        description = ''
+            The options to use to configure an nginx virtualHost.
+            If null (the default), no nginx virtualHost will be configured.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.${user} = {
+      isSystemUser = true;
+      createHome = true;
+      home = dataDir;
+      group  = user;
+    };
+    users.extraGroups.${user} = {};
+
+    systemd.services.piwik_setup_update = {
+      # everything needs to set up and up to date before piwik php files are executed
+      requiredBy = [ "${phpExecutionUnit}.service" ];
+      before = [ "${phpExecutionUnit}.service" ];
+      # the update part of the script can only work if the database is already up and running
+      requires = [ databaseService ];
+      after = [ databaseService ];
+      path = [ pkgs.piwik ];
+      serviceConfig = {
+        Type = "oneshot";
+        User = user;
+        # hide especially config.ini.php from other
+        UMask = "0007";
+        Environment = "PIWIK_USER_PATH=${dataDir}";
+        # chown + chmod in preStart needs root
+        PermissionsStartOnly = true;
+      };
+      # correct ownership and permissions in case they're not correct anymore,
+      # e.g. after restoring from backup or moving from another system.
+      # Note that ${dataDir}/config/config.ini.php might contain the MySQL password.
+      preStart = ''
+        chown -R ${user}:${user} ${dataDir}
+        chmod -R ug+rwX,o-rwx ${dataDir}
+        '';
+      script = ''
+            # Use User-Private Group scheme to protect piwik data, but allow administration / backup via piwik group
+            # Copy config folder
+            chmod g+s "${dataDir}"
+            cp -r "${pkgs.piwik}/config" "${dataDir}/"
+            chmod -R u+rwX,g+rwX,o-rwx "${dataDir}"
+
+            # check whether user setup has already been done
+            if test -f "${dataDir}/config/config.ini.php"; then
+              # then execute possibly pending database upgrade
+              piwik-console core:update --yes
+            fi
+      '';
+    };
+
+    systemd.services.${phpExecutionUnit} = {
+      # stop phpfpm on package upgrade, do database upgrade via piwik_setup_update, and then restart
+      restartTriggers = [ pkgs.piwik ];
+      # stop config.ini.php from getting written with read permission for others
+      serviceConfig.UMask = "0007";
+    };
+
+    services.phpfpm.poolConfigs = {
+      ${pool} = ''
+        listen = "${phpSocket}"
+        listen.owner = ${cfg.webServerUser}
+        listen.group = root
+        listen.mode = 0600
+        user = ${user}
+        env[PIWIK_USER_PATH] = ${dataDir}
+        ${cfg.phpfpmProcessManagerConfig}
+      '';
+    };
+
+
+    services.nginx.virtualHosts = mkIf (cfg.nginx != null) {
+      # References:
+      # https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html
+      # https://github.com/perusio/piwik-nginx
+      ${cfg.nginx.virtualHost} = {
+        root = "${pkgs.piwik}/share";
+        enableSSL  = cfg.nginx.enableSSL;
+        enableACME = cfg.nginx.enableACME;
+        forceSSL   = cfg.nginx.forceSSL;
+
+        locations."/" = {
+          index = "index.php";
+        };
+        # allow index.php for webinterface
+        locations."= /index.php".extraConfig = ''
+          fastcgi_pass unix:${phpSocket};
+        '';
+        # allow piwik.php for tracking
+        locations."= /piwik.php".extraConfig = ''
+          fastcgi_pass unix:${phpSocket};
+        '';
+        # Any other attempt to access any php files is forbidden
+        locations."~* ^.+\.php$".extraConfig = ''
+          return 403;
+        '';
+        # Disallow access to unneeded directories
+        # config and tmp are already removed
+        locations."~ ^/(?:core|lang|misc)/".extraConfig = ''
+          return 403;
+        '';
+        # Disallow access to several helper files
+        locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''
+          return 403;
+        '';
+        # No crawling of this site for bots that obey robots.txt - no useful information here.
+        locations."= /robots.txt".extraConfig = ''
+          return 200 "User-agent: *\nDisallow: /\n";
+        '';
+        # let browsers cache piwik.js
+        locations."= /piwik.js".extraConfig = ''
+          expires 1M;
+        '';
+      };
+    };
+  };
+
+  meta = {
+    doc = ./piwik-doc.xml;
+    maintainers = with stdenv.lib.maintainers; [ florianjacob ];
+  };
+}
diff --git a/pkgs/servers/web-apps/piwik/bootstrap.php b/pkgs/servers/web-apps/piwik/bootstrap.php
new file mode 100644
index 00000000000..a8163f33e5c
--- /dev/null
+++ b/pkgs/servers/web-apps/piwik/bootstrap.php
@@ -0,0 +1,6 @@
+<?php
+// get PIWIK_USER_PATH from environment variable,
+// so this bootstrap.php can be read-only but still configure PIWIK_USER_PATH at runtime
+if ($path = getenv('PIWIK_USER_PATH')) {
+  define('PIWIK_USER_PATH', $path);
+}
diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix
new file mode 100644
index 00000000000..22d87d67064
--- /dev/null
+++ b/pkgs/servers/web-apps/piwik/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchurl, makeWrapper, php }:
+
+stdenv.mkDerivation rec {
+  name = "piwik-${version}";
+  version = "3.0.4";
+
+  src = fetchurl {
+    url = "https://builds.piwik.org/${name}.tar.gz";
+    sha512 = "2i0vydr073ynv7wcn078zxhvywdv85c648hympkzicdd746g995878py9006m96iwkmk4q664wn3f8jnfqsl1jd9f26alz1nssizbn9";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  # regarding the PIWIK_USER_PATH substitutes:
+  #   looks like this is just a bug / confusion of the directories, and nobody has tested this.
+  #   PR at https://github.com/piwik/piwik/pull/11661
+  # regarding the 127.0.0.1 substitute:
+  #   This replaces the default value of the database server field.
+  #   unix socket authentication only works with localhost,
+  #   but password-based SQL authentication works with both.
+  postPatch = ''
+    substituteInPlace core/AssetManager/UIAssetFetcher.php \
+      --replace "return PIWIK_USER_PATH;" "return PIWIK_DOCUMENT_ROOT;"
+    substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \
+      --replace "setImportDir(PIWIK_USER_PATH);" "setImportDir(PIWIK_DOCUMENT_ROOT);"
+    substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \
+      --replace "\$absolutePath = PIWIK_USER_PATH" "\$absolutePath = PIWIK_DOCUMENT_ROOT"
+    substituteInPlace plugins/Installation/FormDatabaseSetup.php \
+      --replace "=> '127.0.0.1'," "=> 'localhost',"
+    cp ${./bootstrap.php} bootstrap.php
+  '';
+
+  # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH.
+  #       See https://forum.piwik.org/t/bootstrap-php/5926/10 and
+  #       https://github.com/piwik/piwik/issues/11654#issuecomment-297730843
+  installPhase = ''
+    runHook preInstall
+
+    # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed
+    mkdir -p $out/share
+    cp -ra * $out/share/
+    # tmp/ is created by piwik in PIWIK_USER_PATH
+    rmdir $out/share/tmp
+    # config/ needs to be copied to PIWIK_USER_PATH anyway
+    mv $out/share/config $out/
+
+    makeWrapper ${php}/bin/php $out/bin/piwik-console \
+      --add-flags "$out/share/console"
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A real-time web analytics application";
+    license = licenses.gpl3Plus;
+    homepage = https://piwik.org/;
+    platforms = platforms.all;
+    maintainers = [ maintainers.florianjacob ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c87ab0a1c4e..f23ef8971b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11407,6 +11407,8 @@ with pkgs;
 
   shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { };
 
+  piwik = callPackage ../servers/web-apps/piwik { };
+
   axis2 = callPackage ../servers/http/tomcat/axis2 { };
 
   unifi = callPackage ../servers/unifi { };
-- 
GitLab


From a19514df76481c2306e84811bc6f188c2fd1eeff Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 19 Jun 2017 15:09:23 +0200
Subject: [PATCH 0941/1490] firefox-beta-bin: 54.0b13 -> 55.0b2

---
 .../browsers/firefox-bin/beta_sources.nix     | 764 +++++++++---------
 1 file changed, 387 insertions(+), 377 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 0c4126a4add..967fd1e1595 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,945 +1,955 @@
 {
-  version = "54.0b13";
+  version = "55.0b2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ach/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "b76584a4027ae3c05b4350952bf231e1701c3f161355d86f028379a04cf7f3f1fcefd67736dfd2cbc02fffca670ea7e62b1729ba1647746da62dff30969d74dc";
+      sha512 = "7164db8b579c12976ab86770f3c238d8b4b4334a41107f995d03b87c77e7998e1c7d48b36b2305d67f1eddb4d3cbe0b9bfb9c27169abaac00839d90a0e80d38f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/af/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "c8cfb40ba81947254a58dde6438a5e6eac9b4279701800353b8538ca74776fe09da4f6e5384d93a197bfbd3c88b30e3b56231aa4d9530c61da84a712d0ba0473";
+      sha512 = "994024e45c16b1dda3680ad4d73fa7a2a84bf43ce3be8df4fa61a695b9041fcdf88ae750c0ab34bf9dd814cbcde10b14832d5b03682e8c83e4dc43a316b6c75f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/an/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "072e89337c05b9dc4f82eb4746464cb19b897d3c4eda1f50c9d0c7d1d38e9c1b2301f9c0416ad26809c31e0bb5099872cc577540ce722ad5e54ca04ef3b7c003";
+      sha512 = "dc4a8db0c9bd87ef140d8c2fa2e4deb63e664a97353d88f94f99fd10ed358091a6215b62f8a441ef65dfa6774989ede451e55749bdffb0f670904959f5e8bb70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ar/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "4c63f391b072b5d33f61020dd2bd5f2fbaf644b0a411070297ecc31ea5c7059af373cc58d6b49e377ce6db239ef4df64f301612db0c45b118662178b750fb069";
+      sha512 = "94d018fe2116733bd14daf51d9d9f09022a745b3797773422ac79511a8fd1e14e9fea879f7873c1043e0b63d2df4425c806645467764325400f71600a2f1cc1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/as/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "22e95dba78581460159f24130bda330557348516ea9442644055159a6c7cae3ad4529890676fdc43f8a8cd902d4a75fb06de50262db72fc1297e08d9e14e2d0d";
+      sha512 = "6b5811c9ec50be18a34e0102438e95fea58c8667a0a19c9c4c5f4ac93c8ae8b9cd929252c81de7f19a15b82ed6a01e8fe37fda7aafc63cac223cc09b1d9dbd11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ast/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "527ff1bd64649b475a863f3d3e40e900d40d5c1e5a404e0dcc2678e7708fd24dd0a68fa85f1f3cc8e23f12edac41530310d0f65e1eea390f5e01460c2ac90e0c";
+      sha512 = "4deb4aff290277f870d5c3148e375a9bd2071b455ff93f10e28c9afe149a8f11689bef936db8a87c0fd4cda5bdda70aced4580395343916e7510ab7970269fdd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/az/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "c3184445a3a4cd205140a43adbd498571a0339175fc9ba05ebc2306fb37990095f4c66dba0eec1a121a7b5aafb6c3d6d5f5ff68485382ee61ad7ebfba190fd8d";
+      sha512 = "3cf69626fbcd8667c83978e540cf0e8e0123408dd080073e95f543a0c98085320bd95caf77fb814002e45694cefa5542c6d436d258c66abb8435d52ce85f111c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bg/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2";
+      locale = "be";
+      arch = "linux-x86_64";
+      sha512 = "0318b4bbf69fda1586665dbe7626d4ba1c4768acf310b5bcb0d49c1212199704d4f0c0da6dcd99f75dd7871d39a4725497c47ec2f980b1c458b101a4e18531e5";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "e1eb42e04be44f4b091fd6675af506c80098886a20be0b37eadbd907dc8925b1bbc0c99145417e16534d6a59f1f6ef718769819d9f79ebbfac22f05ba5ad95a3";
+      sha512 = "0de32e72eba0fae0e19c1d1cf8e8f8f99926d66df6831317742a74bd0e90f909cd4a55432f9fde3e25c33e37160f5e92d0ca97b2236089d4059c5789e89823f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bn-BD/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "9d09de31bb8207533a2e222a1fa8888f3a323046dbf8521f6cad0aaffc9d91ebe35b0ce766fa2b292d1058f370298f60479312a5f8c749bef5599c60e88777d8";
+      sha512 = "333b28b03e6a4612b0e5636e14bc83d6e152237fbcd4129acf25767f3049835bf262040caacba1976d2791ec06fa89e3c70ed1abea414bbf4289729296099993";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bn-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "1656bdd3844c968d448fafffb7b1fa5994e8dc4a590f4b39965df095ca29a8914fa4f8dee1fea4a15b6c4716a6555841f4b9c72b432adc1b60b02f561cd3ef7d";
+      sha512 = "ba989a0555fdc40e9ce9d834eef26b19c30b19616d85b5864d26253572fd79bf02b7a0b9bfd00dddaa192950c7f9d52c20887569b7cad8b03622ac0df55baadb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/br/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "945f866e86a8ff5e6a8d2216abb3fef9a1a93b585599267f54a38b5acb0843c1cab5ecb4440f6277e7604fd4fe730b5d2b57b4708bc1639ad2adcc0e217ca716";
+      sha512 = "e43ec7e1ba0d977938e5a1bc3f985196211fb6587c44018958f750b35fea78f2dd94a8fbd1b91f70e41c3f3cc0da194bed76306d4b63bca3dfde7a65a6a7532a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bs/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "cd555e3638139d6e36b59fbc72a53a4e233e33557c7000e9c308cc292d963d458261c0404d130353abd071e23927c11d8232add50b455063fb3c261faac35594";
+      sha512 = "7ed042ecf92e7f873f93e0f6a7ab27418e960adcc2417e18fe9ee8b468157af85dfbd8e56df7f0dba97027b3a38aeb6279d81451579cc97a9fec814064b74e58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ca/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "ffce1a6bba525cd67880f695f6c21b1078fe419ee32cb878519f5f36d4d403b5cd2dfc6f1d9ed02f4f38dd2f7404670f63b34484180137c6a597f407c24b638b";
+      sha512 = "0953320dfdebfda3b2f135fb5277ebbdcae1c13f431b4452e0398515d990fd6faa8137dd4f49bf4336b385c70422f340e0bd8a466c07f76146d9ff32655cbe1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/cak/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e1d2750edd967f15a51af0daae4599f78add80211ddcfb13c7480ba696426e0e69da3bbd5331979aaf88ec6f611aa33c98f7924c1428e7cc37f2d9fb30c3ac6d";
+      sha512 = "e79e1e6a2784e3e61637624ddd8b628b784090c61daa35d36a3ebbb68db1801ead01b86bb04d7b2bb3037fb53b42197a50de78013afcc2443136b65df6f0b9dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/cs/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "c8ca0cdea3742f5a18992c9743c994d9676bfd6765b458d0f13e03038f61a9add04b48f434c41fcacc67c303be2488e8833aaa8d8d68150e00e3ccd2affd6a0e";
+      sha512 = "c48991f37c786982f90ba12d43120dbefdc046d30c9ccbba630224b1f08dbce2b73eb4456e1b588f5ca0518ad19b8148e9dd5cf4a9f47f8d4ca0e90e2988f18d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/cy/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "954ba8941fb42595fb05ee03ced136b1dfd3617c08d14042b63fc2e53984b71f490471e3e680bb67f2ee31ae72ca329198272b9c354681e1ad9fa6e12bd32b16";
+      sha512 = "a01937ba6f1e56b34ed4d16acbfa336338391c8fe4e33e5f06ec2a35c3c6010a35f20f7949ef1f6d50c9d6f6d9db115eb95cac50762d7d6a3b642f78192a6b4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/da/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "144d754470b59b95e3706516224e21c1c53b0d2260541cf4a4a2afdfc7af39dcd0ae97204e8558e29d627853e1667f2f0a337cd257d05409c355f96f9ffbb453";
+      sha512 = "d7861e3765acac1e8e5a1b302986fcfbdc262a22308ead2239e7acb3617534f1b8bc101c2ca6d5aa1758bc13a6cac5f31fa062dd31ef239113cc815c9d4d22a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/de/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "1bbe368dc61546c4d2cfb09ba0d0b8414abbaff2a58ddc60e6961fc3f387a8d90a75a44c3b4736df1ee3d2777cc6732c02b42a897486bde9b9f030e8a599aabc";
+      sha512 = "2b6efac1ab738f42fe52a6c8e4bd20fea1e044577a4dd82fea54ef403adf2ea9f7cb64268de68dc55799afd3f5e90f724c98b9f705affc704e1a58118c674dac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/dsb/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "407728ddb4062f0961a856e34d7f4db5f137f9674b95a7cd509c57878813e4dd469487ceb91e3f0a182f08e2e95116348d7f9f12e23a6c45d5911f3c8af3c0bf";
+      sha512 = "c5de911eea687279d6d14b8dc745597c6450c733cc332e104de6ebd9a7a64b877474fb0da0bbe59ef4c8424549eff4fc6b57a93379c09df00fda761bc7347e54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/el/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "5473cb886a94aaf59065f65029c01e31e162d38e54e85b19109fa29929c97a7872149e802fa131ffdd1189ba5a20184f081f483cb783de90d287469f6300a0de";
+      sha512 = "b531426207bf42f74f87ba8807441926f9476f0f15caf8a21594d099992c7c91d2cda6d71d318d899863185bdf776f4bf46820fff77b37f8a95c52f570f9247d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/en-GB/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "8fb73d0a889c33fe2163f51847054c5d8dfd491ff4ae3c5e1333b93aada953a03d376b1f3afcf26189b3a333639a28dc380ff967cbfbb2a2f11a92c1750a59a5";
+      sha512 = "4c1c99501cf1ff1320d27c7709d9572837a1a1fb7d8dea4578075836e013b5fd79c84afababb45bbb5cf95655b51b0503ac45023746ff6d4831bda93c493e539";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/en-US/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "66b68bdb3043436548d057d435a065b896a815c4c0eaf7f4c072c306ee379de4e98aa750362175df822767786b2202744586fd6aacf789f987ee7528b6bae865";
+      sha512 = "82678293b35fe73c27c5842589de97858a8cb5186d7f1309693f16a516ddd62a59bd96e84358571367b706354625a98bec7fff9f7c598c96f025594baad44aa2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/en-ZA/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "4f3917809ad8b62bdf6bfcae453b297d956e938c346b48613758c362d0c32be098d158fd660ec24ffd000a9f8f6be0cf026ea6533878c756e6b476135d0483a4";
+      sha512 = "ded063ef65018cb0b138298b9e9df9a2aedaadf92d5c77248120cee6504542d18967b01c1bf497e264a9aeac7c119c8bc9885fb202dd0abcb0ba00344ad30397";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/eo/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "bc0682dfdb05432df784ae6abc1202f638e16c04e0deb53211118cd0890bfcc07608dd94feacbcd4e6abfb3f6403c9d1c1746579834ab1111e4870396bf0dd41";
+      sha512 = "205dc910f37c5501b27ff044f5bbb197fd4bbc3d8a5512ea01b0b4c155cd8b2f19eb6c400cb999a6136f2534ac0ede511ddf827ffd59f97ba00b538852c9a0a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-AR/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b9490b0a0fa01e7e8e09b8af4d77ec42ab89a7859b70106e0c4294dc0a03df215de2a34854fe48f8e033138d9dc5b553e2a71b629c0e351712e1d66afc0aaeb8";
+      sha512 = "95a026ce800722d1e89237a675a58fee8243e5b4a900d1ce42a4f139dbb43e940478660f78d9c4593b9d09af7c3dc843984b7a362b465d99317aba9bb213b371";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-CL/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "524a89e97ccd1919a86b2ba38beaaa42b6664af46d36e4da0f5f17f7d8f9b1c428be8fcd111a42c3fa951108724c139f54aa5e4f4a7577dd6f58895b3a3d99ed";
+      sha512 = "42f0703824210feedd7da2f78a4d0823d1d0f3b23d4edaa07d63a5021847ba55871fec33676915b9f2b411ebd9cdf31de155f2de0a47586428bf0e1a3fe7457e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-ES/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "58660dea649a468e97d12d054a59dce61d7abf33e4a5620c40f1c42eb30ec3411738aecec666f0334e46b3458a48caab97b5dd7e9e1b0699f5c16330401b5aac";
+      sha512 = "d11dd1264e4692da710d18ef5c18d7f5bc1db36214cfd28a7f567d56a35ac6e56f838a58ef6ebfc2d68b115417cdd19fd49ae2f6a13f1a57bb2eacd122945f1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-MX/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2c5cfc09b15daedf69ce16ecb12b07aab99cbd0b68d7ff5b65ac9116a59790d32aa1f0c3a931e9837b381c82d4e50f3e14237c39cb5c45e652d11310d0e01faa";
+      sha512 = "ab33b21aaacb43f4676856e74f4d93e2d449b67095500907669db42f678fe0d7448f2205f42c3f85885cef0a2c262818368808ecc336205411dc27b99e42f272";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/et/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "6301197a08de0912a9195b0d78d95df338f3c2ee2c90045108d220c9309edc8504a6ff6aa5f0c8db21df33d6bb0e624d713d59c6e49fceada3a510d22613d59f";
+      sha512 = "2a87e6a9bd6c3aa22d278f114d0bd18779c7847cab2e6257c4e601f3749df703f2d0a25f5646ad91802a2cd093bd1734305fb350aa2be269c1fc5fd2d621d4db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/eu/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "2ca00edb210c879a48f1107137378818e6f4beeb2f3a2b1941d12a7da6f474bc164d07158ef3713cf9e79c222b4f2f9a243ce924b21802dfb4374f48c18954cc";
+      sha512 = "9017cc8bed387b103f78870b157a50c18f8e36858eca1bcbce8ac5ceb06f6d7b178760f7dc733ce570cdbdc3204d277a98a4b4324a0d3691d1fe3f6b1e9725df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fa/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ded6f7d1daaaa417ca62dede3e6a0ae4acc66852dbbf6230e8b1ff5ad74ce4438369fe6c3280f9c8abd3a1c22fa05f2c9e36dee20531fb5d3eeae3c736984b63";
+      sha512 = "d70f1a793d67f1b52f740bbcdc4fb01056495fdc5b14672b35a48a500c71ac7cd0cc6272e7f6b4b4fcac65874f32ee64338435f76131c1d74ef82ca7a512eab7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ff/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "59c5c0604faf14bc0478cebdfe09982d0a184a5735c791458254b14ba1031fb9e18c09dcfada0e921a088fd7168d231cef52dd45eb703553a5e5624ca38b9363";
+      sha512 = "c16463456725b2f0263b8fee2d0729bd4951a352b1dfdee819bc2af0e138cda73d169eec63a27ed2900a0703648db0c784969a41df874336b1a84170ddaa71a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fi/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "10e9aa82198338f1bb21c6fd5663a939b14d1db5b1a5b672d0c81aea26d910e9b6c8b53d7e40105e5dbd9e4b67bbaaa50803b323dd648ff85699cb88384c3c23";
+      sha512 = "00bf17dab47261470f57b94a18fcd5fcca0344be1b1d6352968e132c7f3fdfc5b5229c80eaca1a9802e75d432e09bb6e0dd3dbd40ee9f0c783ca007da61b52de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b267baea7bf0c9fefab7bca2b32aee9dd0d6f9e435c477ecbdc622e9cb2a08ac4adc1c26db88e2f61b1ef55416c079e49d4af6a4366f2b893504fe814021b674";
+      sha512 = "7599fed77975a7b4667c9d3456a5536e3b7eb1725acd624c504d061330ea84c3a19dd72914a0f7644068972b94a7a058708e3b1e3618e084315b920e8f671f13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fy-NL/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "afaa720f4b935ee8674b61362972a90ed9aeabddac17e5768eb05f72eccb1b54ab6836524bb8a189e08cd06f6b24c8863208f9917d02d12f622b7a3c4b96ca8b";
+      sha512 = "c665bb33f04b7d3b9790580b0db992ce223e75fdd3915b16f79125a72bac91cec098b1ae73b1223f5b03597c1e19522b46fe11c5c05a7cfe0c932a21bf94f90c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ga-IE/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c60fa858865ba80ca17fdfc29f2ae85c77528d570f8b4f43b890eb0316807ddb2049fbb4c6005fedfc0f05ed85b211901e88a6d06fa51f9cda214b2999b7de76";
+      sha512 = "c775e3e6858732104ba3251de42a0e9ba5031ade5f89207b357e93c6f6e4acd07bcc91a5fa558a9884f07438ca0de6bf10065ff7e37d980914da392428bc57e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gd/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "37d7f0b8159e7c23454b0f1a15902280fe5def086001befbed3d17d21e4e3684c40609a5888fef3cc22888bf57860302633a680a4d01ad1ad0e765ef14a3cce5";
+      sha512 = "c8df95449757099a7c8d50c04f42aace7ce25297c78622296feb336352cecb53726f3873210af6cab96d90f65e21daa084b08f6b943e1130c75f68e6de1168a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "2749dd7a2379c3eb2e2f52441717ef065d3bb07c6cc58aab02bcb3c050e3f1fc14310c479bd58da5bfe9a17a91fd0ca44d032aa81f2f098cec1bd2922876cdae";
+      sha512 = "4488db080b8bbf7e437a684d1d7cbe219d1d730db055cd9988706cd71deb110b9496a87684ca32d172f3eeb3308ec1ee2ad0ab3b1e206d012c62311db45db911";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gn/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "28f3f810fe9e2ef555d5f72714284eda44750f5525a560f93b9e47bc56f5f2b83d2c73af3da8245b387260e4c82341272518034aa6b8c968665ef9ae0a201a9b";
+      sha512 = "272c43aabe7c63b769df2aea4eac5350c9cf90326ece8ac2f096db421f7785e630cbdcfdb84e41c516e36165f1a67d9b22ee0090d84ca9d58fef275d119c2dad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gu-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "76a246d75ac07afdf824307706b9834c2d7eb558448097c9b078e37b61973447fce723c3b697aa4ba464f93d584901bc174a635aaaf7bbc27efa21f923dd7452";
+      sha512 = "415b1ff89552f6bb83458a96905c2c6b7b6b25a974b72ab4a4d4a0a1a5b1e431b82e519466393bd6a8e8031954eacbca97529cb0e4513d722563e13eb97a8fbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/he/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "e0de309d1c0f1e9f3182eb95e91b0384bef6a52e26a921d47e896f16e9c58b270ef30b6c1b4e4007c1eb3b75fe41c12be5193a4fcf88d15bbd7f2892c0d5bb40";
+      sha512 = "1110e4c1c6121a00fd76f25bc513f0c877bfdc7751af2b5958f38f2a7892d8a00c9b5eaa6adab34213535480228a4e0b3aef3ec3a3ab4adde74bfa2fc7dbde94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hi-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "1b9e63cac216f3f043c17b8b4a701ea5e8fb5522a25f6e21d0b5ddee07210ab0ae1afcb8419b0e6018abdc25b989a5a3fe554d1d04f52c38f545172869d95e08";
+      sha512 = "b1279b0f0a97413799598fbd3c6efca475b8aef7a0b05c401cddf283722ba423ad2524341962360845951798d9083019a5b8b431e658513001c3046b6a3fedff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "959a5760577f5ef026f3230a196ee26de93425a452ced9cf9770b5bff8f3f44c2dae2cdda7e01f68cba2297b320d2df299cb774e9fce2b68adaf986a1af26a09";
+      sha512 = "77474e40120fd4ad50a109c6b46fa93c070bfaf899e187bd4bac0ad4a53fc12c7f7d9d2a2003a871e8666dcfc60de4f3ea26b79008f4fe7ee1c5a358307b2eb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hsb/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "50390a8d09b6a19fd8441f55a1d0310ca279fec250557124271e3791ad8869b1a4b361176c0ac95f8acfefb8a00c80095c2422314c5da557895a85bf194fc011";
+      sha512 = "b1e440f25ef20da7fd6e3d6a403b7c448e5493bfa410e09c3b9d59b32450883a938967b167a8e84cbfcaee546d36e28c8152a6c048070b543479072bb8df6189";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hu/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "8ca51f25ee3c06b918fb4a4c034ffaf493c30c67f1c3eebc0fc268f09ac6fe62ac163ad260f4a4ca592a7bdd80bcf3a916660ffbfc8681e46b40e416e3e7380b";
+      sha512 = "7ce8bedd243fb6d8cfe28eea17aafda028d1b85d96dd60c734f239f258dad8e7c132439614d48494e58088f99903f8a2a8824fc4878366400d9affffed203b84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hy-AM/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "49da49d63b28110d98156df0d07528e6261a01f5db9aefcb1ba1f04dd1b45e812bb026b6bc183fa27bac57a9a735009278ac86394ad43c54ba5760b9d4a05de9";
+      sha512 = "ab5054bc6cbc515af08763e61351275411edb2507b7013152185c49e3c7bad0263def5ad187cfe5fc4bb0f93e86a1596e131746646b25e452293f24216116543";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/id/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "6cf45812cfd16071b12c3b87226a37e5353fd0f331b65a575a4fc094709b20f3b0fe00064af1a82bb4c9430caabf2d2c4361f90cb2e90b1d5385a57a171c5955";
+      sha512 = "122b20868a4ee4d1bd42efb3bd281f137bda130d4328e830b3b21176777c6b993f562948671fd8e020d039b5e5798b150f1fbcf734f245615a2a3beda8d44e85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/is/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "db48948f72641b83078dc44354dc3bf6a0919695a69c155d836154f260a4d32b8d325c138d6db863006dcc80f75d6cefcde0f9e445eeed89d9d8f89a7aa5a048";
+      sha512 = "033451b816392acf472f6f62f3367f929e4d4c2b749629138120580b7bb854c5409251c49650d3359e6f48929eeb62bb9a475ff46a8b57cf11c34d6035c67f70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/it/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "2d63a2dd3d5b56c3c630b3badd764ca50e6bf4eb0ba551cb1207c849f0d3006de96781c59b8ba86ef93659487be74e2c5ce0621b3df921e3091debded91b6a56";
+      sha512 = "99bccadd7b8994c20ade9907301ac695ef01542407032588bb17cd3353e4941ed70944c8f9a28aa0fee5b49990d2bfbc5ac37d9c3d4fb88d13c473d50ecaf849";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ja/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "f7bb1e8cc1cd72363f8be0d25173f8abca5383277c101585198e6941c4b4fddd222942fa6711f5ccdcb2dde97dcdf974229392ced1488d37bad30274987decac";
+      sha512 = "ec7193a6eb610bf1ee67791f1f7ed9ab951cc8a53bdcbddffb1078479919d5a70c43235e3b4ec4c20eb89514f283dc8223a4f61835f039f347744d07727058ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ka/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "a36808e207a1277bada5793ac8431a381dddf11a600c795d077d0136997380d294a59f7606ed2a64643df53675b607ea249e6ac9518d57b91b2f905c76a2cb1f";
+      sha512 = "753c48c6dc9de12787705574fe0319ca9e4d5f9db67166d62fe0391fe5b8867d7f5da9d21f829420bee034444762a6ac3166c109a36e0001e6e7752c93304f77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/kab/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "498ac5ac757560c131e21a5b03e956e63e329a3ba9b3d7085d1448e722a78ef17c022cbe22a5786931c9190d79081806f408ecd79b3538b6c042e91f04baf65d";
+      sha512 = "a64d1b1f69d18d06810d72ad10aaae40153e696a29efaba4327d44e45d167a4526cc00811cfb764288df8971576c281fee1d8b737597f1de0f0755a4d2e78126";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/kk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "2b3abe204415dc66119edf9d09dbeb26b026b89a9bbf06cdcc9d624281f96269f2e0cb39f8bdc0a21be373ab4b0cd41aa93f9db556dbc910dda58e44619c2f73";
+      sha512 = "e95905b00476f33a8e5c39b427e592f844f04d267263dec65f9edee3e2a91790382cfde6731e2eec0193d535267d041d2254c4645a7f8cb6b1e3ecbaa40f37aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/km/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "27d3ca7572fea00b1bb6409b55262ac85fdbf8a0a3a49146fc158636780cea266bb2eb52885eee25d198a5b6484476532f6a4d6e9f1e0f2c479bfd0c82ce3943";
+      sha512 = "3dd5c83d82e6a47aebecee97c49e94018169a06a9f81ac61bcfa7d6ff337b5c4ca66d10ae552f5642cda20ce545752ffa0f2589163fd1e01bd7e61c24c88e7fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/kn/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "d98e7a94cdb367ffa7c2f3453e7f2530acc09562a28139b431c17424c68973b27293a18cbdcdefd86bb9d3348fc37a4938502affc1b18e2f2e1e4c36fbea0d62";
+      sha512 = "cfcc5d048fbfa18aa0030114c445b40ada42064ac56194add35d51340173b3f6dffa1c9faca87fe4ca2f5aee608d7d05903ac8540095236d19aed3f939f88914";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ko/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "55eac7a2667f90789e148f0dff06492c80253ee6a7d65af2e9897a7fef5209a64c4a9a018c6d5b8e137ebed60780ffdd1932287d1d5e174462f9208dfd181581";
+      sha512 = "9e7b63568e745d5299fa0315dac87478bef0a30cdad42b05e33acdf188f8346e23ccac0ca3c544f1284e4cd216d8b5c792ef448d6cac31318ad711ec21ec4b05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/lij/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e86ee02d85ab92f61544f590692bb00ea49fcdf3b1d0475dff6dc0fc003663582fc3e87f1ea03cda90e20fd073da9e2663795e620b9e6adae2ecd98f434ae9e6";
+      sha512 = "1c8ffd773a5c259d32a6bb6ed6472c041f5337f01f21f6e5e18f774ddb04480cf0772ccc6bac7710e9c22f760d7bd2b234d6d21e1281d9ce2a26483ccd6e928b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/lt/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "57659b95a6421d0db8370dd17e5ee767433136eb939dd69ff5a29e7ee351c0c05a3339c70984d5146c198e6922f8c2f41a9d164dc1690b779a25d62d4e1b7edc";
+      sha512 = "2f087692eba683bb0e865b5d4abc712edff5cffae647e8bfe382b2c15acfca481bb56c20f6b14742e7f16dedaf27848e8ae4d5078492762185d36c040c7e33ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/lv/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "ae547b8db7236199787cf455d2277d5dcfa7cbd88dcfc226b5f1552054313a4d56144d828ff1819aa341ecdcd84609e30e4c4ce22884493031fde62cc8d523d8";
+      sha512 = "0f6869d9528ba56a8e03e2dd85d8b76d74a359a17eb84c575a94580f965fa8c3d253933b798e2c426f742fe5d8d0d7709a7280e21e7eb41ce3799ee98cdd3af1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/mai/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "61aeb8fe7c8af0b411435868f6ef540e575a5ad6ae353d2d40538c1d50f154534e8216c3d479f838f4eab4d76b07280a8d1a76d2e73ec6a8d32d99bf79f9f14c";
+      sha512 = "31c2449b7127b4b537d407330cb618e1ffc24259f9bb455f95e2b535a4ca17aff8249c77e98e8f36375671390d4225552b18ba21346e3f1062482e8b8d3cc288";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/mk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "778ed9879a57b2e6a8e7fc48bfe109a3b60c4686163ede1b8df225a3daaa9e2a854af79caa3f83e2e756b32fd2d6f5177dd145eaad1d670c4420a4482a6c7baa";
+      sha512 = "0722b24e72fb8d0423e37d47035be6c2e90db45d99590961dea6cd5be6dbc7f1851234f20e4d8d741c4a36b82c31675b2e39884d2949f5134954b53ae6db6ac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ml/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "3a3058ac0a0dac34a601e82209482dbadd2cbfe9228ee64726fe1ec60d3e6c0029b6cedf243f0a82bbb57c8ffdaa17a14f3c75c8300c31ffa41a07a9c390c83a";
+      sha512 = "4944473b377fabc233f30a6269ebf02aff87ecdd02a75e528b8f0c737dba37ad9eb322f99b1ffae1392a67144b737307bfedf0c6d45e65562f964bcb9dd3fdc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/mr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "a2218eae78eb1cd9e27af11dc578302e5ba47530cfb8e05b8518b3c9378eb0397e6409d093742e00708955144e4d6574366f70253ddc9753dbbad53230f27882";
+      sha512 = "5b2bf5731f4a988d1bdcdac74abf00b0633b4f9b63c1b999309d5c4eb5390d0e823d170b7cedc278b49d018d74e6eaa83373ad5c2a26151b78e9e831bf38f14c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ms/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "46c04289d100455e926c9e54d77ad9ee9f920bb7d928ab11dc346872bbc6fc888e3e4e8e66e1cc2e169b33a4aedb9fb7d0d205ccbb052d9846b14af9772f9679";
+      sha512 = "e96483b5e5800a6a33a9e9d065a90476ad76c94b6e75fe006881c209469e2f37173ef6d67b4f2b2cb216c46ad44bd0db9dcfb9d2e5afe864297e26eee93898d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/my/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "84e9fa1ae7ead0f9ed4240c4923fb6a4485f81d3a725793c490c644ac0b8bcbf8e2fc0b7675b3d146dbb3f14adae243f1e10fd0b95ff08a90d674166c3af72ad";
+      sha512 = "4d145815f5cdd37666a60b0db476925b89495b1add8bfba42cd15580a294610f20fa340c449c04fa9cd2714a62e09c61e742037cbe26b5f11671eb72dc8a5008";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/nb-NO/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "0fea5208d74fc9d4b184413e3f6437130beb816cc21425555108ffbe1c15d2b5bfb4478fd81d81f5a57fb8ab2c90ec8efced100b9c022940b7ac6db701829088";
+      sha512 = "3763bbc87d2ff21b6db0d45b684b91f1080e3dd9fa1b2240edd56c2db1100b66ae04748c67df410cc9c0802e83fcb2a6661fa35fce6e8615a787c280ded8ebd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/nl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "b125f32a93e2509e404cf0e7ae8f21d227d863586869f83fcdb577da76bcbc5c4457bd7c79ca4c1d51046aed6cf68c772c9dfd6447da139dd4abae1ffe97d952";
+      sha512 = "eaaccd4746477ff10af5ee15b6e18020e8e1bf36bea7176cd3ca92903d983b97cea4d73a516a976827ad46dc4a03b000935f1d1d353af90ae205df435cdc3004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/nn-NO/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "155e45030d15bdd1db33cfb862df509cdadea5dd9425c8639bace7ec8bbca4265ed501c608911454001022ed01fd27600ad0b9c526e721b6faca9d30f30236c8";
+      sha512 = "7df043f3e917978b9d2c3ec6128275daed830d1402a4bcb98160b2bbdb98012e5db116b7ae6537206de95f65b3c7472326b7739979a12e452bc045e738071ffa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/or/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "dc1590c5d3a51b2a1d3cead15d432df33f58a4de6ca57ca0ff207a10e239575d177f931c31e03294c6a5f6d4938de04dcbeb7e356c73f25a7b9a187481d0a8f2";
+      sha512 = "04e46a2cc75b662404fd5c107a7df37761c6cde2bbe93f040d2b1b745ca6e3fad978ae868536aeb526e26b4af1f7b961e9327a3a9660e1ae9823c9688a8ab3fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pa-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c02641857f7742ee2eff502ce47cebc00548efd54521f73760c0afda0dbd59190a2364862f3589d2b5caacda451811bdc19bbf381ae849065fd5af4e715d72ca";
+      sha512 = "a5a7a0ce8df208b595f895428030fab8e19eca9b88ae2484e915766376d249e0455986b3a79fb4314889b35f52abb6aeca7e7b979ee86672b85ec777f8ad9a5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "1baa6b00ee15366413a081172a67fc835eaead6b053268ed7bbfb093c6d3cd0ba4168f10f88d2a3451c3fdb421c3a91962b8ae2523d5b32c7ca6f774c3041419";
+      sha512 = "427a76174ed62b38ab83fdca0c64eab60c8d8626bf350d15c269056d126a3eb2263ce75f6cdd476ffed3c59b27a77119bc28317640d3407e54a2d17497207a5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pt-BR/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "c74567b9c3ba8fdceb309b72c6dc267c8ae81fb5281e9903ddb19f45ca0c10b988b548fcbb7abe7ec67ed4cd314ce9c9d75ef11f1cc6ae3e411f807d8b9a5fbe";
+      sha512 = "6f93c44b4e3990680eb37af208a1040de5a77008485e7163db861443334cd8fbc86ce387341737699dd0f9197df4ec9aa7668a2b3862c133f0df983d1abab0c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pt-PT/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "aa7b19c3f40c376c82945ae4e3a7136127d0be75502e143bfd206e738be1def4edb9173d4defbe0cbcfef59c2c168bcf983a23d721ec61311fcccb4b3dc8ebf6";
+      sha512 = "255a1297cd0c2c8c3f872173276a81a0847f9991d1dd4180555e3299379740a1a65318596c66c8d464dd74bb2b4c6a395fba3f905c98eac3a97a0b0cb4ebf45d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/rm/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "0f2452d45e213daefc3fdbf68f92f3ac9d4644dfa33f880f9a0e2597c58e93998011ce4e7a6b6d4add46ed205f5234f5ca7d5d0161336480ec0013bc33582815";
+      sha512 = "69c0e8248a17c54879e3e50b6bbf2054afa8d2f85a7006e6201d6dadf5112ba558d4f8e2839bf65c622dfc55f537aeaaf6fe267e6861317cda6bcf86eb9a3ddc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ro/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "7de63c520fa69a218bdd602ff17418e8f586343c676d5f0880fd5dbc7185e9272ce75b39bed5d949ecf4112b2787e72b02643c6be7fae2a87ec3124f2ecd71f3";
+      sha512 = "dd696d3f948e3fc5a6330fef299c93d2958daf96eb688826d58f76457931cd69b0a68cd9e1366e52407a2bcc650542c42f592c0b10c682d07faeaae968b0d74c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ru/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "788a723a5fdadf2cf4149575c860d883858b798af34fb429b3d74d7542d230198c6ffdff20d07b224dd1f140ef84801dbc52962447a26dac9999c397b78da0d5";
+      sha512 = "5c788e031ab302a82cc4b7d51f7f2c7d1aeb9a32be241f4001fc8bb64c2331db391b5013480b15ae9426d970eb80fb95d72e3e2819c3ede8d54f9e47c6bfc76b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/si/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "3ce0498800ffff07caf920dfb8bb32838f519d6111574a687c2c6e864d0e99d644c2f2c33d2f312560f0c0c3fc50b7b592b3bca8cdd87ed700503323d7398b92";
+      sha512 = "2a87bd1040627364b6830604b9148df4b9c826ff9c8d6a9b8709ffa491503ea25ba32f8e186946021358d66129f0b84be98561be9682369a701bd56ca13d990a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "73966742be3916d1a9ff31d55071bf50fcb21bc8913d27109f75b3fe63849dd982bbe9329733e9f050d1c884468bd91ed0b8a47cb713dee79929cfc8c1417d96";
+      sha512 = "defa6ba4b5f00922a45d173fd85982e13a099760ef025c202cd3096366e6fa236ecda704ab97fdc3460f1c66c83e3e8cccfaa313a752f6a038118e2420626039";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "1550d741812085658fbfe82212b0a10408d5dc1ae23fc77441d4559bbc5fefdc54052fc62387aedd7fca0a81902de068a9fe24aeca9cfc338e64ba43e8513a51";
+      sha512 = "adf3e6886f3e500e62f3706ef79e03924e6e9390775b16fe20799d5f7fd6618e5d0c520a8b409b3ee4eb737d8bd2e0f87e1aa8c2b34ee2e0cae1651913215593";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/son/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "25816528ca8907e502a7fe3533bbd3c8dd3448ad9fcb8149ceeac0c397fcb28c7f92965b76f1586e3a7be53575999c6e013064454f6dc2aaf1405b0633e68676";
+      sha512 = "d6e1e6b2b0fda67a38eb9f7eb8c3bc50f1274fe81118491974372b46fe323419ddb990549c74be040900b372fd52c2cfc193e417714215f8a1b3b07259f2dd79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sq/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "22980b382acae61fcd6cf5ba65fc0f969231a8e4d1cb3dc6d09d1773ebd23eda2b6bdb5da10e752f0f69991e45938046b0ecc0bddd377f7e458146f3de387dd1";
+      sha512 = "a787b2df5b1fd9ba57bfe5cc66bc4b774dd4a4b81d11c0d5f0b9c54e1c72590e58d11688ca0ea64d9775a3e4f65524cbfa9740d990197a0b6972034bd4bac9b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "db418099ecb1f34efe3fe3fecefcd40dd2ee720a8dc46da1c10ccca7eb27f3e062756a78c9b6c86314f66be641362e8a82cf344c18721300a432a792c9f71530";
+      sha512 = "3127231295510a1681808d4c65735f2581991ef04fc7af8ee705ccf57b556f3e085a3abf0fe105533c608a27273bc659b8ac8941f2b044a1ec8a9b085b0a2124";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sv-SE/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "8ae1fb40b7b2240a014d1f25547f8afb8dbcafaae62cdbb84b027887427fbec6111fc3ff1325d692341b3d9800bcfd8c9036ecfe32a9fc9146b511668c03d67e";
+      sha512 = "a1bcf79292ddd3efa08d2382a35ca00022e7be2930d832523a4f94db9f25b7ca45054d6d6b6c456f3793038fe4167d8659496f4b0bc812ddc8c58a1e83e279c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ta/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "2e22c50f9905aa744b2cef1fe087332cc17cc7ab51c144e34327153bca833cf5b5783f0adfe5315e2965f30c237729f2093f670c9a00e39a1db8659a94297528";
+      sha512 = "c3ce64381471908f7aa7d4004c8c00d1b05d852c200343ce48cf7d428558d0182c4b13b23190e266269c556165c6f51ed55baa1bad9f55f3c355935c09bc9f3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/te/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "c2add5e606be0a210ed6af6c06c3e916905d3053dc63e282ae54e5d4209b800906ccfe0b23279ec2cce1e2eec7f40b6604cf21652fdf626dd0e261881552724b";
+      sha512 = "9427ada27b5ad79a556f4e0f7d1fccecec7bafcb44ee19af9257c16e4235bc2078af94acf9e0c0240d11a32a59176040ac54721fa7b934ba12320a67c3207183";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/th/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "2c5b5e170e75dd7ec9b4e98fdfb2cd6f228ca6aec0907b6ecf837855a2084b9d2e0ec6000e6f82d1bd9b7b09db23afba8ffa6e813060df3f69dae7a5f04d4907";
+      sha512 = "83276f41443e931b7e55914fbf32547ab01d58f9d5bce5335cb931b783fd9845f20514b76889f82e357e489b65afa3dd0894544d4004625df08bd2021aeba8e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/tr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "a16330055ddce9502e69b8ddd6381ac421836ad98d0002591cf0ad28ea199ee607ff747651228fd2e5528a9be773aa9fa6f0ac58e57d13996e104a0c2c6fcb34";
+      sha512 = "c93877ccb3a0d4ba9164363b869577a5cd36d85cb05a8d1ff882fac21e333b7ff8c4597647243de753c037525f1ad7fba21dc1acb2ad212802b514af9402896d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/uk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "e9537030c06093d21230cf8e07913f05d9b02a89d31d952debf558c346d77b2cb95f3129a9ff6a249e3abfd769d41d0d67a57335d4dd39b1ca1c13eb9bd6cc9e";
+      sha512 = "1512592dc0ec9a19e2e92fd39db30b50fb5b26886c1683038885c9d7b18a863182dbe1cef7b8265aaa82e60dcf94c45b84892ae19a25a8a9339382ddab13e327";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ur/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "754c986845dfc0d376fdaad04bef71498982259524a458cf1b89ab84439cfa4bd0ad6d7092e7499cc91e3eb45dcfed3f93a2fd1bbcde5f2b678d17fa4d62ee99";
+      sha512 = "3a90c751054ce848aae996641133e2aa573c4d6329d3dc58465562e45ff450bdbe820828c551de71f0719210458cc71aaa4d0d3745a7feb27731f91befcff3d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/uz/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "ced181d692de83928a297f18bc62391c9ad9c05b27d0d9e2db3b9f0c7d37d726eb4406837a4e223534e15358fce4daec1961fafe284ed032916c39e49c0880f4";
+      sha512 = "33d3c67687b235c231e09b6564fa525049e1d99c37c3a5fd6905feee5674c305af313d381eef5af990e878fca36f6af0cddbb399a5a297affa4e3aab5f3c103d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/vi/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "ebd4bcacff95dcb7ac6a58da2ede2b4fa7d44598cc96761e870e49d65c827f89d5fb7b2b144252026475379b3dcc88801a46de8793a8b75f17997edd56f90679";
+      sha512 = "8dc83c33bf9e27dd0605c945a746035bf16a189b6d5f0e52a9d65e4f45964d8fadead1b539d9b906ab13cd43a7b2157b4c7040c1d155f4eb7aa67dc987819a3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/xh/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "80d32cc0d735e54691b1c4cd59cc1a46b187dbe4e2b2dc3d3738b66b5355324313c7c5e61c778ad058b236e48dbd8238a1bb796cff6185398515a9fe5ca42385";
+      sha512 = "b0535a8704b8879b86d27cb4867f13269395ffafd54a5acdf49124808f9c606f52cdf9e64a6378fc0cc37a6eb4f955b3613af07076567a6bde71a5e61a521c9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/zh-CN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "c63f0fc1174d40dbd2c1c57d92cf02d594c1a64ff12e90b5a58b28d7ea991fcb615a0e8029f96ebad12c59ef1fcea39575ac58b69eb25f31ec4d5c9de5cf72b8";
+      sha512 = "17c5996c8002cdfd0b07ac796be9b437582cb0c5401fbe0f405dd0f8b4aa3f45aab24bb5a8f364320d62550eba7d228e1c20bc7805e741a86666c225db3046cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/zh-TW/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "54fed20629960f34306e290eb60fddb7cdf20dd7b95a21a632557a41c99ca24cfa03215924138debe7c6aab9772197a0680f6afa3f35da841ae8df553349ea18";
+      sha512 = "68d9b507ac39d9e175285e5bb4f4f24396687e57622ff31448cf77d73ea8e8817230b65e70c493121b40f4ae91b145be59eda2ab9d572be3d48c14ddacfb28d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ach/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "baf49f88f15e62a5b2a60c8c09f1cdf8e414083dd816403df8ccc4fd760e74e66b2b86cbed075ee78a504e03cf6de5e90d92a0228fe0b3e889ea301758c8e95b";
+      sha512 = "e6b59ce7c5c6289d57edbf019e74d2529b2d38f09552110a50d94eb82e7470103791c69c59066405b8e5d1cbf5058730c3bef780cab7b95444eee756b593eabc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/af/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "39d3f8fe582222fdcb2e2435cc02806bd34637deb2377276faac5dc30a7df0bccaba1636e9d04e86ff1ee4f376e7da4eab2d63cdaf00c4a20e7c048c76a39e38";
+      sha512 = "38393317412a3310ce7984e77a5dd12a70edc3da8691ca38b5133355c1c60e2ee61a12ecd5af7ea7b47d20f2718da2bce56c9b6b8b056fd75f9b93d1e196f52f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/an/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "3045e008ec29253728d6dd9fe99f220aa00555c721747dd684a6806bc87d60539e79c7b547fee0d3b740df09ebb8febec9e44961369d8f614b9fb34b8d04f1e0";
+      sha512 = "584ffa243d0d070aa642d3b0e5fa4b7db553f68032d1f0f251034f4c636529f382451930217da9a3fcfa62e7912108f41e280a2f277b5ca9faa2b05ee0a86487";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ar/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c4b147f35e18d3ae864d641b686af9dfe25d5ed58e1b84df16c2ed0f4574039549f71b019d2102bfe60a5c84f2bef9ec20bcb4f56d914ec69b5d91910e7b6378";
+      sha512 = "b04ec9e9698e2c70149c772818a8c4ba2e0516e3049b31ea8fe9db3b1f69724094bd2c05685a864f3364978362eb89a51b0e15e7931c61ab3cd4693dfa8d7517";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/as/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "3f8b2001af4064b4273dfd543f4df1f6b534df9b5b56fa6f3ba2eda0f924757b4ccd567295ff5874e463e330be1669ef4d5850f33a1e081b0f077b571fd90dd4";
+      sha512 = "2f76402d2333572483ac9441faf070bf55f39bc22a7d995c6e6f06e7f478e54209b1b61fdea9a350f1466b508c35a5640a3db0c4f5f0451de14e535dbc4760e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ast/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "20575f29d9409afb7c9cbc78b1f2a16e975b9844fa9d47946fc36fc3d9cec14c340b97643147a6d021a53daea07b22e0d9b791caa954686ecf573c98136176c9";
+      sha512 = "1b5c6de905494d0773a7089df87987435b70b5c734de77a6ec44ffb941709d0e8713c54de8293c0f84a77a96fc3b7ca11e9ad892c870236c24a86031e62e35e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/az/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "29f374dddf442ae9abcce6be49a234a45b95987dc547e76eb9d3ff7e48781a58bf00303b72cf13624ebda702d9dfdda70ed594f17d59d1573783b643b54f2241";
+      sha512 = "d1ed01e6854e3ab1f8e8f339e7d4c3bbe4941ccda88090e09a44eb8828a62e59749218072fa248358c073ab76e84b18d59cbb3cd39550834de9e8c91b81a8477";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2";
+      locale = "be";
+      arch = "linux-i686";
+      sha512 = "807a7bbdfe7e556c4f8071ea8e148cd3cdf2cc32c6c00d91a0563ebbb378599debd0d3e0a5f96f75f4ef0bde552c5050c8e798f6d1bb65a37019aa0b1b61b55b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bg/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a2126b3a3875ae62b21eb2a0ec840f0b5f0ccf8c81c945b0b6f80fc0ff5e2aca3cb6cb9554bcc8737b85d65fc6494fd80effe9fbff277f6f5a7fbbe4b8eb6477";
+      sha512 = "fe499058210285f65d81397d182b7e37ede56e60ee21cc7e0680fba8c9dff58a0e8747d6c99e789cc2b7578bba62b5a04b83d1cd1f8e533213ee3ece4957acba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bn-BD/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "7bd043b9bb24fffb8f2a8a288ccd67195d36ef5e3908ce83b559efd37278c2d7275a85341c03edb42763cddfe2c95b917387f536738b7f8b54c743361045a2f9";
+      sha512 = "df14ba0acae51673edcee4e2da4ebcbde1f44e615a56777712b4bf1261c49a1007249b4b547d378906b64e4b97959b53285bd5d0c074fd3e0080537a5ef24c1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bn-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "62218d525722f55e1ed9ebe86961311573e53a08eb87f8a459d44e08f2a2e627fd0bb8b67c4a8de1b63fa14aebede187428bd728ffa68caaa8390c46d5bf148d";
+      sha512 = "5db62ceaf945411c01066e244fd08a95ac72134867619c488f54df05659e6e335af77c6a5341370cbcdfc7c9142a5654aa843b1a392a1531c10062052cf97c5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/br/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1638a7b3091f243adcbbb87566eaa8d95c5a6c315b8c67263181e33d5e014342e3f062da4a749972dc36da029d15cf10a4762ed607cccff934c19a9acc3d6e72";
+      sha512 = "02d4f4a010cc1ec71d93c1b6236bf891b290bddfca87ce9502f12f530033b26b94a1ea993f591911cb48d52145f2351a34be8b63b67a74498f6a10ee7744cc75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bs/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "e577bf44f0f0cafb96a33f8aae0a2b538ebf46d6bf3be51e4bd59e77261b4022f45619ae098c66c11546dcfe6baf4b596f1d9ae7f4bd1266c3786310567a0487";
+      sha512 = "458d234394e79ffb87fa3181c6722c63eecf19af4e6c10eaba372f01f4209db60ee01d932fddb335f0f1dfd2781cb3e651e98ab4e69b71974316be78693d05e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ca/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "dc0dbc0b86ab3079863dc37d62851fdeda415728546bc0a2799c9c0546df258de0ea47968ef2b941e443ee4110cc8aec632eefd6879b4e76be905f66981d0290";
+      sha512 = "cb0e2dce6a8dc0c211a72bb4e868bc3d04c2baf19478ddb4af6f6adf6c97b7a0ac334017d7faca08d51185e3352140b13c818b2a64f1c74956dca8aaba1edda4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/cak/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c1c02e89db0421c9f1355c618cf2831ab54eac9fdc8bd61efa5aadc37999b28e2cb91c56edef23748141becc36c4e315a9670856323ab7abf64fa5b37432add0";
+      sha512 = "984b28925fdf204b1d0dfb4080f503a520ae38288370ab2e36ac1f32e579b5fcfbce3106896a351472dad078de42656c566bdd56b32088b52fe4bc6ffbada247";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/cs/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "8d8d2f7cb0f352c70681b2deff30b23caaee1247e11e0b6ff977fe4f12352db8a3fcf2f4c9463ccd8c3a8631be7432295fd82f74aa2ade8a67bdb89916e5c57a";
+      sha512 = "18bfdd25f92324a7ca00183f47ec0c43eebf582ba4493a36b6b39b7f178974333df29a2238fec5974baeba271a3f83ff3f274ffc15488c24e89cc2d17766ef64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/cy/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "9ec90347d3ec2a1d23db120f309bb6a5266b8c6cf85004a97cef798c7ce14169e28f752dcd6d89bccce7947cf0be04457c8e96a8cdee6cd2e4bfbfc84193fd4d";
+      sha512 = "1aad954d11eb33704782e1ae502d86fe9c428c9cd0d7dfad020e7510348443adcdc7db789fbcffe96691e68880da2dde1ee331d5f51503dc90b839f14aa44ebe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/da/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ad20e0ca46c567d8cd27a44af43c7c8855be4cb50905f7697a102af7378009449ad940cbb66e24b9326136ec98b90782fd569ee411951b5313c9444a516a4184";
+      sha512 = "0dd9a02adc2aa39fe5ec4ebbd0b6cfa0968b0daf50b558d088f1f0680cb06a8baa526ebf96fe63babdd8dc85561910a5a6645ac11e02e641361491a2c9185738";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/de/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "21d414a1c906675cc8eab081f499438c5b01fa1b535a048ca0538815403f18226fe8c7fda818afeb05128497dbe1c53d17868418c1e0efb92dd41bb112496ec8";
+      sha512 = "a3f13abc0d8ccc445a495cd87cc690e5875c9c79aebdf6adb04f469483a5870d45fe7a61231bcb3ce07eb64c38ef04ff6e16e75c4852864a3ed1f385d3dfb79d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/dsb/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "d7472be94b33967a8f65764e5afcf6ffc8762d507d6fdebdc87aaddba28bf0aaf1b31a546c69adca4e53effa0a349f5795ba2ac52d51f2726094a4901263a042";
+      sha512 = "e5bcf46a200adfa34191063503dc5875bcad0cc298f9ccecee7a1346c15b22dad5aeffee2ab7d17b98bd3cd659544422c05ee9f79ff8a0702e592b7d1b8e5b32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/el/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "ea5e5520cf1559e92bbd0b94f5c7f8451e1fd53c09b92d5aaf2ee2e48c1693cd9b22abdf418ee1bb1551768a7ebc220903c1b0476935fbd95cf9476b7b6e5a30";
+      sha512 = "eefcc3ebb84bd75472ee0614d386a5bfe718a77b2fcb7e4296dae1131415e6541f3158b072314e8aaf46851ab718d0bef12339cdfcbf1ce4d1ae19004fc82153";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/en-GB/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "3e685d42bf1156dd736622b6ecba811dd4b3333f6be268ec616961088b2784eefda7ea0fae8440d9ddbc2a54507e90f33a801aa885baa70bbd82f0d2e0b206da";
+      sha512 = "c03a785ece38365eb69893ff4346f468199ce8753329c781241bf6ed96f595696c0927285db41fb00a15cb548eb74c66696e3962560c5add5b0be7a29936c8a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/en-US/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "f9fce327dc51338160dfcfa22733f299df0598e4f2f2d0f86b7376e7582d10a183bc8eaece746bd7b598ebf0f07efa35f61ce1c5996e35d4d4d60a891a14d01f";
+      sha512 = "26d4b175dd8ce02cee25c2f8d6eea4e60ec3ebbf4858a185d38d3593f4397131fbb60208043f4c53affbd075299c69d5916b4ad55b910cbc8cc15952c78d9b2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/en-ZA/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "1c6378b8c5ec23b8988b9232175213151adcf6b60c9d7d8f36874e21bdac58b55d788d588ca99ac7dbb235de619cd62fdd66f607f467fd681dc0c0dfc48e4a0a";
+      sha512 = "f99136eb3831a304ec84044cda5d5fdcdefd1a4814f6372c9edfbffb98d93b551d0cbc8fb45e8386f251eeb0f0a4aebcc12013267a901c2533bcca197ca6b5d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/eo/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "8f991d8e5a85e7890d868cdd5683f24ebd5fea2ddd01de9efdaeb1d8978c81ef36084603e76f487fc844a4261d65a467471bf30910ac9b0c33dad874cd1a5094";
+      sha512 = "3ede053c3018b41f113d64f5d5dc14ee1d2bf219e1d7b37ae7ae8b36aab349b1364331d7364850cf40f7913294119c85468a8441f524cfa6f18fbb55c4bb2644";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-AR/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "65c1099c7fd660ad90d12a0297729c6212336b9e06f96128fbfe7c52e419869d8db443cc19f4b61e86e4f7ad275952a7e7d570361e7829927d4507e20b95a964";
+      sha512 = "51736e77004f5c9cbe4f303f00ac6c32c9459e55a1cdcab958ece590ae8d575f119ded5bb013600f077fe388e3572d01f31a41f462defc5407d9bcb6da743fde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-CL/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "ffc3863b8e25fcbcebbe01fa0ba28070bb97813f87a5f4f80eb25c7bc96df133140ed9a646438618ab297749890d0860c65ea77284ca101903b064b975a5e2a9";
+      sha512 = "9ea21d6a5b9d0eab81eafa1a5757aa566b806fd16a925609e46002ad126a633d2373fa8ef27db9388c3f6f4680dc76b946b5ad9f71afa8dc69382323cf1dae22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-ES/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "6cb1a2b2c1da715733ca83e9a1af5e20c313887b1973010b1871be3e5b1faa35ef81c4e3c1c0084d23bbfb2b9151cc684179fc285852115cf3f79fc3538e93ce";
+      sha512 = "3d77e61ddb1738c24af8edfd8a2b9905732626ffb51d1c64b2a27c229121ec8df0e7ad61389ffc0c78ed545a6ce8ad9deb424f65c6d6fcad427753f9cee6f1fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-MX/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "f54c7a2da3a00cbe3c744e0234ff8f258a37f67590f92a271df313a87de1f15c05387b83525dc01029fcfa2db536809ce24cce1d067c765441d6fe6909aa6eca";
+      sha512 = "155eae1468c3f4ad4a38e3ab135f79e352da4e96b1f1bd2a20771d9eca6e4ee89a0bf6db92c2a3aa4ea92df8fa41cc63f35d3b78c3f14fa4ccb4521d7fddf102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/et/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "af3ec37d2edf1d0f0f7da6de779923b0bc446a066443484241783b8a76fd96a8b2ae7044967b3d4854349fc6f0bd18b2032a50272ffbebb1a53f851ec3d2ef19";
+      sha512 = "08f8ff1dfc92fbf4d26eef4ed6b05caa6b911fc8a2ef1c655fd6a6216a5469e3086a514deed1b6722e6207a439feac717d3df851caa08f71a9796033b6292a90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/eu/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "504764ad92b0250b203bcf8b42c6c2eaf0ddf4ac0b5a3419b9c4d84f4ef4e50e3275079514aa89595a3127162c139078262bc90e0b998922bd2c06f8a90f9f7a";
+      sha512 = "407844c56a06d6464446390d35cba2b0ef983084beecd03f4cb9ea93607e0571be882b4ebd35bb25c6f2fc4f65bc64321c1e6f522838c1dd68bab46ea9bee779";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fa/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "8c632dc5b05a2b0711e917a4d3599775bdbb59aba448f408660e7df02f3aa21313301b4ff8b4237ab7ef9c6e61c5b3331860d79413abfe447dfd262ca4d817f2";
+      sha512 = "f5c27b8987623ce46979083aeb2c7cbe0efb9e92c2df6909fefb54e78a25ac3792d78605fcbd50fcf71dca8d09b60c5e92dc4ffce22f3a24130a0e1e5fc13918";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ff/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b37986236fa7467d513b643534e0b4fb7e9676dda8856b6600ee2287b671cef974c4fd781ea1254e20ae66445168e2fdf2fff1e761f489e2a0fd6d0138adcdaf";
+      sha512 = "12367b1f896f88a06c3eb906a10a5b288fa6b3d689fb1a452ae93677e37ed89957499937025d50f29ed808b93c359bc9cffced49e013e95a588e2828a4bd3d65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fi/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "57164b97daf88d76e7e3fe73463d1b583893165dcd79ddaf824e76e0e8fc182f9e4c168ba5a78091d5f2cc7af0b36bf538b056d5837a5dbf1d53d0c29c0de5b2";
+      sha512 = "40ccce97079cc5ca9a7db1ab2aba581c4e92d10c83748c654e48d922ca14d28632bec850d138b97c847e9325162bc34a20d4e672aab9b191aed7f5784dbdf814";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "5e29ce0a9890cd6679a0f7b2b074f27d8a0f4c0df00c0bf15fb07dc5ae7d4d5147a3a21412d7916c00c67befee21febc8399045ef90f9c776d77853488551d1c";
+      sha512 = "5639d6800f4e8265bae4b3b49fac10312fceb04be944a51c11b37c33b49c4f418f0c2a6481ff0860652adfd7a0259612be93d784a802769465fb29cf02780c6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fy-NL/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "023e82bd8d6fd4378d88f063b28b92254440c9eea4306fa046b1abf31ea91d43259ed55c330f788cd686d152e17c1f94626eb05ffd0cb27857070ddb8d546298";
+      sha512 = "f73acd20403e4cf38d365f9b49de1879a750f73ec2842a3ee91da657c5fdb6eaf0695540efdbf3e67cd72234cb9007c2620b3d146a5bee72e30453c9fc6264b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ga-IE/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "249f6f582f5cf7adc8cd755e26c44a3d48712b10f65a436cbb43332dc7a72b3d11ad20c4d456c7c685d174243166ef1ca11a834c155f691249bb1de4a157b996";
+      sha512 = "b588a3a9782621b33d9b43e252311e78bee1a49b290bbe055cb01b45eed1ecaa79c8cbe326a4a462a632a4452978a2978d6ac73f7d56d9b4b51aac479bcc5c0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gd/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "447a9ecb093576cad7dd24f9c9d8656d31d4b23db33f76ac35325bdd8cacbf0d64625734aaee4d5849b9f450dc7f4300af8ea284ccb0fdf9d1532cfa74556613";
+      sha512 = "ecc2d97c4713a3646a3c38ea5cc1245ca7a0bc690305bbe0ac3d9b09d903e27265cf87b73f1baf98b50547b321ae4ff984bcb4f9afc788efef9b17962c9ac28b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "cd0ad5f227caa5bd3213ac35b9cb73c315b23d9eba789a192ae21265a81ad85a5718ab088c1ab9ef7242df5c3e03271be333a59c40db55744de1b5be3e066e33";
+      sha512 = "0715dd37ac757f9c70d41bdd0faa26cb6f45745ed17b9e627d51bfc040d9d637f236546cf1eae77c8cabad59f82bf2bf95758e5eb675dd9fb6813eb43214163c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gn/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "918afbfa4fb7cb8a553cea7638f0ae26ed6cd360e5d1dde81c2699e4d9de24583a126cd75ebde7a6b4a42cd9b220ac1472a1b96d9c63ce5c53f241f6008a2264";
+      sha512 = "7617f00ec13a6a672b80fda28108e467124d0ee22b5e0dc366e2bc04d5be5eab91c9ec4edc275df7bc7ccf45197629fea909e945c633f58f88c8165ef2628b37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gu-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "d680af2d9e62d7460d1c683bd17ca079022e3641b14d2c51ab1deb226c6f68a9f0228a0a394b683d4adf27268cb68af87122725f4b3e6556a61f231a1472f2e4";
+      sha512 = "15e94de3500b185668ee87880667ebebeccb23bf69c324cd64c9a5f94e6ad1844861c773eb0a7b7479c169de63c8612845902c8c468ff670b37684b1d6059d1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/he/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "a2e79d3e819c6f161d9d03b3c2614968de2d7ae266c56ef928051a8682e3edae2cb76f850de3a33e475757570f79d2c6cb580781424c03f1453d9f82c558e7fc";
+      sha512 = "86a94619d93861ad797bd9457a768f62472f980076d0d526a95e1caff52cbb0136abad76825e191003ec55611429f2b35bab9dcf4a1d62aa226db89261e234f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hi-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "7a4b6a513e70b0645a9b96d2b08dacee9f14ab2d6209b82937fe4bbb7b08b4af64e513921baa17384e66a5f61c18f5fb20c4f70a99afd878cbfa1f42a33befc9";
+      sha512 = "639469d7c987b366a5be59b45058f8aaa2e5322e0534a4784c19f434d48ba5cc7e6d2da824de48d49e09a56085521e16680e1cc29261c97cf18cd4dcdfc79c27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "102726454dbed95a25e17a5bc438fa5c78f3c17fac6cb91537007c58e3d12199e0341e6726c16dbc899a6bed37efcb9acafba6ab1b73347a7efbbd7b9e049143";
+      sha512 = "8c4021a8591de29704240d152bfe3283901b405e8b4296196eda3f0b9591b33fe8c08871c3248afa82c3967c7d025896d584478d1ec3b761ec5f97cff498e098";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hsb/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "6aa930b7658d9347b2f17acd829d71791e289aade826614d6515ff5f8596ed9a95fce0a63df18a98ca28e1dec7bc15661f2f55905241e698c27ba4ae20303fa9";
+      sha512 = "7316554b2d0d3b1cd559057374b67e9cf805bc827a40652e70d00bbddbc892f68c7e65fff08af2d4742115df124185c3e3ca862901a85ef56ccd658f799ac757";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hu/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "c4db23836c13f371027145bcc1e6c9e8096c8299c0007fac948ddf46ce2099f7c1a5f0d8415d6cf42ca83cb08cb61f86fd3927f07a974055517e8bbec72a7894";
+      sha512 = "1365f7b1e55eed2fb7d579fb2d9a2efb57d93a4e78051d57980e7b1bf3213b2f577eef6c0f1c53dcb47a7af92ea0b0ba9558e25e84c72e0f32e573c393dc8d4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hy-AM/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "b66112e99b41c2c357d285789f636b9f6f4da848ba4ca013c7d24f7338b1f724f6f81651faa9f82bb082a9182ff9d4fab442eae581117d2d02493f215bca621e";
+      sha512 = "14e0a798b4fd9af769a464ff8c2fc87ea69116f7ec66326cb623f4fbdcf4c99f285bb8e65492e9b65cbb86dcf66a52669bd81df37ed00359546072a3709f20f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/id/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "d0d9b990e145730396a8b88bacbecbd320f3ab9f2e07bc9f56493900b93693ea7ca04ffd077229e488c847014de8cf16d481ec078a4b30058eef73903c5dff9f";
+      sha512 = "dc15d01a33d3fbd10f26bb9a1758df13f53aeb9f6b0a62abfe8bca1e7a3e233aa0a06981d04085e79e91c629a1cb51510bdb744ff34a6522f374444c9bbb84ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/is/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "a23c64f8dbfa1c5a6bb2e31fe2fbc80d02485abeebe57e091cf101355e07532fa2e1d75ba91f4c5a0cb112dd941440f8f2b83cbeceb17eea026f29bfcaa37779";
+      sha512 = "13761e766b5fede7eb123f304bca45bc3a7cf5ffa4661e2a961ece5653c2986a61aee742cca3dc0cdc8bef54b38a66b08e9a45223e42cce9c0a99a857d6bf45b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/it/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e7084183c5bcadad2eab62db7276c1342522da64996f442eb9ea0dfb3354c5f75f19acb53d937d055d8723b68b4445580b7bcb8328a063abd601614cff501542";
+      sha512 = "23dc06fc36ef32c148990692ea5bc5266f1ae61aab4a3853034f85f3debee5ea5a5a71d741ffa29136db54d63857edeeca75805f9c7f75c278f06a6c930ac248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ja/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "0f8e6cdb01c5aef004ea12b63bf24797276676ec4ef0a3bd63b596552322a33cd8905efb075259955189ff5952c99738a1017cfab8dde90ffe90d978182f193e";
+      sha512 = "f33b38709a7c4701debf19a901e36302b364c911405d96f952c0510fbf95fc4e24869a34e3a336718a0e0f26b5c7fc88fd1a3955c329a352bc1077b73cede937";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ka/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "6e1556802092f186cd57edc995ce53b596ebcc70fbf37dfde19fc8884441b5f84431e9c8b023c93578c538ac14d5d17caec96cbb6178f330f6105f21133fa07c";
+      sha512 = "7b684624e52e189ccfd31d6d910b18148f9040eddfe0518710388dbc1160c2ac068f0de39faa42eccfba7823372290f932d3693ad898a0c7ce20f6368e696f1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/kab/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "9e25fcd718b65c66c8e99a5d63d06603e120f518c36cabe47cbea3ba9d2b4b61d9baa805a13c7860cb22405d8a5c2978fb2fee1e911dbd2d3d87ed2d25b4aa95";
+      sha512 = "9a9f8ec3cb7b86866dfca4a4f5ac25e13135896144af816ed2242091fa8719535a7d2c225be6650cdbe17a9bdc7bd2bdb962e40abd16428702c2570cd06a798f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/kk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "0411b45af993bc0df101640db9c13b8a041f9e73712b3b41ce8c3b92e0174d366279e8e61a286982ba0214ed2dbbd6b23bc940a2f06947bfa534d8fa9f3574f6";
+      sha512 = "c7aa9195a8bf39d65deeb4233139c6941433a7bef77797532fa346b509cf91c8e2041a24569996f7a5e7d2fb0e4a108bb40337cf1283195b257a5526d89b3bf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/km/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "621de21c64bb7a10aaae1bf277d2a869a2897270f6075dce9c543b6864be03221d278aae9b6ce7d67af5024fd9c5ce807e7f6c9e9c5b9eb8206c5ada0460fc70";
+      sha512 = "45a5dbd1ecbfbc69a4ff99327a234e9b26f06b9e280cdb2e0689b4378a84eefc4fe3a511bf8b111db873ccf39f7b99c1d256218accf190975d53ed574d565747";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/kn/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "f446dbacccb0bb89c48137166aaeb2ecb781f11441b6610508cf3119759cc8a1c12ea713e231e6c05ea4001c2e7a750d2880765ba09315d3c593975a7bec8035";
+      sha512 = "75574a88816ff42e8f20555a55f41bacb9d33d2535843b38d3079d0487bd1190b392e07e7d97f288c51f38c053bbbacc7acb34a835a7ae39814d6ff2ebfb1510";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ko/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "2d941257c88db0617c230e877a48fa54a6753cb1c46897b92c752159e9ccb0300cd7916d9854e7671688394d2e147330fa97e16a716ce1133b0f0c37727a1553";
+      sha512 = "2bbe4f990e2265e1d210c52987759486e6127a875ee55707bdd8fbceb44943215c28faa5f6c06161db7b7f18c2c2c3864882ffcc1eda286edc59aec7e33aca0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/lij/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "6705fa1ad8aa7fb4a463561a2c91c8f6a70d491418877d3dc6a9d98c903f3367e649d66a6f1b7b1ad417fa65b0cb44a792a49db479842eda27ab5bc5791bef5c";
+      sha512 = "9c3580a05057f7e04f6efbf60b281c50b64970064dac547cf6a84ed305c8dab5d014f96719e70c87e67124f61afa3e1a44ecc3627fd6a3181e3dbfc28ed175c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/lt/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "246416023a4a2c8231ac60a5339c3164301f2d51a2ed6bb23f58f0715b6eb834f874b992268639e7d2000ec41a404b61c5ad191a218a3fe68f09244bc8fd8b3a";
+      sha512 = "37b30fdf603cd41617db37cc9ba7e546c58a6bb58833b461fdced4caaf128bbc1a36ed774370548b8249da884302bfedf52681af61348313c5599628576e9c57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/lv/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "e47f984c68e98927e15d66b62588f8a159c012bbfbff931625e297e28c8a1b2ca06eaea60a13d62392d8fd5285b2fb0cc42c9e4d68c1123dedf87964401d39de";
+      sha512 = "7d075198482100a338105bb80d2d40d97d24460f2a6b15b72b349d249ebb638112e69bcecbf32578375d5621f3a46e6267401629d2fbe1ab6dc5d72dba454086";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/mai/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "7bb51a53327f85883b3aeb58a00cd78a5921fd6746f2110a22eccd38d735262c05d97cdd84dac1dfa29502bbfe333ff365d7ca163ed4f6c946156df11dd5d9ca";
+      sha512 = "7e052470a133931183439deba29a16097ad50383b63f97d5a1c03b7a3ce0c6485811c1afa2ea78bf9f03def2b0678bb43acefb2c1b944d8c12ee18e44b5d520c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/mk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "e94346e4b53c26523f2de965f4e0de11b835cba2dc19553a3a58cb789b9b1bcd146f37fb932184b9fef6d991db04f7dffdb9b838db758e159f654f6c24beb196";
+      sha512 = "ef6b8ad5fdeb7300c9676a2232accca1cac1b47896987455ec93ae8b8cf46dc092e224b417f922bc4cc0c41ce941d607c4c3fde6e305e274750af72b8c405389";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ml/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "1c2aabf2587e312ef071acd5e97a508ad2c5d61f3bed5ea36eaf47758ff60d5f46f9966e09954c15a0bd389d2351f3cc4fd36ccbbdf8fdfcb1cff92d8832e56d";
+      sha512 = "79dd88442e22ec9b98d432985deafc68b6b5c3dcadf6fa0a04292b019b3245c24b2fd08784d4c4d804c3b913bdf379753df4ba24ec69cdfcf9fdd659c8a18e4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/mr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "0f04e81a05c37ef0919dc03787ec069a78de21154fc167ebde8c256738cbe23bfe2585e0c76eb8a4687b6d17bf69efa6fc142de27b30c519aa446e34ff6c52e0";
+      sha512 = "d474b05fc960f2c12319bbf994027945ed655bb8b6e766e1ba04f9c863e4d5b6d1ab8d632e0051d1191bbaab87e4793e8c1240372b9b0e0f170da03856c5d8d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ms/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "82c95552769bbde10239ceed7c5f37d3d2dca19c7ca4556404e5340253f8396e66f88577b475f7f0d6a367a6ab1df556bcdfb1859ac9b673604555a396e391b3";
+      sha512 = "c5372584abf3c3ccf858c50927d26099504efa43feecf487639ab7a73e87da6137e29f31a440d7b6eae43092701e68c02325a39207f95c73fa2db303c3b402d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/my/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "af03cfbcfd4594129a6e8812136c5984a62ac09aae238432ae69e825e767ab22c720005350fad22a0d3b774bf58e460f567c7d4438d32bfd6370b44f5fc19869";
+      sha512 = "e5374a80b05eab9dd8b4a279ac96edc52930ee730a9108f76a022e3908f5d81c3e5db9ffedcad492edee532c2606982a6c76733a971cb5d8f64ce68d04b113ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/nb-NO/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "33216bfcff1cbdcbd1aa656614d442a1dde16e033954065f7cbabf5ef065cf9f1722f4ce17989c3dbb822aa7b2e21818b9e7b25e0ea0da9bdfe157d6e7713547";
+      sha512 = "5077c2c497fda39bca53fd140241fd9bd3cde4f4e1ce3e7fbb101fed4a24d61df81d99db40453d4745750e24499382afd83e78cb67e82bbbf91158505472472f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/nl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "520e225e72413a9649ac0025a1c3fb9b58a2bbda0d28aad15c2608feba53e53e61dbc7f06ef22e655c3c2b77c0b1be853a79057cb08afc75900bd852ae8077f0";
+      sha512 = "9eb8e46b9ea30e2865a009beed1c4c515830b1acddf79c2a0c035e8005dc646f2ec1d011474cfe53c07f3bbc73071765e7a88aaf0ce24378b1501cf5f246b106";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/nn-NO/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "c564b555844d104a82d6b02e35349778fd0afdc7dad20d8560713a1f32614557fe3009bed29bcabc16da245825cc6a4281a64ee0bc82a78d4b45b21a887e8d23";
+      sha512 = "afe2b9c41cdd692b9166ddfecdb78ab94a3bb91d60b91e3e79a203a1f928a92d40eaf7889ceef19427dda1464155f85d0e166e98bd9eace6b071d3b30f954071";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/or/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "1ee6ca370ab28f36fd379daa2ba4259e715d6dd5905c72ae6ba05eef5eafd4ce08511c4c4134ccf640834e053d1993bee85688c108ee4cbe89ea5f8acad11f9d";
+      sha512 = "5eb2662445fa000b626e5f4a0195a44d8e00c630e09fe386eb7d77fb514b2ea939c07c23f299ae050260c06e6e68abda8e32a2ca8c5155e5f1d5e223add04e48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pa-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "d66120b15473b145f8b5429a1a683950eb5766372f5f1a98c3a3ed69c68b9220f5dc45e5d114a6bea83851dc9b4941ea735c75ac45ceb661e601c6069d9d7534";
+      sha512 = "7e6ab9ace1aff3de1209992336567da167a3d6681af81354b05e36012545df1ff06e1a825668de7146e843a56c4e3a110ea530351ed83b129f9989d24bf86a2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "4b6f5155e5b763a7a19cd230cb37a6864beb07b29e4181aaaf5cfbb9fc7bf9fc67cdb8bcd9b0a35780b40a7dc8744ba04fc73acebeba49e32bbf53250a78d395";
+      sha512 = "fbddea93b51eb530f26de74d16a1d373ca9b86a8fc89b7f12c8ee4e2f3c3af8be22560ec11ee4afc7d93c305eb8f352931a06b2e7dcc11eb1e9ec755a2afc2a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pt-BR/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "1b74ef30b836d7490b155b194ea6a9b1e4461d955f5f16ff0afaf1c1f1980dc1e7f60b600c2ceab1e655038e84574e4408c15fe0c7cf48ac99c0961e8a04b135";
+      sha512 = "6ae90c6b37258ef9e9b93fdad261c7b2522ee3b251c36f03dc6bf964d91da86a05937b0a65c75bb3531b7c10be6d5ada3a88b2240dbcf1c64c5b3f624acedcb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pt-PT/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "3c5a2881d06820a3f54d3a2e73be720d1c0f06233114766196ac344f5f9f0ddaf0f9056367b5f2a7199ce7852e81ad77f5c55dafa3626afbda92a4bfdbf5db47";
+      sha512 = "0f1d035f72a3f0739f843e97e1ab27c3b5b5901e88eb8adb9d8b343f6b5f571133fb8e9f40b3df14e4d7e1144aa7f1af86e7100df5786602185e4ebe425c8f97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/rm/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "d8b5fa46c953746a7feabf4dc0fd7526128f3268cc3fb92962d67d2c03afb61088cd82d7e5054ff14a4f8e0ea411e0734af8745f743412cad1368414593e0162";
+      sha512 = "7ec0f5792e812fb2d57d420ecdca006f5242f6c3599b58da01e3ee65df896d1853fb61ae0413ff59834a669690ab40b74244a31be5033ca215bbe784a7a8cb3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ro/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "070ad441190f46741ac49c15d72264ac81d9a0576d382f5696e940482f6de6634bd5f8bdc1855d3e3da6040b632100d333cc06058414eb7f25acb12914de5e3c";
+      sha512 = "653e8942d04dc440d998229ad8a10ec8a1098ef85331abd8e1676c05398dd4b514f5fbdfd15c1b20ab0fa83216d7ad0b0e4d20b6555aab9a02f7fdf139d11e35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ru/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "935cbe5dd97db312ecf7045bd38d8d3ac84e812da507256e9c5abe465e5111bd20131373c6aa43bcc8b6848dfb6d77e72df60b19d6378d808a6f8a095eeb1b03";
+      sha512 = "66c45ddea853348cf0084fb64710ce0b077dc6521767a27a83eadfc237becf05e26335d85fd1701ba4790e80a2f5f971986c1a3847cc84efa2aaa8623d0b3556";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/si/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "a4db271cf567f9010fb8c3ac1bd859c4bad8772dd26a068eed1c5f7c048fa969b5492f0b4e12ee221da6be9581790348253ae8838b4e21a8824718efb14b6ec8";
+      sha512 = "69bc89b863e9a4ffde9ff478331a88b93a42a2cc5d51114acc995189c63301144093b4cd156864e6094940d64285797f83ef920b3231a427a149c5f6dac37dc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a617d8bd5cd8827f7858dc4a881c4da326e7909caa9dc20194f4a150340897bbb07e397918057265573f35c6cbda269b857cec31b90a9c41535d65f8c2e5f22c";
+      sha512 = "6b36b64b3edd9a16ba7051727a8ef326473859a07006159cd2b8a6fff25b0cd9649511dad03e5286e384ed74fca4b80d257cb0e754ee4ecd6eaa7c589478a5b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3ef4245014e3eebb31207e084d9c50b39ebfe16408f6b96bf0ddf66c9c69e9d717266152c643e2412358bef30d517f84ec482ffc57bc826a9d1a9474848fac7c";
+      sha512 = "19a6c7c7d7f8cc2a2f03bbb23f28c4691152ffda292399b6e438dbc3afe89dee98be86ea4d7f27d9d4f736e68a6ff21db1cbb746bcbcb9cd6ba9d7e23155cc21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/son/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "2bbfcbd5945be669b779e58c0ac925b4d83836a3117732d5c85f9cc009cd87302e8ea5793d286951ec830ee4b8996413b3fb004b9d48eeca506cb289b99efa6c";
+      sha512 = "df598c9156ba76218f4f0d87ff301a3220979abb3a4f5af19d0545b6a3ad48719a8267da22a31f646e6d20ad1f6f090579c9587e949be91559aa58455502a156";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sq/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c59ab2f574e605528d90ff4c25b67f1815e778458aac7ca4a7ed105668d8f59daa9ee4e4df33e62c359ce3818c4d717a520d99cb367c84f329321357083e1ae6";
+      sha512 = "e8d53fa58ce1d34d22c7460c9b9d9111233047148e503e5a628d8d8e1c689b2c4a302048931dab44ee33ba2c4831362d3e74c294e907f1c5eee23d464007343d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "80e49c1e72e12f63dabb6a73b3e05de635aa63f8523251a38d9762dd80aacc0ce2db7a37b8e4ba8cb804c2f41540fb5c9790279dd6a02c06bb1a7a1ff944b75d";
+      sha512 = "5d3e8d3741ee0ab535479ded3035379858ba092a8cebbd5ac8bcc525e88159594f5cef90894bb0fdc5eb9c349c435913b89a030ebf942054110d37e57bcc50cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sv-SE/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "47569b272c2b42c0149790fc008894dcadf35dd82d64cfefb07146a75dba85e8052524151d7baf8cc929879342c4af7a8161d6df02aec7582bc3df4cc99e1c57";
+      sha512 = "98da270b0da5091cff599cfdc9a0d241ab8463c1c9e2771f81e8c0dd7ecf567e2cf4ea536b81cfd6b1679e449d7f1d4157b8927f1b1b0a03f3cb7dbfbd267d65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ta/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "1c64a7ace3abedcbcaec3d3ca884538aca70bed9c9c736a721152bb3dfa7c7b0a1f12305fb54ca2ba7658ce9c2f42bc2c87049e3e792b8548091bfe4e10824b4";
+      sha512 = "63287a39d325111c7e18b62a9b76cf0e7564709846cad78a946852fce761475edc61e292e31491821215b0cd2f392e8c41b7ecf0ba78ac3440cdd4f7f9b52d21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/te/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "2a55a67577d2de5dee7b526a716b5061fc4bcbc670db5286cf8290629139d72325f086217689bc55a5d260f3d30b572360d62b01370685028acd9825ae748fc2";
+      sha512 = "476840816b36816b967f86c9796f6df4afdb3d7524f4268cd867393eac83ff868645eb14ed5766aec87ba3c226e593099e15d44aa63a01bf422a12a4bb5c77ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/th/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "22c796f3d0bfa8ca93654ac73a8e1be30b7d2d02a1700008243d98c4cd367b4b5e5712a2def5fd8b3a40d7deb3e638cdb4edc7e609d37bf7726b9fad69f9225d";
+      sha512 = "b5dd1a09db20a788261a2f6812a6b35be7164d14cce7c700af51dc1cb187801c2ecc0d0b035386ec4340af25c8cf651f9dd4c679bd61b335866fd2d7a531f7ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/tr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "8c50483a7bf1b8016349e9c9a088efac8750bb51bde35d3af78b82827f0ddf951a1605a193b3a1ebf6e03af1224defc48f9d0decfa317f3e1c507e20b1c552b8";
+      sha512 = "08a002ec452956730d02985e74c9c1c615783d19fde6c1ee3da3adaeb1ea021c05c865e72d8dd7c930f9351ee376cd42b20fb90916d276344e7b2d17eda6f458";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/uk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "2dbcf145a1ec46a2239f0340e881228f887e8ada2c8cfdd4f77a0229440f3de7c4e7f40706973dde6171ccf45e2da41e77c1e5fc4375d857e4a2a74722dd9d10";
+      sha512 = "7c75010a3a15f2208774f3e92317dd88c2a821c468a84a5855e4db193c5fa6d639d4b6969d3ef72bbc90c47212854abd0002295f163b06998285d439f50ccde4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ur/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "69acb4094d4a302c4c62328dcfeac0733576188b3e4548dfcd3ca9d3cf7e49379771122090bf99acf6e47624d2216a790b3593dec4d4a578b346139027e9d619";
+      sha512 = "2d94f170a3eb66ef776c0c78c53d16716aef47218122bd5a9c7910fc6f821a5ae54192cee0314c48c7d6c5336f442532594c31e4e0821cb427f617590b8b7ae7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/uz/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "287dc219c456f2bd60cd4a1552d42f7656f6321780cfe11ef7b67772601d55c03eb8cc83d239b90e45a47869e5104a1c1aab77131c788693aad8bc86c61ec53e";
+      sha512 = "21880c1a14e339e7b716f742c2910451662712a3870605db9eac00729b6cf9c2043cc49035c86044af8512239fbf05ea51ef476aebd234a7fa9317cefbd43a29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/vi/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "8cc0f6c83328a67cbad2dc3427678a985fb74863b0f7baf4bf65074771c1e5a18576e274f725d65901c1627d0a9a0b6ae1d815d28dcaf5c4b9b6d830dbf3c245";
+      sha512 = "5efca9a9fac37440d41c444497ecb2a5eb56b47881b46c66cf65b3b78353fd8a18d37c93d83400be1207193c7dc3a901402d679c50ebe55ddb93687439d4874e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/xh/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "28d803a22ec0d5061edd6a8185638842e55ba5748b0f1ed5fca85ea9e7ceac33319e9d5b282b308f092c2583e747ed981dd731a0f375eb826d878eecd31f65a5";
+      sha512 = "03927d0b8bf3c261fd00a043d8499e3686c7abc51eedac63f049d100095da2b858a2cea582c8aa2e3f65e1269b7094559709c22fd633a0cda29c6b21f3987eb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/zh-CN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "0fd9414050a69c8731e1ca8fc8f1a5f721d7aad48114a9680550b133b149da043bf550d42102c6fc066392a5463697afd55d3f08a5f94cc755d961bb29e261d7";
+      sha512 = "75a77fff929aa72700b9af9452e2d0fa93f21136cd7651a32970fec24332d3c9a7afd58a823e3dffe1aa63ca49057c62ba5ce579021a783a096733c23c71bbfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/zh-TW/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3e460f2eae2ee0c40dc32138d6102aea4b47471f320dad3cff9884efa6e3bd23dba1c5b825a7a907ff6f7f7a08f145854de3d82bbe9bb85d518538822918c547";
+      sha512 = "d83bb672b5587b6fc8e2c4028f144821282b1596ca88f1aa889f4a2601d46fac44c7302d30f23179db6540e84e878244c4291dceadb56045f3edbdd41bc42a19";
     }
     ];
 }
-- 
GitLab


From b1f76ebb738df969cce17b38dce5bd17f406290d Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 19 Jun 2017 15:09:44 +0200
Subject: [PATCH 0942/1490] firefox-devedition-bin: 54.0b14 -> 55.0b2

---
 .../firefox-bin/devedition_sources.nix        | 764 +++++++++---------
 1 file changed, 387 insertions(+), 377 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index cab4d330f43..a436cd46a11 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,945 +1,955 @@
 {
-  version = "54.0b14";
+  version = "55.0b2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ach/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "8f19c1210c95d5dbb845caa05ceb90bfee3dbc8e7ee630849766fea2e06b5eb20660d1c7387a89112daeb4b11bc6a05e274429bf48dfd9b6c010700c6998da14";
+      sha512 = "003297708bc29bdfd471ae4af99a39f3c4732a067ad56e7f5a49fe8caff7a88dbff9245a4e8843f504f80c0defd2c2fa62819e6b71c176da6cd0cfe9d1c614d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/af/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "daade55b9ed5a4390ec65498680b600fb1ee0ad9f73f73066236a376c8b86687480f11cd5c97c254681d3b227759e84ed292b3050ee368337514338ba918a688";
+      sha512 = "4f32ca70b0891bf25fe68196f5e78fc9368cef5dd2016f8cb0c0b099fca34b154bbc6b8faee831320fd0bbfd35f81ad379e44c7778d78b1b517175b3d5a42dd4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/an/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "41836c83842fb5429938964faca59a763a7bf7fc1d38611274d7bfc559ac9f167841d1b43deddfd9494508bdce515e2842684482bb808b2509ca27eb5a4937d1";
+      sha512 = "01d1d9df2c24c6e41ab6a29028ef0c38630c7a786cb310eefa93adbd334d8b1e65335225b3fdb9f21bd8740d4d9710085d750144b2670b4a30e326bae0d96d78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ar/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b97e47a261bee9e512ea2478c4c1447de4144928adc84ab251b951a650c20774b9c42fae2da4d033120a7830129e2c9196ee960a8de58a112c06704dee2e8451";
+      sha512 = "731ab03cf719f8181c097a40436c5123c2fac528a4c420b5564d79d094bd506dfe58c8718d7fa1a0d3e3223b67173de1826046fe09c763248bea79b7e1485c4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/as/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "c60ffa06a01ea84f28bbeb5a48ce4c60a95332fb90534465bb6a66d9aeac99d23ca7f8b8c38aea706b245f5abc482829365e7cc20dd683534e93dca14d89b3d3";
+      sha512 = "78f9203b0cae15830ee289b540d56e6664a486f107f99b42020809375ead3193da2e4e1bc7bc25ac20256ac07c55e4c619302615220b0a1ae742ded4f4d6afe7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ast/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e0d798c61111c7fa8ec59ca54bdff1375576d83c94063edd2fd9a2fb9f15603e864f2daef85e760578305574f69e475930a7d276c1f4ce5cf2fc82af338fb276";
+      sha512 = "401afbb8c2945724b0754d95b0385822d77a9018874c067b83864546c5565735d403ccd1a9f999af0be10b806ec2b64bda5f28306f90e5171406b8a79dfe5975";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/az/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "262a818ff21e88763626ee9d1bff84308efd3fa06695b3f011007f808657ddca8b4b7de82542e43a4e4264beae88885923dee7571a542c9bcaf1a1a1be782242";
+      sha512 = "953b91a7681e033219fe80d63ec41ed50025f1bda91cde9f6124bee46ed89e38c8470257e1791878443adfda94a579c9261c2ada6c8d415a62dc27b38cf6cb66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bg/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2";
+      locale = "be";
+      arch = "linux-x86_64";
+      sha512 = "366f951b05f62a0f158bd1a345fe1540647c3a1d5b91c49c2d104f76974a64030e830dda3afc15828309f88100c4f12d5dfee98827565c96acd62a4e0db24e74";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "43a5df2c83b731e5983938a69f636ee3cf0977de21cffe57792313f30740dba696a71a8e93c8addf5d13ae1402d83a8bf4eb20fb18d174e5777fbfbddffc2ffe";
+      sha512 = "51542bf88583b2f2dba75e1abfc892c0595737e74ccc6844cb470513bbad7c337e1ccfaa628f08a8d5ce09b91812ea07758831d5bab54ac961652f905c9b216b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bn-BD/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "6797547ba2d94a14d0b5409e51104b8622aca1b6ec988a16deff7e8528b4a77b571484bf2f92a72716f565bbf707c4c72fbb59d67476e22ffabf23c7db1e7b96";
+      sha512 = "9f41fae202b3a38115b1efccb0358f3b8896d8f44730f4e53896fc48c9048d6a1ca8904217312c6bd9f9ebeee1514a85c1723acae8e293559289aaa6b63661ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bn-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "733c9889f7dc782656846bba3cadc0b0197c03233428b966f638ef3c8ad64881379e78742c2afbd4f9fc14f42de77145a24e26d4742294b589d2011f8cb65aa3";
+      sha512 = "6c617687ee2e1460addc86c383a9967803a6900845a2c98d4ef67f2007d3cbe82e6e8b046e4d990b59b8a001f60eaaaa34a50494cc1c8b9d5bfdf3951494022b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/br/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "c3baa5e4f44c8e7fae99323494d0364b933231b67d164cfc5eb3bbe919e2cbeceb0d9d9838922def26639becdeadde5101bcb514250b8335d1fdd0081158cde4";
+      sha512 = "23cc36ad34c20003cd3a4c11eb22e6b35ba1fc43ec81fbbef0ca3c7aee445920d66620d355b60e6439296ff19805d29f7266060c2abc5937b266fe45f5af251c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bs/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "2fb80dec95921067a879cf836bd2b191d6f628122d813f22b242f1d6a0e605d71f74dece30c51c18bbbf35e64b20df4ad3fe11e8812f11f44fd98ced49fbd792";
+      sha512 = "97b1bac5f6637c07578e689011721e261feef2535feabef4a86856a45c3a48c34da692dcff7aedd4c381159ce016eaec0b6c50acf21f9e045a4679e494c01a3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ca/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "276a1b0ff9df2606d6626203de6e22d3eab41f853e29dc87d478825cab41e0c8a93feef4dced6b731025135103922140b3e7c5f9e1fe49f02a1a3e09f3f3351c";
+      sha512 = "e188a8de2f0fb240655f88176a138a7816929a5acc708fd66960b8f51798fb240e63932498eb7db64868eab95d2b9c95935eb6475a0752e1525c5c6403a78616";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/cak/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "a20244e8aa7a7d935fc948eb474f265a3695b23dac6dfbf585d782ab1c224f4a922de43c52317966ffa735e3dd38d0b4742f6a3b87edd545bbb8608fa0827ca8";
+      sha512 = "f98825c86e87c3010a48e2e71752b4b61d118e72fc4ef16f2c3eecba54e6af37671ba18c4a7564157b8f65eb552c92c461ca190b80b344103714946dec00da3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/cs/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "a2bfb5f97fb367e16c2737f60ee269447a9ee92a9b2917183053d602713fece31706e7f1c64742893496c881d11b62c34e594eb5fd17b92bd41082a0f09cb7f5";
+      sha512 = "b5e007f882126d7c1e40d9750c9016dcf98674177cec15185ee340ac779cfb81efca0d23486bf7bcada25654e7bc15dd2cc78ad948981e668d0a00a5f138f62f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/cy/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "336c46fdb5a8dab5dbcd6b75c3f82805defb0f8be45465ade68f5d3c5ebf0b080fb0694a220efaf9f7e5e1265c1e0cb151066f53542f8534c29260efd2e4e2b2";
+      sha512 = "ceb4f5eff71192a8be67ca79feb3a42390501e11c2c2d2c3a9bbda42a6fcb71362665e991a84fae660442269eb4b91ce1cd8c860a6b801eeda2569a1e7800291";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/da/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "c3bbcaf4ac2dc38a2903d48596ee5c836baab94bdba016074eb8138c1f22e0d30281de862abd6823b0c4918660226e66abcb8946a26c30156f47efc946f860a2";
+      sha512 = "c0cf7ef6fcad94ba4ac44ca8b4d272fb88c0e63a477b4829a675585204e19c88086b8f21f89c52c1954624dfc1f0f9a836d3333ad8c6989fd398afe2eb92234a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/de/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "f871bbc4cce559fad162d4579c46623a81c8a9faec2b0328f5f3e9492bfcdb64d5311cc8aa75ec3e8ebb2c0f2823193fff163a345e3cca43e70df0bd355e998a";
+      sha512 = "fb4423b8f154f0f124ad0a36ae692ad8962564aa9ff7747d412a73ca983e1164bec45d8ae6f983f91f2e657701bb268b96d4ddbe8261d68bd41e07d4f7c9fd5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/dsb/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "29b063bd654d9704a999c27265a79dd75dedab388b1b4ec3c52ca89a8d99e82de59a7f552f7ab0eac6b03b1469cf8882a70e439806be97bf3e0e70b3e34df950";
+      sha512 = "f17bcbd5885a0caa72380f1dafc65c4e104897abaa03f89703501af9dce33ab9e9dd133ea8fd518809e02f99ef6c10a9c5f516b56e05d700b6324b3a101de18d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/el/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "a11b8d9bf8ea151d62a33bc0630570098babc02a09bb355d0f0c3ac0d316ebfcd9dcc786115ef1cc36e447f3697fec57511f77e678b401d2c75294429a4c66c4";
+      sha512 = "cf0304640af1f3b27b992b32e59a215d5cf95e8b0744266a86ac7738988faa8e2fcbe6b22a50990298cd7a6512747a0000e9788e50b1c32684fa616a7159cbcf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/en-GB/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "9ddeaa9e89c08ef7e918d5d480e35e34df5feeaeeff2500c2a8a48bf5bb685fd29d74ee1aafdc4c3ff8dba0da7baad20ef0fcd522f14ab9a9e6eb739f8d1fb26";
+      sha512 = "dde0c233b45cd72b63b39a4a99e0d3c0a2f0a63999fb6ba9bf8bddeb686afe6b03a441215e5f2d5d192a19e49b63dc3cb14555c2aaac4efe196e7d58ee83fb27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/en-US/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ad39e7bd5164c754d596c15eb14a07f32985dc86486774bf76fbc60f8eda4a9690df37295b1cb99411e2bd1c83af89498b133404c7180fe5819befcc194b517e";
+      sha512 = "d5e35480eac87eb0f073e0ca413eec6ba6f54c7b14b0ffbaace7a130e07703215d5f7ed3c6f7356154f6a0388f4ddd695419a4d84e4ea42a85c967202110016c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/en-ZA/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "2a80bec8e181242482d5dd4f28b41a3290a473ca380f7a85138eca7814192fff70b8ee24c6f613fce201d5eacbbd221ba3dbac571801586af2a5c771a1a3d992";
+      sha512 = "3831f3003fa5376b88fa216dc309a15b2332d4a9ba332d78b0067a38b774f7db40cb86d82daf7e0dbe5785ed72f603feb3542a84fe219bd4798cfeef1c46a268";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/eo/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "6b47ecbc39d16e1d142440ef58aa375f7987284e5b85cf7edb802405127dff89e3fcdffcc47a23148daa925e58af17f538c3f5520347d0ca8391ed6ef51a5a96";
+      sha512 = "5dddcc0fefb98d0364097fc374f033b8063cfe07ed77b0ef0f8f3c58cd907b27c860ee2776952d3900b99f0084494c304aa38eb07f659dd60765d991f86ff69b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-AR/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "67e0fd7cd860951656b6dcf60450dc9ed5439afc0be8d6be0c549521c6f92bb90fbb2f941a8f9d1d96cfdbd6d1ba9ca3590a8866a4b48062f878917a570913eb";
+      sha512 = "4c1f58fb03e85a96ae339447135712ac59a5280643035f2b1ad684858d58147e62dccb9d793829a30160056891538c56df5f8a73b3342b8aaceca8a8c8b7ec40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-CL/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "90ec508d87a799c3e3b6a26582cd1c6b6b81923d715ff6e2cb2b6cc7a88c4db78bcee0b5e53f27513aa763ca7368f5a23093e62a5be2b41289b4631464179a50";
+      sha512 = "b96414975770592a829fa95c46dbd9c14cf1509bcbd8787442d23b55765dc3abf406cbd3fd100ad3f8ba243103798e1b060a6bbc1deabcdce24d52401b6e065a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-ES/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "cae140a83a1be44b0e1d42e37d9718dde01ed3f9241cf98c62fce2319a9c73c724d94c65f6eb6f066bff644ad591111334ccaf32986c0d79f01194066ccaf6f2";
+      sha512 = "bb5d87a32d9c9c10a54273cab014caee57a68d5b1ad3de3ea10ccfd9517118a97d351b789e171514720d684e4d1c5fd89554f3c776f832d69e546d729bffa01b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-MX/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "778abfde377ec538ce3e1cf6bf65a30de7c5d6f5a1748f6e587bff5a182419577bb305dedcaa01a650c4c8cd1f078279e192d9a4c807f7afd38f4dfbacc55071";
+      sha512 = "5136699c8ec08604d1b8040bea67477dc021a50af8eaf7cb30dc9d5462fd1fbf6be2e418ad531056a033c5a661d47e9c8841e3087b8ebca3f9b1eee24d0cc20a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/et/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "2a832ab5fde11c3728d4ab8f4802413f5da0aec9faabe3dfc58b1558f741182d093ba351f8b6c7cca846a014132770eb13775d9d7f345f57c7f4f817e2877fd8";
+      sha512 = "77b0dc7274c941efb10f25ef80d2cbc70c3d3243e6ecc07459bba933fbb01382e6d8757c77c0fc26fa42f39be0761cf07d783a1e2cf5064a73910adb420556ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/eu/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "ee0af554a7bab3a6661424b42360cd7ed85e68fa1436c893fd5796a54b0eaf01b86af77b6b33d3ce722ad897fc403187a55da3557c0ad767e70488a24f4c5b7c";
+      sha512 = "f842af2f0b7e1894d49da17dcfa910df6976976cc59e58603d119adbc1fd7e4a4316ade167896b57a40e6480acf54f168a5630d3b30a7136360b3e9a6dd10d05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fa/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "11944b7afe0df66d929760ad2bb7af3d1058573083c2f710ce52a1ddf607b6b4b28926a7c140044135fd7cbecffd338be08a94991b08a81edbbcfbf8e5b00ac0";
+      sha512 = "37899d6ed1c16785d9b41dd2593f504c5fd9169210b6f4bf79e4f8c3a7f00dbce74e88eca4884fbf08c28191408d886d0762f2d79928bac1820181321a53ebd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ff/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "ae4b81503613f9ca69de12e86131bc507d7eb6c10a26ee5ec702fc7a98e22aae6254f04fb8a11c553cf1b0836c1112ac41797920a54988a2753c91f2d1f7ab87";
+      sha512 = "3a0a3cb965822ccfe51c662986fe2acea2802a72bdb9506f48c3b58e70e55f7c283ef590946e4c5c6b9aeec026980a43846dbe2fbe41744d4c9cadfabfef79f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fi/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "3049f77695c0eda7f77f4c6a785b5d5a70a6d961618f99ff4364e062efeb8629e966e222e4fdcb1f85b652358854cd7ef859e7e7d9f657c7157a43911fbd00c3";
+      sha512 = "a1d3bb077e396caa2df99a1b95a8eebb32d929980273c8f748958b7ffa6f1f7eabbf486afb195cad613d2012f3af0a355152a631066215d717bb7e270c05b72b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "d45cbecd191b05d219e71ca77a190a43b3f4ea2acaad12e442e960ce1df3fa3552378f5e5c8cfceca5b0cbba66eb6f7652986d4c907db8cd662f45d91b1216be";
+      sha512 = "012bb9748fa46c6a61d958bdcbce045ae050b1571ba4cc19a91314468f2144976a804183340f3ec0c249eb548ea323db872529a0a3cae391b840069ab43ef397";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fy-NL/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "701271caa493338d73a6a6fbafd0f48c8d6b548ea400146339155aaf723e8f28c3a3e4154cb79cb7a9aac3a77c6fcbc4aa155793a27a8f46a58a43ab6443f1b0";
+      sha512 = "f78c749867899de82295aa928a4afd256f5749f1a02b149eb2bb26660b9073e3bc4ba6a7acbb02a050ca54a1961541b2b9458e5827cbf7cc4a31e813234940ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ga-IE/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "0dfa071841e5609302dee5525788fe37e705b7c4ee78c05b718356eacdf48870a00cda237c78a5eff6c55d403ed0688cf64ba3895b7e687f87fe86d0f2e223dd";
+      sha512 = "88652cc3006f731ffa9549cce2ed3d21553753105eacd7260e0274bd63acc4f77b5ee60ee2967cf963c37779e27290f95f61731701666d22d5ca3dcee257cf5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gd/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "03a29bf45820adeb9bb792e599dbbe8fdcfeefc7ffd2003d5fd9516951e8f19fd340fb0c0d05beb026de880806b206e3805184a6b5976848235ed97b110a05ef";
+      sha512 = "a0eb1f4e1ba442deeffee4cf074ced94844e167fe58ecb2985555ae233f22990b11ea5eed9a219f407adfcd8fc18ca6c21f191802cbb12fbf767a0d2742154a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "0f479c94f552c72c20581913bbaf2c0b832765f8cef3fa18e649940c5e4a4678dfb82e6fa61fc5dd70295c3de68556b671fa66238fe0b1de9afc4725c353689d";
+      sha512 = "51363ace7df993022052162a5eb6b1ad65bf66eb48e1cb713deac1594f3883401f42f0a2f5c1bd7a73eef1d45f34df7a8d1976bc1d115bec134d9c7cd671b1f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gn/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "23290b9d07bc7ebf6b0ad4977fc1ce8a2314867c240f3f139acb43e7bb2fd44e127cc89dc338ca960096605db72667fc40a31824e8e915ec9ea6d89012d334fb";
+      sha512 = "93549b7a3ffdb275a4f4dba8a80f292cae039506990085484a9f6a54665a7588ff04c29ff5746f8c76e9d387272e18312ca58313cc255327b0fbfab53598515b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gu-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "52479a691379fa2793932380ad54f14019818158653e4a6e00e63298cf7eee489eb8fcfb62999d90c726e990a8df95b190cd59c7ddb54bf2eb04ec3181839054";
+      sha512 = "5da0acb3b9c1588f971cfd3b40041a46cd32102b619984e3e9b16ce9f6b950c37ccd16990cd6b912bdc5af42e9cbbdf6849fd7b3716a85b2217f890b5241233c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/he/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "e440421111559ba38dae4c1b2a5a02b551050426b8d294405a4cdc1f8e05ee226c0959ee1fcce894398eb3f9b146bb8cdbdaa44f57cfb4ef921f720864f74e75";
+      sha512 = "f5e703361f106f63d101df3c591c0f63930df88b72bcaa0a93ca1ab0709c325edb1680d1955eb678103343c97719fa0b38b1ab8f12458538087f4a5f31080060";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hi-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a911950fd9299543a95391fe280a0fa88147aabb0ed8cb1ada320537d3b02bd77c2528c018480039653be44a9a18878dd6cd0b91266ed30be0190dd365fff890";
+      sha512 = "237e1fb08f8dba0bf72cfa32de252af6cde28820ae0f46d4756fa4a82893752a343d9cabfa4c719a4e39897fd6e41a32349ce2fdce61824a0dcc101cf9254681";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "085277f8e4949a6f3484f2e374ff82ff215d91772357e2f91327334f9045d97f42bea3e7cdb2eb8a0d25655d4a5001c3ae287134329fec209add20d24fe9a1f6";
+      sha512 = "908dc023c384b447af89b7dda7c60d2d2cdac3f386d1c4005d78490b4df5b69400b72ac743e9cbd0c700e4989583945cc2da0f2b8c0e1a87917ab1d37c842f4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hsb/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "02b9a28af54c9abf5f6bc0bed73e9ea6e14bc12bb23c3bd92673fa5422b4f77263690ba5f83a45cde0d6edb1cb67007f951b13b5bbf6f5c6bc7cecc43830f3e5";
+      sha512 = "c4a91ab0f38eb0f565d021e798c30dd07e4d259624a50ba1f51969b46e257396b9faf8a0676675799f476ed9c71fab540d0bede002e4ff6e63d3114a7114c47b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hu/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "6760b7e056e61e25f439cb6aba0de3e3624693097578e392c8f4b3a2fe3a0447cdeade3aed421bd6693059d9d6d52ba4df183e77edb499ff5bb1b440fbd95b9b";
+      sha512 = "cc8d632d7b9aa675f60780d0d16bc5da2f9853813917d6e89a7e0f47db288092fd2da94bbe28c0959d4589c23422df1d15101ed340059a3e5ebb9c622aaf9c46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hy-AM/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "4a5b0c868a2ae6ea6b1b133182c8c147dc10995f69b31e83517f05d150616d3c2c92daeee767ee44d22a691446683d6729de786efbd37429e52038ffc3b08910";
+      sha512 = "aa37883c2b1b880f807ab3bf2ce4cdc99e83cd8a80e5856055f33a0eed68eed21a3f8b5d20394ad706b0ae707d2469918bfc70c52e270b2b0303953d560e34b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/id/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "245a1856af9fd7345e4925c560de1efa8b786483415431ec3a7bd22a7216296cb6d74756d8300d06d5b1c86ce1fa04eb807c050698d4777e9c9fd58308823ced";
+      sha512 = "cad8f320178124b82fa27947908191b02536691e9129fbfe9b782ca0a15a6d7adbfeccd2b6bf2bdbb4aa1d4b3d4949cb55b4188b49078685e4d07ce2a90eac20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/is/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "63e14be658c33020dc32bc974578f4b329fcfba60ed070e11c833135c25ebf8039f6fe968fcd3ee2a5d33b13f1ba8c23bb3e268eae20d86f56b9cfe83bb34a3a";
+      sha512 = "7f64839be67ff5709d4ee08838a4c15e9e7971032a89390335e27781176c9d1fe555a070968f23a9cf786c3515ef028cb4911b4fb6615c38f94fdc700d35c169";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/it/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "992610d09e22da69f6425b4a427181a2c69ef9bca7f94aaec8175d9f2e35885f03852f45d4b692ee780c470f3304e66696c33ea4f2abac6c4c928f1919280773";
+      sha512 = "bd1f6c79c108f1fa1c01b445acd9f9ecb0a9f088cda0a113b48e1ebeb7503fdf36789881643cef359407e587eaad6d0dbe27298554b5025602f90d11e3c9ae0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ja/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "c26f7772fb0b5f45b9aa5cfa8f1d7b34bdc97e7e7bc3e841ee39614cc5f345d6c45b5053827b5fd4f62180a36b1229034570d23e3f4734d276ff33916d8fb68d";
+      sha512 = "2f9eb69e4f1db37c46a63eb3f71edd461727ab98e5fd2ea6925cab501c2f7aa81b8870bd42af2d4e30410e8d6083cd103baa83f07177ab7370a0d96afeaf424a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ka/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "4d6b1b599ec6006fe1f5d4365c4ccab4b3d496ef412986a9afc1a646d596ed2269b2d67f4c42af95afcbaeeaa4b8d5f4eaece649a22097484bf0971b8e90ddf2";
+      sha512 = "b6b2728e9b74bf6c1eec3859c1dd8ee7d2ee98ccbc45fc28e2caaf45f1bb71e05b42361a25e3c4e5d71138b5b23b764d9e8e5288874cfc7b96b8b0db33088147";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/kab/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "0e1d510b7f1e7e345d119c41f31f8ded78ac61c6a05258bf6c6671aca1b4dddb16508e1baa68c130bdbe959f038a9add353c58fe3b1d02e76cd1630b87324897";
+      sha512 = "a4c3dd17640fff69deff932488c7322c687263c28d8bb352af37f7bec8ae442aa821782f011953e07b34c37ebd62f55c1b913a6fe6d634af41a41137c57e89ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/kk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "61ee97413139b6e794fcfe1d318cca08f4b726dcb3f0ea21c7f9cb6cda16957d24db360f6cd547a2e0e6a6e031d1a200f4c8bcb9afaaf7e297fd80aec10d0f9e";
+      sha512 = "ddda306e1944d9ed37f9372ee247a2008c362235eacdc1f85ee2b875b88c968736e111b8db8d9954a3c6b0d31b76822b69968bf54394269f426ab3d4a3b11e50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/km/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "e6ff303470ccd2f5f98b722746b191d0a60cf53569e37f6d8f62366d975a1e7f71bcee51afd47766566561c1869956e81feaa7040add09bb512c0578714283e8";
+      sha512 = "651cb45d7efbf85dfd081c0358def68cf1b98f9ac0025a00a112ea43c034d974a8caddc07460ffa2bf4638cf2e9c8730408cc2d5907e74645f3509861f2ee5eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/kn/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "be552d120b3a39241ab90c64673974f27ac10576328448f7b23c4b4d395190ce32f4f215336e86450f07f5a222492467b7b481a55e7bd9aed6c131e23c09f756";
+      sha512 = "ace13edd7b784ae7496e6c6e7959e8c343cca43ef77cf9cb9fc43895720db85989b794228296af05068c6326e8704929bd2d3568b475429a839765c9c9bb18b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ko/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "cfa83333a94c0227b97a7fc0381894d97afef80aaa0808031d95b12d79acfc144de525350c1b29a7f53d10fbcf53ecf0029c9203c7d4511af071ab0c93e55127";
+      sha512 = "4cc11703b836f50e5797638922bd5c3fd79dcce4b200c1eb2036876569d317733dbc38dfaf10eaa3fbd4309a1a131dddb62ce360608f82aa08c78b1a383981df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/lij/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "8332db66b531b2d685e9d9a3349f1d82c4185c0fdd79bf3383112b38cfddcf24c2379031443eba19dc5cd51e602fd9a508c09c7622b92f4423376393163c5824";
+      sha512 = "4f57f8ebb8a2d2d2237b23f703e791daa92f4692c0801fd63a1079c82f658c96b33d4c64be5b05c976f05cce74321d3cc0a3d09350461830fe89361b23a71916";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/lt/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "00cc56db7b2711b8f8c91459b9e1cb19bc158b09566d9218663411adb084f967d7ca2f312fa023e26da31a2d016168ca748ad7fa7a81eefc1444474babbe338d";
+      sha512 = "1dc3fedf53e70e5a299ea925484e3c995a670fba7227b56767a4887422aa4da7d536baad2655432fee86b89404fad7cd239b4c814a545e7be27db6a2ed91b725";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/lv/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "2eeb912b4b787f82d0b997646d13e019dd8762b08ccde5d2823358df0515fd05855caf991ededc17aa9cef1c3524d59cf651f14a4c592c70fecf44f3b2fb0f1b";
+      sha512 = "c97cdde91fe876bfb5da846e486d1f34ac9ba9f14d39ecdd53bd397c37fbe44254df3110d0854b3598c3a6e89883c220afc69293e09877fdaa49d7c286be5cdf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/mai/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "4e61c996041804cfac7c62c410fe0315f153e592cb423b57ac9b96070bda7d37cdad02e3e047319951c4a2c7fe1b41f06b98af0f71f876949611f7a52cff3c72";
+      sha512 = "afe506e36a228dbf1c8a3918077bade8a69d51c801cbb274209055e6062c9cbca340e153842d9a24637c62cb6833f99e69fcf3b92b82ec16afa882d566cf44c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/mk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "338d4b3fc0ec34edb5acb3a4e86b9e8b64d16c470303f0ed127d060c1d38b176bd51251eccb3ab3df19c140007d44ab6649983c0c9aab8daa5ea348f5b34dfde";
+      sha512 = "b9cbec5c7f75d6dd2fc69aea6f182bd8682cc2974425973b5d7f42982fa7f69b384bafae1bdab4fa225f7965f9d2a37c0e127ff12d7ad1991f998b19deaded63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ml/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "1c7f8fcf9a0cb5a8a18a21ef5c258d6edd26cf0b6b847eb64b0c4d8bb963b4814df06be0b9adaf4ebe1d384afbe76c9bb60609c9f9773e466ad8fdf36e4e5d88";
+      sha512 = "2e7cffa6991ee2ee8018dfbed50163c6c905e1e9394ec880d92f12bde8d180ef6445a8f20c217f620b3ed19efc5505ab2b158a679adc97a904b83d46561ba0e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/mr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "ceeccd3c53a1bf3d3cff32cbdc8a3845db7c383e98b7666fbab71ee748ea57b8f103ab337e8cc08cc25a0b5c28c57748864ed098259ceff167faf4cf5e3bff8f";
+      sha512 = "9e3ffcb028a9809dc34969587585fec94c31e3f8561c969bec5a1f6d9c436ac02648185a56c4cb95a16b400d6abcb1c01293505c51b8e9149625bdd910523aca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ms/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "d08fff37dfc1ab4ad2a629562a3294aeca275a4f86110e9a21839653849cdce9ab709228bea30e33b3b1695cf7a84fc0cacd1b068a060c5ad1cbb39553eb1299";
+      sha512 = "29f08c10050013832f709bb0b42ea1f6a3ed191ba979efaeffba44e5ff27220c7bae9717d68a9478c2a452eaf0ef1e8da390eced1f5f7a37ce1ae5ee6f4bfa6a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/my/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "fd5cad2fe03a2029b1cb63fff9807cdeb5555ce7b3e84f0a8ef334a41ee15f2d499221e1280c68fdb846393bc5aee86e2dbb1a5373873e4c50cda495cbac3475";
+      sha512 = "5f58e403b72cff6963a51a4e32ae55f94680460a658ff5ede90e859aa1de849c89abab33036cc194b9a3eded23b61d53ff9e9f98bb653785a1e60848e32533dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/nb-NO/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "baef1e2bded7e56a4fb3d1104548ca5e9b9a8a9ab5650c39ebf822199feafd960d24859bd24cdf652edaac8276a7b235110d1e3a7ef6219f6152d6e0a6c48e7b";
+      sha512 = "2e6c4cbc3a73c4669e7703b9847a52849bdde3a5cf332ff0aa76cf5336f21f62177daf050d655250e552c7beb4a05043cfddc276896feae1e03b5dade016e0c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/nl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "ea47b33ab1b2b7de0d461f50d0784157ed3ff0eef3ce6753d9ba5c11372d182b887cb521afdd8697ade0c077c9a329ac0c47dae928aae68dc6e49b45071d45d5";
+      sha512 = "bd0afc4ef24c68e1a503ac93ecdb969a29427548d5991f47b86583941d2a1bd8d9af88e3a46b74b52b5957cc80d05a2dde659cae2c33028f87fc48beea637366";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/nn-NO/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "54df10b892ff31a6decc0c4d3dda5687499512e21f42d69ea68823ee99dcf41e8f1f1aa99cb210f6d3e01bc07aff5b0a7b6e55b2b6a41627e654efc02645a461";
+      sha512 = "c342102835e18d7d14e18e1f7185547d1b2385ce4157554ee65e76766885edc62d1d7e4a911af206d2bf34caa0377b6e256e18c06c41082074a868c5a6367f45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/or/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "eac033a46ab0de8deddd1a4ee88c8c4eb7d814ce559862b92fdc7a2f8a0549913208d4ba151a1a746acaff3d627916e6d09bafe2ad6d78ad54f01aa691be75c1";
+      sha512 = "154b729897c7fa4e243eb42c7e365f658f3857b0b799a633e446ed1ef7257e6387d755c0534ce2cf81e0008caaa205c18ba512a3b3c4e6f31f6a5789674e16f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pa-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "cd6f0d6f30627d50011e0f193754815256b45200fe743e820b6bb6b98120a29936cfeb84676e92e9d90ec8f71774d8bebd57dd68860d4bd77339bea154cdf28d";
+      sha512 = "39cb1b7546ba00c9f2a7f5794c7920f6a110ccddc20605b829945cd85dd5172465f03fff0dfd3d22f67769c15f43130d5f034fe48e52659b864bed7cd5e869a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "749592aea4e2c18472981ee9d7b6d3cfdbe9c41fe2c0566c3e7eb62c0d910104a6301dfdefb19ac2972edfa65aac509ff485af7ecb73aed365d1a0b052ae63c0";
+      sha512 = "a5d30cc38ec170a5d23fc721a91802c09ce913356217c34684887b292c523f9da5b0d2a16e882d324a38cac871f541e08c86446c36f8dd69cf2c6a60d0a2dfd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pt-BR/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "d6e8ce82e79368c9fde059e8763bc9a5b4b6927672f503f52f525a86eec4e39829790d63a009477d1cb4f27be7ef5624c9ee3b2ad58603d76eb5400a8a758754";
+      sha512 = "0ac69c4cd827cb724507202bb88ef00cddebc10e7785a23ed3adfc0fc537e981c45d8141d299f6d6e6c84017cb16361022357750b69c5cf70e643d14e12c99a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pt-PT/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d3ec8279b1c4ce984cfc57b4b9dd67b923aa73314c21b87f5800e9c1d64d4d23ec8077dc571bdad068e9ce6ce7aeca2b358cf1b12cc6a05c24a58fb876630a4f";
+      sha512 = "34ce2df0f0501610a73b4faff1fee7cc60c0c0d675c60a769b99362c7ea82a5f780804f1fd5d1b010063b0ec5fa67db5d6dcf661b0638274563c0af588c86238";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/rm/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "49310bc21921933c4daeb096c059730d69c22696121af66a4db8b305376fa2cdba73ac58201c12b8afffa751ac30e0f7668d6fbd811077bde055baebfe106bf1";
+      sha512 = "8053d904c427dbe66837445b471793c80e23fcabc673f2df5090b9acde7f29ba38f74d786183b8d4a1808c5af0c7ec147a02735a0aab3a8d812c7e8d541e2167";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ro/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "44bb06eb3de9dc5ba0b6446c782335a50ac058bfdd0dbe69801c7e1b2b55af8ce1a846527baa65afa251c062ad4e325403970b04e939aa9b25ae317b6354ac8f";
+      sha512 = "6faf8c31b8457e11e627309c851ffac67821966e7d2f363ea54e133f25195fe35eb593de6b8f6698b01940604b4b5ba13b37259de6e24a817fc4cb402cebb52f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ru/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "1278da77065621c5738a66bd7c8bf8fc361f6bfc8ae7b2d47a454bee53bb3ce47118b490ef0219f9fb56cd956d34f9b24ecb50ef2b5290f8731192b64cbcf413";
+      sha512 = "1ef8163cbffdc6887cbc5bc26e999adeecb43d9ce45bc805da9c3d307659100a83038038cac411aaae384cf20c45be081ad1fc1211110a68d023ec1551e52b2b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/si/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "5537d26bff86ee2d7249809cd47d093f980a4b882e72dbe0d97dab3c368000c2e25b6fbb762bcbf7249524c7fa40e65c9fc15a79004825cbc09be4ed62ee54a0";
+      sha512 = "556eded9643cd1f482e6b4f83fb52e73d2a182065df441e7244256472dca276903a76e19ede5bdcd02c9facdbd09c7c2d533163e3165c68e54087b592dec4fc5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "85a544edb4948f0d828908da796f0d6bed5ee0370cba310acd31adc5adc3786f639bc86563904194302e9198f61c9d266aeebd48cf3a2b7d6a96f7dcfa35a75d";
+      sha512 = "8b1cb4342ed920bba9e3770b6679817475205e9b18f94892cf86af0348a10530616622ace83173ad71b7889917dd0e6fdfce391b5a4c667230bcc63ee14f5050";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "aac17e2a1ef5166aacabe96933d7179165a185da27da11d1810bec8ce15f9c738eebd3b1e079f03fea30b7079602e110a7c1d536a91ecc513cecbd20cebffc44";
+      sha512 = "69aa0ed87116ab8c1d0b0ef1c086d014b55b7e1441c1c41a10377eab81ae0ff66516dff7be201faec156e541d17262aa1f46d82f4041eda791086906c7795826";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/son/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "23dfa3759617bc04758c779b47323edf9a96f3d3fa655b72c6f2cd885fc9e6b19b1b34ba39ec8ad6a4395a6d502d8689fdcefbe489cc0673ca3df8bf9b64cb64";
+      sha512 = "4bd0d7510c9977013a9fdfd3453361380b497dc600b1418856a0652ead5625c67b1aaa554d75fa8c10dc1ff4c3e60fe2218a421c623ace151e8ad078c63fdb74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sq/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "bc7bc6da2111e0a211a75aa3f37736b7ee6d4c2193f7c884d0ce1b5b0d88019b24de9f7cdc2da1eb4649ac3ee7d06b3c4a580c4f6797ecaf65067178fca7a63d";
+      sha512 = "37c7bbeaff9004b3facad06afdaffb2ce75e1a49147a3801113124f1e6827e96ccd41b38b59f5230e97c1f9060e9db4cbfd399b362bc8d3619e9f4c4786e7f65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "50a6875b26453414dcb61860f6f595ea46e7563cc9231d00e1df97b6a940570a0bc370c99a76ef97d03dddf75b75842102b3d63062aad989b3620426c880978d";
+      sha512 = "ca2f26e74b20fa6e1d9d43517a26426817bfd40f0d73fc487f7341485bc1ffec6a722cd1c3212fee03f0584fb7807b554465979bf8d8228f1870eca139baf752";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sv-SE/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "e8c400e7250e1d4f03072c674762d7eba488f6e9526139657ac4bae7ceedb6eb85b070acf7b94c609492bdc74534f4d1fa2404dadf3ec3c0732804afbd6d6d11";
+      sha512 = "9233da6de53b4304e19b27a8188314ee42ebccf49c65b48c3bfc5a06f9ffcd2cabc4843f2995f881eaa2262a9a0d8f1e6b68943d5e1d81c1290dc1d21adf3e14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ta/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "7896fda2249da5444d3dcbb4dc6381005c79c9e93e2275261ee46f8b9b7a586250ac8722acccf1e4a0d5a4ef8a0c3d7b4cea1518e4dd9ff3d99ba49e9f9a99db";
+      sha512 = "12ada3e1b3816c257538deacb8138819b4924a900f71397c95286f37e2e941c3705db504ae4f5a964d6af142a39305cb9ab5a63cd2a3060047aa55fb6c288f4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/te/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0868096328171e221db7a5ec57121682dbe0134300da0b520b68379e23a88e88817b2480673d508b76d61a91b010ea2daeefe711444c931352775d96b51e7e67";
+      sha512 = "cf2bd733d492edefe19af9ab68f36298e825d66cdfb89995bd20ffc3a405e078af26e6a7f07bdb1b04bd09daa516b9dfced7fe524cbeace8b9aec324b8826ba9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/th/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "8bbdba7486615b3591bf396b0997c74e0bb3da0547d4f9aa40a1c2274d7eee6f11a866a1176167e38614d9f182c853f2ed884d982dc2219069a4051f7b41ca35";
+      sha512 = "dd6c976d58a61a50bd6f6ab3773c43f778ddb08b2dbef7ca3709219ec4ddf14db479fa8b9a9136d28875bb71c493b085b9e668c5f4d02dc307c0e350be2b81f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/tr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "948888566da0b04eadc9135989f8c4940c6fe8edf25e3f093fcf81e39bd09b730e105f07c461844ab72a69e7782b6dfa24996768caa99fdf4dfe5082f1613583";
+      sha512 = "6bcb6a25b985261506e47bf984302153074811c88f2134987a15651f96d2e373ca6867c3509eddd34690e2731ea0552c575097b3e083e9fed8d9aaf03b95da75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/uk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "d12e0c53ea756b4406e650f1b11010ec6c0682afcf6edc7eec4732322e82e0e2e4904aa5b3587f87b5124f98a3712bfcf60adab62ea0c8309e03f80e83d7ba19";
+      sha512 = "403ab45582319cc2ded9c5f6c39791cc35e040cba808ab416a4d6104accfa75df56f858597c714bb5087f41471e4dac54d0f6ab62ee767de6925ccf0a10097a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ur/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "648267564541e466291a055180d2aed657931be70674e51c204f46c9effd5133d4bc35064902692194e433d609b727822d9bc9a0221aed0e538371acf6343032";
+      sha512 = "4dcd348076640ae39ee104cde115e6b207aca400cf9fdfc65d00334271e18ba78fd185136ff54211a162f32f0eec46d696f3c5a02ae969addcce95b839f45260";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/uz/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "afbc0b0af8882b8f14a965475ee9b4421b315dfea064b3d00bce51879448d8a22f64af95991e4290a545a2db77dccc97ea6beeb22ac10298ab71d9f423011467";
+      sha512 = "f6d38f2de149b4fb2494582e6ee3a562d4c7af71aa957ba30fedc9c1cfea314d11849fc1c8a11d19cc43045d73c1939845f1fb3e334c4d32eeb0c2881b9ca724";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/vi/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "1caddc6f94250d9142d99b9ba221f52f157e252b7b36bfce253b0ed1de68e38d859c6afd0be23e642c9aa7d51a82f04ff0ad1d63397bbcb6bf47b918a6d7826f";
+      sha512 = "277f09e65c5d07539346282b9f70a662494a2c5640c78ad56089e0c50c651ab0c0fadabfb67148bdcc5de190ea83d1abe70c3aa5fc50ae1cb870937d10d95be4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/xh/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c03d230edc7078a3efa322d359e10b45b129689702704c8ec6ed869c7db1cf99b7f57d50442e2ff64b730ed5c72f39ced56efd9ac2ba65654b3a735f3a381866";
+      sha512 = "e541a068ccd072724fb19a0bd830a2a95665a20a08ad9e398be02545a0a6ae8488d3f30f8dfa25c1149df2a90eca5f586fbe116740cfe630efbe00f002d3278b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/zh-CN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "0ee7ab138d09638b9ef34c7e5dd155c4bfcc13414fe91696ccba38bc0df3ec7cbbedc39f02c790448d9b0079a20b49c3ec47b02c29469ee6a1d53fcc7b9046a1";
+      sha512 = "3f9163e25fd67048456bcae71c86c287d5052c45caedbb19d6fc65e421d1dbc66cafd61582137b7e3a6a5535fb19be110f93d11ea1cd6462f5e4a16ac2bac182";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/zh-TW/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "0dd312831aaa9801246e0124d80f239b4e7311a64d64823111e32a93b3165401fb27f484d0023751af87b204df22e4a7961db0f37787025babe195f185ac920e";
+      sha512 = "12508fd22dc5ec22cb272ad8c62150ca2d7ed680e91d398e304ea07633b55eba1b44ef7668e3b0510f0ef2bd21c8d83c28ae07d2f519e138b4100c5f8fb35ae1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ach/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "a97800319c06e5433e3b31ea80c153d03f203804c9013eff166b57b7dba3edbab74ae565a57565c36371f609d53a76ac2657965d8e2da936ee753d614ceb6de8";
+      sha512 = "de723b9dca94cc4f35c329e2e31596df20e8d873b54cfc0c4d0cba1ce27b25bbe7af37f50cb360e933b4ae69b1e9d9d2874a84d4357d39d7ec06dbd62fbe9187";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/af/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "50ba89db1ba882fb84be61875caf147d29e0c7c64402088a95293b58f98065d49228d47fcedf0a2ecee9cf5d994303c2b8576cfa9fe1939eaf9ac2ae5ff89266";
+      sha512 = "ff3da99e585bcf41f1205e62e2d2a0f7aeaf09a8d06472d6d26c74555ffbb8600fff7266730459cd2596766029ef968f613dd2e793f444ece9967a793754de14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/an/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "fa33fb132888398d38d1ce923c2740b0976f3f87f661c1c30b016a8e8cd60fa8b57d3f53e20b008fc6b6adfcd6b5c632f0550361b078248495dea8ccacccd274";
+      sha512 = "8c9d07c589a2fd0f6fb6229a3c83ebf26d07e4535b915fbc737e8a54c64985731a7101e6474023e03c048d30c34c57e6d0a47c530a642072167093671a67f144";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ar/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "463593d809774306e88fcc3484aae8dc329580e5327f48f463f487493b3cfdc73ae6b943bc301227244d12869acf0c766c234868981b38c63bea673dec204b36";
+      sha512 = "f8242f8bbfd54bef69d9480c1a3b78811c91332ed26b1ab3db731e9a2b4633b4db1e5dace3f8351210f38f383d9396d6372dde7b1c3c20a99a4631d095c387ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/as/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "7d804ad62497a7fa22e418826677db500dd59bd6583729c8c1ff8d49fd13eb8979e35749055b707c0d9ef98af3c78a7e80f3b0609cbd34868efbe0bf7c7f166e";
+      sha512 = "830cd3edabf5584fad8e5f77201b0980859b2fe8a2c6ec5c0ec886a5b7fe1c81c3513d93a9e99b6ad350d3d699376ba3a027caea1b8b092137f580379cc34d59";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ast/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "bbc13a6cf87e047243a6aa17bda1ecb13aafb00f3c8baf84cd5e64db0cd0fb2dfc679cc8f1dcd1d877c7bf42503d716049c5fec163a946dc47f1ff72f495ab7b";
+      sha512 = "5ef46e285b2c7015f8c0de1a4cbf59883f1ad0a98ae9bd4fe2a5ebbaf9f27ca5522233517d7a50281cf75375a3cba0036a0d77d493e28fa8230e4af3b888456d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/az/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "b9357217c5f1ebe06fb6c1a399ac94637388e8866a291ad6bdcbdd0c6d2820bb2beb8b66d6e1c6557abd87835e857b50f01a45f8fe21aa8c053d44417b8466fa";
+      sha512 = "6db4270e17b883c6970988287a365497a5905f12c581ed40e442712cc61f61cb78f82dc67c5d1806f61d31302f6e914df95f3116c96404c09c07945de13e6556";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2";
+      locale = "be";
+      arch = "linux-i686";
+      sha512 = "779561717f27e6090de5d63646ae0ee7de5b029422889a9b8701f30cee2ab1e1c7737f6d61a6f8bfb7106b7f05cccb060a7cb30f8bb593210ed7a04d72137c98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bg/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "bb94f0186705cf5a0d9b377b1ed9b465cbf6632a0528dc6fb9697409a85ea1963f53b5517cc97fc16db13022da69d8bc43682dc80b54fb7b4bbb8650d8723935";
+      sha512 = "889172aef9743e4a38cbbca387528e03b3a3c9882b2a2459acb0da697bec2080a51491cc0998955921ebbfad4b272f0f82ae7029313209a887984a768552fcb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bn-BD/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "c25f755fe5a82a2bad51c8060e6c152a4e66901e9c2adb53b79e08f64bf2e673b83aead21ef83b28390b9506b65685a8c373b62ba1002f3f8ba59ecdcd530b73";
+      sha512 = "0b93d432172814b44e5d879f044799c0d6002e8c631766a43e892d76fee156614fb64ec5333ade7bb65451c73d04443d30202d054b8c7dc2d82d3e63b196d472";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bn-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "7291294306a82b9c6ebd2861715a9954169192909e096391ca342d7b82cf7b45855b1f9315e2f447749209b0c3979ea1545532b61b52ccefd68031028473f0a4";
+      sha512 = "708637cca38914670df1a237fb5b3d30cc6fa93f75c9b13585fc1d80b11b986511139aac1a984e0ce27143e554092be538d91a9e54841ea44fb5feec9128eeee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/br/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1c14ef7d74da4c9925b1891a60480e7cae632f95ed46180c77eae8706aeb3e778a6a131f670abeb2b2d4640edb265da4d3b848d993d17f604cc0fe6d3e322c29";
+      sha512 = "0343c096b3b9c98ca65a4934aaeff8d08166a2b6c806ed81cf89cd1942cea9bfd2464a42cd54037c5bd78b3c05951f29710894e852ba65f24c5f7bb0cff3f885";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bs/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "426384268d285b1c4e4ef14edc348cc2e6be1bd27abbdfd1eb1ac4cd4a9cf36c2e0af269ec778a36d413da40186adeaeede3aed6695fc7fc9699fbc57a48b956";
+      sha512 = "00d309e92d80941318ac41a56ad41ffe3fce590ab084974bf2745ed7be2637192829c4cebf230a86d77d2eebf9aebd19495b4674a5d469563ba00b124f526a9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ca/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "6c20671af78f50aee715e9d9583923c9df086232e9fbb6dcb7211ad2a2c605671fb1d5484a9b1fc35062bf568aae2d15c79af26e9d56692ed3ec51eee0584254";
+      sha512 = "ad25a897f3d9a58156f1ad95bb17da94a3fef84603da874cbd12db8b0f51868b95e8157b71cc8c1b88253b043bcfb5f58897f052c20f4ee703afcdcf3279a15b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/cak/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d4c5b4e344caf327a261e06fb0aff1d8071ec2ee61fb77ce2008eacb0ce4937b53d91bfd8e0369979de996c9db665302fec8278e6d024857fabe975b3f01b4d6";
+      sha512 = "d10a6222212fac4f69b2cbf5fd82954160dc6495a901f2e790fb5dfdbac5548f017d611df93b5ee74d688b53a0002f8927c2d360a7c2a907e2ce72d3961c06f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/cs/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "c0e10ef87dcf787a337f7f5dd14eaf1f327d248cf3cf2cc0b42b5e9fa426a19c65fcd83cf6ad5898b84f1d8cb70390aafc8e3b7b5cbf2880d9713e854f070b9f";
+      sha512 = "f18dff7152d0b83955ad8221f1b3e46ad0b34c082f0be17296eb459639addd076060b26036548b79aa1da73ac11a53ad82ea2e6069e12babc90570e23ea8681a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/cy/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b9d8bcd6e05d9a975fe9947d766012150fe504e26384b4cf42591b009201cb1d035ba1157eeaf8dde4c08e7d37814b7177eb46df0f4fb5cc775a62ccbccb06b4";
+      sha512 = "04aeeac12aa2ea1ee0064daba05f33147c376c3f6acec38abd64e794ec78f72783ae865ec17b855c165c80990812ee3e0555ec55e24592806cfb02854379e32d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/da/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "3676798548d36ddb1ae0e9b17c970e21572882ec75d81f78d4d63d6ee6581338f75a934b257764c3d43129d139fc8d9be585568d105550b61b5c1146aedb3071";
+      sha512 = "53034182c7115b8f2a24662823571b290f86977e2be663dfd40c02d9a8f2cd5db3d3563873af5cfff89bdb67e7a2e60c14c21e755b070bea0a5942c2821140ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/de/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "f42a2d8acdd380157bf145ba5341b574f5b065705e3ca536f99b23784ff4763c16decc784b62c6d0c6a98ffe088526cbbd6b07cc97c5e0a62268f073c8b8945b";
+      sha512 = "9a1ee91fa95b6ca8e0618dfd84930c2e41cb03a1daf33b03ac8ac9a92e113d43ab41e922537eee477bb5e706c7f018a817dd640460df5cf10288684811eb9585";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/dsb/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "80bcfed6c5788919b2ddd85942dd47ba4a0de1de33840fcc2a7b4ed18dff748c2665d12dcbf3a68ae09f9199292a466be02cf141478e303912c2efed4aab3f33";
+      sha512 = "935e7ee75c34045393dde791d14be3f4f7c5d57bcef5c4b8a6e291941acdb21550e6b5aa54bb559f3deb64cc6922f4709bec360fd62273b4b693718b69de532b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/el/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "42bc0ce9c2b9a8e5d9655b921009820c1e0e05a48ff104e68533df9cd4e17e9acd19c8d9bd88d4dff48f851c9532f4e58bdc175f8c0cd14d1b98bedcb96fec17";
+      sha512 = "371d5b023d63923bb65acfdf3d4d7efb5acfff3b2b6de7ba94e0b475b7e45b268612303373e7b10b420ca2c398e9eaf340dd481390f36c5a0b50beb54ddcfc1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/en-GB/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "cc4ae041a4595d6386a1dd24ca83440497e04f552d748566d4fcc1a17aeecc63771a130ac212d2f5a12f2691128c201f673edc3ca3ea76c808a44bb0a771c8f3";
+      sha512 = "c99cfd1283ab71d78ab8311616ea6645cc1d492dfb5091d2bee19299ecaa9455228639f85ea366e7b4ebd28270f06446897b1a99c9c9b54bb2c69b4f4d3fec1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/en-US/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "dcdc0828e37d46046c4793440d1ce236b53b67426bb9395f4134700d78027d01670b0948fc668f7ba38c2daa3f1909882441d056f1f8f4216773ff4151f2cb56";
+      sha512 = "7a81c06e4b85e7e839aba4ea4fb41f1da871c3de705a843c013965648b1bedea86f0ab73a616b7b864da10da0c47624819178063f2894508fefd34d7971e3714";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/en-ZA/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "f8f1629e0824f14dad1d315e0a02356cc6581fb09cbfc89899071e376a5fc359820bf5c0fefad003cf714c344a4fdbcbfa6117e618e9d01fbdb6bce4ec2b0cd7";
+      sha512 = "4f0b171169b73fa526e25a7c7c9dfa1a0fd557fec07b69e761a948de71172f733bc2a1d2e3d1f44d6deed0f42568279e78541e32352ba1a27fb45274d76768e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/eo/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "5360d73ea0fb4bf9ac0312a9f636ff3c350bf3332e1051a24b69b9f2abea038c9924055ff6b1b8ead926e20d6f4a56349312184bdb6d8977b3e8325a76e8491b";
+      sha512 = "d992ef007b02ec7c33b8efb7d69f71a9656d410dbb30ddd3c2a7e39ec6f358ea02fa9404af84bde1bf0da524d5a359655847d729f10a877e81b3846c77a74a15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-AR/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "242cf9863fdeac1bce45d307ea666b3c1903778704f0e417f39a37afc22395d3ce231f4dd33b6e4e9ac31d256d3ad8926bee3ae2c22f062a981061443607b2d2";
+      sha512 = "5e4303d24df249bf07a84e6f76bedefb906e8846db787c12422890240faa3c231e9b87afb1fc210ccb1e8b3abc7aafa84f1896d535d7e1c24854d87971be8bb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-CL/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "4978958d499534a8c6f330dfd56e1ef40c0a92bfa27115019855d8630d9c1b1bd4f26fecfd5fec866e44f7c93f8dbf93feb7e1247af5285c62562ff7e449cbb1";
+      sha512 = "0be7306ad2da4072abebea8e93ae7a826e7f4be78855400fadd930e9d7d4f114b7c0e6d830a571da17d3c67d9fd3ba7b0d3fb861ed8f61c7681b3f23dd8bf381";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-ES/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e321bf3bdac860f2bd2e163e05fecbbd002fdd5f7ac068ece7bf2352aa5a5efee184d47b0d4b95c2323cd786cc874ef81fcb772cc585b0bc217886e6cf588791";
+      sha512 = "df9e70df387da42984bd27e5f032e2194eaac20605c2c50be0b41bfbba2a1b71237380e7ad68ba02da3ab426575f5dcdcaa7a31b3871b9e565239571699d9fcd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-MX/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "3a38e786861f16a6c228ea5416d2bd0ba643f27fa02bcc0621f705db537ba6e89eeae1f1c191bee6b499e4c6a1ef9af66df80979f32598b54db118bfe963ec79";
+      sha512 = "cb021bb04ed655c92120a6dee9f65109ce5951d1496c5acd2aee2ff0e8204e36e3b226cc08a1aa947cebc693e84b41c87de91edddcd47265835c883f6078dbb4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/et/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "d452515192a70bc20640d3cb6443c91dcd878ca354288d825426c6b395a8a299ee18b781da1f210acca58799ef34f6c6149f4fb758609ae7264dcc698e810d76";
+      sha512 = "c3199f20eb4db23791bc7ce076b97bf08bffa447efb15542c34f2e6def2ee64bc6e2bdaf9de094eac35ace1bab6693bfab4f0ea0bccb2754948cc9fb13a99989";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/eu/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "41939bc714c4cf0ee9a58ec99851329495a6eebfb8d6e7b3429a246497d7e917457958eecb273e2d4adc65d70a018534ed5692a1b2b6d018b0a03bf5d3babbe1";
+      sha512 = "8c168058d15a7b0f7fcb72bf8e25de041a6c8ff8b70744645dc03c57b7380a273d419090779ca755ee114b997e6beabea060542df53adf6b4dbb32527425b15f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fa/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "7834266f460d0a98a4f863f03f77770a1a76a107dd9bd3cc44e5e26c40a310a08cbc51518aac8db989dc843ddd31f0bf342b58ee065565a06e00d81470d8eb13";
+      sha512 = "2c263b26f64e565fc4873201e21cc2cae483ae691f628b4252928f3277d919eda1a5b3b0504da04a6da3df8875dbfd86d2aca440c9fd65fdf31992d87842a3b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ff/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "f89b33dbc852913b44658691c558a98881c5b9a6dde0a60caa7dcaf9cf7d833bb841216f9217616be8ef0f4343d5221cdf64bccca4960bb39430d2629ad4f592";
+      sha512 = "089903272e4245ac8cc4b3a2f60809a2b11affeee2ba1befe03031bf05c8cbef239189f2a729d0489cf5593ceb9ea5356a21039b464b25c8f4613bb7ac787e17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fi/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "2bf12c99f929224dccb1937ca241610a741af9ff5af92fa06752c27857cbb7e3c6f9bee5cd453d7e88e9cdbe2dd57940a6b00069a2f795447fce943eca84a15d";
+      sha512 = "a9f5bcded43b63766ec18f2a846b3c4c57fdfab15a0a570eaa10b9b09b817abe63eb7e9ed67bd6e1bc31805582b8458ecb3249c125aaae1803ed5036a66460c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "a14d18ee73bb8665d86b603c8806391ab937f3571808034216d69aa2f8ab1a6b97d52d47c34f44ca0f6eecd48e5ae58142d25e840a6c14721f8948c387795c37";
+      sha512 = "4689fba26647f5ba64eef2e8b188366747df8c2e957fc903845de131969e25aeb25b8f4528210be0c6d4a6a5db8a21079e1627aa8edcf087a5eafc8f9b0f8f2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fy-NL/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "6cffe5d50a37469b7a1f2ca62b9e05d8c2f2e5d9686a07ac365e34357c2827d95c767044a7f5f5fe1124e38690560cd99adf8b733df9d76275049032196a1af1";
+      sha512 = "c9ccaf00b75d0032f3fa7c79bad37e672b944dddcf07cb6783b401a4115e283ef11c90684f3a1a589a745e08f2dff9e27456509fb78a6f894e83c24cab141185";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ga-IE/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "619489d201b72f96d23be570e8b02654f851f4eac81cccc65e978b0ee69d4af5b205dcda42d95e3b2539959fd697807a0519a1da64acb3784830aeb53e263469";
+      sha512 = "a62af4ccedf1b6c443a13efd6c41b6d6f492f31d1d7701946871ffbbf00df000eef59eac69292f6ea8be64d9512d064ea86d7cdf07656b8ab2bc234106468db2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gd/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "9e198c4392396379057570a5200e41eb44ecf8c7b427a4cf9d307404d58d23ab440aa1f29798b38887959beea217bf3ab12a80012da66479260438ce45bb12dd";
+      sha512 = "177f3584b81bd03ceceb0f7083114b38ba826974b115e962d8c6065c001aefda7c65c273c1a833cf7dabd24b69e0c42079ccd6842f882f196de1a2fdb7ce8605";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "6a8439062f17c97e76a7f660ce9d25461e92089494bd8b12857e08bd712e9c4ef300252fb6145335884dcae8ef867e562f0e4cb901f07c8a037eb7f03615d562";
+      sha512 = "6dd9fc8420093f8faf0eaafbb1cf4326360d610593fc8642e488a3850d9f94a249e27c89123eb3a25e476100b63fff1a88dc85f3e5714080ebc9078dc9309ca4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gn/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "6be9a7cf4c3727aa603747476a2033b24be6e848ab2e5f8ea834fa07e96af05774b7a06d8e004be975f6ffd83ded606486a996d0b7132e7759f81da43bf5f003";
+      sha512 = "3badcdbd0642ac510cf978e978ea7a9fbd1d6a0de7ca541aa2eba16bd2b788b5616fbdaec06a3d29975c6b4fbe8894b6f38e2522a6495b4d8d1564efd4c2c656";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gu-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "c97c4ac9a0359a040d07e3a62fe0200c7eb767d4f4748801241a0aeaed930761ea306dad1789c8c6cbbea75a90e55a4f00e04c450a528e8242a3821af803a19a";
+      sha512 = "85b254c78925a8f30798e37afe5e452c50bbdfdac683a16cb0407c8cdeb1a9dfc23be4f7bedd44c8f434d2d1b16b65603448e356e5d82ca41bd698bc275da80b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/he/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "27597aa4743b1bc4dfc8c26e79d5ccdccab812b576ed8d2a1d6cdd5c6971fffe00dd10f69fe13e00cb972ca78ddf47822485c1e053e81c179d2a187c9b46590b";
+      sha512 = "49c6aad468a893d77f9b158883095fa0429e4acc0a18aff2b284cc90036f11a04de9951a2fc18ba87ecf1d3fa6c55673e9e0e69428bce980638fc270356e11c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hi-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "5e9e484fded08a42b2499417327b2373e92d2321cc3550cec25e4f0462c7c4e22a1490c972f6b31c30776b858faf50345a03ee52c6a67e2e0da062837c07d245";
+      sha512 = "6f64ce83bfd5156c6fef02fbd0e7bac47f8a04848ba5da619c9809510b1f1eefba396c3c9f48ad6f9d0ee700e2b19a6edf1f0b104ec05bc798c22b8dd2b4a6e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "44a49025664ff4e5fb34a5d8d02e1dd7dbe581b0aa5d014c2c9e9c052be9957bb04d6d9bfaa0aab15963b2eafda2f2e414fcabe826c73d9286923eb5e8ce1300";
+      sha512 = "0c4f520f2da27b1a5a59bfef7fc9648b9794bf0e4e471082f0527471bc824ce999ca668ac6cfe39566eee81cdcc66d5a09a15dc4aaa528345786288fc4ee4531";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hsb/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "6a71f8e721270d1c450c19c627ed1212f56a7f4d1b3f3cfb5e72609c58f6e040d76aea4e57f8f15c912c5f35c7f7e91c604f2355b51551808399593548724b24";
+      sha512 = "b7753e082c93d169aa559bbb9314de29cedfb3bed336e9b2bf2f4514269fca3ffef52e5298322c9f5d354aea160bf0e1538cb51f570a2c29d504d398c6fbe262";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hu/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "8ac3c4c1b078daf9a671f22cb77f7bd056175b11d20606e710017b1cf564ed648264d3ce23c9e28ee507ff0c0f5bf78cf897a62df03c5ab5e25571c1c04d546f";
+      sha512 = "84642ded2af2d558cf93960af568cd224ebff05f13f26d4fca84425df14f6ea8ad3ff459df16b0f035f28697723a264d2f3ecf8121022ba9659ed47163faee7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hy-AM/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "6a97cc2fbbf92050d1055dc288ccd5346284ff6927b05aa0467bb369dfdb1a2b54c0b57f3356add342e1221c391a7d381d2fa895bb0aded5d82cb85071582a76";
+      sha512 = "fbb79684d496b4780bfeedd2d682fda002bd190f5148343d3f3720673d2dc26609fdafe402feb96093de0db960135293dada87218612bec562a6be2760514a77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/id/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "19c32f612c53bf98bfc108f02adfd6345ba3d7c544d1ae93168f57d95e9360718fb57fffd8f205550417fb237639dc4e21e098f2a95bccf8598a11b464497a2a";
+      sha512 = "405635feea5949d6ef58632809fc69ade5f77f6dd19f0c190059698558c429f28f94fdf08612c0346ffac4e54bbe806dd6c01ebceb9202a4c7911f86ccb1f747";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/is/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "570c0832f57f46b398b6370a3f80439d3ea5bad1877af242f6c57b9a35f6bb148946b13475ef95c60a920cb51505887c09b6e2530fa2c802d09e4a1967847d1f";
+      sha512 = "5c6e9021355b7e9bf4d13db20d7bbb09dbcb94c4c8213e2aa313b6a451ace1bb394e31ded52d36ac80770b64bbd7b9cee93c7df233338a6ca9e4e5a8f0a8fa80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/it/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "54e6f03f1e8473d407ac31267378eb5432ba7c366a309a646076ca2d02e342cc586ded7dbadc83117bd71a24d1654cfae63ee5b1b1ecda2cbafcdbca8009ab94";
+      sha512 = "2fc8eb314a9328cd91029aa28234acded5ee1318b2708fc167171f4ea8cbe25a87e0130ce3c13300fb15bc5e8d09ce504da9ea5ab46cb5b01498b083d067499a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ja/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "e73625a90586b9b845f9a2870838a3ac4f1b194fd04202b60d00805506102f65fd1ab69a3781e86f5db5580c881b7570c1d611c3933c271c43d32e15c3214db7";
+      sha512 = "5cd5fe41c714f9efcd7a0d4aef259c01ff4a3a0ac05ebfd6b011fb2984f1399803199f7f91703fb55e3e4cd8d0032bc6469065dade99a4290dc2af1109fce044";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ka/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "72c070a815511e483eba416ba4172f6ad4d026f2469d1b2b0beaa07cb49f219275b7612e3eb39140601c7d9aa55b0fa687f768ed358a3245c1d467100b6c0cd5";
+      sha512 = "1e84b3d9fd78c884a125a18b003dd03834b6ffc8cffae93644bac3d78e6041cddb831ceda58d5d4d461e3fe900204d3916a917d5e5056e12684a8ec471df9d20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/kab/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "15a2566f74412625329444b2b95fa3c8d0873da9b40a0305b9d2add6a9494574e9350860e87ede63daed36f3347d617b0901aecfe7c3c20a8fe0e44e2117c085";
+      sha512 = "a650cdebc1c89f5f65d60f36449650ed36f9ab79b4e5bd084717f88c089312a105388bc6cf6cb6b05aaa05ef4168225ec1378d574f82b0c7ae2fcadd9ba549b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/kk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f56ffefb3278b3cf580fd6506a1d1b69fe5a693f259cf630a33f0fab8ec413fbb49f1dc118ff389ec513288f346cbebf379dd4c6da6475c740de3133e5b53130";
+      sha512 = "901a7f524fb6cab92a6f686ae2951ac4668b2373f0306572b4214b9dff76762e36372afb6d5eb319eafb0c1595a62a8020078938a650531dedf26e4951f7e519";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/km/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "bb26a6a7a90cd0925f0e809ae904e7d81f9bbdb5a0e56b084f5c5bf22647ea19ef8d445917a03d5924ae551affae375eb2706c83efc930e7027f0753db168638";
+      sha512 = "a86ad7c74e87ebe0e4885914a07e352349d353507708e79e37be2af57653f4778f0203b1d72580909a725aa696e8e8f491fc817237f553f526400aa47da0f03c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/kn/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "b500573653885e3452aa4e05a4dbf7bc9631fc9751b62e23dea013fc4f845a4e370848b53b999d416552c44a176304187ec2333bb51b2c4231fb52b6fcf3d429";
+      sha512 = "6f8e697482ac61565c2030164ea08fb92803e91cbd3f562ba70f982b2db7c0d9effea7347acf3a4cdaa7c7cbe393a3455b4a7333957ac2ee707f5b542ecefabf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ko/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "51e6ff26f2721d8750e230aac93def8579c9fbf066413977c8c8216b435c77ee45e597864b778b2e79ba01dfc9e994578920a75e67269c379f767f662bafcdcc";
+      sha512 = "83a7ce342c38ee014142e60590d59e42373a38475a36f4c9e03dfd12890e4649e34a0ab5c3153c93ee9eeab9810c78ddb5332e4bd92c891c462e1df2a2305bfe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/lij/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "8cbf424675d8289648d77b3a4b3b37150762647b08941ca7f78fc67e2a5d6a96e800985f8861d5515d6d5339008962066dd5bd5fb16a04789a9101a158fb6d4a";
+      sha512 = "8a8b686894ac4c211381e31e29d0020f43b11c92edf8158c89838e73713576e21e3d25349d8f3bfa1da3a9b232a1c058f6252af15e0f2181a77cc24fd046ef7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/lt/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0344d94606aa384757bbfd07982762a66683cc27ea446c16ec3206fa2c0b299fab06462cc203a25cd0db5070e160daeda11047b2dcb8b4af2bcae130b6a1ed2e";
+      sha512 = "141f50e9bcb95e456204620f25e670ba3299b3cc06f86afe7bda652dc59745d09e9014737f70caf12c5f6a52c8b5f0777405969b92efe272a579d2eca817e22b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/lv/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "8b80056b0d6897cca46fbcd3836096cfdc3c4824154b71837573eec75b5f4ee1d0e82cdf0dd1d73a651707aad7888d2413505154bffb0e56beabb379f5b96105";
+      sha512 = "c51ff24bf9ecf43e49064aede96d9487240e3a14bf5b6e61da1c83de01b5d5e974432e43b93d28fef0c473311f528cd06ea2d2a3fb09cc7a7e8fbbcc07c7e4f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/mai/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "365cc9a52dae47e9391c95dcd84230d0667816266e561b5a26dec8e21b1b82fa891acb851cfcc70a162a852d2ce21492701fa277d3fe98d6dcd6f3cad1c704f4";
+      sha512 = "2307008568c8140d7b90ff4dce3d4c6fa6bf5f1776d93fd7979b14ffc384916f15261f611dfd3c0e83e5d1e8980bff9c551ae9978ed16540a399f6cc7ff64c84";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/mk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "2ee12219fcee798550da2dccebe800fc67b81a41ca7aa543d0a39cdc10fcc4db5d2503a9053fb2f46e76c34e3300a1c025aa87a639f74a2b14e8585487b7f949";
+      sha512 = "b6746b827a3c45e0f8a7bdf4423f63197ae728fe0bcaf0a6781e44fc42dc6c31cbe1e4ec4f1b97f96f1534550aa6921f453ad9732e62ea8fa0737a36a10e3479";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ml/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "38bab91c0e1019369f9aaf84abf145045810a3f89b1f437dd3851fc2267524f1b23daa0668f60740678ed659e5ae1990d2e6798944e7f81621cccfcce60b0da0";
+      sha512 = "7f1a44de725ba6ae31eb21e005fccf6434e7987acd8a480493fe872163ceb5d7052e9fed2475ce65ff487f0824b3a090c917b2a8119b4b9b47a3c6e5f7fc43a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/mr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "011868a403e71693274139de118051dbd0d0c6771a5c780406672f373e5b7470183836bcc0c6aa67c3e9369d401e919def3d6889d0e1758ff2b5152a8f118bca";
+      sha512 = "e751aebda7834a0532fb0885da223316e19f4c0606a88b5a70956d0a72bf37069370d0478c2809400ac09f76822b34706d776f5ee6237b7b33ad4237ee4f7fd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ms/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "d4a4891090b122f5ed2462c9c42f148f431c9b9eaad831698479ac1eb15ae41fa4355740f3fb44d7367a34e552c3313a44f43c76ebd2889990a546ba2ed5d61a";
+      sha512 = "ceaf89d467075799f95ebbf7b93bddf4c1961fead16fb86962bc857caf3ace620c42e2d11152b9cb2819f9a8a16625e5e276263ebe9066dba0840696a2a0a052";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/my/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "ec14ee7fdef28210a232fc7a0fa4ab3e891d1bf59be498a1842fae465b1ea8738bb6bf24297ffe8b77e043772be3c5a4bdfeea4ef13ace543b050a25418544ff";
+      sha512 = "d7d6ca947e04fc99d28abfa9d9fb07e85f4f71b71b381cda0c8587460c6274a860ae26b60432566ac9af25c752e8d5edbf8cda515cd523521958e2f3bae4cbe4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/nb-NO/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "7cea11945a09933f75efb1385224f49ff08f395669ef3b6cab296b02ac2e597e9b424c6ff7c08180b0cd3763b2772a7c288e9cc9c42dbe27e1eb285d209a62d3";
+      sha512 = "4d5f7c260011e00a202c841f2ef103aa9fb6b6e329a51175656bf9cc3952664da5c0e90de571f9bb6c0886363e1988b8a81a8fe3ce0daddcd1ae284b68b8be34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/nl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "25418b1377a9ed0a0389f5d4a04099197a2e364e7337368ca8c096f30b249a16d4988f3bdf941661f548bb7c478be5a74169dca9fd5d4800c56af5a6c93b9728";
+      sha512 = "994ee217f580dd8bf8eb06cea6f9ab509f7a430e8f74946d518465ec26b6b2d7c61e775374a9c1c3101c3a7c663326903226af0b585b01b40cd57151aa909a39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/nn-NO/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "eaad38fae776a49f53448bd9e652f75299946b19839f440ba470afe5aa813c5e8230ce62388d923b411f662011c72cdc5d6a0c400024677b92183d13aa3af585";
+      sha512 = "ae39cb50182999233a46c6a5326ead7b5e2f363cfc10505f246d14e70fa52bab5f51804a03a7f20485b9761dbc4dfba3596feefe27e6026dc530646da0cc4b14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/or/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "a055a1bba667fb338c55f015e5380fdea48bcb7a6311060412171a7dc573c76c087b74108d505b35b7738998516632df54143ddb5949946ffced477d408d3f99";
+      sha512 = "9b8346e09115651b58a2aca7a7ee2f4346155fbe6d77dda6c06f3a3e92ad4956ee5775dfcdd9c193a36a00407132aa2041311ba92e7b59c10cab287f8c8c4716";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pa-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "d93f23ac36daef173869ca9a0ab32d986b1acfeda96b2d277a6a555fda14f501c4f3c98f4dc8e77905098a0d20073e801f83e245b2654aa6c4e6519fd1ce3be1";
+      sha512 = "64bda267943ca748f6151498d477687bfe06f52110ef10e5bb2a744548878f3cbdbb5dd707bda4607c45e8ea1037981a2ced01143ffa596a3847792db4849371";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "586a4162866ba6f4b0851278cc987389aeb5f4f2582241fae9337cb00a62fd909348046f57492af9872e0a41f0e3167698f80cb7e37ef98a8dc7cb8c13fecd66";
+      sha512 = "dd38f64466c58cd4aee750d4489e598c0e934c6eb904ca8eccf1c2c1c092bb87af739a624f5f210e6c4ed25a6ac3dff233f13f1de5abf7a9bc831e02b4630f60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pt-BR/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "69ef7b9bc482bd073471383258b15e8bec77a4513502ae797bd1428e618525c8d2e037eca4ee957f6537ef4f3fd261d1a0e9c14d8597bd354652c482f315ab7f";
+      sha512 = "b1265e3274779c415db96c6a8c2518b159311d4f7aa638c030d90ec4169db70b6388df9b5c94fe31c4e41417cce2e65a227a6f6e9c47322a365fc6941d50e1e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pt-PT/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ad7bb1f211b5167c3a091f832248ff14c5f9d197e7065bd962245f8c2e1e54c0835d148f63b2760fdfb2e6720f4ac3f64c6f154267b5fae29683bf9d88a7d232";
+      sha512 = "30e5d4ed87cc28fd51340d407e506b56fcda3cc23fc382d1c471af2c3b990222a5d2fb7b645373c1f067825df56875ec6c2f9bd7b2b259bcf0e466f5070bbb2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/rm/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "e25b7a201fa2a77f6f8b9dbe815e59548c598218cab74919d726281e27a8cd4b1dce0a89beff79ac21ff0bcd5c1faea3f436acea5405dd1a899e66fb5a7a7754";
+      sha512 = "c3d31a0e8704bd7dbf6aab569aaba68df60489ee38001905f445849fc9bd1eb4666cfba8bef959a8559dd0dd9c16222429f64b398a55502b4d8dfd7fbc8d614d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ro/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "12419f032ccbc2a7bd54f1f04de77d5318531426b6ed0030076b52d4330037ca606f1319606831f485ab994d0bbeec50455a770b0448c24c1731e137f9cae51a";
+      sha512 = "d9833be482f828da584c2d30480230e5f79432bf3479f05b5be978d7068e11d76f07f697f85ab8c84b68f49e78593cd1a3fd9067b888f11657e96ca8a2dc3872";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ru/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "79a76a1d54d4449031755a2298efeb60d94290f77a003263dea2d771975bcfd66a7a81e1eaab298f9c72eafc1cdf28060554a901a01bdf26ca8f39b1b927d375";
+      sha512 = "e1f1778d4e7d019f2a945a8c83338bd3af7b6db0277af921e869c6c94fa22579240570f6d7edbf5f42c28044b6537f724bd33719d4d7cbaedca77ca7e17dfc20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/si/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "d93baf7dc43228f94f2e38e9884f37ac638f69fe367998b86c75f5cd735f012b408b270cc86a78b18f86ba344739baef22ee022dcb8397d83dd341e8da63be05";
+      sha512 = "63580c6e8820bdc3ea48dca090ab3ba2393d02051ce26905fc3097a36dd9e76efbd19b704145a0d3960a86d52462c7c58497591fbe50f6351e7d727871ec77c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "61e6388daa5f1ce30a313d2d93378bdd8119ae0c3d84b60f1b7caf5e78033e30602a808b0a1169d4017d581daab2e905dd03c202ef394ae765b083518b45a890";
+      sha512 = "9df80f36ecb8607613f30254aa8c3af5b6d417575c937dd6f428b5e62989ba9bf9237d7244b0ea598127ccd4bd2aa35db31a54412506022fbe4f2e65eb603d4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3d72f18632eb1142da5ea6b9423a7832b030d246af261cd46516810c721bc9024cc147cfd5fbc7c3cfbbd8fbf920b543d23c203325baaac024e726a040715809";
+      sha512 = "820cebffee19a05c2c03ab25b5c86ac7468989dd2a1118d3324dd7be5d3827675a791e3ec0b92ec32907fc585666b5b1050c81c5e16f57ffadc11da3b6de013b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/son/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "6a7a960468213dad0970e6793716aa4882f82c3dae1cc24c875190dcbd93953fe89a862d6141744d1cf7fafc6aae723c3d271094242b82d4fe76738aaaeeacd3";
+      sha512 = "b70dc6963e44a225254aa8b9487c40abd03ba1e1cb96cc2ab4a8b24908b26f5093bc715ae2dfc727257465ef8cd01bb5b15628a328a9cf5fd6b78b7f35771855";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sq/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "170b0ff5fcd665c50dd33cc05ef5ba79d4b6b7b66c04c0e679c294e03395aac07ff8b47b7178f2b7075aee4e42e9398e911c670671cdf15f1f1a465f57c95ef9";
+      sha512 = "ce2d445084c4db468e1a116fa9e4b741ff44ba994ebe5c575295bb6cd69cb72e5305b8a0326f7b43ee620a5e219279696b862ef512f3c4bfc32d3b6b2ab2321b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3f57ec3fe394f1a39bb4cf2f7017b52680d3d13b3147c6385edcf36885afdec0a0613919c27c276994fe30fd1f28b53ffdee99ed0701688b65cb6a0ce4ec6010";
+      sha512 = "4a5b4f4e8e9aa944d7dff5e1bc40f44141b04672666663c8c4a1b7844faf2289d3323427efec373f5f4fdc7ef5c79494dba416db8ced23b1a5f387b462d609b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sv-SE/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "021ecd06e900dfe961a527d7ac80e02d74cbe12daaa79db293b3c88d638fa46407523a5e80de193d6f9733954c8c309ec51337abf30c6f3679d54443c6f8247d";
+      sha512 = "56ca783a26d7c4c022001c72c96f02f79fc78bea625a73e3fb2be7602c96cb3753a718a184b7c1c5d154a755fdb4862a53137e4f8d1795345d6e5855cfe3faf5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ta/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "f5d624139725c96dea05a2bed5430f004da09c5e6cde7e82226589889ed6a6bbf5cde458cda787463eb7a71366678213fb04ca75f05c10385d9ae7c3e2144f39";
+      sha512 = "9fe7f93308392fe970aeca2fa72fc7d709c592ebab1bbae768a511c6928c914c4679eadf3832f416dad9e23cadb241de6fba3345739b419d8118523b0c35aec9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/te/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "d024a530ad5adffab0077644f119d0bd6fe538d9849ef2db4fedf0af299375de4b0035926041288957367d77ed868c85f95fba426e2c5d8a3021865d603204ff";
+      sha512 = "0d1333de541d617aa61741b03368c82ec8c76374741c086866d1d53832d97b9b0ad115d406914bed8061d348c0ea1bb5ce84a61e57596afd5ae318022b8f50b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/th/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "37e4be8ecff2e594778710c4ee1f779a4e53ccce4fe38644122850f55071f9be025346ac3efd74dd8d7789a6772638cfa6d0e32028025269a8b1de1c4c39127a";
+      sha512 = "cb607b0394cb81e6db0f52b080866fb26f4776d3f81ba9b040553fcb087817795049b4c12128b9c00bc17d9d0554dc428f680de531f80cadcf24fc3dc1f15a89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/tr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "a7897a83625bd5b7d0121ea62bb97bd0e6f802e6e010d27ef2f535438c62a7aafbb91b0a1194571e9bd35a673aea1527949b5da0ddafb721c82662ecd1f8db59";
+      sha512 = "3549abe03ea546bbdb0c0837829c7c9402a2d791f1fecfd7d8b9f3a3c14f496c26f758096cef959f9f9e5538397526b8d500e4d97062363f6c370cb7b8ea2b95";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/uk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a4f133b7184d8a80777b0032012007ef12edb3fc9ffece00774deea31836e0b4ff9d8f372454db3c2d9a167298e304055fe59488996a2f3fcfd93aef77715f8e";
+      sha512 = "f65108c24e28daa73d79d52bb2c58c0d590c6bee90f4a57202954d556ea04cb082ab61f588747bdbdd7d1c752272d83e47708bb5a2c7e346f6bbd5f1bc8e5746";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ur/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "71d75174c843d68cb677676b318b2239b6f2e295b8014c13f2be5ef5d050d91182f5c60d95491e6e1afc25df98b431f6eee0b058607289baf14e28ea60716938";
+      sha512 = "f138ec6164a608d03d7873af6f4ee8fd51f553912c06841e41214b24890f232bb342c2c33df388a58a958d932ca803ac671f2daf139ceba4f46c8fe5cd038bf0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/uz/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "fd317b715c9a2eaf995ab95293652f61984f63b47e487e7e0c4e226d65163ee26ef13725d29357beab6555015fae0a6bb9dd273996bcbc0d60463cfee9b2af0d";
+      sha512 = "7c427f89f4aa7462a2e3a35755c5dd82cfc5ced2d82fbfbfaf8804d152326d02e88fec8230d4905f89eaf27020f522c4096cdb844d38fbb0ef4c5c54c250745f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/vi/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "a964992502ef7f2e32c9a525fdede156a5e9e0eb88224b9112541f706bb9162b5ba68dab049c99206b5afa3bf232489e8cf25149e012f42f9d299176e48ab990";
+      sha512 = "6bd2810d6683ff537aa47b97dd8e4778604a8aa58e7cd8f5a1aeea7cebdabc8f7111c025131ad6255428711a5a6ae69bd1118b3636f6f4ab3ce4022aef293de0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/xh/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "ae4d335ceaa94e4b95a2fd6223d08087d20ddc666253bdbae17290f50fa0d425243aefab62d25362f2efee1dbf2abd7df4cf6acb5704ba487395e139060df6ef";
+      sha512 = "d23be8509fc11f3726efdcad75847390055e2d4d9fe775e9ea007290e21e9e9583dbe5a2a74dca0866f7d0cc2d3066f9afc4bb1e6665e94cb808b3e9f3250439";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/zh-CN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "c4975f9645aa875df6d948d9f89a00a1758843b7ec706814b6632d5e2b5f8ef272f25ba48ba9ea0b4b00e41d5d2fb7094aa1c7e2d1dd8b5e0715c51adbdd6e6b";
+      sha512 = "42361dd8de84b011d860b0fd4a7f7ae59b3cd8297c57275283f61ecf51275e8263a67af9730e82251c1c9f19c5216b0e2d65adde5987c4dfa88f3f95eea8086f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/zh-TW/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "ce2050031406d912f6c812ed6b29a07d0c41c1569eb28a4e4280544ba286fa088967b16113181ef5d2be14e00ac84c89d0bfa9b4c25c700874d1b514493260cb";
+      sha512 = "44735872e5600fbfe03a5ecafc0f25b8f193572b067a8a18a598ea4972952747023a93c10727887e6f598922691bbf2bd90a76c8a966abc69ae946ab09aa0c81";
     }
     ];
 }
-- 
GitLab


From ffa04893104debbc01a434e8cae6a26af4ab3fa4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 19 Jun 2017 15:09:54 +0300
Subject: [PATCH 0943/1490] afl: 2.42b -> 2.43b

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

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 4fa200e5bbd..1d6307f807c 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "2.42b";
+  version = "2.43b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "16ckgi4rh48rdmqcyxgabzcsmkfq77jjaghbxw9smkkm4sbx3yhk";
+    sha256 = "1jv2y9b53k3p8hngm78ikakhcf4vv3yyz6ip17jhg5gsis29gdwx";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup
-- 
GitLab


From f19f6317ea1bc2d730bc8a80df08a8456a8bbf5a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 19 Jun 2017 15:10:04 +0300
Subject: [PATCH 0944/1490] fio: 2.20 -> 2.21

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

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index c4e0724dddc..3320f2abab3 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
 let
-  version = "2.20";
-  sha256 = "06sn9ll75xbr2rr7zn8xzdy1v705kqfxv6q1zx6ysvxwri0sxrfx";
+  version = "2.21";
+  sha256 = "0nvvnhmls9gbn093lzcgps1w8824ylgyz674af85768pw2bvczzy";
 in
 
 stdenv.mkDerivation rec {
-- 
GitLab


From 31703358bd38845e5bcc47df3c564f0e132272c5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 19 Jun 2017 15:10:13 +0300
Subject: [PATCH 0945/1490] yle-dl: 2.16 -> 2.17

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

diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 1de8f8c9a10..8da61ddc4af 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "yle-dl-${version}";
-  version = "2.16";
+  version = "2.17";
 
   src = fetchFromGitHub {
     owner = "aajanki";
     repo = "yle-dl";
     rev = version;
-    sha256 = "1ahv7b3r52mvi2b5ji77l62hy543b6pdmq8hnd9xxvnxai463k35";
+    sha256 = "06szrcm1xlz6i736qkxzhhvrzg63shxzy2bww91bgxfccmkapa14";
   };
 
   patchPhase = ''
-- 
GitLab


From 5446934b41cf180aa50c2fb69e12593720522036 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 19 Jun 2017 19:01:05 +0200
Subject: [PATCH 0946/1490] nix: 1.11.10 -> 1.11.11

(cherry picked from commit 7b1e936b24ca60810cdb6d46b68300cd179836f1)
---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++---
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 6ccc645a125..80241cd3ebe 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
 {
-  x86_64-linux = "/nix/store/qiiwjyc338xigks5wqyxn0nnqiwy7xav-nix-1.11.10";
-  i686-linux = "/nix/store/30fi96qqggjs51c5085y3fiws0a3wdcl-nix-1.11.10";
-  x86_64-darwin = "/nix/store/zs6msqwjgjr9v9kbs5s0sap7vhdw692z-nix-1.11.10";
+  x86_64-linux = "/nix/store/crqd5wmrqipl4n1fcm5kkc1zg4sj80js-nix-1.11.11";
+  i686-linux = "/nix/store/wsjn14xp5ja509d4dxb1c78zhirw0b5x-nix-1.11.11";
+  x86_64-darwin = "/nix/store/zqkqnhk85g2shxlpb04y72h1i3db3gpl-nix-1.11.11";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index bef203e588e..3aa18fad942 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -148,10 +148,10 @@ in rec {
   nix = nixStable;
 
   nixStable = (common rec {
-    name = "nix-1.11.10";
+    name = "nix-1.11.11";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467";
+      sha256 = "f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5";
     };
   }) // { perl-bindings = nixStable; };
 
-- 
GitLab


From d1b9c9d2cddf2e57964fde7e4f468c8767a77b3b Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sat, 17 Jun 2017 16:28:41 +0200
Subject: [PATCH 0947/1490] erlang: refactor: build packages per Erlang/OTP.

This change introduces a fixpoint, which allows to do deep override when
building packages defined in pkgs/development/beam-modules/default.hex.
This allows to provide beam.packages.erlang{,R16,R17,R18,R19} which
contains the same packages built with different Erlang/OTP versions.

Top-level attribute beamPackages points at beam.packages.erlangR18, the
same applies to other top-level Erlang packages.

TODO:
- beam.packages.erlang{R16,R17} is almost useless, since rebar/rebar3
  does not build using these versions;
- all packages in beam.packages which use buildMix are actually built
  with erlangR18;
- update documentation.
---
 pkgs/development/beam-modules/build-hex.nix |  3 +-
 pkgs/development/beam-modules/default.nix   | 57 ++++++++++++++++-----
 pkgs/top-level/all-packages.nix             |  2 +-
 pkgs/top-level/beam-packages.nix            | 27 +++++-----
 4 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix
index ff6e47e5a80..27ce64582f3 100644
--- a/pkgs/development/beam-modules/build-hex.nix
+++ b/pkgs/development/beam-modules/build-hex.nix
@@ -1,13 +1,14 @@
 { stdenv, buildRebar3, fetchHex }:
 
 { name, version, sha256
+, builder ? buildRebar3
 , hexPkg ? name
 , ... }@attrs:
 
 with stdenv.lib;
 
 let
-  pkg = self: buildRebar3 (attrs // {
+  pkg = self: builder (attrs // {
 
     src = fetchHex {
       pkg = hexPkg;
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 1fd899c53c9..00443350a7d 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,16 +1,45 @@
-{ stdenv, pkgs }:
+{ stdenv, pkgs, erlang, overrides ? (self: super: {}) }:
 
 let
-  self = rec {
-    hexPackages = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; pkgs = pkgs; };
-    callPackage = pkgs.lib.callPackageWith (pkgs // self // hexPackages);
-    buildRebar3 = callPackage ./build-rebar3.nix {};
-    buildHex = callPackage ./build-hex.nix {};
-    buildErlangMk = callPackage ./build-erlang-mk.nix {};
-    buildMix = callPackage ./build-mix.nix {};
-
-    ## Non hex packages
-    hex = callPackage ./hex {};
-    webdriver = callPackage ./webdriver {};
-  };
-in self // self.hexPackages
+  inherit (stdenv.lib) fix' extends;
+
+  # FIXME: add support for overrideScope
+  callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args;
+  mkScope = scope: pkgs // scope;
+
+  packages = self:
+    let
+      defaultScope = mkScope self;
+      callPackage = drv: args: callPackageWithScope defaultScope drv args;
+    in
+      import ./hex-packages.nix {
+        inherit pkgs stdenv callPackage;
+      } // {
+        inherit callPackage erlang;
+        beamPackages = self;
+
+        rebar = callPackage ../tools/build-managers/rebar { };
+        rebar3-open = callPackage ../tools/build-managers/rebar3 {
+          hermeticRebar3 = false;
+        };
+        rebar3 = callPackage ../tools/build-managers/rebar3 {
+          hermeticRebar3 = true;
+        };
+
+        hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { };
+        fetchHex = callPackage ./fetch-hex.nix { };
+
+        buildRebar3 = callPackage ./build-rebar3.nix {};
+        buildHex = callPackage ./build-hex.nix {};
+        buildErlangMk = callPackage ./build-erlang-mk.nix {};
+        buildMix = callPackage ./build-mix.nix {};
+
+        ## Non hex packages
+        hex = callPackage ./hex {};
+        webdriver = callPackage ./webdriver {};
+
+        hex2nix = callPackage ../tools/erlang/hex2nix { };
+        cuter = callPackage ../tools/erlang/cuter { };
+        relxExe = callPackage ../tools/erlang/relx-exe {};
+      };
+in fix' (extends overrides packages)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2fc65da558..ac90f7b3b95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5986,7 +5986,7 @@ with pkgs;
     erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac
     erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac;
 
-  inherit (beam.packages)
+  inherit (beam.packages.erlang)
     rebar rebar3-open rebar3
     hexRegistrySnapshot fetchHex beamPackages
     hex2nix cuter relxExe;
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 3451816c0c5..ccf22d6c534 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -3,10 +3,11 @@
 rec {
   lib = import ../development/beam-modules/lib.nix { inherit pkgs; };
 
+  # Each
   interpreters = rec {
 
-    # R18 is the Default version.
-    erlang = erlangR18;
+    # R18 is the default version.
+    erlang = erlangR18; # The main switch to change default Erlang version.
     erlang_odbc = erlangR18_odbc;
     erlang_javac = erlangR18_javac;
     erlang_odbc_javac = erlangR18_odbc_javac;
@@ -44,22 +45,24 @@ rec {
       odbcSupport = true;
     };
 
-    # Other Beam languages.
+    # Other Beam languages. These are built with beam.interpreters.erlang.
     elixir = callPackage ../development/interpreters/elixir { debugInfo = true; };
     lfe = callPackage ../development/interpreters/lfe { };
   };
 
+  # Helper function to generate package set with a specific Erlang version.
+  packagesWith = erlang: callPackage ../development/beam-modules { inherit erlang; };
+
+  # Each field in this tuple represents all Beam packages in nixpkgs built with
+  # appropriate Erlang/OTP version.
   packages = rec {
-    rebar = callPackage ../development/tools/build-managers/rebar { };
-    rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; };
-    rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; };
-    hexRegistrySnapshot = callPackage ../development/beam-modules/hex-registry-snapshot.nix { };
-    fetchHex = callPackage ../development/beam-modules/fetch-hex.nix { };
 
-    beamPackages = callPackage ../development/beam-modules { };
-    hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { };
-    cuter = callPackage ../development/tools/erlang/cuter { };
+    # Packages built with default Erlang version.
+    erlang = packagesWith interpreters.erlang;
+    erlangR16 = packagesWith interpreters.erlangR16;
+    erlangR17 = packagesWith interpreters.erlangR17;
+    erlangR18 = packagesWith interpreters.erlangR18;
+    erlangR19 = packagesWith interpreters.erlangR19;
 
-    relxExe = callPackage ../development/tools/erlang/relx-exe {};
   };
 }
-- 
GitLab


From f66b0186dc9764b83ad76f9dcaec341b0f6f83a0 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sun, 18 Jun 2017 16:17:40 +0200
Subject: [PATCH 0948/1490] erlang: fix rebar3-nix-bootstrap in Erlang < R18.

---
 .../build-managers/rebar3/rebar3-nix-bootstrap | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
index 81257dd8c0c..b839a4a3b09 100755
--- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
+++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
@@ -180,14 +180,14 @@ make_sure_registry_snapshot_exists(RegistrySnapshot) ->
             erlang:halt(1)
     end.
 
--spec gather_required_data_from_the_environment(#data{}) -> {ok, map()}.
+-spec gather_required_data_from_the_environment(#data{}) -> {ok, #data{}}.
 gather_required_data_from_the_environment(ArgData) ->
     {ok, ArgData#data{ version = guard_env("version")
-                     , erl_libs = os:getenv("ERL_LIBS", [])
-                     , plugins = os:getenv("buildPlugins", [])
+                     , erl_libs = get_env("ERL_LIBS", [])
+                     , plugins = get_env("buildPlugins", [])
                      , root = code:root_dir()
                      , name = guard_env("name")
-                     , compile_ports = nix2bool(os:getenv("compilePorts", ""))
+                     , compile_ports = nix2bool(get_env("compilePorts", ""))
                      , registry_snapshot = guard_env("HEX_REGISTRY_SNAPSHOT")}}.
 
 -spec nix2bool(any()) -> boolean().
@@ -196,9 +196,17 @@ nix2bool("1") ->
 nix2bool("") ->
     false.
 
+get_env(Name) ->
+    os:getenv(Name).
+get_env(Name, Def) ->
+    case get_env(Name) of
+        false -> Def;
+        Val ->   Val
+    end.
+
 -spec guard_env(string()) -> string().
 guard_env(Name) ->
-    case os:getenv(Name) of
+    case get_env(Name) of
         false ->
             stderr("Expected Environment variable ~s! Are you sure you are "
                    "running in a Nix environment? Either a nix-build, "
-- 
GitLab


From 10c2f39df0d94204bb9fe1197e2d7bce95a48657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 19 Jun 2017 18:53:16 +0100
Subject: [PATCH 0949/1490] vimPlugins.vimwiki: readd

was remove accidentally removed in 425bc07d43
---
 pkgs/misc/vim-plugins/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c871e422638..dbba9597ce7 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2382,6 +2382,16 @@ rec {
 
   };
 
+  vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimwiki-2017-04-15";
+    src = fetchgit {
+      url = "git://github.com/vimwiki/vimwiki";
+      rev = "8cdc1c15388cc7f4edb827ff15dbc31d592a79af";
+      sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h";
+    };
+    dependencies = [];
+  };
+
   vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vinegar-2017-05-23";
     src = fetchgit {
-- 
GitLab


From 7797e1a1dda661476dbb312b1f26896d32831ef5 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sun, 18 Jun 2017 19:24:18 +0200
Subject: [PATCH 0950/1490] erlang: put Elixir/LFE into per-OTP packageset.

This makes beam.package.erlangR19.abnf to be actually built with R19,
instead of the default R18. It means that Elixir and LFE are provided in
two versions, one built with R18 and with R19.

Please note that Elixir does not build with R16 and R17 - trying to
access beam.packages.erlang{R16,R17}.elixir will throw an error.
---
 pkgs/development/beam-modules/default.nix | 16 ++++++++++++----
 pkgs/development/beam-modules/lib.nix     | 11 ++++++++++-
 pkgs/top-level/beam-packages.nix          | 10 ++++++----
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 00443350a7d..0db695befe6 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,7 +1,9 @@
 { stdenv, pkgs, erlang, overrides ? (self: super: {}) }:
 
 let
-  inherit (stdenv.lib) fix' extends;
+  inherit (stdenv.lib) fix' extends getVersion versionAtLeast;
+
+  lib = pkgs.callPackage ./lib.nix {};
 
   # FIXME: add support for overrideScope
   callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args;
@@ -34,12 +36,18 @@ let
         buildErlangMk = callPackage ./build-erlang-mk.nix {};
         buildMix = callPackage ./build-mix.nix {};
 
-        ## Non hex packages
+        # BEAM-based languages.
+        elixir = if versionAtLeast (lib.getVersion erlang) "18"
+                 then callPackage ../interpreters/elixir { debugInfo = true; }
+                 else throw "Elixir requires at least Erlang/OTP R18.";
+        lfe = callPackage ../interpreters/lfe { };
+
+        # Non hex packages
         hex = callPackage ./hex {};
         webdriver = callPackage ./webdriver {};
 
-        hex2nix = callPackage ../tools/erlang/hex2nix { };
-        cuter = callPackage ../tools/erlang/cuter { };
+        hex2nix = callPackage ../tools/erlang/hex2nix {};
+        cuter = callPackage ../tools/erlang/cuter {};
         relxExe = callPackage ../tools/erlang/relx-exe {};
       };
 in fix' (extends overrides packages)
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index ae2705613f0..009bfb4975b 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, stdenv }:
 
 rec {
 
@@ -12,6 +12,15 @@ rec {
 
   callPackage = callPackageWith pkgs;
 
+  /* Erlang/OTP-specific version retrieval, returns 19 for OTP R19 */
+  getVersion = x:
+   let
+     parse = drv: (builtins.parseDrvName drv).version;
+   in builtins.replaceStrings ["B" "-"] ["." "."] (
+      if builtins.isString x
+      then parse x
+      else x.version or (parse x.name));
+
   /* Uses generic-builder to evaluate provided drv containing OTP-version
   specific data.
 
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index ccf22d6c534..9e0234ac1e2 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -1,7 +1,7 @@
 { pkgs, stdenv, callPackage, wxGTK30, darwin }:
 
 rec {
-  lib = import ../development/beam-modules/lib.nix { inherit pkgs; };
+  lib = callPackage ../development/beam-modules/lib.nix {};
 
   # Each
   interpreters = rec {
@@ -45,9 +45,11 @@ rec {
       odbcSupport = true;
     };
 
-    # Other Beam languages. These are built with beam.interpreters.erlang.
-    elixir = callPackage ../development/interpreters/elixir { debugInfo = true; };
-    lfe = callPackage ../development/interpreters/lfe { };
+    # Other Beam languages. These are built with `beam.interpreters.erlang`. To
+    # access for example elixir built with different version of Erlang, use
+    # `beam.packages.erlangR19.elixir`.
+    elixir = packages.erlang.elixir;
+    lfe = packages.erlang.lfe;
   };
 
   # Helper function to generate package set with a specific Erlang version.
-- 
GitLab


From 0fccd5bba40ce903ff25bb8f2ca09e86f3bef19d Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sun, 18 Jun 2017 23:05:18 +0200
Subject: [PATCH 0951/1490] erlang: update documentation.

The documentation got a bit stale compared to actual contents of
nixpkgs. This commit focuses on updating existing docs, not on making
sure all details of beam packages are covered.
---
 doc/languages-frameworks/beam.xml             | 140 ++++++++++++++----
 pkgs/development/beam-modules/mix-bootstrap   |  20 ++-
 .../rebar3/rebar3-nix-bootstrap               |   2 +-
 3 files changed, 120 insertions(+), 42 deletions(-)

diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index efb2e60cf3a..28dec9f77de 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -2,36 +2,85 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-beam">
 
-  <title>Beam Languages (Erlang &amp; Elixir)</title>
+  <title>Beam Languages (Erlang, Elixir &amp; LFE)</title>
   <section xml:id="beam-introduction">
     <title>Introduction</title>
     <para>
       In this document and related Nix expressions we use the term
-      <emphasis>Beam</emphasis> to describe the environment. Beam is
+      <emphasis>Beam</emphasis> to describe the environment. BEAM is
       the name of the Erlang Virtial Machine and, as far as we know,
-      from a packaging perspective all languages that run on Beam are
+      from a packaging perspective all languages that run on BEAM are
       interchangable. The things that do change, like the build
       system, are transperant to the users of the package. So we make
       no distinction.
     </para>
   </section>
-<section xml:id="build-tools">
+  <section xml:id="beam-structure">
+    <title>Structure</title>
+    <para>
+      All Beam-related things are available via top-level
+      <literal>beam</literal> attribute, which includes:
+    </para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <literal>interpreters</literal>: contains a set of compilers running
+          on Beam, including multiple Erlang/OTP versions
+          (<literal>beam.interpreters.erlangR19</literal>, etc), Elixir
+          (<literal>beam.interpreters.elixir</literal>) and LFE
+          (<literal>beam.interpreters.lfe</literal>).
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <literal>packages</literal>: contains a set of package sets, each
+          compiled with a specific Erlang/OTP version, e.g.
+          <literal>beam.packages.erlangR19</literal>.
+        </para>
+      </listitem>
+    </itemizedlist>
+    <para>
+      Default Erlang compiler is defined by
+      <literal>beam.interpreters.erlang</literal> and aliased as
+      <literal>erlang</literal>. Default package set with Beam packages is
+      defined by <literal>beam.packages.erlang</literal> and aliased at
+      top-level as <literal>beamPackages</literal>.
+    </para>
+    <para>
+      If you want to create a package set built with a custom Erlang version,
+      use lambda <literal>beam.packagesWith</literal>, which accepts an
+      Erlang/OTP derivative and produces a package set similar to
+      <literal>beam.packages.erlang</literal>.
+    </para>
+    <para>
+      Many Erlang/OTP distributions available in
+      <literal>beam.interpreters</literal> have their versions with ODBC and/or
+      Java enabled. For example there's
+      <literal>beam.interpreters.erlangR19_odbc_javac</literal> which
+      corresponds to <literal>beam.interpreters.erlangR19</literal>.
+    </para>
+    <para>
+      We also provide <literal>beam.packages.erlang.callPackage</literal>, which
+      simplifies writing Beam package definitions, by injecting all packages from
+      <literal>beam.packages.erlang</literal> into top-level context.
+    </para>
+  </section>
+  <section xml:id="build-tools">
   <title>Build Tools</title>
   <section xml:id="build-tools-rebar3">
     <title>Rebar3</title>
     <para>
-      By default Rebar3 wants to manage it's own dependencies. In the
-      normal non-Nix, this is perfectly acceptable. In the Nix world it
-      is not. To support this we have created two versions of rebar3,
+      By default Rebar3 wants to manage it's own dependencies. This is perfectly
+      acceptable in the normal non-Nix setup. In the Nix world it is not. To
+      support this we have created two versions of rebar3,
       <literal>rebar3</literal> and <literal>rebar3-open</literal>. The
-      <literal>rebar3</literal> version has been patched to remove the
-      ability to download anything from it. If you are not running it a
-      nix-shell or a nix-build then its probably not going to work for
-      you. <literal>rebar3-open</literal> is the normal, un-modified
-      rebar3. It should work exactly as would any other version of
-      rebar3. Any Erlang package should rely on
-      <literal>rebar3</literal> and thats really what you should be
-      using too.
+      <literal>rebar3</literal> version has been patched to remove the ability
+      to download anything from it. If you are not running it a nix-shell or a
+      nix-build then its probably not going to work for you.
+      <literal>rebar3-open</literal> is the normal, un-modified rebar3. It
+      should work exactly as would any other version of rebar3. Any Erlang
+      package should rely on <literal>rebar3</literal> and thats really what you
+      should be using too. See <literal>buildRebar3</literal> below.
     </para>
   </section>
   <section xml:id="build-tools-other">
@@ -43,16 +92,17 @@
       <literal>buildMix</literal> and <literal>buildErlangMk</literal> derivations.
     </para>
   </section>
-
 </section>
 
 <section xml:id="how-to-install-beam-packages">
   <title>How to install Beam packages</title>
   <para>
-    Beam packages are not registered in the top level simply because
-    they are not relevant to the vast majority of Nix users. They are
-    installable using the <literal>beamPackages</literal> attribute
-    set.
+    Beam packages are not registered in the top level simply because they are
+    not relevant to the vast majority of Nix users. They are installable using
+    the <literal>beam.packages.erlang</literal> attribute set and aliased as
+    <literal>beamPackages</literal>. This attribute points at packages built by
+    the default Erlang/OTP version in Nixpkgs as defined by
+    <literal>beam.interpreters.erlang</literal>.
 
     You can list the avialable packages in the
     <literal>beamPackages</literal> with the following command:
@@ -87,10 +137,11 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
     <section xml:id="rebar3-packages">
       <title>Rebar3 Packages</title>
       <para>
-        There is a Nix functional called
-        <literal>buildRebar3</literal>. We use this function to make a
-        derivation that understands how to build the rebar3 project. For
-        example, the epression we use to build the <link
+        There is a Nix function called <literal>buildRebar3</literal> (defined
+        in <literal>beam.packages.erlang.buildRebar3</literal> and aliased at
+        top-level). We use this function to make a derivation that understands
+        how to build the rebar3 project. For example, the expression we use to
+        build the <link
         xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
         project follows.
       </para>
@@ -111,10 +162,18 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
           beamDeps = [ ibrowse jsx erlware_commons ];
         }
       </programlisting>
+      <para>
+        This derivation is callable with
+        <literal>beam.packages.erlang.callPackage</literal> (see above). If you
+        want to call this package using normal <literal>callPackage</literal>,
+        you should refer to dependency packages via
+        <literal>beamPackages</literal>, e.g.
+        <literal>beamPackages.ibrowse</literal>.
+      </para>
       <para>
         The only visible difference between this derivation and
         something like <literal>stdenv.mkDerivation</literal> is that we
-        have added <literal>erlangDeps</literal> to the derivation. If
+        have added <literal>beamDeps</literal> to the derivation. If
         you add your Beam dependencies here they will be correctly
         handled by the system.
       </para>
@@ -171,6 +230,27 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
             sha256 =
               "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
           };
+          beamDeps  = [ plug absinthe ];
+
+          meta = {
+            description = ''A plug for Absinthe, an experimental GraphQL
+                            toolkit'';
+            license = stdenv.lib.licenses.bsd3;
+            homepage = "https://github.com/CargoSense/absinthe_plug";
+         };
+       }
+      </programlisting>
+      <para>
+        Alternatively one can use <literal>buildHex</literal> as a shortcut for the above:
+      </para>
+      <programlisting>
+        { buildHex, buildMix, plug, absinthe }:
+        buildHex {
+          name = "absinthe_plug";
+          version = "1.0.0";
+          sha256 =
+              "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
+          builder = buildMix;
           beamDeps  = [ plug absinthe];
 
           meta = {
@@ -264,7 +344,7 @@ let
         name = "hex2nix";
         version = "0.1.0";
         src = ./.;
-        erlangDeps = [ ibrowse jsx erlware_commons ];
+        beamDeps = [ ibrowse jsx erlware_commons ];
       };
   drv = beamPackages.callPackage f {};
 
@@ -272,10 +352,10 @@ in
  drv
     </programlisting>
     <section xml:id="building-in-a-shell">
-    <title>Building in a shell</title>
+    <title>Building in a shell (for mix projects)</title>
     <para>
-      We can leveral the support of the Derivation, regardless of
-      which build Derivation is called by calling the commands themselv.s
+      We can leverage the support of the Derivation, regardless of
+      which build Derivation is called by calling the commands themselves.
     </para>
     <programlisting>
 # =============================================================================
@@ -351,7 +431,7 @@ analyze: build plt
     <literal>hex2nix</literal> tool. Given the path to the Erlang
     modules (usually
     <literal>pkgs/development/erlang-modules</literal>). It will
-    happily dump a file called
+    dump a file called
     <literal>hex-packages.nix</literal>. That file will contain all
     the packages that use a recognized build system in Hex. However,
     it can't know whether or not all those packages are buildable.
diff --git a/pkgs/development/beam-modules/mix-bootstrap b/pkgs/development/beam-modules/mix-bootstrap
index c4a1b364daa..6c9a20c6de2 100755
--- a/pkgs/development/beam-modules/mix-bootstrap
+++ b/pkgs/development/beam-modules/mix-bootstrap
@@ -3,18 +3,16 @@
 %%! -smp enable
 %%% ---------------------------------------------------------------------------
 %%% @doc
-%%% The purpose of this command is to prepare a rebar3 project so that
-%%% rebar3 understands that the dependencies are all already
-%%% installed. If you want a hygienic build on nix then you must run
-%%% this command before running rebar3. I suggest that you add a
-%%% `Makefile` to your project and have the bootstrap command be a
-%%% dependency of the build commands. See the nix documentation for
+%%% The purpose of this command is to prepare a mix project so that mix
+%%% understands that the dependencies are all already installed. If you want a
+%%% hygienic build on nix then you must run this command before running mix. I
+%%% suggest that you add a `Makefile` to your project and have the bootstrap
+%%% command be a dependency of the build commands. See the nix documentation for
 %%% more information.
 %%%
-%%% This command designed to have as few dependencies as possible so
-%%% that it can be a dependency of root level packages like rebar3. To
-%%% that end it does many things in a fairly simplistic way. That is
-%%% by design.
+%%% This command designed to have as few dependencies as possible so that it can
+%%% be a dependency of root level packages like mix. To that end it does many
+%%% things in a fairly simplistic way. That is by design.
 %%%
 %%% ### Assumptions
 %%%
@@ -37,7 +35,7 @@ main(Args) ->
 
 %% @doc
 %% This takes an app name in the standard OTP <name>-<version> format
-%% and returns just the app name. Why? because rebar is doesn't
+%% and returns just the app name. Why? Because rebar doesn't
 %% respect OTP conventions in some cases.
 -spec fixup_app_name(file:name()) -> string().
 fixup_app_name(Path) ->
diff --git a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
index b839a4a3b09..aa7e6c5f912 100755
--- a/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
+++ b/pkgs/development/tools/build-managers/rebar3/rebar3-nix-bootstrap
@@ -146,7 +146,7 @@ make_symlink(Path, TargetFile) ->
 
 %% @doc
 %% This takes an app name in the standard OTP <name>-<version> format
-%% and returns just the app name. Why? because rebar doesn't
+%% and returns just the app name. Why? Because rebar doesn't
 %% respect OTP conventions in some cases.
 -spec fixup_app_name(string()) -> string().
 fixup_app_name(FileName) ->
-- 
GitLab


From cb6a99d878c34b9e805fd74a7f9d6459d048403b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Jun 2017 16:24:25 +0200
Subject: [PATCH 0952/1490] haskell-test-framework-quickcheck2: force update to
 latest version

We need 0.3.0.4 to build successfully. LTS 8.x will catch up, eventually, but
until then we force the update.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 493181ea16c..acee7acef24 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2067,7 +2067,7 @@ default-package-overrides:
   - test-fixture ==0.5.0.1
   - test-framework ==0.8.1.1
   - test-framework-hunit ==0.3.0.2
-  - test-framework-quickcheck2 ==0.3.0.3
+  - test-framework-quickcheck2 < 0.4
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
   - test-invariant ==0.4.5.0
-- 
GitLab


From bb394afa2509fb730f00a8d9a888cf29f58e01a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Jun 2017 16:30:47 +0200
Subject: [PATCH 0953/1490] haskell-ghc-syb-utils: force update to latest
 version

We need 0.2.3.2 to build successfully. LTS 8.x will catch up, eventually, but
until then we force the update.

Closes https://github.com/NixOS/nixpkgs/issues/26689.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index acee7acef24..80b70b9fad3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -740,7 +740,7 @@ default-package-overrides:
   - ghc-mod ==5.7.0.0
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.3.0.2
-  - ghc-syb-utils ==0.2.3.1
+  - ghc-syb-utils < 0.3
   - ghc-tcplugins-extra ==0.2
   - ghc-typelits-extra ==0.2.3
   - ghc-typelits-knownnat ==0.2.4
-- 
GitLab


From 534a8efe170215aeb840c7e840d184de5d1b5e28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Jun 2017 15:12:26 +0200
Subject: [PATCH 0954/1490] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/da66240a000524241e8b6bc53fb83e2740ac01ea.
---
 .../haskell-modules/hackage-packages.nix      | 1429 ++++++++++++++---
 1 file changed, 1195 insertions(+), 234 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a384a682757..3ad53530c40 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2978,21 +2978,18 @@ self: {
      }) {};
 
   "ConcurrentUtils" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , crypto-random, cryptohash, list-extras, MonadRandom, monads-tf
-     , network, parallel, process, reexport-crypto-random, RSA
-     , securemem, tagged
+    ({ mkDerivation, array, arrows, base, containers, hashable
+     , hashtables, list-extras, monad-loops, MonadRandom, monads-tf
+     , parallel, stm, strict, tagged, ttrie
      }:
      mkDerivation {
        pname = "ConcurrentUtils";
-       version = "0.4.4.0";
-       sha256 = "1zvh3y5mph98l696sgabwqia4cq176dfkhswl28cz6h6blrjv5dz";
+       version = "0.4.5.0";
+       sha256 = "1kf5g4d8q28hs4wfd0fvc7k1bfir40z7rzx3lxflci36inr1d6dc";
        libraryHaskellDepends = [
-         array base binary bytestring containers crypto-random cryptohash
-         list-extras MonadRandom monads-tf network parallel process
-         reexport-crypto-random RSA securemem tagged
+         array arrows base containers hashable hashtables list-extras
+         monad-loops MonadRandom monads-tf parallel stm strict tagged ttrie
        ];
-       homepage = "http://alkalisoftware.net";
        description = "Concurrent utilities";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10521,6 +10518,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_2_8_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.2.8.2";
+       sha256 = "1s3qakm7jn2kjx59nlp81hkysz6bxidj3khd8xlny7x8gvjqjk5p";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       homepage = "https://github.com/Twinside/Juicy.Pixels";
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-canvas" = callPackage
     ({ mkDerivation, base, containers, JuicyPixels }:
      mkDerivation {
@@ -13331,6 +13346,8 @@ self: {
        pname = "Only";
        version = "0.1";
        sha256 = "0rdj3a629fk2vp121jq8mf2smkblrz5w3cxhlsyx6my2x29s2ymb";
+       revision = "1";
+       editedCabalFile = "1ahk7p34kmh041mz7lyc10nhcxgv2i4z8nvzxvqm2x34gslmsbzr";
        libraryHaskellDepends = [ base deepseq ];
        description = "The 1-tuple type or single-value \"collection\"";
        license = stdenv.lib.licenses.bsd3;
@@ -15682,6 +15699,8 @@ self: {
        pname = "STMonadTrans";
        version = "0.4.3";
        sha256 = "1nr26fnmi5fdjc6d00w13kjhmfyvb5b837d0006w4dj0yxndaksp";
+       revision = "1";
+       editedCabalFile = "09kqrv9a4yhsdpix49h9qjw0j2fhxrgkjnfrnyxg1nspmqrvl50m";
        libraryHaskellDepends = [ array base mtl ];
        testHaskellDepends = [ array base Cabal mtl ];
        description = "A monad transformer version of the ST monad";
@@ -16529,6 +16548,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spintax_0_3_2" = callPackage
+    ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
+     mkDerivation {
+       pname = "Spintax";
+       version = "0.3.2";
+       sha256 = "0j7hkdskc66h02yxrw6aah1drqrwxdhq9c33w5mg0rg0gj0j1rpp";
+       libraryHaskellDepends = [
+         attoparsec base extra mtl mwc-random text
+       ];
+       homepage = "https://github.com/MichelBoucey/spintax";
+       description = "Random text generation based on spintax";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Spock" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, containers
      , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
@@ -36336,6 +36370,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "burnt-explorer" = callPackage
+    ({ mkDerivation, aeson, base, bitcoin-script, bytestring, process
+     , scientific
+     }:
+     mkDerivation {
+       pname = "burnt-explorer";
+       version = "0.1.1";
+       sha256 = "1swv8xy06bk3wkhg788mzlpgwghyp7v3g3c22c09jji9kxwsgslv";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bitcoin-script bytestring process scientific
+       ];
+       homepage = "https://gitlab.com/KrzysiekJ/burnt-explorer";
+       description = "List OP_RETURN cryptocurrency transaction outputs";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "burst-detection" = callPackage
     ({ mkDerivation, base, criterion, deepseq }:
      mkDerivation {
@@ -39745,6 +39797,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cassava_0_5_0_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring
+     , bytestring-builder, containers, deepseq, hashable, HUnit, Only
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cassava";
+       version = "0.5.0.0";
+       sha256 = "1fdydyl2qn8qgjcrdij3gff13zwzp2fqmr3a8g0j35qfhq4lnzl4";
+       libraryHaskellDepends = [
+         array attoparsec base bytestring bytestring-builder containers
+         deepseq hashable Only text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring hashable HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/hvr/cassava";
+       description = "A CSV parsing and encoding library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cassava-conduit" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, conduit-extra, containers, criterion, mtl, QuickCheck
@@ -42423,6 +42500,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clay_0_12_2" = callPackage
+    ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
+     mkDerivation {
+       pname = "clay";
+       version = "0.12.2";
+       sha256 = "12p9hrky0dynsraz46ddhr4ah5aw9kragvcd5xza7j388ni9b2za";
+       libraryHaskellDepends = [ base mtl text ];
+       testHaskellDepends = [ base hspec hspec-expectations mtl text ];
+       homepage = "http://fvisser.nl/clay";
+       description = "CSS preprocessor as embedded Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clckwrks" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
      , blaze-html, bytestring, cereal, containers, directory, filepath
@@ -43751,20 +43842,21 @@ self: {
 
   "codecov-haskell" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cmdargs
-     , containers, curl, hpc, HUnit, process, regex-posix, safe, split
+     , containers, curl, hpc, HUnit, process, regex-posix, retry, safe
+     , split
      }:
      mkDerivation {
        pname = "codecov-haskell";
-       version = "0.4.0.2";
-       sha256 = "0y1vv9iayjvikjfp4y41m4gypybxd1lq3pv4154nvbjpfapmndsw";
+       version = "0.5.0";
+       sha256 = "0g9m1z4qpjgyav8wa10cxdprsgf0b5ij430ql7jyw4sj20warhfg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring cmdargs containers curl hpc safe split
+         aeson base bytestring cmdargs containers curl hpc retry safe split
        ];
        executableHaskellDepends = [
          aeson async base bytestring cmdargs containers curl hpc process
-         regex-posix safe split
+         regex-posix retry safe split
        ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/codecov-haskell";
@@ -47718,8 +47810,8 @@ self: {
      }:
      mkDerivation {
        pname = "core-compiler";
-       version = "0.1.0.0";
-       sha256 = "0bh7z1mbg299xk07ms6d6n3n3q8yz7i4if2r1x0zhp12cf139zh6";
+       version = "0.1.0.1";
+       sha256 = "0qyrqarqf35z9kp2znaq3qvfpkjlvyahkvarr1jhl2z12alfvzns";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55240,23 +55332,23 @@ self: {
      }) {};
 
   "dhall" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, charset
-     , containers, http-client, http-client-tls, lens
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive
+     , charset, containers, http-client, http-client-tls, lens
      , neat-interpolation, optparse-generic, parsers, system-fileio
      , system-filepath, tasty, tasty-hunit, text, text-format
      , transformers, trifecta, unordered-containers, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.3.0";
-       sha256 = "1d34qx1nq49r0phdq10cvzdx9d82169xi03yq829pqnyxwc03ws4";
+       version = "1.4.2";
+       sha256 = "0wnfqm0478h9fqav13q6fqnj8fzbhigsndnasr0hbcjd3s3qvf0d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring charset containers http-client
-         http-client-tls lens neat-interpolation parsers system-fileio
-         system-filepath text text-format transformers trifecta
-         unordered-containers vector
+         ansi-wl-pprint base bytestring case-insensitive charset containers
+         http-client http-client-tls lens neat-interpolation parsers
+         system-fileio system-filepath text text-format transformers
+         trifecta unordered-containers vector
        ];
        executableHaskellDepends = [ base optparse-generic text trifecta ];
        testHaskellDepends = [
@@ -55273,8 +55365,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.1";
-       sha256 = "1944g78k66hpqgmr5pw6w6jigcyjmfhczgz07l157vv98v5fwqab";
+       version = "1.0.2";
+       sha256 = "19nzf0wh7z3xjpkn48dmi66hqayjscwi3r2w0nkxpkwrcfagrkw2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55313,8 +55405,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.2";
-       sha256 = "1si2ishkam9l8brz02wvczxd10532m7nqflnlb7hwkc84javyvm1";
+       version = "1.0.3";
+       sha256 = "1q3b3vcvkpz5b79xcdh66p0vqqvjlnd52pvdanlf7vp819n2zsdy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55333,8 +55425,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.0.3";
-       sha256 = "14h0sszkkzxhzvi6r6jva2rinayd20b1cb8ybjbbpph7b103ph90";
+       version = "1.0.4";
+       sha256 = "19sv7n3fn7vkrclmcbjn141ypxi4ja78ahlndnmci6vbv40hm2vf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55347,6 +55439,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-text" = callPackage
+    ({ mkDerivation, base, dhall, optparse-generic, text }:
+     mkDerivation {
+       pname = "dhall-text";
+       version = "1.0.0";
+       sha256 = "1xbgzvmxd9y1f58nh9a495rqn3s7yfq93l61by5g9sd81vvbcgqd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base dhall optparse-generic text ];
+       description = "Template text using Dhall";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dhcp-lease-parser" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty
      , tasty-hunit, text
@@ -56942,31 +57047,75 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "discord-gateway" = callPackage
+    ({ mkDerivation, aeson, base, discord-types, hslogger, transformers
+     , url, websockets, wuss
+     }:
+     mkDerivation {
+       pname = "discord-gateway";
+       version = "0.2.2";
+       sha256 = "1pc8j2pqrpmgvf31kx24gwj6n96npxdjj6mjf2w9wzh500rdrrzy";
+       libraryHaskellDepends = [
+         aeson base discord-types hslogger transformers url websockets wuss
+       ];
+       homepage = "https://github.com/jano017/Discord.hs";
+       description = "An API wrapper for Discord in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "discord-hs" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive, comonad
-     , containers, data-default, hakyll, hashable, hslogger, http-client
-     , mmorph, mtl, pipes, req, split, stm, stm-conduit, text, time
-     , transformers, unordered-containers, url, vector, websockets, wuss
+    ({ mkDerivation, base, discord-gateway, discord-rest, discord-types
+     , hashable, mtl, url, websockets
      }:
      mkDerivation {
        pname = "discord-hs";
-       version = "0.3.2";
-       sha256 = "1y2nir530gaal4nxxax86z33bb7d2rlavdx47dff5s5lqn06kc1f";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.2";
+       sha256 = "0lv299wn7jisgavmcpm2h7vf9dalz5dmi6j8qvlbbiyqg1c0jn2a";
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive comonad containers
-         data-default hashable hslogger http-client mmorph mtl pipes req stm
-         stm-conduit text time transformers unordered-containers url vector
-         websockets wuss
+         base discord-gateway discord-rest discord-types hashable mtl url
+         websockets
        ];
-       executableHaskellDepends = [ base hakyll split ];
        homepage = "https://github.com/jano017/Discord.hs";
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "discord-rest" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, comonad, data-default
+     , discord-types, hashable, hslogger, http-client, mtl, req, stm
+     , text, time, url
+     }:
+     mkDerivation {
+       pname = "discord-rest";
+       version = "0.2.2";
+       sha256 = "02sg05zf2m83d6hq5z51cjvw7ycarrmwx9y00c71wiw3hvb84fb3";
+       libraryHaskellDepends = [
+         aeson base bytestring comonad data-default discord-types hashable
+         hslogger http-client mtl req stm text time url
+       ];
+       homepage = "https://github.com/jano017/Discord.hs";
+       description = "An API wrapper for Discord in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "discord-types" = callPackage
+    ({ mkDerivation, aeson, base, hashable, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "discord-types";
+       version = "0.2.2";
+       sha256 = "12smb4z6mrj9hhk7jc9r2cz6p4lcix2016ahwp9qapklrql539sc";
+       libraryHaskellDepends = [
+         aeson base hashable text time transformers unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/jano017/Discord.hs";
+       description = "Type information for discord-hs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "discordian-calendar" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -63019,14 +63168,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "errors_2_2_0" = callPackage
+  "errors_2_2_1" = callPackage
     ({ mkDerivation, base, exceptions, safe, text, transformers
      , transformers-compat, unexceptionalio
      }:
      mkDerivation {
        pname = "errors";
-       version = "2.2.0";
-       sha256 = "0z31r5pq8xbfkdwibf0r51fdw4jz11jxrql3hi6xrmsh37lwk8gx";
+       version = "2.2.1";
+       sha256 = "0cgmalid229snvn788sk2w16bqgfzgwc4ir2p60jvwqbj63yp5s1";
        libraryHaskellDepends = [
          base exceptions safe text transformers transformers-compat
          unexceptionalio
@@ -65044,19 +65193,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "extra_1_5_3" = callPackage
+  "extra_1_6" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.5.3";
-       sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4";
+       version = "1.6";
+       sha256 = "1pqlggdbbhfj71yaby5595shf4hpzv9700sczksgy36qz9bfcrh7";
        libraryHaskellDepends = [
          base clock directory filepath process time unix
        ];
        testHaskellDepends = [
-         base clock directory filepath QuickCheck time unix
+         base clock directory filepath QuickCheck unix
        ];
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
@@ -68393,8 +68542,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.2.6";
-       sha256 = "1krjwrwhfjyp80anb8y79a5rgfcs3qdlw6mgwdid5hfpddjbc1nd";
+       version = "0.5.2.7";
+       sha256 = "03x9322rqafviaxfwkiq2g1jlsqh6hw6q4x9ywa6pi7s45d2rm78";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -69506,14 +69655,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "foundation_0_0_11" = callPackage
+  "foundation_0_0_12" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.11";
-       sha256 = "0jgxcr532vb7376h43l88g0rjgbil2caqnknmznfsprawy6a9s1v";
+       version = "0.0.12";
+       sha256 = "1dlrknx0rhi1vjiw8pb25n5ml5rfahhhvwj64svdg51zm3m3aiyr";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -70625,6 +70774,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fswait" = callPackage
+    ({ mkDerivation, base, hinotify, optparse-applicative
+     , optparse-generic, semigroups, stm, system-filepath, text
+     , time-units, turtle
+     }:
+     mkDerivation {
+       pname = "fswait";
+       version = "1.0.0";
+       sha256 = "0w29f6qwks54zxi8x9wd9s4k5ryb6fz9flip9clm4l53vkx1s3b0";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base hinotify optparse-applicative optparse-generic semigroups stm
+         system-filepath text time-units turtle
+       ];
+       homepage = "https://github.com/ixmatus/fswait";
+       description = "Wait and observe events on the filesystem for a path, with a timeout";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fswatcher" = callPackage
     ({ mkDerivation, base, directory, fsnotify, optparse-applicative
      , process, regex-pcre-builtin, system-filepath, unix
@@ -73843,19 +74012,6 @@ self: {
      }) {};
 
   "ghc-syb-utils" = callPackage
-    ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }:
-     mkDerivation {
-       pname = "ghc-syb-utils";
-       version = "0.2.3.1";
-       sha256 = "13gazr6ydlxrj5yfg9pqhrgm7az9a36m7cfxmmvv1hkq2plfgw7y";
-       libraryHaskellDepends = [ base ghc syb ];
-       testHaskellDepends = [ base directory filepath ghc ghc-paths ];
-       homepage = "http://github.com/nominolo/ghc-syb";
-       description = "Scrap Your Boilerplate utilities for the GHC API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-syb-utils_0_2_3_2" = callPackage
     ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }:
      mkDerivation {
        pname = "ghc-syb-utils";
@@ -73866,7 +74022,6 @@ self: {
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
@@ -74929,8 +75084,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-ostree";
-       version = "1.0.2";
-       sha256 = "0x9scavp8pbmky70j8c9l8khp2r33517fq1w38cp4la18ba5dqv8";
+       version = "1.0.3";
+       sha256 = "0b9x7w6v8w62wbvwc2p3fk5q2mar7db9ch1a0idf8s667jhmzdfj";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -85091,6 +85246,50 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) utillinux;};
 
+  "hakyll_4_9_8_0" = callPackage
+    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
+     , containers, cryptohash, data-default, deepseq, directory
+     , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
+     , network, network-uri, optparse-applicative, pandoc
+     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
+     , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , time-locale-compat, unordered-containers, utillinux, vector, wai
+     , wai-app-static, warp, yaml
+     }:
+     mkDerivation {
+       pname = "hakyll";
+       version = "4.9.8.0";
+       sha256 = "0jjy1j79vzkdpi2ksql5bzwv2bw3bk6h0jgi73ngj8lkrm6q80b3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types lrucache mtl network network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process random
+         regex-base regex-tdfa resourcet scientific system-filepath tagsoup
+         text time time-locale-compat unordered-containers vector wai
+         wai-app-static warp yaml
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types lrucache mtl network network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process
+         QuickCheck random regex-base regex-tdfa resourcet scientific
+         system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
+         time time-locale-compat unordered-containers vector wai
+         wai-app-static warp yaml
+       ];
+       testToolDepends = [ utillinux ];
+       homepage = "http://jaspervdj.be/hakyll";
+       description = "A static website compiler library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) utillinux;};
+
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
      }:
@@ -93824,20 +94023,22 @@ self: {
      }) {};
 
   "hfmt" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, Cabal, Diff, directory
-     , filepath, haskell-src-exts, hindent, hlint, HUnit
-     , optparse-applicative, pipes, pretty, stylish-haskell
-     , test-framework, test-framework-hunit, text
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal, Diff
+     , directory, exceptions, filepath, haskell-src-exts, hindent, hlint
+     , HUnit, optparse-applicative, path, path-io, pipes, pretty
+     , stylish-haskell, test-framework, test-framework-hunit, text
+     , transformers, yaml
      }:
      mkDerivation {
        pname = "hfmt";
-       version = "0.0.2.3";
-       sha256 = "165s5azjq08f50s247xbx891iyq4s2mxygxknc5cxkkfj8gxgki2";
+       version = "0.1.0";
+       sha256 = "13dcywy7i9r8silc6rpm6pqj3zs2cq2zqzpz015563rkbwmi42zy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal directory filepath haskell-src-exts hindent hlint HUnit
-         pipes stylish-haskell text
+         base bytestring Cabal directory exceptions filepath
+         haskell-src-exts hindent hlint HUnit path path-io pipes
+         stylish-haskell text transformers yaml
        ];
        executableHaskellDepends = [
          ansi-wl-pprint base Diff optparse-applicative pipes pretty
@@ -95994,8 +96195,8 @@ self: {
        pname = "hledger-ui";
        version = "1.2";
        sha256 = "02mhhhkk6zz3bjcv6x0yhp4f2ifhj3pdk1z4wf6qkwm7jqsamqk1";
-       revision = "1";
-       editedCabalFile = "0ryr7rwf4bc9biwdpn3mjm82jlsr91773a7wsr0xw765mvgxvzbf";
+       revision = "2";
+       editedCabalFile = "0w3w4llvb9fmdd555q4823dagw7ibqwas8cycra5pvw50ciia4xd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97942,6 +98143,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hopfli_0_2_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
+     mkDerivation {
+       pname = "hopfli";
+       version = "0.2.2.1";
+       sha256 = "061as7aa806xzcpch35isrkqbgqhwdy48fs049f491wwb47xqwad";
+       libraryHaskellDepends = [ base bytestring zlib ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
+       homepage = "https://github.com/ananthakumaran/hopfli";
+       description = "Bidings to Google's Zopfli compression library";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hoppy-docs" = callPackage
     ({ mkDerivation, base, haskell-src, hoppy-generator, hoppy-runtime
      }:
@@ -102020,6 +102235,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hspec-pg-transact" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, pg-transact
+     , postgresql-simple, resource-pool, text, tmp-postgres
+     }:
+     mkDerivation {
+       pname = "hspec-pg-transact";
+       version = "0.1.0.2";
+       sha256 = "030wy3ajlfd7pi6gwfn6xcsl2yi0gvznxl8m7kq001bkiabjmv55";
+       libraryHaskellDepends = [
+         base bytestring hspec pg-transact postgresql-simple resource-pool
+         text tmp-postgres
+       ];
+       homepage = "https://github.com/jfischoff/pg-transact-hspec#readme";
+       description = "Helpers for creating database tests with hspec and pg-transact";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hspec-server" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-contrib, hspec-core
      , hspec-expectations, HUnit, process, regex-posix, temporary
@@ -103836,6 +104068,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client-tls_0_3_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, connection
+     , containers, criterion, cryptonite, data-default-class, exceptions
+     , hspec, http-client, http-types, memory, network, network-uri
+     , text, tls, transformers
+     }:
+     mkDerivation {
+       pname = "http-client-tls";
+       version = "0.3.5.1";
+       sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive connection containers cryptonite
+         data-default-class exceptions http-client http-types memory network
+         network-uri text tls transformers
+       ];
+       testHaskellDepends = [ base hspec http-client http-types ];
+       benchmarkHaskellDepends = [ base criterion http-client ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "http-client backend using the connection package and tls library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-common" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , case-insensitive, directory, mtl, network, text, transformers
@@ -105040,17 +105296,19 @@ self: {
      }) {};
 
   "hurriyet" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, http-client
-     , http-client-tls, text
+    ({ mkDerivation, aeson, base, bytestring, containers, here, hspec
+     , http-client, http-client-tls, mtl, text
      }:
      mkDerivation {
        pname = "hurriyet";
-       version = "0.1.0.0";
-       sha256 = "07hklxgf6308a81p0myykn6hn4p2rn1zyxypjld3q3l7pcdhsn7d";
+       version = "0.2.0.0";
+       sha256 = "1czdal0dxic0gw5qjp29jcbq8z0syffgrfmdqcg579y37ah1hgqg";
        libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls text
+         aeson base bytestring http-client http-client-tls mtl text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers here hspec text
        ];
-       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/yigitozkavci/hurriyet-haskell";
        description = "Haskell bindings for Hurriyet API";
        license = stdenv.lib.licenses.bsd3;
@@ -108541,6 +108799,27 @@ self: {
        license = "GPL";
      }) {};
 
+  "incremental-parser_0_2_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.2.5.1";
+       sha256 = "1kdrpwnj3sbil0mhmqspi2jbh1pibrzaybyijcknvvvm5ldrgafz";
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [
+         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
+       homepage = "https://github.com/blamario/incremental-parser";
+       description = "Generic parser library capable of providing partial results from partial input";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-sat-solver" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -108928,8 +109207,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.1.2.2";
-       sha256 = "038031446gpby3s805j1imffriwfq35jvkmd7z8gjnz5x5xciz9b";
+       version = "1.2.1";
+       sha256 = "0sgc29kiflgq0b3h1irnnim1ih6sk8h309yk1xd3z9hwyd9c121w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109964,15 +110243,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "intro_0_3_0_0" = callPackage
+  "intro_0_3_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytestring, containers
      , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck, safe
      , text, transformers, unordered-containers, writer-cps-mtl
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.3.0.0";
-       sha256 = "0jhy1s8pivswmb4cbcgbn1wxpb306x5lg87caxy6v9d3s0vhqh54";
+       version = "0.3.0.1";
+       sha256 = "0yc163r255w7df0hjly30bh5dqgx38f1z5lk3x3i7jh93j97cpn0";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe text transformers unordered-containers
@@ -110803,8 +111082,8 @@ self: {
        pname = "irc-dcc";
        version = "2.0.1";
        sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234";
-       revision = "1";
-       editedCabalFile = "0i8ihmlldkk692ckxhhgb3sj6kipnckxgi5b4l234k983yk5h4dj";
+       revision = "2";
+       editedCabalFile = "1zw5a6aj2jfl482197v741rjsrc13bsirq0a290qbjsyyib9jjzk";
        libraryHaskellDepends = [
          attoparsec base binary bytestring io-streams iproute irc-ctcp mtl
          network path safe-exceptions transformers utf8-string
@@ -115474,6 +115753,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "kmp-dfa" = callPackage
+    ({ mkDerivation, array, base, QuickCheck }:
+     mkDerivation {
+       pname = "kmp-dfa";
+       version = "0.1.0.1";
+       sha256 = "0h0jk0pidikk655yw8nwmgrvwknhikjmalhizqspfd28w9ijxprg";
+       libraryHaskellDepends = [ array base QuickCheck ];
+       testHaskellDepends = [ array base QuickCheck ];
+       homepage = "https://github.com/paolino/kmp-dfa";
+       description = "KMP algorithm implementation, based on Deterministic Finite State Automata";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "knead" = callPackage
     ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record
      , storable-tuple, transformers, utility-ht
@@ -124688,8 +124980,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.3.0.6";
-       sha256 = "143plaxlnlrjb947ysysqz8x4070jka0g39w2wlk7b1hld0c6pn6";
+       version = "2.3.1.1";
+       sha256 = "1ybbf281kpmdwggjvmhpilip0pficsqqg1m1nizgwwlgg76kwnj3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124940,12 +125232,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mainland-pretty_0_6" = callPackage
+  "mainland-pretty_0_6_1" = callPackage
     ({ mkDerivation, base, containers, srcloc, text, transformers }:
      mkDerivation {
        pname = "mainland-pretty";
-       version = "0.6";
-       sha256 = "0cbhw3nnp16hc9mhgj7jmszyir4pi5zl0wgsrh279q4x2235wp3g";
+       version = "0.6.1";
+       sha256 = "1q25vn93jlxbrlprh5vv1mb4z0qjjl58snc7mv5a5lnjgj3j8ip3";
        libraryHaskellDepends = [
          base containers srcloc text transformers
        ];
@@ -126336,6 +126628,26 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "matrix-market-attoparsec_0_1_0_8" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory
+     , exceptions, hspec, QuickCheck, scientific
+     }:
+     mkDerivation {
+       pname = "matrix-market-attoparsec";
+       version = "0.1.0.8";
+       sha256 = "0xqa4q4wyjjh55lggsyjhsi0kb5rhk3afzk0qhnhdmnzmf0slhay";
+       libraryHaskellDepends = [
+         attoparsec base bytestring exceptions scientific
+       ];
+       testHaskellDepends = [
+         base directory exceptions hspec QuickCheck
+       ];
+       homepage = "https://github.com/ocramz/matrix-market-attoparsec";
+       description = "Parsing and serialization functions for the NIST Matrix Market format";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrix-market-pure" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -127227,6 +127539,8 @@ self: {
        pname = "megaparsec";
        version = "5.2.0";
        sha256 = "0204x5bklgvfydap1a2y76aicnjfs33jh786y7w6vsb54fpafl62";
+       revision = "1";
+       editedCabalFile = "1ah5r6jjz187l5g1mnzajsyiac5wdc8ijqwkapl0wa35mj3ybakg";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions mtl QuickCheck
          scientific text transformers
@@ -127250,8 +127564,8 @@ self: {
        pname = "megaparsec";
        version = "5.3.0";
        sha256 = "0lpf3f24lyid1chb2hrxiw97kciww844wzkp910zj811b6pbm6rs";
-       revision = "1";
-       editedCabalFile = "185fy44b3ivblh7hw2d18r494g0b4m9wp02m5ms85f8b57r90jws";
+       revision = "2";
+       editedCabalFile = "1gwvrg5vmxhlycav33g9r9157vq0f6j701bar0p7ck4mszs0v6zk";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions mtl QuickCheck
          scientific text transformers
@@ -127934,18 +128248,20 @@ self: {
      }) {};
 
   "mezzo" = callPackage
-    ({ mkDerivation, base, boxes, ghc-typelits-natnormalise, HCodecs
-     , hspec, QuickCheck, should-not-typecheck, template-haskell
+    ({ mkDerivation, base, boxes, deepseq, ghc-prim
+     , ghc-typelits-natnormalise, HCodecs, hspec, HUnit, QuickCheck
+     , should-not-typecheck, template-haskell
      }:
      mkDerivation {
        pname = "mezzo";
-       version = "0.2.0.2";
-       sha256 = "1b50ccbvg65j55cpg7ps8x4j52lw4v7gp1bgrxdqgy6k6ccrq34w";
+       version = "0.3.0.0";
+       sha256 = "10i0n03wmrds8gg0p14nvqi00ziqh2lhynbq6gynizgqs5nfh481";
        libraryHaskellDepends = [
-         base boxes ghc-typelits-natnormalise HCodecs template-haskell
+         base boxes ghc-prim ghc-typelits-natnormalise HCodecs
+         template-haskell
        ];
        testHaskellDepends = [
-         base hspec QuickCheck should-not-typecheck
+         base deepseq hspec HUnit QuickCheck should-not-typecheck
        ];
        homepage = "https://github.com/DimaSamoz/mezzo";
        description = "Typesafe music composition";
@@ -128171,6 +128487,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-mtl_0_1_11_0" = callPackage
+    ({ mkDerivation, base, microlens, mtl, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "microlens-mtl";
+       version = "0.1.11.0";
+       sha256 = "1885kc8sgcrv05q2sya4q562gph7hgp1hd66mgy7r1vnnz43zfjf";
+       libraryHaskellDepends = [
+         base microlens mtl transformers transformers-compat
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens support for Reader/Writer/State from mtl";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-platform" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
@@ -128188,6 +128521,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-platform_0_3_9_0" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.3.9.0";
+       sha256 = "0f9m6yd4pf839flw3w4g1irplrlmncj0kxfci7dnbkp52x66y1wk";
+       libraryHaskellDepends = [
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Feature-complete microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-th" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
@@ -129215,6 +129566,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mixed-types-num_0_2_0_1" = callPackage
+    ({ mkDerivation, base, convertible, hspec, hspec-smallcheck
+     , QuickCheck, smallcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "mixed-types-num";
+       version = "0.2.0.1";
+       sha256 = "05jy5rym4a2y80pg00csyrfpd3bdv98s1kdv3s18nqfrhsyz84wa";
+       libraryHaskellDepends = [
+         base convertible hspec hspec-smallcheck QuickCheck smallcheck
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
+       homepage = "https://github.com/michalkonecny/mixed-types-num";
+       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mkbndl" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell98 }:
      mkDerivation {
@@ -131383,6 +131753,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoid-subclasses_0_4_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "monoid-subclasses";
+       version = "0.4.3.2";
+       sha256 = "1n13a3nj1hzlbpanl6d1ak3j2vnjy8mb5p5gp7y5hfhrpiymhbgi";
+       libraryHaskellDepends = [
+         base bytestring containers primes text vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers primes QuickCheck quickcheck-instances
+         tasty tasty-quickcheck text vector
+       ];
+       homepage = "https://github.com/blamario/monoid-subclasses/";
+       description = "Subclasses of Monoid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-transformer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -139032,6 +139423,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "one-liner_0_9_1" = callPackage
+    ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
+     , profunctors, tagged, transformers
+     }:
+     mkDerivation {
+       pname = "one-liner";
+       version = "0.9.1";
+       sha256 = "18jys0qvywd7il4yzyf2yb22md7apzhxvnzr067d90srqdva7cpf";
+       libraryHaskellDepends = [
+         base bifunctors contravariant ghc-prim profunctors tagged
+         transformers
+       ];
+       testHaskellDepends = [ base contravariant HUnit ];
+       homepage = "https://github.com/sjoerdvisscher/one-liner";
+       description = "Constraint-based generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "one-time-password" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cryptonite, memory
      , tasty, tasty-hunit, time
@@ -139368,7 +139778,7 @@ self: {
     ({ mkDerivation, aeson, base, base64-bytestring, bindings-DSL
      , bytestring, Cabal, containers, criterion, data-default, deepseq
      , directory, Glob, haskell-src-exts, inline-c, inline-c-cpp
-     , JuicyPixels, lens, linear, opencv, primitive, QuickCheck, repa
+     , JuicyPixels, lens, linear, opencv3, primitive, QuickCheck, repa
      , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
      , transformers, vector
      }:
@@ -139376,13 +139786,16 @@ self: {
        pname = "opencv";
        version = "0.0.0.0";
        sha256 = "1y2mjb6a6iym6h6m7c214lwrmcjhm9snsqgf1jrbq27fr346mrkb";
+       configureFlags = [
+         "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++"
+       ];
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          aeson base base64-bytestring bindings-DSL bytestring containers
          data-default deepseq inline-c inline-c-cpp JuicyPixels linear
          primitive repa template-haskell text transformers vector
        ];
-       libraryPkgconfigDepends = [ opencv ];
+       libraryPkgconfigDepends = [ opencv3 ];
        testHaskellDepends = [
          base bytestring containers data-default directory Glob
          haskell-src-exts JuicyPixels lens linear primitive QuickCheck repa
@@ -139394,7 +139807,7 @@ self: {
        homepage = "https://github.com/LumiGuide/haskell-opencv";
        description = "Haskell binding to OpenCV-3.x";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) opencv;};
+     }) {inherit (pkgs) opencv3;};
 
   "opencv-extra" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, Cabal, containers
@@ -141391,8 +141804,8 @@ self: {
        pname = "pandoc";
        version = "1.19.2.1";
        sha256 = "00bq5h70byfs1fnszkggwws33hp7dpr7lzs0lfdvp5dzfwyjys88";
-       revision = "4";
-       editedCabalFile = "0r5lypd2jxsh221djvb49an7zcn4dlzr563cyf5xchchhnz9mcxp";
+       revision = "5";
+       editedCabalFile = "0rp81lr8ys7bcnjx5hm9fn704zhph313whjc51ns8sbpzlpwvx1f";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -141717,8 +142130,8 @@ self: {
        pname = "pandoc-types";
        version = "1.17.0.5";
        sha256 = "1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8";
-       revision = "3";
-       editedCabalFile = "0hz6apf01gavsbff2rs70c6zbb7fpai2qd0jmsb928dmpja97d6y";
+       revision = "4";
+       editedCabalFile = "1ljvzl41ikfwwdh253mwpqjr7c4vf1ib01sxvp66ahi7vpxshm7n";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -144805,6 +145218,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-mysql_2_6_1" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , containers, monad-control, monad-logger, mysql, mysql-simple
+     , persistent, resource-pool, resourcet, text, transformers
+     }:
+     mkDerivation {
+       pname = "persistent-mysql";
+       version = "2.6.1";
+       sha256 = "0i1a7xmspgxzlwi1z9jyh5ckjx16yba1xs289vh2id9400yh8c57";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit containers
+         monad-control monad-logger mysql mysql-simple persistent
+         resource-pool resourcet text transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Backend for the persistent library using MySQL database server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-mysql-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-control, monad-logger, mysql-haskell, network
@@ -145270,6 +145703,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pg-transact" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, hspec
+     , hspec-discover, monad-control, postgresql-simple, tmp-postgres
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pg-transact";
+       version = "0.1.0.1";
+       sha256 = "0zf9mfhpknaa0vggv60gpkfr0ak51n1xbw5lfqx8l8p1kqv3d0jr";
+       libraryHaskellDepends = [
+         base bytestring exceptions monad-control postgresql-simple
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring exceptions hspec hspec-discover postgresql-simple
+         tmp-postgres
+       ];
+       homepage = "https://github.com/jfischoff/pg-transact#readme";
+       description = "Another postgresql-simple transaction monad";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pgdl" = callPackage
     ({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit
      , conduit-extra, configurator, containers, directory
@@ -145399,12 +145854,12 @@ self: {
      }) {};
 
   "phaser" = callPackage
-    ({ mkDerivation, base, bytestring, text }:
+    ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "phaser";
-       version = "0.2.0.0";
-       sha256 = "126s1xqb6fm30fhnslqgqrby6v0jhagmbnms144dcnyjphdr69i0";
-       libraryHaskellDepends = [ base bytestring text ];
+       version = "1.0.0.0";
+       sha256 = "06m7a61fs6kmd4pgfj1zp7ijzprkdaximynzjv9wm9ynz3fplkzs";
+       libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/quickdudley/phaser";
        description = "Incremental multiple pass parser library";
        license = stdenv.lib.licenses.bsd3;
@@ -149199,16 +149654,15 @@ self: {
 
   "postgresql-simple-opts" = callPackage
     ({ mkDerivation, base, bytestring, data-default, either, hspec
-     , markdown-unlit, optparse-applicative, optparse-generic
-     , postgresql-simple
+     , optparse-applicative, optparse-generic, postgresql-simple
      }:
      mkDerivation {
        pname = "postgresql-simple-opts";
-       version = "0.2.0.0";
-       sha256 = "07zsykbxcl1rjbcnq21bw99r77jm743py9lcvk8grnqfjqyn43a7";
+       version = "0.2.0.2";
+       sha256 = "0jwhlafbpkg75rc2b4hv8pg1d2q200h70lwn0acilikf55r3vlj1";
        libraryHaskellDepends = [
-         base bytestring data-default either markdown-unlit
-         optparse-applicative optparse-generic postgresql-simple
+         base bytestring data-default either optparse-applicative
+         optparse-generic postgresql-simple
        ];
        testHaskellDepends = [
          base bytestring hspec optparse-applicative postgresql-simple
@@ -149219,6 +149673,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-simple-queue" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-ses, async, base
+     , bytestring, data-default, exceptions, hspec, hspec-discover
+     , hspec-expectations-lifted, hspec-pg-transact, lens, lifted-async
+     , lifted-base, monad-control, optparse-generic, pg-transact
+     , postgresql-simple, postgresql-simple-opts, random, resource-pool
+     , text, time, transformers, uuid
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-queue";
+       version = "0.1.0.1";
+       sha256 = "1rwfv4ii4bdxq4ikvjrjrwbn9csr5q4qmmi7d5r0656a4qi9syh9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring data-default exceptions lifted-async
+         lifted-base monad-control optparse-generic pg-transact
+         postgresql-simple postgresql-simple-opts random resource-pool text
+         time transformers uuid
+       ];
+       executableHaskellDepends = [
+         aeson amazonka amazonka-ses base lens lifted-base text
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring hspec hspec-discover
+         hspec-expectations-lifted hspec-pg-transact pg-transact
+         postgresql-simple
+       ];
+       homepage = "https://github.com/jfischoff/postgresql-queue#readme";
+       description = "A PostgreSQL backed queue";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-simple-sop" = callPackage
     ({ mkDerivation, base, generics-sop, postgresql-simple }:
      mkDerivation {
@@ -150529,6 +151016,18 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "prim-array" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive }:
+     mkDerivation {
+       pname = "prim-array";
+       version = "0.1";
+       sha256 = "0k4askk73r6pm160lqgrdz787qacd7sv7j04awdwrxbr0mwqn5gk";
+       libraryHaskellDepends = [ base ghc-prim primitive ];
+       homepage = "https://github.com/andrewthad/prim-array#readme";
+       description = "Primitive byte array with type variable";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prim-spoon" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck
      , spoon
@@ -151673,8 +152172,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.0.4";
-       sha256 = "0h69g079zrv9rnq0rb6d1j323rb310qmal109ma8ss50m5f4gyiq";
+       version = "4.0.6";
+       sha256 = "0w8n7l4ws3awccqf6g12bk09l10s4scmdvr5vkxhhpm5cmawd0fq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -151771,20 +152270,20 @@ self: {
      }) {};
 
   "proteaaudio" = callPackage
-    ({ mkDerivation, alsaLib, base, c2hs }:
+    ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }:
      mkDerivation {
        pname = "proteaaudio";
-       version = "0.6.5";
-       sha256 = "0bilgdwzm8gfgfpf66kc3akpi9axr69b3fmx6s3y1bq24lkx9irp";
+       version = "0.7.0.1";
+       sha256 = "1v56qmgwj5cd8xbk19qgjwwkc1nbya1vagai7kypf5aj8c07gjrq";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ alsaLib ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ libpulseaudio ];
        libraryToolDepends = [ c2hs ];
        description = "Simple audio library for Windows, Linux, OSX";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) libpulseaudio;};
 
   "proto-lens" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
@@ -154048,7 +154547,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-instances_0_3_15" = callPackage
+  "quickcheck-instances_0_3_16" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , case-insensitive, containers, hashable, old-time, QuickCheck
      , scientific, tagged, text, time, transformers, transformers-compat
@@ -154056,8 +154555,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-instances";
-       version = "0.3.15";
-       sha256 = "02nwas0i2jlvjahlj5mayhpiy8pkb46xicypjw63kzp1xc6zs3ly";
+       version = "0.3.16";
+       sha256 = "07xqbjb3rb5hzhjak3qpvj4hl91gc0z2272n60hv67zmv3w8kcf1";
        libraryHaskellDepends = [
          array base base-compat bytestring case-insensitive containers
          hashable old-time QuickCheck scientific tagged text time
@@ -154815,15 +155314,16 @@ self: {
      }) {};
 
   "radium" = callPackage
-    ({ mkDerivation, base, Cabal, containers, hspec, parsec, QuickCheck
+    ({ mkDerivation, base, Cabal, containers, hspec, lens, parsec
+     , QuickCheck
      }:
      mkDerivation {
        pname = "radium";
-       version = "0.7";
-       sha256 = "08xwy6v1w32lr6i9kkbj3h6zk2llc5lba30piim6a3dgvr1zpfpq";
-       libraryHaskellDepends = [ base containers parsec ];
+       version = "0.8.0";
+       sha256 = "04pc3zy09hg7p9w54ffwvfcby3341vbpzlv2d9ma2q9py0ymx6d5";
+       libraryHaskellDepends = [ base containers lens parsec ];
        testHaskellDepends = [
-         base Cabal containers hspec parsec QuickCheck
+         base Cabal containers hspec lens parsec QuickCheck
        ];
        homepage = "https://github.com/klangner/radium";
        description = "Chemistry";
@@ -161520,18 +162020,23 @@ self: {
      }) {};
 
   "rocksdb-haskell" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, filepath
-     , resourcet, rocksdb, transformers
+    ({ mkDerivation, base, binary, bytestring, data-default, filepath
+     , hspec, hspec-expectations, process, QuickCheck, resourcet
+     , rocksdb, temporary, transformers
      }:
      mkDerivation {
        pname = "rocksdb-haskell";
-       version = "0.1.0";
-       sha256 = "1wi8mc0xzdd47r2vxa1x4gmbm4yikp4pyfj00ycnydvs4b2n3iad";
+       version = "1.0.0";
+       sha256 = "0raipwawmah4h9ryja65b881dcj4yadrhh4c4718fdr0n89wgnzd";
        libraryHaskellDepends = [
-         base bytestring data-default filepath resourcet transformers
+         base binary bytestring data-default filepath resourcet transformers
        ];
        librarySystemDepends = [ rocksdb ];
-       homepage = "http://github.com/agrafix/rocksdb-haskell";
+       testHaskellDepends = [
+         base bytestring data-default hspec hspec-expectations process
+         QuickCheck resourcet temporary transformers
+       ];
+       homepage = "http://github.com/serokell/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
@@ -162775,6 +163280,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "safe_0_3_15" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "safe";
+       version = "0.3.15";
+       sha256 = "0bbalr2n92akwcgdyl5ff45h8d4waamj1lp7ly6mdgda17k4lpm3";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       homepage = "https://github.com/ndmitchell/safe#readme";
+       description = "Library of safe (exception free) functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safe-access" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -165514,10 +166033,8 @@ self: {
      }:
      mkDerivation {
        pname = "selda";
-       version = "0.1.8.0";
-       sha256 = "13ccbpwsd2w6l534a9l6d1mmssfy1q9lh6df14zf2am8ph184av7";
-       revision = "1";
-       editedCabalFile = "1lqq7ik4s1xvbc94knv57h2k08r8rk4nyhxq6nlfy23spb56r0a6";
+       version = "0.1.9.0";
+       sha256 = "0c69aaalxi4b42y6y9y12wcxxyjnb3arc196kj0c1q6xdwh9fpk4";
        libraryHaskellDepends = [
          base bytestring exceptions hashable mtl psqueues text time
          unordered-containers
@@ -165533,8 +166050,8 @@ self: {
      }:
      mkDerivation {
        pname = "selda-postgresql";
-       version = "0.1.5.0";
-       sha256 = "1ziavpl33m82xfv7528nvfgmlamz2rzmdd73gs7zbrvqnizjq4b5";
+       version = "0.1.5.1";
+       sha256 = "1462rcvyf79p80b17hkgkgb2jfzhkdq8vj0y001jy5wzl6gs7b8d";
        libraryHaskellDepends = [
          base bytestring exceptions postgresql-libpq selda text
        ];
@@ -165549,8 +166066,8 @@ self: {
      }:
      mkDerivation {
        pname = "selda-sqlite";
-       version = "0.1.5.0";
-       sha256 = "10r0sqbps515qbcdfgsi9lkjx5axps02hbgrjgkc7djg01i3c6x1";
+       version = "0.1.5.1";
+       sha256 = "1r81qidwqp5smi3h7awrbxhvlclm5dgvrmi56irghvh960h720j3";
        libraryHaskellDepends = [
          base direct-sqlite directory exceptions selda text
        ];
@@ -168372,6 +168889,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "serviette" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, generic-deriving, text }:
+     mkDerivation {
+       pname = "serviette";
+       version = "0.1.0.4";
+       sha256 = "1i5k12y547z3l2hb4h1zafvv9sbfh5x60hajjw78dnk2p4v1gzl4";
+       libraryHaskellDepends = [
+         aeson base bytestring generic-deriving text
+       ];
+       homepage = "https://github.com/v0d1ch/serviette#readme";
+       description = "JSON to raw Sql string";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servius" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , http-types, markdown, shakespeare, text, wai, wai-app-static
@@ -174742,6 +175273,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "space" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, cryptonite, directory, http-date, http-types, lucid
+     , memory, network, stm, template-haskell, text, unix, wai, warp
+     }:
+     mkDerivation {
+       pname = "space";
+       version = "0.1.0";
+       sha256 = "0462f3sljgzj9l3gd8m8irnv1bsiixh0vzz7skwdfrm92dazbcrb";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring cryptonite
+         directory http-date http-types lucid memory network stm
+         template-haskell text unix wai warp
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/xtendo-org/space#readme";
+       description = "Experimental library";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "spacefill" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -175047,6 +175598,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "spdx_0_2_2_0" = callPackage
+    ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
+     mkDerivation {
+       pname = "spdx";
+       version = "0.2.2.0";
+       sha256 = "1jxxivxlhzjx4idy69qhqqv37sspqhk3f3i93mydzn8cyhn87aqp";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
+       homepage = "https://github.com/phadej/spdx";
+       description = "SPDX license expression language";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "spe" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -177450,8 +178015,8 @@ self: {
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.2.0.0";
-       sha256 = "0sx5m62s12pvbgawndpycf38rpik5sdghxpc3prmcv308xavsp7r";
+       version = "0.2.1.0";
+       sha256 = "120w7kpgv2nsp7c36w1w6aglfh8sx72b3gmhrg5g790596f81797";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -179703,15 +180268,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "stylish-haskell_0_8_0_0" = callPackage
+  "stylish-haskell_0_8_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
      , strict, syb, test-framework, test-framework-hunit, yaml
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.8.0.0";
-       sha256 = "157mdq8529dn1lib1q7mmg47as61msda0ix34xb76c6pzfn1dd0w";
+       version = "0.8.1.0";
+       sha256 = "08qzplmzpnfyl8zaskimx91xij723mim11k552a7yl3p0i0cfmw7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183089,8 +183654,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.3.1";
        sha256 = "0i2lv0m8va2kirddgng5laaq9q78y56jg9li93iq8b9062smiila";
-       revision = "1";
-       editedCabalFile = "0gdf742llw1109ai5p6xrcv2a095bip7h5cj9qp14w49rzi5hdza";
+       revision = "2";
+       editedCabalFile = "0d8cwpkqayf7qgg4xvs8aj4wxk3qkilmjfy74s3jkxyrxsg22d73";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tagged tasty
          tasty-quickcheck tasty-smallcheck
@@ -183724,8 +184289,8 @@ self: {
      }:
      mkDerivation {
        pname = "teardown";
-       version = "0.0.0.2";
-       sha256 = "0d28sxx2krf3p5alj8gn8gs98slfs9fqwbaf6lyimayy2fx9d5jf";
+       version = "0.1.0.0";
+       sha256 = "0sg113khwlb56x0rgb47lm0hf0cfsr9wc31w98nav9zcw5gndm33";
        libraryHaskellDepends = [
          ansi-wl-pprint base protolude text time
        ];
@@ -184804,15 +185369,13 @@ self: {
      }:
      mkDerivation {
        pname = "test-framework-quickcheck2";
-       version = "0.3.0.3";
-       sha256 = "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc";
-       revision = "2";
-       editedCabalFile = "1h0vv04vgbj9ncla9nssgiis1sq29n865h473pydfmj31j6ri7wq";
+       version = "0.3.0.4";
+       sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
        libraryHaskellDepends = [
          base extensible-exceptions QuickCheck random test-framework
        ];
-       homepage = "https://batterseapower.github.io/test-framework/";
-       description = "QuickCheck2 support for the test-framework package";
+       homepage = "http://haskell.github.io/test-framework/";
+       description = "QuickCheck-2 support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -185927,25 +186490,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-show_3_6" = callPackage
+  "text-show_3_6_2" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, contravariant
      , criterion, deepseq, deriving-compat, generic-deriving
      , ghc-boot-th, ghc-prim, hspec, integer-gmp, nats, QuickCheck
      , quickcheck-instances, semigroups, tagged, template-haskell, text
-     , th-lift, transformers, transformers-compat, void
+     , th-abstraction, th-lift, transformers, transformers-compat, void
      }:
      mkDerivation {
        pname = "text-show";
-       version = "3.6";
-       sha256 = "0gvg1fpgvws75zhvxdkcg03m6sy5rv4m77fynjh8v6rakbiy7gb4";
-       revision = "1";
-       editedCabalFile = "052zp68y3fbwvg9xigngaqfv7afjw9prfns5qlx6s7mv3i8dc2mk";
+       version = "3.6.2";
+       sha256 = "1wqzdpa7wxnqaa62mmw9fqklg12i9gyiaahj6xqy2h3rdw7r5qz2";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers contravariant generic-deriving ghc-boot-th ghc-prim
-         integer-gmp nats semigroups tagged template-haskell text th-lift
-         transformers transformers-compat void
+         integer-gmp nats semigroups tagged template-haskell text
+         th-abstraction th-lift transformers transformers-compat void
        ];
        testHaskellDepends = [
          array base base-compat base-orphans bifunctors bytestring
@@ -186002,7 +186563,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-show-instances_3_6_1" = callPackage
+  "text-show-instances_3_6_2" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
      , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
@@ -186013,10 +186574,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "3.6.1";
-       sha256 = "1ws5gkmb7y21aw6lrakjq760lgg7j8r5rfm45sdfalhgasxh54lz";
-       revision = "1";
-       editedCabalFile = "1zkncw3nflhqgs0wmfj4pz2jvbp2hq5xanyv3ggdbjff6zzpcx6m";
+       version = "3.6.2";
+       sha256 = "0c64ibvzpz2h4f54bhrla4yf4mhsl3x2ag2nx2kj81g47pw917r5";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
@@ -186944,6 +187503,8 @@ self: {
        pname = "these";
        version = "0.7.4";
        sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw";
+       revision = "1";
+       editedCabalFile = "15vrym6g4vh4fbji8zxy1kxajnickmg6bq83m4hcy5bfv7rf9y39";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -187369,18 +187930,21 @@ self: {
 
   "throwable-exceptions" = callPackage
     ({ mkDerivation, base, either, safe-exceptions, tasty
-     , tasty-discover, tasty-hunit, text
+     , tasty-discover, tasty-hunit, template-haskell, text
      }:
      mkDerivation {
        pname = "throwable-exceptions";
-       version = "0.1.0.4";
-       sha256 = "1hpji5db3hg36f4ry3xsgl4cynw0djx3a61i19q4cy9sqbbdlw4c";
-       libraryHaskellDepends = [ base safe-exceptions ];
+       version = "0.1.0.5";
+       sha256 = "1f4aaj37j0wni1qgshf1n72kid74wz4gj6dydzzasrxq4ls51cvn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base safe-exceptions template-haskell ];
+       executableHaskellDepends = [ base safe-exceptions ];
        testHaskellDepends = [
          base either safe-exceptions tasty tasty-discover tasty-hunit text
        ];
        homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md";
-       description = "throwable-exceptions gives the exception's value constructors";
+       description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -188942,6 +189506,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tmp-postgres" = callPackage
+    ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover
+     , network, postgresql-simple, process, temporary, unix
+     }:
+     mkDerivation {
+       pname = "tmp-postgres";
+       version = "0.1.0.6";
+       sha256 = "0h3rhli1vm0rq2943fz1z4l26s6nzrx5sccwdx6wc998wbgbdq15";
+       libraryHaskellDepends = [
+         base directory network process temporary unix
+       ];
+       testHaskellDepends = [
+         base bytestring directory hspec hspec-discover postgresql-simple
+         process temporary
+       ];
+       homepage = "https://github.com/jfischoff/tmp-postgres#readme";
+       description = "Start and stop a temporary postgres for testing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tmpl" = callPackage
     ({ mkDerivation, base, bytestring, directory, template, text }:
      mkDerivation {
@@ -190025,14 +190609,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "transient_0_5_6" = callPackage
+  "transient_0_5_8" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.5.6";
-       sha256 = "01r0mw35h3k7yry91gir64gkb6d3x9i5awnacmk8l8anffhvvayc";
+       version = "0.5.8";
+       sha256 = "04n43yddamgk7han7kmhz57v2vrp3cazqkgy4xnkdfgr10z8pppx";
        libraryHaskellDepends = [
          base bytestring containers directory mtl random stm time
          transformers
@@ -190077,7 +190661,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transient-universe_0_4_5" = callPackage
+  "transient-universe_0_4_6" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, filepath, hashable, HTTP, iproute, mtl, network
      , network-info, network-uri, process, random, stm, TCache, text
@@ -190085,8 +190669,8 @@ self: {
      }:
      mkDerivation {
        pname = "transient-universe";
-       version = "0.4.5";
-       sha256 = "0imyapqzdl2rz4gdykkcf3vr3r5d22qdnm9n0rg0gkl63b4lvv60";
+       version = "0.4.6";
+       sha256 = "0as7930b9mwy86rcly957q9yslqd2rflakmxnl1njnqm2cr2dx7m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190158,16 +190742,17 @@ self: {
      }) {};
 
   "trasa" = callPackage
-    ({ mkDerivation, base, binary, bytestring, doctest, http-types
-     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
-     , vinyl
+    ({ mkDerivation, base, binary, bytestring, doctest, hashable
+     , http-media, http-types, tasty, tasty-hunit, tasty-quickcheck
+     , text, unordered-containers, vinyl
      }:
      mkDerivation {
        pname = "trasa";
-       version = "0.1";
-       sha256 = "118x1z2hwx5gagiw4fas30jsdn1igqry2gydpjfnn9nvzf639x6y";
+       version = "0.2";
+       sha256 = "1570f4612nfslcxr0mjwf4zzgfninb0mv1d0n6livcks8jd4w4ph";
        libraryHaskellDepends = [
-         base binary bytestring http-types text unordered-containers vinyl
+         base binary bytestring hashable http-media http-types text
+         unordered-containers vinyl
        ];
        testHaskellDepends = [
          base bytestring doctest tasty tasty-hunit tasty-quickcheck text
@@ -190180,14 +190765,14 @@ self: {
 
   "trasa-client" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, http-client
-     , http-types, ip, text, trasa, unordered-containers
+     , http-media, http-types, ip, text, trasa, unordered-containers
      }:
      mkDerivation {
        pname = "trasa-client";
-       version = "0.1.0.0";
-       sha256 = "00vhl41al809njjl94j5prrbhihc02627qfsacqy294sdf5pf6kd";
+       version = "0.2";
+       sha256 = "0cgsjaclcqy4nprp7ndr4di1km0fp70zfgv1r4v172mk2q0n06nx";
        libraryHaskellDepends = [
-         base binary bytestring http-client http-types text trasa
+         base binary bytestring http-client http-media http-types text trasa
        ];
        testHaskellDepends = [
          aeson base http-client http-types ip text trasa
@@ -190199,15 +190784,15 @@ self: {
 
   "trasa-reflex" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghcjs-dom
-     , http-types, jsaddle, reflex, reflex-dom, text, trasa
+     , http-media, http-types, jsaddle, reflex, reflex-dom, text, trasa
      }:
      mkDerivation {
        pname = "trasa-reflex";
-       version = "0.1.0.0";
-       sha256 = "10c9ssk5dzvqglhism3g3kpracaf4j913gd6m639ry8nkax0ndyv";
+       version = "0.2";
+       sha256 = "11dwymm1cvxbfhfmsfipzxbigrgi6wybz3qylq8v0022c929cd1n";
        libraryHaskellDepends = [
-         base bytestring containers ghcjs-dom http-types jsaddle reflex
-         reflex-dom text trasa
+         base bytestring containers ghcjs-dom http-media http-types jsaddle
+         reflex reflex-dom text trasa
        ];
        description = "Reactive Type Safe Routing";
        license = stdenv.lib.licenses.mit;
@@ -190216,16 +190801,16 @@ self: {
 
   "trasa-server" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , doctest, http-client, http-types, mtl, tasty, tasty-hunit
-     , tasty-quickcheck, text, trasa, vinyl, wai, warp
+     , doctest, http-client, http-media, http-types, mtl, tasty
+     , tasty-hunit, tasty-quickcheck, text, trasa, vinyl, wai, warp
      }:
      mkDerivation {
        pname = "trasa-server";
-       version = "0.1";
-       sha256 = "1pj0rlpn0625vxm5hzik1vj2yrfkc8dmf04hc6mcjrpb78yyd2ai";
+       version = "0.2";
+       sha256 = "1jiqlsmiz82xh0mxj72bm0daqjvn5h5wb44i50q4pbsijaqgvsyy";
        libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-types mtl text
-         trasa wai
+         base bytestring case-insensitive containers http-media http-types
+         mtl text trasa wai
        ];
        testHaskellDepends = [
          base bytestring doctest http-client tasty tasty-hunit
@@ -196897,6 +197482,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) fftw;};
 
+  "vector-fftw_0_1_3_8" = callPackage
+    ({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
+     mkDerivation {
+       pname = "vector-fftw";
+       version = "0.1.3.8";
+       sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6";
+       libraryHaskellDepends = [ base primitive storable-complex vector ];
+       librarySystemDepends = [ fftw ];
+       homepage = "http://hackage.haskell.org/package/vector-fftw";
+       description = "A binding to the fftw library for one-dimensional vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) fftw;};
+
   "vector-functorlazy" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive, vector, vector-th-unbox
      }:
@@ -200248,20 +200847,24 @@ self: {
 
   "web-push" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
-     , cryptonite, exceptions, http-client, http-types, jose, memory
-     , random, text, time, transformers, unordered-containers
+     , cryptonite, exceptions, hspec, http-client, http-types, jose
+     , memory, mtl, random, text, time, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "web-push";
-       version = "0.1.0.0";
-       sha256 = "0wdqpvc4k5bqhfx37yf70rmpxhblhyg8xw2m0yk0fli2jfcljwjp";
+       version = "0.1.2.0";
+       sha256 = "1c9l6fl8fpz4jd9p1m8w42hknnklak8j4gjakcm4qdbw86c4w3kk";
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring cryptonite
-         exceptions http-client http-types jose memory random text time
+         exceptions http-client http-types jose memory mtl random text time
          transformers unordered-containers
        ];
+       testHaskellDepends = [
+         base base64-bytestring binary bytestring hspec
+       ];
        homepage = "https://github.com/sarthakbagaria/web-push#readme";
-       description = "Helper functions to send messages using Web Push protocol";
+       description = "Send messages using Web Push protocol";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -200705,8 +201308,8 @@ self: {
      }:
      mkDerivation {
        pname = "webify";
-       version = "0.1.7.0";
-       sha256 = "16fsk6x875bmnqng5mfkxcxrkp3dcs3lkmsnds5fm416x4iw1sql";
+       version = "0.1.8.0";
+       sha256 = "031gim7g15ssjj3pzc5nk7r8dsfj35pf3kzjzaxfijklwzj0zj9q";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -201069,8 +201672,8 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "0.1.5";
-       sha256 = "0jnfg68828qdk14lpa0ql4x6cj7ap2njrwpgdqwkpm2hkgw21363";
+       version = "0.1.6";
+       sha256 = "1ss78jqiygypr8j4n2nj9b5dhxly6gmnf5qlil4cj8kb0pzr1q7b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -203300,8 +203903,8 @@ self: {
        pname = "xdcc";
        version = "1.1.4";
        sha256 = "0r344vgkiwc7lkb7x78swnz0rimbgdcb0ki29dilqvdv0k4z9i59";
-       revision = "2";
-       editedCabalFile = "1r9vp01r8pym1skqy6ll632q5j4xbgsf6mf1n26rk296z2rqdvra";
+       revision = "3";
+       editedCabalFile = "11swld2awjp5l1386c1c1lpkrw53g9l77agvz1y43kh00c2a6yaa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -203526,12 +204129,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xhtml_3000_2_1" = callPackage
+  "xhtml_3000_2_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "xhtml";
-       version = "3000.2.1";
-       sha256 = "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik";
+       version = "3000.2.2";
+       sha256 = "0z34m5jfvjyzqjr81kk6mp2dyf0iay5zl8xlzwl3k5zdfl5hsz74";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/haskell/xhtml";
        description = "An XHTML combinator library";
@@ -203947,6 +204550,29 @@ self: {
        license = "unknown";
      }) {};
 
+  "xml-conduit-parse_0_3_1_1" = callPackage
+    ({ mkDerivation, base, conduit, conduit-parse, containers
+     , data-default, exceptions, hlint, parsers, resourcet, tasty
+     , tasty-hunit, text, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit-parse";
+       version = "0.3.1.1";
+       sha256 = "1i20smw7cs2bjh7z1606grac779a60fcwpc8qrqavagbmkhx0ba8";
+       libraryHaskellDepends = [
+         base conduit conduit-parse containers exceptions parsers text
+         xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base conduit conduit-parse data-default hlint parsers resourcet
+         tasty tasty-hunit
+       ];
+       homepage = "https://github.com/k0ral/xml-conduit-parse";
+       description = "Streaming XML parser based on conduits";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-conduit-writer" = callPackage
     ({ mkDerivation, base, containers, dlist, mtl, text, xml-conduit
      , xml-types
@@ -207309,6 +207935,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-recaptcha2" = callPackage
+    ({ mkDerivation, base, classy-prelude-yesod, http-conduit
+     , yesod-auth
+     }:
+     mkDerivation {
+       pname = "yesod-recaptcha2";
+       version = "0.1.0.0";
+       sha256 = "0cmhw0wlbs8r4wpcyywgsizl86l3y0hrngl711sr2yl51vxhgh2f";
+       libraryHaskellDepends = [
+         base classy-prelude-yesod http-conduit yesod-auth
+       ];
+       homepage = "https://github.com/ncaq/yesod-recaptcha2#readme";
+       description = "yesod recaptcha2";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-routes" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, HUnit
      , path-pieces, template-haskell, text, vector
@@ -207778,8 +208420,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.13.5";
-       sha256 = "17r5lzrrr6fkf72w2lkc0a144v3bqiny91j2siax5qbyjakl28wh";
+       version = "0.14.0";
+       sha256 = "0hdwcsv8yy1dfb2grj1haix1by8lp63mvi4vws733q2q9p9yrali";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = false;
        isExecutable = true;
@@ -207850,6 +208492,67 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-core_0_14_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, binary, bytestring
+     , containers, criterion, data-default, deepseq, directory, dlist
+     , dynamic-state, dyre, filepath, hashable, ListLike
+     , microlens-platform, mtl, old-locale, oo-prototypes, parsec
+     , pointedlist, process, process-extras, quickcheck-text, semigroups
+     , split, tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time
+     , transformers-base, unix, unix-compat, unordered-containers
+     , xdg-basedir, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-core";
+       version = "0.14.0";
+       sha256 = "176frh7q1bd4sa1fx2dgip70a4vyla09qw5n2v58qwhpfq14zwi0";
+       libraryHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state dyre filepath hashable ListLike
+         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
+         process process-extras semigroups split text text-icu time
+         transformers-base unix unix-compat unordered-containers xdg-basedir
+         yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state filepath hashable ListLike
+         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
+         process process-extras quickcheck-text split tasty tasty-hunit
+         tasty-quickcheck text text-icu time transformers-base unix
+         unix-compat unordered-containers xdg-basedir yi-language yi-rope
+       ];
+       benchmarkHaskellDepends = [
+         array attoparsec base binary bytestring containers criterion
+         data-default deepseq directory dlist dynamic-state filepath
+         hashable ListLike microlens-platform mtl old-locale oo-prototypes
+         parsec pointedlist process process-extras split text text-icu time
+         transformers-base unix unix-compat unordered-containers xdg-basedir
+         yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor core library";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yi-dynamic-configuration" = callPackage
+    ({ mkDerivation, base, dyre, microlens-platform, mtl, text
+     , transformers-base, yi-core, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-dynamic-configuration";
+       version = "0.14.0";
+       sha256 = "06gad5vi55hjbb5ifvkprnbbpd68n2y0sbjm0z0x0zaqg2srjmls";
+       libraryHaskellDepends = [
+         base dyre microlens-platform mtl text transformers-base yi-core
+         yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Dynamic configuration support for Yi";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "yi-emacs-colours" = callPackage
     ({ mkDerivation, base, containers, split, yi-language }:
      mkDerivation {
@@ -207869,8 +208572,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-pango";
-       version = "0.13.5";
-       sha256 = "1c3j6ab04bcdd1zwrdp9sxqfrhndbam4v1v4qv8yvmv1w5i5vkzj";
+       version = "0.14.0";
+       sha256 = "0zwpy1lbkw8lkxk4p162xs181n9xsp9x8h6yknklqd79lnxs4zd5";
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
          oo-prototypes pango pointedlist text transformers-base yi-core
@@ -207899,6 +208602,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-frontend-vty_0_14_0" = callPackage
+    ({ mkDerivation, base, containers, data-default, dlist
+     , microlens-platform, pointedlist, stm, text, vty, yi-core
+     , yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-frontend-vty";
+       version = "0.14.0";
+       sha256 = "0055npls7dhlx68fwnhfb7kk4nzpy8vvmlpplm3m36rlvk85gyma";
+       libraryHaskellDepends = [
+         base containers data-default dlist microlens-platform pointedlist
+         stm text vty yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vty frontend for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-fuzzy-open" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
@@ -207917,6 +208639,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-fuzzy-open_0_14_0" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default, directory
+     , filepath, mtl, text, transformers-base, vector, yi-core
+     , yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-fuzzy-open";
+       version = "0.14.0";
+       sha256 = "0plpxc4p3wa2ak32j0s8y0z6ha5x8wgnzpgzj71bs7rkaf5bf8dd";
+       libraryHaskellDepends = [
+         base binary containers data-default directory filepath mtl text
+         transformers-base vector yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Fuzzy open plugin for yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-gtk" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -207946,6 +208687,24 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-ireader_0_14_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, data-default
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-ireader";
+       version = "0.14.0";
+       sha256 = "0lqxa4m4agha9fd9lwf8xf2cxpj8mh2q93rkjchlksrjav3khz6q";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default microlens-platform
+         text yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor incremental reader";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-cua" = callPackage
     ({ mkDerivation, base, microlens-platform, text, yi-core
      , yi-keymap-emacs, yi-rope
@@ -207963,6 +208722,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-keymap-cua_0_14_0" = callPackage
+    ({ mkDerivation, base, microlens-platform, text, yi-core
+     , yi-keymap-emacs, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-cua";
+       version = "0.14.0";
+       sha256 = "0l7r8vyigmcmp9biskf13qnn8in16s6pliwrc12lxa5ikym7r59r";
+       libraryHaskellDepends = [
+         base microlens-platform text yi-core yi-keymap-emacs yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Cua keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-emacs" = callPackage
     ({ mkDerivation, base, containers, filepath, Hclip
      , microlens-platform, mtl, oo-prototypes, semigroups, text
@@ -207983,6 +208759,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-keymap-emacs_0_14_0" = callPackage
+    ({ mkDerivation, base, containers, filepath, Hclip
+     , microlens-platform, mtl, oo-prototypes, semigroups, text
+     , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-emacs";
+       version = "0.14.0";
+       sha256 = "0mlizcb2aj10kfmcavdzbdli0sxq0id02ihnpr23ix4dk3wgznqn";
+       libraryHaskellDepends = [
+         base containers filepath Hclip microlens-platform mtl oo-prototypes
+         semigroups text transformers-base yi-core yi-language yi-misc-modes
+         yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Emacs keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-vim" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, data-default
      , directory, filepath, Hclip, microlens-platform, mtl
@@ -208012,6 +208808,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-keymap-vim_0_14_0" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, containers, data-default
+     , directory, filepath, Hclip, microlens-platform, mtl
+     , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers-base
+     , unordered-containers, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-vim";
+       version = "0.14.0";
+       sha256 = "1hy36q69a0yhkg5v0n2f2gkmbf85a9y6k5b38gdg18kdnil974q4";
+       libraryHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist safe
+         semigroups text transformers-base unordered-containers yi-core
+         yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck
+         safe semigroups tasty tasty-hunit tasty-quickcheck text
+         transformers-base unordered-containers yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vim keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-language" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
@@ -208040,6 +208865,35 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-language_0_14_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, containers
+     , data-default, hashable, microlens-platform, oo-prototypes
+     , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
+     , tasty-quickcheck, template-haskell, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "yi-language";
+       version = "0.14.0";
+       sha256 = "1dpiqh46b2z627ry0smq4a0ynna1m166qf0yqhlh80v67myyg9jr";
+       libraryHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
+         template-haskell transformers-base unordered-containers
+       ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform pointedlist regex-base regex-tdfa tasty
+         tasty-hspec tasty-quickcheck template-haskell transformers-base
+         unordered-containers
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Collection of language-related Yi libraries";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-misc-modes" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, semigroups, text, yi-core, yi-language
@@ -208060,6 +208914,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-misc-modes_0_14_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, filepath
+     , microlens-platform, semigroups, text, yi-core, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-misc-modes";
+       version = "0.14.0";
+       sha256 = "0khyy4iacp8fah1lrp6ffvn2vy5xxrgizd4mzdlb6shc7sliaifz";
+       libraryHaskellDepends = [
+         array base binary data-default filepath microlens-platform
+         semigroups text yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor miscellaneous modes";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-mode-haskell" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, filepath, hashable, hspec, microlens-platform
@@ -208088,6 +208962,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-mode-haskell_0_14_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, filepath
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-haskell";
+       version = "0.14.0";
+       sha256 = "0yqwshj1hms1q2r78fi0hsqyrazy5cyv0znxcjpmx2f6mnifjxd9";
+       libraryHaskellDepends = [
+         array base binary data-default filepath microlens-platform text
+         yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor haskell mode";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-mode-javascript" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, dlist
      , filepath, microlens-platform, mtl, text, yi-core, yi-language
@@ -208108,6 +209001,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-mode-javascript_0_14_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, dlist
+     , filepath, microlens-platform, mtl, text, yi-core, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-javascript";
+       version = "0.14.0";
+       sha256 = "00ap00h9lz0b2r75m0dn741aasi18455srwq6mcpbbq6j4v3jzfz";
+       libraryHaskellDepends = [
+         array base binary data-default dlist filepath microlens-platform
+         mtl text yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor javascript mode";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-monokai" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {
@@ -208163,6 +209076,28 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-snippet_0_14_0" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default, free
+     , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
+     , yi-core, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-snippet";
+       version = "0.14.0";
+       sha256 = "152g3bsy50viydnhhx4b7vyyaq4frw43cbb9r3pm56wmnk4ixn7k";
+       libraryHaskellDepends = [
+         base binary containers data-default free microlens-platform mtl
+         text vector yi-core yi-rope
+       ];
+       testHaskellDepends = [
+         base containers tasty-hunit tasty-th yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Snippet support for yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-solarized" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {
@@ -209073,6 +210008,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zip;};
 
+  "zip-archive_0_3_1_1" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , digest, directory, filepath, HUnit, mtl, old-time, pretty
+     , process, temporary, text, time, unix, zip, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.3.1.1";
+       sha256 = "09c3y13r77shyamibr298i4l0rp31i41w3rg1ksnrl3gkrj8x1ly";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers digest directory filepath
+         mtl old-time pretty text time unix zlib
+       ];
+       testHaskellDepends = [
+         base bytestring directory HUnit old-time process temporary time
+         unix
+       ];
+       testToolDepends = [ zip ];
+       homepage = "http://github.com/jgm/zip-archive";
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zip;};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl
-- 
GitLab


From 2764961b877bd9a4813d21c5b2f47cf7e00e3b4a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 19 Jun 2017 21:21:15 -0400
Subject: [PATCH 0955/1490] linux: 4.12-rc5 -> 4.12-rc6

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index c56a25c3c26..6bde598c47a 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12-rc5";
-  modDirVersion = "4.12.0-rc5";
+  version = "4.12-rc6";
+  modDirVersion = "4.12.0-rc6";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0d3lpf429fqrf6i529y0pjdwnpq2v82agn3xhw4jwkriib9i425x";
+    sha256 = "0yqs65kmrksphca8f959g9ca9kpdwbp3ad5v594wvwsdk0q4sqgc";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From 8a00d896187591cabfb38931ca65cc5b0a52dbdf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:03:01 +0200
Subject: [PATCH 0956/1490] aubio: 0.4.4 -> 0.4.5

---
 pkgs/development/libraries/aubio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 3ea86b36a30..e13b102c788 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aubio-0.4.4";
+  name = "aubio-0.4.5";
 
   src = fetchurl {
     url = "http://aubio.org/pub/${name}.tar.bz2";
-    sha256 = "1y5zzwv9xjc649g4xrlqnim4q7pcwgzn0xrq3ijbmm5r4ckbkk9a";
+    sha256 = "1xkshac4wdm7r5sc04c38d6lmvv5sk4qrb5r1yy0xgsgdx781hkh";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library for audio labelling";
-    homepage = http://aubio.org/;
+    homepage = https://aubio.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ goibhniu marcweber fpletz ];
     platforms = platforms.linux;
-- 
GitLab


From aea08dd53e54aead17c8de13eae2b78a754f65d2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:54:40 +0200
Subject: [PATCH 0957/1490] kanboard: 1.0.40 -> 1.0.44

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

diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index ba1a266a42f..2a4793bfe09 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "kanboard-${version}";
-  version = "1.0.40";
+  version = "1.0.44";
 
   src = fetchzip {
-    url = "https://kanboard.net/kanboard-1.0.40.zip";
-    sha256 = "1phn3rvngch636g00rhicl0225qk6gdmxqjflkrdchv299zysswd";
+    url = "https://kanboard.net/${name}.zip";
+    sha256 = "1cwk9gcwddwbbw6hz2iqmkmy90rwddy79b9vi6fj9cl03zswypgn";
   };
 
   dontBuild = true;
-- 
GitLab


From 21b509396654c5f8740300cd74c486016f7c5c96 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:55:10 +0200
Subject: [PATCH 0958/1490] libite: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 39806d7d22c..72b4469058c 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libite-${version}";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libite";
     rev = "v${version}";
-    sha256 = "0cx566rcjq2m24yq7m88ci642x34lxy97kjb12cbi1c174k738hm";
+    sha256 = "040idgbjqr239rkd68rqzwhylryiaa0z3qkwj2l2mlscv0aq8v0j";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 19a840cb66ef2b3a5cd484b382bc7bd769810229 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:55:40 +0200
Subject: [PATCH 0959/1490] jenkins: 2.65 -> 2.66

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 2737329121a..8be5c6ebe85 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.65";
+  version = "2.66";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "0ydg8crv8a4lg2y8dihflxcb3b2fxn6ds70c9l1vwmb8j29wsli6";
+    sha256 = "05n03rm5vjzcz1f36829hwviw7i8l8d728nvr4cnf6mcl3rxciyl";
   };
 
   buildCommand = ''
-- 
GitLab


From 60cddbe3da70b5b677a545966286e1acfd5a7a5e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:56:06 +0200
Subject: [PATCH 0960/1490] screen-message: 0.24 -> 0.25

---
 pkgs/tools/X11/screen-message/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 1bb381826a1..fd5cfe03ea3 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "screen-message-${version}";
-  version = "0.24";
+  version = "0.25";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/s/screen-message/screen-message_${version}.orig.tar.gz";
-    sha256 = "1v03axr7471fmzxccl3ckv73j8gfcj615y5maxvm5phy0sd6rl49";
+    sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 7f1fc9f838b3bf12525a5b7007ace86ba614c4a4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:56:37 +0200
Subject: [PATCH 0961/1490] collectd: 5.7.0 -> 5.7.2

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

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 7d649256f86..4aa5aee4c27 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -35,12 +35,12 @@
 , libmnl ? null
 }:
 stdenv.mkDerivation rec {
-  version = "5.7.0";
+  version = "5.7.2";
   name = "collectd-${version}";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "1cpjkv4d0iifngihxikzljavya0r2k3blarlahamgbdsqsymz815";
+    sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x";
   };
 
   buildInputs = [
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Daemon which collects system performance statistics periodically";
-    homepage = http://collectd.org;
+    homepage = https://collectd.org;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor fpletz ];
-- 
GitLab


From 42dcabf4140dbaaaee4a69b101ca200c7e7b3048 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:57:04 +0200
Subject: [PATCH 0962/1490] mitmproxy: 2.0.0 -> 2.0.2

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

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 83a526a5535..36bb9cb791b 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -3,13 +3,13 @@
 python3Packages.buildPythonPackage rec {
   baseName = "mitmproxy";
   name = "${baseName}-${version}";
-  version = "2.0.0";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = baseName;
     repo = baseName;
     rev = "v${version}";
-    sha256 = "17gvr642skz4a23966lckdbrkh6mx31shi8hmakkvi91sa869i30";
+    sha256 = "1x1a28al5clpfd69rjcpw26gjjnpsm1vfl4scrwpdd1jhkw044h9";
   };
 
   propagatedBuildInputs = with python3Packages; [
-- 
GitLab


From 99bd99db3d73185214862b0ff6a7704bcfb1e196 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:57:23 +0200
Subject: [PATCH 0963/1490] bzflag: 2.4.8 -> 2.4.10

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

diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index d3792843d47..1269b434634 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bzflag";
-  version = "2.4.8";
+  version = "2.4.10";
 
   src = fetchurl {
     url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
-    sha256 = "08iiw0i0vx68d73hliiylswsm0nvnm849k37xc7iii6sflblvjj3";
+    sha256 = "1ylyd5safpraaym9fvnrqj2506dqrraaaqhrb2aa9zmjwi54aiqa";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Multiplayer 3D Tank game";
-    homepage = http://bzflag.org/;
+    homepage = https://bzflag.org/;
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz ];
-- 
GitLab


From c34d43a4ce6f9eb92bb066de63d56f003b651478 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:57:42 +0200
Subject: [PATCH 0964/1490] openttd: 1.6.1 -> 1.7.1

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

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 0c129f8d556..2ecff1c835e 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "openttd-${version}";
-  version = "1.6.1";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
-    sha256 = "1ak32fj5xkk2fvmm3g8i7wzmk4bh2ijsp8fzvvw5wj6365p9j24v";
+    sha256 = "0dhv5bbbg1dmmq7fi3xss0a9jq2rqgb5sf9fsqzlsjcdm590j6b1";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-- 
GitLab


From 735dcc1a27d471a98acf2e5fcb4d9b5a0e995ca1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:57:55 +0200
Subject: [PATCH 0965/1490] charybdis: 3.5.3 -> 3.5.5

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

diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index f63fecb66c8..b2288336d57 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, bison, flex, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "charybdis-3.5.3";
+  name = "charybdis-3.5.5";
 
   src = fetchFromGitHub {
     owner = "charybdis-ircd";
     repo = "charybdis";
     rev = name;
-    sha256 = "1s8p26lrc5vm08gi6hc5gqidgyj7v5bzm4d2g81v4xk387f85lnc";
+    sha256 = "16bl516hcj1chgzkfnpg9bf9s6zr314pqzhlz6641lgyzaw1z3w0";
   };
 
   patches = [
-- 
GitLab


From ed71a3a6785a9901e59bda5118e1f9a1fa341acc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:58:15 +0200
Subject: [PATCH 0966/1490] chrony: 3.0 -> 3.1

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

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 32a8ca5f99e..b805a4bfcf3 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null;
 stdenv.mkDerivation rec {
   name = "chrony-${version}";
 
-  version = "3.0";
+  version = "3.1";
 
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "0vfdsajz2w6b7c94rxrj7fsr234jryhl2rbdlmb7h10gla8pnf50";
+    sha256 = "0xb03dya1zhcn1gch2v2ynifxw95g8m3plr9q4ys0s3pvgf0g4cx";
   };
 
   buildInputs = [ readline texinfo nss nspr ]
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Sets your computer's clock from time servers on the Net";
-    homepage = http://chrony.tuxfamily.org/;
+    homepage = https://chrony.tuxfamily.org/;
     repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git;
     license = licenses.gpl2;
     platforms = with platforms; linux ++ freebsd ++ openbsd;
-- 
GitLab


From bc3ee6bfd47a3bab4c9491da51c550f4ec49106d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:58:31 +0200
Subject: [PATCH 0967/1490] dnsmasq: 2.76 -> 2.77

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

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 4b1717e0902..801d41c852b 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -11,11 +11,11 @@ let
   ]);
 in
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.76";
+  name = "dnsmasq-2.77";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz";
-    sha256 = "15lzih6671gh9knzpl8mxchiml7z5lfqzr7jm2r0rjhrxs6nk4jb";
+    sha256 = "12lbbwpy1wxi6n5dngv30x8g8v13apdnvjgq7w71f9dfa0f3pb3f";
   };
 
   preBuild = ''
-- 
GitLab


From e7f5e7fe3b9faa58c4f9b050456a066719c5e693 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:58:50 +0200
Subject: [PATCH 0968/1490] whois: 5.2.15 -> 5.2.16

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

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index ec573dadc64..fd1045d03d9 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  version = "5.2.15";
+  version = "5.2.16";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "0via0ls9lqmzvbbfq4zyla7si45nvkhdx0f516739f9b1jmffj04";
+    sha256 = "1axkj3xp8ryw94ml8lkqgpdqkv56aygbyv18kynf2bcglxildyvv";
   };
 
   buildInputs = [ perl gettext ];
-- 
GitLab


From 11bf721290903950a124d3741f34c2665ba52508 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:59:14 +0200
Subject: [PATCH 0969/1490] mbedtls_1_3: 1.3.18 -> 1.3.19

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

diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix
index 41c0e0a9d16..e89fabb9fb3 100644
--- a/pkgs/development/libraries/mbedtls/1.3.nix
+++ b/pkgs/development/libraries/mbedtls/1.3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-1.3.18";
+  name = "mbedtls-1.3.19";
 
   src = fetchurl {
     url = "https://tls.mbed.org/download/${name}-gpl.tgz";
-    sha256 = "188fjm0zzggxrjxnqc7zv7zz8pvys6yp1jx3xdyq8970h9qj2ad2";
+    sha256 = "03mhlh8s2378ph23m1173i7wkhrs5i6d03mk5wa7a1d3qn24jrar";
   };
 
   nativeBuildInputs = [ perl ];
-- 
GitLab


From aa583079736aea10f15cf14c0574c60a8298d48d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:59:37 +0200
Subject: [PATCH 0970/1490] mbedtls: 2.4.0 -> 2.4.2

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

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index ebab4850be4..c5eab3f74b5 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-2.4.0";
+  name = "mbedtls-2.4.2";
 
   src = fetchurl {
     url = "https://tls.mbed.org/download/${name}-gpl.tgz";
-    sha256 = "0gwyxsz7av8fyzrz4zxhcy9jmszlvg9zskz3srar75lg0bhg1vw0";
+    sha256 = "17r9qs585gqghcf5yavb1cnvsigl0f8r0k8rklr5a855hrajs7yh";
   };
 
   nativeBuildInputs = [ perl ];
-- 
GitLab


From 05cb49625d1712a3ee7658a2c59d12a5fc87ebcc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:59:52 +0200
Subject: [PATCH 0971/1490] powertop: 2.8 -> 2.9

---
 pkgs/os-specific/linux/powertop/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index 4d81126af44..5a10f455ea0 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "powertop-2.8";
+  name = "powertop-${version}";
+  version = "2.9";
 
   src = fetchurl {
-    url = "https://01.org/sites/default/files/downloads/powertop/${name}.tar.gz";
-    sha256 = "0nlwazxbnn0k6q5f5b09wdhw0f194lpzkp3l7vxansqhfczmcyx8";
+    url = "https://01.org/sites/default/files/downloads/powertop/powertop-v${version}.tar.gz";
+    sha256 = "0l4jjlf05li2mc6g8nrss3h435wjhmnqd8m7v3kha3x0x7cbfzxa";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From e60c958811186e46d9220cca8ce9700da174d9a1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:00:14 +0200
Subject: [PATCH 0972/1490] prometheus: 1.5.2 -> 1.7.1

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

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 5d7a75b2013..63ea093b4bb 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "prometheus-${version}";
-  version = "1.5.2";
+  version = "1.7.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/prometheus";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "1b24nx6gmx2c7fj92p2byla3i0zs6xwymxqji00gvgpxr8bsfhn1";
+    sha256 = "11acdwn2fw5qnyns5vdbxw18xnd2v4hb1y2cfjjxw478hhza4ni3";
   };
 
   docheck = true;
-- 
GitLab


From 294a20ea02e58d0ed47379a9f285ab3221d031bd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:00:30 +0200
Subject: [PATCH 0973/1490] smcroute: 2.1.0 -> 2.3.1

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

diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index 9a6423652b6..db47dc99468 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "smcroute-${version}";
-  version = "2.1.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "smcroute";
     rev = version;
-    sha256 = "0mmwvjqbzhzwii4g6rz3ms9fhzppnhbsrhr4jqpih2y95cz039gg";
+    sha256 = "0a1sgf9p39gbfrh7bhfg1hjqa6y18i7cig7bffmv7spqnvb50zx5";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From fcbf28d6b55aef837db6ab885efb4f915bbcf0e5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:00:48 +0200
Subject: [PATCH 0974/1490] squid: 3.5.23 -> 3.5.26

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

diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index b64dfeda667..eeec9048689 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -2,11 +2,11 @@
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "squid-3.5.23";
+  name = "squid-3.5.26";
 
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz";
-    sha256 = "1nqbljph2mbxjy1jzsis5vplfvvc2y6rdlxy609zx4hyyjchqk7s";
+    sha256 = "10m9g7wcik11gv7xqpv9wbkmmfbwxs00s1jm8hgqh63fgp5yx8ds";
   };
 
   buildInputs = [
-- 
GitLab


From a7210764eb29e0fb5f15d46e1f732a500e9ed832 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:01:17 +0200
Subject: [PATCH 0975/1490] squid4: 4.0.17 -> 4.0.20

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

diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
index 52fcad7ff95..f8c735d879b 100644
--- a/pkgs/servers/squid/4.nix
+++ b/pkgs/servers/squid/4.nix
@@ -2,11 +2,11 @@
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "squid-4.0.17";
+  name = "squid-4.0.20";
 
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
-    sha256 = "1713fqw59r3d892p5hpbkhmfcaw6jzfnngfn5f4h46sx963k87wb";
+    sha256 = "1apb496psfv513fad82m52s6x7l74lsdq2dkzifmfgh3zrlc7r9i";
   };
 
   buildInputs = [
-- 
GitLab


From eb8c14751a3532898e7941ee43a271d8739a6a21 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:01:38 +0200
Subject: [PATCH 0976/1490] lxc: 2.0.7 -> 2.0.8

---
 pkgs/os-specific/linux/lxc/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index bab7038aa47..1d432f9bbd9 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -12,11 +12,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "lxc-${version}";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
-    sha256 = "0paz0lgb9dzpgahysad1cr6gz54l6xyhqdx6dzw2kh3fy1sw028w";
+    sha256 = "15449r56rqg3487kzsnfvz0w4p5ajrq0krcsdh6c9r6g0ark93hd";
   };
 
   nativeBuildInputs = [
@@ -29,13 +29,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./support-db2x.patch
-    (fetchurl {
-      name = "CVE-2017-5985.patch";
-      url = "https://github.com/lxc/lxc/commit/d512bd5efb0e407eba350c4e649c464a65b712a3.patch";
-      sha256 = "0v1rhlfviadsxj2wmbl7nqb64p6y2bxm9y43sc44jg3k6mkr0r5c";
-    })
   ];
 
+  postPatch = ''
+    sed -i '/chmod u+s/d' src/lxc/Makefile.am
+  '';
+
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
   # FIXME
@@ -81,7 +80,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://lxc.sourceforge.net";
+    homepage = "https://linuxcontainers.org/";
     description = "Userspace tools for Linux Containers, a lightweight virtualization system";
     license = licenses.lgpl21Plus;
 
-- 
GitLab


From 9da4cb176ad08b1a370e01defcbe36e6ce78d69d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:01:53 +0200
Subject: [PATCH 0977/1490] lxcfs: 2017-03-02 -> 2.0.7

---
 pkgs/os-specific/linux/lxcfs/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 2555ce5c6c3..c23457c6b5f 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -2,15 +2,13 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  # use unstable because it fixed some serious crashes,
-  # stable should be reconsidered in future
-  name = "lxcfs-unstable-2017-03-02";
+  name = "lxcfs-2.0.7";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
-    sha256 = "1say5bf6gknzs0aymvrg2xiypc311gcdcfdmvb2vnz058pmianq9";
-    rev = "4a6707e130b4b65a33606ebc18a95ec471f4bf40";
+    rev = name;
+    sha256 = "1z6d52dc12rcplgc9jdgi3lbxm6ahlsjgs1k8v8kvn261xsq1m0a";
   };
 
   nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
@@ -34,6 +32,6 @@ stdenv.mkDerivation rec {
     description = "FUSE filesystem for LXC";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ mic92 ];
+    maintainers = with maintainers; [ mic92 fpletz ];
   };
 }
-- 
GitLab


From c9268482e0cec8fe7456fefc975ae0d41361ec9a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:02:54 +0200
Subject: [PATCH 0978/1490] lxd: 2.12 -> 2.14

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

diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index cba686f9c4c..1aec4209b4d 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "lxd-${version}";
-  version = "2.12";
+  version = "2.14";
   rev = "lxd-${version}";
 
   goPackagePath = "github.com/lxc/lxd";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "lxc";
     repo = "lxd";
-    sha256 = "1znqsf6iky21kddvl13bf0lsj65czabwysdbvha24lm16s51mv0p";
+    sha256 = "1jy60lb2m0497bnjj09qvflsj2rb0jjmlb8pm1xn5g4lpzibszjm";
   };
 
   goDeps = ./deps.nix;
@@ -21,7 +21,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Daemon based on liblxc offering a REST API to manage containers";
-    homepage = https://github.com/lxc/lxd;
+    homepage = https://linuxcontainers.org/lxd/;
     license = licenses.asl20;
     maintainers = with maintainers; [ globin fpletz ];
     platforms = platforms.linux;
-- 
GitLab


From 65b3f5e8e7000c2d945e812fdf0f0d2310795f52 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:22:20 +0200
Subject: [PATCH 0979/1490] kea: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index ca1846edb04..8a474812e19 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "kea";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
-    sha256 = "0b9w71d7pfgr0asqpffh9h935xpvwabyfdvdzqzna6da9zp7mnf3";
+    sha256 = "0afiab6c8cw0w3m0l4hrc4g8bs9y3z59fdr16xnba01nn52mkl92";
   };
 
   patches = [ ./dont-create-var.patch ];
-- 
GitLab


From ffb0ddc51607913fdb144863c048eb89d7f1a10e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:31:25 +0200
Subject: [PATCH 0980/1490] bandwidth: 1.3.1 -> 1.4.2

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

diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 8b0e1719196..143918baa9c 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "bandwidth-${version}";
-  version = "1.3.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "http://zsmith.co/archives/${name}.tar.gz";
-    sha256 = "13a0mxrkybpwiynv4cj8wsy8zl5xir5xi1a03fzam5gw815dj4am";
+    sha256 = "1p1kp5s3fdgy667q7mc9ywnps0sbj4lpr42561yhi59m69n8c3kd";
   };
 
   buildInputs = [ nasm ];
-- 
GitLab


From d7624d667733aac9059fbd190a8dafb61df8bb72 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:37:28 +0200
Subject: [PATCH 0981/1490] icecast: 2.4.1 -> 2.4.3

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

diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix
index d241b59c3fe..f1bd1a4c9d8 100644
--- a/pkgs/servers/icecast/default.nix
+++ b/pkgs/servers/icecast/default.nix
@@ -3,11 +3,11 @@
 , libvorbis, libtheora, speex, libkate, libopus }:
 
 stdenv.mkDerivation rec {
-  name = "icecast-2.4.1";
+  name = "icecast-2.4.3";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz";
-    sha256 = "0js5lylrgklhvvaksx46zc8lc975qb1bns8h1ms545nv071rxy23";
+    sha256 = "14n5vm2xnyn8y7kl46lnnlgv6v5fjykhc57ffdsh0qaxfs6a8p68";
   };
 
   buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ];
-- 
GitLab


From 1ae0f2a1d4f773e34fba76f329baf237276af422 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:43:36 +0200
Subject: [PATCH 0982/1490] ipmitool: 1.8.17 -> 1.8.18

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

diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index dcbea515677..fe411edfcda 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, openssl, static ? false }:
+{ stdenv, lib, fetchurl, openssl, static ? false }:
 
 let
   pkgname = "ipmitool";
-  version = "1.8.17";
+  version = "1.8.18";
 in
 stdenv.mkDerivation {
   name = "${pkgname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz";
-    sha256 = "0qcrz1d1dbjg46n3fj6viglzcxlf2q15xa7bx9w1hm2hq1r3jzbi";
+    sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m";
   };
 
   patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -28,10 +28,11 @@ stdenv.mkDerivation {
   makeFlags = if static then "AM_LDFLAGS=-all-static" else "";
   dontDisableStatic = static;
 
-  meta = {
+  meta = with lib; {
     description = ''Command-line interface to IPMI-enabled devices'';
-    license = stdenv.lib.licenses.bsd3;
-    homepage = http://ipmitool.sourceforge.net;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.bsd3;
+    homepage = https://sourceforge.net/projects/ipmitool/;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
   };
 }
-- 
GitLab


From c8948e9109f37dc8ef8ed0a9739ffb323a2b67a5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:50:03 +0200
Subject: [PATCH 0983/1490] josm: 11826 -> 12275

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 753d27b3376..b53a49d584d 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "11826";
+  version = "12275";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "0x59n6klkxkaqcqgbkscdynyp0grfxdil2fxmg710yp8vkzg0zk2";
+    sha256 = "14y8ga1g3s9234zcgan16sw6va19jlwhfq39z0ayqmzna0fxi88a";
   };
 
   phases = [ "installPhase" ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "An extensible editor for ​OpenStreetMap";
+    description = "An extensible editor for OpenStreetMap";
     homepage = https://josm.openstreetmap.de/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
-- 
GitLab


From 5d851e8be820bb4ec12bafb331426445c1c283ca Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:55:48 +0200
Subject: [PATCH 0984/1490] ipv6calc: 0.99.1 -> 0.99.2

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

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index e41b65d3d25..aea77f72512 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "ipv6calc-${version}";
-  version = "0.99.1";
+  version = "0.99.2";
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
-    sha256 = "0a0xpai14y969hp6l10r2wcd16sqf3v40fq5h97m4a69hcpmvg5h";
+    sha256 = "1vs64v8v5g9rskg46baqrzyay86vs7ln3i5r5ippa9l6ildyrvpj";
   };
 
   buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ];
-- 
GitLab


From 726645a94f8f6f276ce3b2c0280571371e3b7535 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:01:26 +0200
Subject: [PATCH 0985/1490] tpacpi-bat: 3.0 -> 3.1

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

diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix
index bf60331d8ad..fbc1685c577 100644
--- a/pkgs/os-specific/linux/tpacpi-bat/default.nix
+++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix
@@ -3,13 +3,13 @@
 # Requires the acpi_call kernel module in order to run.
 stdenv.mkDerivation rec {
   name = "tpacpi-bat-${version}";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "teleshoes";
     repo = "tpacpi-bat";
     rev = "v${version}";
-    sha256 = "0l72qvjk5j7sg9x4by7an0xwx65x10dx82fky8lnwlwfv54vgg8l";
+    sha256 = "0wbaz34z99gqx721alh5vmpxpj2yxg3x9m8jqyivfi1wfpwc2nd5";
   };
 
   buildInputs = [ perl ];
-- 
GitLab


From 83a4180947cd2e774fcbb857c74459ad56076dde Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:18:19 +0200
Subject: [PATCH 0986/1490] thc-hydra: 8.2 -> 8.5

---
 pkgs/tools/security/thc-hydra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 7fcde2a0350..e8eb3aacd3e 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -6,11 +6,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "thc-hydra-${version}";
-  version = "8.2";
+  version = "8.5";
 
   src = fetchurl {
     url = "http://www.thc.org/releases/hydra-${version}.tar.gz";
-    sha256 = "1i2a5glmrxdjr80gfppx6wgakflcpj3ksgng212fjzhxr9m4k24y";
+    sha256 = "0vfx6xwmw0r7nd0s232y7rckcj58fc1iqjgp4s56rakpz22b4yjm";
   };
 
   preConfigure = ''
-- 
GitLab


From 22e0683aa8909b33953cd7d1acd91389897c165d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:19:34 +0200
Subject: [PATCH 0987/1490] thermald: 1.5.4 -> 1.6

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

diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index ddd6740c983..983c881d388 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "thermald-${version}";
-  version = "1.5.4";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thermal_daemon";
     rev = "v${version}";
-    sha256 = "0yrlnm1blfxi97af4dbx6xm5w1p8r20raiim1ng08gbqbgnjg56g";
+    sha256 = "1qzvmzkzdrmwrzfbxb2rz1i39j5zskjxiiv1w9m0xyg08p2wr7h3";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];
-- 
GitLab


From f33708bb7d7e0b7b417afebaf9ce27df17cbff55 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:25:43 +0200
Subject: [PATCH 0988/1490] opusTools: 0.1.9 -> 0.1.10

---
 pkgs/applications/audio/opus-tools/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index cee86f45685..658ba1700f2 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -1,13 +1,14 @@
 {stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}:
 
 stdenv.mkDerivation rec {
-  name = "opus-tools-0.1.9";
+  name = "opus-tools-0.1.10";
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
-    sha256 = "0fk4nknvl111k89j5yckmyrh6b2wvgyhrqfncp7rig3zikbkv1xi";
+    sha256 = "135jfb9ny3xvd27idsxj7j5ns90lslbyrq70cq3bfwcls4r7add2";
   };
 
-  buildInputs = [ libogg libao pkgconfig libopus flac ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libogg libao libopus flac ];
 
   meta = {
     description = "Tools to work with opus encoded audio streams";
-- 
GitLab


From 22fbdc90328f93769ce9c7990d3d3f43f7240826 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:26:14 +0200
Subject: [PATCH 0989/1490] uhd: 3.10.1 -> 3.10.1.1

---
 pkgs/development/tools/misc/uhd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix
index 8857e1d1e91..e3af8181601 100644
--- a/pkgs/development/tools/misc/uhd/default.nix
+++ b/pkgs/development/tools/misc/uhd/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   name = "uhd-${version}";
-  version = "3.10.1";
+  version = "3.10.1.1";
 
   # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
   # and xxx.yyy.zzz. Hrmpf...
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EttusResearch";
     repo = "uhd";
-    rev = "release_003_010_001_000";
-    sha256 = "1wypn1cspwx331ah7awajjhnpyjykiif0h1l4fb3lahxvsnkwi51";
+    rev = "release_003_010_001_001";
+    sha256 = "009pynjfpwbf3vfyg4w5yhcn4xb93afagqb3p5svjxzswh90j1d2";
   };
 
   enableParallelBuilding = true;
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       USRP devices are designed and sold by Ettus Research, LLC and its parent
       company, National Instruments.
     '';
-    homepage = http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki;
+    homepage = https://uhd.ettus.com/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor fpletz ];
-- 
GitLab


From 1466bdd98fc6eef0c42d41d1284d5233dc307eef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:39:39 +0200
Subject: [PATCH 0990/1490] wireshark: 2.2.6 -> 2.2.7

---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 4e5d9893c2c..326529d1e0f 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.2.6";
+  version = "2.2.7";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
-    sha256 = "0jd89i9si43lyv3hsl6p1lkjmz4zagvc37wcbigsxxc5v8gda9zn";
+    sha256 = "1dfvhra5v6xhzbp097qsxi0zvirw0srbasl4v1wjf58v49idz7b8";
   };
 
   nativeBuildInputs = [
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.wireshark.org/;
+    homepage = https://www.wireshark.org/;
     description = "Powerful network protocol analyzer";
     license = licenses.gpl2;
 
-- 
GitLab


From b0b918224164e5ae3975892d57bb5ec018eb868c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:39:54 +0200
Subject: [PATCH 0991/1490] gnuradio: 3.7.10.1 -> 3.7.11

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

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 497ac298d28..8218285c5fb 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnuradio-${version}";
-  version = "3.7.10.1";
+  version = "3.7.11";
 
   src = fetchurl {
-    url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
-    sha256 = "0ds9mcw8hgm03f82jvp3j4mm02ha6zvsl77lp13jzqmbqifbdmv3";
+    url = "https://gnuradio.org/releases/gnuradio/${name}.tar.gz";
+    sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7";
   };
 
   buildInputs = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
       environments to support both wireless communications research and
       real-world radio systems.
     '';
-    homepage = http://www.gnuradio.org;
+    homepage = https://www.gnuradio.org;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor fpletz ];
-- 
GitLab


From 03d1e8a14ec29388f6a50c2900c7d4f48c491214 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:42:51 +0200
Subject: [PATCH 0992/1490] iproute: 4.9.0 -> 4.11.0

---
 pkgs/os-specific/linux/iproute/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 1ff68fc0408..4ffc99b6ced 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
-  version = "4.9.0";
+  version = "4.11.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0";
+    sha256 = "09l0phf09mw17bn3xlzfr80sbhw14mq8xv28iz5x15m6pll10rvj";
   };
 
   patches = lib.optionals enableFan [
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     "MANDIR=$(out)/share/man"
     "BASH_COMPDIR=$(out)/share/bash-completion/completions"
     "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs
+    "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers
   ];
 
   buildFlags = [
@@ -47,10 +48,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2;
+    homepage = https://wiki.linuxfoundation.org/networking/iproute2;
     description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";
     platforms = platforms.linux;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ eelco wkennington ];
+    maintainers = with maintainers; [ eelco wkennington fpletz ];
   };
 }
-- 
GitLab


From 47f7aa96b0dc3756ed324790c71187ce865ff2a0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 04:57:40 +0200
Subject: [PATCH 0993/1490] sudo: 1.8.20p1 -> 1.8.20p2

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

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 840d24f6e67..6f662206350 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.20p1";
+  name = "sudo-1.8.20p2";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "07fvh8qy0l1h93lccc625f48d8yp0pkp5rjjykq13pb07ar0x64y";
+    sha256 = "1na5likm1srnd1g5sjx7b0543sczw0yppacyqsazfdg9b48awhmx";
   };
 
   prePatch = ''
-- 
GitLab


From 127937f0b6248d7ed797a36bfa3cca798325e19b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:06:03 +0200
Subject: [PATCH 0994/1490] aptly: 0.9.7 -> 1.0.1

---
 pkgs/tools/misc/aptly/default.nix |   8 +-
 pkgs/tools/misc/aptly/deps.nix    | 245 ------------------------------
 2 files changed, 3 insertions(+), 250 deletions(-)
 delete mode 100644 pkgs/tools/misc/aptly/deps.nix

diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index ccb13f2e42c..2398d9019dc 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -2,21 +2,21 @@
 
 let
 
-  version = "0.9.7";
+  version = "1.0.1";
   rev = "v${version}";
 
   aptlySrc = fetchFromGitHub {
     inherit rev;
     owner = "smira";
     repo = "aptly";
-    sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00";
+    sha256 = "0rqxdhy2mlwndxhqb447gz626q92zd09rpvhysr2g1rx9nxa039p";
   };
 
   aptlyCompletionSrc = fetchFromGitHub {
     rev = version;
     owner = "aptly-dev";
     repo = "aptly-bash-completion";
-    sha256 = "1yz3pr2jfczqv81as2q3cizwywj5ksw76vi15xlbx5njkjp4rbm4";
+    sha256 = "0dkc4z687yk912lpv8rirv0nby7iny1zgdvnhdm5b47qmjr1sm5q";
   };
 
 in
@@ -27,12 +27,10 @@ buildGoPackage {
   src = aptlySrc;
 
   goPackagePath = "github.com/smira/aptly";
-  goDeps = ./deps.nix;
 
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
-    rm $bin/bin/man
     mkdir -p $bin/share/bash-completion/completions
     ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions
     wrapProgram "$bin/bin/aptly" \
diff --git a/pkgs/tools/misc/aptly/deps.nix b/pkgs/tools/misc/aptly/deps.nix
deleted file mode 100644
index f0163f34ae8..00000000000
--- a/pkgs/tools/misc/aptly/deps.nix
+++ /dev/null
@@ -1,245 +0,0 @@
-[
-    {
-      goPackagePath = "github.com/AlekSi/pointer";
-      fetch = {
-        type = "git";
-        url = https://github.com/AlekSi/pointer.git;
-        rev = "5f6d527dae3d678b46fbb20331ddf44e2b841943";
-        sha256 = "127n71d8y1d8hxv9fq9z1midw3vk5xa6aq45gffjvwabx4cgha1l";
-      };
-    }
-    {
-      goPackagePath = "github.com/awalterschulze/gographviz";
-      fetch = {
-        type = "git";
-        url = https://github.com/awalterschulze/gographviz.git;
-        rev = "20d1f693416d9be045340150094aa42035a41c9e";
-        sha256 = "1q4796nzanikqmz77jdc2xrq30n93w6ljcfsbhij3yj3s698bcaf";
-      };
-    }
-    {
-      goPackagePath = "github.com/aws/aws-sdk-go";
-      fetch = {
-        type = "git";
-        url = https://github.com/aws/aws-sdk-go.git;
-        rev = "a170e9cb76475a0da7c0326a13cc2b39e9244b3b";
-        sha256 = "0z7pgb9q0msvdkrvjwi95cbl9k9w8f3n2liwkl6fli0nx9jyamqw";
-      };
-    }
-    {
-      goPackagePath = "github.com/cheggaaa/pb";
-      fetch = {
-        type = "git";
-        url = https://github.com/cheggaaa/pb.git;
-        rev = "2c1b74620cc58a81ac152ee2d322e28c806d81ed";
-        sha256 = "148fv6a0ranzcc1lv4v5lmvgbfx05dhzpwsg8vxi9ggn51n496ny";
-      };
-    }
-    {
-      goPackagePath = "github.com/DisposaBoy/JsonConfigReader";
-      fetch = {
-        type = "git";
-        url = https://github.com/DisposaBoy/JsonConfigReader.git;
-        rev = "33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4";
-        sha256 = "1rq7hp1xk8lzvn9bv9jfkszw8p2qia8prvrx540gb2y93jw9i847";
-      };
-    }
-    {
-      goPackagePath = "github.com/gin-gonic/gin";
-      fetch = {
-        type = "git";
-        url = https://github.com/gin-gonic/gin.git;
-        rev = "b1758d3bfa09e61ddbc1c9a627e936eec6a170de";
-        sha256 = "0y3v5vi68xafcvz9yz6ffww96xs2qalklnaab7vrwpax3brlkipk";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-ini/ini";
-      fetch = {
-        type = "git";
-        url = https://github.com/go-ini/ini.git;
-        rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
-        sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia";
-      };
-    }
-    {
-      goPackagePath = "github.com/jlaffaye/ftp";
-      fetch = {
-        type = "git";
-        url = https://github.com/jlaffaye/ftp.git;
-        rev = "fec71e62e457557fbe85cefc847a048d57815d76";
-        sha256 = "08ivzsfswgl4xlr6wmqpbf77jclh8ivhwxlhj59allp27lic1kgm";
-      };
-    }
-    {
-      goPackagePath = "github.com/jmespath/go-jmespath";
-      fetch = {
-        type = "git";
-        url = https://github.com/jmespath/go-jmespath.git;
-        rev = "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74";
-        sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
-      };
-    }
-    {
-      goPackagePath = "github.com/julienschmidt/httprouter";
-      fetch = {
-        type = "git";
-        url = https://github.com/julienschmidt/httprouter.git;
-        rev = "46807412fe50aaceb73bb57061c2230fd26a1640";
-        sha256 = "0mvzjpzlb1gkb6lp0nwni3vid6fw33dkzl6s9gj7gp2wsbwzcdhd";
-      };
-    }
-    {
-      goPackagePath = "github.com/mattn/go-shellwords";
-      fetch = {
-        type = "git";
-        url = https://github.com/mattn/go-shellwords.git;
-        rev = "c7ca6f94add751566a61cf2199e1de78d4c3eee4";
-        sha256 = "1714ca0p0mwijck0vxdssizxyjjjki1dpc5bl51ayw5sa7s6d4n2";
-      };
-    }
-    {
-      goPackagePath = "github.com/mkrautz/goar";
-      fetch = {
-        type = "git";
-        url = https://github.com/mkrautz/goar.git;
-        rev = "282caa8bd9daba480b51f1d5a988714913b97aad";
-        sha256 = "0b6nmgyh5lmm8d1psm5yqqmshkqi87di1191c9q95z1gkkfi16b2";
-      };
-    }
-    {
-      goPackagePath = "github.com/mxk/go-flowrate";
-      fetch = {
-        type = "git";
-        url = https://github.com/mxk/go-flowrate.git;
-        rev = "cca7078d478f8520f85629ad7c68962d31ed7682";
-        sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541";
-      };
-    }
-    {
-      goPackagePath = "github.com/ncw/swift";
-      fetch = {
-        type = "git";
-        url = https://github.com/ncw/swift.git;
-        rev = "384ef27c70645e285f8bb9d02276bf654d06027e";
-        sha256 = "1is9z6pbn55yr5b7iizfyi8y19nc9xprd87cwab4i54bxkqqp5hg";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/go-aws-auth";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/go-aws-auth.git;
-        rev = "0070896e9d7f4f9f2d558532b2d896ce2239992a";
-        sha256 = "0ic7fgpgr8n1gvhwab1isbm82azy8kb9bzjxsch5i2dpvnz03rvh";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/go-xz";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/go-xz.git;
-        rev = "0c531f070014e218b21f3cfca801cc992d52726d";
-        sha256 = "1wpgw8y6xjyf75dfcirx58cr1c277avdb6hr7xvcddhcfn01qzma";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/commander";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/commander.git;
-        rev = "f408b00e68d5d6e21b9f18bd310978dafc604e47";
-        sha256 = "0gzhxjni17qq0z4zhakjrp98qd0qmf6wlyrx5xwwsqgh07nyzssa";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/flag";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/flag.git;
-        rev = "357ed3e599ffcbd4aeaa828e1d10da2df3ea5107";
-        sha256 = "0wh77lz7z23rs9mbyi89l28i16gp1zx2312zxs4ngqdvjvinsiri";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/go-ftp-protocol";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/go-ftp-protocol.git;
-        rev = "066b75c2b70dca7ae10b1b88b47534a3c31ccfaa";
-        sha256 = "1az9p44fa7bcw92ywcyrqch2j1781b96rpid2qggyp3nhjivx8rx";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/go-uuid";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/go-uuid.git;
-        rev = "ed3ca8a15a931b141440a7e98e4f716eec255f7d";
-        sha256 = "1vasidfa2pqrawk4zm5bqsi5q7f3qx3xm159hs36r0h0kj0c7sz4";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/lzma";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/lzma.git;
-        rev = "7f0af6269940baa2c938fabe73e0d7ba41205683";
-        sha256 = "0ka8mbyg2dj076aslbi1hiahw5n5gjyn7s4w3x4ws9ak5chw5zif";
-      };
-    }
-    {
-      goPackagePath = "github.com/golang/snappy";
-      fetch = {
-        type = "git";
-        url = https://github.com/golang/snappy.git;
-        rev = "723cc1e459b8eea2dea4583200fd60757d40097a";
-        sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h";
-      };
-    }
-    {
-      goPackagePath = "github.com/syndtr/goleveldb";
-      fetch = {
-        type = "git";
-        url = https://github.com/syndtr/goleveldb.git;
-        rev = "917f41c560270110ceb73c5b38be2a9127387071";
-        sha256 = "0ybpcizg2gn3ln9rycqbaqlclci3k2q8mipcwq7927ym113d7q32";
-      };
-    }
-    {
-      goPackagePath = "github.com/ugorji/go";
-      fetch = {
-        type = "git";
-        url = https://github.com/ugorji/go.git;
-        rev = "71c2886f5a673a35f909803f38ece5810165097b";
-        sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";
-      };
-    }
-    {
-      goPackagePath = "github.com/vaughan0/go-ini";
-      fetch = {
-        type = "git";
-        url = https://github.com/vaughan0/go-ini.git;
-        rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
-        sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
-      };
-    }
-    {
-      goPackagePath = "github.com/wsxiaoys/terminal";
-      fetch = {
-        type = "git";
-        url = https://github.com/wsxiaoys/terminal.git;
-        rev = "5668e431776a7957528361f90ce828266c69ed08";
-        sha256 = "0dirblp3lwijsrx590qfp8zn5xspkjzq7ihkv05806mpncg5ivxd";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/crypto";
-      fetch = {
-        type = "git";
-        url = https://go.googlesource.com/crypto.git;
-        rev = "a7ead6ddf06233883deca151dffaef2effbf498f";
-        sha256 = "0gyvja1kh6xkxy7mg5y72zpvmi6hfix34kmzg4sry1x7bycw3dfc";
-      };
-    }
-]
-- 
GitLab


From b6cf652e08bb132a69eb7be16b4f3eb6344bf9d1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:19:31 +0200
Subject: [PATCH 0995/1490] boinc: 7.4.42 -> 7.8.0

---
 .../science/misc/boinc/default.nix            | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 54be212b86c..716d6d9687c 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -2,20 +2,28 @@
 mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
 sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
 
+let
+  majorVersion = "7.8";
+  minorVersion = "0";
+in
+
 stdenv.mkDerivation rec {
-  version = "7.4.42";
+  version = "${majorVersion}.${minorVersion}";
   name = "boinc-${version}";
 
   src = fetchFromGitHub {
+    name = "${name}-src";
     owner = "BOINC";
     repo = "boinc";
-    rev = "561fbdae0cac3be996136319828f43cbc62c9";
-    sha256 = "1rlh463yyz88p2g5pc6avndn3x1162vcksgbqich0i3qb90jms29";
+    rev = "client_release/${majorVersion}/${version}";
+    sha256 = "08kv3fai79cc28vmyi0y4xcdd5h9xgkn9yyc6y36c0mglaxsn4pr";
   };
 
-  buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
-    freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver libnotify patchelf libX11
-    libxcb xcbutil
+  nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ];
+
+  buildInputs = [
+    curl mesa libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver
+    libnotify patchelf libX11 libxcb xcbutil
   ];
 
   NIX_LDFLAGS = "-lX11";
@@ -31,11 +39,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Free software for distributed and grid computing";
-
     homepage = http://boinc.berkeley.edu/;
-
     license = stdenv.lib.licenses.lgpl2Plus;
-
     platforms = stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
-- 
GitLab


From e9840d04827582362f8aa9d5c5f95103948ce366 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:27:48 +0200
Subject: [PATCH 0996/1490] librepo 1.7.18 -> 1.7.20

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

diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index 4b9b593655b..99a5013e217 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }:
 
 stdenv.mkDerivation rec {
-  version = "1.7.18";
+  version = "1.7.20";
   name = "librepo-${version}";
 
   src = fetchFromGitHub {
     owner  = "rpm-software-management";
     repo   = "librepo";
     rev    = name;
-    sha256 = "05iqx2kvfqsskb2r3n5p8f91i4gd4pbw6nh30pn532mgab64cvxk";
+    sha256 = "17fgj2wifn2qxmh1p285fbwys0xbvwbnmxsdfvqyr5njpyl2s99h";
   };
 
   patchPhase = ''
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
       --replace ' ''${PYTHON_INSTALL_DIR}' " $out/lib/python2.7/site-packages"
   '';
 
-  buildInputs = [ cmake python2 pkgconfig expat glib pcre openssl curl check attr gpgme ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ python2 expat glib pcre openssl curl check attr gpgme ];
 
   # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
   propagatedBuildInputs = [ curl gpgme expat ];
-- 
GitLab


From cacc16c39090e2f891053285a6f4f107a1440d56 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:30:43 +0200
Subject: [PATCH 0997/1490] libass: 0.13.4 -> 0.13.7

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

diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index b3345c47732..058839f70f8 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -19,11 +19,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
-  version = "0.13.4";
+  version = "0.13.7";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1dlzkjybnpl2fkvyjq0qblb7qw12cs893bs7zj3rvf8ij342yjnq";
+    sha256 = "17byv926w1mxn56n896sxvdq4m0yv1l7qbm688h6zr3nzgsyarbh";
   };
 
   configureFlags = [
-- 
GitLab


From 63eb0e9c37270e7d4ca32d46033a7ec39e65ace3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:36:46 +0200
Subject: [PATCH 0998/1490] libbsd: 0.8.3 -> 0.8.4

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

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 013fea3e9fc..a1a61e33668 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libbsd-${version}";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchurl {
     url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1a1l7afchlvvj2zfi7ajcg26bbkh5i98y2v5h9j5p1px9m7n6jwk";
+    sha256 = "1cya8bv976ijv5yy1ix3pzbnmp9k2qqpgw3dx98k2w0m55jg2yi1";
   };
 
   # darwin changes configure.ac which means we need to regenerate
-- 
GitLab


From 45035b74df48c6f0a72dd750fa7d1ebcbabcc3b8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:45:10 +0200
Subject: [PATCH 0999/1490] libchardet: 1.0.4 -> 1.0.5

---
 pkgs/development/libraries/libchardet/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
index b12b642668b..410c83953aa 100644
--- a/pkgs/development/libraries/libchardet/default.nix
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libchardet-1.0.4";
-  
-  src = fetchurl {
-    url = "http://yupmin.net/wp-content/uploads/2014/03/libchardet-1.0.4.tar.bz2";
-    sha256 = "0cvwba4la25qw70ap8jd5r743a9jshqd26nnbh5ph68zj1imlgzl";
+  name = "libchardet-${version}";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "Joungkyun";
+    repo = "libchardet";
+    rev = version;
+    sha256 = "0c1k5hf3ssh3cm72w2zpy5k73vhy1gyq5s9rqdawqqa4al8syyvn";
   };
 
   nativeBuildInputs = [ perl ];
-- 
GitLab


From 17026869c80882f7ed053fc7c2bdc9d0f5d5c6ef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:52:57 +0200
Subject: [PATCH 1000/1490] libpwquality: 1.3.0 -> 1.4.0

---
 .../libraries/libpwquality/default.nix        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index 3e4fe99df4c..a5a428010b2 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -1,17 +1,23 @@
-{ stdenv, fetchurl, cracklib, python }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }:
 
 stdenv.mkDerivation rec {
   name = "libpwquality-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
-  src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2";
-    sha256 = "0aidriag6h0syfm33nzdfdsqgrnsgihwjv3a5lgkqch3w68fmlkl";
+  src = fetchFromGitHub {
+    owner = "libpwquality";
+    repo = "libpwquality";
+    rev = name;
+    sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd";
   };
 
+  nativeBuildInputs = [ autoreconfHook perl ];
   buildInputs = [ cracklib python ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with lib; {
+    description = "Password quality checking and random password generation library";
+    homepage = "https://github.com/libpwquality/libpwquality";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From baf28b60e47356b54f6b8baf14f039b40191edef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:57:03 +0200
Subject: [PATCH 1001/1490] libcap_ng: 0.7.7 -> 0.7.8

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

diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix
index ea54f1a39fd..d4625687c47 100644
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/pkgs/os-specific/linux/libcap-ng/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   name = "libcap-ng-${version}";
   # When updating make sure to test that the version with
   # all of the python bindings still works
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.gz";
-    sha256 = "0syhyrixk7fqvwis3k7iddn75g0qxysc1q5fifvzccxk7774jmb1";
+    sha256 = "0pyhjxgsph3p28ayk4ynxab6wvzaqmazk1nkamx11m2w8jbzj6n2";
   };
 
   nativeBuildInputs = [ swig ];
-- 
GitLab


From 3c33ceadb6c4b60bf7b9886b6473a3c18ebe78d6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 06:27:25 +0200
Subject: [PATCH 1002/1490] libpfm: 4.5.0 -> 4.8.0

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

diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index c08ff265194..34b09d45044 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.5.0";
+  version = "4.8.0";
   name = "libpfm-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz";
-    sha1 = "857eb066724e2a5b723d6802d217c8eddff79082";
+    sha256 = "0s6gcvrhj2h928cqc8399189annif7yl74k6wda446r0fdx7i4wi";
   };
 
   installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true";
-- 
GitLab


From 84a3f1c67257a18d08d5397cc91f259b4a3091bc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 06:48:21 +0200
Subject: [PATCH 1003/1490] libnotify: 0.7.6 -> 0.7.7

---
 .../libraries/libnotify/default.nix           | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index c26a64ec804..41a9cf518e4 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -1,27 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
-, glib, gdk_pixbuf, gobjectIntrospection, autoreconfHook }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook
+, glib, gdk_pixbuf, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   ver_maj = "0.7";
-  ver_min = "6";
+  ver_min = "7";
   name = "libnotify-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz";
-    sha256 = "0dyq8zgjnnzcah31axnx6afb21kl7bks1gvrg4hjh3nk02j1rxhf";
+    sha256 = "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w";
   };
 
-  # see Gentoo ebuild - we don't need to depend on gtk+(2/3)
-  preAutoreconf = ''
-    sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
-    sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die
-  '';
+  # disable tests as we don't need to depend on gtk+(2/3)
+  configureFlags = [ "--disable-tests" ];
 
-  buildInputs = [ pkgconfig automake autoconf autoreconfHook
-                  libtool glib gdk_pixbuf gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ glib gdk_pixbuf gobjectIntrospection ];
 
   meta = {
-    homepage = http://galago-project.org/; # very obsolete but found no better
+    homepage = https://developer.gnome.org/notification-spec/;
     description = "A library that sends desktop notifications to a notification daemon";
     platforms = stdenv.lib.platforms.unix;
   };
-- 
GitLab


From f4734e75db9dc31ac0d16bf9851d752c10676333 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:03:53 +0200
Subject: [PATCH 1004/1490] libnl: 3.2.29 -> 3.3.0

---
 pkgs/os-specific/linux/libnl/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index dc0dadf92e0..8066eddd4f3 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:
 
-let version = "3.2.29"; in
+let version = "3.3.0"; in
 stdenv.mkDerivation {
   name = "libnl-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0y8fcb1bfbdvxgckq5p6l4jzx0kvv3g11svy6d5v3i6zy9kkq8wh";
-    rev = "libnl3_2_29";
     repo = "libnl";
     owner = "thom311";
+    rev = "libnl${lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "1796kyq2lkhz2802v9kp32vlxf8ynlyqgyw9nhmry3qh5d0ahcsv";
   };
 
   outputs = [ "bin" "dev" "out" "man" ];
 
   nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
 
-  meta = {
+  meta = with lib; {
     inherit version;
     homepage = "http://www.infradead.org/~tgr/libnl/";
-    description = "Linux NetLink interface library";
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+    description = "Linux Netlink interface library suite";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.linux;
   };
 }
-- 
GitLab


From 12a31293ad046580acc097f3c706c65ed17d7d9b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:04:16 +0200
Subject: [PATCH 1005/1490] quagga: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index b60212dea01..ba3cc6dae76 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "quagga-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "mirror://savannah/quagga/${name}.tar.gz";
-    sha256 = "1qyw675hrs3f67zprdbyw91wldmyihv97ibn1f99ypcp6x6n8hqh";
+    sha256 = "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda";
   };
 
   buildInputs =
-- 
GitLab


From 7d1eb8a56349428efddd411b789ad5b48b13cf37 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:12:32 +0200
Subject: [PATCH 1006/1490] libnice: 0.1.13 -> 0.1.14

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

diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index a9d07701dd9..09be1b41353 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1 }:
+{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "libnice-0.1.13";
+  name = "libnice-0.1.14";
 
   src = fetchurl {
     url = "http://nice.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1q8rhklbz1zla67r4mw0f7v3m5b32maj0prnr0kshcz97fgjs4b1";
+    sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];
   propagatedBuildInputs = [ glib gupnp_igd ];
 
   meta = {
-- 
GitLab


From c2a271e825f18ee45354153efbc1ff84b9f332ff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:19:41 +0200
Subject: [PATCH 1007/1490] libmtp: 1.1.11 -> 1.1.13

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

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index b187c213bee..8892b016fe8 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.11";
+  name = "libmtp-1.1.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "1sc768q2cixwanlwrz95mp389iaadl4s95486caavxx4g7znvn8m";
+    sha256 = "0h3dv9py5mmvxhfxmkr8ky4s80hgq3d66cmrfnnnlcdwpwpy0kj9";
   };
 
   outputs = [ "bin" "dev" "out" ];
-- 
GitLab


From 7bddc281760fd61f43ff7f468ba8bd33ad85613f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:20:41 +0200
Subject: [PATCH 1008/1490] libmikmod: 3.3.10 -> 3.3.11

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

diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index f6dc4b86292..8071d386db0 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -4,10 +4,10 @@ let
   inherit (stdenv.lib) optional optionals optionalString;
 
 in stdenv.mkDerivation rec {
-  name = "libmikmod-3.3.10";
+  name = "libmikmod-3.3.11";
   src = fetchurl {
     url = "mirror://sourceforge/mikmod/${name}.tar.gz";
-    sha256 = "0j7g4jpa2zgzw7x6s3rldypa7zlwjvn97rwx0sylx1iihhlzbcq0";
+    sha256 = "1smb291jr4qm2cdk3gfpmh0pr23rx3jw3fw0j1zr3b4ih7727fni";
   };
 
   buildInputs = [ texinfo ]
-- 
GitLab


From 57a889bcfa0096643bf999a9118350955466924b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:24:20 +0200
Subject: [PATCH 1009/1490] liblockfile: 1.09 -> 1.14

---
 pkgs/development/libraries/liblockfile/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix
index e7e4cd6c75d..46ea9fe6ee5 100644
--- a/pkgs/development/libraries/liblockfile/default.nix
+++ b/pkgs/development/libraries/liblockfile/default.nix
@@ -2,23 +2,22 @@
 
 stdenv.mkDerivation rec {
   _name   = "liblockfile";
-  version = "1.09";
+  version = "1.14";
   name    = "${_name}-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz";
-    sha256 = "0zqvbxls1632wqfhv4v3q2djzlz9391h0wdgsvhnaqrr0nx9x5qn";
+    sha256 = "0q6hn78fnzr6lhisg85a948rmpsd9rx67skzx3vh9hnbx2ix8h5b";
   };
 
   preConfigure = ''
-    sed -i -e 's/install -g [^ ]* /install /' Makefile.in
+    sed -i -e 's/ -g [^ ]* / /' Makefile.in
   '';
 
   preInstall = ''
     mkdir -p $out/{bin,lib,include,man} $out/man/man{1,3}
   '';
 
-
   meta = {
     description = "Shared library with NFS-safe locking functions";
     homepage = http://packages.debian.org/unstable/libs/liblockfile1;
-- 
GitLab


From 1f2a47c70fea16723b4f367272dd69f1939a085c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:28:34 +0200
Subject: [PATCH 1010/1490] libhttpseverywhere: 0.4.2 -> 0.4.5

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

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 961b8a77670..239536140ec 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   major = "0.4";
-  minor = "2";
+  minor = "5";
   version = "${major}.${minor}";
 
   name = "libhttpseverywhere-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
-    sha256 = "0n850a4adsla6di8dylnadg07wblkdl28abrjvk6fzy8a1kjlx02";
+    sha256 = "07sgcw285rl9wqr5k7srs3fj7fhgrrw6w780jx8wy8jw2bfwlvj2";
   };
 
   nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
-- 
GitLab


From a01f1c0a4224509d1b071e2241ddaed8a09a1d8b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:43:14 +0200
Subject: [PATCH 1011/1490] sniproxy: 0.4.0 -> 0.5.0

---
 pkgs/applications/networking/sniproxy/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix
index 6c3c33007c8..1751106cd68 100644
--- a/pkgs/applications/networking/sniproxy/default.nix
+++ b/pkgs/applications/networking/sniproxy/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }:
+{ stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }:
 
 stdenv.mkDerivation rec {
   name = "sniproxy-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "dlundquist";
     repo = "sniproxy";
     rev = version;
-    sha256 = "1r6hv55k2z8l5q57l2q2x3nsspc2yjvi56l760yrz2c1hgh6r0a2";
+    sha256 = "0nspisqdl0si5zpiiwkh9hhdy6h7lxw8l09rasflyawlmm680z1i";
   };
 
-  buildInputs = [ autoconf automake autoreconfHook gettext libev pcre pkgconfig udns ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ gettext libev pcre udns ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
-- 
GitLab


From 2ddcdac01c9f57536064be3b38be2d45cf7ba7bd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:43:38 +0200
Subject: [PATCH 1012/1490] libftdi1: 1.2 -> 1.3

---
 pkgs/development/libraries/libftdi/1.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index cd0a2a3c473..180aab09188 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -9,11 +9,11 @@ assert pythonSupport -> python != null && swig != null;
 assert docSupport -> doxygen != null;
 
 stdenv.mkDerivation rec {
-  name = "libftdi1-1.2";
-  
+  name = "libftdi1-1.3";
+
   src = fetchurl {
     url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2";
-    sha256 = "1ml8hiahnqm4z0xzyjv8kyrkzvhw6l431c3jndg026cjh9f7ksm6";
+    sha256 = "1x41mbzh4qy7mrv2n86r2cr176rx03iacn0a99c3dkzv9g4rb34s";
   };
 
   buildInputs = with stdenv.lib; [ cmake pkgconfig confuse ]
-- 
GitLab


From 2d5ede04fcb3fd0f33a6a78b6d3a8a96d623ce60 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:43:59 +0200
Subject: [PATCH 1013/1490] libinput: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 17950b383bb..1cc275b3048 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -17,11 +17,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0b1e5a6c106ccc609ccececd9e33e6b27c8b01fc7457ddb4c1dd266e780d6bc2";
+    sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 76de6e4f39a4aeef570f2f2b002fc01c336487e4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:47:52 +0200
Subject: [PATCH 1014/1490] libcroco: 0.6.11 -> 0.6.12

---
 pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
index a4c46ef85d4..05344a33025 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libcroco-0.6.11";
+  name = "libcroco-0.6.12";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
-    sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk";
+    sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x";
   };
 
   outputs = [ "out" "dev" ];
@@ -13,9 +13,13 @@ stdenv.mkDerivation rec {
 
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 
-  buildInputs = [ pkgconfig libxml2 glib ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libxml2 glib ];
 
   meta = with stdenv.lib; {
+    description = "GNOME CSS2 parsing and manipulation toolkit";
+    homepage = "https://git.gnome.org/browse/libcroco";
+    license = licenses.lgpl2;
     platforms = platforms.unix;
   };
 }
-- 
GitLab


From 0227471cc91cc26f3ced4e7c3a0a9bd18e9e10c0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:48:14 +0200
Subject: [PATCH 1015/1490] librsvg: 2.40.16 -> 2.40.17

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

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index ebd0f79cd47..447712fc7db 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -6,11 +6,11 @@
 # no introspection by default, it's too big
 
 stdenv.mkDerivation rec {
-  name = "librsvg-2.40.16";
+  name = "librsvg-2.40.17";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz";
-    sha256 = "0bpz6gsq8xi1pb5k9ax6vinph460v14znch3y5yz167s0dmwz2yl";
+    sha256 = "1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6";
   };
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-- 
GitLab


From fe9c7ad83f1ea97a3642e147b16f2ec69caa0ae6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:51:34 +0200
Subject: [PATCH 1016/1490] libcpuid: 0.2.2 -> 0.4.0

---
 pkgs/tools/misc/libcpuid/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index e26533d4642..410ab454312 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchgit
+, fetchFromGitHub
 , libtool
 , automake
 , autoconf
@@ -7,18 +7,19 @@
 }:
 stdenv.mkDerivation rec {
   name = "libcpuid-${version}";
-  version = "0.2.2";
+  version = "0.4.0";
 
-  src = fetchgit {
-    url = https://github.com/anrieff/libcpuid.git;
-    rev = "535ec64dd9d8df4c5a8d34b985280b58a5396fcf";
-    sha256 = "1j9pg7fyvqhr859k5yh8ccl9jjx65c7rrsddji83qmqyg0vp1k1a";
+  src = fetchFromGitHub {
+    owner = "anrieff";
+    repo = "libcpuid";
+    rev = "v${version}";
+    sha256 = "136kv6m666f7s18mim0vdbzqvs4s0wvixa12brj9p3kmfbx48bw7";
   };
 
   patchPhase = ''
     libtoolize
     autoreconf --install
- '';
+  '';
 
   configurePhase = ''
     mkdir -p Install
@@ -45,12 +46,12 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out
     sed -i -re "s#(prefix=).*Install#\1$out#g" Install/lib/pkgconfig/libcpuid.pc
- 
+
     cp -r Install/* $out
     cp -r tests $out
   '';
 
-  buildInputs = [
+  nativeBuildInputs = [
     libtool
     automake
     autoconf
-- 
GitLab


From b6bacc4bb2e9cc1e8ee7c810e697e93439b83529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Jun 2017 16:52:58 +0100
Subject: [PATCH 1017/1490] llvmPackage_{3.4,3.5,3.7,3.8,3.9}: fix output of
 llvm-config

llvm-config is a tool to output compile and linker flags, when compiling against llvm.

The tool however outputs static library names despite libllvm is build
as shared library on nixos. This was fixed for llvm 3.4, 3.5 and 3.7.

For llvm 3.8 and 3.9 it printed the library extension twice (.so.so).
This was fixed in 4.0 and the patch is backported to 3.8 and 3.9 in
this pull request.

```
$ for i in 34 35 37 38 39; do echo "\nllvm-$i"; nix-shell -p llvmPackages_$i.llvm --run 'llvm-config --libnames'; done

llvm-34
libLLVMInstrumentation.so libLLVMIRReader.so libLLVMAsmParser.so
...

llvm-35
libLLVMLTO.so libLLVMObjCARCOpts.so libLLVMLinker.so libLLVMipo.so
...

llvm-37
libLLVMLTO.so libLLVMObjCARCOpts.so libLLVMLinker.so libLLVMBitWriter.so
...

llvm-38
libLLVM-3.8.1.so

llvm-39
libLLVM-3.9.so
```

fixes #26713
---
 pkgs/development/compilers/llvm/3.4/llvm.nix        |  2 +-
 pkgs/development/compilers/llvm/3.5/llvm.nix        |  3 ++-
 .../compilers/llvm/3.7/fix-llvm-config.patch        | 13 -------------
 pkgs/development/compilers/llvm/3.7/llvm.nix        |  2 +-
 .../compilers/llvm/3.8/fix-llvm-config.patch        | 11 +++++++++++
 pkgs/development/compilers/llvm/3.8/llvm.nix        |  3 ++-
 pkgs/development/compilers/llvm/3.9/llvm.nix        |  8 ++++++++
 .../compilers/llvm/{3.4 => }/fix-llvm-config.patch  |  0
 8 files changed, 25 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
 create mode 100644 pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
 rename pkgs/development/compilers/llvm/{3.4 => }/fix-llvm-config.patch (100%)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 73469fa122a..79b0c9ff898 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optionals (!stdenv.isDarwin) [
     # llvm-config --libfiles returns (non-existing) static libs
-    ./fix-llvm-config.patch
+    ../fix-llvm-config.patch
   ];
 
   # hacky fix: created binaries need to be run before installation
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 8bb5a6c684b..c5503da9b83 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -53,7 +53,8 @@ in stdenv.mkDerivation rec {
     "-DCAN_TARGET_i386=false"
   ];
 
-  patches = [ ./fix-15974.patch ];
+  patches = [ ./fix-15974.patch ] ++
+    stdenv.lib.optionals (!stdenv.isDarwin) [../fix-llvm-config.patch ];
 
   postBuild = ''
     rm -fR $out
diff --git a/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
deleted file mode 100644
index 772c4960927..00000000000
--- a/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
-index eacefdf60bf..40d25f5cef8 100644
---- a/utils/llvm-build/llvmbuild/main.py
-+++ b/utils/llvm-build/llvmbuild/main.py
-@@ -412,7 +412,7 @@ subdirectories = %s
-             if library_name is None:
-                 library_name_as_cstr = '0'
-             else:
--                library_name_as_cstr = '"lib%s.a"' % library_name
-+                library_name_as_cstr = '"lib%s.so"' % library_name
-             f.write('  { "%s", %s, %d, { %s } },\n' % (
-                 name, library_name_as_cstr, is_installed,
-                 ', '.join('"%s"' % dep
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index 1bdefd214f9..81aaa7cd65c 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optionals (!stdenv.isDarwin) [
     # llvm-config --libfiles returns (non-existing) static libs
-    ./fix-llvm-config.patch
+    ../fix-llvm-config.patch
   ];
 
   cmakeFlags = with stdenv; [
diff --git a/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
new file mode 100644
index 00000000000..6e56c67c897
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
@@ -0,0 +1,11 @@
+--- llvm.org/utils/llvm-build/llvmbuild/main.py	2015-10-07 00:24:35.000000000 +0100
++++ llvm/utils/llvm-build/llvmbuild/main.py	2017-06-16 17:08:39.866586578 +0100
+@@ -413,7 +413,7 @@
+             if library_name is None:
+                 library_name_as_cstr = 'nullptr'
+             else:
+-                library_name_as_cstr = '"lib%s.a"' % library_name
++                library_name_as_cstr = '"lib%s.so"' % library_name
+             if is_installed:
+                 is_installed_as_cstr = 'true'
+             else:
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index 9394179a8f9..ee0a50c9397 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -37,7 +37,8 @@ in stdenv.mkDerivation rec {
 
   # Fix a segfault in llc
   # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html
-  patches = [ ./D17533-1.patch ];
+  patches = [ ./D17533-1.patch ] ++
+    stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch];
 
   # hacky fix: New LLVM releases require a newer OS X SDK than
   # 10.9. This is a temporary measure until nixpkgs darwin support is
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 964b6232fb5..654e1ce0023 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -58,6 +58,14 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ ncurses zlib ];
 
+  patches = [
+    # fix output of llvm-config (fixed in llvm 4.0)
+    (fetchpatch {
+      url = https://github.com/llvm-mirror/llvm/commit/5340b5b3d970069aebf3dde49d8964583742e01a.patch;
+      sha256 = "095f8knplwqbc2p7rad1kq8633i34qynni9jna93an7kyc80wdxl";
+   })
+  ];
+
   postPatch = ""
   + ''
     patch -p1 --reverse < ${fetchpatch {
diff --git a/pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch b/pkgs/development/compilers/llvm/fix-llvm-config.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch
rename to pkgs/development/compilers/llvm/fix-llvm-config.patch
-- 
GitLab


From 908157c6c5517b6404c7ab13b9953a02f0f76229 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 20 Jun 2017 12:04:21 +0200
Subject: [PATCH 1018/1490] prometheus-blackbox-exporter: 0.4.0 -> 0.5.0

---
 pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 1eaef1010d3..ccbcce26033 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "blackbox_exporter-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
   rev = version;
 
   goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "1wx3lbhg8ljq6ryl1yji0fkrl6hcsda9i5cw042nhqy29q0ymqsh";
+    sha256 = "1q719q7xslksj9m5c5d8jmap9380nsrdc71yjyn70rimv8xmzfj1";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From ea440eae21fe79fe325566562b91936909a6d483 Mon Sep 17 00:00:00 2001
From: John Children <john@cognitivelogic.com>
Date: Thu, 15 Jun 2017 12:01:42 +0100
Subject: [PATCH 1019/1490] antlr4_7: init at 4.7

Includes a more recent version of antlr to nixpkgs. Previous
versions exist already, but version 4 brings many changes
to the generated code and runtime targets.

The install location has been changed from previous versions
of antlr to make use of the set-java-classpath hook, which
is required to make use of both the runtime and the binary.

Also includes the testing rig as a script to allow graphical
inspection of parse trees.
---
 pkgs/development/tools/parsing/antlr/4.7.nix | 41 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  3 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/antlr/4.7.nix

diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix
new file mode 100644
index 00000000000..acf7edf0145
--- /dev/null
+++ b/pkgs/development/tools/parsing/antlr/4.7.nix
@@ -0,0 +1,41 @@
+{stdenv, fetchurl, jre}:
+
+stdenv.mkDerivation rec {
+  name = "antlr-${version}";
+  version = "4.7";
+  src = fetchurl {
+    url ="http://www.antlr.org/download/antlr-${version}-complete.jar";
+    sha256 = "0r08ay63s5aajix5j8j7lf7j7l7wiwdkr112b66nyhkj5f6c72yd";
+  };
+
+  unpackPhase = "true";
+ 
+  installPhase = ''
+    mkdir -p "$out"/{share/java,bin}
+    cp "$src" "$out/share/java/antlr-${version}-complete.jar"
+
+    echo "#! ${stdenv.shell}" >> "$out/bin/antlr"
+    echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr"
+    
+    echo "#! ${stdenv.shell}" >> "$out/bin/grun"
+    echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun"
+
+    chmod a+x "$out/bin/antlr" "$out/bin/grun"
+    ln -s "$out/bin/antlr"{,4}
+  '';
+
+  inherit jre;
+
+  meta = with stdenv.lib; {
+    description = "Powerful parser generator";
+    longDescription = ''
+      ANTLR (ANother Tool for Language Recognition) is a powerful parser
+      generator for reading, processing, executing, or translating structured
+      text or binary files. It's widely used to build languages, tools, and
+      frameworks. From a grammar, ANTLR generates a parser that can build and
+      walk parse trees.
+    '';
+    homepage = http://www.antlr.org/;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..6ee032a104c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6413,6 +6413,9 @@ with pkgs;
   antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };
   antlr3 = antlr3_5;
 
+  antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { };
+  antlr4 = antlr4_7;
+
   ant = apacheAnt;
 
   apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
-- 
GitLab


From 63022fdfcbad164cf7e54b8be73b769ac9600502 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 20 Jun 2017 13:25:42 +0200
Subject: [PATCH 1020/1490] shaarli: 0.8.4 -> 0.9.0

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

diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 26e3f92931b..1c58194027a 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "shaarli-${version}";
-  version = "0.8.4";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz";
-    sha256 = "1p6yljl8v8p74n71az1h68nnsvffw2hkcfk9p2dldspi4k51vnb7";
+    sha256 = "1l8waa26cq9rjh8hvhnlrsvj4606pz81msdmhljgqx7fdn5wzs5c";
   };
 
   outputs = [ "out" "doc" ];
-- 
GitLab


From c02e26f8a0de163de12c03fea88becdcfdb681e0 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 20 Jun 2017 13:30:38 +0200
Subject: [PATCH 1021/1490] wallabag: 2.2.2 -> 2.2.3

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

diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index c7067ffbd53..d330dd2d1ab 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wallabag-${version}";
-  version = "2.2.2";
+  version = "2.2.3";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
 
   src = fetchurl {
     url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
-    sha256 = "0l8zba2risi8lsmff0fbgplfqdiqp7jz0f93z4lbqv8iavaqpna0";
+    sha256 = "0myqarwny9p53g2gmwmg1mcn17jlx5ah0bri13panhf7ryvmrzhk";
   };
 
   outputs = [ "out" "doc" ];
-- 
GitLab


From 0eb34ac754608581aeed11e87b25a55d5427cce2 Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@univ-littoral.fr>
Date: Tue, 20 Jun 2017 14:59:30 +0200
Subject: [PATCH 1022/1490] opencv: add openblas support

---
 pkgs/development/libraries/opencv/3.x.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index dc4a00e6dd9..85b4d562720 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -15,6 +15,7 @@
 , enableFfmpeg    ? false, ffmpeg
 , enableGStreamer ? false, gst_all_1
 , enableEigen     ? false, eigen
+, enableOpenblas  ? false, openblas
 , enableCuda      ? false, cudatoolkit, gcc5
 , AVFoundation, Cocoa, QTKit
 }:
@@ -130,6 +131,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional enableFfmpeg ffmpeg
     ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
     ++ lib.optional enableEigen eigen
+    ++ lib.optional enableOpenblas openblas
     ++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
     ++ lib.optional enableContrib protobuf3_1
     ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];
@@ -141,7 +143,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR";
 
   cmakeFlags = [
-    "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}"
+    "-DWITH_IPP=${if enableIpp then "ON" else "OFF"} -DWITH_OPENMP=ON"
     (opencvFlag "TIFF" enableTIFF)
     (opencvFlag "JASPER" enableJPEG2K)
     (opencvFlag "WEBP" enableWebP)
-- 
GitLab


From 08ba40ae9cb2c7c3446425bbb7dcb9cc4287b774 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 31 Mar 2017 20:56:00 +0000
Subject: [PATCH 1023/1490] ranger: add imagePreviewSupport option and make
 previews work out of the box

Before one had to turn it on manually and update the preview script in dotfiles
manually when ranger updates.

Now it requires zero configuration. Just run `ranger` and it works, and
should continue to work automagically when ranger updates.

Everything still can be (de)configured via `rc.conf` in dotfiles.
---
 pkgs/applications/misc/ranger/default.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 1371646be27..92e017c3f28 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, pythonPackages, w3m, file, less }:
+{ stdenv, fetchurl, pythonPackages, file, less
+, imagePreviewSupport ? true, w3m ? null}:
+
+with stdenv.lib;
+
+assert imagePreviewSupport -> w3m != null;
 
 pythonPackages.buildPythonApplication rec {
   name = "ranger-1.8.1";
@@ -23,14 +28,23 @@ pythonPackages.buildPythonApplication rec {
   '';
 
   preConfigure = ''
-    substituteInPlace ranger/ext/img_display.py \
-      --replace /usr/lib/w3m ${w3m}/libexec/w3m
     substituteInPlace ranger/__init__.py \
       --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${stdenv.lib.getBin less}/bin/less'"
 
     for i in ranger/config/rc.conf doc/config/rc.conf ; do
       substituteInPlace $i --replace /usr/share $out/share
     done
+
+    # give file previews out of the box
+    substituteInPlace ranger/config/rc.conf \
+      --replace "set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh"
+  '' + optionalString imagePreviewSupport ''
+    substituteInPlace ranger/ext/img_display.py \
+      --replace /usr/lib/w3m ${w3m}/libexec/w3m
+
+    # give image previews out of the box when building with w3m
+    substituteInPlace ranger/config/rc.conf \
+      --replace "set preview_images false" "set preview_images true" \
   '';
 
 }
-- 
GitLab


From 14a320ace869a5f1eba3b2e26441e8b62802267e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 20 Jun 2017 16:42:40 +0200
Subject: [PATCH 1024/1490] moreutils: fix build on darwin

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

diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 51ac3249fed..da8e22bbce3 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ];
 
+  buildFlags = optionalString stdenv.isDarwin "CC=clang";
   installFlags = "PREFIX=$(out)";
 
   postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB";
-- 
GitLab


From 922d706e819f4363eae602c18c8a46f1011ef997 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 20 Jun 2017 11:23:37 -0700
Subject: [PATCH 1025/1490] wineStaging: 2.7 -> 2.10

wineUnstable: 2.7 -> 2.10
---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index e0db6285df8..7cb45b08a98 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.7";
+    version = "2.10";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "0k711vdn1h2x6ar20hpvb5b6zh21niy2n9s9mgvlag1iiq446np5";
+    sha256 = "0ygiaayi2mv6jl450d03i4x2gd2bg3mwk3s2pxas87g8sbzzg3a8";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0ipz160mpg9di47xin9whcq986nrbadmcvpdbwgrpwlxf63x4k63";
+    sha256 = "1i7lzr8w9w9hfa5djclp5n19plfgff6p1yhrs94a62jspf6c10sw";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
-- 
GitLab


From 6fd606bdf3a1718577b37d08c39b7c90b7dbbfb3 Mon Sep 17 00:00:00 2001
From: Isaac Shapira <fresheyeball@gmail.com>
Date: Tue, 20 Jun 2017 14:00:14 -0600
Subject: [PATCH 1026/1490] awscli: 1.11.95 -> 1.11.105

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d93a3a012c1..d4f6bf2693d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1500,12 +1500,12 @@ in {
   in buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "awscli";
-    version = "1.11.95";
+    version = "1.11.108";
     namePrefix = "";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1f99cg5x5kw1p1awny64adp07rvva57srdfrbi81yl2kpw33ybjc";
+      sha256 = "1wz76hkljc25zzfa2l5jv0mbr5vx6d9ixq4sq0p3zf3l45ql6mdf";
     };
 
     # No tests included
@@ -3039,11 +3039,11 @@ in {
   botocore = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "botocore";
-    version = "1.5.58";
+    version = "1.5.71";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1kd9hngdqvpjm01amizsmsnc08h2a0dxiasdk0f4kg1pibpqdni5";
+      sha256 = "1fgg28halsy4g43wjpkbd6l0wqiwyzkd4zjrzbbyzw4dxbsf3xfm";
     };
 
     propagatedBuildInputs =
-- 
GitLab


From a21ddfb1586c38cc37fccaab27af345777798115 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Jun 2017 16:08:47 -0400
Subject: [PATCH 1027/1490] pythonPackages.bcdoc: Disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d4f6bf2693d..ec89d81479d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1971,6 +1971,9 @@ in {
 
     buildInputs = with self; [ docutils six ];
 
+    # Tests fail due to nix file timestamp normalization.
+    doCheck = false;
+
     meta = {
       homepage = https://github.com/botocore/bcdoc;
       license = licenses.asl20;
-- 
GitLab


From 8fe525b6c77ca5fdd2d1922d2e863fbb9198781c Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 20 Jun 2017 20:15:20 +0000
Subject: [PATCH 1028/1490] mtr: do not do 'setcap' on installPhase, it would
 fail anyway

---
 pkgs/tools/networking/mtr/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index 666bb4942a9..03a0c99c421 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "17zi99n8bdqrwrnbfyjn327jz4gxx287wrq3vk459c933p34ff8r";
   };
 
+  preConfigure = "substituteInPlace Makefile.in --replace ' install-exec-hook' ''";
+
   configureFlags = optionalString (!withGtk) "--without-gtk";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-- 
GitLab


From 065bb61330ba73025980e724242f8b5af13310bf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 20 Jun 2017 20:42:10 +0200
Subject: [PATCH 1029/1490] moreutils: fix darwin build

---
 pkgs/tools/misc/moreutils/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index da8e22bbce3..622923e048c 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
+{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper, darwin }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook
   '';
 
-  buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ];
+  buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ]
+    ++ optional stdenv.isDarwin darwin.cctools;
 
   propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ];
 
-- 
GitLab


From d04286be345c653a5b0f5ba377cabef76dec2afd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 20 Jun 2017 23:30:58 +0200
Subject: [PATCH 1030/1490] quiterss: 0.18.5 -> 0.18.6

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

diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 4bf571a93d8..e95963c695c 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
-  version = "0.18.5";
+  version = "0.18.6";
 
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
     rev = "${version}";
-    sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb";
+    sha256 = "0qklgdv6b3zg4xil9yglja33vaa25d4i7vipv5aafhlavjz16mh6";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
-- 
GitLab


From 2fe0cd548cc184dd7ebaccc09c6e1069cb4b1b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Wed, 21 Jun 2017 01:12:38 +0200
Subject: [PATCH 1031/1490] statifier: 1.7.3 -> 1.7.4

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

diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix
index f666ac3e135..3cb9179f535 100644
--- a/pkgs/os-specific/linux/statifier/default.nix
+++ b/pkgs/os-specific/linux/statifier/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gcc_multi, glibc_multi }:
 
-let version = "1.7.3"; in
+let version = "1.7.4"; in
 stdenv.mkDerivation {
   name = "statifier-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz";
-    sha256 = "0jc67kq3clkdwvahpr2bjp2zix4j7z7z8b7bcn1b3g3sybh1cbd6";
+    sha256 = "03lzkla6knjhh186b43cac410x2fmhi28pkmzb3d211n3zp5i9y8";
   };
 
   buildInputs = [ gcc_multi glibc_multi ];
-- 
GitLab


From fdc7cf8238ee955a118ce890f080e4cb7397ffef Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 20 Jun 2017 19:32:29 -0400
Subject: [PATCH 1032/1490] minikube: 0.19.0 -> 0.19.1

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

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 8779fbf2028..36e9db7323d 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -22,7 +22,7 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.19.0";
+  version = "0.19.1";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -30,7 +30,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "060zl5wx9karl0j1w3b1jnr6wkr56p3wgs75r6d5aiz36i8fkg8m";
+    sha256 = "19kw2xhpcbyh32im0lnvajcjf1f8p357vhggk0jl342a23vr3rxl";
   };
 
   # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
-- 
GitLab


From 56435c140413ae43530d03ae1db3c8cdd43d3838 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Jun 2017 19:53:25 -0400
Subject: [PATCH 1033/1490] nixos tests: retry: Count down to 0, and pass
 remaining attempts to the sub

Allows test functions to output diagnostic information on failure.
---
 nixos/lib/test-driver/Machine.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 6be119bbf33..c88f9f2bbbe 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -219,8 +219,8 @@ sub waitForMonitorPrompt {
 sub retry {
     my ($coderef) = @_;
     my $n;
-    for ($n = 0; $n < 900; $n++) {
-        return if &$coderef;
+    for ($n = 899; $n >=0; $n--) {
+        return if &$coderef($n);
         sleep 1;
     }
     die "action timed out after $n seconds";
-- 
GitLab


From 348785eec0c499dc4f79943cedcd78be279ca41d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Jun 2017 20:55:52 -0400
Subject: [PATCH 1034/1490] nixos tests: waitUntilTTYMatches: Log TTY contents
 on last try

If the test has not passed yet, on the last attempt it now outputs:

    machine: Last chance to match /logine: / on TTY2, which currently contains:
    machine: running command: fold -w$(stty -F /dev/tty2 size | awk '{print $2}') /dev/vcs2
    machine: exit status 0
    machine:

    <<< Welcome to NixOS 17.09.git.a804ef4 (x86_64) - tty2 >>>

    machine login:

to help debug the problem. Notice the "logine" typo in my check.
---
 nixos/lib/test-driver/Machine.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index c88f9f2bbbe..973e05542d5 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -518,6 +518,12 @@ sub waitUntilTTYMatches {
 
     $self->nest("waiting for $regexp to appear on tty $tty", sub {
         retry sub {
+            my ($retries_remaining) = @_;
+            if ($retries_remaining == 0) {
+                $self->log("Last chance to match /$regexp/ on TTY$tty, which currently contains:");
+                $self->log($self->getTTYText($tty));
+            }
+
             return 1 if $self->getTTYText($tty) =~ /$regexp/;
         }
     });
-- 
GitLab


From 1b833015b72fa6ccf379c46706d1d645cd216f07 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Jun 2017 21:10:34 -0400
Subject: [PATCH 1035/1490] nixos tests: waitForText: output the detected
 screen content prior to the last attempt

    machine: Last chance to match /(?^:BALICE)/ on the screen, which currently contains:
    machine: performing optical character recognition
    machine: sending monitor command: screendump /tmp/nix-build-vm-test-run-sddm.drv-0/ocrin.ppm
    machine: Session Layout

    O O

    0 1 : 0 9

    Wednesday, June 21, 2017

    |_ I

    Select your user and enter password
---
 nixos/lib/test-driver/Machine.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 973e05542d5..4a68e0cd9dc 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -572,6 +572,12 @@ sub waitForText {
     my ($self, $regexp) = @_;
     $self->nest("waiting for $regexp to appear on the screen", sub {
         retry sub {
+            my ($retries_remaining) = @_;
+            if ($retries_remaining == 0) {
+                $self->log("Last chance to match /$regexp/ on the screen, which currently contains:");
+                $self->log($self->getScreenText);
+            }
+
             return 1 if $self->getScreenText =~ /$regexp/;
         }
     });
-- 
GitLab


From 3f40fcabbf692ac08cee390ac9b56650ca075630 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Jun 2017 21:16:35 -0400
Subject: [PATCH 1036/1490] nixos tests: waitForWindow: output a list of
 windows we see prior to the final check

    machine: must succeed: xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'
    machine: exit status 0
    machine: Last chance to match /(?^:dfiirst configuration)/ on the the window list, which currently contains:
    machine: [i3 con] container around 0xf8a5f0, i3: first configuration, [i3 con] floatingcon around 0xf8c260, [i3 con] container around 0xf8a380, i3bar for output Virtual-1, [i3 con] bottom dockarea Virtual-1, [i3 con] workspace 1, [i3 con] content Virtual-1, [i3 con] top dockarea Virtual-1, [i3 con] output Virtual-1, [i3 con] workspace __i3_scratch, [i3 con] content __i3, [i3 con] pseudo-output __i3, i3
---
 nixos/lib/test-driver/Machine.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 4a68e0cd9dc..cd375352c4c 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -612,6 +612,13 @@ sub waitForWindow {
     $self->nest("waiting for a window to appear", sub {
         retry sub {
             my @names = $self->getWindowNames;
+
+            my ($retries_remaining) = @_;
+            if ($retries_remaining == 0) {
+                $self->log("Last chance to match /$regexp/ on the the window list, which currently contains:");
+                $self->log(join(", ", @names));
+            }
+
             foreach my $n (@names) {
                 return 1 if $n =~ /$regexp/;
             }
-- 
GitLab


From 0d20c7e2f56cfd961d1bbb31f97fbb396a78426e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 21 Jun 2017 09:03:40 +0200
Subject: [PATCH 1037/1490] python.pkgs: several maintenance bumps

---
 pkgs/development/python-modules/Nikola/default.nix        | 4 ++--
 pkgs/development/python-modules/asgi_redis/default.nix    | 4 ++--
 pkgs/development/python-modules/libnacl/default.nix       | 4 ++--
 pkgs/development/python-modules/sqlalchemy/default.nix    | 4 ++--
 pkgs/development/python-modules/zxcvbn-python/default.nix | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index a4127806853..520a9c3a30b 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -30,7 +30,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Nikola";
-  version = "7.8.8";
+  version = "7.8.9";
 
   # Nix contains only Python 3 supported version of doit, which is a dependency
   # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a45272e96ea8311e79ab6ea5523d792207d549cba418d623f03bf80d5e5e3e5a";
+    sha256 = "c85bf293a245a34057fb55236fc2f2c5d28e9ef1c375889f443bca1d86924df4";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
index c289a096d83..440f15cbd3a 100644
--- a/pkgs/development/python-modules/asgi_redis/default.nix
+++ b/pkgs/development/python-modules/asgi_redis/default.nix
@@ -2,13 +2,13 @@
   asgiref, asgi_ipc, msgpack, six, redis, cryptography
 }:
 buildPythonPackage rec {
-  version = "1.4.1";
+  version = "1.4.2";
   pname = "asgi_redis";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";
-    sha256 = "71a6147c8b08833815993f16e2b665a0e5483fae392f03decb8da54ed0882904";
+    sha256 = "aa8e9342a3e66c4e7f9035b074f6f66b92e5f1cf8022f1446106ed6dd004a274";
   };
 
   # Requires a redis server available
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 0aa3ed29f20..7a96530912b 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libnacl";
-  version = "1.5.0";
+  version = "1.5.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ph042x0cfysj16mmjif40pxn505rg5c9n94s972dgc0mfgvrwhs";
+    sha256 = "e44e9436e7245b0d8b7322bef67750cb7757834d7ccdb7eb7b723b4813df84fb";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 3fdb7cf9a6e..4cd522fe195 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.1.10";
+  version = "1.1.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dbd92b8af2306d600efa98ed36262d73aad227440a758c8dc3a067ca30096bd3";
+    sha256 = "76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211";
   };
 
   checkInputs = [ pytest mock pytest_xdist ]
diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix
index 65d343cbec9..66a0f8d77aa 100644
--- a/pkgs/development/python-modules/zxcvbn-python/default.nix
+++ b/pkgs/development/python-modules/zxcvbn-python/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "zxcvbn-python";
-  version = "4.4.14";
+  version = "4.4.15";
 
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fd3a46536035851571e3f4142b64d6e7bcf0ade3cd40d8fecae7a1243945e327";
+    sha256 = "ef982a382518d217d353a42093aa8bb8608a50bc2df559c08885bba166782cd0";
   };
 
   # No tests in archive
-- 
GitLab


From b8297ff08ac8651a427e06b5d07e9b3386e828cc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 21 Jun 2017 15:17:01 +0800
Subject: [PATCH 1038/1490] bundler: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index fc6a4bab75c..53e47630fbb 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.15.0";
-  sha256 = "1k84zjr49ri7dj0mbjm7wkqdmknwdid817y2kyhn42mh4vxa68id";
+  version = "1.15.1";
+  sha256 = "1mq0n8g08vf2rnd7fvylx3f4sspx15abid49gycf9zzsjj7w8vps";
   dontPatchShebangs = true;
 
   postFixup = ''
-- 
GitLab


From a3f054d8ada887dcaf46eef90e76ce2adcb3c5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 21 Jun 2017 09:38:56 +0100
Subject: [PATCH 1039/1490] dino: 2017-06-13 -> 2017-06-21

---
 .../networking/instant-messengers/dino/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 611146080bd..eff9b71daa6 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2017-06-13";
+  name = "dino-unstable-2017-06-21";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "7bbbb738fdb233f4ad91ffdd7d9247b28849d715";
-    sha256 = "09w26c6b5rkrrz7wvm629cncpdmd5n0d0805h8hw69bbzirpjjh2";
+    rev = "3f0089db86e2057293a33453361678989919147f";
+    sha256 = "011wd6qi8nagig8418hibgnsmznd76dvp3p2dzzr4wyrb7d6cgcb";
     fetchSubmodules = true;
   };
 
-- 
GitLab


From d3ceaccb42cb1b02c035ba1edc7e09e74bfbe004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Jun 2017 10:55:06 +0100
Subject: [PATCH 1040/1490] nerdtree-git-plugin: init at 2017-03-12

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index dbba9597ce7..0077185ded4 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -462,6 +462,17 @@ rec {
 
   };
 
+  nerdtree-git-plugin = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "nerdtree-git-plugin-2017-03-12";
+    src = fetchgit {
+      url = "https://github.com/albfan/nerdtree-git-plugin";
+      rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d";
+      sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj";
+    };
+    dependencies = [];
+
+  };
+
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-closetag-2017-05-13";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b83660b220b..cda3865d3de 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -27,6 +27,7 @@
 "github:LnL7/vim-nix"
 "github:Quramy/tsuquyomi"
 "github:Shougo/deoplete.nvim"
+"github:albfan/nerdtree-git-plugin"
 "github:ajh17/Spacegray.vim"
 "github:alvan/vim-closetag"
 "github:ap/vim-css-color"
-- 
GitLab


From edd2a9d5196358a458a5f2fb5f213e377631d02e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 21 Jun 2017 12:27:34 +0200
Subject: [PATCH 1041/1490] gsl: 2.3 -> 2.4

See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00008.html
for release announcement.
---
 pkgs/development/libraries/gsl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix
index d130a328dba..afd6391d719 100644
--- a/pkgs/development/libraries/gsl/default.nix
+++ b/pkgs/development/libraries/gsl/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, fetchpatch, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "gsl-2.3";
+  name = "gsl-2.4";
 
   src = fetchurl {
     url = "mirror://gnu/gsl/${name}.tar.gz";
-    sha256 = "1yxdzqjwmi2aid650fa9zyr8llw069x7lm489wx9nnfdi6vh09an";
+    sha256 = "16yfs5n444s03np1naj6yp1fsysd42kdscxzkg0k2yvfjixx0ijd";
   };
 
   patches = [
-- 
GitLab


From 5521b542a24d3945924acb9130c0a8d7e5d3a861 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2017 13:35:10 +0200
Subject: [PATCH 1042/1490] openvpn: 2.4.2 -> 2.4.3

See https://community.openvpn.net/openvpn/wiki/VulnerabilitiesFixedInOpenVPN243

Fixed:

  * CVE-2017-7508
  * CVE-2017-7520
  * CVE-2017-7521
  * CVE-2017-7512
  * CVE-2017-7522
---
 pkgs/tools/networking/openvpn/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index f2741e2b724..78f21e78277 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -8,14 +8,15 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openvpn-${version}";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz";
-    sha256 = "1ydzy5i7yaifz0v1ivrckksvm0nkkx5sia3g5y5b1xkx9cw4yp6z";
+    sha256 = "0w85915nvdws1n1zsn8zcy9wg23jsx782nvrx1a3x4mqlmkn3a3s";
   };
 
-  buildInputs = [ lzo openssl pkgconfig ]
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ lzo openssl ]
                   ++ optionals stdenv.isLinux [ pam systemd iproute ]
                   ++ optional pkcs11Support pkcs11helper;
 
-- 
GitLab


From f237eeb6a895656b0829aac850bce34c62237ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 21 Jun 2017 13:44:17 +0200
Subject: [PATCH 1043/1490] moreutils: address comment on
 14a320ace869a5f1eba3b2e26441e8b62802267e

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

diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 622923e048c..dbb80067e6d 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ];
 
-  buildFlags = optionalString stdenv.isDarwin "CC=clang";
+  buildFlags = "CC=cc";
   installFlags = "PREFIX=$(out)";
 
   postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB";
-- 
GitLab


From cfdb9769ce200035c1f287e2f91d0fe19f62f4fb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2017 14:37:22 +0200
Subject: [PATCH 1044/1490] unrar: 5.4.5 -> 5.5.5 (security)

Fixes arbitrary memory write.

See https://bugs.chromium.org/p/project-zero/issues/detail?id=1286
---
 pkgs/tools/archivers/unrar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 0086891da29..a1454229a1c 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unrar-${version}";
-  version = "5.4.5";
+  version = "5.5.5";
 
   src = fetchurl {
     url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "0v3rz2245bp2nh4115ysqv34vqlrpln9y11fnlzqj8i46f2caw74";
+    sha256 = "1vv1s1pa0pf1r0h7dw89ha9y68x7hdm82csnkh6ms0igrcwkhmd4";
   };
 
   postPatch = ''
-- 
GitLab


From 66a5e0c8e04ca5bbfa0e7eb86cc1289fa655ab1c Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Wed, 21 Jun 2017 06:04:09 -0700
Subject: [PATCH 1045/1490] hugo: 0.23 -> 0.24

---
 pkgs/applications/misc/hugo/default.nix |  4 +--
 pkgs/applications/misc/hugo/deps.nix    | 40 ++++++++++++-------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 4fe62179b25..bfed86adc0b 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.23";
+  version = "0.24";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "spf13";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "0phw5pcmrmryxb83jzifhqh3vx20qiwh4dkk802v38fw07z1hvki";
+    sha256 = "1q398afrkmg480c2an9pyhqkbi9iw266q4svwqrvm408gzjprdzp";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 2b844943865..d24fcaf70f2 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -58,8 +58,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/cpuguy83/go-md2man";
-      rev = "bcc0a711c5e6bbe72c7cb13d81c7109b45267fd2";
-      sha256 = "097l5ln1b08x5hc41qhiybzlyjfcm6kjllgv6pgsgxlx8irz459j";
+      rev = "23709d0847197db6021a51fdb193e66e9222d4e7";
+      sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f";
     };
   }
   {
@@ -76,8 +76,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/eknkc/amber";
-      rev = "f0d8fdb67f9f4a2c0d02fb6ce4830b8b6754de10";
-      sha256 = "148q8ng5kzv1n8wz5dx9fjhz7kz1l34n8vmksnfwhnqg82b77vsy";
+      rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5";
+      sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq";
     };
   }
   {
@@ -220,8 +220,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "26ae43fdeeea7db6778850f76cc828b232da1e13";
-      sha256 = "06gz20ywqbsy4sfsjjay60y7km9m07l9qvmarr7fldqfi8xgl1f4";
+      rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286";
+      sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6";
     };
   }
   {
@@ -283,8 +283,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "ca57f0f5dba473a8a58765d16d7e811fb8027add";
-      sha256 = "1lycnfkby5c7aamvwgxwq6ivzyvd8r761zkdignww1rmnqmiwd2h";
+      rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37";
+      sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx";
     };
   }
   {
@@ -328,8 +328,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/viper";
-      rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2";
-      sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f";
+      rev = "c1de95864d73a5465492829d7cb2dd422b19ac96";
+      sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm";
     };
   }
   {
@@ -337,8 +337,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
-      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
+      rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a";
+      sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9";
     };
   }
   {
@@ -355,8 +355,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "7e9105388ebff089b3f99f0ef676ea55a6da3a7e";
-      sha256 = "0q3nx9px0bddpfnh2d5h56hsvbfx483jz93j6vanxqnysizgfc1n";
+      rev = "850760c427c516be930bc91280636328f1a62286";
+      sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz";
     };
   }
   {
@@ -364,8 +364,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "5961165da77ad3a2abf3a77ea904c13a76b0b073";
-      sha256 = "0r4zb2pafrjyjb0alfnxbxkfc27iikkfdqhpklrm790j2x9xrp89";
+      rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd";
+      sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8";
     };
   }
   {
@@ -373,8 +373,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "dbc2be9168a660ef302e04b6ff6406de6f967473";
-      sha256 = "1hz9d7wnxwlvhlgmqrxjdx9fihx30f9ww6ir2l74l8ping1g6w1j";
+      rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a";
+      sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj";
     };
   }
   {
@@ -382,8 +382,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "19e51611da83d6be54ddafce4a4af510cb3e9ea4";
-      sha256 = "09pcfzx7nrma0gjv93jx57c28farf8m1qm4x07vk5505wlcgvvfl";
+      rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735";
+      sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh";
     };
   }
   {
-- 
GitLab


From 0d72dfdcdf3180835d744750c5fff9b997afad19 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Wed, 21 Jun 2017 06:13:31 -0700
Subject: [PATCH 1046/1490] hugo: fix github repo owner

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index bfed86adc0b..80e3eb072da 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -7,7 +7,7 @@ buildGoPackage rec {
   goPackagePath = "github.com/gohugoio/hugo";
 
   src = fetchFromGitHub {
-    owner = "spf13";
+    owner = "gohugoio";
     repo = "hugo";
     rev = "v${version}";
     sha256 = "1q398afrkmg480c2an9pyhqkbi9iw266q4svwqrvm408gzjprdzp";
-- 
GitLab


From be4a4ef70126d5f69816ebcfd075b1c08fc004df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 21 Jun 2017 15:30:02 +0200
Subject: [PATCH 1047/1490] hydra: 2017-04-26 -> 2017-06-21

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

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index ba2c62ce8ea..42b0094c2cc 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -62,15 +62,15 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2017-04-26";
+  version = "2017-06-21";
 
   inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "1f94f0369937c9187b158f53a4a361507a62c5e9";
-    sha256 = "0h013690pwm20vykccr6l4k0q1jdb065127pblfhs23a287ayqlm";
+    rev = "6e4a7a30f731c42e64e24ccbf8f25110c02776ab";
+    sha256 = "0j7s4slmwrmwywvfkxdpg4wgxnfqjzv9dzwvni2n21sbbwjyqgij";
   };
 
   buildInputs =
-- 
GitLab


From 7bd918b3641ce30f4766dffadd779bc7f4614195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 21 Jun 2017 15:35:07 +0200
Subject: [PATCH 1048/1490] hydra-evaluator: depend on jq

---
 nixos/modules/services/continuous-integration/hydra/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index c515622d11a..6d39affee48 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -344,7 +344,7 @@ in
       { wantedBy = [ "multi-user.target" ];
         requires = [ "hydra-init.service" ];
         after = [ "hydra-init.service" "network.target" ];
-        path = [ cfg.package pkgs.nettools ];
+        path = with pkgs; [ cfg.package nettools jq ];
         environment = env;
         serviceConfig =
           { ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator";
-- 
GitLab


From e89e96a7551e4213f50e0f44467546a26d42ea5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 21 Jun 2017 17:14:04 +0100
Subject: [PATCH 1049/1490] linux_4_11: renable CONFIG_UPROBE_EVENTS

CONFIG_UPROBE_EVENT was renamed to CONFIG_UPROBE_EVENTS.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index b23d52b39e3..ec90620fce1 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -472,8 +472,10 @@ with stdenv.lib;
   SCHED_TRACER y
   STACK_TRACER y
 
-  ${optionalString (versionOlder version "4.11") ''
+  ${if versionOlder version "4.11" then ''
     UPROBE_EVENT? y
+  '' else ''
+    UPROBE_EVENTS? y
   ''}
 
   ${optionalString (versionAtLeast version "4.4") ''
-- 
GitLab


From 80ace7383d2c2eb1a54598b09872a5ffef424d32 Mon Sep 17 00:00:00 2001
From: Martin Wohlert <martin@b-root-force.de>
Date: Wed, 21 Jun 2017 18:27:01 +0200
Subject: [PATCH 1050/1490] libopus: 1.1.5 -> 1.2

> http://opus-codec.org/release/stable/2017/06/20/libopus-1_2.html

Changes since 1.1.x include:

- Speech quality improvements especially in the 12-20 kbit/s range
- Improved VBR encoding for hybrid mode
- More aggressive use of wider speech bandwidth, including fullband speech starting at 14 kbit/s
- Music quality improvements in the 32-48 kb/s range
- Generic and SSE CELT optimizations
- Support for directly encoding packets up to 120 ms
- DTX support for CELT mode
- SILK CBR improvements
- Support for all of the fixes in draft-ietf-codec-opus-update-06 (the mono downmix and the folding fixes need --enable-update-draft)
- Many bug fixes, including integer wrap-arounds discovered through fuzzing (no security implications)
---
 pkgs/development/libraries/libopus/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 328c5db0b65..756def8ad90 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -2,14 +2,14 @@
 , fixedPoint ? false, withCustomModes ? true }:
 
 let
-  version = "1.1.5";
+  version = "1.2";
 in
 stdenv.mkDerivation rec {
   name = "libopus-${version}";
 
   src = fetchurl {
-    url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz";
-    sha256 = "1r33nm7b052dw7gsc99809df1zmj5icfiljqbrfkw2pll0f9i17b";
+    url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
+    sha256 = "1ad9q2g9vivx409jdsslv1hrh5r616qz2pjm96y8ymsigfl4bnvp";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 03a6297b6c7769a61dc8a84e1f249b6a8d57111e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 21 Jun 2017 18:44:04 +0000
Subject: [PATCH 1051/1490] python-dogpile-cache: do not depend on dogpile_core

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

diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index 25913f3a497..c04da071156 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, dogpile_core, pytest, pytestcov, mock, Mako
+, pytest, pytestcov, mock, Mako
 }:
 
 buildPythonPackage rec {
@@ -18,7 +18,6 @@ buildPythonPackage rec {
     rm tests/test_lock.py
   '';
 
-  propagatedBuildInputs = [ dogpile_core ];
   buildInputs = [ pytest pytestcov mock Mako ];
 
   meta = with stdenv.lib; {
-- 
GitLab


From bf5c57e1b8e243565469196d033bb61ab0055307 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 21 Jun 2017 19:34:44 +0000
Subject: [PATCH 1052/1490] jetbrains.{ruby-mine,webstorm,datagrip,phpstorm}:
 2017.1 -> 2017.1.4

---
 pkgs/applications/editors/jetbrains/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index d599bc12315..eaef3156099 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -225,12 +225,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2017.1";
+    version = "2017.1.4";
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa";
+      sha256 = "0f03hgiiwlxnsvcm4dg2qf8pc5dy7w5phbj6qwgmppba2x5f8lf3";
     };
     wmClass = "jetbrains-datagrip";
   };
@@ -309,12 +309,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2017.1";
+    version = "2017.1.4";
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
+      sha256 = "0zrbcziznz6dwh56snr27752xcsnl2gsxzi6jiraplkd92f2xlaf";
     };
     wmClass = "jetbrains-phpstorm";
   };
@@ -369,12 +369,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2017.1";
+    version = "2017.1.4";
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "6c27f43ddc385ffba2cb2f011b80ab46d9b128d0fccf3b4ea43272fe36401a3a";
+      sha256 = "06jk0anlnc4gr240i51kam47shdjgda6zg3hglk5w3bpvbyix68z";
     };
     wmClass = "jetbrains-rubymine";
   };
@@ -405,12 +405,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2017.1.3";
+    version = "2017.1.4";
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "0g4b0x910231ljdj18lnj2mlzmzyl12lv3fsbsz6v45i1kwpwnvc";
+      sha256 = "0aw2728wknss5vn2fkgz8rkm5vwk031305f32dirfrh51bvmq2zm";
     };
     wmClass = "jetbrains-webstorm";
   };
-- 
GitLab


From bc47794ab580a28d9c995e4b0f01ef4bee77af28 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 21 Jun 2017 22:15:07 +0200
Subject: [PATCH 1053/1490] quicklispPackages: update

Escape things by default in derivation names (i.e. digit cannot be the
first character etc.)

Update Quicklisp (tracking upstream); list new missing dependencies

Add some minimal README about ql-to-nix
---
 pkgs/development/lisp-modules/README.txt      |  16 +
 .../lisp-modules/define-package.nix           |   3 +-
 .../{3bmd.nix => _3bmd.nix}                   |   9 +-
 .../quicklisp-to-nix-output/abnf.nix          |  35 ++
 .../quicklisp-to-nix-output/alexandria.nix    |  14 +-
 .../quicklisp-to-nix-output/anaphora.nix      |   2 +
 .../quicklisp-to-nix-output/array-utils.nix   |  14 +-
 .../asdf-system-connections.nix               |  36 ++
 .../quicklisp-to-nix-output/babel-streams.nix |  17 +-
 .../quicklisp-to-nix-output/babel.nix         |  16 +-
 .../quicklisp-to-nix-output/blackbird.nix     |   4 +-
 .../bordeaux-threads.nix                      |   6 +-
 .../quicklisp-to-nix-output/caveman.nix       |   7 +-
 .../quicklisp-to-nix-output/cffi-grovel.nix   |   5 +-
 .../quicklisp-to-nix-output/cffi.nix          |   5 +-
 .../quicklisp-to-nix-output/chipz.nix         |   2 +
 .../quicklisp-to-nix-output/chunga.nix        |   4 +-
 .../circular-streams.nix                      |   6 +-
 .../quicklisp-to-nix-output/cl+ssl.nix        |   8 +-
 .../quicklisp-to-nix-output/cl-aa.nix         |  14 +-
 .../quicklisp-to-nix-output/cl-annot.nix      |   4 +-
 .../quicklisp-to-nix-output/cl-anonfun.nix    |   2 +
 .../quicklisp-to-nix-output/cl-ansi-text.nix  |   5 +-
 .../quicklisp-to-nix-output/cl-async-base.nix |   6 +-
 .../quicklisp-to-nix-output/cl-async-repl.nix |   4 +-
 .../quicklisp-to-nix-output/cl-async-ssl.nix  |   5 +-
 .../quicklisp-to-nix-output/cl-async-util.nix |   8 +-
 .../quicklisp-to-nix-output/cl-async.nix      |   7 +-
 .../quicklisp-to-nix-output/cl-base64.nix     |   2 +
 .../quicklisp-to-nix-output/cl-colors.nix     |   5 +-
 .../quicklisp-to-nix-output/cl-containers.nix |  36 ++
 .../quicklisp-to-nix-output/cl-cookie.nix     |   8 +-
 .../quicklisp-to-nix-output/cl-csv.nix        |  36 ++
 .../quicklisp-to-nix-output/cl-dbi.nix        |   2 +
 .../quicklisp-to-nix-output/cl-emb.nix        |   2 +
 .../quicklisp-to-nix-output/cl-fad.nix        |   5 +-
 .../cl-fuse-meta-fs.nix                       |   7 +-
 .../quicklisp-to-nix-output/cl-fuse.nix       |   7 +-
 .../quicklisp-to-nix-output/cl-interpol.nix   |  35 ++
 .../quicklisp-to-nix-output/cl-json.nix       |   2 +
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix  |   2 +
 .../quicklisp-to-nix-output/cl-l10n.nix       |   7 +-
 .../quicklisp-to-nix-output/cl-libuv.nix      |   5 +-
 .../quicklisp-to-nix-output/cl-log.nix        |  35 ++
 .../quicklisp-to-nix-output/cl-markdown.nix   |  39 ++
 .../quicklisp-to-nix-output/cl-markup.nix     |   2 +
 .../quicklisp-to-nix-output/cl-mysql.nix      |   4 +-
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |  16 +-
 .../quicklisp-to-nix-output/cl-postgres.nix   |   4 +-
 .../cl-ppcre-template.nix                     |  16 +-
 .../cl-ppcre-unicode.nix                      |   4 +-
 .../quicklisp-to-nix-output/cl-ppcre.nix      |   2 +
 .../quicklisp-to-nix-output/cl-project.nix    |   8 +-
 .../quicklisp-to-nix-output/cl-reexport.nix   |   4 +-
 .../quicklisp-to-nix-output/cl-smtp.nix       |   8 +-
 .../quicklisp-to-nix-output/cl-store.nix      |   2 +
 .../cl-syntax-annot.nix                       |   4 +-
 .../cl-syntax-anonfun.nix                     |   4 +-
 .../cl-syntax-markup.nix                      |   4 +-
 .../quicklisp-to-nix-output/cl-syntax.nix     |   5 +-
 .../quicklisp-to-nix-output/cl-test-more.nix  |   2 +
 .../quicklisp-to-nix-output/cl-unicode.nix    |   2 +
 .../cl-unification.nix                        |  12 +-
 .../quicklisp-to-nix-output/cl-utilities.nix  |   2 +
 .../quicklisp-to-nix-output/cl-vectors.nix    |  14 +-
 .../quicklisp-to-nix-output/cl-who.nix        |   2 +
 .../clack-v1-compat.nix                       |  23 +-
 .../quicklisp-to-nix-output/clack.nix         |  17 +-
 .../quicklisp-to-nix-output/closer-mop.nix    |  12 +-
 .../closure-common.nix                        |   6 +-
 .../quicklisp-to-nix-output/clsql.nix         |   4 +-
 .../quicklisp-to-nix-output/clss.nix          |  16 +-
 .../quicklisp-to-nix-output/clx-truetype.nix  |   7 +-
 .../quicklisp-to-nix-output/clx.nix           |  14 +-
 .../command-line-arguments.nix                |   2 +
 .../quicklisp-to-nix-output/css-lite.nix      |   2 +
 .../quicklisp-to-nix-output/cxml-dom.nix      |   4 +-
 .../quicklisp-to-nix-output/cxml-klacks.nix   |   4 +-
 .../quicklisp-to-nix-output/cxml-test.nix     |   5 +-
 .../quicklisp-to-nix-output/cxml-xml.nix      |   6 +-
 .../quicklisp-to-nix-output/cxml.nix          |   5 +-
 .../quicklisp-to-nix-output/db3.nix           |  35 ++
 .../quicklisp-to-nix-output/dbd-mysql.nix     |   6 +-
 .../quicklisp-to-nix-output/dbd-postgres.nix  |   8 +-
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   |   7 +-
 .../quicklisp-to-nix-output/dexador.nix       |  22 +-
 .../quicklisp-to-nix-output/do-urlencode.nix  |   5 +-
 .../documentation-utils.nix                   |  16 +-
 .../quicklisp-to-nix-output/drakma.nix        |   7 +-
 .../dynamic-classes.nix                       |  36 ++
 .../quicklisp-to-nix-output/esrap.nix         |  16 +-
 .../external-program.nix                      |   5 +-
 .../quicklisp-to-nix-output/fast-http.nix     |   2 +
 .../quicklisp-to-nix-output/fast-io.nix       |  17 +-
 .../quicklisp-to-nix-output/flexi-streams.nix |   4 +-
 .../quicklisp-to-nix-output/form-fiddle.nix   |  16 +-
 .../quicklisp-to-nix-output/garbage-pools.nix |  35 ++
 .../quicklisp-to-nix-output/http-body.nix     |   6 +-
 .../quicklisp-to-nix-output/hu.dwim.asdf.nix  |  16 +-
 .../quicklisp-to-nix-output/hu.dwim.def.nix   |  17 +-
 .../hu_dot_dwim_dot_asdf.nix                  |  36 ++
 .../hu_dot_dwim_dot_def.nix                   |  37 ++
 .../quicklisp-to-nix-output/hunchentoot.nix   |   7 +-
 .../quicklisp-to-nix-output/idna.nix          |   4 +-
 .../quicklisp-to-nix-output/ieee-floats.nix   |  35 ++
 .../quicklisp-to-nix-output/iolib.nix         |  18 +-
 .../quicklisp-to-nix-output/ironclad.nix      |  16 +-
 .../quicklisp-to-nix-output/iterate.nix       |   2 +
 .../quicklisp-to-nix-output/ixf.nix           |  35 ++
 .../quicklisp-to-nix-output/jonathan.nix      |  16 +-
 .../lack-middleware-backtrace.nix             |  37 --
 .../quicklisp-to-nix-output/lack-util.nix     |  38 --
 .../quicklisp-to-nix-output/lack.nix          |   2 +
 .../quicklisp-to-nix-output/let-plus.nix      |   5 +-
 .../quicklisp-to-nix-output/lev.nix           |   4 +-
 .../quicklisp-to-nix-output/list-of.nix       |  35 ++
 .../quicklisp-to-nix-output/local-time.nix    |  14 +-
 .../quicklisp-to-nix-output/lparallel.nix     |  36 ++
 .../quicklisp-to-nix-output/lquery.nix        |  17 +-
 .../quicklisp-to-nix-output/map-set.nix       |   2 +
 .../quicklisp-to-nix-output/marshal.nix       |   2 +
 .../quicklisp-to-nix-output/md5.nix           |  14 +-
 .../quicklisp-to-nix-output/metabang-bind.nix |   2 +
 .../metatilities-base.nix                     |  35 ++
 .../quicklisp-to-nix-output/mssql.nix         |  36 ++
 .../quicklisp-to-nix-output/myway.nix         |   7 +-
 .../named-readtables.nix                      |   2 +
 .../quicklisp-to-nix-output/nibbles.nix       |   2 +
 .../quicklisp-to-nix-output/optima.nix        |   5 +-
 .../quicklisp-to-nix-output/parenscript.nix   |   6 +-
 .../quicklisp-to-nix-output/parse-number.nix  |  35 ++
 .../quicklisp-to-nix-output/pcall.nix         |   4 +-
 .../quicklisp-to-nix-output/pgloader.nix      |  47 ++
 .../quicklisp-to-nix-output/plump.nix         |  14 +-
 .../quicklisp-to-nix-output/postmodern.nix    |  36 ++
 .../quicklisp-to-nix-output/proc-parse.nix    |   5 +-
 .../quicklisp-to-nix-output/prove.nix         |   7 +-
 .../quicklisp-to-nix-output/puri.nix          |   2 +
 .../py-configparser.nix                       |  35 ++
 .../quicklisp-to-nix-output/qmynd.nix         |  38 ++
 .../quicklisp-to-nix-output/query-fs.nix      |   6 +-
 .../quicklisp-to-nix-output/quri.nix          |   6 +-
 .../quicklisp-to-nix-output/rfc2388.nix       |   2 +
 .../quicklisp-to-nix-output/salza2.nix        |   2 +
 .../quicklisp-to-nix-output/simple-date.nix   |  35 ++
 .../quicklisp-to-nix-output/smart-buffer.nix  |   6 +-
 .../split-sequence.nix                        |   2 +
 .../quicklisp-to-nix-output/sqlite.nix        |   4 +-
 .../static-vectors.nix                        |   5 +-
 .../quicklisp-to-nix-output/stumpwm.nix       |  16 +-
 .../quicklisp-to-nix-output/swap-bytes.nix    |   4 +-
 .../trivial-backtrace.nix                     |   2 +
 .../trivial-features.nix                      |   2 +
 .../trivial-garbage.nix                       |   2 +
 .../trivial-gray-streams.nix                  |   2 +
 .../trivial-indent.nix                        |  14 +-
 .../quicklisp-to-nix-output/trivial-mimes.nix |  14 +-
 .../quicklisp-to-nix-output/trivial-types.nix |   2 +
 .../quicklisp-to-nix-output/trivial-utf-8.nix |   2 +
 .../quicklisp-to-nix-output/uffi.nix          |   2 +
 .../quicklisp-to-nix-output/uiop.nix          |  14 +-
 .../quicklisp-to-nix-output/usocket.nix       |   4 +-
 .../quicklisp-to-nix-output/uuid.nix          |  35 ++
 .../quicklisp-to-nix-output/vom.nix           |   2 +
 .../quicklisp-to-nix-output/woo.nix           |   2 +
 .../quicklisp-to-nix-output/wookie.nix        |   2 +
 .../quicklisp-to-nix-output/xmls.nix          |   2 +
 .../quicklisp-to-nix-output/xsubseq.nix       |   2 +
 .../quicklisp-to-nix-output/yason.nix         |   5 +-
 .../quicklisp-to-nix-output/zpb-ttf.nix       |   2 +
 .../quicklisp-to-nix-overrides.nix            |  52 +-
 .../lisp-modules/quicklisp-to-nix-systems.txt |  11 +
 .../lisp-modules/quicklisp-to-nix.nix         | 461 ++++++++++++------
 .../quicklisp-to-nix/invocation.emb           |   9 +-
 .../quicklisp-to-nix/nix-package.emb          |   4 +-
 .../quicklisp-to-nix/ql-to-nix.lisp           |  31 +-
 176 files changed, 1938 insertions(+), 583 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/README.txt
 rename pkgs/development/lisp-modules/quicklisp-to-nix-output/{3bmd.nix => _3bmd.nix} (83%)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix

diff --git a/pkgs/development/lisp-modules/README.txt b/pkgs/development/lisp-modules/README.txt
new file mode 100644
index 00000000000..2a2fc9cb4f3
--- /dev/null
+++ b/pkgs/development/lisp-modules/README.txt
@@ -0,0 +1,16 @@
+Prerequisite: have Quicklisp installed somehow.
+
+Add to LD_LIBRARY_PATH all the things listed in quicklisp-to-nix-overrides.nix
+for library propagatedBuildInputs (a lot of these are done via addNativeLibs).
+
+Current list is:
+openssl fuse libuv mariadb libfixposix libev sqlite
+
+Add the needed system names to quicklisp-to-nix-systems.txt and load
+quicklisp-to-nix/ql-to-nix.lisp and call
+(ql-to-nix "/path/to/nixpkgs/pkgs/development/lisp-modules/") which is often
+just (ql-to-nix ".")
+
+Add native libraries and whatever else is needed to overrides.
+
+The lispPackages set is supposed to be buildable in its entirety.
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 1acedf4b704..83bbdf3b8f9 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -1,4 +1,5 @@
-args @ {stdenv, clwrapper, baseName, testSystems ? [baseName], version ? "latest"
+args @ {stdenv, clwrapper, baseName, packageName ? baseName, testSystems ? [packageName]
+  , version ? "latest"
   , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {})
   , propagatedBuildInputs ? []}:
 let
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
similarity index 83%
rename from pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
rename to pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
index e04b3032091..4bc7545d966 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
@@ -1,6 +1,6 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''3bmd'';
+  baseName = ''_3bmd'';
   version = ''20161204-git'';
 
   description = ''markdown processor in CL using esrap parser.'';
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
     sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
   };
+    
+  packageName = "3bmd";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,7 @@ rec {
   };
 }
 /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL
-    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME 3bmd DEPS
-    ((NAME split-sequence) (NAME esrap) (NAME alexandria)) DEPENDENCIES (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS
+    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME _3bmd DEPS
+    ((NAME split-sequence FILENAME split-sequence) (NAME esrap FILENAME esrap) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS
     (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
new file mode 100644
index 00000000000..1f605fcc795
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''abnf'';
+  version = ''cl-20150608-git'';
+
+  description = ''ABNF Parser Generator, per RFC2234'';
+
+  deps = [ args."cl-ppcre" args."esrap" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz'';
+    sha256 = ''00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687'';
+  };
+    
+  packageName = "abnf";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/abnf[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM abnf DESCRIPTION ABNF Parser Generator, per RFC2234 SHA256 00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687 URL
+    http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz MD5 311c2b17e49666dac1c2bb45256be708 NAME abnf TESTNAME NIL FILENAME abnf
+    DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME esrap FILENAME esrap)) DEPENDENCIES (cl-ppcre esrap) VERSION cl-20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index d72835e88c6..7f60d2dde20 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''alexandria'';
-  version = ''20170227-git'';
+  version = ''20170516-git'';
 
   description = ''Alexandria is a collection of portable public domain utilities.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz'';
-    sha256 = ''0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh'';
+    url = ''http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz'';
+    sha256 = ''0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82'';
   };
+    
+  packageName = "alexandria";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh
-    URL http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz MD5 b0cbf86723fa3a1fe5c544e8079a3be3 NAME alexandria TESTNAME NIL
-    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (alexandria-tests)) */
+/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82
+    URL http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz MD5 9234737872493dd82d2da9cadf6a1484 NAME alexandria TESTNAME NIL
+    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (alexandria-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index fde774a9b24..cc1eb196202 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz'';
     sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9'';
   };
+    
+  packageName = "anaphora";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 0f51b69e200..80030739535 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''array-utils'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A few utilities for working with arrays.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz'';
-    sha256 = ''1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx'';
+    url = ''http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz'';
+    sha256 = ''0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q'';
   };
+    
+  packageName = "array-utils";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx URL
-    http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz MD5 8b3880c7b73625cf8ed599d91a3836b4 NAME array-utils TESTNAME NIL
-    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS (array-utils-test)) */
+/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q URL
+    http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz MD5 c6e4ccbee8f5d72fb86493b419cd0f59 NAME array-utils TESTNAME NIL
+    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (array-utils-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
new file mode 100644
index 00000000000..f694e4746ac
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''asdf-system-connections'';
+  version = ''20170124-git'';
+
+  description = ''Allows for ASDF system to be connected so that auto-loading may occur.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz'';
+    sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq'';
+  };
+    
+  packageName = "asdf-system-connections";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/asdf-system-connections[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM asdf-system-connections DESCRIPTION Allows for ASDF system to be connected so that auto-loading may occur. SHA256
+    0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq URL
+    http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz MD5 23bdbb69c433568e3e15ed705b803992 NAME
+    asdf-system-connections TESTNAME NIL FILENAME asdf-system-connections DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index 4ad9f00b150..adc5571a337 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''babel-streams'';
-  version = ''babel-20150608-git'';
+  version = ''babel-20170516-git'';
 
   description = ''Some useful streams based on Babel's encoding code'';
 
-  deps = [ args."trivial-gray-streams" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
-    sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz'';
+    sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk'';
   };
+    
+  packageName = "babel-streams";
 
   overrides = x: {
     postInstall = ''
@@ -28,7 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL
-    http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel-streams TESTNAME NIL FILENAME
-    babel-streams DEPS ((NAME trivial-gray-streams) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams alexandria) VERSION babel-20150608-git SIBLINGS
-    (babel-tests babel)) */
+/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL
+    http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel-streams TESTNAME NIL FILENAME
+    babel-streams DEPS NIL DEPENDENCIES NIL VERSION babel-20170516-git SIBLINGS (babel-tests babel)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index a88e60824d1..c9b98838862 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''babel'';
-  version = ''20150608-git'';
+  version = ''20170516-git'';
 
   description = ''Babel, a charset conversion library.'';
 
-  deps = [ args."trivial-features" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
-    sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz'';
+    sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk'';
   };
+    
+  packageName = "babel";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL
-    http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel TESTNAME NIL FILENAME babel DEPS
-    ((NAME trivial-features) (NAME alexandria)) DEPENDENCIES (trivial-features alexandria) VERSION 20150608-git SIBLINGS (babel-streams babel-tests)) */
+/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL
+    http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel TESTNAME NIL FILENAME babel DEPS
+    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (babel-streams babel-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index 352538cd353..edeadade715 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz'';
     sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9'';
   };
+    
+  packageName = "blackbird";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM blackbird DESCRIPTION A promise implementation for Common Lisp. SHA256 0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9 URL
     http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz MD5 5cb13dc06a0eae8dcba14714d2b5365d NAME blackbird TESTNAME NIL FILENAME
-    blackbird DEPS ((NAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */
+    blackbird DEPS ((NAME vom FILENAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index adcf9fa5a72..002b2ad0e37 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
     sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
   };
+    
+  packageName = "bordeaux-threads";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM bordeaux-threads DESCRIPTION Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
     09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz MD5
-    67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION
-    v0.8.5 SIBLINGS NIL) */
+    67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (alexandria) VERSION v0.8.5 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index e5d895adb63..5b5d13bcec1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz'';
     sha256 = ''111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi'';
   };
+    
+  packageName = "caveman";
 
   overrides = x: {
     postInstall = ''
@@ -31,7 +33,8 @@ rec {
 /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi URL
     http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz MD5 a6700f14fd7c4bf8fdc573473ff5fab6 NAME caveman TESTNAME NIL FILENAME
     caveman DEPS
-    ((NAME myway) (NAME local-time) (NAME do-urlencode) (NAME clack-v1-compat) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-project) (NAME cl-ppcre)
-     (NAME cl-emb) (NAME anaphora))
+    ((NAME myway FILENAME myway) (NAME local-time FILENAME local-time) (NAME do-urlencode FILENAME do-urlencode)
+     (NAME clack-v1-compat FILENAME clack-v1-compat) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-project FILENAME cl-project) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-emb FILENAME cl-emb) (NAME anaphora FILENAME anaphora))
     DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20161031-git SIBLINGS
     (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index fdb2ab5b869..dba9bfcbc76 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
     sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
   };
+    
+  packageName = "cffi-grovel";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
     http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel
-    DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
+    DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS
+    (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 81f3dfad8aa..9f92871b712 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
     sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
   };
+    
+  packageName = "cffi";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
     http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi TESTNAME NIL FILENAME cffi DEPS
-    ((NAME uiop) (NAME trivial-features) (NAME babel) (NAME alexandria)) DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS
+    ((NAME uiop FILENAME uiop) (NAME trivial-features FILENAME trivial-features) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS
     (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index 0a1d054b05e..e2a9da13b45 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz'';
     sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826'';
   };
+    
+  packageName = "chipz";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 6f38719781e..d6361d4392d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz'';
     sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg'';
   };
+    
+  packageName = "chunga";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM chunga DESCRIPTION NIL SHA256 1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL
     http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5 75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga TESTNAME NIL FILENAME chunga DEPS
-    ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */
+    ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index ff69c56e8a6..39cf82831a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
     sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128'';
   };
+    
+  packageName = "circular-streams";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM circular-streams DESCRIPTION Circularly readable streams for Common Lisp SHA256 1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128 URL
     http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams
-    TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams) (NAME fast-io)) DEPENDENCIES (trivial-gray-streams fast-io) VERSION 20161204-git
-    SIBLINGS (circular-streams-test)) */
+    TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME fast-io FILENAME fast-io)) DEPENDENCIES
+    (trivial-gray-streams fast-io) VERSION 20161204-git SIBLINGS (circular-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
index 9b19aa51678..bfe44d109d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz'';
     sha256 = ''1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s'';
   };
+    
+  packageName = "cl+ssl";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s URL
     http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz MD5 e6d22f98947384d0e0bb2eb18230f72d NAME cl+ssl TESTNAME NIL FILENAME cl+ssl
-    DEPS ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-garbage) (NAME flexi-streams) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES
-    (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */
+    DEPS
+    ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME flexi-streams FILENAME flexi-streams) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads))
+    DEPENDENCIES (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 2988906735a..5057ddbd9d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-aa'';
-  version = ''cl-vectors-20150407-git'';
+  version = ''cl-vectors-20170516-git'';
 
   description = ''cl-aa: polygon rasterizer'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
+    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
   };
+    
+  packageName = "cl-aa";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
-    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-aa TESTNAME NIL FILENAME
-    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
+/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-aa TESTNAME NIL FILENAME
+    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index bdf0dbdf48a..591df96c84e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz'';
     sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3'';
   };
+    
+  packageName = "cl-annot";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-annot DESCRIPTION Python-like Annotation Syntax for Common Lisp SHA256 0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3 URL
     http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz MD5 35d8f79311bda4dd86002d11edcd0a21 NAME cl-annot TESTNAME NIL FILENAME
-    cl-annot DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */
+    cl-annot DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index dae0666a727..51b5b5cf543 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz'';
     sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m'';
   };
+    
+  packageName = "cl-anonfun";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 2530203e3b7..0dce1f78944 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz'';
     sha256 = ''112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i'';
   };
+    
+  packageName = "cl-ansi-text";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-ansi-text DESCRIPTION ANSI control string characters, focused on color SHA256 112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i URL
     http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz MD5 70aa38b40377a5e89a7f22bb68b3f796 NAME cl-ansi-text TESTNAME NIL
-    FILENAME cl-ansi-text DEPS ((NAME cl-colors) (NAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION 20150804-git SIBLINGS (cl-ansi-text-test)) */
+    FILENAME cl-ansi-text DEPS ((NAME cl-colors FILENAME cl-colors) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION
+    20150804-git SIBLINGS (cl-ansi-text-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
index ea9c89dffb7..210e914aeee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-base";
 
   overrides = x: {
     postInstall = ''
@@ -32,5 +34,5 @@ rec {
 }
 /* (SYSTEM cl-async-base DESCRIPTION Base system for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-base TESTNAME cl-async
-    FILENAME cl-async-base DEPS ((NAME cl-libuv) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES (cl-libuv cffi bordeaux-threads) VERSION
-    cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
+    FILENAME cl-async-base DEPS ((NAME cl-libuv FILENAME cl-libuv) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES
+    (cl-libuv cffi bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index ccc138a9b5e..21dd26e4a83 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-repl";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl TESTNAME NIL
-    FILENAME cl-async-repl DEPS ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS
+    FILENAME cl-async-repl DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS
     (cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index dbd056059f7..438a85700e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-ssl";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl TESTNAME NIL
-    FILENAME cl-async-ssl DEPS ((NAME vom) (NAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-test cl-async)) */
+    FILENAME cl-async-ssl DEPS ((NAME vom FILENAME vom) (NAME cffi FILENAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS
+    (cl-async-repl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
index b72be6f88bf..8bc2b61128f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-util";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-async-util DESCRIPTION Internal utilities for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-util TESTNAME NIL
-    FILENAME cl-async-util DEPS ((NAME vom) (NAME fast-io) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-base) (NAME cffi)) DEPENDENCIES
-    (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
+    FILENAME cl-async-util DEPS
+    ((NAME vom FILENAME vom) (NAME fast-io FILENAME fast-io) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv)
+     (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi))
+    DEPENDENCIES (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index e484e1d991a..2e8a5ce83de 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async";
 
   overrides = x: {
     postInstall = ''
@@ -31,7 +33,8 @@ rec {
 /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async TESTNAME NIL FILENAME
     cl-async DEPS
-    ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-features) (NAME static-vectors) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-util)
-     (NAME cl-async-base) (NAME cffi) (NAME babel))
+    ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-features FILENAME trivial-features)
+     (NAME static-vectors FILENAME static-vectors) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv)
+     (NAME cl-async-util FILENAME cl-async-util) (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi) (NAME babel FILENAME babel))
     DEPENDENCIES (uiop trivial-gray-streams trivial-features static-vectors cl-ppcre cl-libuv cl-async-util cl-async-base cffi babel) VERSION 20160825-git
     SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index 0ca5f7149f2..86cc31f5642 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz'';
     sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp'';
   };
+    
+  packageName = "cl-base64";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 237fbfaea38..5abdac589dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz'';
     sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4'';
   };
+    
+  packageName = "cl-colors";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256 032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL
     http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors TESTNAME NIL FILENAME
-    cl-colors DEPS ((NAME alexandria) (NAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS NIL) */
+    cl-colors DEPS ((NAME alexandria FILENAME alexandria) (NAME let-plus FILENAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
new file mode 100644
index 00000000000..89627b22fbc
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-containers'';
+  version = ''20170403-git'';
+
+  description = ''A generic container library for Common Lisp'';
+
+  deps = [ args."metatilities-base" args."asdf-system-connections" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz'';
+    sha256 = ''0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg'';
+  };
+    
+  packageName = "cl-containers";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-containers[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-containers DESCRIPTION A generic container library for Common Lisp SHA256 0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg URL
+    http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz MD5 17123cd2b018cd3eb048eceef78be3f8 NAME cl-containers TESTNAME
+    NIL FILENAME cl-containers DEPS ((NAME metatilities-base FILENAME metatilities-base) (NAME asdf-system-connections FILENAME asdf-system-connections))
+    DEPENDENCIES (metatilities-base asdf-system-connections) VERSION 20170403-git SIBLINGS (cl-containers-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index 4d2b56ac775..5aa6ad1c9c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz'';
     sha256 = ''0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8'';
   };
+    
+  packageName = "cl-cookie";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256 0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8 URL
     http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz MD5 d2c08a71afd47b3ad42e1234ec1a3083 NAME cl-cookie TESTNAME NIL FILENAME
-    cl-cookie DEPS ((NAME quri) (NAME proc-parse) (NAME local-time) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES
-    (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */
+    cl-cookie DEPS
+    ((NAME quri FILENAME quri) (NAME proc-parse FILENAME proc-parse) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
new file mode 100644
index 00000000000..3436e5a75a6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-csv'';
+  version = ''20170403-git'';
+
+  description = ''Facilities for reading and writing CSV format files'';
+
+  deps = [ args."iterate" args."cl-interpol" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz'';
+    sha256 = ''1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h'';
+  };
+    
+  packageName = "cl-csv";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-csv[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h URL
+    http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz MD5 1e71a90c5057371fab044d440c39f0a3 NAME cl-csv TESTNAME NIL FILENAME cl-csv
+    DEPS ((NAME iterate FILENAME iterate) (NAME cl-interpol FILENAME cl-interpol) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (iterate cl-interpol alexandria) VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 781ae6c1d33..489147c881b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "cl-dbi";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 7b4c40632a5..067e09ab0e1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz'';
     sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80'';
   };
+    
+  packageName = "cl-emb";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 2063f2f4be3..43651428bd0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz'';
     sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x'';
   };
+    
+  packageName = "cl-fad";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL
     http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5 8ee53f2249eca9d7d54e268662b41845 NAME cl-fad TESTNAME NIL FILENAME cl-fad DEPS
-    ((NAME alexandria) (NAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS NIL) */
+    ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 9d3d779ab48..681b9205e9b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz'';
     sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2'';
   };
+    
+  packageName = "cl-fuse-meta-fs";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM cl-fuse-meta-fs DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL
     http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs
-    TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS ((NAME bordeaux-threads) (NAME cl-fuse) (NAME iterate) (NAME pcall)) DEPENDENCIES
-    (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */
+    TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall))
+    DEPENDENCIES (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index 576edbfdbf2..8681110c22e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
     sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6'';
   };
+    
+  packageName = "cl-fuse";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,8 @@ rec {
 }
 /* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL
     http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse TESTNAME NIL FILENAME
-    cl-fuse DEPS ((NAME bordeaux-threads) (NAME cffi) (NAME cffi-grovel) (NAME cl-utilities) (NAME iterate) (NAME trivial-backtrace) (NAME trivial-utf-8))
+    cl-fuse DEPS
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate) (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-utf-8 FILENAME trivial-utf-8))
     DEPENDENCIES (bordeaux-threads cffi cffi-grovel cl-utilities iterate trivial-backtrace trivial-utf-8) VERSION 20160318-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
new file mode 100644
index 00000000000..5dae43b6e59
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-interpol'';
+  version = ''0.2.6'';
+
+  description = '''';
+
+  deps = [ args."cl-unicode" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz'';
+    sha256 = ''172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b'';
+  };
+    
+  packageName = "cl-interpol";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-interpol[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b URL
+    http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz MD5 1adc92924670601ebb92546ef8bdc6a7 NAME cl-interpol TESTNAME NIL FILENAME
+    cl-interpol DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION 0.2.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index 7babd1a459f..20afe70c796 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz'';
     sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g'';
   };
+    
+  packageName = "cl-json";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index f782c99a68a..74d40aa8e79 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz'';
     sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv'';
   };
+    
+  packageName = "cl-l10n-cldr";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index 6c465f14858..eabcda82eab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz'';
     sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl'';
   };
+    
+  packageName = "cl-l10n";
 
   overrides = x: {
     postInstall = ''
@@ -31,6 +33,7 @@ rec {
 /* (SYSTEM cl-l10n DESCRIPTION Portable CL Locale Support SHA256 1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl URL
     http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz MD5 c7cb0bb584b061799abaaaf2bd65c9c5 NAME cl-l10n TESTNAME NIL FILENAME
     cl-l10n DEPS
-    ((NAME alexandria) (NAME cl-fad) (NAME cl-l10n-cldr) (NAME cl-ppcre) (NAME closer-mop) (NAME cxml) (NAME flexi-streams) (NAME iterate) (NAME local-time)
-     (NAME metabang-bind))
+    ((NAME alexandria FILENAME alexandria) (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME closer-mop FILENAME closer-mop) (NAME cxml FILENAME cxml) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate)
+     (NAME local-time FILENAME local-time) (NAME metabang-bind FILENAME metabang-bind))
     DEPENDENCIES (alexandria cl-fad cl-l10n-cldr cl-ppcre closer-mop cxml flexi-streams iterate local-time metabang-bind) VERSION 20161204-darcs SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index cca51585e5d..c08467fdd20 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz'';
     sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r'';
   };
+    
+  packageName = "cl-libuv";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL
     http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv TESTNAME NIL FILENAME
-    cl-libuv DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */
+    cl-libuv DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES
+    (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
new file mode 100644
index 00000000000..cc0a45b6e38
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-log'';
+  version = ''cl-log.1.0.1'';
+
+  description = ''CL-LOG - a general purpose logging utility'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz'';
+    sha256 = ''0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d'';
+  };
+    
+  packageName = "cl-log";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-log[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-log DESCRIPTION CL-LOG - a general purpose logging utility SHA256 0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d URL
+    http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz MD5 fb960933eb748c14adc3ccb376ac8066 NAME cl-log TESTNAME NIL FILENAME cl-log DEPS NIL
+    DEPENDENCIES NIL VERSION cl-log.1.0.1 SIBLINGS (cl-log-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
new file mode 100644
index 00000000000..791b1e55827
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
@@ -0,0 +1,39 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-markdown'';
+  version = ''20101006-darcs'';
+
+  description = '''';
+
+  deps = [ args."metatilities-base" args."metabang-bind" args."dynamic-classes" args."cl-ppcre" args."cl-containers" args."anaphora" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz'';
+    sha256 = ''1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w'';
+  };
+    
+  packageName = "cl-markdown";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markdown[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-markdown DESCRIPTION NIL SHA256 1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w URL
+    http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz MD5 3e748529531ad1dcbee5443fe24b6300 NAME cl-markdown TESTNAME NIL
+    FILENAME cl-markdown DEPS
+    ((NAME metatilities-base FILENAME metatilities-base) (NAME metabang-bind FILENAME metabang-bind) (NAME dynamic-classes FILENAME dynamic-classes)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-containers FILENAME cl-containers) (NAME anaphora FILENAME anaphora))
+    DEPENDENCIES (metatilities-base metabang-bind dynamic-classes cl-ppcre cl-containers anaphora) VERSION 20101006-darcs SIBLINGS
+    (cl-markdown-comparisons cl-markdown-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 282b05fefd8..a8f218d3756 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz'';
     sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r'';
   };
+    
+  packageName = "cl-markup";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index f54fc00950a..90983764cda 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz'';
     sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319'';
   };
+    
+  packageName = "cl-mysql";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL
     http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql TESTNAME NIL FILENAME
-    cl-mysql DEPS ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */
+    cl-mysql DEPS ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index 38f57fc61b1..964c94c95d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-paths-ttf'';
-  version = ''cl-vectors-20150407-git'';
+  version = ''cl-vectors-20170516-git'';
 
   description = ''cl-paths-ttf: vectorial paths manipulation'';
 
-  deps = [ args."zpb-ttf" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
+    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
   };
+    
+  packageName = "cl-paths-ttf";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
-    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-paths-ttf TESTNAME NIL
-    FILENAME cl-paths-ttf DEPS ((NAME zpb-ttf)) DEPENDENCIES (zpb-ttf) VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */
+/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-paths-ttf TESTNAME NIL
+    FILENAME cl-paths-ttf DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 66b42fec175..7766454c193 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
     sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
   };
+    
+  packageName = "cl-postgres";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
     http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres TESTNAME NIL
-    FILENAME cl-postgres DEPS ((NAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */
+    FILENAME cl-postgres DEPS ((NAME md5 FILENAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index 8e687ce64a8..cf46246063f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-ppcre-template'';
-  version = ''cl-unification-20170124-git'';
+  version = ''cl-unification-20170516-git'';
 
   description = ''A system used to conditionally load the CL-PPCRE Template.
 
@@ -9,12 +9,14 @@ This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.'';
 
-  deps = [ args."cl-ppcre" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz'';
-    sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz'';
+    sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0'';
   };
+    
+  packageName = "cl-ppcre-template";
 
   overrides = x: {
     postInstall = ''
@@ -37,6 +39,6 @@ REGULAR-EXPRESSION-TEMPLATE.'';
 This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.
-    SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz
-    MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
-    cl-unification-20170124-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
+    SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz
+    MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS NIL DEPENDENCIES NIL VERSION
+    cl-unification-20170516-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 3872bfd5f93..b79a00f672f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
     sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
   };
+    
+  packageName = "cl-ppcre-unicode";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
     http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode TESTNAME NIL FILENAME
-    cl-ppcre-unicode DEPS ((NAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */
+    cl-ppcre-unicode DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index ecf4a5de399..b7c60a16696 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
     sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
   };
+    
+  packageName = "cl-ppcre";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 3a933d2b11d..74c1213cc6d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz'';
     sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81'';
   };
+    
+  packageName = "cl-project";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL
     http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project TESTNAME NIL
-    FILENAME cl-project DEPS ((NAME uiop) (NAME prove) (NAME local-time) (NAME cl-ppcre) (NAME cl-emb)) DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb)
-    VERSION 20160531-git SIBLINGS (cl-project-test)) */
+    FILENAME cl-project DEPS
+    ((NAME uiop FILENAME uiop) (NAME prove FILENAME prove) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-emb FILENAME cl-emb))
+    DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb) VERSION 20160531-git SIBLINGS (cl-project-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index cad670acab1..03d863f2122 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz'';
     sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi'';
   };
+    
+  packageName = "cl-reexport";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages. SHA256 1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi URL
     http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz MD5 207d02771cbd906d033ff704ca5c3a3d NAME cl-reexport TESTNAME NIL
-    FILENAME cl-reexport DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */
+    FILENAME cl-reexport DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 0098abf59d3..1d525c7a675 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz'';
     sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh'';
   };
+    
+  packageName = "cl-smtp";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL
     http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp TESTNAME NIL FILENAME
-    cl-smtp DEPS ((NAME cl+ssl) (NAME cl-base64) (NAME flexi-streams) (NAME trivial-gray-streams) (NAME usocket)) DEPENDENCIES
-    (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */
+    cl-smtp DEPS
+    ((NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) (NAME flexi-streams FILENAME flexi-streams)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket))
+    DEPENDENCIES (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index ba16a64a9f6..9a49e468ce1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz'';
     sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz'';
   };
+    
+  packageName = "cl-store";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index abdfc65ec1f..e82cb4d501f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax-annot";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-syntax-annot DESCRIPTION CL-Syntax Reader Syntax for cl-annot SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-annot TESTNAME NIL
-    FILENAME cl-syntax-annot DEPS ((NAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS
+    FILENAME cl-syntax-annot DEPS ((NAME cl-annot FILENAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS
     (cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index 32c1a0c0ccc..6680fc51cbc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax-anonfun";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-syntax-anonfun DESCRIPTION CL-Syntax Reader Syntax for cl-anonfun SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-anonfun TESTNAME NIL
-    FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS
+    FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun FILENAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS
     (cl-syntax-annot cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index 34c5a2e6628..2150b64cb6f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax-markup";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-syntax-markup DESCRIPTION CL-Syntax Reader Syntax for CL-Markup SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-markup TESTNAME NIL
-    FILENAME cl-syntax-markup DEPS ((NAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS
+    FILENAME cl-syntax-markup DEPS ((NAME cl-markup FILENAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS
     (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index bccba7ca8ea..264d74e2db4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM cl-syntax DESCRIPTION Reader Syntax Coventions for Common Lisp and SLIME SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax TESTNAME NIL FILENAME
-    cl-syntax DEPS ((NAME trivial-types) (NAME named-readtables)) DEPENDENCIES (trivial-types named-readtables) VERSION 20150407-git SIBLINGS
+    cl-syntax DEPS ((NAME trivial-types FILENAME trivial-types) (NAME named-readtables FILENAME named-readtables)) DEPENDENCIES
+    (trivial-types named-readtables) VERSION 20150407-git SIBLINGS
     (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index c0d004c4009..2e7f97cf66a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
     sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
+    
+  packageName = "cl-test-more";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index d514c1f26a4..8b0d35253f4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz'';
     sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n'';
   };
+    
+  packageName = "cl-unicode";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 4c0b0c5c762..7c5e16973ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-unification'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''The CL-UNIFICATION system.
 
@@ -10,9 +10,11 @@ The system contains the definitions for the 'unification' machinery.'';
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz'';
-    sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz'';
+    sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0'';
   };
+    
+  packageName = "cl-unification";
 
   overrides = x: {
     postInstall = ''
@@ -33,6 +35,6 @@ The system contains the definitions for the 'unification' machinery.'';
 /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system.
 
 The system contains the definitions for the 'unification' machinery.
-    SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz
-    MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS
+    SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz
+    MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
     (cl-unification-lib cl-unification-test cl-ppcre-template)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 099c63daf28..da23cbc9499 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
     sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
   };
+    
+  packageName = "cl-utilities";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index e2e2c956e7d..fef996a845b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-vectors'';
-  version = ''20150407-git'';
+  version = ''20170516-git'';
 
   description = ''cl-paths: vectorial paths manipulation'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
+    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
   };
+    
+  packageName = "cl-vectors";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
-    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-vectors TESTNAME NIL
-    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
+/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-vectors TESTNAME NIL
+    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index ca1303e9d1d..e5888844c82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz'';
     sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq'';
   };
+    
+  packageName = "cl-who";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index b9d894e3f47..e00c430581f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20170403-git'';
+  version = ''clack-20170516-git'';
 
   description = '''';
 
-  deps = [ args."uiop" args."trivial-types" args."trivial-mimes" args."trivial-backtrace" args."split-sequence" args."quri" args."marshal" args."local-time" args."lack-util" args."lack" args."ironclad" args."http-body" args."flexi-streams" args."cl-syntax-annot" args."cl-ppcre" args."cl-base64" args."circular-streams" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz'';
-    sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz'';
+    sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw'';
   };
+    
+  packageName = "clack-v1-compat";
 
   overrides = x: {
     postInstall = ''
@@ -28,16 +30,9 @@ rec {
     '';
   };
 }
-/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL
-    http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack-v1-compat TESTNAME NIL FILENAME
-    clack-v1-compat DEPS
-    ((NAME uiop) (NAME trivial-types) (NAME trivial-mimes) (NAME trivial-backtrace) (NAME split-sequence) (NAME quri) (NAME marshal) (NAME local-time)
-     (NAME lack-util) (NAME lack) (NAME ironclad) (NAME http-body) (NAME flexi-streams) (NAME cl-syntax-annot) (NAME cl-ppcre) (NAME cl-base64)
-     (NAME circular-streams) (NAME alexandria))
-    DEPENDENCIES
-    (uiop trivial-types trivial-mimes trivial-backtrace split-sequence quri marshal local-time lack-util lack ironclad http-body flexi-streams cl-syntax-annot
-     cl-ppcre cl-base64 circular-streams alexandria)
-    VERSION clack-20170403-git SIBLINGS
+/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL
+    http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack-v1-compat TESTNAME NIL FILENAME
+    clack-v1-compat DEPS NIL DEPENDENCIES NIL VERSION clack-20170516-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 2d0d3b3d0bc..43c75bdd6e8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''Web application environment for Common Lisp'';
 
-  deps = [ args."uiop" args."lack-util" args."lack-middleware-backtrace" args."lack" args."bordeaux-threads" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz'';
-    sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz'';
+    sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw'';
   };
+    
+  packageName = "clack";
 
   overrides = x: {
     postInstall = ''
@@ -28,10 +30,9 @@ rec {
     '';
   };
 }
-/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL
-    http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack TESTNAME NIL FILENAME clack DEPS
-    ((NAME uiop) (NAME lack-util) (NAME lack-middleware-backtrace) (NAME lack) (NAME bordeaux-threads) (NAME alexandria)) DEPENDENCIES
-    (uiop lack-util lack-middleware-backtrace lack bordeaux-threads alexandria) VERSION 20170403-git SIBLINGS
+/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL
+    http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack TESTNAME NIL FILENAME clack DEPS
+    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index 432da3069d2..d73de2e941c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz'';
-    sha256 = ''166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz'';
+    sha256 = ''072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w'';
   };
+    
+  packageName = "closer-mop";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf URL http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz MD5
-    806918d9975d0c82fc471f95f40972a1 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */
+    SHA256 072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w URL http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz MD5
+    169ba62f7f8f436e45f182cbe7dd8614 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index 4e7579dba88..8dca87dc182 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz'';
     sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4'';
   };
+    
+  packageName = "closure-common";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM closure-common DESCRIPTION NIL SHA256 1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL
     http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common
-    TESTNAME NIL FILENAME closure-common DEPS ((NAME babel) (NAME trivial-gray-streams)) DEPENDENCIES (babel trivial-gray-streams) VERSION 20101107-git
-    SIBLINGS NIL) */
+    TESTNAME NIL FILENAME closure-common DEPS ((NAME babel FILENAME babel) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
+    (babel trivial-gray-streams) VERSION 20101107-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index f5dba03d08e..76eae519de9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz'';
     sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn'';
   };
+    
+  packageName = "clsql";
 
   overrides = x: {
     postInstall = ''
@@ -30,6 +32,6 @@ rec {
 }
 /* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL
     http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql TESTNAME NIL FILENAME clsql DEPS
-    ((NAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS
+    ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS
     (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests
      clsql-uffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index e8af9d041e0..81e50db852b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clss'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''A DOM tree searching engine based on CSS selectors.'';
 
-  deps = [ args."array-utils" args."plump" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz'';
-    sha256 = ''0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb'';
+    url = ''http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz'';
+    sha256 = ''1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f'';
   };
+    
+  packageName = "clss";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb URL
-    http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz MD5 f05606cab3a75e01c57fd264d1c71863 NAME clss TESTNAME NIL FILENAME clss DEPS
-    ((NAME array-utils) (NAME plump)) DEPENDENCIES (array-utils plump) VERSION 20170124-git SIBLINGS NIL) */
+/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f URL
+    http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz MD5 2e69a5197694a9654c0e9c5fced4152f NAME clss TESTNAME NIL FILENAME clss DEPS NIL
+    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index bf1b1a5e00c..dfd8669b59f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
     sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
   };
+    
+  packageName = "clx-truetype";
 
   overrides = x: {
     postInstall = ''
@@ -31,5 +33,6 @@ rec {
 /* (SYSTEM clx-truetype DESCRIPTION clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension. SHA256
     0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67 URL http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz MD5
     7c9dedb21d52dedf727de741ac6d9c60 NAME clx-truetype TESTNAME NIL FILENAME clx-truetype DEPS
-    ((NAME cl-aa) (NAME cl-fad) (NAME cl-paths-ttf) (NAME cl-store) (NAME cl-vectors) (NAME clx) (NAME trivial-features) (NAME zpb-ttf)) DEPENDENCIES
-    (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */
+    ((NAME cl-aa FILENAME cl-aa) (NAME cl-fad FILENAME cl-fad) (NAME cl-paths-ttf FILENAME cl-paths-ttf) (NAME cl-store FILENAME cl-store)
+     (NAME cl-vectors FILENAME cl-vectors) (NAME clx FILENAME clx) (NAME trivial-features FILENAME trivial-features) (NAME zpb-ttf FILENAME zpb-ttf))
+    DEPENDENCIES (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index e9e1acfcefc..b47a7cbd7d4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clx'';
-  version = ''20170227-git'';
+  version = ''20170516-git'';
 
   description = ''An implementation of the X Window System protocol in Lisp.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz'';
-    sha256 = ''0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx'';
+    url = ''http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz'';
+    sha256 = ''00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs'';
   };
+    
+  packageName = "clx";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx URL
-    http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz MD5 fe5fc4bd65ced7a0164abc0ed34afffd NAME clx TESTNAME NIL FILENAME clx DEPS NIL
-    DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
+/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs URL
+    http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz MD5 1f5d7963802a503d7f7fcf73e1f42dd8 NAME clx TESTNAME NIL FILENAME clx DEPS NIL
+    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 62010efd047..276b13e1bd0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz'';
     sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh'';
   };
+    
+  packageName = "command-line-arguments";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 3f8886915a0..695164566ba 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz'';
     sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg'';
   };
+    
+  packageName = "css-lite";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
index 041cc5b8481..924b61cae6e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-dom";
 
   overrides = x: {
     postInstall = ''
@@ -32,4 +34,4 @@ rec {
 }
 /* (SYSTEM cxml-dom DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-dom TESTNAME cxml FILENAME cxml-dom
-    DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
+    DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
index 15dd75fbfa6..f8418ccf27f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-klacks";
 
   overrides = x: {
     postInstall = ''
@@ -32,4 +34,4 @@ rec {
 }
 /* (SYSTEM cxml-klacks DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-klacks TESTNAME cxml FILENAME
-    cxml-klacks DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
+    cxml-klacks DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
index 4a872802ecb..e8856352dcd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-test";
 
   overrides = x: {
     postInstall = ''
@@ -32,4 +34,5 @@ rec {
 }
 /* (SYSTEM cxml-test DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-test TESTNAME cxml FILENAME
-    cxml-test DEPS ((NAME cxml-xml) (NAME cxml-klacks) (NAME cxml-dom)) DEPENDENCIES (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */
+    cxml-test DEPS ((NAME cxml-xml FILENAME cxml-xml) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-dom FILENAME cxml-dom)) DEPENDENCIES
+    (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
index 9674eca3d1a..5d8ef158772 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-xml";
 
   overrides = x: {
     postInstall = ''
@@ -32,5 +34,5 @@ rec {
 }
 /* (SYSTEM cxml-xml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-xml TESTNAME cxml FILENAME cxml-xml
-    DEPS ((NAME trivial-gray-streams) (NAME puri) (NAME closure-common)) DEPENDENCIES (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git
-    SIBLINGS (cxml)) */
+    DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME puri FILENAME puri) (NAME closure-common FILENAME closure-common)) DEPENDENCIES
+    (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 3c17f72b42a..baab538ca38 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cxml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml TESTNAME NIL FILENAME cxml DEPS
-    ((NAME cxml-dom) (NAME cxml-klacks) (NAME cxml-test)) DEPENDENCIES (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */
+    ((NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-test FILENAME cxml-test)) DEPENDENCIES
+    (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
new file mode 100644
index 00000000000..06ffeb9ad69
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''db3'';
+  version = ''cl-20150302-git'';
+
+  description = ''DB3 file reader'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz'';
+    sha256 = ''0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi'';
+  };
+    
+  packageName = "db3";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/db3[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM db3 DESCRIPTION DB3 file reader SHA256 0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi URL
+    http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz MD5 578896a3f60f474742f240b703f8c5f5 NAME db3 TESTNAME NIL FILENAME db3 DEPS
+    NIL DEPENDENCIES NIL VERSION cl-20150302-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 4ba68b6c545..93d0e3d599b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "dbd-mysql";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
     http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-mysql TESTNAME NIL FILENAME
-    dbd-mysql DEPS ((NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-mysql)) DEPENDENCIES (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git
-    SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
+    dbd-mysql DEPS ((NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-mysql FILENAME cl-mysql)) DEPENDENCIES
+    (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 0d0c3f153ef..3c963b5141e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "dbd-postgres";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
     http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-postgres TESTNAME NIL FILENAME
-    dbd-postgres DEPS ((NAME trivial-garbage) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-postgres)) DEPENDENCIES
-    (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
+    dbd-postgres DEPS
+    ((NAME trivial-garbage FILENAME trivial-garbage) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-postgres FILENAME cl-postgres))
+    DEPENDENCIES (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index f4c38e485f9..e19565fc277 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "dbd-sqlite3";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
     http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-sqlite3 TESTNAME NIL FILENAME
-    dbd-sqlite3 DEPS ((NAME uiop) (NAME sqlite) (NAME cl-syntax-annot) (NAME cl-syntax)) DEPENDENCIES (uiop sqlite cl-syntax-annot cl-syntax) VERSION
-    cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
+    dbd-sqlite3 DEPS
+    ((NAME uiop FILENAME uiop) (NAME sqlite FILENAME sqlite) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)) DEPENDENCIES
+    (uiop sqlite cl-syntax-annot cl-syntax) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 95672b7296f..54f1cf78e40 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
-  deps = [ args."usocket" args."trivial-mimes" args."trivial-gray-streams" args."quri" args."fast-io" args."fast-http" args."cl-reexport" args."cl-ppcre" args."cl-cookie" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" args."bordeaux-threads" args."babel" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz'';
-    sha256 = ''0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz'';
+    sha256 = ''129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6'';
   };
+    
+  packageName = "dexador";
 
   overrides = x: {
     postInstall = ''
@@ -28,12 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn URL
-    http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz MD5 0330a50a117313dbe0ba3f136b0fa416 NAME dexador TESTNAME NIL FILENAME
-    dexador DEPS
-    ((NAME usocket) (NAME trivial-mimes) (NAME trivial-gray-streams) (NAME quri) (NAME fast-io) (NAME fast-http) (NAME cl-reexport) (NAME cl-ppcre)
-     (NAME cl-cookie) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz) (NAME bordeaux-threads) (NAME babel) (NAME alexandria))
-    DEPENDENCIES
-    (usocket trivial-mimes trivial-gray-streams quri fast-io fast-http cl-reexport cl-ppcre cl-cookie cl-base64 cl+ssl chunga chipz bordeaux-threads babel
-     alexandria)
-    VERSION 20170403-git SIBLINGS (dexador-test)) */
+/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6 URL
+    http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz MD5 463972f0b98fd2a641ce2bfab4400dc7 NAME dexador TESTNAME NIL FILENAME
+    dexador DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (dexador-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 608cd6b3896..993a49bc9f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz'';
     sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa'';
   };
+    
+  packageName = "do-urlencode";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL
     http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode TESTNAME NIL
-    FILENAME do-urlencode DEPS ((NAME babel) (NAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION 20130720-git SIBLINGS NIL) */
+    FILENAME do-urlencode DEPS ((NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION
+    20130720-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 43f6343b7eb..d9bacd96af8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''documentation-utils'';
-  version = ''20161204-git'';
+  version = ''20170516-git'';
 
   description = ''A few simple tools to help you with documenting your library.'';
 
-  deps = [ args."trivial-indent" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz'';
-    sha256 = ''0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq'';
+    url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz'';
+    sha256 = ''0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1'';
   };
+    
+  packageName = "documentation-utils";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256
-    0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq URL
-    http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz MD5 36a233bf438bfc067b074b6a05865c33 NAME
-    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS ((NAME trivial-indent)) DEPENDENCIES (trivial-indent) VERSION 20161204-git SIBLINGS NIL) */
+    0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1 URL
+    http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz MD5 5e04421eb7fd48d8abe1757b5211e310 NAME
+    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index 82695e74bfe..16bbac4d03a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz'';
     sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z'';
   };
+    
+  packageName = "drakma";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z URL
     http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz MD5 eb51e1417c02c912c2b43bd9605dfb50 NAME drakma TESTNAME NIL FILENAME drakma DEPS
-    ((NAME usocket) (NAME puri) (NAME flexi-streams) (NAME cl-ppcre) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz)) DEPENDENCIES
-    (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */
+    ((NAME usocket FILENAME usocket) (NAME puri FILENAME puri) (NAME flexi-streams FILENAME flexi-streams) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl) (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz))
+    DEPENDENCIES (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
new file mode 100644
index 00000000000..283dfe813ac
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dynamic-classes'';
+  version = ''20130128-git'';
+
+  description = '''';
+
+  deps = [ args."metatilities-base" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz'';
+    sha256 = ''0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa'';
+  };
+    
+  packageName = "dynamic-classes";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dynamic-classes[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM dynamic-classes DESCRIPTION NIL SHA256 0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa URL
+    http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz MD5 a6ed01c4f21df2b6a142328b24ac7ba3 NAME dynamic-classes
+    TESTNAME NIL FILENAME dynamic-classes DEPS ((NAME metatilities-base FILENAME metatilities-base)) DEPENDENCIES (metatilities-base) VERSION 20130128-git
+    SIBLINGS (dynamic-classes-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 60db24e57d0..49c0ff6c8ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''esrap'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
 
-  deps = [ args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz'';
-    sha256 = ''1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8'';
+    url = ''http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz'';
+    sha256 = ''06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8'';
   };
+    
+  packageName = "esrap";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8 URL
-    http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz MD5 72f7a7d8e5808586dfd3ab1698e3d11f NAME esrap TESTNAME NIL FILENAME esrap DEPS
-    ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170124-git SIBLINGS NIL) */
+/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8 URL
+    http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz MD5 6116df281050ee58e6ba195727154ac0 NAME esrap TESTNAME NIL FILENAME esrap DEPS
+    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index aa7963f3243..698189fc911 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz'';
     sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13'';
   };
+    
+  packageName = "external-program";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM external-program DESCRIPTION NIL SHA256 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL
     http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program
-    TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git SIBLINGS NIL) */
+    TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git
+    SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 1f83d562967..7b100d891b9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz'';
     sha256 = ''0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx'';
   };
+    
+  packageName = "fast-http";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 52cbc8ddcdb..0e819493109 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fast-io'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''Alternative I/O mechanism to a stream or vector'';
 
-  deps = [ args."trivial-gray-streams" args."static-vectors" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz'';
-    sha256 = ''0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2'';
+    url = ''http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz'';
+    sha256 = ''1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1'';
   };
+    
+  packageName = "fast-io";
 
   overrides = x: {
     postInstall = ''
@@ -28,7 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2 URL
-    http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz MD5 e9fa77c0e75a9f32e56c27ef6861bce2 NAME fast-io TESTNAME NIL FILENAME
-    fast-io DEPS ((NAME trivial-gray-streams) (NAME static-vectors) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams static-vectors alexandria) VERSION
-    20170124-git SIBLINGS (fast-io-test)) */
+/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1 URL
+    http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz MD5 a9a96c0f6260271446fd43bf2e51e90f NAME fast-io TESTNAME NIL FILENAME
+    fast-io DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (fast-io-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 2348167ba65..1bb2b6b9c18 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz'';
     sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p'';
   };
+    
+  packageName = "flexi-streams";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL
     http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams TESTNAME NIL
-    FILENAME flexi-streams DEPS ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */
+    FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index e12f3efb59a..754d2f8c869 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''form-fiddle'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A collection of utilities to destructure lambda forms.'';
 
-  deps = [ args."documentation-utils" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz'';
-    sha256 = ''1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7'';
+    url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz'';
+    sha256 = ''00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh'';
   };
+    
+  packageName = "form-fiddle";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7 URL
-    http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz MD5 d7c363b70125a65d909419b78fa7dc24 NAME form-fiddle TESTNAME NIL
-    FILENAME form-fiddle DEPS ((NAME documentation-utils)) DEPENDENCIES (documentation-utils) VERSION 20160929-git SIBLINGS NIL) */
+/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh URL
+    http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz MD5 8f0d8b920f6da0c7fd939b7096c30235 NAME form-fiddle TESTNAME NIL
+    FILENAME form-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
new file mode 100644
index 00000000000..72403e8598a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''garbage-pools'';
+  version = ''20130720-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz'';
+    sha256 = ''1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05'';
+  };
+    
+  packageName = "garbage-pools";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/garbage-pools[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM garbage-pools DESCRIPTION NIL SHA256 1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05 URL
+    http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz MD5 f691e2ddf6ba22b3451c24b61d4ee8b6 NAME garbage-pools TESTNAME
+    NIL FILENAME garbage-pools DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS (garbage-pools-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index ed38c44b0c1..e6510c59c30 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz'';
     sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi'';
   };
+    
+  packageName = "http-body";
 
   overrides = x: {
     postInstall = ''
@@ -31,5 +33,7 @@ rec {
 /* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL
     http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body TESTNAME NIL FILENAME
     http-body DEPS
-    ((NAME trivial-gray-streams) (NAME quri) (NAME jonathan) (NAME flexi-streams) (NAME fast-http) (NAME cl-utilities) (NAME cl-ppcre) (NAME babel))
+    ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME quri FILENAME quri) (NAME jonathan FILENAME jonathan)
+     (NAME flexi-streams FILENAME flexi-streams) (NAME fast-http FILENAME fast-http) (NAME cl-utilities FILENAME cl-utilities)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME babel FILENAME babel))
     DEPENDENCIES (trivial-gray-streams quri jonathan flexi-streams fast-http cl-utilities cl-ppcre babel) VERSION 20161204-git SIBLINGS (http-body-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
index c37de8f6f8d..f36b4e931ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu.dwim.asdf'';
-  version = ''20170403-darcs'';
+  version = ''20170516-darcs'';
 
   description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
 
-  deps = [ args."uiop" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz'';
-    sha256 = ''0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz'';
+    sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw'';
   };
+    
+  packageName = "hu.dwim.asdf";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
-    0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz MD5
-    53cbeb56a8ee066116069d80c7fc3f65 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION 20170403-darcs
-    SIBLINGS (hu.dwim.asdf.documentation)) */
+    0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5
+    041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+    (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
index 0649edb6fd3..2aedd0f6704 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu.dwim.def'';
-  version = ''20161204-darcs'';
+  version = ''20170516-darcs'';
 
   description = ''General purpose, homogenous, extensible definer macro.'';
 
-  deps = [ args."metabang-bind" args."iterate" args."hu.dwim.asdf" args."anaphora" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz'';
-    sha256 = ''0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz'';
+    sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by'';
   };
+    
+  packageName = "hu.dwim.def";
 
   overrides = x: {
     postInstall = ''
@@ -28,9 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj URL
-    http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz MD5 c4a85c220873a9edd1c2c49a6498baca NAME hu.dwim.def TESTNAME NIL
-    FILENAME hu.dwim.def DEPS ((NAME metabang-bind) (NAME iterate) (NAME hu.dwim.asdf) (NAME anaphora) (NAME alexandria)) DEPENDENCIES
-    (metabang-bind iterate hu.dwim.asdf anaphora alexandria) VERSION 20161204-darcs SIBLINGS
+/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL
+    http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL
+    FILENAME hu.dwim.def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
     (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
      hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
new file mode 100644
index 00000000000..b358ff0562d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu_dot_dwim_dot_asdf'';
+  version = ''20170516-darcs'';
+
+  description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz'';
+    sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw'';
+  };
+    
+  packageName = "hu.dwim.asdf";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
+    0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5
+    041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu_dot_dwim_dot_asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+    (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
new file mode 100644
index 00000000000..5e5e56be2e5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu_dot_dwim_dot_def'';
+  version = ''20170516-darcs'';
+
+  description = ''General purpose, homogenous, extensible definer macro.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz'';
+    sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by'';
+  };
+    
+  packageName = "hu.dwim.def";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL
+    http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL
+    FILENAME hu_dot_dwim_dot_def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+    (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
+     hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index e77e977ea3f..e0a2d194f9e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -14,6 +14,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz'';
     sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74'';
   };
+    
+  packageName = "hunchentoot";
 
   overrides = x: {
     postInstall = ''
@@ -37,6 +39,7 @@ rec {
   through subclassing.
     SHA256 0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74 URL http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz MD5
     d1ce17dec454cab119c0f263e8a176d1 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS
-    ((NAME bordeaux-threads) (NAME chunga) (NAME cl+ssl) (NAME cl-base64) (NAME cl-fad) (NAME cl-ppcre) (NAME flexi-streams) (NAME md5) (NAME rfc2388)
-     (NAME trivial-backtrace) (NAME usocket))
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME md5 FILENAME md5)
+     (NAME rfc2388 FILENAME rfc2388) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME usocket FILENAME usocket))
     DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION 1.2.35 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index ea7dd30df0b..d849cf15272 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
     sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
   };
+    
+  packageName = "idna";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM idna DESCRIPTION IDNA (international domain names) string encoding and decoding routines SHA256 0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c
     URL http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz MD5 85b91a66efe4381bf116cdb5d2b756b6 NAME idna TESTNAME NIL FILENAME idna DEPS
-    ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */
+    ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
new file mode 100644
index 00000000000..fb106aa54c5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''ieee-floats'';
+  version = ''20160318-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz'';
+    sha256 = ''0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4'';
+  };
+    
+  packageName = "ieee-floats";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ieee-floats[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM ieee-floats DESCRIPTION NIL SHA256 0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4 URL
+    http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz MD5 84d679a4dffddc3b0cff944adde623c5 NAME ieee-floats TESTNAME NIL
+    FILENAME ieee-floats DEPS NIL DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index 55dd6b2a373..404c7a5dee9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''iolib'';
-  version = ''v0.8.1'';
+  version = ''v0.8.2'';
 
   description = ''I/O library.'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."split-sequence" args."swap-bytes" args."trivial-features" args."uiop" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz'';
+    sha256 = ''1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr'';
   };
+    
+  packageName = "iolib";
 
   overrides = x: {
     postInstall = ''
@@ -28,8 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481 URL
-    http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz MD5 cd34c4f7db4af7391757ebc3f4f61422 NAME iolib TESTNAME NIL FILENAME iolib DEPS
-    ((NAME alexandria) (NAME babel) (NAME bordeaux-threads) (NAME cffi) (NAME idna) (NAME split-sequence) (NAME swap-bytes) (NAME trivial-features)
-     (NAME uiop))
-    DEPENDENCIES (alexandria babel bordeaux-threads cffi idna split-sequence swap-bytes trivial-features uiop) VERSION v0.8.1 SIBLINGS NIL) */
+/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr URL
+    http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz MD5 cd2d4d2893b7e6d0502d9a16e717a2e9 NAME iolib TESTNAME NIL FILENAME iolib DEPS NIL
+    DEPENDENCIES NIL VERSION v0.8.2 SIBLINGS (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index de5528bca5e..944781947fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ironclad'';
-  version = ''ironclad_0.33.0'';
+  version = ''v0.34'';
 
   description = ''A cryptographic toolkit written in pure Common Lisp'';
 
-  deps = [ args."nibbles" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz'';
-    sha256 = ''1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7'';
+    url = ''http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz'';
+    sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0'';
   };
+    
+  packageName = "ironclad";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7 URL
-    http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz MD5 2b7befe607e2fedffbdd45b2443db718 NAME ironclad TESTNAME NIL FILENAME ironclad
-    DEPS ((NAME nibbles)) DEPENDENCIES (nibbles) VERSION ironclad_0.33.0 SIBLINGS (ironclad-text)) */
+/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL
+    http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad TESTNAME NIL FILENAME ironclad
+    DEPS NIL DEPENDENCIES NIL VERSION v0.34 SIBLINGS (ironclad-text)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index 446b54a455a..5e02dceb84c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz'';
     sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm'';
   };
+    
+  packageName = "iterate";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
new file mode 100644
index 00000000000..3d2da3fa6bc
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''ixf'';
+  version = ''cl-20170516-git'';
+
+  description = ''Tools to handle IBM PC version of IXF file format'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz'';
+    sha256 = ''0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf'';
+  };
+    
+  packageName = "ixf";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ixf[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format SHA256 0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf URL
+    http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz MD5 1c4c5ff76bb6fa9c19fe47d064c512b9 NAME ixf TESTNAME NIL FILENAME ixf DEPS
+    NIL DEPENDENCIES NIL VERSION cl-20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 905a14b785c..841c210a5ae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''jonathan'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
 
-  deps = [ args."trivial-types" args."proc-parse" args."fast-io" args."cl-syntax-annot" args."cl-syntax" args."cl-ppcre" args."cl-annot" args."babel" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz'';
-    sha256 = ''1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l'';
+    url = ''http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz'';
+    sha256 = ''00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q'';
   };
+    
+  packageName = "jonathan";
 
   overrides = x: {
     postInstall = ''
@@ -29,7 +31,5 @@ rec {
   };
 }
 /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256
-    1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l URL http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz MD5
-    f33377a22a3b1d948f294985acec20ad NAME jonathan TESTNAME NIL FILENAME jonathan DEPS
-    ((NAME trivial-types) (NAME proc-parse) (NAME fast-io) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-ppcre) (NAME cl-annot) (NAME babel)) DEPENDENCIES
-    (trivial-types proc-parse fast-io cl-syntax-annot cl-syntax cl-ppcre cl-annot babel) VERSION 20170124-git SIBLINGS (jonathan-test)) */
+    00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q URL http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz MD5
+    b05ccc0140e70636240f216fdc14e4d3 NAME jonathan TESTNAME NIL FILENAME jonathan DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (jonathan-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
deleted file mode 100644
index ba24d7dd78c..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20161204-git'';
-
-  description = '''';
-
-  deps = [ args."uiop" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
-    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-middleware-backtrace[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
-    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-middleware-backtrace TESTNAME NIL
-    FILENAME lack-middleware-backtrace DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION lack-20161204-git SIBLINGS
-    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session
-     lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util lack
-     t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
-     t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
deleted file mode 100644
index 9b60f52c87f..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''lack-util'';
-  version = ''lack-20161204-git'';
-
-  description = '''';
-
-  deps = [ args."ironclad" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
-    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-util[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM lack-util DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
-    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-util TESTNAME NIL FILENAME lack-util
-    DEPS ((NAME ironclad)) DEPENDENCIES (ironclad) VERSION lack-20161204-git SIBLINGS
-    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
-     lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test
-     lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf
-     t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util
-     t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index ceed4365966..2e8c2fe291f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
     sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
   };
+    
+  packageName = "lack";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index c01500f0c3d..4082abbe656 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz'';
     sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8'';
   };
+    
+  packageName = "let-plus";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL
     http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus TESTNAME NIL FILENAME
-    let-plus DEPS ((NAME alexandria) (NAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS NIL) */
+    let-plus DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 9d4aa874d4c..f35ba345d1b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz'';
     sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl'';
   };
+    
+  packageName = "lev";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM lev DESCRIPTION libev bindings for Common Lisp SHA256 0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl URL
     http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz MD5 10f340f7500beb98b5c0d4a9876131fb NAME lev TESTNAME NIL FILENAME lev DEPS
-    ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */
+    ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
new file mode 100644
index 00000000000..720afedb815
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''list-of'';
+  version = ''asdf-finalizers-20170403-git'';
+
+  description = ''magic list-of deftype'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz'';
+    sha256 = ''1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj'';
+  };
+    
+  packageName = "list-of";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/list-of[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM list-of DESCRIPTION magic list-of deftype SHA256 1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj URL
+    http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz MD5 a9e3c960e6b6fdbd69640b520ef8044b NAME list-of TESTNAME
+    NIL FILENAME list-of DEPS NIL DEPENDENCIES NIL VERSION asdf-finalizers-20170403-git SIBLINGS (asdf-finalizers-test asdf-finalizers)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index e2e7e71aadd..0740ec0779f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''local-time'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''A library for manipulating dates and times, based on a paper by Erik Naggum'';
 
-  deps = [ args."cl-fad" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz'';
-    sha256 = ''0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1'';
+    url = ''http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz'';
+    sha256 = ''0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p'';
   };
+    
+  packageName = "local-time";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256
-    0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1 URL http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz MD5
-    b345e5e74186eeddb85233df91d0dfe9 NAME local-time TESTNAME NIL FILENAME local-time DEPS ((NAME cl-fad)) DEPENDENCIES (cl-fad) VERSION 20170124-git SIBLINGS
+    0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p URL http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz MD5
+    b2f5b94458f34f4b73cdd614e1304a9a NAME local-time TESTNAME NIL FILENAME local-time DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
     (cl-postgres+local-time local-time.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
new file mode 100644
index 00000000000..a8d9d94c664
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lparallel'';
+  version = ''20160825-git'';
+
+  description = ''Parallelism for Common Lisp'';
+
+  deps = [ args."bordeaux-threads" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz'';
+    sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1'';
+  };
+    
+  packageName = "lparallel";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lparallel[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM lparallel DESCRIPTION Parallelism for Common Lisp SHA256 0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1 URL
+    http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz MD5 6393e8d0c0cc9ed1c88b6e7cca8de5df NAME lparallel TESTNAME NIL FILENAME
+    lparallel DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (bordeaux-threads alexandria) VERSION
+    20160825-git SIBLINGS (lparallel-bench lparallel-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 473581c3184..51c8af197fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lquery'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
 
-  deps = [ args."plump" args."form-fiddle" args."clss" args."array-utils" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz'';
-    sha256 = ''1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x'';
+    url = ''http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz'';
+    sha256 = ''11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7'';
   };
+    
+  packageName = "lquery";
 
   overrides = x: {
     postInstall = ''
@@ -28,7 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x URL
-    http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz MD5 072a796075862c96dcd6f227d79dc2b7 NAME lquery TESTNAME NIL FILENAME lquery
-    DEPS ((NAME plump) (NAME form-fiddle) (NAME clss) (NAME array-utils)) DEPENDENCIES (plump form-fiddle clss array-utils) VERSION 20160929-git SIBLINGS
-    (lquery-test)) */
+/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7 URL
+    http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz MD5 2190045b167685bfffdd01f5af9aa9a1 NAME lquery TESTNAME NIL FILENAME lquery
+    DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (lquery-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index ad159edc5c9..b5c242530fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz'';
     sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v'';
   };
+    
+  packageName = "map-set";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index cb5041b6029..5729c898fdc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz'';
     sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d'';
   };
+    
+  packageName = "marshal";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index a24e9d99a2c..1384799d242 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''md5'';
-  version = ''20150804-git'';
+  version = ''20170516-git'';
 
   description = ''The MD5 Message-Digest Algorithm RFC 1321'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz'';
-    sha256 = ''1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5'';
+    url = ''http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz'';
+    sha256 = ''1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv'';
   };
+    
+  packageName = "md5";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5 URL
-    http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz MD5 69331e0d326cbc3286ac447e2868e7fd NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
-    DEPENDENCIES NIL VERSION 20150804-git SIBLINGS NIL) */
+/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv URL
+    http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz MD5 1c90df8ab2c6d57b7abaac84cae30ab3 NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
+    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index 708fa41ca51..0bfbbbe14b2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz'';
     sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc'';
   };
+    
+  packageName = "metabang-bind";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
new file mode 100644
index 00000000000..1e35369a9d0
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''metatilities-base'';
+  version = ''20170403-git'';
+
+  description = ''These are metabang.com's Common Lisp basic utilities.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz'';
+    sha256 = ''14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br'';
+  };
+    
+  packageName = "metatilities-base";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metatilities-base[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM metatilities-base DESCRIPTION These are metabang.com's Common Lisp basic utilities. SHA256 14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br URL
+    http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz MD5 8a3f429862a368e63b8fde731e9ab28a NAME
+    metatilities-base TESTNAME NIL FILENAME metatilities-base DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS (metatilities-base-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
new file mode 100644
index 00000000000..3586d5cc21b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''mssql'';
+  version = ''cl-20131003-git'';
+
+  description = '''';
+
+  deps = [ args."cffi" args."garbage-pools" args."iterate" args."parse-number" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz'';
+    sha256 = ''1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk'';
+  };
+    
+  packageName = "mssql";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/mssql[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM mssql DESCRIPTION NIL SHA256 1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk URL
+    http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz MD5 3e9d85a3b0ae7e000723a857ce7c2d44 NAME mssql TESTNAME NIL FILENAME mssql
+    DEPS ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number))
+    DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION cl-20131003-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 186550a15df..6580c322b04 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz'';
     sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh'';
   };
+    
+  packageName = "myway";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL
     http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway TESTNAME NIL FILENAME myway DEPS
-    ((NAME quri) (NAME map-set) (NAME cl-utilities) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION
-    20150302-git SIBLINGS (myway-test)) */
+    ((NAME quri FILENAME quri) (NAME map-set FILENAME map-set) (NAME cl-utilities FILENAME cl-utilities) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION 20150302-git SIBLINGS (myway-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index c952ab5a1f7..53834f82431 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -12,6 +12,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz'';
     sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45'';
   };
+    
+  packageName = "named-readtables";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index c5300698e54..622fd506b15 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz'';
     sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4'';
   };
+    
+  packageName = "nibbles";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 48bd3b7e542..74cb02155eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz'';
     sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc'';
   };
+    
+  packageName = "optima";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM optima DESCRIPTION Optimized Pattern Matching Library SHA256 0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc URL
     http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz MD5 20523dc3dfc04bb2526008dff0842caa NAME optima TESTNAME NIL FILENAME optima
-    DEPS ((NAME closer-mop) (NAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS (optima.ppcre optima.test)) */
+    DEPS ((NAME closer-mop FILENAME closer-mop) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS
+    (optima.ppcre optima.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index 56ae3473e2c..b7398d3973d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz'';
     sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li'';
   };
+    
+  packageName = "parenscript";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL
     http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript TESTNAME NIL FILENAME
-    parenscript DEPS ((NAME named-readtables) (NAME cl-ppcre) (NAME anaphora)) DEPENDENCIES (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6
-    SIBLINGS (parenscript.test)) */
+    parenscript DEPS ((NAME named-readtables FILENAME named-readtables) (NAME cl-ppcre FILENAME cl-ppcre) (NAME anaphora FILENAME anaphora)) DEPENDENCIES
+    (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6 SIBLINGS (parenscript.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
new file mode 100644
index 00000000000..726209f9617
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''parse-number'';
+  version = ''1.4'';
+
+  description = ''Number parsing library'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz'';
+    sha256 = ''0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh'';
+  };
+    
+  packageName = "parse-number";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parse-number[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM parse-number DESCRIPTION Number parsing library SHA256 0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh URL
+    http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz MD5 f189d474a2cd063f9743b452241e59a9 NAME parse-number TESTNAME NIL FILENAME
+    parse-number DEPS NIL DEPENDENCIES NIL VERSION 1.4 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index dae0d011e75..f12f7b68d00 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
     sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
   };
+    
+  packageName = "pcall";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM pcall DESCRIPTION NIL SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
     http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall TESTNAME NIL FILENAME pcall DEPS
-    ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */
+    ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
new file mode 100644
index 00000000000..d5ef8606f49
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
@@ -0,0 +1,47 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''pgloader'';
+  version = ''3.3.2'';
+
+  description = ''Load data into PostgreSQL'';
+
+  deps = [ args."abnf" args."alexandria" args."cl-base64" args."cl-csv" args."cl-fad" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."command-line-arguments" args."db3" args."drakma" args."esrap" args."flexi-streams" args."ixf" args."local-time" args."lparallel" args."metabang-bind" args."mssql" args."postmodern" args."py-configparser" args."qmynd" args."quri" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."uiop" args."usocket" args."uuid" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz'';
+    sha256 = ''1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv'';
+  };
+    
+  packageName = "pgloader";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pgloader[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv URL
+    http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz MD5 fb72ca0db46b80a74b7b31dc5b27e1b8 NAME pgloader TESTNAME NIL FILENAME pgloader
+    DEPS
+    ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME cl-base64 FILENAME cl-base64) (NAME cl-csv FILENAME cl-csv)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-log FILENAME cl-log) (NAME cl-markdown FILENAME cl-markdown) (NAME cl-postgres FILENAME cl-postgres)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME db3 FILENAME db3) (NAME drakma FILENAME drakma)
+     (NAME esrap FILENAME esrap) (NAME flexi-streams FILENAME flexi-streams) (NAME ixf FILENAME ixf) (NAME local-time FILENAME local-time)
+     (NAME lparallel FILENAME lparallel) (NAME metabang-bind FILENAME metabang-bind) (NAME mssql FILENAME mssql) (NAME postmodern FILENAME postmodern)
+     (NAME py-configparser FILENAME py-configparser) (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri) (NAME simple-date FILENAME simple-date)
+     (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME uiop FILENAME uiop)
+     (NAME usocket FILENAME usocket) (NAME uuid FILENAME uuid))
+    DEPENDENCIES
+    (abnf alexandria cl-base64 cl-csv cl-fad cl-log cl-markdown cl-postgres cl-ppcre command-line-arguments db3 drakma esrap flexi-streams ixf local-time
+     lparallel metabang-bind mssql postmodern py-configparser qmynd quri simple-date split-sequence sqlite trivial-backtrace uiop usocket uuid)
+    VERSION 3.3.2 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 17795e3a92a..d89e25f8819 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''plump'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
-    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
+    url = ''http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz'';
+    sha256 = ''0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8'';
   };
+    
+  packageName = "plump";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x
-    URL http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz MD5 c49aeb37173aca79ee6ff5c89b0c4b1a NAME plump TESTNAME NIL FILENAME plump
-    DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
+/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8
+    URL http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz MD5 917a4f25691b3087ce24fd52ee42b4be NAME plump TESTNAME NIL FILENAME plump
+    DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
new file mode 100644
index 00000000000..18dc40ff51a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''postmodern'';
+  version = ''20170403-git'';
+
+  description = ''PostgreSQL programming API'';
+
+  deps = [ args."closer-mop" args."bordeaux-threads" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
+    sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
+  };
+    
+  packageName = "postmodern";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/postmodern[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME postmodern TESTNAME NIL
+    FILENAME postmodern DEPS ((NAME closer-mop FILENAME closer-mop) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES
+    (closer-mop bordeaux-threads) VERSION 20170403-git SIBLINGS (cl-postgres s-sql simple-date)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 9e4e2effbd3..142d24f5e48 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz'';
     sha256 = ''00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl'';
   };
+    
+  packageName = "proc-parse";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256 00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl URL
     http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz MD5 5e43f50284fa70c448a3df12d1eea2ea NAME proc-parse TESTNAME NIL
-    FILENAME proc-parse DEPS ((NAME babel) (NAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS (proc-parse-test)) */
+    FILENAME proc-parse DEPS ((NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS
+    (proc-parse-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index cf6fd03ba12..ae823959fdc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
     sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
+    
+  packageName = "prove";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM prove DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
     http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME prove TESTNAME NIL FILENAME prove DEPS
-    ((NAME uiop) (NAME cl-ppcre) (NAME cl-colors) (NAME cl-ansi-text) (NAME alexandria)) DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION
-    20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
+    ((NAME uiop FILENAME uiop) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-colors FILENAME cl-colors) (NAME cl-ansi-text FILENAME cl-ansi-text)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index fe48a580ee9..9a7e24cebdc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz'';
     sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa'';
   };
+    
+  packageName = "puri";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
new file mode 100644
index 00000000000..868aae61f6b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''py-configparser'';
+  version = ''20131003-svn'';
+
+  description = ''Common Lisp implementation of the Python ConfigParser module'';
+
+  deps = [ args."parse-number" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz'';
+    sha256 = ''10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx'';
+  };
+    
+  packageName = "py-configparser";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/py-configparser[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx
+    URL http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz MD5 da697259b68f536bcb6b77933b55a5d9 NAME py-configparser
+    TESTNAME NIL FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) DEPENDENCIES (parse-number) VERSION 20131003-svn SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
new file mode 100644
index 00000000000..b9871752e58
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
@@ -0,0 +1,38 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''qmynd'';
+  version = ''20160208-git'';
+
+  description = ''MySQL Native Driver'';
+
+  deps = [ args."usocket" args."trivial-gray-streams" args."salza2" args."list-of" args."ironclad" args."flexi-streams" args."cl+ssl" args."chipz" args."babel" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz'';
+    sha256 = ''0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq'';
+  };
+    
+  packageName = "qmynd";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/qmynd[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq URL
+    http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz MD5 9483ba5330a4240a9d5a8016c16a0084 NAME qmynd TESTNAME NIL FILENAME qmynd DEPS
+    ((NAME usocket FILENAME usocket) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME salza2 FILENAME salza2) (NAME list-of FILENAME list-of)
+     (NAME ironclad FILENAME ironclad) (NAME flexi-streams FILENAME flexi-streams) (NAME cl+ssl FILENAME cl+ssl) (NAME chipz FILENAME chipz)
+     (NAME babel FILENAME babel))
+    DEPENDENCIES (usocket trivial-gray-streams salza2 list-of ironclad flexi-streams cl+ssl chipz babel) VERSION 20160208-git SIBLINGS (qmynd-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 2a1219e48e7..1cfd62686c4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz'';
     sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a'';
   };
+    
+  packageName = "query-fs";
 
   overrides = x: {
     postInstall = ''
@@ -31,5 +33,7 @@ rec {
 /* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries SHA256
     0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz MD5
     dfbb3d0e7b5d990488a17b184771d049 NAME query-fs TESTNAME NIL FILENAME query-fs DEPS
-    ((NAME bordeaux-threads) (NAME cl-fuse) (NAME cl-fuse-meta-fs) (NAME cl-ppcre) (NAME command-line-arguments) (NAME iterate) (NAME trivial-backtrace))
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME iterate FILENAME iterate)
+     (NAME trivial-backtrace FILENAME trivial-backtrace))
     DEPENDENCIES (bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace) VERSION 20160531-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 1c351669c9a..26fab0612e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz'';
     sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv'';
   };
+    
+  packageName = "quri";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL
     http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5 8c87e99d4f7308d83aab361a6e36508a NAME quri TESTNAME NIL FILENAME quri DEPS
-    ((NAME split-sequence) (NAME cl-utilities) (NAME babel) (NAME alexandria)) DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git
-    SIBLINGS (quri-test)) */
+    ((NAME split-sequence FILENAME split-sequence) (NAME cl-utilities FILENAME cl-utilities) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git SIBLINGS (quri-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 572cd29c75b..e74c2c51b79 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
     sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
   };
+    
+  packageName = "rfc2388";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 38e9e4ecabd..9654a86b74b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -12,6 +12,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz'';
     sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va'';
   };
+    
+  packageName = "salza2";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
new file mode 100644
index 00000000000..00e2b3dbd0f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''simple-date'';
+  version = ''postmodern-20170403-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
+    sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
+  };
+    
+  packageName = "simple-date";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/simple-date[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM simple-date DESCRIPTION NIL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME simple-date TESTNAME NIL
+    FILENAME simple-date DEPS NIL DEPENDENCIES NIL VERSION postmodern-20170403-git SIBLINGS (cl-postgres postmodern s-sql)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 597f8fcfe3a..9a04f3c64db 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz'';
     sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s'';
   };
+    
+  packageName = "smart-buffer";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256 1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s URL
     http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz MD5 454d8510618da8111c7ca687549b7035 NAME smart-buffer TESTNAME NIL
-    FILENAME smart-buffer DEPS ((NAME xsubseq) (NAME uiop) (NAME flexi-streams)) DEPENDENCIES (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS
-    (smart-buffer-test)) */
+    FILENAME smart-buffer DEPS ((NAME xsubseq FILENAME xsubseq) (NAME uiop FILENAME uiop) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES
+    (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS (smart-buffer-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index 2712a1b8e1d..03331578764 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -12,6 +12,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz'';
     sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l'';
   };
+    
+  packageName = "split-sequence";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 1d2f8fd0122..73144329206 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz'';
     sha256 = ''0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh'';
   };
+    
+  packageName = "sqlite";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM sqlite DESCRIPTION NIL SHA256 0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL
     http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite TESTNAME NIL FILENAME
-    sqlite DEPS ((NAME cffi) (NAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */
+    sqlite DEPS ((NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 1a7056e3fa2..e06fe790f76 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz'';
     sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g'';
   };
+    
+  packageName = "static-vectors";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL
     http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors TESTNAME NIL
-    FILENAME static-vectors DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */
+    FILENAME static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES
+    (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index aaef5095dbb..6aa42000e73 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
-  deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz'';
-    sha256 = ''1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz'';
+    sha256 = ''0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659'';
   };
+    
+  packageName = "stumpwm";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf URL
-    http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz MD5 1081021518c5b6c36d39f12c47305ea1 NAME stumpwm TESTNAME NIL FILENAME
-    stumpwm DEPS ((NAME alexandria) (NAME cl-ppcre) (NAME clx)) DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170403-git SIBLINGS NIL) */
+/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659 URL
+    http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz MD5 ed076f733ef138aca3b04b3c3ff748f0 NAME stumpwm TESTNAME NIL FILENAME
+    stumpwm DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index 8ae38c45686..45d7a7800d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz'';
     sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky'';
   };
+    
+  packageName = "swap-bytes";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256 0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky URL
     http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz MD5 dda8b3b0a4e345879e80a3cc398667bb NAME swap-bytes TESTNAME NIL FILENAME
-    swap-bytes DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */
+    swap-bytes DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index e28637849af..0ed2e288760 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz'';
     sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx'';
   };
+    
+  packageName = "trivial-backtrace";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 7b44cb90337..ea531d722d4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz'';
     sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2'';
   };
+    
+  packageName = "trivial-features";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 3c439aae2e4..43bcd571304 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz'';
     sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08'';
   };
+    
+  packageName = "trivial-garbage";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 120f384a7a5..22011917022 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz'';
     sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92'';
   };
+    
+  packageName = "trivial-gray-streams";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index d091ad3250f..05631ab2b93 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A very simple library to allow indentation hints for SWANK.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz'';
-    sha256 = ''0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir'';
+    url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz'';
+    sha256 = ''0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma'';
   };
+    
+  packageName = "trivial-indent";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir
-    URL http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz MD5 d93c0fa8e29d7d37170efd58b84ac188 NAME trivial-indent
-    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */
+/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma
+    URL http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz MD5 6c8bde35ec010645c8d585c272ae01e8 NAME trivial-indent
+    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index e9d090a84aa..f4a84b5ceef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-mimes'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''Tiny library to detect mime types in files.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz'';
-    sha256 = ''1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w'';
+    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz'';
+    sha256 = ''1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2'';
   };
+    
+  packageName = "trivial-mimes";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w URL
-    http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz MD5 1075218aae1940bb3413b0edb6b73ac2 NAME trivial-mimes TESTNAME
-    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */
+/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2 URL
+    http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz MD5 b9cbba4147647ded4042949db3c00f1e NAME trivial-mimes TESTNAME
+    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 064e67fef50..8aed5e9681c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz'';
     sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx'';
   };
+    
+  packageName = "trivial-types";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index d7a8721f298..efbdca21465 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz'';
     sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb'';
   };
+    
+  packageName = "trivial-utf-8";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index f3528d60524..78085ff1762 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz'';
     sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy'';
   };
+    
+  packageName = "uffi";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 3b340be7c1d..579ad469cda 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''uiop'';
-  version = ''3.2.0'';
+  version = ''3.2.1'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz'';
-    sha256 = ''1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig'';
+    url = ''http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz'';
+    sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v'';
   };
+    
+  packageName = "uiop";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM uiop DESCRIPTION NIL SHA256 1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig URL
-    http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz MD5 3c304efce790959b14a241db2e669fce NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
-    DEPENDENCIES NIL VERSION 3.2.0 SIBLINGS (asdf-driver)) */
+/* (SYSTEM uiop DESCRIPTION NIL SHA256 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL
+    http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz MD5 3e9ef02ecf9005240b66552d85719700 NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
+    DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 5b6a7fafd01..c071b2f3bbd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
     sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
   };
+    
+  packageName = "usocket";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL
     http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket TESTNAME NIL FILENAME usocket
-    DEPS ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */
+    DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
new file mode 100644
index 00000000000..1f415f7142a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''uuid'';
+  version = ''20130813-git'';
+
+  description = ''UUID Generation'';
+
+  deps = [ args."ironclad" args."trivial-utf-8" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz'';
+    sha256 = ''1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf'';
+  };
+    
+  packageName = "uuid";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uuid[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM uuid DESCRIPTION UUID Generation SHA256 1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf URL
+    http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz MD5 e9029d9437573ec2ffa2b474adf95daf NAME uuid TESTNAME NIL FILENAME uuid DEPS
+    ((NAME ironclad FILENAME ironclad) (NAME trivial-utf-8 FILENAME trivial-utf-8)) DEPENDENCIES (ironclad trivial-utf-8) VERSION 20130813-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index ca9680ebd00..7be98029ca2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz'';
     sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93'';
   };
+    
+  packageName = "vom";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index a225b323f36..086a374d6e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz'';
     sha256 = ''0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1'';
   };
+    
+  packageName = "woo";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 3744526b25a..46262fb78f4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz'';
     sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0'';
   };
+    
+  packageName = "wookie";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index 11fa1931f0b..4d1d902cf5c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz'';
     sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b'';
   };
+    
+  packageName = "xmls";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index da2611d1f39..c1c699bd362 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz'';
     sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q'';
   };
+    
+  packageName = "xsubseq";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index 32c7198b99f..d581891c7cc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz'';
     sha256 = ''00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk'';
   };
+    
+  packageName = "yason";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256 00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk URL
     http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz MD5 79de5d242c5e9ce49dfda153d5f442ec NAME yason TESTNAME NIL FILENAME yason DEPS
-    ((NAME alexandria) (NAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.6 SIBLINGS NIL) */
+    ((NAME alexandria FILENAME alexandria) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION
+    v0.7.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 06fc8502d6c..0a1a9ee2f81 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz'';
     sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6'';
   };
+    
+  packageName = "zpb-ttf";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 2725c354d35..7065555cedd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -16,6 +16,9 @@ in
         export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh";
       '';
     };
+    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [
+      alexandria cl-ppcre clx
+    ]);
   };
   iterate = skipBuildPhase;
   cl-fuse = x: {
@@ -33,13 +36,12 @@ in
   };
   hunchentoot = addNativeLibs [pkgs.openssl];
   iolib = x: {
-    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++
-     [pkgs.libfixposix pkgs.gcc];
-    testSystems = (x.testSystems or ["iolib"]) ++ [
-      "iolib/os" "iolib/zstreams" "iolib/common-lisp" "iolib/base" "iolib/asdf"
-      "iolib/conf" "iolib/grovel" "iolib/syscalls" "iolib/sockets"
-      "iolib/multiplex" "iolib/streams" "iolib/pathnames"
-    ];
+    propagatedBuildInputs = (x.propagatedBuildInputs or [])
+     ++ (with pkgs; [libfixposix gcc])
+     ++ (with qlnp; [
+       alexandria split-sequence cffi bordeaux-threads idna swap-bytes
+     ])
+     ;
   };
   cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
   clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
@@ -110,6 +112,7 @@ in
   cffi = multiOverride [(addNativeLibs [pkgs.libffi])
     (addDeps (with qlnp; [uffi uiop trivial-features]))];
   cl-vectors = addDeps (with qlnp; [zpb-ttf]);
+  cl-paths-ttf = addDeps (with qlnp; [zpb-ttf]);
   "3bmd" = addDeps (with qlnp; [esrap split-sequence]);
   cl-dbi = addDeps (with qlnp; [
     cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads
@@ -124,13 +127,17 @@ in
         ln -s lib-dependent/*.asd .
       '';
     };
+    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [
+      cl-ppcre
+    ]);
   };
   cl-unification = addDeps (with qlnp; [cl-ppcre]);
   cl-syntax-annot = addDeps (with qlnp; [cl-syntax]);
   cl-syntax-anonfun = addDeps (with qlnp; [cl-syntax]);
   cl-syntax-markup = addDeps (with qlnp; [cl-syntax]);
   cl-test-more = addDeps (with qlnp; [prove]);
-  babel-streams = addDeps (with qlnp; [babel]);
+  babel-streams = addDeps (with qlnp; [babel trivial-gray-streams]);
+  babel = addDeps (with qlnp; [trivial-features alexandria]);
   plump = addDeps (with qlnp; [array-utils trivial-indent]);
   sqlite = addNativeLibs [pkgs.sqlite];
   uiop = x: {
@@ -143,4 +150,33 @@ in
       '';
     };
   };
+  cl-containers = x: {
+    overrides = y: (x.overrides y) // {
+      postConfigure = "rm GNUmakefile";
+    };
+  };
+  esrap = addDeps (with qlnp; [alexandria]);
+  fast-io = addDeps (with qlnp; [
+    alexandria trivial-gray-streams static-vectors
+  ]);
+  hu_dot_dwim_dot_def = addDeps (with qlnp; [
+    hu_dot_dwim_dot_asdf alexandria anaphora iterate metabang-bind
+  ]);
+  ironclad = addDeps (with qlnp; [nibbles flexi-streams]);
+  ixf = addDeps (with qlnp; [
+    split-sequence md5 alexandria babel local-time cl-ppcre ieee-floats
+  ]);
+  jonathan = addDeps (with qlnp; [
+    cl-syntax cl-syntax-annot fast-io proc-parse cl-ppcre
+  ]);
+  local-time = addDeps (with qlnp; [cl-fad]);
+  lquery = addDeps (with qlnp; [array-utils form-fiddle plump clss]);
+  clss = addDeps (with qlnp; [array-utils plump]);
+  form-fiddle = addDeps (with qlnp; [documentation-utils]);
+  documentation-utils = addDeps (with qlnp; [trivial-indent]);
+  mssql = x: {
+    testSystems = [];
+  };
+  cl-postgres = addDeps (with qlnp; [cl-ppcre md5]);
+  postmodern = addDeps (with qlnp; [md5]);
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 3d15319ad06..74946f07f07 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -1,5 +1,6 @@
 3bmd
 alexandria
+array-utils
 babel
 blackbird
 bordeaux-threads
@@ -31,6 +32,7 @@ cl-ppcre-unicode
 cl-reexport
 cl-smtp
 clsql
+clss
 cl+ssl
 cl-syntax-annot
 cl-syntax-anonfun
@@ -50,15 +52,20 @@ dbd-mysql
 dbd-postgres
 dbd-sqlite3
 dexador
+documentation-utils
 drakma
 esrap
 external-program
 fast-http
 fast-io
 flexi-streams
+form-fiddle
 http-body
+hu.dwim.asdf
 hu.dwim.def
 hunchentoot
+idna
+ieee-floats
 iolib
 ironclad
 iterate
@@ -67,9 +74,11 @@ lev
 local-time
 lquery
 marshal
+nibbles
 optima
 parenscript
 pcall
+pgloader
 plump
 proc-parse
 prove
@@ -80,7 +89,9 @@ smart-buffer
 split-sequence
 static-vectors
 stumpwm
+swap-bytes
 trivial-backtrace
+trivial-indent
 trivial-mimes
 trivial-types
 trivial-utf-8
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 118045015e2..c87b827112c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,10 +6,10 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
-  "trivial-indent" = buildLispPackage
+  "asdf-system-connections" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."trivial-indent" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-indent.nix {
+       (qlOverrides."asdf-system-connections" or (x: {}))
+       (import ./quicklisp-to-nix-output/asdf-system-connections.nix {
          inherit fetchurl;
        }));
 
@@ -24,12 +24,63 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "documentation-utils" = buildLispPackage
+  "list-of" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."documentation-utils" or (x: {}))
-       (import ./quicklisp-to-nix-output/documentation-utils.nix {
+       (qlOverrides."list-of" or (x: {}))
+       (import ./quicklisp-to-nix-output/list-of.nix {
+         inherit fetchurl;
+       }));
+
+
+  "parse-number" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."parse-number" or (x: {}))
+       (import ./quicklisp-to-nix-output/parse-number.nix {
+         inherit fetchurl;
+       }));
+
+
+  "garbage-pools" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."garbage-pools" or (x: {}))
+       (import ./quicklisp-to-nix-output/garbage-pools.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-containers" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-containers" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-containers.nix {
+         inherit fetchurl;
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
+       }));
+
+
+  "dynamic-classes" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dynamic-classes" or (x: {}))
+       (import ./quicklisp-to-nix-output/dynamic-classes.nix {
+         inherit fetchurl;
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+       }));
+
+
+  "metatilities-base" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."metatilities-base" or (x: {}))
+       (import ./quicklisp-to-nix-output/metatilities-base.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-interpol" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-interpol" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-interpol.nix {
          inherit fetchurl;
-           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
        }));
 
 
@@ -49,8 +100,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel-streams" or (x: {}))
        (import ./quicklisp-to-nix-output/babel-streams.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -72,112 +121,169 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "named-readtables" = buildLispPackage
+  "uuid" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."named-readtables" or (x: {}))
-       (import ./quicklisp-to-nix-output/named-readtables.nix {
+       (qlOverrides."uuid" or (x: {}))
+       (import ./quicklisp-to-nix-output/uuid.nix {
          inherit fetchurl;
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
        }));
 
 
-  "array-utils" = buildLispPackage
+  "simple-date" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."array-utils" or (x: {}))
-       (import ./quicklisp-to-nix-output/array-utils.nix {
+       (qlOverrides."simple-date" or (x: {}))
+       (import ./quicklisp-to-nix-output/simple-date.nix {
          inherit fetchurl;
        }));
 
 
-  "clss" = buildLispPackage
+  "qmynd" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."clss" or (x: {}))
-       (import ./quicklisp-to-nix-output/clss.nix {
+       (qlOverrides."qmynd" or (x: {}))
+       (import ./quicklisp-to-nix-output/qmynd.nix {
          inherit fetchurl;
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
-           "plump" = quicklisp-to-nix-packages."plump";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "salza2" = quicklisp-to-nix-packages."salza2";
+           "list-of" = quicklisp-to-nix-packages."list-of";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "babel" = quicklisp-to-nix-packages."babel";
        }));
 
 
-  "form-fiddle" = buildLispPackage
+  "py-configparser" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."form-fiddle" or (x: {}))
-       (import ./quicklisp-to-nix-output/form-fiddle.nix {
+       (qlOverrides."py-configparser" or (x: {}))
+       (import ./quicklisp-to-nix-output/py-configparser.nix {
          inherit fetchurl;
-           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
        }));
 
 
-  "nibbles" = buildLispPackage
+  "postmodern" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."nibbles" or (x: {}))
-       (import ./quicklisp-to-nix-output/nibbles.nix {
+       (qlOverrides."postmodern" or (x: {}))
+       (import ./quicklisp-to-nix-output/postmodern.nix {
          inherit fetchurl;
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
        }));
 
 
-  "swap-bytes" = buildLispPackage
+  "mssql" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."swap-bytes" or (x: {}))
-       (import ./quicklisp-to-nix-output/swap-bytes.nix {
+       (qlOverrides."mssql" or (x: {}))
+       (import ./quicklisp-to-nix-output/mssql.nix {
          inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "garbage-pools" = quicklisp-to-nix-packages."garbage-pools";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
        }));
 
 
-  "idna" = buildLispPackage
+  "lparallel" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."idna" or (x: {}))
-       (import ./quicklisp-to-nix-output/idna.nix {
+       (qlOverrides."lparallel" or (x: {}))
+       (import ./quicklisp-to-nix-output/lparallel.nix {
          inherit fetchurl;
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
-  "rfc2388" = buildLispPackage
+  "ixf" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."rfc2388" or (x: {}))
-       (import ./quicklisp-to-nix-output/rfc2388.nix {
+       (qlOverrides."ixf" or (x: {}))
+       (import ./quicklisp-to-nix-output/ixf.nix {
          inherit fetchurl;
        }));
 
 
-  "md5" = buildLispPackage
+  "db3" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."md5" or (x: {}))
-       (import ./quicklisp-to-nix-output/md5.nix {
+       (qlOverrides."db3" or (x: {}))
+       (import ./quicklisp-to-nix-output/db3.nix {
          inherit fetchurl;
        }));
 
 
-  "hu.dwim.asdf" = buildLispPackage
+  "cl-markdown" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."hu.dwim.asdf" or (x: {}))
-       (import ./quicklisp-to-nix-output/hu.dwim.asdf.nix {
+       (qlOverrides."cl-markdown" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-markdown.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-containers" = quicklisp-to-nix-packages."cl-containers";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
        }));
 
 
-  "jonathan" = buildLispPackage
+  "cl-log" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."jonathan" or (x: {}))
-       (import ./quicklisp-to-nix-output/jonathan.nix {
+       (qlOverrides."cl-log" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-log.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-csv" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-csv" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-csv.nix {
+         inherit fetchurl;
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "abnf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."abnf" or (x: {}))
+       (import ./quicklisp-to-nix-output/abnf.nix {
          inherit fetchurl;
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "babel" = quicklisp-to-nix-packages."babel";
+           "esrap" = quicklisp-to-nix-packages."esrap";
        }));
 
 
-  "puri" = buildLispPackage
+  "named-readtables" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."puri" or (x: {}))
-       (import ./quicklisp-to-nix-output/puri.nix {
+       (qlOverrides."named-readtables" or (x: {}))
+       (import ./quicklisp-to-nix-output/named-readtables.nix {
+         inherit fetchurl;
+       }));
+
+
+  "rfc2388" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."rfc2388" or (x: {}))
+       (import ./quicklisp-to-nix-output/rfc2388.nix {
+         inherit fetchurl;
+       }));
+
+
+  "md5" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."md5" or (x: {}))
+       (import ./quicklisp-to-nix-output/md5.nix {
+         inherit fetchurl;
+       }));
+
+
+  "jonathan" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."jonathan" or (x: {}))
+       (import ./quicklisp-to-nix-output/jonathan.nix {
          inherit fetchurl;
        }));
 
@@ -191,6 +297,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "puri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."puri" or (x: {}))
+       (import ./quicklisp-to-nix-output/puri.nix {
+         inherit fetchurl;
+       }));
+
+
   "sqlite" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."sqlite" or (x: {}))
@@ -260,7 +374,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-paths-ttf" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-paths-ttf.nix {
          inherit fetchurl;
-           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
        }));
 
 
@@ -372,28 +485,18 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "lack-middleware-backtrace" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-middleware-backtrace" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix {
-         inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
-  "lack-util" = buildLispPackage
+  "trivial-gray-streams" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."lack-util" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-util.nix {
+       (qlOverrides."trivial-gray-streams" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-gray-streams.nix {
          inherit fetchurl;
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
        }));
 
 
-  "trivial-gray-streams" = buildLispPackage
+  "trivial-features" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."trivial-gray-streams" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-gray-streams.nix {
+       (qlOverrides."trivial-features" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-features.nix {
          inherit fetchurl;
        }));
 
@@ -468,14 +571,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "trivial-features" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-features" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-features.nix {
-         inherit fetchurl;
-       }));
-
-
   "yason" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."yason" or (x: {}))
@@ -551,6 +646,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivial-indent" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-indent" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-indent.nix {
+         inherit fetchurl;
+       }));
+
+
   "trivial-backtrace" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-backtrace" or (x: {}))
@@ -559,14 +662,20 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "swap-bytes" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."swap-bytes" or (x: {}))
+       (import ./quicklisp-to-nix-output/swap-bytes.nix {
+         inherit fetchurl;
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
   "stumpwm" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."stumpwm" or (x: {}))
        (import ./quicklisp-to-nix-output/stumpwm.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "clx" = quicklisp-to-nix-packages."clx";
        }));
 
 
@@ -666,6 +775,44 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "pgloader" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."pgloader" or (x: {}))
+       (import ./quicklisp-to-nix-output/pgloader.nix {
+         inherit fetchurl;
+           "abnf" = quicklisp-to-nix-packages."abnf";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-csv" = quicklisp-to-nix-packages."cl-csv";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-log" = quicklisp-to-nix-packages."cl-log";
+           "cl-markdown" = quicklisp-to-nix-packages."cl-markdown";
+           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments";
+           "db3" = quicklisp-to-nix-packages."db3";
+           "drakma" = quicklisp-to-nix-packages."drakma";
+           "esrap" = quicklisp-to-nix-packages."esrap";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "ixf" = quicklisp-to-nix-packages."ixf";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "lparallel" = quicklisp-to-nix-packages."lparallel";
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "mssql" = quicklisp-to-nix-packages."mssql";
+           "postmodern" = quicklisp-to-nix-packages."postmodern";
+           "py-configparser" = quicklisp-to-nix-packages."py-configparser";
+           "qmynd" = quicklisp-to-nix-packages."qmynd";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "simple-date" = quicklisp-to-nix-packages."simple-date";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "sqlite" = quicklisp-to-nix-packages."sqlite";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "uuid" = quicklisp-to-nix-packages."uuid";
+       }));
+
+
   "pcall" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."pcall" or (x: {}))
@@ -696,6 +843,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "nibbles" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."nibbles" or (x: {}))
+       (import ./quicklisp-to-nix-output/nibbles.nix {
+         inherit fetchurl;
+       }));
+
+
   "marshal" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."marshal" or (x: {}))
@@ -709,10 +864,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lquery" or (x: {}))
        (import ./quicklisp-to-nix-output/lquery.nix {
          inherit fetchurl;
-           "plump" = quicklisp-to-nix-packages."plump";
-           "form-fiddle" = quicklisp-to-nix-packages."form-fiddle";
-           "clss" = quicklisp-to-nix-packages."clss";
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
        }));
 
 
@@ -721,7 +872,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."local-time" or (x: {}))
        (import ./quicklisp-to-nix-output/local-time.nix {
          inherit fetchurl;
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
        }));
 
 
@@ -755,7 +905,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."ironclad" or (x: {}))
        (import ./quicklisp-to-nix-output/ironclad.nix {
          inherit fetchurl;
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
        }));
 
 
@@ -764,15 +913,23 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."iolib" or (x: {}))
        (import ./quicklisp-to-nix-output/iolib.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "idna" = quicklisp-to-nix-packages."idna";
+       }));
+
+
+  "ieee-floats" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."ieee-floats" or (x: {}))
+       (import ./quicklisp-to-nix-output/ieee-floats.nix {
+         inherit fetchurl;
+       }));
+
+
+  "idna" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."idna" or (x: {}))
+       (import ./quicklisp-to-nix-output/idna.nix {
+         inherit fetchurl;
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -795,16 +952,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "hu.dwim.def" = buildLispPackage
+  "hu_dot_dwim_dot_def" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."hu.dwim.def" or (x: {}))
-       (import ./quicklisp-to-nix-output/hu.dwim.def.nix {
+       (qlOverrides."hu_dot_dwim_dot_def" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix {
+         inherit fetchurl;
+       }));
+
+
+  "hu_dot_dwim_dot_asdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."hu_dot_dwim_dot_asdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix {
          inherit fetchurl;
-           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
-           "iterate" = quicklisp-to-nix-packages."iterate";
-           "hu.dwim.asdf" = quicklisp-to-nix-packages."hu.dwim.asdf";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -824,6 +984,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "form-fiddle" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."form-fiddle" or (x: {}))
+       (import ./quicklisp-to-nix-output/form-fiddle.nix {
+         inherit fetchurl;
+       }));
+
+
   "flexi-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."flexi-streams" or (x: {}))
@@ -838,9 +1006,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."fast-io" or (x: {}))
        (import ./quicklisp-to-nix-output/fast-io.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -866,7 +1031,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."esrap" or (x: {}))
        (import ./quicklisp-to-nix-output/esrap.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -886,27 +1050,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "documentation-utils" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."documentation-utils" or (x: {}))
+       (import ./quicklisp-to-nix-output/documentation-utils.nix {
+         inherit fetchurl;
+       }));
+
+
   "dexador" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."dexador" or (x: {}))
        (import ./quicklisp-to-nix-output/dexador.nix {
          inherit fetchurl;
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "fast-http" = quicklisp-to-nix-packages."fast-http";
-           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
-           "chunga" = quicklisp-to-nix-packages."chunga";
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1085,6 +1241,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clss" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clss" or (x: {}))
+       (import ./quicklisp-to-nix-output/clss.nix {
+         inherit fetchurl;
+       }));
+
+
   "clsql" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clsql" or (x: {}))
@@ -1130,7 +1294,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-ppcre-template" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-ppcre-template.nix {
          inherit fetchurl;
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
        }));
 
 
@@ -1323,24 +1486,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack-v1-compat" or (x: {}))
        (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "marshal" = quicklisp-to-nix-packages."marshal";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "http-body" = quicklisp-to-nix-packages."http-body";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1349,12 +1494,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack" or (x: {}))
        (import ./quicklisp-to-nix-output/clack.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1429,8 +1568,14 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel" or (x: {}))
        (import ./quicklisp-to-nix-output/babel.nix {
          inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "array-utils" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."array-utils" or (x: {}))
+       (import ./quicklisp-to-nix-output/array-utils.nix {
+         inherit fetchurl;
        }));
 
 
@@ -1442,10 +1587,10 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "3bmd" = buildLispPackage
+  "_3bmd" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."3bmd" or (x: {}))
-       (import ./quicklisp-to-nix-output/3bmd.nix {
+       (qlOverrides."_3bmd" or (x: {}))
+       (import ./quicklisp-to-nix-output/_3bmd.nix {
          inherit fetchurl;
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "esrap" = quicklisp-to-nix-packages."esrap";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
index a13cedf3dfe..3a0c5cb5fc2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
@@ -1,8 +1,7 @@
-  "<% @var name %>" = buildLispPackage
+  "<% @var filename %>" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."<% @var name %>" or (x: {}))
+       (qlOverrides."<% @var filename %>" or (x: {}))
        (import ./quicklisp-to-nix-output/<% @var filename %>.nix {
          inherit fetchurl;<% @loop deps %>
-           "<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endloop %>
-       }));<% @ifequal name filename %><% @else %>
-  "<% @var filename %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endif %>
+           "<% @var filename %>" = quicklisp-to-nix-packages."<% @var filename %>";<% @endloop %>
+       }));
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index 3b71ade03f7..baedbd1553a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -7,12 +7,14 @@ rec {
 
   description = ''<% @var description %>'';
 
-  deps = [ <% @loop deps %>args."<% @var name %>" <% @endloop %>];
+  deps = [ <% @loop deps %>args."<% @var filename %>" <% @endloop %>];
 
   src = fetchurl {
     url = ''<% @var url %>'';
     sha256 = ''<% @var sha256 %>'';
   };
+    
+  packageName = "<% @var name %>";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index 18cf6d097a2..141fb0f34eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -36,19 +36,27 @@
                        (map 'list 'identity (md5:md5sum-file path))))))))
 
 (defun escape-filename (s)
-  (format nil "~{~a~}"
-       (loop
-         for x in (map 'list 'identity s)
-         collect
-         (case x
-           (#\/ "_slash_")
-           (#\\ "_backslash_")
-           (#\_ "__")
-           (t x)))))
+  (format 
+    nil "~a~{~a~}"
+    (if (cl-ppcre:scan "^[a-zA-Z_]" s) "" "_")
+    (loop
+      for x in (map 'list 'identity s)
+      collect
+      (case x
+        (#\/ "_slash_")
+        (#\\ "_backslash_")
+        (#\_ "__")
+        (#\. "_dot_")
+        (t x)))))
 
 (defun system-data (system)
   (let*
-    ((asdf-system (asdf:find-system system))
+    ((asdf-system
+       (or
+         (ignore-errors (asdf:find-system system))
+         (progn
+           (ql:quickload system)
+           (asdf:find-system system))))
      (ql-system (ql-dist:find-system system))
      (ql-release (ql-dist:release ql-system))
      (ql-sibling-systems (ql-dist:provided-systems ql-release))
@@ -73,7 +81,8 @@
            :test 'equal)
          ql-sibling-names
          :test 'equal))
-     (deps (mapcar (lambda (x) (list :name x)) dependencies))
+     (deps (mapcar (lambda (x) (list :name x :filename (escape-filename x)))
+                   dependencies))
      (description (asdf:system-description asdf-system))
      (release-name (ql-dist:short-description ql-release))
      (version (cl-ppcre:regex-replace-all
-- 
GitLab


From 7469eb9fed930d57a1ff8bb8c0666985d9ed0c46 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Jun 2017 23:25:35 +0200
Subject: [PATCH 1054/1490] stress: enable on darwin

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

diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix
index 52cfd4dde74..5a4734328ff 100644
--- a/pkgs/tools/system/stress/default.nix
+++ b/pkgs/tools/system/stress/default.nix
@@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Simple workload generator for POSIX systems. It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system";
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
-- 
GitLab


From febe37a24a72574245dc907bc191221a957215e2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2017 22:15:24 +0200
Subject: [PATCH 1055/1490] webkitgtk: 2.16.3 -> 2.16.4 for multiple CVEs

Fixes:

  * CVE-2017-2538
  * CVE-2017-2424

See https://webkitgtk.org/security/WSA-2017-0005.html
---
 pkgs/development/libraries/webkitgtk/2.16.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix
index 4431972b5dd..b50d94b90a5 100644
--- a/pkgs/development/libraries/webkitgtk/2.16.nix
+++ b/pkgs/development/libraries/webkitgtk/2.16.nix
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.16.3";
+  version = "2.16.4";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "04mmfxm8284zrlkrhkcn9gq1l4lpm1q6wwb5hyybj081v8qr2ki0";
+    sha256 = "0a2ikwiw1wn8w11y9ci6nn6dq9w0iki48l9lhnbm7g8rhcrs9azr";
   };
 
   # see if we can clean this up....
-- 
GitLab


From dd3f2e648a6ee5dc7ba88bf2e3d13b6b47686350 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2017 23:46:12 +0200
Subject: [PATCH 1056/1490] linux_hardened_copperhead: init at 4.11.6.c

---
 .../kernel/linux-hardened-copperhead.nix      | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 12 +++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
new file mode 100644
index 00000000000..ae47a3842f7
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
+
+let
+  version = "4.11.6";
+  revision = "c";
+  sha256 = "1n1j1y5g5fcvgpqjfq14fbg4cm32k420kbazipqbi84h9zwifa69";
+in
+
+import ./generic.nix (args // {
+  version = "${version}-${revision}";
+  extraMeta.branch = "4.11";
+  modDirVersion = version;
+
+  src = fetchFromGitHub {
+    inherit sha256;
+    owner = "copperhead";
+    repo = "linux-hardened";
+    rev = "${version}.${revision}";
+  };
+
+  kernelPatches = args.kernelPatches;
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2fc65da558..2973e2d9b0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11841,6 +11841,17 @@ with pkgs;
 
   klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
 
+  linux_hardened_copperhead = callPackage ../os-specific/linux/kernel/linux-hardened-copperhead.nix {
+    kernelPatches = with kernelPatches; [
+      kernelPatches.bridge_stp_helper
+      kernelPatches.p9_fixes
+    ];
+    extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
+      inherit stdenv;
+      inherit (linux) version;
+    };
+  };
+
   linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -12092,6 +12103,7 @@ with pkgs;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
+  linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead;
   linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10);
-- 
GitLab


From b1ffe5e4c029c9f5675bcc42997413fd1b21fbf1 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 6 Jun 2017 22:41:22 +0200
Subject: [PATCH 1057/1490] lib/generators: toPretty

`toPretty` implements a pretty printer for nix values.
---
 lib/generators.nix | 32 ++++++++++++++++++++++++++++++++
 lib/tests/misc.nix | 30 ++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/lib/generators.nix b/lib/generators.nix
index 4d3c920b0ae..0e5ce864356 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -90,4 +90,36 @@ rec {
     * parsers as well.
     */
   toYAML = {}@args: toJSON args;
+
+  # TODO we need some kind of pattern matching sometimes
+  /* Pretty print a value, akin to `builtins.trace`.
+    * Should probably be a builtin as well.
+    */
+  toPretty = {
+    /* If this option is true, attrsets like { __pretty = fn; val = …; }
+       will use fn to convert val to a pretty printed representation.
+       (This means fn is type Val -> String.) */
+    allowPrettyValues ? false
+  }@args: v: with builtins;
+    if      isInt      v then toString v
+    else if isBool     v then (if v == true then "true" else "false")
+    else if isString   v then "\"" + v + "\""
+    else if null ==    v then "null"
+    else if isFunction v then "<λ>"
+    else if isList     v then "[ "
+        + libStr.concatMapStringsSep " " (toPretty args) v
+      + " ]"
+    else if isAttrs    v then
+      # apply pretty values if allowed
+      if attrNames v == [ "__pretty" "val" ] && allowPrettyValues
+         then v.__pretty v.val
+      # TODO: there is probably a better representation?
+      else if v ? type && v.type == "derivation" then "<δ>"
+      else "{ "
+          + libStr.concatStringsSep " " (libAttr.mapAttrsToList
+              (name: value:
+                "${toPretty args name} = ${toPretty args value};") v)
+        + " }"
+    else "toPretty: should never happen (v = ${v})";
+
 }
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 22557bdfeef..f40036274e8 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -285,6 +285,36 @@ runTests {
       expected = builtins.toJSON val;
   };
 
+  testToPretty = {
+    expr = mapAttrs (const (generators.toPretty {})) rec {
+      int = 42;
+      bool = true;
+      string = "fnord";
+      null_ = null;
+      function = x: x;
+      list = [ 3 4 function [ false ] ];
+      attrs = { foo = null; "foo bar" = "baz"; };
+      drv = derivation { name = "test"; system = builtins.currentSystem; };
+    };
+    expected = rec {
+      int = "42";
+      bool = "true";
+      string = "\"fnord\"";
+      null_ = "null";
+      function = "<λ>";
+      list = "[ 3 4 ${function} [ false ] ]";
+      attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }";
+      drv = "<δ>";
+    };
+  };
+
+  testToPrettyAllowPrettyValues = {
+    expr = generators.toPretty { allowPrettyValues = true; }
+             { __pretty = v: "«" + v + "»"; val = "foo"; };
+    expected  = "«foo»";
+  };
+
+
 # MISC
 
   testOverridableDelayableArgsTest = {
-- 
GitLab


From feb8cbdc38c6b10b2c66a96151d8d560e960c29f Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 6 Jun 2017 22:42:30 +0200
Subject: [PATCH 1058/1490] lib/debug: traceSeqN & traceSeqValN

Strict trace functions that only go down to a specified depth.
Handy to get a better picture and prevent infinite recursions.
---
 lib/debug.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/debug.nix b/lib/debug.nix
index 5b3878554c5..925e0d405a7 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -20,8 +20,32 @@ rec {
   traceXMLValMarked = str: x: trace (str + builtins.toXML x) x;
 
   # strict trace functions (traced structure is fully evaluated and printed)
+
+  /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */
   traceSeq = x: y: trace (builtins.deepSeq x x) y;
+
+  /* Like `traceSeq`, but only down to depth n.
+   * This is very useful because lots of `traceSeq` usages
+   * lead to an infinite recursion.
+   */
+  traceSeqN = depth: x: y: with lib;
+    let snip = v: if      isList  v then noQuotes "[…]" v
+                  else if isAttrs v then noQuotes "{…}" v
+                  else v;
+        noQuotes = str: v: { __pretty = const str; val = v; };
+        modify = n: fn: v: if (n == 0) then fn v
+                      else if isList  v then map (modify (n - 1) fn) v
+                      else if isAttrs v then mapAttrs
+                        (const (modify (n - 1) fn)) v
+                      else v;
+    in trace (generators.toPretty { allowPrettyValues = true; }
+               (modify depth snip x)) y;
+
+  /* `traceSeq`, but the same value is traced and returned */
   traceValSeq = v: traceVal (builtins.deepSeq v v);
+  /* `traceValSeq` but with fixed depth */
+  traceValSeqN = depth: v: traceSeqN depth v v;
+
 
   # this can help debug your code as well - designed to not produce thousands of lines
   traceShowVal = x: trace (showVal x) x;
-- 
GitLab


From 5cbc6ca9bb63f939dab2c2c82a63d72f1f30d9b7 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 12 Jun 2017 07:07:59 +0200
Subject: [PATCH 1059/1490] lib/generators: put more information in toPretty
 lambdas

With `builtins.functionArgs` we can get some information if the first argument
is an attrset and whether the contained fields have default values. Encode that
into the pretty-printed lambda.
---
 lib/generators.nix | 9 +++++++--
 lib/tests/misc.nix | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/generators.nix b/lib/generators.nix
index 0e5ce864356..4419c3c8891 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -91,7 +91,6 @@ rec {
     */
   toYAML = {}@args: toJSON args;
 
-  # TODO we need some kind of pattern matching sometimes
   /* Pretty print a value, akin to `builtins.trace`.
     * Should probably be a builtin as well.
     */
@@ -105,7 +104,13 @@ rec {
     else if isBool     v then (if v == true then "true" else "false")
     else if isString   v then "\"" + v + "\""
     else if null ==    v then "null"
-    else if isFunction v then "<λ>"
+    else if isFunction v then
+      let fna = functionArgs v;
+          showFnas = concatStringsSep "," (libAttr.mapAttrsToList
+                       (name: hasDefVal: if hasDefVal then "(${name})" else name)
+                       fna);
+      in if fna == {}    then "<λ>"
+                         else "<λ:{${showFnas}}>"
     else if isList     v then "[ "
         + libStr.concatMapStringsSep " " (toPretty args) v
       + " ]"
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index f40036274e8..4c4c06fe78d 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -292,6 +292,7 @@ runTests {
       string = "fnord";
       null_ = null;
       function = x: x;
+      functionArgs = { arg ? 4, foo }: arg;
       list = [ 3 4 function [ false ] ];
       attrs = { foo = null; "foo bar" = "baz"; };
       drv = derivation { name = "test"; system = builtins.currentSystem; };
@@ -302,6 +303,7 @@ runTests {
       string = "\"fnord\"";
       null_ = "null";
       function = "<λ>";
+      functionArgs = "<λ:{(arg),foo}>";
       list = "[ 3 4 ${function} [ false ] ]";
       attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }";
       drv = "<δ>";
-- 
GitLab


From 7c0f6f4be53453e08a1d4a27cd40a46c4e920ce8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Jun 2017 00:37:32 +0200
Subject: [PATCH 1060/1490] pyopenssl: 16.2.0 -> 17.0.0 and fix tests

Upstream changes:

 * Added OpenSSL.X509Store.set_time() to set a custom verification time
   when verifying certificate chains. pyca/pyopenssl#567
 * Added a collection of functions for working with OCSP stapling. None
   of these functions make it possible to validate OCSP assertions, only
   to staple them into the handshake and to retrieve the stapled
   assertion if provided. Users will need to write their own code to
   handle OCSP assertions. We specifically added:
   Context.set_ocsp_server_callback, Context.set_ocsp_client_callback,
   and Connection.request_ocsp. pyca/pyopenssl#580
 * Changed the SSL module's memory allocation policy to avoid zeroing
   memory it allocates when unnecessary. This reduces CPU usage and
   memory allocation time by an amount proportional to the size of the
   allocation. For applications that process a lot of TLS data or that
   use very lage allocations this can provide considerable performance
   improvements. pyca/pyopenssl#578
 * Automatically set SSL_CTX_set_ecdh_auto() on OpenSSL.SSL.Context.
   pyca/pyopenssl#575
 * Fix empty exceptions from OpenSSL.crypto.load_privatekey().
   pyca/pyopenssl#581

The full upstream changelog can be found at:

https://pyopenssl.readthedocs.io/en/17.0.0/changelog.html

I've also added a patch from pyca/pyopenssl#637 in order to fix the
tests, which was the main reason for the version bump because that patch
won't apply for 16.2.0.

According to the upstream changelog there should be no
backwards-incompatible changes, but I've tested building against some of
the packages depending on pyopenssl anyway. Regardless of this, the
build for pyopenssl fails right now anyway, so the worst that could
happen via this commit would be that we break something that's already
broken.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/top-level/python-packages.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec89d81479d..80bfad3c29c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20318,11 +20318,17 @@ in {
 
   pyopenssl = buildPythonPackage rec {
     name = "pyopenssl-${version}";
-    version = "16.2.0";
+    version = "17.0.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
-      sha256 = "0vji4yrfshs15xpczbhzhasnjrwcarsqg87n98ixnyafnyxs6ybp";
+      sha256 = "1pdg1gpmkzj8yasg6cmkhcivxcdp4c12nif88y4qvsxq5ffzxas8";
+    };
+
+    patches = pkgs.fetchpatch {
+      url = "https://github.com/pyca/pyopenssl/commit/"
+          + "a40898b5f1d472f9449a344f703fa7f90cddc21d.patch";
+      sha256 = "0bdfrhfvdfxhfknn46s4db23i3hww6ami2r1l5rfrri0pn8b8mh7";
     };
 
     preCheck = ''
-- 
GitLab


From a3b2ccb7b4c9d88a3a130ca5016ca9bb92094a90 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Jun 2017 18:54:10 -0500
Subject: [PATCH 1061/1490] upx: 3.93 -> 3.94

* Use release tarball
* Cleanup a bit
---
 pkgs/tools/compression/upx/default.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix
index c41553b562d..8c9f7433058 100644
--- a/pkgs/tools/compression/upx/default.nix
+++ b/pkgs/tools/compression/upx/default.nix
@@ -2,31 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "upx-${version}";
-  version = "3.93";
-  src = fetchFromGitHub {
-    owner = "upx";
-    repo = "upx";
-    rev = "v${version}";
-    sha256 = "03ah23q85hx3liqyyj4vm8vip2d47bijsimagqd39q762a2rin3i";
+  version = "3.94";
+  src = fetchurl {
+    url = "https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz";
+    sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1";
   };
 
   buildInputs = [ ucl zlib perl ];
 
-  lzmaSrc = fetchFromGitHub {
-    owner = "upx";
-    repo = "upx-lzma-sdk";
-    rev = "v${version}";
-    sha256 = "16vj1c5bl04pzma0sr4saqk80y2iklyslzmrb4rm66aifa365zqj";
-  };
-
   preConfigure = "
     export UPX_UCLDIR=${ucl}
-    cp -a $lzmaSrc/* src/lzma-sdk
-    export UPX_LZMADIR=`pwd`/src/lzma-sdk
     cd src
   ";
 
-  buildPhase = "make CHECK_WHITESPACE=true";
+  makeFlags = [ "CHECK_WHITESPACE=true" ];
+
   installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx";
 
   meta = {
-- 
GitLab


From 44c64fef16ed566786c8db276085b484c9d233f3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Jun 2017 03:22:48 +0200
Subject: [PATCH 1062/1490] nixos/xserver: Improve checking keyboard layout

Enumerating the symbols directory doesn't include variants, so we're now
basically doing what "localectl list-x11-keymap-layouts" does but we use
sed instead.

The reason I'm not using localectl directly is because the path to
rules/base.lst is hardcoded in the systemd source.

Of course, the XKB specification allows for much more complicated rules,
but at least this should cover the most basic ones including variants.

So the sed expression itself is just for listing the available layouts
and variants and we use a grep with -xF to match only full lines without
interpreting regular expressions.

This should again allow to set "dvorak" as the layout option.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lheckemann
Fixes: #25526
---
 nixos/modules/services/x11/xserver.nix | 47 +++++++++++---------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 09fcdd0b72b..01e1659b30b 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -648,34 +648,25 @@ in
 
     services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
 
-    system.extraDependencies = [
-      (pkgs.runCommand "xkb-layouts-exist" {
-            layouts=cfg.layout;
-        } ''
-        missing=()
-        while read -d , layout
-        do
-          [[ -f "${cfg.xkbDir}/symbols/$layout" ]] || missing+=($layout)
-        done <<< "$layouts,"
-        if [[ ''${#missing[@]} -eq 0 ]]
-        then
-          touch $out
-          exit 0
-        fi
-
-        cat >&2 <<EOF
-
-        Some of the selected keyboard layouts do not exist:
-
-          ''${missing[@]}
-
-        Set services.xserver.layout to the name of an existing keyboard
-        layout (check ${cfg.xkbDir}/symbols for options).
-
-        EOF
-        exit -1
-      '')
-    ];
+    system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" {
+      inherit (cfg) layout xkbDir;
+    } ''
+      sed -n -e ':i /^! \(layout\|variant\) *$/ {
+        :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl
+      }' "$xkbDir/rules/base.lst" | grep -qxF "$layout" && exec touch "$out"
+
+      cat >&2 <<-EOF
+
+      The selected keyboard layout definition does not exist:
+
+        $layout
+
+      Set \`services.xserver.layout' to the name of an existing keyboard
+      layout (check $xkbDir/rules/base.lst for options).
+
+      EOF
+      exit 1
+    '');
 
     services.xserver.config =
       ''
-- 
GitLab


From 7a99036cef70dd00cc8a4a5be04ea4a25ab0dca4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Jun 2017 03:33:35 +0200
Subject: [PATCH 1063/1490] nixos/release-combined: Add keymap tests

We really want to break channel updates whenever we break something like
this, because this actually will hit machines out there and can be very
much annoying (we had broken keymaps a few times which is why I
introduced these tests in the first place).

Just to be sure I don't break channel updates with this commit, I ran
all of the keymap tests and they all succeeded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release-combined.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 4217f5940ec..eca2d281342 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -72,6 +72,12 @@ in rec {
         (all nixos.tests.ecryptfs)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)
+        (all nixos.tests.keymap.azerty)
+        (all nixos.tests.keymap.colemak)
+        (all nixos.tests.keymap.dvorak)
+        (all nixos.tests.keymap.dvp)
+        (all nixos.tests.keymap.neo)
+        (all nixos.tests.keymap.qwertz)
         (all nixos.tests.plasma5)
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)
-- 
GitLab


From 4007ee974c68a65444d939312ffe308297bdd3f6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Jun 2017 04:01:27 +0200
Subject: [PATCH 1064/1490] vlock: Don't try to install setuid binary

With newer Nix it's (fortunately) no longer possible to create a file
with setuid bits, even though the permissions are fixed later the build
will fail during installPhase already.

I've verified whether the contents of the output path are the same as
before this change and the contents match.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/misc/screensavers/vlock/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix
index 031afeeca2f..0e5e87245f3 100644
--- a/pkgs/misc/screensavers/vlock/default.nix
+++ b/pkgs/misc/screensavers/vlock/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
   };
 
   prePatch = ''
-    sed -i -e '/INSTALL/s/-[og] [^ ]*//g' Makefile modules/Makefile
+    sed -i -e '/INSTALL/ {
+      s/-[og] [^ ]*//g; s/4711/755/
+    }' Makefile modules/Makefile
   '';
 
   patches = [ ./eintr.patch ];
-- 
GitLab


From aff15c4b7b43d22ac4dafc6459de82900c2fc4c4 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin@protonmail.com>
Date: Thu, 22 Jun 2017 06:02:07 +0200
Subject: [PATCH 1065/1490] pidgin-sipe: 1.22.0 -> 1.22.1

---
 .../instant-messengers/pidgin-plugins/sipe/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 6693550bd3b..a0b7cfa45f2 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
 
-let version = "1.22.0"; in
+let version = "1.22.1"; in
 
 stdenv.mkDerivation {
   name = "pidgin-sipe-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz";
-    sha256 = "1aeb348e2ba79b82b1fd102555f86cdc42eaa6f9e761b771d74c4f9c9cf15fc3";
+    sha256 = "f6b7b7475e349c0214eb02814b808b04850113a91dd8e8d2c26e7179a3fd1ae8";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From bcaf2f6dbe5369f4835cfff31639f07b70bcb670 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Jun 2017 06:25:31 +0200
Subject: [PATCH 1066/1490] nixos/tests/sddm: Fix detecting login screen

Tesseract seems to have a hard time detecting the "ALICE FOOBAR" text,
so let's match on "Select your user and enter password" instead.

Ran the test on x86_64-linux and it now succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/sddm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 82be9bc1d72..1ce2b815784 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -24,7 +24,7 @@ let
         user = nodes.machine.config.users.extraUsers.alice;
       in ''
         startAll;
-        $machine->waitForText(qr/ALICE/);
+        $machine->waitForText(qr/select your user/i);
         $machine->screenshot("sddm");
         $machine->sendChars("${user.password}\n");
         $machine->waitForFile("/home/alice/.Xauthority");
-- 
GitLab


From f25720cacb4688288d676e550ecd29441f07f57a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 22 Jun 2017 07:46:30 +0200
Subject: [PATCH 1067/1490] python.pkgs.pylint: fix build on python2, fixes
 #26745

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

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 130aef60f97..12871bd8f6c 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -13,7 +13,7 @@
 
     buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];
 
-    propagatedBuildInputs = [ astroid isort ];
+    propagatedBuildInputs = [ astroid configparser isort ];
 
     postPatch = ''
       # Remove broken darwin tests
-- 
GitLab


From 95c98b9bf511d3ff618e4143de6943e2a1784a27 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 22 Jun 2017 09:03:23 +0200
Subject: [PATCH 1068/1490] unifont: 9.0.06 -> 10.0.01

See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00009.html
for release information
---
 pkgs/data/fonts/unifont/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 8ac65dcae35..693de6d78c6 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "unifont-${version}";
-  version = "9.0.06";
+  version = "10.0.01";
 
   ttf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.ttf";
-    sha256 = "0r96giih04din07wlmw8538izwr7dh5v6dyriq13zfn19brgn5z2";
+    sha256 = "0yfz5y4vidb7h6csv6k8h0mx808psdn4vx4842bnyz0fkyhr9h3y";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
-    sha256 = "11ivfzpyz54rbz0cvd437abs6qlv28q0qp37kn27jggxlcpfh8vd";
+    sha256 = "0shlr5804knh14qnv270yzsyfndw6na5ajbx4kvx20gfyxzcsi76";
   };
 
   buildInputs = [ mkfontscale mkfontdir ];
-- 
GitLab


From 3e430a8ee55813f5d2b128316bf599924f084908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 22 Jun 2017 08:10:08 +0100
Subject: [PATCH 1069/1490] dale: fix linking against llvm libs

---
 pkgs/development/compilers/dale/default.nix     |  2 ++
 pkgs/development/compilers/dale/link-llvm.patch | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/development/compilers/dale/link-llvm.patch

diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix
index 6d9adaa1518..3538f85a75f 100644
--- a/pkgs/development/compilers/dale/default.nix
+++ b/pkgs/development/compilers/dale/default.nix
@@ -23,6 +23,8 @@ in stdenv.mkDerivation {
   buildInputs = [ cmake pkgconfig libffi llvm_35 ]
              ++ stdenv.lib.optional doCheck perl;
 
+  patches = [ ./link-llvm.patch ];
+
   inherit doCheck;
 
   checkTarget = "tests";
diff --git a/pkgs/development/compilers/dale/link-llvm.patch b/pkgs/development/compilers/dale/link-llvm.patch
new file mode 100644
index 00000000000..3facec91874
--- /dev/null
+++ b/pkgs/development/compilers/dale/link-llvm.patch
@@ -0,0 +1,10 @@
+--- dale-39e16d8e89fa070de65a673d4462e783d530f95a-src.org/CMakeLists.txt	2017-06-22 08:01:05.839531242 +0100
++++ dale-39e16d8e89fa070de65a673d4462e783d530f95a-src/CMakeLists.txt	2017-06-22 07:59:11.777566801 +0100
+@@ -78,6 +78,7 @@
+ execute_process (COMMAND ${LLVM_CONFIG} --libs
+                  OUTPUT_VARIABLE LLVM_LIBS
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
++STRING(REGEX REPLACE " " ";" LLVM_LIBS "${LLVM_LIBS}")
+ if (${D_LLVM_VERSION_MINOR} GREATER 4)
+     execute_process (COMMAND ${LLVM_CONFIG} --system-libs
+                      OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
-- 
GitLab


From aa2b643e4bc334d1b1b0863069920acdce00c9f2 Mon Sep 17 00:00:00 2001
From: David Izquierdo <david@izquierdofernandez.com>
Date: Sat, 17 Jun 2017 23:24:30 +0200
Subject: [PATCH 1070/1490] tdesktop: 1.0.27 -> 1.1.7

---
 .../telegram/tdesktop/default.nix             | 25 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 0af0c0b1d1b..446156fbe4c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,33 +1,35 @@
 { mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
 , qtbase, qtimageformats
 , breakpad, gtk3, libappindicator-gtk3, dee
-, ffmpeg, openalSoft, minizip
+, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio
+, gcc
 }:
 
 mkDerivation rec {
   name = "telegram-desktop-${version}";
-  version = "1.0.27";
+  version = "1.1.7";
 
   # Submodules
   src = fetchgit {
     url = "https://github.com/telegramdesktop/tdesktop";
     rev = "refs/tags/v${version}";
-    sha256 = "05g88g6h2a7f9biliicg81fqssx0y3akd3y5r2q2b5h8q3igqrfc";
+    sha256 = "0y0nc8d4vlhsmzayy26zdxc5jaiwcv0rb2s1v5fwnnx71gf89m2w";
   };
 
   tgaur = fetchgit {
     url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
-    rev = "b4d169076ed12ec01941a95499774d5caa6fc00e";
-    sha256 = "0pmm6slabg9xazgs0ffnp8v0hx3vnpdfgymvapwqpm3h9mwk22x9";
+    rev = "83af81905de7fc5dc9fbea8f5318d56fa8a6efc6";
+    sha256 = "0v7g7y5cmxzp2yrcj6ylwzxlzr9yrqs2badzplm7sg012nc69yf9";
   };
 
   buildInputs = [
     gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip
+    libopus alsaLib libpulseaudio
   ];
 
-  nativeBuildInputs = [ pkgconfig gyp cmake ];
+  nativeBuildInputs = [ pkgconfig gyp cmake gcc ];
 
-  patches = [ "${tgaur}/aur-build-fixes.patch" ];
+  patches = [ "${tgaur}/tdesktop.patch" ];
 
   enableParallelBuilding = true;
 
@@ -48,10 +50,18 @@ mkDerivation rec {
     "-I${qtbase.dev}/include/${x}"
     "-I${qtbase.dev}/include/${x}/${qtbase.version}"
     "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}"
+    "-I${libopus.dev}/include/opus"
+    "-I${alsaLib.dev}/include/alsa"
+    "-I${libpulseaudio.dev}/include/pulse"
   ]) [ "QtCore" "QtGui" ];
   CPPFLAGS = NIX_CFLAGS_COMPILE;
 
   preConfigure = ''
+
+    pushd "Telegram/ThirdParty/libtgvoip"
+    patch -Np1 -i "${tgaur}/libtgvoip.patch"
+    popd
+
     sed -i Telegram/gyp/telegram_linux.gypi \
       -e 's,/usr,/does-not-exist,g' \
       -e 's,appindicator-0.1,appindicator3-0.1,g' \
@@ -63,6 +73,7 @@ mkDerivation rec {
       -e "s,/usr/bin/rcc,rcc,g"
 
     gyp \
+      -Dbuild_defines=${GYP_DEFINES} \
       -Gconfig=Release \
       --depth=Telegram/gyp \
       --generator-output=../.. \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e4ebd8889e..9153da77f96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16024,6 +16024,7 @@ with pkgs;
 
   tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop {
     inherit (pythonPackages) gyp;
+    gcc = gcc6;
   };
 
   telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { };
-- 
GitLab


From 744bdac78ec49b517c3285b24d3cccf5e2be6ed0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 22 Jun 2017 09:30:29 +0200
Subject: [PATCH 1071/1490] Re-add iolib subsystems

---
 pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 7065555cedd..fc536adadc3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -42,6 +42,9 @@ in
        alexandria split-sequence cffi bordeaux-threads idna swap-bytes
      ])
      ;
+    testSystems = ["iolib" "iolib/syscalls" "iolib/multiplex" "iolib/streams"
+      "iolib/zstreams" "iolib/sockets" "iolib/trivial-sockets"
+      "iolib/pathnames" "iolib/os"];
   };
   cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
   clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
-- 
GitLab


From f12006bd962188762c37f34dc8416c03ba026835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 22 Jun 2017 09:58:58 +0100
Subject: [PATCH 1072/1490] hound: 20160919 -> 20170324

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

diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix
index e9da64b112b..f438e72b64e 100644
--- a/pkgs/development/tools/misc/hound/default.nix
+++ b/pkgs/development/tools/misc/hound/default.nix
@@ -2,8 +2,8 @@
 
 buildGoPackage rec {
   name = "hound-unstable-${version}";
-  version = "20160919-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "f95e9a9224b8878b9cd8fac0afb6d31f83a65ca7";
+  version = "20170324";
+  rev = "effbe5873f329fcdf982e906b756b535e2804ebc";
 
   goPackagePath = "github.com/etsy/hound";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "etsy";
     repo = "hound";
-    sha256 = "0d4mhka7f8x8xfjrjhl5l0v06ng8kc868jrajpv5bjkxsj71nwbg";
+    sha256 = "0zc769lygad5an63z5mivaggbmm07d9ynngi2jx3f7651wpji4aw";
   };
 
   goDeps = ./deps.nix;
-- 
GitLab


From 505508a813d7680d8ada10eb8875a62de79e5aac Mon Sep 17 00:00:00 2001
From: Eric Bailey <yurrriq@users.noreply.github.com>
Date: Thu, 22 Jun 2017 04:32:46 -0500
Subject: [PATCH 1073/1490] Update BEAM docs

Improve beam docs:
 * correct spelling
 * update per pandoc changes
 * capitalize titles
 * capitalize BEAM throughout and use "the BEAM" when referring to the virtual machine.
 * tweak grammar and phrasing
 * reformat build-tools-rebar3 section
 * add more links
 * re-wrap <para>s

Also update <programlisting>s
* normalize whitespace
* don't double quote homepage
* use $ in all shell snippets
---
 doc/default.nix                   |   2 +-
 doc/languages-frameworks/beam.xml | 344 ++++++++++++++++--------------
 2 files changed, 182 insertions(+), 164 deletions(-)

diff --git a/doc/default.nix b/doc/default.nix
index 540a209c2ac..cfd51fba257 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -26,7 +26,7 @@ pkgs.stdenv.mkDerivation {
       extraHeader = ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
     in ''
       {
-        pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--chapters"} \
+        pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--top-level-division=chapter"} \
           --smart \
           | sed -e 's|<ulink url=|<link xlink:href=|' \
               -e 's|</ulink>|</link>|' \
diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index 28dec9f77de..1a18ed27237 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -2,30 +2,29 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-beam">
 
-  <title>Beam Languages (Erlang, Elixir &amp; LFE)</title>
+  <title>BEAM Languages (Erlang, Elixir &amp; LFE)</title>
   <section xml:id="beam-introduction">
     <title>Introduction</title>
     <para>
-      In this document and related Nix expressions we use the term
-      <emphasis>Beam</emphasis> to describe the environment. BEAM is
-      the name of the Erlang Virtial Machine and, as far as we know,
-      from a packaging perspective all languages that run on BEAM are
-      interchangable. The things that do change, like the build
-      system, are transperant to the users of the package. So we make
-      no distinction.
+      In this document and related Nix expressions, we use the term,
+      <emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name
+      of the Erlang Virtual Machine and, as far as we're concerned, from a
+      packaging perspective, all languages that run on the BEAM are
+      interchangeable. That which varies, like the build system, is transparent
+      to users of any given BEAM package, so we make no distinction.
     </para>
   </section>
   <section xml:id="beam-structure">
     <title>Structure</title>
     <para>
-      All Beam-related things are available via top-level
+      All BEAM-related expressions are available via the top-level
       <literal>beam</literal> attribute, which includes:
     </para>
     <itemizedlist>
       <listitem>
         <para>
-          <literal>interpreters</literal>: contains a set of compilers running
-          on Beam, including multiple Erlang/OTP versions
+          <literal>interpreters</literal>: a set of compilers running on the
+          BEAM, including multiple Erlang/OTP versions
           (<literal>beam.interpreters.erlangR19</literal>, etc), Elixir
           (<literal>beam.interpreters.elixir</literal>) and LFE
           (<literal>beam.interpreters.lfe</literal>).
@@ -33,36 +32,37 @@
       </listitem>
       <listitem>
         <para>
-          <literal>packages</literal>: contains a set of package sets, each
-          compiled with a specific Erlang/OTP version, e.g.
+          <literal>packages</literal>: a set of package sets, each compiled with
+          a specific Erlang/OTP version, e.g.
           <literal>beam.packages.erlangR19</literal>.
         </para>
       </listitem>
     </itemizedlist>
     <para>
-      Default Erlang compiler is defined by
-      <literal>beam.interpreters.erlang</literal> and aliased as
-      <literal>erlang</literal>. Default package set with Beam packages is
-      defined by <literal>beam.packages.erlang</literal> and aliased at
-      top-level as <literal>beamPackages</literal>.
+      The default Erlang compiler, defined by
+      <literal>beam.interpreters.erlang</literal>, is aliased as
+      <literal>erlang</literal>. The default BEAM package set is defined by
+      <literal>beam.packages.erlang</literal> and aliased at the top level as
+      <literal>beamPackages</literal>.
     </para>
     <para>
-      If you want to create a package set built with a custom Erlang version,
-      use lambda <literal>beam.packagesWith</literal>, which accepts an
-      Erlang/OTP derivative and produces a package set similar to
+      To create a package set built with a custom Erlang version, use the
+      lambda, <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP
+      derivation and produces a package set similar to
       <literal>beam.packages.erlang</literal>.
     </para>
     <para>
       Many Erlang/OTP distributions available in
-      <literal>beam.interpreters</literal> have their versions with ODBC and/or
-      Java enabled. For example there's
-      <literal>beam.interpreters.erlangR19_odbc_javac</literal> which
+      <literal>beam.interpreters</literal> have versions with ODBC and/or Java
+      enabled. For example, there's
+      <literal>beam.interpreters.erlangR19_odbc_javac</literal>, which
       corresponds to <literal>beam.interpreters.erlangR19</literal>.
     </para>
-    <para>
-      We also provide <literal>beam.packages.erlang.callPackage</literal>, which
-      simplifies writing Beam package definitions, by injecting all packages from
-      <literal>beam.packages.erlang</literal> into top-level context.
+    <para xml:id="erlang-call-package">
+      We also provide the lambda,
+      <literal>beam.packages.erlang.callPackage</literal>, which simplifies
+      writing BEAM package definitions by injecting all packages from
+      <literal>beam.packages.erlang</literal> into the top-level context.
     </para>
   </section>
   <section xml:id="build-tools">
@@ -70,42 +70,52 @@
   <section xml:id="build-tools-rebar3">
     <title>Rebar3</title>
     <para>
-      By default Rebar3 wants to manage it's own dependencies. This is perfectly
-      acceptable in the normal non-Nix setup. In the Nix world it is not. To
-      support this we have created two versions of rebar3,
-      <literal>rebar3</literal> and <literal>rebar3-open</literal>. The
-      <literal>rebar3</literal> version has been patched to remove the ability
-      to download anything from it. If you are not running it a nix-shell or a
-      nix-build then its probably not going to work for you.
-      <literal>rebar3-open</literal> is the normal, un-modified rebar3. It
-      should work exactly as would any other version of rebar3. Any Erlang
-      package should rely on <literal>rebar3</literal> and thats really what you
-      should be using too. See <literal>buildRebar3</literal> below.
+      By default, Rebar3 wants to manage its own dependencies. This is perfectly
+      acceptable in the normal, non-Nix setup, but in the Nix world, it is not.
+      To rectify this, we provide two versions of Rebar3:
+      <itemizedlist>
+        <listitem>
+          <para>
+            <literal>rebar3</literal>: patched to remove the ability to download
+            anything. When not running it via <literal>nix-shell</literal> or
+            <literal>nix-build</literal>, it's probably not going to work as
+            desired.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It
+            should work exactly as would any other version of Rebar3. Any Erlang
+            package should rely on <literal>rebar3</literal> instead. See <xref
+            linkend="rebar3-packages"/>.
+          </para>
+        </listitem>
+      </itemizedlist>
     </para>
   </section>
   <section xml:id="build-tools-other">
     <title>Mix &amp; Erlang.mk</title>
     <para>
-      Both Mix and Erlang.mk work exactly as you would expect. There
-      is a bootstrap process that needs to be run for both of
-      them. However, that is supported by the
-      <literal>buildMix</literal> and <literal>buildErlangMk</literal> derivations.
+      Both Mix and Erlang.mk work exactly as expected. There is a bootstrap
+      process that needs to be run for both, however, which is supported by the
+      <literal>buildMix</literal> and <literal>buildErlangMk</literal>
+      derivations, respectively.
     </para>
   </section>
 </section>
 
 <section xml:id="how-to-install-beam-packages">
-  <title>How to install Beam packages</title>
+  <title>How to Install BEAM Packages</title>
   <para>
-    Beam packages are not registered in the top level simply because they are
+    BEAM packages are not registered at the top level, simply because they are
     not relevant to the vast majority of Nix users. They are installable using
-    the <literal>beam.packages.erlang</literal> attribute set and aliased as
-    <literal>beamPackages</literal>. This attribute points at packages built by
-    the default Erlang/OTP version in Nixpkgs as defined by
+    the <literal>beam.packages.erlang</literal> attribute set (aliased as
+    <literal>beamPackages</literal>), which points to packages built by the
+    default Erlang/OTP version in Nixpkgs, as defined by
     <literal>beam.interpreters.erlang</literal>.
 
-    You can list the avialable packages in the
-    <literal>beamPackages</literal> with the following command:
+    To list the available packages in
+    <literal>beamPackages</literal>, use the following command:
   </para>
 
   <programlisting>
@@ -119,145 +129,152 @@ beamPackages.meck       meck-0.8.3
 beamPackages.rebar3-pc  pc-1.1.0
   </programlisting>
   <para>
-    To install any of those packages into your profile, refer to them by
-    their attribute path (first column):
+    To install any of those packages into your profile, refer to them by their
+    attribute path (first column):
   </para>
   <programlisting>
 $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
   </programlisting>
   <para>
-    The attribute path of any Beam packages corresponds to the name
-    of that particular package in Hex or its OTP Application/Release name.
+    The attribute path of any BEAM package corresponds to the name of that
+    particular package in <link xlink:href="https://hex.pm">Hex</link> or its
+    OTP Application/Release name.
   </para>
 </section>
 <section xml:id="packaging-beam-applications">
-  <title>Packaging Beam Applications</title>
+  <title>Packaging BEAM Applications</title>
   <section  xml:id="packaging-erlang-applications">
     <title>Erlang Applications</title>
     <section xml:id="rebar3-packages">
       <title>Rebar3 Packages</title>
       <para>
-        There is a Nix function called <literal>buildRebar3</literal> (defined
-        in <literal>beam.packages.erlang.buildRebar3</literal> and aliased at
-        top-level). We use this function to make a derivation that understands
-        how to build the rebar3 project. For example, the expression we use to
-        build the <link
-        xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
-        project follows.
+        The Nix function, <literal>buildRebar3</literal>, defined in
+        <literal>beam.packages.erlang.buildRebar3</literal> and aliased at the
+        top level, can be used to build a derivation that understands how to
+        build a Rebar3 project. For example, we can build <link
+        xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> as
+        follows:
       </para>
       <programlisting>
-        {stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
+        { stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
 
-          buildRebar3 rec {
-            name = "hex2nix";
-            version = "0.0.1";
+        buildRebar3 rec {
+          name = "hex2nix";
+          version = "0.0.1";
 
-            src = fetchFromGitHub {
-              owner = "ericbmerritt";
-              repo = "hex2nix";
-              rev = "${version}";
-              sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg";
-            };
+          src = fetchFromGitHub {
+            owner = "ericbmerritt";
+            repo = "hex2nix";
+            rev = "${version}";
+            sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg";
+          };
 
           beamDeps = [ ibrowse jsx erlware_commons ];
         }
       </programlisting>
       <para>
-        This derivation is callable with
-        <literal>beam.packages.erlang.callPackage</literal> (see above). If you
-        want to call this package using normal <literal>callPackage</literal>,
-        you should refer to dependency packages via
+        Such derivations are callable with
+        <literal>beam.packages.erlang.callPackage</literal> (see <xref
+        linkend="erlang-call-package"/>). To call this package using the normal
+        <literal>callPackage</literal>, refer to dependency packages via
         <literal>beamPackages</literal>, e.g.
         <literal>beamPackages.ibrowse</literal>.
       </para>
       <para>
-        The only visible difference between this derivation and
-        something like <literal>stdenv.mkDerivation</literal> is that we
-        have added <literal>beamDeps</literal> to the derivation. If
-        you add your Beam dependencies here they will be correctly
-        handled by the system.
+        Notably, <literal>buildRebar3</literal> includes
+        <literal>beamDeps</literal>, while
+        <literal>stdenv.mkDerivation</literal> does not. BEAM dependencies added
+        there will be correctly handled by the system.
       </para>
       <para>
-        If your package needs to compile native code via Rebar's port
-        compilation mechenism. You should add <literal>compilePort =
-        true;</literal> to the derivation.
+        If a package needs to compile native code via Rebar3's port compilation
+        mechanism, add <literal>compilePort = true;</literal> to the derivation.
       </para>
     </section>
     <section xml:id="erlang-mk-packages">
       <title>Erlang.mk Packages</title>
       <para>
-        Erlang.mk functions almost identically to Rebar. The only real
-        difference is that <literal>buildErlangMk</literal> is called
-        instead of <literal>buildRebar3</literal>
+        Erlang.mk functions similarly to Rebar3, except we use
+        <literal>buildErlangMk</literal> instead of
+        <literal>buildRebar3</literal>.
       </para>
       <programlisting>
-        { buildErlangMk, fetchHex,  cowlib, ranch }:
-          buildErlangMk {
-            name = "cowboy";
+        { buildErlangMk, fetchHex, cowlib, ranch }:
+
+        buildErlangMk {
+          name = "cowboy";
+          version = "1.0.4";
+
+          src = fetchHex {
+            pkg = "cowboy";
             version = "1.0.4";
-            src = fetchHex {
-              pkg = "cowboy";
-              version = "1.0.4";
-              sha256 =
-                "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac";
-            };
-            beamDeps  = [ cowlib ranch ];
-
-            meta = {
-              description = ''Small, fast, modular HTTP server written in
-                            Erlang.'';
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/ninenines/cowboy";
-            };
+            sha256 = "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac";
+          };
+
+          beamDeps = [ cowlib ranch ];
+
+          meta = {
+            description = ''
+              Small, fast, modular HTTP server written in Erlang
+            '';
+            license = stdenv.lib.licenses.isc;
+            homepage = https://github.com/ninenines/cowboy;
+          };
         }
       </programlisting>
     </section>
     <section xml:id="mix-packages">
       <title>Mix Packages</title>
       <para>
-        Mix functions almost identically to Rebar. The only real
-        difference is that <literal>buildMix</literal> is called
-        instead of <literal>buildRebar3</literal>
+        Mix functions similarly to Rebar3, except we use
+        <literal>buildMix</literal> instead of <literal>buildRebar3</literal>.
       </para>
       <programlisting>
         { buildMix, fetchHex, plug, absinthe }:
+
         buildMix {
           name = "absinthe_plug";
           version = "1.0.0";
+
           src = fetchHex {
             pkg = "absinthe_plug";
             version = "1.0.0";
-            sha256 =
-              "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
+            sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
           };
-          beamDeps  = [ plug absinthe ];
+
+          beamDeps = [ plug absinthe ];
 
           meta = {
-            description = ''A plug for Absinthe, an experimental GraphQL
-                            toolkit'';
+            description = ''
+              A plug for Absinthe, an experimental GraphQL toolkit
+            '';
             license = stdenv.lib.licenses.bsd3;
-            homepage = "https://github.com/CargoSense/absinthe_plug";
-         };
-       }
+            homepage = https://github.com/CargoSense/absinthe_plug;
+          };
+        }
       </programlisting>
       <para>
-        Alternatively one can use <literal>buildHex</literal> as a shortcut for the above:
+        Alternatively, we can use <literal>buildHex</literal> as a shortcut:
       </para>
       <programlisting>
         { buildHex, buildMix, plug, absinthe }:
+
         buildHex {
           name = "absinthe_plug";
           version = "1.0.0";
-          sha256 =
-              "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
+
+          sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
+
           builder = buildMix;
-          beamDeps  = [ plug absinthe];
+
+          beamDeps = [ plug absinthe ];
 
           meta = {
-            description = ''A plug for Absinthe, an experimental GraphQL
-                            toolkit'';
+            description = ''
+              A plug for Absinthe, an experimental GraphQL toolkit
+            '';
             license = stdenv.lib.licenses.bsd3;
-            homepage = "https://github.com/CargoSense/absinthe_plug";
+            homepage = https://github.com/CargoSense/absinthe_plug;
          };
        }
       </programlisting>
@@ -265,18 +282,18 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
   </section>
 </section>
 <section xml:id="how-to-develop">
-  <title>How to develop</title>
+  <title>How to Develop</title>
   <section xml:id="accessing-an-environment">
     <title>Accessing an Environment</title>
     <para>
-      Often, all you want to do is be able to access a valid
-      environment that contains a specific package and its
-      dependencies. we can do that with the <literal>env</literal>
-      part of a derivation. For example, lets say we want to access an
-      erlang repl with ibrowse loaded up. We could do the following.
+      Often, we simply want to access a valid environment that contains a
+      specific package and its dependencies. We can accomplish that with the
+      <literal>env</literal> attribute of a derivation. For example, let's say
+      we want to access an Erlang REPL with <literal>ibrowse</literal> loaded
+      up. We could do the following:
     </para>
     <programlisting>
-      ~/w/nixpkgs ❯❯❯ nix-shell -A beamPackages.ibrowse.env --run "erl"
+      $ nix-shell -A beamPackages.ibrowse.env --run "erl"
       Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
 
       Eshell V7.0  (abort with ^G)
@@ -317,20 +334,19 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
       2>
     </programlisting>
     <para>
-      Notice the <literal>-A beamPackages.ibrowse.env</literal>.That
-      is the key to this functionality.
+      Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key
+      to this functionality.
     </para>
   </section>
   <section xml:id="creating-a-shell">
     <title>Creating a Shell</title>
     <para>
       Getting access to an environment often isn't enough to do real
-      development. Many times we need to create a
-      <literal>shell.nix</literal> file and do our development inside
-      of the environment specified by that file. This file looks a lot
-      like the packaging described above. The main difference is that
-      <literal>src</literal> points to project root and we call the
-      package directly.
+      development. Usually, we need to create a <literal>shell.nix</literal>
+      file and do our development inside of the environment specified therein.
+      This file looks a lot like the packaging described above, except that
+      <literal>src</literal> points to the project root and we call the package
+      directly.
     </para>
     <programlisting>
 { pkgs ? import &quot;&lt;nixpkgs&quot;&gt; {} }:
@@ -349,13 +365,14 @@ let
   drv = beamPackages.callPackage f {};
 
 in
- drv
+
+  drv
     </programlisting>
     <section xml:id="building-in-a-shell">
-    <title>Building in a shell (for mix projects)</title>
+    <title>Building in a Shell (for Mix Projects)</title>
     <para>
-      We can leverage the support of the Derivation, regardless of
-      which build Derivation is called by calling the commands themselves.
+      We can leverage the support of the derivation, irrespective of the build
+      derivation, by calling the commands themselves.
     </para>
     <programlisting>
 # =============================================================================
@@ -415,42 +432,43 @@ analyze: build plt
 
     </programlisting>
     <para>
-      If you add the <literal>shell.nix</literal> as described and
-      user rebar as follows things should simply work. Aside from the
+      Using a <literal>shell.nix</literal> as described (see <xref
+      linkend="creating-a-shell"/>) should just work. Aside from
       <literal>test</literal>, <literal>plt</literal>, and
-      <literal>analyze</literal> the talks work just fine for all of
-      the build Derivations.
+      <literal>analyze</literal>, the Make targets work just fine for all of the
+      build derivations.
     </para>
   </section>
 </section>
 </section>
 <section xml:id="generating-packages-from-hex-with-hex2nix">
-  <title>Generating Packages from Hex with Hex2Nix</title>
+  <title>Generating Packages from Hex with <literal>hex2nix</literal></title>
   <para>
-    Updating the Hex packages requires the use of the
-    <literal>hex2nix</literal> tool. Given the path to the Erlang
-    modules (usually
-    <literal>pkgs/development/erlang-modules</literal>). It will
-    dump a file called
-    <literal>hex-packages.nix</literal>. That file will contain all
-    the packages that use a recognized build system in Hex. However,
-    it can't know whether or not all those packages are buildable.
+    Updating the <link xlink:href="https://hex.pm">Hex</link> package set
+    requires <link
+    xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>. Given the
+    path to the Erlang modules (usually
+    <literal>pkgs/development/erlang-modules</literal>), it will dump a file
+    called <literal>hex-packages.nix</literal>, containing all the packages that
+    use a recognized build system in <link
+    xlink:href="https://hex.pm">Hex</link>. It can't be determined, however,
+    whether every package is buildable.
     </para>
     <para>
-      To make life easier for our users, it makes good sense to go
-      ahead and attempt to build all those packages and remove the
-      ones that don't build. To do that, simply run the command (in
-      the root of your <literal>nixpkgs</literal> repository). that follows.
+      To make life easier for our users, try to build every <link
+      xlink:href="https://hex.pm">Hex</link> package and remove those that fail.
+      To do that, simply run the following command in the root of your
+      <literal>nixpkgs</literal> repository:
     </para>
     <programlisting>
 $ nix-build -A beamPackages
     </programlisting>
     <para>
-      That will build every package in
-      <literal>beamPackages</literal>. Then you can go through and
-      manually remove the ones that fail. Hopefully, someone will
-      improve <literal>hex2nix</literal> in the future to automate
-      that.
+      That will attempt to build every package in
+      <literal>beamPackages</literal>. Then manually remove those that fail.
+      Hopefully, someone will improve <link
+      xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> in the
+      future to automate the process.
     </para>
 </section>
 </section>
-- 
GitLab


From 3d52203ab2a2aa31df8ae52efda3b14e75628a57 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Thu, 22 Jun 2017 11:50:09 +0200
Subject: [PATCH 1074/1490] sshd.nix: Added nixops usage warning of
 openssh.authorizedKeys.keys usage

---
 nixos/modules/services/networking/ssh/sshd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index bebf4e145ca..0f58536b4b7 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -21,6 +21,8 @@ let
           daemon reads in addition to the the user's authorized_keys file.
           You can combine the <literal>keys</literal> and
           <literal>keyFiles</literal> options.
+          Warning: If you are using <literal>NixOps</literal> then don't use this 
+          option since it will replace the key required for deployment via ssh.
         '';
       };
 
-- 
GitLab


From bb9e23837a3c4334133efa9976cd822b2bf333e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 22 Jun 2017 13:24:11 +0200
Subject: [PATCH 1075/1490] haskellPackages: make
 configuration-{nix,common}.nix configurable

The motivation is to be able to get rid of common configuration
when initial packages differs since common configuration assumes
a very specific version set.

cc @jmitchell @peti
---
 pkgs/development/haskell-modules/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 6b5812cd07f..32fa46f111d 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -3,6 +3,8 @@
 , packageSetConfig ? (self: super: {})
 , overrides ? (self: super: {})
 , initialPackages ? import ./hackage-packages.nix
+, configurationCommon ? import ./configuration-common.nix
+, configurationNix ? import ./configuration-nix.nix
 }:
 
 let
@@ -15,8 +17,8 @@ let
     inherit ghc extensible-self;
   };
 
-  commonConfiguration = import ./configuration-common.nix { inherit pkgs; };
-  nixConfiguration = import ./configuration-nix.nix { inherit pkgs; };
+  commonConfiguration = configurationCommon { inherit pkgs; };
+  nixConfiguration = configurationNix { inherit pkgs; };
 
   extensible-self = makeExtensible
     (extends overrides
-- 
GitLab


From d8027bd9c4a766dcee7aceba7e0d341d407dad77 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 21 Jun 2017 20:55:56 +0200
Subject: [PATCH 1076/1490] pythonPackages.pygraphviz: fix build

---
 .../python-modules/pygraphviz/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-------------
 2 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/pygraphviz/default.nix

diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
new file mode 100644
index 00000000000..911779e67fd
--- /dev/null
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, graphviz
+, pkgconfig, doctest-ignore-unicode, mock, nose }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pygraphviz";
+  version = "1.4rc1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a";
+  };
+
+  buildInputs = [ doctest-ignore-unicode mock nose ];
+  propagatedBuildInputs = [ graphviz pkgconfig ];
+
+  # the tests are currently failing:
+  # check status of pygraphviz/pygraphviz#129
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python interface to Graphviz graph drawing package";
+    homepage = https://github.com/pygraphviz/pygraphviz;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e957218263..73129720305 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14558,25 +14558,7 @@ in {
     };
   };
 
-  pygraphviz = buildPythonPackage rec {
-    name = "pygraphviz-${version}";
-    version = "1.4rc1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pygraphviz/${name}.tar.gz";
-      sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a";
-    };
-
-    buildInputs = with self; [ doctest-ignore-unicode mock nose ];
-    propagatedBuildInputs = [ pkgs.graphviz pkgs.pkgconfig ];
-
-    meta = {
-      description = "Python interface to Graphviz graph drawing package";
-      homepage = https://github.com/pygraphviz/pygraphviz;
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ matthiasbeyer ];
-    };
-  };
+  pygraphviz = callPackage ../development/python-modules/pygraphviz { };
 
   pympler = buildPythonPackage rec {
     pname = "Pympler";
-- 
GitLab


From 5041df441112a4533c62091799d864e61dbda3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 22 Jun 2017 13:09:56 +0100
Subject: [PATCH 1077/1490] doc/languages-frameworks/vim: add custom vimrc &
 packages

---
 doc/languages-frameworks/vim.md | 41 +++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.md
index 5442d706cb0..1d6a4fe8da8 100644
--- a/doc/languages-frameworks/vim.md
+++ b/doc/languages-frameworks/vim.md
@@ -8,15 +8,48 @@ date: 2016-06-25
 You'll get a vim(-your-suffix) in PATH also loading the plugins you want.
 Loading can be deferred; see examples.
 
-VAM (=vim-addon-manager) and Pathogen plugin managers are supported.
-Vundle, NeoBundle could be your turn.
+Vim packages, VAM (=vim-addon-manager) and Pathogen are supported to load
+packages.
 
-## dependencies by Vim plugins
+## Custom configuration
+
+Adding custom .vimrc lines can be done using the following code:
+
+```
+vim_configurable.customize {
+  name = "vim-with-plugins";
+
+  vimrcConfig.customRC = ''
+    set hidden
+  '';
+}
+```
+
+## Vim packages
+
+To store you plugins in Vim packages the following example can be used:
+
+```
+vim_configurable.customize {
+  vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
+    # loaded on launch
+    start = [ youcompleteme fugitive ];
+    # manually loadable by calling `:packadd $plugin-name`
+    opt = [ phpCompletion elm-vim ];
+    # To automatically load a plugin when opening a filetype, add vimrc lines like:
+    # autocmd FileType php :packadd phpCompletion
+  }
+};
+```
+
+## VAM
+
+### dependencies by Vim plugins
 
 VAM introduced .json files supporting dependencies without versioning
 assuming that "using latest version" is ok most of the time.
 
-## HOWTO
+### Example
 
 First create a vim-scripts file having one plugin name per line. Example:
 
-- 
GitLab


From 9c57f3b5c05621f0d1c207aa80f20ccc1d79ebfb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Jun 2017 14:27:11 +0200
Subject: [PATCH 1078/1490] python-modules/trezor: Fix build

Regression introduced by 76beb0831384b5ae53592513507524990017e973.

With version 0.7.15 a few additional dependencies are needed by trezor,
mainly a newer version of protobuf bindings and requests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @np
---
 pkgs/development/python-modules/trezor/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 29e6a7d1743..6a3f9c63890 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -1,4 +1,6 @@
-{ lib, fetchPypi, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
+{ lib, fetchPypi, buildPythonPackage, protobuf3_2, hidapi, ecdsa, mnemonic
+, requests
+}:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -10,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "f7e4f509263ca172532b4c0a440d164add7cdc021b4370a253d51eba5806b618";
   };
 
-  propagatedBuildInputs = [ protobuf3_0 hidapi ];
+  propagatedBuildInputs = [ protobuf3_2 hidapi requests ];
 
   buildInputs = [ ecdsa mnemonic ];
 
-- 
GitLab


From 1e9a9ba149fe941d9f489cb1e794aa3fc3b519b2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 22 Jun 2017 07:47:53 -0500
Subject: [PATCH 1079/1490] creduce: 2.6.0 -> 2.7.0, now uses LLVM 4

---
 pkgs/development/tools/misc/creduce/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index d768f68576c..c8378e06df6 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -10,11 +10,11 @@ assert stdenv.isLinux -> (utillinux != null);
 
 stdenv.mkDerivation rec {
   name = "creduce-${version}";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz";
-    sha256 = "0pf5q0n8vkdcr1wrkxn2jzxv0xkrir13bwmqfw3jpbm3dh2c3b6d";
+    sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2973e2d9b0f..e7a8d45249e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6619,7 +6619,7 @@ with pkgs;
   creduce = callPackage ../development/tools/misc/creduce {
     inherit (perlPackages) perl
       ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey;
-    inherit (llvmPackages_39) llvm clang-unwrapped;
+    inherit (llvmPackages_4) llvm clang-unwrapped;
     utillinux = if stdenv.isLinux then utillinuxMinimal else null;
   };
 
-- 
GitLab


From 05f94c8c13dbe4084faea98c62b99d40c7f97acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 22 Jun 2017 16:48:17 +0200
Subject: [PATCH 1080/1490] hydra: 2017-06-21 -> 2017-06-22

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

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 42b0094c2cc..fe1bb771fca 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -62,15 +62,15 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2017-06-21";
+  version = "2017-06-22";
 
   inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "6e4a7a30f731c42e64e24ccbf8f25110c02776ab";
-    sha256 = "0j7s4slmwrmwywvfkxdpg4wgxnfqjzv9dzwvni2n21sbbwjyqgij";
+    rev = "803833aba77e1082c14857aa26933fc7fe5ae190";
+    sha256 = "1cnxpsan8l6fnbr73n0qxxq1szlda1n3qfkk9k9ic8ijk7md4pvs";
   };
 
   buildInputs =
-- 
GitLab


From 722d61c2f251595c5021aeef13564082c5bd2923 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Thu, 22 Jun 2017 22:41:55 +0800
Subject: [PATCH 1081/1490] slock: Avoid chmod u+s (#26600)

---
 pkgs/misc/screensavers/slock/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 2a2be06fde6..55765a520da 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   installFlags = "DESTDIR=\${out} PREFIX=";
 
+  patchPhase = "sed -i '/chmod u+s/d' Makefile";
+
   preBuild = optionalString (conf != null) ''
     cp ${writeText "config.def.h" conf} config.def.h
   '';
-- 
GitLab


From 1a879759103df812fae9d47b8e7773b6185522d9 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 22 Jun 2017 15:44:52 +0000
Subject: [PATCH 1082/1490] update script for jetbrains products

---
 .../editors/jetbrains/default.nix             | 53 +++++++----
 pkgs/applications/editors/jetbrains/update.pl | 92 +++++++++++++++++++
 2 files changed, 128 insertions(+), 17 deletions(-)
 create mode 100755 pkgs/applications/editors/jetbrains/update.pl

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index eaef3156099..d1807a684ee 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -12,7 +12,7 @@ let
 
   # Sorted alphabetically
 
-  buildClion = { name, version, src, license, description, wmClass }:
+  buildClion = { name, version, src, license, description, wmClass, update-channel }:
     lib.overrideDerivation (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "CLion";
@@ -54,7 +54,7 @@ let
       '';
     });
 
-  buildDataGrip = { name, version, src, license, description, wmClass }:
+  buildDataGrip = { name, version, src, license, description, wmClass, update-channel }:
     (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "DataGrip";
@@ -71,7 +71,7 @@ let
       };
     });
 
-  buildGogland = { name, version, src, license, description, wmClass }:
+  buildGogland = { name, version, src, license, description, wmClass, update-channel }:
     (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "Gogland";
@@ -89,7 +89,7 @@ let
       };
     });
 
-  buildIdea = { name, version, src, license, description, wmClass }:
+  buildIdea = { name, version, src, license, description, wmClass, update-channel }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "IDEA";
@@ -106,7 +106,7 @@ let
       };
     });
 
-  buildPhpStorm = { name, version, src, license, description, wmClass }:
+  buildPhpStorm = { name, version, src, license, description, wmClass, update-channel }:
     (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "PhpStorm";
@@ -123,7 +123,7 @@ let
       };
     });
 
-  buildPycharm = { name, version, src, license, description, wmClass }:
+  buildPycharm = { name, version, src, license, description, wmClass, update-channel }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "PyCharm";
@@ -150,7 +150,7 @@ let
       propagatedUserEnvPkgs = [ python ];
     };
 
-  buildRider = { name, version, src, license, description, wmClass }:
+  buildRider = { name, version, src, license, description, wmClass, update-channel }:
     lib.overrideDerivation (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "Rider";
@@ -176,7 +176,7 @@ let
       '';
     });
 
-  buildRubyMine = { name, version, src, license, description, wmClass }:
+  buildRubyMine = { name, version, src, license, description, wmClass, update-channel }:
     (mkJetBrainsProduct rec {
       inherit name version src wmClass jdk;
       product = "RubyMine";
@@ -189,7 +189,7 @@ let
       };
     });
 
-  buildWebStorm = { name, version, src, license, description, wmClass }:
+  buildWebStorm = { name, version, src, license, description, wmClass, update-channel }:
     (mkJetBrainsProduct {
       inherit name version src wmClass jdk;
       product = "WebStorm";
@@ -221,18 +221,20 @@ in
       sha256 = "045pkbbf4ypk9qkhldz08i7hbc6vaq68a8v9axnpndnvcrf0vf7g";
     };
     wmClass = "jetbrains-clion";
+    update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
   };
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2017.1.4";
+    version = "2017.1.4"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "0f03hgiiwlxnsvcm4dg2qf8pc5dy7w5phbj6qwgmppba2x5f8lf3";
+      sha256 = "c351e44a176add5b1fc7462e780b3fbe157691c3e23552d9d6b6531ee3830338"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
+    update-channel = "datagrip_2017_1";
   };
 
   gogland = buildGogland rec {
@@ -245,6 +247,7 @@ in
       sha256 = "0q2f8bi2i49j0xcpn824sihz2015jhn338cjaqy0jd988nxik6jk";
     };
     wmClass = "jetbrains-gogland";
+    update-channel = "gogland_1.0_EAP";
   };
 
   idea14-community = buildIdea rec {
@@ -257,6 +260,7 @@ in
       sha256 = "1i4mdjm9dd6zvxlpdgd3bqg45ir0cfc9hl55cdc0hg5qwbz683fz";
     };
     wmClass = "jetbrains-idea-ce";
+    update-channel = "IDEA14.1";
   };
 
   idea-community = buildIdea rec {
@@ -269,6 +273,7 @@ in
       sha256 = "1w1knq969dl8rxlkhr9mw8cr2vszn384acwhspimrd3zs9825r45";
     };
     wmClass = "jetbrains-idea-ce";
+    update-channel = "IDEA_Release";
   };
 
   idea14-ultimate = buildIdea rec {
@@ -281,6 +286,7 @@ in
       sha256 = "1hhga1i2zbsipgq283gn19kv9n94inhr1bxh2yx19gz7yr4r49d2";
     };
     wmClass = "jetbrains-idea";
+    update-channel = "IDEA14.1";
   };
 
   idea15-ultimate = buildIdea rec {
@@ -293,6 +299,7 @@ in
       sha256 = "012aap2qn0jx4x34bdv9ivrsr86vvf683srb5vpj27hc4l6rw6ll";
     };
     wmClass = "jetbrains-idea";
+    update-channel = null;
   };
 
   idea-ultimate = buildIdea rec {
@@ -305,6 +312,7 @@ in
       sha256 = "0byrsbsscpzb0syamzpavny879src5dlclnissa7173rh8hgkna4";
     };
     wmClass = "jetbrains-idea";
+    update-channel = "IDEA_Release";
   };
 
   phpstorm = buildPhpStorm rec {
@@ -317,6 +325,7 @@ in
       sha256 = "0zrbcziznz6dwh56snr27752xcsnl2gsxzi6jiraplkd92f2xlaf";
     };
     wmClass = "jetbrains-phpstorm";
+    update-channel = "PS2017.1";
   };
 
   phpstorm10 = buildPhpStorm rec {
@@ -329,42 +338,46 @@ in
       sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
     };
     wmClass = "jetbrains-phpstorm";
+    update-channel = "WI10";
   };
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2017.1.3";
+    version = "2017.1.4"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "06sai589zli5xaggfk4g0j0grbw9mya9qlwabmxh9414qq3bzvbd";
+      sha256 = "1e69ab29215a9c8c4626de6727df433ae0d9f6ed46eba2a6f48ffa52c2b04256"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
+    update-channel = "PyCharm_Release";
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2017.1.3";
+    version = "2017.1.4"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1wzgh83504px7q93h9xkarih2qjchiavgysy4di82q7377s6xd0c";
+      sha256 = "bbae5602b9cf6d26ccce9e1bf8b388d79c27cf89673d1a56f248bf0a50e518ed"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
+    update-channel = "PyCharm_Release";
   };
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "171.3655.1246";
+    version = "171.4456.575"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz";
-      sha256 = "90f9f8f1919e0f1dad42387f1a308483448323b089c13c409f3dd4d52992266b";
+      sha256 = "9b7f46e9c800a091f2cdbe9fda08041729e2abc0ce57252731da659b2424707b"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
+    update-channel = "rider1.0EAP";
   };
 
   ruby-mine = buildRubyMine rec {
@@ -377,6 +390,7 @@ in
       sha256 = "06jk0anlnc4gr240i51kam47shdjgda6zg3hglk5w3bpvbyix68z";
     };
     wmClass = "jetbrains-rubymine";
+    update-channel = "rm2017.1";
   };
 
   ruby-mine7 = buildRubyMine rec {
@@ -389,6 +403,7 @@ in
       sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l";
     };
     wmClass = "jetbrains-rubymine";
+    update-channel = null;
   };
 
   ruby-mine8 = buildRubyMine rec {
@@ -401,6 +416,7 @@ in
       sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a";
     };
     wmClass = "jetbrains-rubymine";
+    update-channel = null;
   };
 
   webstorm = buildWebStorm rec {
@@ -413,6 +429,7 @@ in
       sha256 = "0aw2728wknss5vn2fkgz8rkm5vwk031305f32dirfrh51bvmq2zm";
     };
     wmClass = "jetbrains-webstorm";
+    update-channel = "WS_Release";
   };
 
   webstorm10 = buildWebStorm rec {
@@ -425,6 +442,7 @@ in
       sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic";
     };
     wmClass = "jetbrains-webstorm";
+    update-channel = null;
   };
 
   webstorm11 = buildWebStorm rec {
@@ -437,5 +455,6 @@ in
       sha256 = "17agyqdyz6naxyx6p0y240ar93gja0ypw01nm2qmfzvh7ch03r24";
     };
     wmClass = "jetbrains-webstorm";
+    update-channel = null;
   };
 }
diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl
new file mode 100755
index 00000000000..9503212df43
--- /dev/null
+++ b/pkgs/applications/editors/jetbrains/update.pl
@@ -0,0 +1,92 @@
+#!/usr/bin/env perl
+
+use strict;
+use List::Util qw(reduce);
+use File::Basename qw(dirname);
+use LWP::Simple;
+
+sub readFile {
+  my ($filename) = @_;
+  local $/ = undef;
+  open FILE, $filename or die "readFile($filename) failed: $!";
+  binmode FILE;
+  my $data = <FILE>;
+  close FILE;
+  return $data;
+}
+
+sub writeFile {
+  my ($filename, $content) = @_;
+  make_path(dirname($filename)) or die "$!" unless -d dirname($filename);
+  open FH, ">$filename" or die "writeFile($filename) failed: $!";
+  binmode FH; # do not emit \r
+  print FH $content;
+  close FH;
+}
+
+sub semantic_less {
+  my ($a, $b) = @_;
+  $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg;
+  $b =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg;
+  return $a lt $b;
+}
+
+sub get_latest_versions {
+  my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs;
+  my %h = {};
+  for my $ch (@channels) {
+    my ($id) = $ch =~ /^<channel id="([^"]+)"/;
+    my @builds = $ch =~ /(<build .+?<\/build>)/gs;
+    my $latest_build = reduce {
+      my ($aversion) = $a =~ /^<build [^>]*version="([^"]+)"/; die "no version in $a" unless $aversion;
+      my ($bversion) = $b =~ /^<build [^>]*version="([^"]+)"/; die "no version in $b" unless $bversion;
+      semantic_less($aversion, $bversion) ? $b : $a;
+    } @builds;
+    next unless $latest_build;
+
+    # version as in download url
+    my ($latest_version) = $latest_build =~ /^<build [^>]*version="([^"]+)"/;
+    ($latest_version) = $latest_build =~ /^<build [^>]*fullNumber="([^"]+)"/ if $latest_version =~ / /;
+
+    $h{$id} = $latest_version;
+  }
+  return %h;
+}
+
+my %latest_versions = get_latest_versions();
+#for my $ch (sort keys %latest_versions) {
+#  print("$ch $latest_versions{$ch}\n");
+#}
+
+sub update_nix_block {
+  my ($block) = @_;
+  my ($channel) = $block =~ /update-channel\s*=\s*"([^"]+)"/;
+  if ($channel) {
+    die "unknown update-channel $channel" unless $latest_versions{$channel};
+    my ($version) = $block =~ /version\s*=\s*"([^"]+)"/;
+    die "no version in $block" unless $version;
+    if ($version eq $latest_versions{$channel}) {
+      print("$channel is up to date at $version\n");
+    } else {
+      print("updating $channel: $version -> $latest_versions{$channel}\n");
+      my ($url) = $block =~ /url\s*=\s*"([^"]+)"/;
+      # try to interpret some nix
+      my ($name) = $block =~ /name\s*=\s*"([^"]+)"/;
+      $name =~ s/\$\{version\}/$latest_versions{$channel}/;
+      $url =~ s/\$\{name\}/$name/;
+      $url =~ s/\$\{version\}/$latest_versions{$channel}/;
+      die "$url still has some interpolation" if $url =~ /\$/;
+
+      my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/;
+      die "invalid sha256 in $url.sha256" unless $sha256;
+
+      $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$latest_versions{$channel}"; /* updated by script */#m;
+      $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256"; /* updated by script */#m;
+    }
+  }
+  return $block;
+}
+
+my $nix = readFile 'default.nix';
+$nix =~ s/(= build\w+ rec \{.+?\};\n\n)/update_nix_block($1)/gse;
+writeFile 'default.nix', $nix;
-- 
GitLab


From 32ef253269f88fd5d33c80c6b463375c07d5130a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 23 Jun 2017 00:10:14 +0800
Subject: [PATCH 1083/1490] tmate: minor cleanup

---
 pkgs/tools/misc/tmate/default.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index f02c4148481..a528f5f394f 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, zlib, openssl, libevent, ncurses, cmake, ruby, libmsgpack, libssh }:
+{ stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig
+, zlib, openssl, libevent, ncurses, ruby, libmsgpack, libssh }:
 
 stdenv.mkDerivation rec {
   name = "tmate-${version}";
@@ -11,17 +12,17 @@ stdenv.mkDerivation rec {
     sha256 = "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r";
   };
 
-  buildInputs = [ autoconf automake pkgconfig libtool zlib openssl libevent ncurses cmake ruby libmsgpack libssh ];
+  dontUseCmakeConfigure = true;
 
-  dontUseCmakeConfigure=true;
+  buildInputs = [ libtool zlib openssl libevent ncurses ruby libmsgpack libssh ];
+  nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
+  enableParallelBuilding = true;
 
-  preConfigure = "./autogen.sh";
-
-  meta = {
-    homepage = http://tmate.io/;
+  meta = with stdenv.lib; {
+    homepage    = http://tmate.io/;
     description = "Instant Terminal Sharing";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ ];
   };
 }
-- 
GitLab


From d1eefba3a48828590a08389e14939c1cb5f4bfaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 22 Jun 2017 17:31:45 +0100
Subject: [PATCH 1084/1490] jetbrains: use nix-shell shebang in update script

---
 pkgs/applications/editors/jetbrains/update.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl
index 9503212df43..79436ae7d78 100755
--- a/pkgs/applications/editors/jetbrains/update.pl
+++ b/pkgs/applications/editors/jetbrains/update.pl
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+#!/usr/bin/env nix-shell
+#!nix-shell -i perl -p perl perlPackages.LWP
 
 use strict;
 use List::Util qw(reduce);
-- 
GitLab


From 00101eb7c92f110c857d85f4dbd1a31fc10a668c Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 22 Jun 2017 19:00:12 +0000
Subject: [PATCH 1085/1490] jetbrains updater: use
 perlPackages.LWPProtocolhttps

---
 pkgs/applications/editors/jetbrains/update.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl
index 79436ae7d78..ecdedca9e15 100755
--- a/pkgs/applications/editors/jetbrains/update.pl
+++ b/pkgs/applications/editors/jetbrains/update.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i perl -p perl perlPackages.LWP
+#!nix-shell -i perl -p perl perlPackages.LWPProtocolhttps
 
 use strict;
 use List::Util qw(reduce);
-- 
GitLab


From 1f65182272800122917f5ad25479ac618f7fd100 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Jun 2017 21:06:17 +0200
Subject: [PATCH 1086/1490] electrum: Unify protobuf dependencies

Since 9c57f3b5c05621f0d1c207aa80f20ccc1d79ebfb bumped the protobuf
version because the new upstream requires it, electrum now gets
protobuf3_0 *and* protobuf3_2 instead of just one version.

This leads to the following build errer:

Found duplicated packages in closure for dependency 'protobuf':
  protobuf 3.0.2 (...-python2.7-protobuf-3.0.2/lib/python2.7/site-packages)
  protobuf 3.2.0 (...-python2.7-protobuf-3.2.0/lib/python2.7/site-packages)

Using protobuf3_2 for keepkey and electrum fixes the build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @np
---
 pkgs/applications/misc/electrum/default.nix         | 2 +-
 pkgs/development/python-modules/keepkey/default.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 14c6c18f91c..34f403fda89 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
     ecdsa
     jsonrpclib
     pbkdf2
-    protobuf3_0
+    protobuf3_2
     pyaes
     pycrypto
     pyqt4
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
index 0d7f7661e7d..e54ed52d9c5 100644
--- a/pkgs/development/python-modules/keepkey/default.nix
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchPypi, buildPythonPackage, ecdsa
-, mnemonic, protobuf3_0, hidapi }:
+, mnemonic, protobuf3_2, hidapi }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
   };
 
-  propagatedBuildInputs = [ protobuf3_0 hidapi ];
+  propagatedBuildInputs = [ protobuf3_2 hidapi ];
 
   buildInputs = [ ecdsa mnemonic ];
 
-- 
GitLab


From 7fa29f39d199553bd32b7514fe1f5441a20954de Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 22 Jun 2017 19:08:19 +0000
Subject: [PATCH 1087/1490] a little simpification (use File::Slurp)

---
 pkgs/applications/editors/jetbrains/update.pl | 27 +++----------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl
index ecdedca9e15..62943787111 100755
--- a/pkgs/applications/editors/jetbrains/update.pl
+++ b/pkgs/applications/editors/jetbrains/update.pl
@@ -1,30 +1,11 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i perl -p perl perlPackages.LWPProtocolhttps
+#!nix-shell -i perl -p perl perlPackages.LWPProtocolhttps perlPackages.FileSlurp
 
 use strict;
 use List::Util qw(reduce);
-use File::Basename qw(dirname);
+use File::Slurp;
 use LWP::Simple;
 
-sub readFile {
-  my ($filename) = @_;
-  local $/ = undef;
-  open FILE, $filename or die "readFile($filename) failed: $!";
-  binmode FILE;
-  my $data = <FILE>;
-  close FILE;
-  return $data;
-}
-
-sub writeFile {
-  my ($filename, $content) = @_;
-  make_path(dirname($filename)) or die "$!" unless -d dirname($filename);
-  open FH, ">$filename" or die "writeFile($filename) failed: $!";
-  binmode FH; # do not emit \r
-  print FH $content;
-  close FH;
-}
-
 sub semantic_less {
   my ($a, $b) = @_;
   $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg;
@@ -88,6 +69,6 @@ sub update_nix_block {
   return $block;
 }
 
-my $nix = readFile 'default.nix';
+my $nix = read_file 'default.nix';
 $nix =~ s/(= build\w+ rec \{.+?\};\n\n)/update_nix_block($1)/gse;
-writeFile 'default.nix', $nix;
+write_file 'default.nix', $nix;
-- 
GitLab


From a2605322c6211c2bdccd742827902de57b8e2c6f Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 22 Jun 2017 19:16:19 +0000
Subject: [PATCH 1088/1490] fixed regexp, it did not match the last block

---
 pkgs/applications/editors/jetbrains/update.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl
index 62943787111..fecdeb0cae8 100755
--- a/pkgs/applications/editors/jetbrains/update.pl
+++ b/pkgs/applications/editors/jetbrains/update.pl
@@ -70,5 +70,5 @@ sub update_nix_block {
 }
 
 my $nix = read_file 'default.nix';
-$nix =~ s/(= build\w+ rec \{.+?\};\n\n)/update_nix_block($1)/gse;
+$nix =~ s/(= build\w+ rec \{.+?\n  \};\n)/update_nix_block($1)/gse;
 write_file 'default.nix', $nix;
-- 
GitLab


From 90b2d06268971aea52aa254df6c4458792986d88 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 21 Jun 2017 12:20:41 +0200
Subject: [PATCH 1089/1490] maintainers: add roberth

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d4f9d1c31a8..e0b0d89c016 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -467,6 +467,7 @@
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
   robbinch = "Robbin C. <robbinch33@gmail.com>";
+  roberth = "Robert Hensing <nixpkgs@roberthensing.nl>";
   robgssp = "Rob Glossop <robgssp@gmail.com>";
   roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
-- 
GitLab


From 86dc6469baa652c111437ac8f3e124e1d1ed8f86 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 21 Jun 2017 12:49:21 +0200
Subject: [PATCH 1090/1490] arelle: init at 2017-06-01

---
 .../python-modules/arelle/default.nix         | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            |  9 +++
 3 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/python-modules/arelle/default.nix

diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix
new file mode 100644
index 00000000000..32c020961f2
--- /dev/null
+++ b/pkgs/development/python-modules/arelle/default.nix
@@ -0,0 +1,55 @@
+{ gui ? true,
+  buildPythonPackage, fetchFromGitHub, lib,
+  sphinx_1_2, lxml, isodate, numpy, pytest,
+  tkinter ? null,
+  ... }:
+
+let
+  # Releases are published at http://arelle.org/download/ but sadly no
+  # tags are published on github.
+  version = "2017-06-01";
+
+  src = fetchFromGitHub {
+    owner = "Arelle";
+    repo = "Arelle";
+    rev = "c883f843d55bb48f03a15afceb4cc823cd4601bd";
+    sha256 = "1h48qdj0anv541rd3kna8bmcwfrl1l3yw76wsx8p6hx5prbmzg4v";
+  };
+
+in
+
+buildPythonPackage {
+  name = "arelle-${version}${lib.optionalString (!gui) "-headless"}";
+  inherit src;
+  outputs = ["out" "doc"];
+  postPatch = "rm testParser2.py";
+  buildInputs = [
+    sphinx_1_2
+    pytest
+  ];
+  propagatedBuildInputs = [
+    lxml
+    isodate
+    numpy
+  ] ++ lib.optional gui [
+    tkinter
+  ];
+
+  # arelle-gui is useless without gui dependencies, so delete it when !gui.
+  postInstall = lib.optionalString (!gui) ''
+    find $out/bin -name "*arelle-gui*" -delete
+  '';
+
+  # Documentation
+  postBuild = ''
+    (cd apidocs && make html && cp -r _build $doc)
+    '';
+
+  meta = {
+    description = "An open source facility for XBRL, the eXtensible Business Reporting Language supporting various standards, exposed through a python or REST API" + lib.optionalString gui " and a graphical user interface";
+    homepage = http://arelle.org/;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ roberth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2973e2d9b0f..989562420fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13136,6 +13136,8 @@ with pkgs;
     inherit (vamp) vampSDK;
   };
 
+  inherit (python34Packages) arelle;
+
   ario = callPackage ../applications/audio/ario { };
 
   arora = callPackage ../applications/networking/browsers/arora { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80bfad3c29c..9f054e7bc99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1184,6 +1184,15 @@ in {
     };
   };
 
+  arelle = callPackage ../development/python-modules/arelle {
+    gui = true;
+  };
+
+  arelle-headless = callPackage ../development/python-modules/arelle {
+    gui = false;
+  };
+
+
   arrow = buildPythonPackage rec {
     name = "arrow-${version}";
     version = "0.7.0";
-- 
GitLab


From d859769f26f956db57c648579be68673d9dae2ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Thu, 22 Jun 2017 22:04:34 +0200
Subject: [PATCH 1091/1490] nixos: replaced "userns" with "user namespaces" for
 clarity

"userns" wasn't introduces as an abbreviation elsewhere as far as I can see, and I wasn't sure what was meant at first.
---
 nixos/modules/profiles/hardened.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 8bde2e4f498..0a0838431da 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -55,7 +55,7 @@ with lib;
   # same privileges as it would have inside it.  This is particularly
   # bad in the common case of running as root within the namespace.
   #
-  # Setting the number of allowed userns to 0 effectively disables
+  # Setting the number of allowed user namespaces to 0 effectively disables
   # the feature at runtime.  Attempting to create a user namespace
   # with unshare will then fail with "no space left on device".
   boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0;
-- 
GitLab


From 8f970d09fe8e895b6bb7dbf52f80411a45504b19 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 22 Jun 2017 14:52:35 -0400
Subject: [PATCH 1092/1490] ghcHEAD: Actually split docs into their own output

I put `outputs = ...` in the wrong spot in the last PR, oops. Sorry
about that.
---
 pkgs/development/compilers/ghc/head.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 3e1aada22eb..53069619ffb 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -15,8 +15,6 @@ let
   version = "8.1.20170106";
   rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd";
 
-  outputs = [ "out" "doc" ];
-
   commonPreConfigure =  ''
     echo ${version} >VERSION
     echo ${rev} >GIT_COMMIT_ID
@@ -77,6 +75,8 @@ in stdenv.mkDerivation (rec {
     done
   '';
 
+  outputs = [ "out" "doc" ];
+
   passthru = {
     inherit bootPkgs;
   } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) {
-- 
GitLab


From c4ba2e3ef691c349bcce2b1e8b76a0bcd253544c Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 21 May 2017 14:51:02 -0400
Subject: [PATCH 1093/1490] cc-wrapper: Remove `stdenv.is*` for
 `targetPlatform.is*`

Modify bootstrapping stdenvs to make sure `targetPlatform` also passed.
---
 pkgs/build-support/cc-wrapper/default.nix | 11 ++++++-----
 pkgs/stdenv/darwin/default.nix            |  2 ++
 pkgs/stdenv/freebsd/default.nix           |  1 +
 pkgs/stdenv/linux/default.nix             |  2 ++
 pkgs/stdenv/native/default.nix            |  1 +
 pkgs/stdenv/nix/default.nix               |  1 +
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index e56f1f9a7d4..6a47836b171 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -10,6 +10,7 @@
 , zlib ? null, extraPackages ? [], extraBuildCommands ? ""
 , dyld ? null # TODO: should this be a setup-hook on dyld?
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
+, targetPlatform
 }:
 
 with stdenv.lib;
@@ -35,7 +36,7 @@ let
   # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
   coreutils_bin = if nativeTools then "" else getBin coreutils;
 
-  default_cxx_stdlib_compile=optionalString (stdenv.isLinux && !(cc.isGNU or false))
+  default_cxx_stdlib_compile=optionalString (targetPlatform.isLinux && !(cc.isGNU or false))
     "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
 in
 
@@ -78,7 +79,7 @@ stdenv.mkDerivation {
       }
     ''
 
-    + optionalString (!nativeLibc) (if (!stdenv.isDarwin) then ''
+    + optionalString (!nativeLibc) (if (!targetPlatform.isDarwin) then ''
       dynamicLinker="${libc_lib}/lib/$dynamicLinker"
       echo $dynamicLinker > $out/nix-support/dynamic-linker
 
@@ -117,7 +118,7 @@ stdenv.mkDerivation {
     ''
 
     + (if nativeTools then ''
-      ccPath="${if stdenv.isDarwin then cc else nativePrefix}/bin"
+      ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin"
       ldPath="${nativePrefix}/bin"
     '' else ''
       echo $cc > $out/nix-support/orig-cc
@@ -166,7 +167,7 @@ stdenv.mkDerivation {
       echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
     ''
 
-    + optionalString (stdenv.isSunOS && nativePrefix != "") ''
+    + optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
       # Solaris needs an additional ld wrapper.
       ldPath="${nativePrefix}/bin"
       exec="$ldPath/ld"
@@ -271,7 +272,7 @@ stdenv.mkDerivation {
       (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
        if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
        # ARM with a wildcard, which can be "" or "-armhf".
-       if stdenv.isArm then "ld-linux*.so.3" else
+       if targetPlatform.isArm32 then "ld-linux*.so.3" else
        if stdenv.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else
        if stdenv.system == "powerpc-linux" then "ld.so.1" else
        if stdenv.system == "mips64el-linux" then "ld.so.1" else
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index fba5afd4f6e..1592426b6e3 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -73,6 +73,7 @@ in rec {
           nativeTools  = true;
           nativePrefix = bootstrapTools;
           nativeLibc   = false;
+          targetPlatform = localSystem;
           libc         = last.pkgs.darwin.Libsystem;
           isClang      = true;
           cc           = { name = "clang-9.9.9"; outPath = bootstrapTools; };
@@ -295,6 +296,7 @@ in rec {
       inherit shell;
       nativeTools = false;
       nativeLibc  = false;
+      targetPlatform = localSystem;
       inherit (pkgs) coreutils binutils gnugrep;
       inherit (pkgs.darwin) dyld;
       cc   = pkgs.llvmPackages.clang-unwrapped;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 474a467e90c..20be86e5f96 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -77,6 +77,7 @@ let inherit (localSystem) system; in
         nativeTools  = true;
         nativePrefix = "/usr";
         nativeLibc   = true;
+        targetPlatform = localSystem;
         inherit (prevStage) stdenv;
         cc           = {
           name    = "clang-9.9.9";
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index b3399cc29b3..b23d1cd0173 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -76,6 +76,7 @@ let
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
           nativeTools = false;
           nativeLibc = false;
+          targetPlatform = localSystem;
           cc = prevStage.gcc-unwrapped;
           isGNU = true;
           libc = prevStage.glibc;
@@ -239,6 +240,7 @@ in
         nativeTools = false;
         nativeLibc = false;
         isGNU = true;
+        targetPlatform = localSystem;
         cc = prevStage.gcc-unwrapped;
         libc = self.glibc;
         inherit (self) stdenv binutils coreutils gnugrep;
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 77c868a02f8..3bcd0687bc6 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -125,6 +125,7 @@ in
         "i686-solaris" = "/usr/gnu";
         "x86_64-solaris" = "/opt/local/gcc47";
       }.${system} or "/usr";
+      targetPlatform = localSystem;
       inherit stdenv;
     };
 
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index ef088ecbf64..2363fb966e7 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -30,6 +30,7 @@ bootStages ++ [
         nativeTools = false;
         nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr";
         nativeLibc = true;
+        targetPlatform = localSystem;
         inherit stdenv;
         inherit (prevStage) binutils coreutils gnugrep;
         cc = prevStage.gcc.cc;
-- 
GitLab


From 459f1c60f5e53acb96123a7da8463d1e21093426 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 13 Feb 2017 18:01:04 -0500
Subject: [PATCH 1094/1490] cc-wrapper: Learn about target prefixes

This is first step towards getting rid of gcc-wrapper-cross
---
 pkgs/build-support/cc-wrapper/default.nix | 85 ++++++++++++-----------
 pkgs/stdenv/darwin/default.nix            |  2 +
 pkgs/stdenv/freebsd/default.nix           |  1 +
 pkgs/stdenv/linux/default.nix             |  2 +
 pkgs/stdenv/native/default.nix            |  1 +
 pkgs/stdenv/nix/default.nix               |  1 +
 6 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 6a47836b171..29766a7fe02 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -10,7 +10,7 @@
 , zlib ? null, extraPackages ? [], extraBuildCommands ? ""
 , dyld ? null # TODO: should this be a setup-hook on dyld?
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
-, targetPlatform
+, hostPlatform, targetPlatform
 }:
 
 with stdenv.lib;
@@ -24,6 +24,12 @@ assert !nativeLibc -> libc != null;
 assert cc.langVhdl or false -> zlib != null;
 
 let
+  # Prefix for binaries. Customarily ends with a dash separator.
+  #
+  # TODO(@Ericson2314) Make unconditional, or optional but always true by
+  # default.
+  prefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
+                                     (targetPlatform.config + "-");
 
   ccVersion = (builtins.parseDrvName cc.name).version;
   ccName = (builtins.parseDrvName cc.name).name;
@@ -41,9 +47,9 @@ let
 in
 
 stdenv.mkDerivation {
-  name =
-    (if name != "" then name else ccName + "-wrapper") +
-    (if cc != null && ccVersion != "" then "-" + ccVersion else "");
+  name = prefix
+    + (if name != "" then name else "${ccName}-wrapper")
+    + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}");
 
   preferLocalBuild = true;
 
@@ -52,7 +58,8 @@ stdenv.mkDerivation {
 
 
   passthru = {
-    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile;
+    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
+            prefix;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
@@ -170,7 +177,7 @@ stdenv.mkDerivation {
     + optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
       # Solaris needs an additional ld wrapper.
       ldPath="${nativePrefix}/bin"
-      exec="$ldPath/ld"
+      exec="$ldPath/${prefix}ld"
       wrap ld-solaris ${./ld-solaris-wrapper.sh}
     '')
 
@@ -178,72 +185,72 @@ stdenv.mkDerivation {
       # Create a symlink to as (the assembler).  This is useful when a
       # cc-wrapper is installed in a user environment, as it ensures that
       # the right assembler is called.
-      if [ -e $ldPath/as ]; then
-        ln -s $ldPath/as $out/bin/as
+      if [ -e $ldPath/${prefix}as ]; then
+        ln -s $ldPath/${prefix}as $out/bin/${prefix}as
       fi
 
-      wrap ld ${./ld-wrapper.sh} ''${ld:-$ldPath/ld}
+      wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld}
 
-      if [ -e ${binutils_bin}/bin/ld.gold ]; then
-        wrap ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/ld.gold
+      if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then
+        wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold
       fi
 
       if [ -e ${binutils_bin}/bin/ld.bfd ]; then
-        wrap ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/ld.bfd
+        wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd
       fi
 
-      export real_cc=cc
-      export real_cxx=c++
+      export real_cc=${prefix}cc
+      export real_cxx=${prefix}c++
       export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}"
 
-      if [ -e $ccPath/gcc ]; then
-        wrap gcc ${./cc-wrapper.sh} $ccPath/gcc
-        ln -s gcc $out/bin/cc
-        export real_cc=gcc
-        export real_cxx=g++
+      if [ -e $ccPath/${prefix}gcc ]; then
+        wrap ${prefix}gcc ${./cc-wrapper.sh} $ccPath/${prefix}gcc
+        ln -s ${prefix}gcc $out/bin/${prefix}cc
+        export real_cc=${prefix}gcc
+        export real_cxx=${prefix}g++
       elif [ -e $ccPath/clang ]; then
-        wrap clang ${./cc-wrapper.sh} $ccPath/clang
-        ln -s clang $out/bin/cc
+        wrap ${prefix}clang ${./cc-wrapper.sh} $ccPath/clang
+        ln -s ${prefix}clang $out/bin/${prefix}cc
         export real_cc=clang
         export real_cxx=clang++
       fi
 
-      if [ -e $ccPath/g++ ]; then
-        wrap g++ ${./cc-wrapper.sh} $ccPath/g++
-        ln -s g++ $out/bin/c++
+      if [ -e $ccPath/${prefix}g++ ]; then
+        wrap ${prefix}g++ ${./cc-wrapper.sh} $ccPath/${prefix}g++
+        ln -s ${prefix}g++ $out/bin/${prefix}c++
       elif [ -e $ccPath/clang++ ]; then
-        wrap clang++ ${./cc-wrapper.sh} $ccPath/clang++
-        ln -s clang++ $out/bin/c++
+        wrap ${prefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++
+        ln -s ${prefix}clang++ $out/bin/${prefix}c++
       fi
 
       if [ -e $ccPath/cpp ]; then
-        wrap cpp ${./cc-wrapper.sh} $ccPath/cpp
+        wrap ${prefix}cpp ${./cc-wrapper.sh} $ccPath/cpp
       fi
     ''
 
     + optionalString cc.langFortran or false ''
-      wrap gfortran ${./cc-wrapper.sh} $ccPath/gfortran
-      ln -sv gfortran $out/bin/g77
-      ln -sv gfortran $out/bin/f77
+      wrap ${prefix}gfortran ${./cc-wrapper.sh} $ccPath/${prefix}gfortran
+      ln -sv ${prefix}gfortran $out/bin/${prefix}g77
+      ln -sv ${prefix}gfortran $out/bin/${prefix}f77
     ''
 
     + optionalString cc.langJava or false ''
-      wrap gcj ${./cc-wrapper.sh} $ccPath/gcj
+      wrap ${prefix}gcj ${./cc-wrapper.sh} $ccPath/${prefix}gcj
     ''
 
     + optionalString cc.langGo or false ''
-      wrap gccgo ${./cc-wrapper.sh} $ccPath/gccgo
+      wrap ${prefix}gccgo ${./cc-wrapper.sh} $ccPath/${prefix}gccgo
     ''
 
     + optionalString cc.langAda or false ''
-      wrap gnatgcc ${./cc-wrapper.sh} $ccPath/gnatgcc
-      wrap gnatmake ${./gnat-wrapper.sh} $ccPath/gnatmake
-      wrap gnatbind ${./gnat-wrapper.sh} $ccPath/gnatbind
-      wrap gnatlink ${./gnatlink-wrapper.sh} $ccPath/gnatlink
+      wrap ${prefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${prefix}gnatgcc
+      wrap ${prefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${prefix}gnatmake
+      wrap ${prefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${prefix}gnatbind
+      wrap ${prefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink
     ''
 
     + optionalString cc.langVhdl or false ''
-      ln -s $ccPath/ghdl $out/bin/ghdl
+      ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl
     ''
 
     + ''
@@ -253,10 +260,10 @@ stdenv.mkDerivation {
 
       # some linkers on some platforms don't support specific -z flags
       hardening_unsupported_flags=""
-      if [[ "$($ldPath/ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
+      if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
         hardening_unsupported_flags+=" bindnow"
       fi
-      if [[ "$($ldPath/ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
+      if [[ "$($ldPath/${prefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
         hardening_unsupported_flags+=" relro"
       fi
 
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 1592426b6e3..bce332b6761 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -73,6 +73,7 @@ in rec {
           nativeTools  = true;
           nativePrefix = bootstrapTools;
           nativeLibc   = false;
+          hostPlatform = localSystem;
           targetPlatform = localSystem;
           libc         = last.pkgs.darwin.Libsystem;
           isClang      = true;
@@ -296,6 +297,7 @@ in rec {
       inherit shell;
       nativeTools = false;
       nativeLibc  = false;
+      hostPlatform = localSystem;
       targetPlatform = localSystem;
       inherit (pkgs) coreutils binutils gnugrep;
       inherit (pkgs.darwin) dyld;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 20be86e5f96..389a5b9985f 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -77,6 +77,7 @@ let inherit (localSystem) system; in
         nativeTools  = true;
         nativePrefix = "/usr";
         nativeLibc   = true;
+        hostPlatform = localSystem;
         targetPlatform = localSystem;
         inherit (prevStage) stdenv;
         cc           = {
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index b23d1cd0173..b116a48a2bd 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -76,6 +76,7 @@ let
              else lib.makeOverridable (import ../../build-support/cc-wrapper) {
           nativeTools = false;
           nativeLibc = false;
+          hostPlatform = localSystem;
           targetPlatform = localSystem;
           cc = prevStage.gcc-unwrapped;
           isGNU = true;
@@ -240,6 +241,7 @@ in
         nativeTools = false;
         nativeLibc = false;
         isGNU = true;
+        hostPlatform = localSystem;
         targetPlatform = localSystem;
         cc = prevStage.gcc-unwrapped;
         libc = self.glibc;
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 3bcd0687bc6..b21da1cd522 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -125,6 +125,7 @@ in
         "i686-solaris" = "/usr/gnu";
         "x86_64-solaris" = "/opt/local/gcc47";
       }.${system} or "/usr";
+      hostPlatform = localSystem;
       targetPlatform = localSystem;
       inherit stdenv;
     };
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 2363fb966e7..7ab797ce91b 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -30,6 +30,7 @@ bootStages ++ [
         nativeTools = false;
         nativePrefix = stdenv.lib.optionalString hostPlatform.isSunOS "/usr";
         nativeLibc = true;
+        hostPlatform = localSystem;
         targetPlatform = localSystem;
         inherit stdenv;
         inherit (prevStage) binutils coreutils gnugrep;
-- 
GitLab


From d70e7263f47e890a350f50686bbf38e5f342cf37 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 22 May 2017 20:59:39 -0400
Subject: [PATCH 1095/1490] cc-wrapper: Simplify and correct logic to chose
 dynamic linker library

---
 pkgs/build-support/cc-wrapper/default.nix | 28 ++++++++++-------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 29766a7fe02..c58523d3981 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -274,31 +274,27 @@ stdenv.mkDerivation {
     + extraBuildCommands;
 
   # The dynamic linker has different names on different Linux platforms.
+  #
+  # TODO(1b62c9c06173f4d5e6b090e5ae0c68fa5f478faf): This is not the best way to
+  # do this. I think the reference should be the style in the gcc-cross-wrapper,
+  # but to keep a stable stdenv now I do this sufficient if/else.
   dynamicLinker =
     if !nativeLibc then
-      (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
-       if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
+      (if targetPlatform.system == "i686-linux"     then "ld-linux.so.2" else
+       if targetPlatform.system == "x86_64-linux"   then "ld-linux-x86-64.so.2" else
        # ARM with a wildcard, which can be "" or "-armhf".
-       if targetPlatform.isArm32 then "ld-linux*.so.3" else
-       if stdenv.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else
-       if stdenv.system == "powerpc-linux" then "ld.so.1" else
-       if stdenv.system == "mips64el-linux" then "ld.so.1" else
-       if stdenv.system == "x86_64-darwin" then "/usr/lib/dyld" else
+       if targetPlatform.isArm32                    then "ld-linux*.so.3" else
+       if targetPlatform.system == "aarch64-linux"  then "ld-linux-aarch64.so.1" else
+       if targetPlatform.system == "powerpc-linux"  then "ld.so.1" else
+       if targetPlatform.system == "mips64el-linux" then "ld.so.1" else
+       if targetPlatform.system == "x86_64-darwin"  then "/usr/lib/dyld" else
+       if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else
        abort "Don't know the name of the dynamic linker for this platform.")
     else "";
 
   crossAttrs = {
     shell = shell.crossDrv + shell.crossDrv.shellPath;
     libc = stdenv.ccCross.libc;
-    #
-    # This is not the best way to do this. I think the reference should be
-    # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I
-    # do this sufficient if/else.
-    dynamicLinker =
-      (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else
-       if stdenv.cross.arch == "mips" then "ld.so.1" else
-       if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else
-       abort "don't know the name of the dynamic linker for this platform");
   };
 
   meta =
-- 
GitLab


From 04a3cad968fccc11fd07997cd5b496f4c482aae7 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 22 May 2017 20:59:39 -0400
Subject: [PATCH 1096/1490] cc-wrapper: Add support for no libc whatsoever

---
 pkgs/build-support/cc-wrapper/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index c58523d3981..86314c5130f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -5,7 +5,7 @@
 # script that sets up the right environment variables so that the
 # compiler and the linker just "work".
 
-{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
+{ name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
 , zlib ? null, extraPackages ? [], extraBuildCommands ? ""
 , dyld ? null # TODO: should this be a setup-hook on dyld?
@@ -18,7 +18,8 @@ with stdenv.lib;
 assert nativeTools -> nativePrefix != "";
 assert !nativeTools ->
   cc != null && binutils != null && coreutils != null && gnugrep != null;
-assert !nativeLibc -> libc != null;
+assert !(nativeLibc && noLibc);
+assert (noLibc || nativeLibc) == (libc == null);
 
 # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper.
 assert cc.langVhdl or false -> zlib != null;
@@ -34,9 +35,9 @@ let
   ccVersion = (builtins.parseDrvName cc.name).version;
   ccName = (builtins.parseDrvName cc.name).name;
 
-  libc_bin = if nativeLibc then null else getBin libc;
-  libc_dev = if nativeLibc then null else getDev libc;
-  libc_lib = if nativeLibc then null else getLib libc;
+  libc_bin = if libc == null then null else getBin libc;
+  libc_dev = if libc == null then null else getDev libc;
+  libc_lib = if libc == null then null else getLib libc;
   cc_solib = getLib cc;
   binutils_bin = if nativeTools then "" else getBin binutils;
   # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
@@ -86,7 +87,7 @@ stdenv.mkDerivation {
       }
     ''
 
-    + optionalString (!nativeLibc) (if (!targetPlatform.isDarwin) then ''
+    + optionalString (libc != null) (if (!targetPlatform.isDarwin) then ''
       dynamicLinker="${libc_lib}/lib/$dynamicLinker"
       echo $dynamicLinker > $out/nix-support/dynamic-linker
 
@@ -104,7 +105,7 @@ stdenv.mkDerivation {
       echo "export LD_DYLD_PATH=\"$dynamicLinker\"" >> $out/nix-support/setup-hook
     '')
 
-    + optionalString (!nativeLibc) ''
+    + optionalString (libc != null) ''
       # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
       # against the crt1.o from our own glibc, rather than the one in
       # /usr/lib.  (This is only an issue when using an `impure'
@@ -169,7 +170,7 @@ stdenv.mkDerivation {
       # Propagate the wrapped cc so that if you install the wrapper,
       # you get tools like gcov, the manpages, etc. as well (including
       # for binutils and Glibc).
-      echo ${cc} ${cc.man or ""} ${binutils_bin} ${libc_bin} > $out/nix-support/propagated-user-env-packages
+      echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
 
       echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
     ''
-- 
GitLab


From 0f0383394d006ae1c67e2815d5b4a8e4c7788de0 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 22 May 2017 20:59:39 -0400
Subject: [PATCH 1097/1490] cc-wrapper: Salt environment variables with LLVM
 triples

We now (on cross) require per-target flag interposition by putting the
triple in the names of the relevant environment variables, e.g:

export NIX_arm_unknown_linux_gnu_CFLAGS_COMPILE=...

The wrapper also has a `infixSalt` attribute (and "_" prefixed and
suffixed variants) to assist downstream packages.

Note how that the dashes are replaced to keep the identifier valid.
Using names like this allows us to keep the settings for different
compilers seperate.

I think it might be even better to use names like `NIX_{BUILD,HOST}...`
using the platform's role rather than the platform itself, but this
would be more work as the previous stages' tools would have to be re-
wrapped to take on their new role. I therefore didn't do this for now,
but that route should be thoroughly explored in the future.
---
 pkgs/build-support/cc-wrapper/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 86314c5130f..ffb1fdc139d 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -45,6 +45,12 @@ let
 
   default_cxx_stdlib_compile=optionalString (targetPlatform.isLinux && !(cc.isGNU or false))
     "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
+
+  dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config;
+  # TODO(@Ericson2314) Make unconditional
+  infixSalt  = stdenv.lib.optionalString (targetPlatform != hostPlatform) dashlessTarget;
+  infixSalt_ = stdenv.lib.optionalString (targetPlatform != hostPlatform) (dashlessTarget + "_");
+  _infixSalt = stdenv.lib.optionalString (targetPlatform != hostPlatform) ("_" + dashlessTarget);
 in
 
 stdenv.mkDerivation {
@@ -60,17 +66,17 @@ stdenv.mkDerivation {
 
   passthru = {
     inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
-            prefix;
+            prefix infixSalt infixSalt_ _infixSalt;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
       (mapc (lambda (arg)
         (when (file-directory-p (concat arg "/include"))
-          (setenv "NIX_CFLAGS_COMPILE" (concat (getenv "NIX_CFLAGS_COMPILE") " -isystem " arg "/include")))
+          (setenv "NIX_${infixSalt_}CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt_}CFLAGS_COMPILE") " -isystem " arg "/include")))
         (when (file-directory-p (concat arg "/lib"))
-          (setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib")))
+          (setenv "NIX_${infixSalt_}LDFLAGS" (concat (getenv "NIX_${infixSalt_}LDFLAGS") " -L" arg "/lib")))
         (when (file-directory-p (concat arg "/lib64"))
-          (setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
+          (setenv "NIX_${infixSalt_}LDFLAGS" (concat (getenv "NIX_${infixSalt_}LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)}))
     '';
   };
 
-- 
GitLab


From 8a7433fca4d08ee6654df498e0f238f0dfab01be Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 22 May 2017 21:00:21 -0400
Subject: [PATCH 1098/1490] cc-wrapper: Temporarily got to great lengths to
 avoid mass-rebuild

Eventually we should avoid this "pre-wrapping" and just update those
files in nixpkgs. This mass-rebuild change is best done along with
those needed to reduce the disparity between native and cross (i.e.
making native the "identity cross").
---
 pkgs/build-support/cc-wrapper/default.nix | 75 +++++++++++++++++------
 1 file changed, 55 insertions(+), 20 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index ffb1fdc139d..77c0cfd63a7 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -11,6 +11,7 @@
 , dyld ? null # TODO: should this be a setup-hook on dyld?
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 , hostPlatform, targetPlatform
+, runCommand ? null
 }:
 
 with stdenv.lib;
@@ -21,6 +22,8 @@ assert !nativeTools ->
 assert !(nativeLibc && noLibc);
 assert (noLibc || nativeLibc) == (libc == null);
 
+assert targetPlatform != hostPlatform -> runCommand != null;
+
 # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper.
 assert cc.langVhdl or false -> zlib != null;
 
@@ -51,6 +54,38 @@ let
   infixSalt  = stdenv.lib.optionalString (targetPlatform != hostPlatform) dashlessTarget;
   infixSalt_ = stdenv.lib.optionalString (targetPlatform != hostPlatform) (dashlessTarget + "_");
   _infixSalt = stdenv.lib.optionalString (targetPlatform != hostPlatform) ("_" + dashlessTarget);
+
+  # We want to prefix all NIX_ flags with the target triple
+  preWrap = textFile:
+    # TODO: Do even when not cross on next mass-rebuild
+    # TODO: use @target_tripple@ for consistency
+    if targetPlatform == hostPlatform
+    then textFile
+    else runCommand "sed-nix-env-vars" {} ''
+      cp ${textFile} $out
+
+      sed -i $out \
+        -e 's^NIX_^NIX_${infixSalt_}^g' \
+        -e 's^addCVars^addCVars${_infixSalt}^g' \
+        -e 's^\[ -z "\$crossConfig" \]^\[\[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" \]\]^g'
+
+      # NIX_ things which we don't both use and define, we revert them
+      #asymmetric=$(
+      #  for pre in "" "\\$"
+      #  do
+      #    grep -E -ho $pre'NIX_[a-zA-Z_]*' ./* | sed 's/\$//' | sort | uniq
+      #  done | sort | uniq -c | sort -nr | sed -n 's/^1 NIX_//gp')
+
+      # hard-code for now
+      asymmetric=("CXXSTDLIB_COMPILE" "CC")
+
+      # The ([^a-zA-Z_]|$) bussiness is to ensure environment variables that
+      # begin with `NIX_CC` don't also get blacklisted.
+      for var in "''${asymmetric[@]}"
+      do
+        sed -i $out -E -e "s~NIX_${infixSalt_}$var([^a-zA-Z_]|$)~NIX_$var\1~g"
+      done
+    '';
 in
 
 stdenv.mkDerivation {
@@ -185,7 +220,7 @@ stdenv.mkDerivation {
       # Solaris needs an additional ld wrapper.
       ldPath="${nativePrefix}/bin"
       exec="$ldPath/${prefix}ld"
-      wrap ld-solaris ${./ld-solaris-wrapper.sh}
+      wrap ld-solaris ${preWrap ./ld-solaris-wrapper.sh}
     '')
 
     + ''
@@ -196,14 +231,14 @@ stdenv.mkDerivation {
         ln -s $ldPath/${prefix}as $out/bin/${prefix}as
       fi
 
-      wrap ${prefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld}
+      wrap ${prefix}ld ${preWrap ./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld}
 
       if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then
-        wrap ${prefix}ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold
+        wrap ${prefix}ld.gold ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold
       fi
 
       if [ -e ${binutils_bin}/bin/ld.bfd ]; then
-        wrap ${prefix}ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd
+        wrap ${prefix}ld.bfd ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd
       fi
 
       export real_cc=${prefix}cc
@@ -211,49 +246,49 @@ stdenv.mkDerivation {
       export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}"
 
       if [ -e $ccPath/${prefix}gcc ]; then
-        wrap ${prefix}gcc ${./cc-wrapper.sh} $ccPath/${prefix}gcc
+        wrap ${prefix}gcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcc
         ln -s ${prefix}gcc $out/bin/${prefix}cc
         export real_cc=${prefix}gcc
         export real_cxx=${prefix}g++
       elif [ -e $ccPath/clang ]; then
-        wrap ${prefix}clang ${./cc-wrapper.sh} $ccPath/clang
+        wrap ${prefix}clang ${preWrap ./cc-wrapper.sh} $ccPath/clang
         ln -s ${prefix}clang $out/bin/${prefix}cc
         export real_cc=clang
         export real_cxx=clang++
       fi
 
       if [ -e $ccPath/${prefix}g++ ]; then
-        wrap ${prefix}g++ ${./cc-wrapper.sh} $ccPath/${prefix}g++
+        wrap ${prefix}g++ ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}g++
         ln -s ${prefix}g++ $out/bin/${prefix}c++
       elif [ -e $ccPath/clang++ ]; then
-        wrap ${prefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++
+        wrap ${prefix}clang++ ${preWrap ./cc-wrapper.sh} $ccPath/clang++
         ln -s ${prefix}clang++ $out/bin/${prefix}c++
       fi
 
       if [ -e $ccPath/cpp ]; then
-        wrap ${prefix}cpp ${./cc-wrapper.sh} $ccPath/cpp
+        wrap ${prefix}cpp ${preWrap ./cc-wrapper.sh} $ccPath/cpp
       fi
     ''
 
     + optionalString cc.langFortran or false ''
-      wrap ${prefix}gfortran ${./cc-wrapper.sh} $ccPath/${prefix}gfortran
+      wrap ${prefix}gfortran ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gfortran
       ln -sv ${prefix}gfortran $out/bin/${prefix}g77
       ln -sv ${prefix}gfortran $out/bin/${prefix}f77
     ''
 
     + optionalString cc.langJava or false ''
-      wrap ${prefix}gcj ${./cc-wrapper.sh} $ccPath/${prefix}gcj
+      wrap ${prefix}gcj ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcj
     ''
 
     + optionalString cc.langGo or false ''
-      wrap ${prefix}gccgo ${./cc-wrapper.sh} $ccPath/${prefix}gccgo
+      wrap ${prefix}gccgo ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gccgo
     ''
 
     + optionalString cc.langAda or false ''
-      wrap ${prefix}gnatgcc ${./cc-wrapper.sh} $ccPath/${prefix}gnatgcc
-      wrap ${prefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${prefix}gnatmake
-      wrap ${prefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${prefix}gnatbind
-      wrap ${prefix}gnatlink ${./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink
+      wrap ${prefix}gnatgcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gnatgcc
+      wrap ${prefix}gnatmake ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatmake
+      wrap ${prefix}gnatbind ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatbind
+      wrap ${prefix}gnatlink ${preWrap ./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink
     ''
 
     + optionalString cc.langVhdl or false ''
@@ -261,7 +296,7 @@ stdenv.mkDerivation {
     ''
 
     + ''
-      substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp
+      substituteAll ${preWrap ./setup-hook.sh} $out/nix-support/setup-hook.tmp
       cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook
       rm $out/nix-support/setup-hook.tmp
 
@@ -274,9 +309,9 @@ stdenv.mkDerivation {
         hardening_unsupported_flags+=" relro"
       fi
 
-      substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
-      substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
-      cp -p ${./utils.sh} $out/nix-support/utils.sh
+      substituteAll ${preWrap ./add-flags.sh} $out/nix-support/add-flags.sh
+      substituteAll ${preWrap ./add-hardening.sh} $out/nix-support/add-hardening.sh
+      cp -p ${preWrap ./utils.sh} $out/nix-support/utils.sh
     ''
     + extraBuildCommands;
 
-- 
GitLab


From 121e7d9335187fa742abba7994e03b495b8f2a6c Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 26 Apr 2017 00:06:11 -0400
Subject: [PATCH 1099/1490] gcc-cross-wrapper: Remove in favor of
 newly-cross-supporting `cc-wrapper`

---
 .../build-support/gcc-cross-wrapper/add-flags |   5 -
 .../gcc-cross-wrapper/builder.sh              | 120 ---------------
 .../gcc-cross-wrapper/default.nix             |  65 --------
 .../gcc-cross-wrapper/gcc-wrapper.sh          | 117 --------------
 .../gcc-cross-wrapper/ld-wrapper.sh           | 145 ------------------
 .../gcc-cross-wrapper/setup-hook.sh           |  90 -----------
 pkgs/build-support/gcc-cross-wrapper/utils.sh |  24 ---
 pkgs/top-level/all-packages.nix               |  28 ++--
 8 files changed, 15 insertions(+), 579 deletions(-)
 delete mode 100644 pkgs/build-support/gcc-cross-wrapper/add-flags
 delete mode 100644 pkgs/build-support/gcc-cross-wrapper/builder.sh
 delete mode 100644 pkgs/build-support/gcc-cross-wrapper/default.nix
 delete mode 100644 pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
 delete mode 100644 pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
 delete mode 100644 pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
 delete mode 100644 pkgs/build-support/gcc-cross-wrapper/utils.sh

diff --git a/pkgs/build-support/gcc-cross-wrapper/add-flags b/pkgs/build-support/gcc-cross-wrapper/add-flags
deleted file mode 100644
index 9ff4522e800..00000000000
--- a/pkgs/build-support/gcc-cross-wrapper/add-flags
+++ /dev/null
@@ -1,5 +0,0 @@
-export NIX_CROSS_CFLAGS_COMPILE="@cflagsCompile@ $NIX_CROSS_CFLAGS_COMPILE"
-export NIX_CROSS_CFLAGS_LINK="@cflagsLink@ $NIX_CROSS_CFLAGS_LINK"
-export NIX_CROSS_LDFLAGS="@ldflags@ $NIX_CROSS_LDFLAGS"
-export NIX_CROSS_LDFLAGS_BEFORE="@ldflagsBefore@ $NIX_CROSS_LDFLAGS_BEFORE"
-export NIX_CROSS_GLIBC_FLAGS_SET=1
diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh
deleted file mode 100644
index b729144b860..00000000000
--- a/pkgs/build-support/gcc-cross-wrapper/builder.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-source $stdenv/setup
-
-mkdir $out
-mkdir $out/bin
-mkdir $out/nix-support
-
-# Force gcc to use ld-wrapper.sh when calling ld.
-cflagsCompile="-B$out/bin/"
-
-if test -z "$nativeLibc" -a -n "$libc"; then
-    cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc_dev/include"
-    ldflags="$ldflags -L$libc/lib"
-    # Get the proper dynamic linker for glibc and uclibc. 
-    dlinker=`eval 'echo $libc/lib/ld*.so.?'`
-    if [ -n "$dlinker" ]; then
-      ldflagsBefore="-dynamic-linker $dlinker"
-
-      # The same as above, but put into files, useful for the gcc builder.
-      echo $dlinker > $out/nix-support/dynamic-linker
-      # This trick is to avoid dependencies on the cross-toolchain gcc
-      # for libgcc, libstdc++, ...
-      # -L is for libtool's .la files, and -rpath for the usual fixupPhase
-      # shrinking rpaths.
-      if [ -n "$gccLibs" ]; then
-        ldflagsBefore="$ldflagsBefore -rpath $gccLibs/lib"
-      fi
-    fi
-
-    if [ -n "$osxMinVersion" ]; then
-        cflagsCompile="$cflagsCompile -mmacosx-version-min=$osxMinVersion"
-    fi
-
-    echo "$cflagsCompile -B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
-
-    echo "-L$libc/lib -rpath $libc/lib -rpath-link $libc/lib" > $out/nix-support/libc-ldflags
-
-    # The dynamic linker is passed in `ldflagsBefore' to allow
-    # explicit overrides of the dynamic linker by callers to gcc/ld
-    # (the *last* value counts, so ours should come first).
-    echo "$ldflagsBefore" > $out/nix-support/libc-ldflags-before
-fi
-
-if test -n "$nativeTools"; then
-    gccPath="$nativePrefix/bin"
-    ldPath="$nativePrefix/bin"
-else
-    ldflags="$ldflags -L$gcc/lib -L$gcc/lib64"
-    gccPath="$gcc/bin"
-    ldPath="$binutils/$crossConfig/bin"
-fi
-
-
-doSubstitute() {
-    local src=$1
-    local dst=$2
-    substitute "$src" "$dst" \
-        --subst-var "out" \
-        --subst-var "shell" \
-        --subst-var "gcc" \
-        --subst-var "gccProg" \
-        --subst-var "binutils" \
-        --subst-var "libc" \
-        --subst-var "cflagsCompile" \
-        --subst-var "cflagsLink" \
-        --subst-var "ldflags" \
-        --subst-var "ldflagsBefore" \
-        --subst-var "ldPath" \
-        --subst-var-by "ld" "$ldPath/ld"
-}
-
-
-# Make wrapper scripts around gcc, g++, and g77.  Also make symlinks
-# cc, c++, and f77.
-mkGccWrapper() {
-    local dst=$1
-    local src=$2
-
-    if ! test -f "$src"; then
-        echo "$src does not exist (skipping)"
-        return
-    fi
-
-    gccProg="$src"
-    doSubstitute "$gccWrapper" "$dst"
-    chmod +x "$dst"
-}
-
-mkGccWrapper $out/bin/$crossConfig-gcc $gccPath/$crossConfig-gcc
-#ln -s gcc $out/bin/cc
-
-mkGccWrapper $out/bin/$crossConfig-g++ $gccPath/$crossConfig-g++
-ln -s $crossConfig-g++ $out/bin/$crossConfig-c++
-
-mkGccWrapper $out/bin/$crossConfig-cpp $gccPath/$crossConfig-cpp
-
-mkGccWrapper $out/bin/$crossConfig-g77 $gccPath/$crossConfig-g77
-ln -s $crossConfig-g77 $out/bin/$crossConfig-f77
-
-ln -s $binutils/bin/$crossConfig-ar $out/bin/$crossConfig-ar
-ln -s $binutils/bin/$crossConfig-as $out/bin/$crossConfig-as
-ln -s $binutils/bin/$crossConfig-nm $out/bin/$crossConfig-nm
-ln -s $binutils/bin/$crossConfig-strip $out/bin/$crossConfig-strip
-
-
-# Make a wrapper around the linker.
-doSubstitute "$ldWrapper" "$out/bin/$crossConfig-ld"
-chmod +x "$out/bin/$crossConfig-ld"
-
-
-# Emit a setup hook.  Also store the path to the original GCC and
-# Glibc.
-test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc
-test -n "$libc" && echo $libc > $out/nix-support/orig-libc
-test -n "$libc_dev" && echo $libc_dev > $out/nix-support/orig-libc-dev
-
-doSubstitute "$addFlags" "$out/nix-support/add-flags"
-
-doSubstitute "$setupHook" "$out/nix-support/setup-hook"
-
-cp -p $utils $out/nix-support/utils
diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix
deleted file mode 100644
index 505d80a6b2a..00000000000
--- a/pkgs/build-support/gcc-cross-wrapper/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't
-# know where the C library and standard header files are.  Therefore
-# the compiler produced by that package cannot be installed directly
-# in a user environment and used from the command line.  This
-# stdenv.mkDerivation provides a wrapper that sets up the right environment
-# variables so that the compiler and the linker just "work".
-
-{ name ? "", stdenv, nativeTools, nativeLibc, noLibc ? false, nativePrefix ? ""
-, gcc ? null, libc ? null, binutils ? null, shell ? "", cross
-}:
-
-assert nativeTools -> nativePrefix != "";
-assert !nativeTools -> gcc != null && binutils != null;
-assert !noLibc -> (!nativeLibc -> libc != null);
-
-let
-  chosenName = if name == "" then gcc.name else name;
-  gccLibs = stdenv.mkDerivation {
-    name = chosenName + "-libs";
-    phases = [ "installPhase" ];
-    installPhase = ''
-      echo $out
-      mkdir -p "$out"
-
-      if [ -d "${gcc}/${cross.config}/lib" ]
-      then
-          cp -Rd "${gcc}/${cross.config}/lib" "$out/lib"
-          chmod -R +w "$out/lib"
-          for a in "$out/lib/"*.la; do
-              sed -i -e "s,${gcc}/${cross.config}/lib,$out/lib,g" $a
-          done
-          rm -f "$out/lib/"*.py
-      else
-          # The MinGW cross-compiler falls into this category.
-          mkdir "$out/lib"
-      fi
-    '';
-  };
-in
-stdenv.mkDerivation {
-  builder = ./builder.sh;
-  setupHook = ./setup-hook.sh;
-  gccWrapper = ./gcc-wrapper.sh;
-  ldWrapper = ./ld-wrapper.sh;
-  utils = ./utils.sh;
-  addFlags = ./add-flags;
-  inherit nativeTools nativeLibc nativePrefix gcc binutils;
-  libc = if libc ? out then libc.out else libc;
-  libc_dev = if libc ? dev then libc.dev else libc;
-  crossConfig = if cross != null then cross.config else null;
-  osxMinVersion = cross.osxMinVersion or null;
-  gccLibs = if gcc != null then gccLibs else null;
-  name = chosenName;
-  langC = if nativeTools then true else gcc.langC;
-  langCC = if nativeTools then true else gcc.langCC;
-  langF77 = if nativeTools then false else gcc ? langFortran;
-  shell = if shell == "" then stdenv.shell else shell;
-  meta = if gcc != null then gcc.meta else
-    { description = "System C compiler wrapper";
-    };
-
-  passthru = {
-    target = cross;
-  };
-}
diff --git a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
deleted file mode 100644
index c15777144e1..00000000000
--- a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#! @shell@ -e
-
-if test -n "$NIX_CC_WRAPPER_START_HOOK"; then
-    source "$NIX_CC_WRAPPER_START_HOOK"
-fi
-
-if test -z "$NIX_CROSS_GLIBC_FLAGS_SET"; then
-    source @out@/nix-support/add-flags
-fi
-
-source @out@/nix-support/utils
-
-
-# Figure out if linker flags should be passed.  GCC prints annoying
-# warnings when they are not needed.
-dontLink=0
-if test "$*" = "-v" -o -z "$*"; then
-    dontLink=1
-else
-    for i in "$@"; do
-        if test "$i" = "-c"; then
-            dontLink=1
-        elif test "$i" = "-S"; then
-            dontLink=1
-        elif test "$i" = "-E"; then
-            dontLink=1
-        elif test "$i" = "-E"; then
-            dontLink=1
-        elif test "$i" = "-M"; then
-            dontLink=1
-        elif test "$i" = "-MM"; then
-            dontLink=1
-        fi
-    done
-fi
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
-    rest=()
-    n=0
-    while test $n -lt ${#params[*]}; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-L" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-I" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-isystem" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-# Add the flags for the C compiler proper.
-extraAfter=($NIX_CROSS_CFLAGS_COMPILE)
-extraBefore=()
-
-if test "$dontLink" != "1"; then
-
-    # Add the flags that should only be passed to the compiler when
-    # linking.
-    extraAfter=(${extraAfter[@]} $NIX_CROSS_CFLAGS_LINK)
-
-    # Add the flags that should be passed to the linker (and prevent
-    # `ld-wrapper' from adding NIX_CROSS_LDFLAGS again).
-    for i in $NIX_CROSS_LDFLAGS_BEFORE; do
-        if test "${i:0:3}" = "-L/"; then
-            extraBefore=(${extraBefore[@]} "$i")
-        else
-            extraBefore=(${extraBefore[@]} "-Wl,$i")
-        fi
-    done
-    for i in $NIX_CROSS_LDFLAGS; do
-        if test "${i:0:3}" = "-L/"; then
-            extraAfter=(${extraAfter[@]} "$i")
-        else
-            extraAfter=(${extraAfter[@]} "-Wl,$i")
-        fi
-    done
-    export NIX_CROSS_LDFLAGS_SET=1
-fi
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @gccProg@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extraBefore flags to @gccProg@:" >&2
-  for i in ${extraBefore[@]}; do
-      echo "  $i" >&2
-  done
-  echo "extraAfter flags to @gccProg@:" >&2
-  for i in ${extraAfter[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_CC_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_CC_WRAPPER_EXEC_HOOK"
-fi
-
-# We want gcc to call the wrapper linker, not that of binutils.
-export PATH="@ldPath@:$PATH"
-
-exec @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
diff --git a/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
deleted file mode 100644
index 226fad83359..00000000000
--- a/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
+++ /dev/null
@@ -1,145 +0,0 @@
-#! @shell@ -e
-
-if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
-    source "$NIX_LD_WRAPPER_START_HOOK"
-fi
-
-if test -z "$NIX_CROSS_GLIBC_FLAGS_SET"; then
-    source @out@/nix-support/add-flags
-fi
-
-source @out@/nix-support/utils
-
-
-# Optionally filter out paths not refering to the store.
-params=("$@")
-if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \
-        -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_CROSS_LDFLAGS_SET" \); then
-    rest=()
-    n=0
-    while test $n -lt ${#params[*]}; do
-        p=${params[n]}
-        p2=${params[$((n+1))]}
-        if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then
-            skip $p
-        elif test "$p" = "-L" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-rpath" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "$p" = "-dynamic-linker" && badPath "$p2"; then
-            n=$((n + 1)); skip $p2
-        elif test "${p:0:1}" = "/" && badPath "$p"; then
-            # We cannot skip this; barf.
-            echo "impure path \`$p' used in link" >&2
-            exit 1
-        else
-            rest=("${rest[@]}" "$p")
-        fi
-        n=$((n + 1))
-    done
-    params=("${rest[@]}")
-fi
-
-
-extra=()
-extraBefore=()
-
-if test -z "$NIX_CROSS_LDFLAGS_SET"; then
-    extra=(${extra[@]} $NIX_CROSS_LDFLAGS)
-    extraBefore=(${extraBefore[@]} $NIX_CROSS_LDFLAGS_BEFORE)
-fi
-
-
-# Add all used dynamic libraries to the rpath.
-if test "$NIX_DONT_SET_RPATH" != "1"; then
-
-    # First, find all -L... switches.
-    allParams=("${params[@]}" ${extra[@]})
-    libPath=""
-    addToLibPath() {
-        local path="$1"
-        if test "${path:0:1}" != "/"; then return 0; fi
-        case "$path" in
-            *..*|*./*|*/.*|*//*)
-                local path2
-                if path2=$(readlink -f "$path"); then
-                    path="$path2"
-                fi
-                ;;
-        esac
-        case $libPath in
-            *\ $path\ *) return 0 ;;
-        esac
-        libPath="$libPath $path "
-    }
-    n=0
-    while test $n -lt ${#allParams[*]}; do
-        p=${allParams[n]}
-        p2=${allParams[$((n+1))]}
-        if test "${p:0:3}" = "-L/"; then
-            addToLibPath ${p:2}
-        elif test "$p" = "-L"; then
-            addToLibPath ${p2}
-            n=$((n + 1))
-        fi
-        n=$((n + 1))
-    done
-
-    # Second, for each -l... switch, find the directory containing the
-    # library and add it to the rpath.
-    rpath=""
-    addToRPath() {
-        # If the path is not in the store, don't add it to the rpath.
-        # This typically happens for libraries in /tmp that are later
-        # copied to $out/lib.  If not, we're screwed.
-        if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi
-        case $rpath in
-            *\ $1\ *) return 0 ;;
-        esac
-        rpath="$rpath $1 "
-    }
-    findLib() {
-        for i in $libPath; do
-            if test -f $i/lib$1.so; then
-                addToRPath $i
-            fi
-        done
-    }
-    n=0
-    while test $n -lt ${#allParams[*]}; do
-        p=${allParams[n]}
-        p2=${allParams[$((n+1))]}
-        if test "${p:0:2}" = "-l"; then
-            findLib ${p:2}
-        elif test "$p" = "-l"; then
-            # I haven't seen `-l foo', but you never know...
-            findLib ${p2}
-            n=$((n + 1))
-        fi
-        n=$((n + 1))
-    done
-
-    # Finally, add `-rpath' switches.
-    for i in $rpath; do
-        extra=(${extra[@]} -rpath $i -rpath-link $i)
-    done
-fi
-
-
-# Optionally print debug info.
-if test "$NIX_DEBUG" = "1"; then
-  echo "original flags to @ld@:" >&2
-  for i in "${params[@]}"; do
-      echo "  $i" >&2
-  done
-  echo "extra flags to @ld@:" >&2
-  for i in ${extra[@]}; do
-      echo "  $i" >&2
-  done
-fi
-
-if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
-    source "$NIX_LD_WRAPPER_EXEC_HOOK"
-fi
-
-exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
deleted file mode 100644
index 599954bd127..00000000000
--- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-NIX_CROSS_CFLAGS_COMPILE=""
-NIX_CROSS_LDFLAGS=""
-
-crossAddCVars () {
-    if test -d $1/include; then
-        export NIX_CROSS_CFLAGS_COMPILE="$NIX_CROSS_CFLAGS_COMPILE -I$1/include"
-    fi
-
-    if test -d $1/lib; then
-        export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -L$1/lib -rpath-link $1/lib"
-    fi
-}
-
-crossEnvHooks+=(crossAddCVars)
-
-crossStripDirs() {
-    local dirs="$1"
-    local stripFlags="$2"
-    local dirsNew=
-
-    for d in ${dirs}; do
-        if test -d "$prefix/$d"; then
-            dirsNew="${dirsNew} $prefix/$d "
-        fi
-    done
-    dirs=${dirsNew}
-
-    if test -n "${dirs}"; then
-        header "cross stripping (with flags $stripFlags) in $dirs"
-        # libc_nonshared.a should never be stripped, or builds will break.
-        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $crossConfig-strip $stripFlags || true
-        stopNest
-    fi
-}
-
-crossStrip () {
-    # In cross_renaming we may rename dontCrossStrip to dontStrip, and
-    # dontStrip to dontNativeStrip.
-    # TODO: strip _only_ ELF executables, and return || fail here...
-    if test -z "$dontCrossStrip"; then
-        stripDebugList=${stripDebugList:-lib lib64 libexec bin sbin}
-        if test -n "$stripDebugList"; then
-            crossStripDirs "$stripDebugList" "${stripDebugFlags:--S}"
-        fi
-        
-        stripAllList=${stripAllList:-}
-        if test -n "$stripAllList"; then
-            crossStripDirs "$stripAllList" "${stripAllFlags:--s}"
-        fi
-    fi
-}
-
-preDistPhases=(${preDistPhases[@]} crossStrip)
-
-
-# Note: these come *after* $out in the PATH (see setup.sh).
-
-if test -n "@gcc@"; then
-    PATH=$PATH:@gcc@/bin
-fi
-
-if test -n "@binutils@"; then
-    PATH=$PATH:@binutils@/bin
-fi
-
-if test -n "@libc@"; then
-    PATH=$PATH:@libc@/bin
-    crossAddCVars @libc@
-fi
-
-if test "$dontSetConfigureCross" != "1"; then
-    configureFlags="$configureFlags --build=$system --host=$crossConfig"
-fi
-# Disabling the tests when cross compiling, as usually the tests are meant for
-# native compilations.
-doCheck=""
-
-# Don't strip foreign binaries with native "strip" tool.
-dontStrip=1
-
-# Add the output as an rpath.
-if test "$NIX_NO_SELF_RPATH" != "1"; then
-    export NIX_CROSS_LDFLAGS="-rpath $out/lib -rpath-link $out/lib $NIX_CROSS_LDFLAGS"
-    if test -n "$NIX_LIB64_IN_SELF_RPATH"; then
-        export NIX_CROSS_LDFLAGS="-rpath $out/lib64 -rpath-link $out/lib $NIX_CROSS_LDFLAGS"
-    fi
-fi
-
-export CC=${crossConfig}-gcc
-export CXX=${crossConfig}-g++
diff --git a/pkgs/build-support/gcc-cross-wrapper/utils.sh b/pkgs/build-support/gcc-cross-wrapper/utils.sh
deleted file mode 100644
index 753b3772e95..00000000000
--- a/pkgs/build-support/gcc-cross-wrapper/utils.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-skip () {
-    if test "$NIX_DEBUG" = "1"; then
-        echo "skipping impure path $1" >&2
-    fi
-}
-
-
-# Checks whether a path is impure.  E.g., `/lib/foo.so' is impure, but
-# `/nix/store/.../lib/foo.so' isn't.
-badPath() {
-    local p=$1
-    
-    # Relative paths are okay (since they're presumably relative to
-    # the temporary build directory).
-    if test "${p:0:1}" != "/"; then return 1; fi
-    
-    # Otherwise, the path should refer to the store or some temporary
-    # directory (including the build directory).
-    test \
-        "$p" != "/dev/null" -a \
-        "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \
-        "${p:0:4}" != "/tmp" -a \
-        "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2fc65da558..11afb0d1e31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5168,8 +5168,8 @@ with pkgs;
       if targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers
       else if targetPlatform.libc == "libSystem" then darwin.xcode
       else null;
-    in wrapGCCCross {
-      gcc = forcedNativePackages.gcc.cc.override {
+    in wrapCCCross {
+      cc = forcedNativePackages.gcc.cc.override {
         crossStageStatic = true;
         langCC = false;
         libcCross = libcCross1;
@@ -5179,19 +5179,17 @@ with pkgs;
       };
       libc = libcCross1;
       inherit (forcedNativePackages) binutils;
-      cross = targetPlatform;
   };
 
   # Only needed for mingw builds
-  gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapGCCCross {
-    gcc = gccCrossStageStatic.gcc;
+  gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapCCCross {
+    cc = gccCrossStageStatic.gcc;
     libc = windows.mingw_headers2;
     inherit (forcedNativePackages) binutils;
-    cross = targetPlatform;
   };
 
-  gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapGCCCross {
-    gcc = forcedNativePackages.gcc.cc.override {
+  gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCCross {
+    cc = forcedNativePackages.gcc.cc.override {
       crossStageStatic = false;
 
       # Why is this needed?
@@ -5199,7 +5197,6 @@ with pkgs;
     };
     libc = libcCross;
     inherit (forcedNativePackages) binutils;
-    cross = targetPlatform;
   };
 
   gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 {
@@ -5924,14 +5921,19 @@ with pkgs;
     libc = glibc;
   };
 
-  wrapGCCCross =
-    {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}:
+  wrapCCCross =
+    {cc, libc, binutils, shell ? "", name ? "gcc-cross-wrapper"}:
 
-    forcedNativePackages.callPackage ../build-support/gcc-cross-wrapper {
+    forcedNativePackages.ccWrapperFun {
       nativeTools = false;
       nativeLibc = false;
       noLibc = (libc == null);
-      inherit gcc binutils libc shell name cross;
+
+      dyld = if stdenv.isDarwin then darwin.dyld else null;
+      isGNU = cc.isGNU or false;
+      isClang = cc.isClang or false;
+
+      inherit cc binutils libc shell name;
     };
 
   # prolog
-- 
GitLab


From 9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 26 Apr 2017 00:06:11 -0400
Subject: [PATCH 1100/1490] cross stdenv adaptor: Remove `ccCross` `binutils`
 attrs and binutils extra buildDepends

It now has the correct wrapped tools and nothing else is needed.
---
 pkgs/stdenv/adapters.nix                       | 18 +++++++++---------
 pkgs/stdenv/cross/default.nix                  | 15 ++++++---------
 .../linux/make-bootstrap-tools-cross.nix       |  1 -
 pkgs/top-level/all-packages.nix                |  1 -
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 7eab7ddb072..fc332dff3aa 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -56,12 +56,17 @@ rec {
 
   # Return a modified stdenv that adds a cross compiler to the
   # builds.
-  makeStdenvCross = stdenv: cross: binutils: gccCross: stdenv // {
+  makeStdenvCross = stdenvOrig: cross: cc: let
+    stdenv = stdenvOrig.override {
+      inherit cc;
 
-    # Overrides are surely not valid as packages built with this run on a
-    # different platform.
-    overrides = _: _: {};
+      allowedRequisites = null;
 
+      # Overrides are surely not valid as packages built with this run on a
+      # different platform.
+      overrides = _: _: {};
+    };
+  in stdenv // {
     mkDerivation =
       { name ? "", buildInputs ? [], nativeBuildInputs ? []
       , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
@@ -91,7 +96,6 @@ rec {
           name = name + "-" + cross.config;
           nativeBuildInputs = nativeBuildInputs
             ++ nativeInputsFromBuildInputs
-            ++ [ gccCross binutils ]
             ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
               # without proper `file` command, libtool sometimes fails
               # to recognize 64-bit DLLs
@@ -109,10 +113,6 @@ rec {
 
           crossConfig = cross.config;
         } // args.crossAttrs or {});
-
-    inherit gccCross binutils;
-    ccCross = gccCross;
-
   };
 
 
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 7fe56725170..f9c23078cd3 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -31,15 +31,12 @@ in bootStages ++ [
     targetPlatform = crossSystem;
     inherit config overlays;
     selfBuild = false;
-    stdenv = if crossSystem.useiOSCross or false
-      then let
-          inherit (buildPackages.darwin.ios-cross) cc binutils;
-        in buildPackages.makeStdenvCross
-          buildPackages.stdenv crossSystem
-          binutils cc
-      else buildPackages.makeStdenvCross
-        buildPackages.stdenv crossSystem
-        buildPackages.binutils buildPackages.gccCrossStageFinal;
+    stdenv = buildPackages.makeStdenvCross
+      buildPackages.stdenv
+      crossSystem
+      (if crossSystem.useiOSCross or false
+       then buildPackages.darwin.ios-cross
+       else buildPackages.gccCrossStageFinal);
   })
 
 ]
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 0378891b27a..90c9d2cef67 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -81,7 +81,6 @@ rec {
       nativeBuildInputs = [
         pkgs.buildPackages.nukeReferences
         pkgs.buildPackages.cpio
-        pkgs.buildPackages.binutils
       ];
 
       buildCommand = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11afb0d1e31..b499b623a8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7805,7 +7805,6 @@ with pkgs;
     stdenv = buildPackages.makeStdenvCross
       buildPackages.buildPackages.stdenv
       buildPackages.targetPlatform
-      buildPackages.binutils
       buildPackages.gccCrossStageStatic;
   };
 
-- 
GitLab


From 594d26420594acf458e5a8ab75229a2147d9194f Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 26 Apr 2017 00:06:11 -0400
Subject: [PATCH 1101/1490] cross stdenv adaptor: Support --host --build
 --target across the board

Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.

rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
---
 doc/stdenv.xml                                | 10 ++++++
 pkgs/applications/video/mplayer/default.nix   |  6 ++--
 pkgs/applications/video/omxplayer/default.nix |  2 +-
 pkgs/development/compilers/ghc/head.nix       |  2 +-
 pkgs/development/compilers/rust/rustc.nix     |  4 ++-
 .../libraries/ffmpeg-full/default.nix         |  2 +-
 pkgs/development/libraries/ffmpeg/generic.nix |  2 +-
 pkgs/development/libraries/libav/default.nix  |  2 +-
 pkgs/development/libraries/libvpx/default.nix |  2 +-
 pkgs/development/libraries/libvpx/git.nix     |  2 +-
 .../libraries/qt-4.x/4.8/default.nix          |  2 +-
 pkgs/development/libraries/zlib/default.nix   |  2 +-
 pkgs/stdenv/adapters.nix                      | 33 +++++++++++++++----
 pkgs/stdenv/cross/default.nix                 | 15 +++++----
 pkgs/top-level/all-packages.nix               |  9 ++---
 15 files changed, 66 insertions(+), 29 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 9ec14d5a782..e637962fbb7 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -640,6 +640,16 @@ script) if it exists.</para>
     true.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>configurePlatforms</varname></term>
+    <listitem><para>
+      By default, when cross compiling, the configure script has <option>--build=...</option> and <option>--host=...</option> passed.
+      Packages can instead pass <literal>[ "build" "host" "target" ]</literal> or a subset to control exactly which platform flags are passed.
+      Compilers and other tools should use this to also pass the target platform, for example.
+      Note eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity.
+    </para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>preConfigure</varname></term>
     <listitem><para>Hook executed at the start of the configure
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 37b424d922b..9ae1b99f86f 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -25,6 +25,7 @@
 , libjpegSupport ? true, libjpeg ? null
 , useUnfreeCodecs ? false
 , darwin ? null
+, hostPlatform
 }:
 
 assert fontconfigSupport -> (fontconfig != null);
@@ -185,13 +186,14 @@ stdenv.mkDerivation rec {
     '';
 
   crossAttrs = {
-    dontSetConfigureCross = true;
+    configurePlatforms = [];
     # Some things (vidix) are nanonote specific. Once someone cares, we can make options from them.
+    # Note, the `target` vs `host` confusion is intensional.
     preConfigure = ''
       configureFlags="`echo $configureFlags |
         sed -e 's/--codecsdir[^ ]\+//' \
         -e 's/--enable-runtime-cpudetection//' `"
-      configureFlags="$configureFlags --target=${stdenv.cross.arch}-linux
+      configureFlags="$configureFlags --target=${hostPlatform.arch}-linux
         --enable-cross-compile --cc=$crossConfig-gcc --as=$crossConfig-as
         --disable-vidix-pcidb --with-vidix-drivers=no --host-cc=gcc"
     '';
diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix
index 449190cfaa1..01a85f3d952 100644
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/pkgs/applications/video/omxplayer/default.nix
@@ -44,7 +44,7 @@ let
     enableParallelBuilding = true;
       
     crossAttrs = {
-      dontSetConfigureCross = true;
+      configurePlatforms = [];
       configureFlags = configureFlags ++ [
         "--cross-prefix=${stdenv.cross.config}-"
         "--enable-cross-compile"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 53069619ffb..70200b2fa01 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -114,7 +114,7 @@ in stdenv.mkDerivation (rec {
 
   buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ];
 
-  dontSetConfigureCross = true;
+  configurePlatforms = [];
 
   passthru = {
     inherit bootPkgs cross;
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 4e0d0971cb6..717c0092c94 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -10,6 +10,7 @@
 , targetPatches
 , targetToolchains
 , doCheck ? true
+, buildPlatform, hostPlatform
 } @ args:
 
 let
@@ -137,7 +138,8 @@ stdenv.mkDerivation {
 
   inherit doCheck;
 
-  dontSetConfigureCross = true;
+  ${if buildPlatform == hostPlatform then "dontSetConfigureCross" else null} = true;
+  ${if buildPlatform != hostPlatform then "configurePlatforms" else null} = [];
 
   # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764
   # https://github.com/rust-lang/rust/issues/30181
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index d5b2632a371..3f847bc752f 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -446,7 +446,7 @@ stdenv.mkDerivation rec {
       fi
     '';
   in {
-    dontSetConfigureCross = true;
+    configurePlatforms = [];
     configureFlags = configureFlags ++ [
       "--cross-prefix=${stdenv.cross.config}-"
       "--enable-cross-compile"
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 57ac086368f..762a4c9503f 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -187,7 +187,7 @@ stdenv.mkDerivation rec {
       fi
     '';
   in {
-    dontSetConfigureCross = true;
+    configurePlatforms = [];
     configureFlags = configureFlags ++ [
       "--cross-prefix=${stdenv.cross.config}-"
       "--enable-cross-compile"
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 6aa88a524c0..785e3599bf1 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -105,7 +105,7 @@ let
     installCheckTarget = "check"; # tests need to be run *after* installation
 
     crossAttrs = {
-      dontSetConfigureCross = true;
+      configurePlatforms = [];
       configureFlags = configureFlags ++ [
         "--cross-prefix=${stdenv.cross.config}-"
         "--enable-cross-compile"
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 7efff3412a3..09fc3a2a9da 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
     isCygwin = stdenv.cross.libc == "msvcrt";
     isDarwin = stdenv.cross.libc == "libSystem";
   in {
-    dontSetConfigureCross = true;
+    configurePlatforms = [];
     configureFlags = configureFlags ++ [
       #"--extra-cflags="
       #"--extra-cxxflags="
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index 1dafd4a124d..ceda1c26389 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -156,7 +156,7 @@ stdenv.mkDerivation rec {
     isCygwin = stdenv.cross.libc == "msvcrt";
     isDarwin = stdenv.cross.libc == "libSystem";
   in {
-    dontSetConfigureCross = true;
+    configurePlatforms = [];
     configureFlags = configureFlags ++ [
       #"--extra-cflags="
       #"--prefix="
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 18f2e7611a9..dee83306cc6 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -209,7 +209,7 @@ stdenv.mkDerivation rec {
     postInstall = ''
       cp bin/qmake* $out/bin
     '';
-    dontSetConfigureCross = true;
+    configurePlatforms = [];
     dontStrip = true;
   } // optionalAttrs isMingw {
     propagatedBuildInputs = [ ];
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 5d96299380e..dc6f0a455d8 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     dontStrip = static;
-    dontSetConfigureCross = true;
+    configurePlatforms = [];
   } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
     installFlags = [
       "BINARY_PATH=$(out)/bin"
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index fc332dff3aa..7fd283ca823 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -56,8 +56,15 @@ rec {
 
   # Return a modified stdenv that adds a cross compiler to the
   # builds.
-  makeStdenvCross = stdenvOrig: cross: cc: let
-    stdenv = stdenvOrig.override {
+  makeStdenvCross = { stdenv
+                    , cc
+                    , buildPlatform, hostPlatform, targetPlatform
+                    } @ overrideArgs: let
+    stdenv = overrideArgs.stdenv.override {
+      # TODO(@Ericson2314): Cannot do this for now because then Nix thinks the
+      # resulting derivation should be built on the host platform.
+      #hostPlatform = buildPlatform;
+      #targetPlatform = hostPlatform;
       inherit cc;
 
       allowedRequisites = null;
@@ -70,7 +77,12 @@ rec {
     mkDerivation =
       { name ? "", buildInputs ? [], nativeBuildInputs ? []
       , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
-      , selfNativeBuildInput ? false, ...
+      , configureFlags ? []
+      , # Target is not included by default because most programs don't care.
+        # Including it then would cause needless massive rebuilds.
+        configurePlatforms   ? args.crossAttrs.configurePlatforms   or [ "build" "host" ]
+      , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false
+      , ...
       } @ args:
 
       let
@@ -93,16 +105,23 @@ rec {
         nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull;
       in
         stdenv.mkDerivation (args // {
-          name = name + "-" + cross.config;
+          name = name + "-" + hostPlatform.config;
           nativeBuildInputs = nativeBuildInputs
             ++ nativeInputsFromBuildInputs
             ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
               # without proper `file` command, libtool sometimes fails
               # to recognize 64-bit DLLs
-            ++ stdenv.lib.optional (cross.config  == "x86_64-w64-mingw32") pkgs.file
-            ++ stdenv.lib.optional (cross.config  == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook
+            ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file
+            ++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook
             ;
 
+          # This parameter is sometimes a string and sometimes a list, yuck
+          configureFlags = let inherit (stdenv.lib) optional elem; in
+            (if stdenv.lib.isString configureFlags then [configureFlags] else configureFlags)
+            ++ optional (elem "build"  configurePlatforms) "--build=${buildPlatform.config}"
+            ++ optional (elem "host"   configurePlatforms) "--host=${hostPlatform.config}"
+            ++ optional (elem "target" configurePlatforms) "--target=${targetPlatform.config}";
+
           # Cross-linking dynamic libraries, every buildInput should
           # be propagated because ld needs the -rpath-link to find
           # any library needed to link the program dynamically at
@@ -111,7 +130,7 @@ rec {
           propagatedBuildInputs = propagatedBuildInputs ++ buildInputs;
           propagatedNativeBuildInputs = propagatedNativeBuildInputs;
 
-          crossConfig = cross.config;
+          crossConfig = hostPlatform.config;
         } // args.crossAttrs or {});
   };
 
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index f9c23078cd3..125c4300975 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -31,12 +31,15 @@ in bootStages ++ [
     targetPlatform = crossSystem;
     inherit config overlays;
     selfBuild = false;
-    stdenv = buildPackages.makeStdenvCross
-      buildPackages.stdenv
-      crossSystem
-      (if crossSystem.useiOSCross or false
-       then buildPackages.darwin.ios-cross
-       else buildPackages.gccCrossStageFinal);
+    stdenv = buildPackages.makeStdenvCross {
+      inherit (buildPackages) stdenv;
+      buildPlatform = localSystem;
+      hostPlatform = crossSystem;
+      targetPlatform = crossSystem;
+      cc = if crossSystem.useiOSCross or false
+           then buildPackages.darwin.ios-cross
+           else buildPackages.gccCrossStageFinal;
+    };
   })
 
 ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b499b623a8c..c201715dfef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7802,10 +7802,11 @@ with pkgs;
     installLocales = config.glibc.locales or false;
     # Can't just overrideCC, because then the stdenv-cross mkDerivation will be
     # thrown away. TODO: find a better solution for this.
-    stdenv = buildPackages.makeStdenvCross
-      buildPackages.buildPackages.stdenv
-      buildPackages.targetPlatform
-      buildPackages.gccCrossStageStatic;
+    stdenv = buildPackages.makeStdenvCross {
+      inherit (buildPackages.buildPackages) stdenv;
+      inherit buildPlatform hostPlatform targetPlatform;
+      cc = buildPackages.gccCrossStageStatic;
+    };
   };
 
   # We can choose:
-- 
GitLab


From e0492d58a68a825924493d381bcc52a20177e5ef Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 3 Jun 2017 13:32:15 -0400
Subject: [PATCH 1102/1490] cross stdenv adaptor: Disable checkPhase by default

Before gcc-cross-wrapper did this unconditionally
---
 pkgs/stdenv/adapters.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 7fd283ca823..7515a72fcfd 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -77,6 +77,9 @@ rec {
     mkDerivation =
       { name ? "", buildInputs ? [], nativeBuildInputs ? []
       , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
+      , # Disabling the tests by default when cross compiling, as usually the
+        # tests rely on being able to run produced binaries.
+        doCheck ? false
       , configureFlags ? []
       , # Target is not included by default because most programs don't care.
         # Including it then would cause needless massive rebuilds.
@@ -115,6 +118,8 @@ rec {
             ++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook
             ;
 
+          inherit doCheck;
+
           # This parameter is sometimes a string and sometimes a list, yuck
           configureFlags = let inherit (stdenv.lib) optional elem; in
             (if stdenv.lib.isString configureFlags then [configureFlags] else configureFlags)
-- 
GitLab


From c1fb71b74a15eba29c01ce8b2aa514310c437992 Mon Sep 17 00:00:00 2001
From: Ross MacLeod <rmm-github@z.odi.ac>
Date: Tue, 30 May 2017 23:31:44 -0400
Subject: [PATCH 1103/1490] cc-wrapper: when cross building, wedge in setting
 AR, AS, and LD env vars to their cross building versions

I think it's ok to export things which aren't wrapped. The cc-wrapper
can be thought of as responsible for all of binutils and the c
compiler, only wrapping those binaries which are necessary to
interposition---as opposed to all binaries it thinks are relevaant.

Conversely, adding the setup hook to the unwrapped compilers would be
unforunate as hooks are ugly hacks and the compilers themselves take
a long time to rebuild. Better to wholely separate "pure packages" from
hacks.
---
 pkgs/build-support/cc-wrapper/default.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 77c0cfd63a7..83326777326 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -61,14 +61,28 @@ let
     # TODO: use @target_tripple@ for consistency
     if targetPlatform == hostPlatform
     then textFile
-    else runCommand "sed-nix-env-vars" {} ''
-      cp ${textFile} $out
+    else runCommand "sed-nix-env-vars" {} (''
+      cp --no-preserve=mode ${textFile} $out
 
       sed -i $out \
         -e 's^NIX_^NIX_${infixSalt_}^g' \
         -e 's^addCVars^addCVars${_infixSalt}^g' \
         -e 's^\[ -z "\$crossConfig" \]^\[\[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" \]\]^g'
 
+    '' + stdenv.lib.optionalString (textFile == ./setup-hook.sh) ''
+      cat << 'EOF' >> $out
+        for CMD in ar as nm objcopy ranlib strip strings size ld
+        do
+          # which is not part of stdenv, but compgen will do for now
+          if
+            PATH=$_PATH type -p ${prefix}$CMD > /dev/null
+          then
+            export ''$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=${prefix}''${CMD};
+          fi
+        done
+      EOF
+    '' + ''
+
       # NIX_ things which we don't both use and define, we revert them
       #asymmetric=$(
       #  for pre in "" "\\$"
@@ -85,7 +99,7 @@ let
       do
         sed -i $out -E -e "s~NIX_${infixSalt_}$var([^a-zA-Z_]|$)~NIX_$var\1~g"
       done
-    '';
+    '');
 in
 
 stdenv.mkDerivation {
-- 
GitLab


From 0aee847858631b2b5aaef54714b598ce78b31b20 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 2 Jun 2017 13:31:11 -0400
Subject: [PATCH 1104/1490] cc-wrapper: Make the cross compiler use a
 crossEnvHook

This is a hack until stdenv's setup.hs gets overhauled
---
 pkgs/build-support/cc-wrapper/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 83326777326..3a155b26319 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -81,6 +81,8 @@ let
           fi
         done
       EOF
+
+      sed -i $out -e 's_envHooks_crossEnvHooks_g'
     '' + ''
 
       # NIX_ things which we don't both use and define, we revert them
-- 
GitLab


From c2e2152afc513fa4eda51b96dc5c7f349c3497da Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 19 Jun 2017 11:10:27 -0400
Subject: [PATCH 1105/1490] cc-wrapper: Port over finding of dynamic linker
 from gcc-cross-wrapper

At the next break, we can deduplicate and go for the best of both
worlds.
---
 pkgs/build-support/cc-wrapper/default.nix | 60 +++++++++++++++--------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 3a155b26319..35a5e90583b 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -102,6 +102,24 @@ let
         sed -i $out -E -e "s~NIX_${infixSalt_}$var([^a-zA-Z_]|$)~NIX_$var\1~g"
       done
     '');
+
+  # The dynamic linker has different names on different platforms.
+  dynamicLinker =
+    if !nativeLibc then
+      (if targetPlatform.system == "i686-linux"     then "ld-linux.so.2" else
+       if targetPlatform.system == "x86_64-linux"   then "ld-linux-x86-64.so.2" else
+       # ARM with a wildcard, which can be "" or "-armhf".
+       if targetPlatform.isArm32                    then "ld-linux*.so.3" else
+       if targetPlatform.system == "aarch64-linux"  then "ld-linux-aarch64.so.1" else
+       if targetPlatform.system == "powerpc-linux"  then "ld.so.1" else
+       if targetPlatform.system == "mips64el-linux" then "ld.so.1" else
+       if targetPlatform.system == "x86_64-darwin"  then "/usr/lib/dyld" else
+       if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else
+       builtins.trace
+         "Don't know the name of the dynamic linker for platform ${targetPlatform.config}, so guessing instead."
+         null)
+    else "";
+
 in
 
 stdenv.mkDerivation {
@@ -144,7 +162,12 @@ stdenv.mkDerivation {
       }
     ''
 
-    + optionalString (libc != null) (if (!targetPlatform.isDarwin) then ''
+      # TODO(@Ericson2314): Unify logic next hash break
+    + optionalString (libc != null) (if (targetPlatform.isDarwin) then ''
+      echo $dynamicLinker > $out/nix-support/dynamic-linker
+
+      echo "export LD_DYLD_PATH=\"$dynamicLinker\"" >> $out/nix-support/setup-hook
+    '' else if dynamicLinker != null then ''
       dynamicLinker="${libc_lib}/lib/$dynamicLinker"
       echo $dynamicLinker > $out/nix-support/dynamic-linker
 
@@ -157,9 +180,21 @@ stdenv.mkDerivation {
       # (the *last* value counts, so ours should come first).
       echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before
     '' else ''
-      echo $dynamicLinker > $out/nix-support/dynamic-linker
+      dynamicLinker=`eval 'echo $libc/lib/ld*.so.?'`
+      if [ -n "$dynamicLinker" ]; then
+        echo $dynamicLinker > $out/nix-support/dynamic-linker
 
-      echo "export LD_DYLD_PATH=\"$dynamicLinker\"" >> $out/nix-support/setup-hook
+        if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
+          echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
+        fi
+
+        ldflagsBefore="-dynamic-linker $dlinker"
+      fi
+
+      # The dynamic linker is passed in `ldflagsBefore' to allow
+      # explicit overrides of the dynamic linker by callers to gcc/ld
+      # (the *last* value counts, so ours should come first).
+      echo "$ldflagsBefore" > $out/nix-support/libc-ldflags-before
     '')
 
     + optionalString (libc != null) ''
@@ -331,24 +366,7 @@ stdenv.mkDerivation {
     ''
     + extraBuildCommands;
 
-  # The dynamic linker has different names on different Linux platforms.
-  #
-  # TODO(1b62c9c06173f4d5e6b090e5ae0c68fa5f478faf): This is not the best way to
-  # do this. I think the reference should be the style in the gcc-cross-wrapper,
-  # but to keep a stable stdenv now I do this sufficient if/else.
-  dynamicLinker =
-    if !nativeLibc then
-      (if targetPlatform.system == "i686-linux"     then "ld-linux.so.2" else
-       if targetPlatform.system == "x86_64-linux"   then "ld-linux-x86-64.so.2" else
-       # ARM with a wildcard, which can be "" or "-armhf".
-       if targetPlatform.isArm32                    then "ld-linux*.so.3" else
-       if targetPlatform.system == "aarch64-linux"  then "ld-linux-aarch64.so.1" else
-       if targetPlatform.system == "powerpc-linux"  then "ld.so.1" else
-       if targetPlatform.system == "mips64el-linux" then "ld.so.1" else
-       if targetPlatform.system == "x86_64-darwin"  then "/usr/lib/dyld" else
-       if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else
-       abort "Don't know the name of the dynamic linker for this platform.")
-    else "";
+  inherit dynamicLinker;
 
   crossAttrs = {
     shell = shell.crossDrv + shell.crossDrv.shellPath;
-- 
GitLab


From bb7067f882bf3c53ea68780a8ec0a7117f563253 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 19 Jun 2017 11:51:01 -0400
Subject: [PATCH 1106/1490] mingw-w64: Clean up, especially clarifying staging

---
 pkgs/os-specific/windows/mingw-w64/common.nix | 11 ++++++
 .../os-specific/windows/mingw-w64/default.nix | 38 ++-----------------
 .../os-specific/windows/mingw-w64/headers.nix | 13 +++++++
 .../windows/mingw-w64/pthreads.nix            | 13 +++++++
 pkgs/top-level/all-packages.nix               | 31 +++++++--------
 5 files changed, 55 insertions(+), 51 deletions(-)
 create mode 100644 pkgs/os-specific/windows/mingw-w64/common.nix
 create mode 100644 pkgs/os-specific/windows/mingw-w64/headers.nix
 create mode 100644 pkgs/os-specific/windows/mingw-w64/pthreads.nix

diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix
new file mode 100644
index 00000000000..ece2586dc80
--- /dev/null
+++ b/pkgs/os-specific/windows/mingw-w64/common.nix
@@ -0,0 +1,11 @@
+{ fetchurl }:
+
+rec {
+  version = "4.0.6";
+  name = "mingw-w64-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
+    sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
+  };
+}
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index 49612b0b461..697e0353182 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -1,36 +1,6 @@
-{ stdenv, fetchurl, binutils ? null, gccCross ? null
-, onlyHeaders ? false
-, onlyPthreads ? false
-}:
-
-let
-  version = "4.0.6";
-  name = "mingw-w64-${version}";
-in
-stdenv.mkDerivation ({
-  inherit name;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
-    sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
-  };
-} //
-(if onlyHeaders then {
-  name = name + "-headers";
-  preConfigure = ''
-    cd mingw-w64-headers
-  '';
-  configureFlags = "--without-crt";
-} else if onlyPthreads then {
-  name = name + "-pthreads";
-  preConfigure = ''
-    cd mingw-w64-libraries/winpthreads
-  '';
-} else {
-  buildInputs = [ gccCross binutils ];
-
-  crossConfig = gccCross.crossConfig;
+{ stdenv, callPackage }:
 
+stdenv.mkDerivation {
+  inherit (callPackage ./common.nix {}) name src;
   dontStrip = true;
-})
-)
+}
diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix
new file mode 100644
index 00000000000..03dbf712e2e
--- /dev/null
+++ b/pkgs/os-specific/windows/mingw-w64/headers.nix
@@ -0,0 +1,13 @@
+{ stdenvNoCC, callPackage }:
+
+let
+  inherit (callPackage ./common.nix {}) name src;
+
+in stdenvNoCC.mkDerivation {
+  name = name + "-headers";
+  inherit src;
+
+  preConfigure = ''
+    cd mingw-w64-headers
+  '';
+}
diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix
new file mode 100644
index 00000000000..c585ab54ff8
--- /dev/null
+++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix
@@ -0,0 +1,13 @@
+{ stdenvNoCC, callPackage }:
+
+let
+  inherit (callPackage ./common.nix {}) name src;
+
+in stdenvNoCC.mkDerivation {
+  name = name + "-pthreads";
+  inherit src;
+
+  preConfigure = ''
+    cd mingw-w64-libraries/winpthreads
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c201715dfef..882a308d285 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5163,9 +5163,17 @@ with pkgs;
 
   gccApple = throw "gccApple is no longer supported";
 
+  # Can't just overrideCC, because then the stdenv-cross mkDerivation will be
+  # thrown away. TODO: find a better solution for this.
+  crossLibcStdenv = buildPackages.makeStdenvCross {
+    inherit (buildPackages.buildPackages) stdenv;
+    inherit buildPlatform hostPlatform targetPlatform;
+    cc = buildPackages.gccCrossStageStatic;
+  };
+
   gccCrossStageStatic = assert targetPlatform != buildPlatform; let
     libcCross1 =
-      if targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers
+      if targetPlatform.libc == "msvcrt" then __targetPackages.windows.mingw_w64_headers
       else if targetPlatform.libc == "libSystem" then darwin.xcode
       else null;
     in wrapCCCross {
@@ -7800,13 +7808,7 @@ with pkgs;
   # Being redundant to avoid cycles on boot. TODO: find a better way
   glibcCross = callPackage ../development/libraries/glibc {
     installLocales = config.glibc.locales or false;
-    # Can't just overrideCC, because then the stdenv-cross mkDerivation will be
-    # thrown away. TODO: find a better solution for this.
-    stdenv = buildPackages.makeStdenvCross {
-      inherit (buildPackages.buildPackages) stdenv;
-      inherit buildPlatform hostPlatform targetPlatform;
-      cc = buildPackages.gccCrossStageStatic;
-    };
+    stdenv = crossLibcStdenv;
   };
 
   # We can choose:
@@ -7815,7 +7817,7 @@ with pkgs;
     # hack fixes the hack, *sigh*.
     /**/ if name == "glibc" then __targetPackages.glibcCross or glibcCross
     else if name == "uclibc" then uclibcCross
-    else if name == "msvcrt" then windows.mingw_w64
+    else if name == "msvcrt" then __targetPackages.windows.mingw_w64 or windows.mingw_w64
     else if name == "libSystem" then darwin.xcode
     else throw "Unknown libc";
 
@@ -12561,17 +12563,12 @@ with pkgs;
     };
 
     mingw_w64 = callPackage ../os-specific/windows/mingw-w64 {
-      gccCross = gccCrossStageStatic;
-      binutils = binutils;
+      stdenv = crossLibcStdenv;
     };
 
-    mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64 {
-      onlyHeaders = true;
-    };
+    mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64/headers.nix { };
 
-    mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64 {
-      onlyPthreads = true;
-    };
+    mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64/pthreads.nix { };
 
     pthreads = callPackage ../os-specific/windows/pthread-w32 {
       mingw_headers = mingw_headers3;
-- 
GitLab


From fc42ec0a5cf9962a6af9c2da39ff748b30299b67 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 19 Jun 2017 15:30:17 -0400
Subject: [PATCH 1107/1490] mingw-w64: Depend on own headers derivation

Without this, a `#include <float.h>` resolves incorrectly. Either the
headers weren't on the include path at all, or they only were for
local, not system, imports.

What's weird is this used to not be a problem. Not sure what other
change in e.g. cc-wrapper would affect this.
---
 pkgs/os-specific/windows/mingw-w64/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index 697e0353182..6e21826381b 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, callPackage }:
+{ stdenv, callPackage, windows }:
 
 stdenv.mkDerivation {
   inherit (callPackage ./common.nix {}) name src;
+  buildInputs = [ windows.mingw_w64_headers ];
   dontStrip = true;
 }
-- 
GitLab


From f55ccbb60fb1022ce9d27595fc8200dd1d0da6db Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 24 Apr 2017 10:41:33 -0400
Subject: [PATCH 1108/1490] xbursttools: Fix eval at least so tests pass

---
 pkgs/tools/misc/xburst-tools/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix          | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index 408879a4534..c64ae609bcb 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig
-, gccCross ? null }:
+, gccCross ? null, crossPrefix
+}:
 
 let
   version = "2011-12-26";
@@ -18,7 +19,7 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = if gccCross != null then
-    "--enable-firmware CROSS_COMPILE=${gccCross.crossConfig}-"
+    "--enable-firmware CROSS_COMPILE=${crossPrefix}-"
     else "";
 
   # Not to strip cross build binaries (this is for the gcc-cross-wrapper)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 882a308d285..05fe28236b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4816,15 +4816,16 @@ with pkgs;
 
   x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
 
-  xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools {
+  xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec {
     # It needs a cross compiler for mipsel to build the firmware it will
     # load into the Ben Nanonote
+    crossPrefix = "mipsel-unknown-linux";
     gccCross =
       let
         pkgsCross = nixpkgsFun {
           # Ben Nanonote system
           crossSystem = {
-            config = "mipsel-unknown-linux";
+            config = crossPrefix;
             bigEndian = true;
             arch = "mips";
             float = "soft";
@@ -4843,7 +4844,7 @@ with pkgs;
           };
         };
       in
-        pkgsCross.gccCrossStageStatic;
+        pkgsCross.buildPackages.gccCrossStageStatic;
   };
 
   xclip = callPackage ../tools/misc/xclip { };
-- 
GitLab


From 29c4d7f505c39930f0d457c9ba4570d6a768f67c Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 30 May 2017 20:08:00 -0400
Subject: [PATCH 1109/1490] podofo: Simplify derivation

Bunch of junk for linux and cross compilation that's no longer needed
---
 pkgs/development/libraries/podofo/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index 1ba82354033..fde5c5e489c 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
-, gcc5, openssl, libpng, lua5, pkgconfig, libidn, expat }:
+, openssl, libpng, lua5, pkgconfig, libidn, expat
+}:
 
 stdenv.mkDerivation rec {
   name = "podofo-0.9.5";
@@ -11,17 +12,9 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
 
-  # Does Linux really need gcc5? Darwin doesn't seem to...
-  nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5;
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  # Does Linux really need libc here? Darwin doesn't seem to...
-  buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;
-
-  crossAttrs = {
-    propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv
-      libtiff.crossDrv fontconfig.crossDrv openssl.crossDrv libpng.crossDrv
-      lua5.crossDrv stdenv.ccCross.libc ];
-  };
+  buildInputs = [ lua5 ];
 
   cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
 
-- 
GitLab


From d016637629e16548a98c9c570136d8ba60e8c9cd Mon Sep 17 00:00:00 2001
From: Ross MacLeod <rmm-github@z.odi.ac>
Date: Mon, 12 Jun 2017 00:29:51 +0000
Subject: [PATCH 1110/1490] podofo: unsimplify derivation a bit to avoid hash
 breakage

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

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index fde5c5e489c..84709441b5e 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
 , openssl, libpng, lua5, pkgconfig, libidn, expat
+, gcc5 # TODO(@Dridus) remove this at next hash break
 }:
 
 stdenv.mkDerivation rec {
@@ -12,9 +13,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  # TODO(@Dridus) remove the ++ ghc5 at next hash break
+  nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5;
 
-  buildInputs = [ lua5 ];
+  # TODO(@Dridus) remove the ++ libc at next hash break
+  buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc;
 
   cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
 
-- 
GitLab


From 12795a706852539b8a29c796caced6295e7af459 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 30 May 2017 20:17:10 -0400
Subject: [PATCH 1111/1490] misc: Remove almost all uses of
 stdenv.{ccCross,binutils}

---
 pkgs/build-support/cc-wrapper/default.nix        |  1 -
 pkgs/build-support/gcc-wrapper-old/default.nix   |  1 -
 pkgs/development/compilers/gcc/4.5/default.nix   |  2 +-
 pkgs/development/compilers/gcc/4.8/default.nix   |  2 +-
 pkgs/development/compilers/gcc/4.9/default.nix   |  2 +-
 pkgs/development/compilers/gcc/5/default.nix     |  2 +-
 pkgs/development/compilers/gcc/6/default.nix     |  2 +-
 .../compilers/gcc/snapshot/default.nix           |  2 +-
 pkgs/development/compilers/ghc/head.nix          | 16 ++++++++--------
 9 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 35a5e90583b..0c624a1454a 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -370,7 +370,6 @@ stdenv.mkDerivation {
 
   crossAttrs = {
     shell = shell.crossDrv + shell.crossDrv.shellPath;
-    libc = stdenv.ccCross.libc;
   };
 
   meta =
diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix
index a87c726e0a8..f8a7c62edc7 100644
--- a/pkgs/build-support/gcc-wrapper-old/default.nix
+++ b/pkgs/build-support/gcc-wrapper-old/default.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation {
 
   crossAttrs = {
     shell = shell.crossDrv + shell.crossDrv.shellPath;
-    libc = stdenv.ccCross.libc;
     coreutils = coreutils.crossDrv;
     binutils = binutils.crossDrv;
     gcc = gcc.crossDrv;
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 67981ad1056..69197b923c3 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -283,7 +283,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc;
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index de9d3165b55..38ff23f86a6 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -401,7 +401,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc;
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index c5bebdf3300..04e67e44f77 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -407,7 +407,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc;
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index b4a74300d36..d4692c77751 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -422,7 +422,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc;
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 057acf9794e..c439703fa8e 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -404,7 +404,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc;
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index bb2c9d8a5c0..f3d8d27d90c 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -405,7 +405,7 @@ stdenv.mkDerivation ({
     NM_FOR_TARGET = "${targetPlatform.config}-nm";
     CXX_FOR_TARGET = "${targetPlatform.config}-g++";
     # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc;
     dontStrip = true;
     configureFlags = ''
       ${if enableMultilib then "" else "--disable-multilib"}
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 70200b2fa01..f199048353c 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -101,26 +101,26 @@ in stdenv.mkDerivation (rec {
   '';
 
   configureFlags = [
-    "CC=${stdenv.ccCross}/bin/${cross.config}-cc"
-    "LD=${stdenv.binutils}/bin/${cross.config}-ld"
-    "AR=${stdenv.binutils}/bin/${cross.config}-ar"
-    "NM=${stdenv.binutils}/bin/${cross.config}-nm"
-    "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib"
+    "CC=${stdenv.cc}/bin/${cross.config}-cc"
+    "LD=${stdenv.cc}/bin/${cross.config}-ld"
+    "AR=${stdenv.cc}/bin/${cross.config}-ar"
+    "NM=${stdenv.cc}/bin/${cross.config}-nm"
+    "RANLIB=${stdenv.cc}/bin/${cross.config}-ranlib"
     "--target=${cross.config}"
     "--enable-bootstrap-with-devel-snapshot"
   ] ++
     # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
     lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space";
 
-  buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ];
+  buildInputs = commonBuildInputs;
 
   configurePlatforms = [];
 
   passthru = {
     inherit bootPkgs cross;
 
-    cc = "${stdenv.ccCross}/bin/${cross.config}-cc";
+    cc = "${stdenv.cc}/bin/${cross.config}-cc";
 
-    ld = "${stdenv.binutils}/bin/${cross.config}-ld";
+    ld = "${stdenv.cc}/bin/${cross.config}-ld";
   };
 })
-- 
GitLab


From 38b2bd2f2853da7021e0efe001e7ec0a313afe44 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 30 May 2017 20:44:03 -0400
Subject: [PATCH 1112/1490] dropbear: Remove now-unneeded crossAttrs

---
 pkgs/tools/networking/dropbear/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index aeace91df19..a918aa6375f 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -22,13 +22,6 @@ stdenv.mkDerivation rec {
     makeFlags=VPATH=`cat $NIX_CC/nix-support/orig-libc`/lib
   '';
 
-  crossAttrs = {
-    # This works for uclibc, at least.
-    preConfigure = ''
-      makeFlags=VPATH=`cat ${stdenv.ccCross}/nix-support/orig-libc`/lib
-    '';
-  };
-
   patches = [
     # Allow sessions to inherit the PATH from the parent dropbear.
     # Otherwise they only get the usual /bin:/usr/bin kind of PATH
-- 
GitLab


From f63f96ae355281bf89ea08f5c5af3b939878df5f Mon Sep 17 00:00:00 2001
From: Ross MacLeod <rmm-github@z.odi.ac>
Date: Tue, 30 May 2017 22:20:15 -0400
Subject: [PATCH 1113/1490] zlib: don't really override CC at ay point

but leave the preConfigure script as it was when not cross building in order to avoid hash breakage
---
 pkgs/development/libraries/zlib/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index dc6f0a455d8..e6468771cd4 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, static ? false }:
+{ stdenv
+, fetchurl
+, buildPlatform, hostPlatform
+, static ? false
+}:
 
 let version = "1.2.11"; in
 
@@ -24,7 +28,9 @@ stdenv.mkDerivation rec {
   setOutputFlags = false;
   outputDoc = "dev"; # single tiny man3 page
 
-  preConfigure = ''
+  # TODO(@Dridus) CC set by cc-wrapper setup-hook, so just empty out the preConfigure script when cross building, but leave the old incorrect script when not
+  # cross building to avoid hash breakage. Once hash breakage is acceptable, remove preConfigure entirely.
+  preConfigure = stdenv.lib.optionalString (hostPlatform == buildPlatform) ''
     if test -n "$crossConfig"; then
       export CC=$crossConfig-gcc
     fi
-- 
GitLab


From 167b80ba76ae767b1d37458afb113683921d8c74 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Jun 2017 22:18:22 -0400
Subject: [PATCH 1114/1490] coreutils: Modernize and fix for cross

"--host=..." needs to be passed but crossAttrs overrides that.
---
 pkgs/tools/misc/coreutils/default.nix | 76 +++++++++++++--------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index d87976cbc5e..71fc791872f 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,8 +1,9 @@
-{ lib, stdenv, buildPackages, fetchurl, perl, xz, gmp ? null
+{ stdenv, lib, buildPackages
+, autoconf, automake114x, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
+, hostPlatform, buildPlatform
 , aclSupport ? false, acl ? null
 , attrSupport ? false, attr ? null
 , selinuxSupport? false, libselinux ? null, libsepol ? null
-, autoconf, automake114x, texinfo
 , withPrefix ? false
 , singleBinary ? "symlinks" # you can also pass "shebangs" or false
 }:
@@ -23,10 +24,10 @@ stdenv.mkDerivation rec {
   # FIXME needs gcc 4.9 in bootstrap tools
   hardeningDisable = [ "stackprotector" ];
 
-  patches = optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch;
+  patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
 
   # The test tends to fail on btrfs and maybe other unusual filesystems.
-  postPatch = optionalString (!stdenv.isDarwin) ''
+  postPatch = optionalString (!hostPlatform.isDarwin) ''
     sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
     sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
     sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
@@ -39,58 +40,54 @@ stdenv.mkDerivation rec {
   configureFlags =
     optional (singleBinary != false)
       ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}")
-    ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no"
-    ++ optional withPrefix "--program-prefix=g";
+    ++ optional hostPlatform.isSunOS "ac_cv_func_inotify_init=no"
+    ++ optional withPrefix "--program-prefix=g"
+    ++ optionals (hostPlatform != buildPlatform && hostPlatform.libc == "glibc") [
+      # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I
+      # don't know why it is not properly detected cross building with glibc.
+      "fu_cv_sys_stat_statfs2_bsize=yes"
+    ];
+
 
   buildInputs = [ gmp ]
     ++ optional aclSupport acl
     ++ optional attrSupport attr
-    ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ]   # due to patch
-    ++ optionals selinuxSupport [ libselinux libsepol ];
-
-  crossAttrs = {
-    buildInputs = [ gmp.crossDrv ]
-      ++ optional aclSupport acl.crossDrv
-      ++ optional attrSupport attr.crossDrv
-      ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ]
-      ++ optional (stdenv ? ccCross.libc.libiconv)
-        stdenv.ccCross.libc.libiconv.crossDrv;
-
-    # Prevents attempts of running 'help2man' on cross-built binaries.
-    PERL = "missing";
-
-    # Works around a bug with 8.26:
-    # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.
-    preInstall = ''
-      sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|'
-    '';
-
-    postInstall = ''
-      rm $out/share/man/man1/*
-      cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1
-    '';
-
-    # Needed for fstatfs()
-    # I don't know why it is not properly detected cross building with glibc.
-    configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ];
-    doCheck = false;
-  };
+    ++ optionals hostPlatform.isCygwin [ autoconf automake114x texinfo ]   # due to patch
+    ++ optionals selinuxSupport [ libselinux libsepol ]
+       # TODO(@Ericson2314): Investigate whether Darwin could benefit too
+    ++ optional (hostPlatform != buildPlatform && hostPlatform.libc != "glibc") libiconv;
 
   # The tests are known broken on Cygwin
   # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
   # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
   # and {Open,Free}BSD.
   # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
-  doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store";
+  doCheck = hostPlatform == buildPlatform
+    && hostPlatform.libc == "glibc"
+    && builtins.storeDir == "/nix/store";
+
+  # Prevents attempts of running 'help2man' on cross-built binaries.
+  ${if hostPlatform == buildPlatform then null else "PERL"} = "missing";
 
   # Saw random failures like ‘help2man: can't get '--help' info from
   # man/sha512sum.td/sha512sum’.
   enableParallelBuilding = false;
 
   NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
-  FORCE_UNSAFE_CONFIGURE = optionalString stdenv.isSunOS "1";
+  FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1";
+
+  makeFlags = optionalString hostPlatform.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
+
+  # Works around a bug with 8.26:
+  # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.
+  ${if hostPlatform == buildPlatform then null else "preInstall"} = ''
+    sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|'
+  '';
 
-  makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
+  ${if hostPlatform == buildPlatform then null else "postInstall"} = ''
+    rm $out/share/man/man1/*
+    cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1
+  '';
 
   meta = {
     homepage = http://www.gnu.org/software/coreutils/;
@@ -109,4 +106,5 @@ stdenv.mkDerivation rec {
 
     maintainers = [ maintainers.eelco ];
   };
+
 }
-- 
GitLab


From 8b22e497f2bbffca98dc73502b1873595fb36ea9 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 31 May 2017 00:53:47 -0400
Subject: [PATCH 1115/1490] vim: Modernize derivation, hopefully fixing cross

---
 pkgs/applications/editors/vim/default.nix | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 98e9a47a760..b8fee7bd1e2 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -6,7 +6,9 @@
     sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
   }
 # apple frameworks
-, Carbon, Cocoa }:
+, Carbon, Cocoa
+, buildPlatform, hostPlatform
+}:
 
 let
   common = callPackage ./common.nix {};
@@ -17,12 +19,26 @@ stdenv.mkDerivation rec {
   inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
 
   buildInputs = [ ncurses pkgconfig ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
+    ++ stdenv.lib.optionals hostPlatform.isDarwin [ Carbon Cocoa ];
   nativeBuildInputs = [ gettext ];
 
   configureFlags = [
     "--enable-multibyte"
     "--enable-nls"
+  ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
+    "vim_cv_toupper_broken=no"
+    "--with-tlib=ncurses"
+    "vim_cv_terminfo=yes"
+    "vim_cv_tty_group=tty"
+    "vim_cv_tty_mode=0660"
+    "vim_cv_getcwd_broken=no"
+    "vim_cv_stat_ignores_slash=yes"
+    "ac_cv_sizeof_int=4"
+    "vim_cv_memmove_handles_overlap=yes"
+    "vim_cv_memmove_handles_overlap=yes"
+
+    # TODO(@Ericson2314): wont' be needed soon.
+    "STRIP=${hostPlatform.config}-strip"
   ];
 
   postInstall = ''
@@ -31,22 +47,6 @@ stdenv.mkDerivation rec {
     cp "${vimrc}" $out/share/vim/vimrc
   '';
 
-  crossAttrs = {
-    configureFlags = [
-      "vim_cv_toupper_broken=no"
-      "--with-tlib=ncurses"
-      "vim_cv_terminfo=yes"
-      "vim_cv_tty_group=tty"
-      "vim_cv_tty_mode=0660"
-      "vim_cv_getcwd_broken=no"
-      "vim_cv_stat_ignores_slash=yes"
-      "ac_cv_sizeof_int=4"
-      "vim_cv_memmove_handles_overlap=yes"
-      "vim_cv_memmove_handles_overlap=yes"
-      "STRIP=${stdenv.cross.config}-strip"
-    ];
-  };
-
   __impureHostDeps = [ "/dev/ptmx" ];
 
   # To fix the trouble in vim73, that it cannot cross-build with this patch
-- 
GitLab


From 05b3c87d9d9df6a8eac118f6d243f5a94649d66a Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 2 Jun 2017 17:35:13 -0400
Subject: [PATCH 1116/1490] busybox: Modernize and fix cross

---
 pkgs/os-specific/linux/busybox/default.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 4956f13950d..e1ea8fa8fdd 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, lib, fetchurl, glibc, musl
+{ stdenv, lib, buildPackages, fetchurl
 , enableStatic ? false
 , enableMinimal ? false
-, useMusl ? false
+, useMusl ? false, musl
 , extraConfig ? ""
+, buildPlatform, hostPlatform
 }:
 
 let
@@ -71,20 +72,16 @@ stdenv.mkDerivation rec {
   '';
 
   postConfigure = lib.optionalString useMusl ''
-    makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
+    makeFlagsArray+=("CC=${stdenv.cc.prefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib")
   '';
 
-  buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ];
+  nativeBuildInputs = lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
 
-  crossAttrs = {
-    extraCrossConfig = ''
-      CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-"
-    '';
+  buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ];
 
-    postConfigure = stdenv.lib.optionalString useMusl ''
-      makeFlagsArray+=("CC=$crossConfig-gcc -isystem ${musl.crossDrv}/include -B${musl.crossDrv}/lib -L${musl.crossDrv}/lib")
-    '';
-  };
+  extraCrossConfig = if hostPlatform == buildPlatform then null else ''
+    CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.prefix}"
+  '';
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 7bdacad8b39568611e84da5aa3b37e4e70641012 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 3 Jun 2017 11:21:03 -0400
Subject: [PATCH 1117/1490] ed: Modernize and fix for cross

---
 pkgs/applications/editors/ed/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index ec56667a4ba..053e1d22af3 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchurl
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "ed-${version}";
@@ -28,11 +30,12 @@ stdenv.mkDerivation rec {
        make: *** [check] Error 127
 
     */
-  doCheck = !stdenv.isDarwin;
+  doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
 
-  crossAttrs = {
-    compileFlags = [ "CC=${stdenv.cross.config}-gcc" ];
-  };
+  configureFlags = if hostPlatform == buildPlatform then null else [
+    "--exec-prefix=${stdenv.cc.prefix}"
+    "CC=${stdenv.cc.prefix}cc"
+  ];
 
   meta = {
     description = "An implementation of the standard Unix editor";
-- 
GitLab


From ef0b07e94a2fa745d731b0308dbc175be58d0184 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 3 Jun 2017 11:27:33 -0400
Subject: [PATCH 1118/1490] gnu patch: Fix for cross

---
 pkgs/tools/text/gnupatch/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index adbd69154ec..57543eb303b 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, ed }:
+{ stdenv, fetchurl
+, ed
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "patch-2.7.5";
@@ -10,11 +13,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional doCheck ed;
 
-  crossAttrs = {
-    configureFlags = [ "ac_cv_func_strnlen_working=yes" ];
-  };
+  configureFlags = if hostPlatform == buildPlatform then null else [
+    "ac_cv_func_strnlen_working=yes"
+  ];
 
-  doCheck = true;
+  doCheck = hostPlatform == buildPlatform;
 
   meta = {
     description = "GNU Patch, a program to apply differences to files";
-- 
GitLab


From f75ad79375d3596d6402af881454ba8c5260b866 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Thu, 1 Jun 2017 12:24:16 -0400
Subject: [PATCH 1119/1490] bash: Modernize derivation, hopefully fixing cross
 compilation

---
 pkgs/shells/bash/4.4.nix | 42 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 061f183e96e..e2defc2bf37 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchurl, readline70 ? null, interactive ? false, texinfo ? null
-, binutils ? null, bison
+{ stdenv, buildPackages
+, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison
+, buildPlatform, hostPlatform
+, interactive ? false
 }:
 
 assert interactive -> readline70 != null;
-assert stdenv.isDarwin -> binutils != null;
+assert hostPlatform.isDarwin -> binutils != null;
 
 let
   version = "4.4";
   realName = "bash-${version}";
   shortName = "bash44";
-  baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
   sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq";
 
   upstreamPatches =
@@ -22,7 +23,7 @@ let
     in
       import ./bash-4.4-patches.nix patch;
 
-  inherit (stdenv.lib) optional optionalString;
+  inherit (stdenv.lib) optional optionals;
 in
 
 stdenv.mkDerivation rec {
@@ -52,26 +53,25 @@ stdenv.mkDerivation rec {
   patchFlags = "-p0";
 
   patches = upstreamPatches
-      ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
-
-  crossAttrs = {
-    configureFlags = baseConfigureFlags +
-      " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes" +
-      optionalString stdenv.isCygwin ''
-        --without-libintl-prefix --without-libiconv-prefix
-        --with-installed-readline
-        bash_cv_dev_stdin=present
-        bash_cv_dev_fd=standard
-        bash_cv_termcap_lib=libncurses
-      '';
-  };
-
-  configureFlags = baseConfigureFlags;
+      ++ optional hostPlatform.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
+
+  configureFlags = [
+    (if interactive then "--with-installed-readline" else "--disable-readline")
+  ] ++ optionals (hostPlatform != buildPlatform) [
+    "bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes"
+  ] ++ optionals hostPlatform.isCygwin [
+    "--without-libintl-prefix --without-libiconv-prefix"
+    "--with-installed-readline"
+    "bash_cv_dev_stdin=present"
+    "bash_cv_dev_fd=standard"
+    "bash_cv_termcap_lib=libncurses"
+  ];
 
   # Note: Bison is needed because the patches above modify parse.y.
   nativeBuildInputs = [bison]
     ++ optional (texinfo != null) texinfo
-    ++ optional stdenv.isDarwin binutils;
+    ++ optional hostPlatform.isDarwin binutils
+    ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
 
   buildInputs = optional interactive readline70;
 
-- 
GitLab


From c54c3cb5cef4ff05ea7af017afbf8c2e294c1f2d Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 3 Jun 2017 16:57:52 -0400
Subject: [PATCH 1120/1490] mpfs: Fix for cross by disabling check

check phase is now only disabled by *default* for cross, but mpfr
was forcing it always.
---
 pkgs/development/libraries/mpfr/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 8dbe150e2cb..4f9a9fb9bd0 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, gmp }:
+{ stdenv, fetchurl, gmp
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "mpfr-3.1.3";
@@ -19,10 +21,10 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "stackprotector" ];
 
   configureFlags =
-    stdenv.lib.optional stdenv.isSunOS "--disable-thread-safe" ++
-    stdenv.lib.optional stdenv.is64bit "--with-pic";
+    stdenv.lib.optional hostPlatform.isSunOS "--disable-thread-safe" ++
+    stdenv.lib.optional hostPlatform.is64bit "--with-pic";
 
-  doCheck = true;
+  doCheck = hostPlatform == buildPlatform;
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 2e337fe969a55f66dcd41715b73f9c68acc38867 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 3 Jun 2017 19:36:59 -0400
Subject: [PATCH 1121/1490] libelf: Modernize and fix for cross

---
 .../development/libraries/libelf/cross-ar.patch | 11 +++++++++++
 pkgs/development/libraries/libelf/default.nix   | 17 ++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/libelf/cross-ar.patch

diff --git a/pkgs/development/libraries/libelf/cross-ar.patch b/pkgs/development/libraries/libelf/cross-ar.patch
new file mode 100644
index 00000000000..e282d9005db
--- /dev/null
+++ b/pkgs/development/libraries/libelf/cross-ar.patch
@@ -0,0 +1,11 @@
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -27,7 +27,7 @@ installdirs = $(libdir) $(includedir) $(includedir)/libelf
+ 
+ CC = @CC@
+ LD = @LD@
+-AR = ar
++AR ?= ar
+ MV = mv -f
+ RM = rm -f
+ LN_S = @LN_S@
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index 5027afa397a..dcd5d1d7a93 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -1,4 +1,7 @@
-{ fetchurl, stdenv, gettext, glibc }:
+{ stdenv, fetchurl
+, gettext, glibc
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "libelf-0.8.13";
@@ -8,20 +11,20 @@ stdenv.mkDerivation rec {
     sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr";
   };
 
+  # TODO(@Ericson2314) Make unconditional next hash break
+  patches = if hostPlatform == buildPlatform then null else [
+    ./cross-ar.patch
+  ];
+
   doCheck = true;
 
   # FIXME needs gcc 4.9 in bootstrap tools
   hardeningDisable = [ "stackprotector" ];
 
-  # For cross-compiling, native glibc is needed for the "gencat" program.
-  crossAttrs = {
-    nativeBuildInputs = [ gettext glibc ];
-  };
-
   # Libelf's custom NLS macros fail to determine the catalog file extension on
   # Darwin, so disable NLS for now.
   # FIXME: Eventually make Gettext a build input on all platforms.
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-nls";
+  configureFlags = stdenv.lib.optional hostPlatform.isDarwin "--disable-nls";
 
   nativeBuildInputs = [ gettext ];
 
-- 
GitLab


From af8d1a4acebdb723f75c20512f4458d2bc82e8ae Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 3 Jun 2017 20:28:29 -0400
Subject: [PATCH 1122/1490] binutils: Fix build != host == target

---
 pkgs/development/tools/misc/binutils/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 23ea7aed251..82eb7f77bb4 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -50,7 +50,8 @@ stdenv.mkDerivation rec {
     ++ [ "info" ]
     ++ optional (targetPlatform == hostPlatform) "dev";
 
-  nativeBuildInputs = [ bison ];
+  nativeBuildInputs = [ bison ]
+    ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
   buildInputs = [ zlib ];
 
   inherit noSysDirs;
-- 
GitLab


From b93e6034d5c37ce2f6faa632a08a619b5c01b52f Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 3 Jun 2017 20:35:03 -0400
Subject: [PATCH 1123/1490] libsigsegv: Fix for cross by disabling check

Check phase is now only disabled *by default* for cross, but this
package was forcing it unconditionally.
---
 pkgs/development/libraries/libsigsegv/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix
index 0e644686af0..961b3b2d883 100644
--- a/pkgs/development/libraries/libsigsegv/default.nix
+++ b/pkgs/development/libraries/libsigsegv/default.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchurl
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "libsigsegv-2.11";
@@ -8,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x";
   };
 
-  doCheck = true;
+  doCheck = hostPlatform == buildPlatform;
 
   meta = {
     homepage = http://www.gnu.org/software/libsigsegv/;
-- 
GitLab


From ff6ab1b3c4f13bb2972b06ab9b881b49ef7b521b Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 3 Jun 2017 21:11:40 -0400
Subject: [PATCH 1124/1490] pcre: Modernize and fix cross

---
 pkgs/development/libraries/pcre/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 21de038f7d6..93e32529592 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl
-, windows ? null, variant ? null, pcre
+, pcre, windows ? null
+, buildPlatform, hostPlatform
+, variant ? null
 }:
 
 with stdenv.lib;
@@ -31,7 +33,9 @@ in stdenv.mkDerivation rec {
 
   patches = [ ./CVE-2017-7186.patch ];
 
-  doCheck = with stdenv; !(isCygwin || isFreeBSD);
+  buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads;
+
+  doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform;
     # XXX: test failure on Cygwin
     # we are running out of stack on both freeBSDs on Hydra
 
@@ -42,10 +46,6 @@ in stdenv.mkDerivation rec {
     ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib}
   '';
 
-  crossAttrs = optionalAttrs (stdenv.cross.libc == "msvcrt") {
-    buildInputs = [ windows.mingw_w64_pthreads.crossDrv ];
-  };
-
   meta = {
     homepage = "http://www.pcre.org/";
     description = "A library for Perl Compatible Regular Expressions";
-- 
GitLab


From 54089620f5ef77f7c1ed3b5db497986423f0d0f4 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 4 Jun 2017 13:29:02 -0400
Subject: [PATCH 1125/1490] libpmc: Fix for cross by disabling check

Check phase is now only disabled *by default* for cross, but this
package was forcing it unconditionally.
---
 pkgs/development/libraries/libmpc/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
index 0d3c9c0997c..1bad236e044 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -1,4 +1,8 @@
-{ fetchurl, stdenv, gmp, mpfr }:
+{ stdenv, fetchurl
+, gmp, mpfr
+, buildPlatform, hostPlatform
+}:
+
 let
   version = "1.0.3";
 in
@@ -14,7 +18,7 @@ stdenv.mkDerivation rec {
 
   CFLAGS = "-I${gmp.dev}/include";
 
-  doCheck = true;
+  doCheck = hostPlatform == buildPlatform;
 
   # FIXME needs gcc 4.9 in bootstrap tools
   hardeningDisable = [ "stackprotector" ];
-- 
GitLab


From d710c2d9430f0ebc3f743c4ca5c6e3e5718c149e Mon Sep 17 00:00:00 2001
From: Ross MacLeod <rmm-github@z.odi.ac>
Date: Sun, 4 Jun 2017 17:32:55 +0000
Subject: [PATCH 1126/1490] findutils: modernize and fix cross

---
 pkgs/tools/misc/findutils/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 53d75485d5c..06a140fed50 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, coreutils }:
+{ stdenv, fetchurl
+, coreutils
+, buildPlatform, hostPlatform
+}:
+
+let inherit (stdenv.lib) optionals; in
 
 stdenv.mkDerivation rec {
   name = "findutils-4.6.0";
@@ -10,20 +15,18 @@ stdenv.mkDerivation rec {
 
   patches = [ ./memory-leak.patch ./no-install-statedir.patch ];
 
-  buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
+  buildInputs = optionals (hostPlatform == buildPlatform) [ coreutils ]; # bin/updatedb script needs to call sort
 
   # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
-  doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");
+  doCheck
+    =  !hostPlatform.isDarwin
+    && !(hostPlatform.libc == "glibc" && hostPlatform.isi686)
+    && hostPlatform == buildPlatform;
 
   outputs = [ "out" "info" ];
 
   configureFlags = [ "--localstatedir=/var/cache" ];
 
-  crossAttrs = {
-    # Fix the 'buildInputs = [ coreutils ]' above - that adds the cross coreutils to PATH :(
-    propagatedBuildInputs = [ ];
-  };
-
   enableParallelBuilding = true;
 
   meta = {
-- 
GitLab


From bef622a4e836999da0d398f78f3968f6b7c629b3 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 4 Jun 2017 17:50:36 -0400
Subject: [PATCH 1127/1490] unzip: Fix for cross

---
 pkgs/tools/archivers/unzip/cross-cc.patch | 12 ++++++++++++
 pkgs/tools/archivers/unzip/default.nix    | 12 ++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/tools/archivers/unzip/cross-cc.patch

diff --git a/pkgs/tools/archivers/unzip/cross-cc.patch b/pkgs/tools/archivers/unzip/cross-cc.patch
new file mode 100644
index 00000000000..3d38ffdef6e
--- /dev/null
+++ b/pkgs/tools/archivers/unzip/cross-cc.patch
@@ -0,0 +1,12 @@
+--- a/unix/Makefile
++++ b/unix/Makefile
+@@ -42,9 +42,7 @@
+ # such as -DDOSWILD).
+ 
+ # UnZip flags
+-CC = cc#	try using "gcc" target rather than changing this (CC and LD
+ LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)
+-AS = as
+ LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
+ AF = $(LOC)
+ CFLAGS = -O
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index b9fa760c019..ad484b3d4d9 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchurl, bzip2
-, enableNLS ? false, libnatspec }:
+{ stdenv, fetchurl
+, bzip2
+, enableNLS ? false, libnatspec
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation {
   name = "unzip-6.0";
@@ -25,14 +28,15 @@ stdenv.mkDerivation {
       url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";
       name = "unzip-6.0-natspec.patch";
       sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1";
-    });
+    })
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform) ./cross-cc.patch;
 
   nativeBuildInputs = [ bzip2 ];
   buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec;
 
   makefile = "unix/Makefile";
 
-  NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec";
+  ${"NIX_${stdenv.cc.infixSalt_}LDFLAGS"} = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec";
 
   buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2";
 
-- 
GitLab


From be3f18d79e2d232c2cbd2a394c34476af8413f0a Mon Sep 17 00:00:00 2001
From: Ross MacLeod <rmm-github@z.odi.ac>
Date: Sun, 4 Jun 2017 21:50:58 +0000
Subject: [PATCH 1128/1490] ddrescue: modernize and fix cross (hopefully)

Carefully do not add attributes for cross unless in cross, to avoid hash breakage
---
 pkgs/tools/system/ddrescue/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 3dcbf59d4d7..0b94f328b84 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, lzip }:
+{ stdenv
+, fetchurl, lzip
+, hostPlatform, buildPlatform
+}:
+
+let inherit (stdenv.lib) optionals; in
 
 stdenv.mkDerivation rec {
   name = "ddrescue-1.22";
@@ -10,7 +15,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ lzip ];
 
-  doCheck = true;
+  doCheck = hostPlatform == buildPlatform;
+
+  ${if hostPlatform != buildPlatform then "crossPlatforms" else null} = [ ];
+  ${if hostPlatform != buildPlatform then "configureFlags" else null} = [
+    "CXX=${stdenv.cc.prefix}c++"
+  ];
 
   meta = with stdenv.lib; {
     description = "GNU ddrescue, a data recovery tool";
-- 
GitLab


From 502902f1c6d16faec2ecca669e4cc77987fb676f Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 4 Jun 2017 19:15:31 -0400
Subject: [PATCH 1129/1490] lynx: Fix for cross

Needed C toolchain targeting build platform
---
 pkgs/applications/networking/browsers/lynx/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 42f45419198..bbf034a1342 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, ncurses, gzip, pkgconfig
+{ stdenv, buildPackages
+, fetchurl, pkgconfig, ncurses, gzip
 , sslSupport ? true, openssl ? null
+, buildPlatform, hostPlatform
 }:
 
 assert sslSupport -> openssl != null;
@@ -15,7 +17,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
 
-  nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig;
+  nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
+
   buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 7c754b1e3bb769da01c49342bc23816605928bf8 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 4 Jun 2017 19:24:50 -0400
Subject: [PATCH 1130/1490] mpg123: Modernize and fix for cross

Do not even think about configureFlags unless in cross, to avoid hash
breaking when not in cross.
---
 pkgs/applications/audio/mpg123/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 9004a46115e..2909dd70ce9 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchurl, alsaLib }:
+{ stdenv
+, fetchurl, alsaLib
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "mpg123-1.23.8";
@@ -10,10 +13,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
 
-  crossAttrs = {
-    configureFlags = if stdenv.cross ? mpg123 then
-      "--with-cpu=${stdenv.cross.mpg123.cpu}" else "";
-  };
+  ${if buildPlatform != hostPlatform then "configureFlags" else null} =
+    stdenv.lib.optional (hostPlatform ? mpg123) "--with-cpu=${hostPlatform.mpg123.cpu}";
 
   meta = {
     description = "Fast console MPEG Audio Player and decoder library";
-- 
GitLab


From 198dceccbe5414a5fd72ca83624c0cc715db1aad Mon Sep 17 00:00:00 2001
From: Ross MacLeod <rmm-github@z.odi.ac>
Date: Mon, 5 Jun 2017 04:37:47 +0000
Subject: [PATCH 1131/1490] gcc5: set --build and --host in the case where
 those differ and make sure to have a build cc-wrapper around as well

---
 pkgs/development/compilers/gcc/5/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index d4692c77751..e95ef92c3f6 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -35,6 +35,7 @@
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
+, buildPackages
 }:
 
 assert langJava     -> zip != null && unzip != null
@@ -312,6 +313,7 @@ stdenv.mkDerivation ({
     ++ (optionals langJava [ boehmgc zip unzip ])
     ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [binutils])
+    ++ (optionals (buildPlatform != hostPlatform) [buildPackages.stdenv.cc])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])
 
@@ -449,6 +451,8 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
+      --build=${buildPlatform.config}
+      --host=${hostPlatform.config}
       --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
-- 
GitLab


From f43ae985a68e515197c57de5ab8413d63ae6ef1a Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 24 Apr 2017 16:00:11 -0400
Subject: [PATCH 1132/1490] ios-cross: Just properly use the cc-wrapper

No other downstream derivations are needed anymore.
---
 pkgs/os-specific/darwin/ios-cross/default.nix | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix
index e5375ef6091..e0981d48c8c 100644
--- a/pkgs/os-specific/darwin/ios-cross/default.nix
+++ b/pkgs/os-specific/darwin/ios-cross/default.nix
@@ -6,7 +6,7 @@
 , stdenv
 , coreutils
 , gnugrep
-, targetPlatform
+, hostPlatform, targetPlatform
 }:
 
 /* As of this writing, known-good prefix/arch/simulator triples:
@@ -28,14 +28,14 @@ let
 
   sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk";
 
-  /* TODO: Properly integrate with gcc-cross-wrapper */
-  wrapper = import ../../../build-support/cc-wrapper {
-    inherit stdenv coreutils gnugrep;
+in (import ../../../build-support/cc-wrapper {
+    inherit stdenv coreutils gnugrep runCommand;
     nativeTools = false;
     nativeLibc = false;
     inherit binutils;
     libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}";
-    cc = clang;
+    inherit (clang) cc;
+    inherit hostPlatform targetPlatform;
     extraBuildCommands = ''
       if ! [ -d ${sdk} ]; then
           echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2
@@ -49,27 +49,6 @@ let
       # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust
       echo "-arch ${arch} -L${sdk}/usr/lib ${lib.optionalString simulator "-L${sdk}/usr/lib/system "}-i${if simulator then "os_simulator" else "phoneos"}_version_min 7.0.0" > $out/nix-support/libc-ldflags-before
     '';
-  };
-in {
-  cc = runCommand "${prefix}-cc" { passthru = { inherit sdkType sdkVer sdk; }; } ''
-    mkdir -p $out/bin
-    ln -sv ${wrapper}/bin/clang $out/bin/${prefix}-cc
-    mkdir -p $out/nix-support
-    echo ${llvm} > $out/nix-support/propagated-native-build-inputs
-    cat > $out/nix-support/setup-hook <<EOF
-    if test "\$dontSetConfigureCross" != "1"; then
-        configureFlags="\$configureFlags --host=${prefix}"
-    fi
-    EOF
-    fixupPhase
-  '';
-
-  binutils = runCommand "${prefix}-binutils" {} ''
-    mkdir -p $out/bin
-    ln -sv ${wrapper}/bin/ld $out/bin/${prefix}-ld
-    for prog in ar nm ranlib; do
-      ln -s ${binutils}/bin/$prog $out/bin/${prefix}-$prog
-    done
-    fixupPhase
-  '';
-}
+  }) // {
+    inherit sdkType sdkVer sdk;
+  }
-- 
GitLab


From 0030c6610353b3706fe77d4cce06f1905a4aec43 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 22 Jun 2017 17:28:15 -0500
Subject: [PATCH 1133/1490] kdeFrameworks, plasma5: fix setup hooks

The setup hooks for many kdeFrameworks and plasma5 packages were erroneously
running before $outputDev was set. This lead to .dev outputs being propagated
into the user environment.
---
 pkgs/desktops/plasma-5/default.nix            | 31 ++++++++++++-------
 .../libraries/kde-frameworks/default.nix      | 31 ++++++++++++-------
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index e101d4e14c5..a592a623510 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -43,17 +43,26 @@ let
 
       propagate = out:
         let setupHook = { writeScript }:
-              writeScript "setup-hook.sh" ''
-                # Propagate $${out} output
-                propagatedUserEnvPkgs+=" @${out}@"
-
-                # Propagate $dev so that this setup hook is propagated
-                # But only if there is a separate $dev output
-                if [ "$outputDev" != out ]; then
-                    if [ -n "$crossConfig" ]; then
-                      propagatedBuildInputs+=" @dev@"
-                    else
-                      propagatedNativeBuildInputs+=" @dev@"
+              writeScript "setup-hook" ''
+                if [ "$hookName" != postHook ]; then
+                    postHooks+=("source @dev@/nix-support/setup-hook")
+                else
+                    # Propagate $${out} output
+                    propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@"
+
+                    if [ -z "$outputDev" ]; then
+                        echo "error: \$outputDev is unset!" >&2
+                        exit 1
+                    fi
+
+                    # Propagate $dev so that this setup hook is propagated
+                    # But only if there is a separate $dev output
+                    if [ "$outputDev" != out ]; then
+                        if [ -n "$crossConfig" ]; then
+                          propagatedBuildInputs="$propagatedBuildInputs @dev@"
+                        else
+                          propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@"
+                        fi
                     fi
                 fi
               '';
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 8ab1d1b99b6..d92e7d19c65 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -41,17 +41,26 @@ let
 
       propagate = out:
         let setupHook = { writeScript }:
-              writeScript "setup-hook.sh" ''
-                # Propagate $${out} output
-                propagatedUserEnvPkgs+=" @${out}@"
-
-                # Propagate $dev so that this setup hook is propagated
-                # But only if there is a separate $dev output
-                if [ "$outputDev" != out ]; then
-                    if [ -n "$crossConfig" ]; then
-                      propagatedBuildInputs+=" @dev@"
-                    else
-                      propagatedNativeBuildInputs+=" @dev@"
+              writeScript "setup-hook" ''
+                if [ "$hookName" != postHook ]; then
+                    postHooks+=("source @dev@/nix-support/setup-hook")
+                else
+                    # Propagate $${out} output
+                    propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@"
+
+                    if [ -z "$outputDev" ]; then
+                        echo "error: \$outputDev is unset!" >&2
+                        exit 1
+                    fi
+
+                    # Propagate $dev so that this setup hook is propagated
+                    # But only if there is a separate $dev output
+                    if [ "$outputDev" != out ]; then
+                        if [ -n "$crossConfig" ]; then
+                          propagatedBuildInputs="$propagatedBuildInputs @dev@"
+                        else
+                          propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@"
+                        fi
                     fi
                 fi
               '';
-- 
GitLab


From 4e08459f9b98200949df65f2a4805e56a8d6b12e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 22 Jun 2017 21:12:20 -0400
Subject: [PATCH 1134/1490] linux-hardened-copperhead: 4.11.6c -> 4.11.6d

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index ae47a3842f7..0cc73849941 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -2,8 +2,8 @@
 
 let
   version = "4.11.6";
-  revision = "c";
-  sha256 = "1n1j1y5g5fcvgpqjfq14fbg4cm32k420kbazipqbi84h9zwifa69";
+  revision = "d";
+  sha256 = "1wpfvcbcs93gx8v87h2z7l2dzbyl9vlcqxpfz8y65achhjj7kqlg";
 in
 
 import ./generic.nix (args // {
-- 
GitLab


From fa6fd34fcca07c0762ef3bc44962e2dc49937454 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 23 Jun 2017 05:33:06 +0200
Subject: [PATCH 1135/1490] github/pr-template: Add note about NixOS tests

On several occasions I've seen people bumping packages which have NixOS
tests but without actually running them.

While this probably won't prevent such occasions entirely, at least it
serves as an additional checklist item so contributors don't forget
about these tests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .github/PULL_REQUEST_TEMPLATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3482ae16e26..4b9345b087e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -11,6 +11,7 @@
    - [ ] NixOS
    - [ ] macOS
    - [ ] Linux
+- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
 - [ ] Tested execution of all binary files (usually in `./result/bin/`)
 - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
-- 
GitLab


From 63fb845fcf6ea02db7933f503948a01fb2f6c2a4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 23 Jun 2017 05:48:54 +0200
Subject: [PATCH 1136/1490] virtualbox: Rebase hardened.patch on top of 5.1.22

The merge of the version bump in
6fb9f892382b4b091fc9edcae00e2eb4c0729bda didn't take care of our patch
for the hardening mode and thus enabling VirtualBox without also
force-disabling hardening mode will result in a build error.

While the patch is largely identical with the old version, I've removed
one particular change around the following code:

    if (pFsObjState->Stat.st_mode & S_IWOTH)
        return supR3HardenedSetError3(VERR_SUPLIB_WORLD_WRITABLE, pErrInfo,
                                      "World writable: '", pszPath, "'");

In the old version of the patch we have checked whether the path is
within the Nix store and suppressed the error return if that's the case.

The reason why I did that in the first place was because we had a bunch
of symlinks which were writable.

In VirtualBox 5.1.22 the code specifically checks whether the file is a
symlink, so we can safely drop our change.

Tested via all of the "virtualbox" NixOS VM subtests and they now all
succeed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../virtualization/virtualbox/hardened.patch  | 50 +++++++------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch
index 8d408d3494e..bd29ca9a65a 100644
--- a/pkgs/applications/virtualization/virtualbox/hardened.patch
+++ b/pkgs/applications/virtualization/virtualbox/hardened.patch
@@ -1,8 +1,8 @@
 diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h
-index 70c596a..78972ed 100644
+index c1daa8f..8618371 100644
 --- a/include/iprt/mangling.h
 +++ b/include/iprt/mangling.h
-@@ -1068,6 +1068,7 @@
+@@ -1440,6 +1440,7 @@
  # define RTPathStripSuffix                              RT_MANGLER(RTPathStripSuffix)
  # define RTPathStripFilename                            RT_MANGLER(RTPathStripFilename)
  # define RTPathStripTrailingSlash                       RT_MANGLER(RTPathStripTrailingSlash)
@@ -10,7 +10,7 @@ index 70c596a..78972ed 100644
  # define RTPathTemp                                     RT_MANGLER(RTPathTemp)
  # define RTPathTraverseList                             RT_MANGLER(RTPathTraverseList)
  # define RTPathUnlink                                   RT_MANGLER(RTPathUnlink)
-@@ -1105,6 +1106,7 @@
+@@ -1478,6 +1479,7 @@
  # define RTProcGetAffinityMask                          RT_MANGLER(RTProcGetAffinityMask)
  # define RTProcGetExecutablePath                        RT_MANGLER(RTProcGetExecutablePath)
  # define RTProcGetPriority                              RT_MANGLER(RTProcGetPriority)
@@ -19,10 +19,10 @@ index 70c596a..78972ed 100644
  # define RTProcQueryParent                              RT_MANGLER(RTProcQueryParent)
  # define RTProcQueryUsername                            RT_MANGLER(RTProcQueryUsername)
 diff --git a/include/iprt/path.h b/include/iprt/path.h
-index 7e42754..b4de4c8 100644
+index 8bd42bc..2c23d3e 100644
 --- a/include/iprt/path.h
 +++ b/include/iprt/path.h
-@@ -1049,6 +1049,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst,
+@@ -1064,6 +1064,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst,
  RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath);
  
  /**
@@ -39,10 +39,10 @@ index 7e42754..b4de4c8 100644
   *
   * @returns iprt status code.
 diff --git a/include/iprt/process.h b/include/iprt/process.h
-index 2760306..0ce6c92 100644
+index 043653e..1070280 100644
 --- a/include/iprt/process.h
 +++ b/include/iprt/process.h
-@@ -313,6 +313,16 @@ RTR3DECL(const char *) RTProcShortName(void);
+@@ -327,6 +327,16 @@ RTR3DECL(const char *) RTProcShortName(void);
  RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath);
  
  /**
@@ -60,11 +60,11 @@ index 2760306..0ce6c92 100644
   *
   * The way this work is that it will spawn a detached / backgrounded /
 diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
-index c39d2f7..896b352 100644
+index ce0f288..6193108 100644
 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
 +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
-@@ -1415,18 +1415,19 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo
-         NOREF(fRelaxed);
+@@ -1489,9 +1489,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo
+         bool fBad = !fRelaxed || pFsObjState->Stat.st_gid != 2 /*bin*/ || suplibHardenedStrCmp(pszPath, "/usr/lib/iconv");
  #else
          NOREF(fRelaxed);
 -        bool fBad = true;
@@ -75,23 +75,11 @@ index c39d2f7..896b352 100644
              return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo,
                                            "An unknown (and thus untrusted) group has write access to '", pszPath,
                                            "' and we therefore cannot trust the directory content or that of any subdirectory");
-     }
- 
-     /*
--     * World must not have write access.  There is no relaxing this rule.
-+     * World must not have write access.
-+     * There is no relaxing this rule, except when it comes to the Nix store.
-      */
--    if (pFsObjState->Stat.st_mode & S_IWOTH)
-+    if (pFsObjState->Stat.st_mode & S_IWOTH && suplibHardenedStrCmp(pszPath, "/nix/store"))
-         return supR3HardenedSetError3(VERR_SUPLIB_WORLD_WRITABLE, pErrInfo,
-                                       "World writable: '", pszPath, "'");
- 
 diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp
-index 95dc9a7..39170bc 100644
+index 320c569..9bfe41f 100644
 --- a/src/VBox/Main/src-server/MachineImpl.cpp
 +++ b/src/VBox/Main/src-server/MachineImpl.cpp
-@@ -7326,7 +7326,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl,
+@@ -7543,7 +7543,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl,
  
      /* get the path to the executable */
      char szPath[RTPATH_MAX];
@@ -101,10 +89,10 @@ index 95dc9a7..39170bc 100644
      szPath[cchBufLeft++] = RTPATH_DELIMITER;
      szPath[cchBufLeft] = 0;
 diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
-index e9e1ba62..4d1c1e1 100644
+index 1e38d99..5e43dda 100644
 --- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp
 +++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
-@@ -79,7 +79,7 @@ int NetworkServiceRunner::start()
+@@ -85,7 +85,7 @@ int NetworkServiceRunner::start(bool aKillProcOnStop)
  
      /* get the path to the executable */
      char exePathBuf[RTPATH_MAX];
@@ -114,7 +102,7 @@ index e9e1ba62..4d1c1e1 100644
      char *substrBs = strrchr(exePathBuf, '\\');
      char *suffix = substrSl ? substrSl : substrBs;
 diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp
-index 8559d2a..2177f27 100644
+index 98dc91a..43a819f 100644
 --- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp
 +++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp
 @@ -47,7 +47,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char
@@ -126,7 +114,7 @@ index 8559d2a..2177f27 100644
      if (RT_FAILURE(rc))
      {
          LogRel(("NetIfAdpCtl: failed to get program path, rc=%Rrc.\n", rc));
-@@ -90,7 +90,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch
+@@ -89,7 +89,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch
  int NetIfAdpCtlOut(const char * pcszName, const char * pcszCmd, char *pszBuffer, size_t cBufSize)
  {
      char szAdpCtl[RTPATH_MAX];
@@ -135,7 +123,7 @@ index 8559d2a..2177f27 100644
      if (RT_FAILURE(rc))
      {
          LogRel(("NetIfAdpCtlOut: Failed to get program path, rc=%Rrc\n", rc));
-@@ -202,7 +202,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox,
+@@ -201,7 +201,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox,
              progress.queryInterfaceTo(aProgress);
  
              char szAdpCtl[RTPATH_MAX];
@@ -145,7 +133,7 @@ index 8559d2a..2177f27 100644
              {
                  progress->i_notifyComplete(E_FAIL,
 diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp
-index be2ad8f..7ddf105 100644
+index 944848e..744a261 100644
 --- a/src/VBox/Runtime/r3/path.cpp
 +++ b/src/VBox/Runtime/r3/path.cpp
 @@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath)
@@ -162,7 +150,7 @@ index be2ad8f..7ddf105 100644
  {
  #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE)
 diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp
-index 7bde6af..2656cae 100644
+index 2aab645..9795f21 100644
 --- a/src/VBox/Runtime/r3/process.cpp
 +++ b/src/VBox/Runtime/r3/process.cpp
 @@ -111,6 +111,26 @@ RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath)
-- 
GitLab


From e620135a8768aea503f7ba3933f3dc97c9ffaf31 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxcallahan@gmail.com>
Date: Sat, 10 Jun 2017 19:35:23 -0700
Subject: [PATCH 1137/1490] fish: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 798d00b0be1..b2a63e9532b 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -89,13 +89,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "fish-${version}";
-  version = "2.5.0";
+  version = "2.6.0";
 
   etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
 
   src = fetchurl {
     url = "http://fishshell.com/files/${version}/${name}.tar.gz";
-    sha256 = "19djav128nkhjxgfhwhc32i5y9d9c3karbh5yg67kqrdranyvh7q";
+    sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby";
   };
 
   buildInputs = [ ncurses libiconv pcre2 ];
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
   # Python: Autocompletion generated from manpages and config editing
   propagatedBuildInputs = [
     coreutils gnugrep gnused bc
-    python which groff gettext
+    python groff gettext
   ] ++ optional (!stdenv.isDarwin) man-db;
 
   postInstall = ''
-- 
GitLab


From 621a1146d66beb6f7db9fd5c111b3a80e41cf154 Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@imag.fr>
Date: Fri, 23 Jun 2017 08:11:06 +0200
Subject: [PATCH 1138/1490] openmpi: 1.10.1 -> 1.10.7

- No more need for the nbc patch
- Cpusets support fixed
---
 .../development/libraries/openmpi/default.nix | 10 ++-----
 .../libraries/openmpi/nbc_copy.patch          | 30 -------------------
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/development/libraries/openmpi/nbc_copy.patch

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index c7ab69e5169..2d08f37c8c2 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -13,19 +13,13 @@ let
   majorVersion = "1.10";
 
 in stdenv.mkDerivation rec {
-  name = "openmpi-${majorVersion}.1";
+  name = "openmpi-${majorVersion}.7";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
-    sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br";
+    sha256 = "142s1vny9gllkq336yafxayjgcirj2jv0ddabj879jgya7hyr2d0";
   };
 
-  # Bug in openmpi implementation for zero sized messages
-  # Patch required to make mpi4py pass. Will NOT
-  # be required when openmpi >= 2.0.0
-  # https://www.open-mpi.org/community/lists/users/2015/11/28030.php
-  patches = [ ./nbc_copy.patch ];
-
   buildInputs = [ gfortran ]
     ++ optional (stdenv.isLinux || stdenv.isFreeBSD) libibverbs;
 
diff --git a/pkgs/development/libraries/openmpi/nbc_copy.patch b/pkgs/development/libraries/openmpi/nbc_copy.patch
deleted file mode 100644
index d496c7cc2d7..00000000000
--- a/pkgs/development/libraries/openmpi/nbc_copy.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 4ee20ba31dd64b8f899447cdad78ec2379acfce7
-Author: Gilles Gouaillardet <gilles@rist.or.jp>
-Date:   Tue Nov 10 08:59:03 2015 +0900
-
-    fix NBC_Copy for legitimate zero size messages
-    
-    (back ported from commit open-mpi/ompi@0bd765eddd33e3d4ac18ec644c60a5c160cb48dc)
-    (back ported from commit open-mpi/ompi@9a70765f27fdf17e70e1a115754fef7e5f16132a)
-
-diff --git a/ompi/mca/coll/libnbc/nbc_internal.h b/ompi/mca/coll/libnbc/nbc_internal.h
-index bf2f1cb..81be8cc 100644
---- a/ompi/mca/coll/libnbc/nbc_internal.h
-+++ b/ompi/mca/coll/libnbc/nbc_internal.h
-@@ -501,7 +501,14 @@ static inline int NBC_Copy(void *src, int srccount, MPI_Datatype srctype, void *
-   } else {
-     /* we have to pack and unpack */
-     res = MPI_Pack_size(srccount, srctype, comm, &size);
--    if (MPI_SUCCESS != res || 0 == size) { printf("MPI Error in MPI_Pack_size() (%i:%i)\n", res, size); return (MPI_SUCCESS == res) ? MPI_ERR_SIZE : res;}
-+    if (MPI_SUCCESS != res) {
-+      printf ("MPI Error in MPI_Pack_size() (%i:%i)", res, size);
-+      return res;
-+    }
-+
-+    if (0 == size) {
-+        return OMPI_SUCCESS;
-+    }
-     packbuf = malloc(size);
-     if (NULL == packbuf) { printf("Error in malloc()\n"); return res; }
-     pos=0;
-
-- 
GitLab


From 5c2d4ef6cfe3bc87cfcca829d4ceb52ede5e69d3 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 23 Jun 2017 09:37:47 +0200
Subject: [PATCH 1139/1490] ammonite: disable remote logging by default

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 0843c37df06..12551ed741c 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, lib, fetchurl, makeWrapper, jre }:
+{ stdenv, lib, fetchurl, makeWrapper, jre
+, disableRemoteLogging ? true
+}:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
   version = "0.9.9";
@@ -19,7 +22,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp ${src} $out/bin/amm
     chmod +x $out/bin/amm
-    wrapProgram $out/bin/amm --prefix PATH ":" ${jre}/bin ;
+    wrapProgram $out/bin/amm \
+      ${optionalString disableRemoteLogging "--add-flags --no-remote-logging"} \
+      --prefix PATH ":" ${jre}/bin ;
   '';
 
   meta = {
-- 
GitLab


From 4f0d812abcbae2016967e9effb4e76a825b246d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 23 Jun 2017 10:43:57 +0200
Subject: [PATCH 1140/1490] python.pkgs.spyder: remove maintainers

since we both do not use this package anymore.
cc @bjornfor
---
 pkgs/applications/science/spyder/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 141ef44b77e..6dbc75e9c06 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -51,6 +51,5 @@ buildPythonApplication rec {
     homepage = https://github.com/spyder-ide/spyder/;
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor fridh ];
   };
 }
-- 
GitLab


From aa3f37ceed582c8cb6e871db528b7216d17b474f Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Wed, 14 Jun 2017 14:27:20 -0700
Subject: [PATCH 1141/1490] pythonPackages.intelhex init at 2.1

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

diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix
new file mode 100644
index 00000000000..9d0a7d08c0c
--- /dev/null
+++ b/pkgs/development/python-modules/intelhex/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+}:
+
+buildPythonPackage rec {
+  pname = "intelhex";
+  version = "2.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0k5l1mn3gv1vb0jd24ygxksx8xqr57y1ivgyj37jsrwpzrp167kw";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = https://github.com/bialix/intelhex/commit/f251aef214daa2116e15ff7f7dcec1639eb12d5b.patch;
+      sha256 = "02i15qjmcz7mwbwvyj3agl5y7098rag2iwypdilkaadhbslsl9b9";
+    })
+  ];
+
+  meta = {
+    homepage = https://github.com/bialix/intelhex;
+    description = "Python library for Intel HEX files manipulations";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ pjones ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c79dd2d60e..f58efccf48f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -216,6 +216,8 @@ in {
     hdf5 = pkgs.hdf5-mpi;
   };
 
+  intelhex = callPackage ../development/python-modules/intelhex { };
+
   mpi4py = callPackage ../development/python-modules/mpi4py {
     mpi = pkgs.openmpi;
   };
-- 
GitLab


From be2b6c2e473d843f56419e34834124baace46f0d Mon Sep 17 00:00:00 2001
From: Alexandre Peyroux <alex@xn--wxa.email>
Date: Sat, 10 Jun 2017 23:16:24 +0200
Subject: [PATCH 1142/1490] gramalecte: init at v0.5.17

---
 .../python-modules/grammalecte/default.nix    | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/grammalecte/default.nix

diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix
new file mode 100644
index 00000000000..8ad1dd62869
--- /dev/null
+++ b/pkgs/development/python-modules/grammalecte/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchurl
+, bottle
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "grammalecte";
+  version = "0.5.17";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://www.dicollecte.org/grammalecte/oxt/Grammalecte-fr-v${version}.zip";
+    sha256 = "0ccvj8p8bwvrj8bp370dzjs16pwm755a7364lvk8bp4505n7g0b6";
+  };
+
+  propagatedBuildInputs = [ bottle ];
+
+  preBuild = "cd ..";
+  postInstall = ''
+    mkdir $out/bin
+    cp $out/cli.py $out/bin/gramalecte
+    cp $out/server.py $out/bin/gramalected
+    chmod a+rx $out/bin/gramalecte
+    chmod a+rx $out/bin/gramalected
+  '';
+
+  disabled = !isPy3k;
+
+  meta = {
+    description = "Grammalecte is an open source grammar checker for the French language";
+    homepage = "https://dicollecte.org/grammalecte/";
+    license = with lib.licenses; [ gpl3 ];
+    maintainers = with lib.maintainers; [ apeyroux ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f58efccf48f..2e31987a8cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11821,6 +11821,7 @@ in {
     };
   };
 
+  grammalecte = callPackage ../development/python-modules/grammalecte { };
 
   greenlet = buildPythonPackage rec {
     name = "greenlet-${version}";
-- 
GitLab


From 167b27b6a738676c14b3bd0e030b2ef9b537beac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 19 Jun 2017 22:43:45 +0200
Subject: [PATCH 1143/1490] LTS Haskell 8.19

---
 .../configuration-hackage2nix.yaml            | 113 +++++++++---------
 1 file changed, 57 insertions(+), 56 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 80b70b9fad3..78b0ecb3182 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 8.18
+  # LTS Haskell 8.19
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -58,8 +58,8 @@ default-package-overrides:
   - aeson-extra ==0.4.0.0
   - aeson-generic-compat ==0.0.1.0
   - aeson-injector ==1.0.8.0
-  - aeson-pretty ==0.8.4
-  - aeson-qq ==0.8.1
+  - aeson-pretty ==0.8.5
+  - aeson-qq ==0.8.2
   - aeson-utils ==0.3.0.2
   - Agda ==2.5.2
   - airship ==0.6.0
@@ -190,7 +190,7 @@ default-package-overrides:
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
   - attoparsec-iso8601 ==1.0.0.0
-  - audacity ==0.0.1.1
+  - audacity ==0.0.1.2
   - authenticate ==1.3.3.2
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
@@ -217,7 +217,7 @@ default-package-overrides:
   - base64-string ==0.2
   - basic-prelude ==0.6.1.1
   - bcrypt ==0.0.10
-  - bench ==1.0.4
+  - bench ==1.0.5
   - benchpress ==0.2.2.9
   - bencode ==0.6.0.0
   - bento ==0.1.0
@@ -318,7 +318,7 @@ default-package-overrides:
   - calendar-recycling ==0.0
   - call-stack ==0.1.0
   - camfort ==0.901
-  - carray ==0.1.6.6
+  - carray ==0.1.6.7
   - cartel ==0.18.0.2
   - case-insensitive ==1.2.0.10
   - cased ==0.1.0.0
@@ -367,7 +367,7 @@ default-package-overrides:
   - classy-prelude ==1.2.0.1
   - classy-prelude-conduit ==1.2.0
   - classy-prelude-yesod ==1.2.0
-  - clay ==0.12.1
+  - clay ==0.12.2
   - clckwrks ==0.24.0.3
   - clckwrks-cli ==0.2.17.1
   - clckwrks-plugin-media ==0.6.16.3
@@ -408,7 +408,7 @@ default-package-overrides:
   - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.16
   - conduit-iconv ==0.1.1.1
-  - conduit-parse ==0.1.2.0
+  - conduit-parse ==0.1.2.1
   - ConfigFile ==1.1.4
   - configuration-tools ==0.2.15
   - configurator ==0.3.0.0
@@ -564,9 +564,9 @@ default-package-overrides:
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
   - doctemplates ==0.1.0.2
-  - doctest ==0.11.2
+  - doctest ==0.11.3
   - doctest-discover ==0.1.0.7
-  - dotenv ==0.3.3.0
+  - dotenv ==0.3.4.0
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.5
@@ -649,7 +649,7 @@ default-package-overrides:
   - extensible ==0.3.7
   - extensible-effects ==1.11.0.4
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.5.2
+  - extra ==1.5.3
   - extract-dependencies ==0.2.0.1
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
@@ -669,7 +669,7 @@ default-package-overrides:
   - feature-flags ==0.1.0.1
   - feed ==0.3.12.0
   - FenwickTree ==0.1.2.1
-  - fft ==0.1.8.5
+  - fft ==0.1.8.6
   - fgl ==5.5.3.1
   - fgl-arbitrary ==0.2.0.3
   - file-embed ==0.0.10
@@ -697,7 +697,7 @@ default-package-overrides:
   - fold-debounce ==0.2.0.5
   - fold-debounce-conduit ==0.1.0.5
   - foldl ==1.2.5
-  - foldl-statistics ==0.1.4.4
+  - foldl-statistics ==0.1.4.6
   - folds ==0.7.3
   - FontyFruity ==0.5.3.2
   - force-layout ==0.4.0.6
@@ -705,7 +705,7 @@ default-package-overrides:
   - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
-  - foundation ==0.0.10
+  - foundation ==0.0.11
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
@@ -740,7 +740,7 @@ default-package-overrides:
   - ghc-mod ==5.7.0.0
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.3.0.2
-  - ghc-syb-utils < 0.3
+  - ghc-syb-utils ==0.2.3.2
   - ghc-tcplugins-extra ==0.2
   - ghc-typelits-extra ==0.2.3
   - ghc-typelits-knownnat ==0.2.4
@@ -936,7 +936,7 @@ default-package-overrides:
   - happy ==1.19.5
   - HaRe ==0.8.4.0
   - harp ==0.4.2
-  - hasbolt ==0.1.1.2
+  - hasbolt ==0.1.1.3
   - hashable ==1.2.6.0
   - hashable-time ==0.2.0.1
   - hashmap ==1.3.2
@@ -1033,7 +1033,7 @@ default-package-overrides:
   - holy-project ==0.2.0.1
   - hOpenPGP ==2.5.5
   - hopenpgp-tools ==0.19.4
-  - hopfli ==0.2.1.1
+  - hopfli ==0.2.2.1
   - hosc ==0.15
   - hostname ==1.0
   - hostname-validate ==1.0.0
@@ -1104,7 +1104,7 @@ default-package-overrides:
   - http-api-data ==0.3.7.1
   - http-client ==0.5.7.0
   - http-client-openssl ==0.2.0.5
-  - http-client-tls ==0.3.5
+  - http-client-tls ==0.3.5.1
   - http-common ==0.8.2.0
   - http-conduit ==2.2.3.1
   - http-date ==0.0.6.1
@@ -1159,7 +1159,7 @@ default-package-overrides:
   - imm ==1.1.0.0
   - immortal ==0.2.2
   - include-file ==0.1.0.3
-  - incremental-parser ==0.2.5
+  - incremental-parser ==0.2.5.1
   - indentation-core ==0.0
   - indentation-parsec ==0.0
   - indents ==0.4.0.0
@@ -1224,7 +1224,7 @@ default-package-overrides:
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
   - json-stream ==0.4.1.3
-  - JuicyPixels ==3.2.8.1
+  - JuicyPixels ==3.2.8.2
   - JuicyPixels-extra ==0.1.1
   - JuicyPixels-scale-dct ==0.1.1.2
   - jvm ==0.1.2
@@ -1309,7 +1309,7 @@ default-package-overrides:
   - loch-th ==0.2.1
   - log ==0.7
   - log-base ==0.7.1
-  - log-domain ==0.11
+  - log-domain ==0.11.1
   - log-elasticsearch ==0.7
   - log-postgres ==0.7
   - logfloat ==0.13.3.3
@@ -1319,7 +1319,7 @@ default-package-overrides:
   - logict ==0.6.0.2
   - loop ==0.3.0
   - lrucache ==1.2.0.0
-  - lrucaching ==0.3.1
+  - lrucaching ==0.3.2
   - lucid ==2.9.8.1
   - lucid-svg ==0.7.0.0
   - lzma-conduit ==1.1.3.1
@@ -1370,11 +1370,11 @@ default-package-overrides:
   - microlens-aeson ==2.2.0.1
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.8.0
-  - microlens-mtl ==0.1.10.0
-  - microlens-platform ==0.3.8.0
+  - microlens-mtl ==0.1.11.0
+  - microlens-platform ==0.3.9.0
   - microlens-th ==0.4.1.1
   - midi ==0.2.2.1
-  - midi-music-box ==0.0.0.3
+  - midi-music-box ==0.0.0.4
   - mighty-metropolis ==1.2.0
   - mime-mail ==0.4.13.1
   - mime-mail-ses ==0.3.2.3
@@ -1388,9 +1388,9 @@ default-package-overrides:
   - mmap ==0.5.9
   - mmorph ==1.0.9
   - mnist-idx ==0.1.2.8
-  - mockery ==0.3.4
+  - mockery ==0.3.5
   - modify-fasta ==0.8.2.3
-  - monad-control ==1.0.1.0
+  - monad-control ==1.0.2.0
   - monad-coroutine ==0.9.0.3
   - monad-extras ==0.6.0
   - monad-http ==0.1.0.0
@@ -1423,10 +1423,10 @@ default-package-overrides:
   - mono-traversable ==1.0.2
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
-  - monoid-subclasses ==0.4.3.1
+  - monoid-subclasses ==0.4.3.2
   - monoid-transformer ==0.0.3
   - monoidal-containers ==0.3.0.1
-  - morte ==1.6.7
+  - morte ==1.6.9
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.1
@@ -1558,7 +1558,7 @@ default-package-overrides:
   - parsers ==0.12.5
   - partial-handler ==1.0.2
   - partial-isomorphisms ==0.2.2.1
-  - patat ==0.5.2.0
+  - patat ==0.5.2.2
   - path ==0.5.13
   - path-extra ==0.0.3
   - path-io ==1.2.2
@@ -1594,7 +1594,7 @@ default-package-overrides:
   - pinchot ==0.24.0.0
   - pipes ==4.3.4
   - pipes-attoparsec ==0.5.1.5
-  - pipes-bytestring ==2.1.4
+  - pipes-bytestring ==2.1.5
   - pipes-cacophony ==0.4.1
   - pipes-category ==0.2.0.1
   - pipes-concurrency ==2.0.7
@@ -1657,7 +1657,7 @@ default-package-overrides:
   - primitive ==0.6.1.0
   - printcess ==0.1.0.3
   - probability ==0.2.5.1
-  - process-extras ==0.7.1
+  - process-extras ==0.7.2
   - product-profunctors ==0.7.1.0
   - profiteur ==0.4.3.0
   - profunctor-extras ==4.0
@@ -1671,7 +1671,7 @@ default-package-overrides:
   - proto-lens-arbitrary ==0.1.0.2
   - proto-lens-combinators ==0.1.0.7
   - proto-lens-descriptors ==0.2.1.0
-  - proto-lens-optparse ==0.1.0.2
+  - proto-lens-optparse ==0.1.0.3
   - proto-lens-protoc ==0.2.1.0
   - protobuf ==0.2.1.1
   - protobuf-simple ==0.1.0.4
@@ -1868,7 +1868,7 @@ default-package-overrides:
   - set-cover ==0.0.8
   - set-monad ==0.2.0.0
   - setenv ==0.1.1.3
-  - setlocale ==1.0.0.4
+  - setlocale ==1.0.0.5
   - sets ==0.0.5.2
   - SHA ==1.6.4.2
   - shake ==0.15.11
@@ -1920,7 +1920,7 @@ default-package-overrides:
   - sourcemap ==0.1.6
   - sparkle ==0.4.0.2
   - sparse-linear-algebra ==0.2.9.7
-  - spdx ==0.2.1.0
+  - spdx ==0.2.2.0
   - speculation ==1.5.0.3
   - speedy-slice ==0.3.0
   - sphinx ==0.6.0.2
@@ -2058,7 +2058,7 @@ default-package-overrides:
   - tdigest-Chart ==0
   - telegram-api ==0.6.3.0
   - template ==0.2.0.10
-  - temporary ==1.2.0.4
+  - temporary ==1.2.1
   - temporary-rc ==1.2.0.3
   - termcolor ==0.2.0.0
   - terminal-progress-bar ==0.1.1.1
@@ -2067,7 +2067,7 @@ default-package-overrides:
   - test-fixture ==0.5.0.1
   - test-framework ==0.8.1.1
   - test-framework-hunit ==0.3.0.2
-  - test-framework-quickcheck2 < 0.4
+  - test-framework-quickcheck2 ==0.3.0.4
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
   - test-invariant ==0.4.5.0
@@ -2094,6 +2094,7 @@ default-package-overrides:
   - textlocal ==0.1.0.5
   - tf-random ==0.5
   - tfp ==1.0.0.2
+  - th-abstraction ==0.2.2.0
   - th-data-compat ==0.0.2.2
   - th-desugar ==1.6
   - th-expand-syns ==0.4.3.0
@@ -2102,7 +2103,7 @@ default-package-overrides:
   - th-lift-instances ==0.1.11
   - th-orphans ==0.13.3
   - th-reify-compat ==0.0.1.1
-  - th-reify-many ==0.1.6
+  - th-reify-many ==0.1.7
   - th-to-exp ==0.0.1.0
   - th-utilities ==0.2.0.1
   - these ==0.7.3
@@ -2149,7 +2150,7 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuple-th ==0.2.5
   - tuples-homogenous-h98 ==0.1.1.0
-  - turtle ==1.3.5
+  - turtle ==1.3.6
   - turtle-options ==0.1.0.4
   - twitter-feed ==0.2.0.11
   - twitter-types ==0.7.2.2
@@ -2236,7 +2237,7 @@ default-package-overrides:
   - vector-algorithms ==0.7.0.1
   - vector-binary-instances ==0.2.3.5
   - vector-buffer ==0.4.1
-  - vector-fftw ==0.1.3.7
+  - vector-fftw ==0.1.3.8
   - vector-instances ==3.4
   - vector-sized ==0.5.1.0
   - vector-space ==0.10.4
@@ -2349,14 +2350,14 @@ default-package-overrides:
   - xdg-basedir ==0.2.2
   - xeno ==0.1
   - xenstore ==0.1.1
-  - xhtml ==3000.2.1
+  - xhtml ==3000.2.2
   - xlsior ==0.1.0.1
   - xlsx ==0.4.3
   - xlsx-tabular ==0.2.2
   - xml ==1.3.14
   - xml-basic ==0.1.2
   - xml-conduit ==1.4.0.4
-  - xml-conduit-parse ==0.3.1.0
+  - xml-conduit-parse ==0.3.1.1
   - xml-conduit-writer ==0.1.1.1
   - xml-hamlet ==0.4.1
   - xml-html-qq ==0.1.0.1
@@ -2372,7 +2373,7 @@ default-package-overrides:
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
   - yahoo-finance-api ==0.2.0.2
-  - yaml ==0.8.23
+  - yaml ==0.8.23.1
   - Yampa ==0.10.6
   - YampaSynth ==0.2
   - yes-precure5-command ==5.5.3
@@ -2398,24 +2399,24 @@ default-package-overrides:
   - yesod-table ==2.0.3
   - yesod-test ==1.5.6
   - yesod-websockets ==0.2.6
-  - yi-core ==0.13.5
-  - yi-frontend-vty ==0.13.5
-  - yi-fuzzy-open ==0.13.5
-  - yi-ireader ==0.13.5
-  - yi-keymap-cua ==0.13.5
-  - yi-keymap-emacs ==0.13.5
-  - yi-keymap-vim ==0.13.5
-  - yi-language ==0.13.5
-  - yi-misc-modes ==0.13.5
-  - yi-mode-haskell ==0.13.5
-  - yi-mode-javascript ==0.13.5
+  - yi-core ==0.13.7
+  - yi-frontend-vty ==0.13.7
+  - yi-fuzzy-open ==0.13.7
+  - yi-ireader ==0.13.7
+  - yi-keymap-cua ==0.13.7
+  - yi-keymap-emacs ==0.13.7
+  - yi-keymap-vim ==0.13.7
+  - yi-language ==0.13.7
+  - yi-misc-modes ==0.13.7
+  - yi-mode-haskell ==0.13.7
+  - yi-mode-javascript ==0.13.7
   - yi-rope ==0.8
-  - yi-snippet ==0.13.5
+  - yi-snippet ==0.13.7
   - yjtools ==0.9.18
   - yoga ==0.0.0.1
   - youtube ==0.2.1
   - zero ==0.1.4
-  - zeromq4-haskell ==0.6.5
+  - zeromq4-haskell ==0.6.6
   - zip ==0.1.11
   - zip-archive ==0.3.1
   - zippers ==0.2.3
-- 
GitLab


From 7673cd0cd4cab1d2a4f6bde6d33b2dcb3d863d38 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 19 Jun 2017 22:45:06 +0200
Subject: [PATCH 1144/1490] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e0fa80e591be1df5eb2a7ccaa8f222e20600ed68.
---
 .../haskell-modules/hackage-packages.nix      | 1707 ++++++++---------
 1 file changed, 784 insertions(+), 923 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3ad53530c40..2038bc9ba84 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2866,8 +2866,8 @@ self: {
     ({ mkDerivation, array, base, libdevil }:
      mkDerivation {
        pname = "Codec-Image-DevIL";
-       version = "0.2.3";
-       sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz";
+       version = "0.2.4";
+       sha256 = "1kzphhzh0ad2mf76mr67b6pl77yrapyakvrwlkvhcx8gp5afy4zk";
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ libdevil ];
        description = "An FFI interface to the DevIL library";
@@ -8827,6 +8827,26 @@ self: {
        license = "LGPL";
      }) {};
 
+  "HaXml_1_25_4" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , polyparse, pretty, random
+     }:
+     mkDerivation {
+       pname = "HaXml";
+       version = "1.25.4";
+       sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers filepath polyparse pretty random
+       ];
+       executableHaskellDepends = [ base directory polyparse pretty ];
+       homepage = "http://projects.haskell.org/HaXml/";
+       description = "Utilities for manipulating XML documents";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Hach" = callPackage
     ({ mkDerivation, base, containers, network, old-locale, text, time
      , vty, vty-ui
@@ -10502,23 +10522,6 @@ self: {
      }) {};
 
   "JuicyPixels" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
-     , primitive, transformers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "JuicyPixels";
-       version = "3.2.8.1";
-       sha256 = "013il9pnglb2mbiz5bbk1wg4mw2yvyi07fjv2zvmmml7p18fs9dk";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq mtl primitive
-         transformers vector zlib
-       ];
-       homepage = "https://github.com/Twinside/Juicy.Pixels";
-       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels_3_2_8_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
@@ -10533,7 +10536,6 @@ self: {
        homepage = "https://github.com/Twinside/Juicy.Pixels";
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -20631,6 +20633,8 @@ self: {
        pname = "active";
        version = "0.2.0.13";
        sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx";
+       revision = "1";
+       editedCabalFile = "15z0n337bglkn1a3hx2gvh64jx311nmsa4vijynmwp2hq11rgvm6";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -21462,28 +21466,6 @@ self: {
      }) {};
 
   "aeson-pretty" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , cmdargs, scientific, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson-pretty";
-       version = "0.8.4";
-       sha256 = "028527bymhvvry5knaqwjj32x3v15flj6d1c9zqy6gwqp87ji3zx";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring scientific text
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson attoparsec base bytestring cmdargs
-       ];
-       homepage = "http://github.com/informatikr/aeson-pretty";
-       description = "JSON pretty-printing library and command-line tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-pretty_0_8_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , cmdargs, scientific, text, unordered-containers, vector
      }:
@@ -21503,32 +21485,9 @@ self: {
        homepage = "http://github.com/informatikr/aeson-pretty";
        description = "JSON pretty-printing library and command-line tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-qq" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
-     , haskell-src-meta, hspec, parsec, scientific, template-haskell
-     , text, vector
-     }:
-     mkDerivation {
-       pname = "aeson-qq";
-       version = "0.8.1";
-       sha256 = "1z8kh3qjc4khadz1ijdqm7fbk7dh17sisqhpwd3c9aibj2927k9d";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-compat haskell-src-meta parsec
-         scientific template-haskell text vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec
-         parsec scientific template-haskell text vector
-       ];
-       homepage = "http://github.com/zalora/aeson-qq";
-       description = "JSON quasiquoter for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "aeson-qq_0_8_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
      , haskell-src-meta, hspec, parsec, scientific, template-haskell
      , text, vector
@@ -21548,7 +21507,6 @@ self: {
        homepage = "https://github.com/sol/aeson-qq#readme";
        description = "JSON quasiquoter for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-quick" = callPackage
@@ -28447,28 +28405,6 @@ self: {
      }) {};
 
   "audacity" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, directory
-     , explicit-exception, filepath, non-empty, storable-record
-     , storablevector, tagchup, transformers, utility-ht, xml-basic
-     }:
-     mkDerivation {
-       pname = "audacity";
-       version = "0.0.1.1";
-       sha256 = "1hmb87h4ynlzcgspqw3g9jzjkfwf5l5n96dws3jppbvhkbhk7lzi";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring deepseq directory explicit-exception filepath
-         non-empty storable-record storablevector tagchup transformers
-         utility-ht xml-basic
-       ];
-       homepage = "http://hub.darcs.net/thielema/audacity";
-       description = "Interchange with the Audacity sound signal editor";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "audacity_0_0_1_2" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory
      , explicit-exception, filepath, non-empty, storable-record
      , storablevector, tagchup, transformers, utility-ht, xml-basic
@@ -31110,25 +31046,6 @@ self: {
      }) {};
 
   "bench" = callPackage
-    ({ mkDerivation, base, criterion, optparse-applicative, silently
-     , text, turtle
-     }:
-     mkDerivation {
-       pname = "bench";
-       version = "1.0.4";
-       sha256 = "1q376q5jy3i99smx06dma4d05jdxmcfyfskjkj7bmm3g84fdwxas";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base criterion optparse-applicative silently text turtle
-       ];
-       homepage = "http://github.com/Gabriel439/bench";
-       description = "Command-line benchmark tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "bench_1_0_5" = callPackage
     ({ mkDerivation, base, criterion, optparse-applicative, silently
      , text, turtle
      }:
@@ -33064,7 +32981,7 @@ self: {
        description = "Bindings to the Yices theorem prover";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
+     }) {inherit (pkgs) gmp; yices = null;};
 
   "bindynamic" = callPackage
     ({ mkDerivation, base, binary, bytestring, rank1dynamic }:
@@ -34639,6 +34556,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "blockchain" = callPackage
+    ({ mkDerivation, aeson, async, base, byteable, bytestring
+     , cryptonite, deepseq, either, errors, hashable, hspec, memory, mtl
+     , QuickCheck, text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "blockchain";
+       version = "0.0.2";
+       sha256 = "1abd2p587p3kvg3zyn3qmlhk0lw42cs18f7msgkcz07r2k99r047";
+       libraryHaskellDepends = [
+         aeson base byteable bytestring cryptonite either errors hashable
+         memory mtl text time transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson async base byteable bytestring cryptonite deepseq either
+         errors hashable hspec memory mtl QuickCheck text time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/TGOlson/blockchain";
+       description = "Generic blockchain implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "blockhash" = callPackage
     ({ mkDerivation, base, bytestring, JuicyPixels
      , optparse-applicative, primitive, vector, vector-algorithms
@@ -37145,8 +37085,8 @@ self: {
      }:
      mkDerivation {
        pname = "c-mosquitto";
-       version = "0.1.0.0";
-       sha256 = "0gyd0h905mi23a8xmg1cyhl3yj6qcq1gqr2yyiv3xav8hf1crszm";
+       version = "0.1.0.1";
+       sha256 = "0scghhz6d9i3rbdl95dvfc03ds99nx0hgmsx29n1d8v8bvvmkpz4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38473,6 +38413,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cacophony_0_10_0" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
+     , bytestring, criterion, cryptonite, deepseq, directory, exceptions
+     , free, hlint, lens, memory, monad-coroutine, mtl, safe-exceptions
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "cacophony";
+       version = "0.10.0";
+       sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cryptonite exceptions free lens memory
+         monad-coroutine mtl safe-exceptions transformers
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring directory hlint
+         text
+       ];
+       benchmarkHaskellDepends = [
+         async base base16-bytestring bytestring criterion deepseq
+       ];
+       homepage = "https://github.com/centromere/cacophony#readme";
+       description = "A library implementing the Noise protocol";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "caf" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -39212,23 +39181,6 @@ self: {
      }) {};
 
   "carray" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, ix-shapable
-     , QuickCheck, syb
-     }:
-     mkDerivation {
-       pname = "carray";
-       version = "0.1.6.6";
-       sha256 = "1h22n68qpk6zfx0yfyj66ccwhxisw6ijziy5jmqqx9g605n16l4z";
-       libraryHaskellDepends = [
-         array base binary bytestring ix-shapable QuickCheck syb
-       ];
-       testHaskellDepends = [ array base ix-shapable QuickCheck ];
-       benchmarkHaskellDepends = [ array base ];
-       description = "A C-compatible array library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "carray_0_1_6_7" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, ix-shapable
      , QuickCheck, syb
      }:
@@ -39243,7 +39195,6 @@ self: {
        benchmarkHaskellDepends = [ array base ];
        description = "A C-compatible array library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "carte" = callPackage
@@ -41198,6 +41149,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "checkers_0_4_7" = callPackage
+    ({ mkDerivation, array, base, QuickCheck, random }:
+     mkDerivation {
+       pname = "checkers";
+       version = "0.4.7";
+       sha256 = "15rb9j7hsdpnf57nw115z74bbk794x705bha8kz0qgb1rlpwpngr";
+       libraryHaskellDepends = [ array base QuickCheck random ];
+       description = "Check properties on standard classes and data structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "chell" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, options, patience
      , random, template-haskell, text, transformers
@@ -41854,6 +41817,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "circle-packing_0_1_0_6" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "circle-packing";
+       version = "0.1.0.6";
+       sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4";
+       libraryHaskellDepends = [ base ];
+       description = "Simple heuristic for packing discs of varying radii in a circle";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "circlehs" = callPackage
     ({ mkDerivation, aeson, base, http-client, http-client-tls, mtl
      , servant, servant-client, text, time, transformers
@@ -42487,20 +42462,6 @@ self: {
      }) {};
 
   "clay" = callPackage
-    ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
-     mkDerivation {
-       pname = "clay";
-       version = "0.12.1";
-       sha256 = "0yl65gjg2g99g2wz8l825514821dky990968zs8y899ksrnp5qzd";
-       libraryHaskellDepends = [ base mtl text ];
-       testHaskellDepends = [ base hspec hspec-expectations mtl text ];
-       homepage = "http://fvisser.nl/clay";
-       description = "CSS preprocessor as embedded Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clay_0_12_2" = callPackage
     ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
      mkDerivation {
        pname = "clay";
@@ -43722,6 +43683,34 @@ self: {
        license = "GPL";
      }) {};
 
+  "cmv" = callPackage
+    ({ mkDerivation, aeson, base, BiobaseInfernal, BiobaseTypes
+     , BiobaseXNA, BioHMM, bytestring, cmdargs, colour, containers
+     , diagrams-cairo, diagrams-lib, directory, either-unwrap, filepath
+     , mtl, parsec, ParsecTools, PrimitiveArray, StockholmAlignment
+     , SVGFonts, template-haskell, text, vector
+     }:
+     mkDerivation {
+       pname = "cmv";
+       version = "1.0.2";
+       sha256 = "107cwha465c7i2yi1k9m2csf9kdszrix7295d1q0dhklwi0fll8d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base BiobaseInfernal BiobaseTypes BiobaseXNA BioHMM colour
+         containers diagrams-cairo diagrams-lib directory either-unwrap
+         filepath mtl parsec ParsecTools PrimitiveArray StockholmAlignment
+         SVGFonts text vector
+       ];
+       executableHaskellDepends = [
+         aeson base BiobaseInfernal BiobaseXNA BioHMM bytestring cmdargs
+         colour containers diagrams-lib directory either-unwrap filepath
+         parsec StockholmAlignment template-haskell text vector
+       ];
+       description = "Detailed visualization of CMs, HMMs and their comparisions";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "cnc-spec-compiler" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, binary, bytestring
      , containers, directory, fgl, filepath, graphviz, HaXml, haxr
@@ -46176,28 +46165,6 @@ self: {
      }) {};
 
   "conduit-parse" = callPackage
-    ({ mkDerivation, base, conduit, dlist, hlint, mtl, parsers
-     , resourcet, safe, safe-exceptions, tasty, tasty-hunit, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "conduit-parse";
-       version = "0.1.2.0";
-       sha256 = "05yfggq2g8ifwgb4w12i9n7hgjydvyk9i3bkszxk0ba51rmiyqhm";
-       libraryHaskellDepends = [
-         base conduit dlist mtl parsers safe safe-exceptions text
-         transformers
-       ];
-       testHaskellDepends = [
-         base conduit hlint mtl parsers resourcet safe-exceptions tasty
-         tasty-hunit
-       ];
-       homepage = "https://github.com/k0ral/conduit-parse";
-       description = "Parsing framework based on conduit";
-       license = "unknown";
-     }) {};
-
-  "conduit-parse_0_1_2_1" = callPackage
     ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint
      , mtl, parsers, resourcet, safe, safe-exceptions, tasty
      , tasty-hunit, text, transformers
@@ -46217,7 +46184,6 @@ self: {
        homepage = "https://github.com/k0ral/conduit-parse";
        description = "Parsing framework based on conduit";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-resumablesink" = callPackage
@@ -48071,6 +48037,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "country" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, hashable, primitive
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "country";
+       version = "0.1";
+       sha256 = "108j6wvismx69p9a13rskr4lsfiicjpfhk0397sgxn2jawaz5vim";
+       libraryHaskellDepends = [
+         base bytestring ghc-prim hashable primitive text
+         unordered-containers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/andrewthad/country#readme";
+       description = "Country data type and functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "country-codes" = callPackage
     ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }:
      mkDerivation {
@@ -48223,6 +48207,27 @@ self: {
        license = "LGPL";
      }) {};
 
+  "cpphs_1_20_8" = callPackage
+    ({ mkDerivation, base, directory, old-locale, old-time, polyparse
+     }:
+     mkDerivation {
+       pname = "cpphs";
+       version = "1.20.8";
+       sha256 = "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory old-locale old-time polyparse
+       ];
+       executableHaskellDepends = [
+         base directory old-locale old-time polyparse
+       ];
+       homepage = "http://projects.haskell.org/cpphs/";
+       description = "A liberalised re-implementation of cpp, the C pre-processor";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cprng-aes" = callPackage
     ({ mkDerivation, base, byteable, bytestring, cipher-aes, criterion
      , crypto-random, mtl
@@ -55780,6 +55785,8 @@ self: {
        pname = "diagrams-lib";
        version = "1.4.1.2";
        sha256 = "0w16cljv9jcvn46hd19qvw1bfvxijlak286nap9qbvyavq2qhvjb";
+       revision = "2";
+       editedCabalFile = "0na2aqk7aw2f1nq62r1zwmv3f5h9yx61b0b5qxmsazgyvqjgc3z3";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -55977,6 +55984,8 @@ self: {
        pname = "diagrams-svg";
        version = "1.4.1";
        sha256 = "11vzcsqgkc8jzm5dw82swgqzahck541mz2l9jkkwfdaq09w16sff";
+       revision = "1";
+       editedCabalFile = "12cp0898pplap5skhq43xsxh0m2ilv5lz9zw2fhkkjmnr4pbl2dx";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
@@ -58103,6 +58112,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dlist-nonempty" = callPackage
+    ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq
+     , dlist, dlist-instances, QuickCheck, quickcheck-instances
+     , semigroupoids
+     }:
+     mkDerivation {
+       pname = "dlist-nonempty";
+       version = "0.1";
+       sha256 = "13nkf2kgm8pd1vicd2lm2z99m04bs65pm1kjn4k4a2259h3hd0m8";
+       libraryHaskellDepends = [
+         base base-compat deepseq dlist semigroupoids
+       ];
+       testHaskellDepends = [
+         base Cabal QuickCheck quickcheck-instances
+       ];
+       benchmarkHaskellDepends = [
+         base base-compat criterion dlist dlist-instances
+       ];
+       homepage = "https://github.com/phadej/dlist-nonempty";
+       description = "Non-empty difference lists";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dmc" = callPackage
     ({ mkDerivation, base, hspec, process, QuickCheck }:
      mkDerivation {
@@ -58457,33 +58489,6 @@ self: {
      }) {};
 
   "doctest" = callPackage
-    ({ mkDerivation, base, base-compat, code-page, deepseq, directory
-     , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
-     , QuickCheck, setenv, silently, stringbuilder, syb, transformers
-     , with-location
-     }:
-     mkDerivation {
-       pname = "doctest";
-       version = "0.11.2";
-       sha256 = "12wlc7qxpr8i46inj8jgq6s224l4h5vka3zw7ibpjhddligdwlh7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         process syb transformers
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base-compat code-page deepseq directory filepath ghc ghc-paths
-         hspec HUnit mockery process QuickCheck setenv silently
-         stringbuilder syb transformers with-location
-       ];
-       homepage = "https://github.com/sol/doctest#readme";
-       description = "Test interactive Haskell examples";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "doctest_0_11_3" = callPackage
     ({ mkDerivation, base, base-compat, code-page, deepseq, directory
      , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process
      , QuickCheck, setenv, silently, stringbuilder, syb, transformers
@@ -58508,7 +58513,6 @@ self: {
        homepage = "https://github.com/sol/doctest#readme";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover" = callPackage
@@ -58791,33 +58795,6 @@ self: {
      }) {};
 
   "dotenv" = callPackage
-    ({ mkDerivation, base, base-compat, exceptions, hspec
-     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "dotenv";
-       version = "0.3.3.0";
-       sha256 = "1n6klccf3rd5l6m0nbbdb6abwgfrjyi19x2g3sjxh3fhqqb1qigg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat exceptions megaparsec text transformers
-       ];
-       executableHaskellDepends = [
-         base base-compat megaparsec optparse-applicative process text
-         transformers
-       ];
-       testHaskellDepends = [
-         base base-compat exceptions hspec hspec-megaparsec megaparsec text
-         transformers
-       ];
-       homepage = "https://github.com/stackbuilders/dotenv-hs";
-       description = "Loads environment variables from dotenv files";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dotenv_0_3_4_0" = callPackage
     ({ mkDerivation, base, base-compat, exceptions, hspec
      , hspec-megaparsec, megaparsec, optparse-applicative, process, text
      , transformers
@@ -58842,7 +58819,6 @@ self: {
        homepage = "https://github.com/stackbuilders/dotenv-hs";
        description = "Loads environment variables from dotenv files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dotfs" = callPackage
@@ -59704,8 +59680,8 @@ self: {
      }:
      mkDerivation {
        pname = "duckling";
-       version = "0.1.0.0";
-       sha256 = "16h07ny99a6vndpwy5m3iiikkc0ygrsg1a9l9aklmlcydprlcmvq";
+       version = "0.1.1.0";
+       sha256 = "0c81cjah5iy3p2p9g4z1k0mxwg1256l93m53bnk7pr37439vwnx6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63373,6 +63349,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "esqueleto_2_5_3" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
+     , hspec, HUnit, monad-control, monad-logger, persistent
+     , persistent-sqlite, persistent-template, QuickCheck, resourcet
+     , tagged, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "esqueleto";
+       version = "2.5.3";
+       sha256 = "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x";
+       libraryHaskellDepends = [
+         base blaze-html bytestring conduit monad-logger persistent
+         resourcet tagged text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base conduit containers hspec HUnit monad-control monad-logger
+         persistent persistent-sqlite persistent-template QuickCheck
+         resourcet text transformers
+       ];
+       homepage = "https://github.com/bitemyapp/esqueleto";
+       description = "Type-safe EDSL for SQL queries on persistent backends";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ess" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -65180,8 +65181,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.5.2";
-       sha256 = "0qz0h2nckd0sqzx264q2j0dw66i5glp2vfih3wlm0a2kxcnw1p27";
+       version = "1.5.3";
+       sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4";
        libraryHaskellDepends = [
          base clock directory filepath process time unix
        ];
@@ -66746,23 +66747,6 @@ self: {
      }) {};
 
   "fft" = callPackage
-    ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
-     , QuickCheck, storable-complex, syb, transformers
-     }:
-     mkDerivation {
-       pname = "fft";
-       version = "0.1.8.5";
-       sha256 = "07xab7lw5k01s41sf20v50dxwayg8nlsal6lx0vn4d9ggr6hlags";
-       libraryHaskellDepends = [
-         array base carray ix-shapable storable-complex syb transformers
-       ];
-       libraryPkgconfigDepends = [ fftw fftwFloat ];
-       testHaskellDepends = [ base carray QuickCheck storable-complex ];
-       description = "Bindings to the FFTW library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
-
-  "fft_0_1_8_6" = callPackage
     ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
      , QuickCheck, storable-complex, syb, transformers
      }:
@@ -66777,7 +66761,6 @@ self: {
        testHaskellDepends = [ base carray QuickCheck storable-complex ];
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
   "fftwRaw" = callPackage
@@ -67957,6 +67940,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fizzbuzz-as-a-service" = callPackage
+    ({ mkDerivation, async, base, bytestring, network-simple
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "fizzbuzz-as-a-service";
+       version = "0.1.0.0";
+       sha256 = "1h7spka2igi1yz1dwl1192i4g74wlxp3m011mi6s6j35xpvll99l";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base bytestring network-simple optparse-applicative
+       ];
+       homepage = "https://github.com/chris-martin/haskell-libraries";
+       description = "FizzBuzz as a service";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "flac" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , directory, exceptions, filepath, FLAC, hspec, mtl, temporary
@@ -68542,8 +68543,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.2.7";
-       sha256 = "03x9322rqafviaxfwkiq2g1jlsqh6hw6q4x9ywa6pi7s45d2rm78";
+       version = "0.5.2.9";
+       sha256 = "1pkmfya8vr9rrms0p2wyj4qwmi9ahp4hd1vaapdag686c4084dsg";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -68883,31 +68884,6 @@ self: {
      }) {};
 
   "foldl-statistics" = callPackage
-    ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
-     , profunctors, quickcheck-instances, semigroups, statistics, tasty
-     , tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "foldl-statistics";
-       version = "0.1.4.4";
-       sha256 = "1lihrkc3k3h8mdkbvlwvq0xf9cbhszy50ykshg7yv1y4zdcwqk0q";
-       libraryHaskellDepends = [
-         base foldl math-functions profunctors semigroups
-       ];
-       testHaskellDepends = [
-         base foldl profunctors quickcheck-instances semigroups statistics
-         tasty tasty-quickcheck vector
-       ];
-       benchmarkHaskellDepends = [
-         base criterion foldl mwc-random statistics vector
-       ];
-       homepage = "http://github.com/Data61/foldl-statistics#readme";
-       description = "Statistical functions from the statistics package implemented as Folds";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
-     }) {};
-
-  "foldl-statistics_0_1_4_6" = callPackage
     ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
      , profunctors, quickcheck-instances, statistics, tasty
      , tasty-quickcheck, vector
@@ -68927,7 +68903,7 @@ self: {
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "foldl-transduce" = callPackage
@@ -69172,6 +69148,8 @@ self: {
        pname = "force-layout";
        version = "0.4.0.6";
        sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp";
+       revision = "1";
+       editedCabalFile = "1ydj5ng7wsi9jg6xw9bg8c7wrsg2jpnvjkjvzxaf6n8sjs0gxhvw";
        libraryHaskellDepends = [
          base containers data-default-class lens linear
        ];
@@ -69642,8 +69620,8 @@ self: {
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.10";
-       sha256 = "0ihrdgsn4ivpyhck0qqcfqx2xza1spqv81sd071i151yfyvl1a5p";
+       version = "0.0.11";
+       sha256 = "0jgxcr532vb7376h43l88g0rjgbil2caqnknmznfsprawy6a9s1v";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -84502,6 +84480,8 @@ self: {
        pname = "hackertyper";
        version = "0.1.0.1";
        sha256 = "17c77f687874bfwahmzcz2v6k8z9p4fv555r5r1f38snsdi825gf";
+       revision = "1";
+       editedCabalFile = "1slyp8ncpiv204yxb2p7z0kwz4xhqv8czfrx4p78cbbhrlkmgnpm";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
@@ -86818,8 +86798,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-static-routing";
-       version = "0.4.2";
-       sha256 = "0g8b94mfhajgs99rgvzfrlc19cxm5a0j6cgrrlrdhgfx7lggc9h2";
+       version = "0.6.0.0";
+       sha256 = "18r7nb6558yvspc486sxckb8708wsvgqgagaycg1qbdxbfhnshhg";
        libraryHaskellDepends = [
          base containers happstack-server list-tries transformers
        ];
@@ -87214,28 +87194,6 @@ self: {
      }) {};
 
   "hasbolt" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
-     , data-binary-ieee754, data-default, hex, hspec, network
-     , network-simple, QuickCheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "hasbolt";
-       version = "0.1.1.2";
-       sha256 = "13razc8k8ik008hssxrmypw9a8idr0rm3j37dn8957wklb2634d8";
-       libraryHaskellDepends = [
-         base binary bytestring containers data-binary-ieee754 data-default
-         hex network network-simple text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers hex hspec QuickCheck text
-       ];
-       homepage = "https://github.com/zmactep/hasbolt#readme";
-       description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasbolt_0_1_1_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-binary-ieee754, data-default, hex, hspec, network
      , network-simple, QuickCheck, text, transformers
@@ -87448,6 +87406,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashable_1_2_6_1" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
+     , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, unix
+     }:
+     mkDerivation {
+       pname = "hashable";
+       version = "1.2.6.1";
+       sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
+         base bytestring ghc-prim HUnit QuickCheck random test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim integer-gmp siphash text
+       ];
+       homepage = "http://github.com/tibbe/hashable";
+       description = "A class for types that can be converted to a hash value";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashable-extras" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
      , filepath, hashable, transformers, transformers-compat
@@ -93774,6 +93759,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hexpat_0_20_13" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, expat, List
+     , text, transformers, utf8-string
+     }:
+     mkDerivation {
+       pname = "hexpat";
+       version = "0.20.13";
+       sha256 = "1l9zfp69r3xaxi2znjwpcrx7xckcqvaahv2c0qgkqq61a7ka1qa6";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq List text transformers
+         utf8-string
+       ];
+       librarySystemDepends = [ expat ];
+       homepage = "http://haskell.org/haskellwiki/Hexpat/";
+       description = "XML parser/formatter based on expat";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) expat;};
+
   "hexpat-iteratee" = callPackage
     ({ mkDerivation, base, bytestring, containers
      , extensible-exceptions, hexpat, iteratee, List, parallel
@@ -96092,8 +96096,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.2.1";
        sha256 = "07jrd8cfy9srazad440b1c24m6s6fvla9jzrksr64gz6vkxkc9mw";
-       revision = "1";
-       editedCabalFile = "114csw9ss3inki8kl2vgb04dpf1nnyp2i5jj3cx6m4d5l3m32yx6";
+       revision = "2";
+       editedCabalFile = "08a8r9cbljpjykqwgij7ilcd9rprq0jxx09gc7vvq8ml7rhg5yv8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97073,8 +97077,8 @@ self: {
      }:
      mkDerivation {
        pname = "hnormalise";
-       version = "0.4.1.0";
-       sha256 = "0mmkd0nidkffp80nn8yn9i1x7cqsi8qs2qyfgp36sjay58y92744";
+       version = "0.4.1.1";
+       sha256 = "0q25mds552c87f2xs7s82b749drg3r41qswy0k8jmyz5dsc9wcir";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98130,20 +98134,6 @@ self: {
      }) {};
 
   "hopfli" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
-     mkDerivation {
-       pname = "hopfli";
-       version = "0.2.1.1";
-       sha256 = "1pqz7f0bvvvmirjrzr1jich4853d6rc99jiwpcj6sb3c75wb5ibc";
-       libraryHaskellDepends = [ base bytestring zlib ];
-       testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
-       homepage = "https://github.com/ananthakumaran/hopfli";
-       description = "Bidings to Google's Zopfli compression library";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hopfli_0_2_2_1" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
      mkDerivation {
        pname = "hopfli";
@@ -98700,29 +98690,29 @@ self: {
   "hpack-convert" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , Cabal, containers, deepseq, directory, filepath, Glob, hspec
-     , interpolate, mockery, pretty, QuickCheck, temporary, text
+     , interpolate, mockery, pretty, QuickCheck, split, temporary, text
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "hpack-convert";
-       version = "1.0.0";
-       sha256 = "0l90sc6fn0c5yv653h7gv2k2wx6bcfksfb3zv6b2vkn54c8q4ldm";
+       version = "1.0.1";
+       sha256 = "1qwrbx22d3gvxa4hr4mk37vw9cms0gq1h8xaqphw7rpgs2iycfkp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base base-compat bytestring Cabal containers deepseq
-         directory filepath Glob pretty text unordered-containers vector
-         yaml
+         directory filepath Glob pretty split text unordered-containers
+         vector yaml
        ];
        executableHaskellDepends = [
          aeson base base-compat bytestring Cabal containers deepseq
-         directory filepath Glob pretty text unordered-containers vector
-         yaml
+         directory filepath Glob pretty split text unordered-containers
+         vector yaml
        ];
        testHaskellDepends = [
          aeson aeson-qq base base-compat bytestring Cabal containers deepseq
          directory filepath Glob hspec interpolate mockery pretty QuickCheck
-         temporary text unordered-containers vector yaml
+         split temporary text unordered-containers vector yaml
        ];
        homepage = "https://github.com/yamadapc/hpack-convert#readme";
        description = "Convert Cabal manifests into hpack's package.yamls";
@@ -100133,6 +100123,17 @@ self: {
        license = "LGPL";
      }) {};
 
+  "hsI2C" = callPackage
+    ({ mkDerivation, base, bytestring, unix }:
+     mkDerivation {
+       pname = "hsI2C";
+       version = "0.1.2";
+       sha256 = "0ma8klvyv4rnfxkag99vm4nvw77yppcv63p6829b4ynsa9vyv9rn";
+       libraryHaskellDepends = [ base bytestring unix ];
+       description = "I2C access for Haskell and Linux";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hsSqlite3" = callPackage
     ({ mkDerivation, base, bindings-sqlite3, bytestring, mtl
      , utf8-string
@@ -104046,29 +104047,6 @@ self: {
      }) {};
 
   "http-client-tls" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, connection
-     , containers, criterion, cryptonite, data-default-class, exceptions
-     , hspec, http-client, http-types, memory, network, network-uri
-     , text, tls, transformers
-     }:
-     mkDerivation {
-       pname = "http-client-tls";
-       version = "0.3.5";
-       sha256 = "1jgwca2dn269c7z14yasj0i1qayz5lvxxqf72m0y62cqwx4hdm5h";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive connection containers cryptonite
-         data-default-class exceptions http-client http-types memory network
-         network-uri text tls transformers
-       ];
-       testHaskellDepends = [ base hspec http-client http-types ];
-       benchmarkHaskellDepends = [ base criterion http-client ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "http-client backend using the connection package and tls library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-tls_0_3_5_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
      , containers, criterion, cryptonite, data-default-class, exceptions
      , hspec, http-client, http-types, memory, network, network-uri
@@ -104089,7 +104067,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-common" = callPackage
@@ -108125,17 +108102,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ilist_0_3_0_0" = callPackage
-    ({ mkDerivation, base, criterion, hspec, lens, transformers, vector
+  "ilist_0_3_1_0" = callPackage
+    ({ mkDerivation, base, criterion, hspec, lens, loop, transformers
+     , vector
      }:
      mkDerivation {
        pname = "ilist";
-       version = "0.3.0.0";
-       sha256 = "0k3rxifpxq5qrkn6ak2rm379v554c70rq2c13j3df471hb3hs6y8";
+       version = "0.3.1.0";
+       sha256 = "15zy584mjk85kr69acs1r7dfsr7g2mgy2bbfyrla5rbp23fy3678";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec transformers ];
        benchmarkHaskellDepends = [
-         base criterion lens transformers vector
+         base criterion lens loop transformers vector
        ];
        homepage = "http://github.com/aelve/ilist";
        description = "Optimised list functions for doing index-related things";
@@ -108780,26 +108758,6 @@ self: {
      }) {};
 
   "incremental-parser" = callPackage
-    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
-     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "incremental-parser";
-       version = "0.2.5";
-       sha256 = "1hbsm1g8avph1n107c32d1r3bbk6kli6rg7a1k03wf3dx04d43vx";
-       libraryHaskellDepends = [ base monoid-subclasses ];
-       testHaskellDepends = [
-         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq monoid-subclasses text
-       ];
-       homepage = "https://github.com/blamario/incremental-parser";
-       description = "Generic parser library capable of providing partial results from partial input";
-       license = "GPL";
-     }) {};
-
-  "incremental-parser_0_2_5_1" = callPackage
     ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
      , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
      }:
@@ -108817,7 +108775,6 @@ self: {
        homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -111082,8 +111039,8 @@ self: {
        pname = "irc-dcc";
        version = "2.0.1";
        sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234";
-       revision = "2";
-       editedCabalFile = "1zw5a6aj2jfl482197v741rjsrc13bsirq0a290qbjsyyib9jjzk";
+       revision = "3";
+       editedCabalFile = "1kc4yzm5k0s069dhyncj5rmxnbfjjn8ynx182wp9v5qhylgicx98";
        libraryHaskellDepends = [
          attoparsec base binary bytestring io-streams iproute irc-ctcp mtl
          network path safe-exceptions transformers utf8-string
@@ -111190,8 +111147,8 @@ self: {
      }:
      mkDerivation {
        pname = "ircbot";
-       version = "0.6.5";
-       sha256 = "1bay1r0x4b8kk07g1p1476p2ppv6jyryiya6q5fn8icn94x77sza";
+       version = "0.6.5.1";
+       sha256 = "1cam9f7ppxj7yh1am0qjkh8b19haggrqdmkd26xik1ymn7nq9iyd";
        libraryHaskellDepends = [
          base bytestring containers directory filepath irc mtl network
          parsec random SafeSemaphore stm time unix
@@ -112270,6 +112227,19 @@ self: {
        license = "GPL";
      }) {};
 
+  "japanese-holidays" = callPackage
+    ({ mkDerivation, base, doctest, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "japanese-holidays";
+       version = "0.1.0.0";
+       sha256 = "1phlq2jzvkdr9askpnbryc7aw6mk7121kh2fz5wqr23cs8mg5m6b";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base doctest hspec QuickCheck time ];
+       homepage = "http://github.com/cohei/japanese-holidays#readme";
+       description = "Japanese holidays utility";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jarfind" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, regex-tdfa
      , zip-archive
@@ -112994,8 +112964,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.9.2.0";
-       sha256 = "0ymq70kwwi60f1rgjnjz914xv465zrnbbw5z351439qg572f8mvg";
+       version = "0.9.2.1";
+       sha256 = "0527hsra6x9iblv1i8k145waha861zx5khk0f7c7sqar72qmrzj4";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring containers
          deepseq filepath ghc-prim http-types lens primitive process ref-tf
@@ -117874,6 +117844,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-sally" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, text
+     }:
+     mkDerivation {
+       pname = "language-sally";
+       version = "0.1.0.1";
+       sha256 = "0zbq1sjf96hpsidnx2cqwh4g4q3s5zqq6iv92y4rwff58j2fdy35";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base bytestring containers text
+       ];
+       description = "AST and pretty printer for Sally";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "language-sh" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, parsec, pcre-light
      }:
@@ -122295,8 +122279,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs";
-       version = "4.1.0.0";
-       sha256 = "02692n5vllv025r6c79kc5z52rxcj3m8d1q6b1fsk1i5mkpp6rlh";
+       version = "4.2.0";
+       sha256 = "12rclc9l85yqh1h0y7m6m65fpb81crzafmkcwq90vl7i5bf1bv1j";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -122821,16 +122805,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "log_0_9_0_0" = callPackage
-    ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions
-     , http-client, http-types, log-base, log-elasticsearch
-     , log-postgres, process, random, tasty, tasty-hunit, text, time
-     , transformers
+  "log_0_9_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bloodhound, bytestring, ekg
+     , exceptions, hpqtypes, http-client, http-types, log-base
+     , log-elasticsearch, log-postgres, process, random, tasty
+     , tasty-hunit, text, text-show, time, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "log";
-       version = "0.9.0.0";
-       sha256 = "16hrygsprq55xh69hvgwppf9cx164fza0n7ss2w7nh6k0dg6rb11";
+       version = "0.9.0.1";
+       sha256 = "1gjh3i0j2q72hc1gnn4knc5qhb2zc7d4pi5a22jd0dqgpkmdaay3";
        libraryHaskellDepends = [
          base log-base log-elasticsearch log-postgres
        ];
@@ -122838,6 +122823,10 @@ self: {
          aeson base bloodhound bytestring exceptions http-client http-types
          process random tasty tasty-hunit text time transformers
        ];
+       benchmarkHaskellDepends = [
+         base ekg hpqtypes random text text-show transformers
+         transformers-base
+       ];
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution with multiple backends";
        license = stdenv.lib.licenses.bsd3;
@@ -122863,30 +122852,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "log-domain" = callPackage
-    ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
-     , directory, distributive, doctest, filepath, generic-deriving
-     , hashable, safecopy, semigroupoids, semigroups, simple-reflect
-     , vector
+  "log-base_0_7_1_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
+     , exceptions, monad-control, monad-time, mtl, semigroups, stm, text
+     , time, transformers-base, unordered-containers
      }:
      mkDerivation {
-       pname = "log-domain";
-       version = "0.11";
-       sha256 = "1js2havkab64qvhw22pkiq7zas7yl7vn9hir7i4ifqwv5ddwsl27";
+       pname = "log-base";
+       version = "0.7.1.1";
+       sha256 = "0kxng0pvql8sv4wk3x1bx0a0mqjsr3ynbixps9l1zrmsisp01344";
        libraryHaskellDepends = [
-         base binary bytes cereal comonad deepseq distributive hashable
-         safecopy semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base directory doctest filepath generic-deriving semigroups
-         simple-reflect
+         aeson aeson-pretty base bytestring deepseq exceptions monad-control
+         monad-time mtl semigroups stm text time transformers-base
+         unordered-containers
        ];
-       homepage = "http://github.com/ekmett/log-domain/";
-       description = "Log-domain arithmetic";
+       homepage = "https://github.com/scrive/log";
+       description = "Structured logging solution (base package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "log-domain_0_11_1" = callPackage
+  "log-domain" = callPackage
     ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
      , comonad, deepseq, distributive, doctest, generic-deriving
      , hashable, safecopy, semigroupoids, semigroups, simple-reflect
@@ -122907,7 +122893,6 @@ self: {
        homepage = "http://github.com/ekmett/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-effect" = callPackage
@@ -122950,7 +122935,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "log-elasticsearch_0_9_0_0" = callPackage
+  "log-elasticsearch_0_9_0_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bloodhound, bytestring, deepseq, http-client, http-client-tls
      , log-base, semigroups, text, text-show, time, transformers
@@ -122958,8 +122943,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-elasticsearch";
-       version = "0.9.0.0";
-       sha256 = "005r1mkyq0ci3gww1qmp6k9n8739gmhjlbrzpq0ymxra7wd3c98c";
+       version = "0.9.0.1";
+       sha256 = "01xfr3rq3s1zp7fw60857c4jvlliy6v9dzx6sip3sbzl3b4hcg1x";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bloodhound bytestring
          deepseq http-client http-client-tls log-base semigroups text
@@ -122992,6 +122977,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "log-postgres_0_7_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base
+     , mtl, semigroups, split, text, text-show, time
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "log-postgres";
+       version = "0.7.0.1";
+       sha256 = "0gfb7xss31fqjlvxs8pywlhzmckgz98srimwhsp819mb9vrysjrn";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring bytestring deepseq
+         hpqtypes http-client lifted-base log-base mtl semigroups split text
+         text-show time unordered-containers vector
+       ];
+       homepage = "https://github.com/scrive/log";
+       description = "Structured logging solution (PostgreSQL back end)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-utils" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, data-default
      , exceptions, hpqtypes, http-types, invariant, kontra-config
@@ -123843,20 +123849,18 @@ self: {
 
   "loup" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
-     , conduit, lifted-async, lifted-base, monad-control
-     , optparse-generic, preamble, shakers, time, turtle
-     , unordered-containers, uuid, yaml
+     , conduit, lifted-async, lifted-base, optparse-generic, preamble
+     , shakers, time, turtle, unordered-containers, uuid, yaml
      }:
      mkDerivation {
        pname = "loup";
-       version = "0.0.5";
-       sha256 = "1c42rp22r37l0fbmd5i463f9pfv7nqchi1rcchv7mcc3wwzyzymq";
+       version = "0.0.6";
+       sha256 = "0lvz5pkb2b4r18hcm4951bc06yb503wywkx20iihax76vgssxr8b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson amazonka amazonka-swf base bytestring conduit lifted-async
-         lifted-base monad-control preamble time turtle unordered-containers
-         uuid yaml
+         lifted-base preamble time turtle unordered-containers uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
        homepage = "https://github.com/swift-nav/loup";
@@ -123928,27 +123932,6 @@ self: {
      }) {};
 
   "lrucaching" = callPackage
-    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
-     , hspec, psqueues, QuickCheck, transformers, vector
-     }:
-     mkDerivation {
-       pname = "lrucaching";
-       version = "0.3.1";
-       sha256 = "1mijn42qd938xx3pd2fi3njfk37rag4xw1f19m3mh7vj1nk7wa1g";
-       revision = "1";
-       editedCabalFile = "0q7hzsc7l64x9gdcxfims25nzqqwammwj91wqv4qjwahgkasmkyn";
-       libraryHaskellDepends = [
-         base base-compat deepseq hashable psqueues vector
-       ];
-       testHaskellDepends = [
-         base containers deepseq hashable hspec QuickCheck transformers
-       ];
-       homepage = "https://github.com/cocreature/lrucaching#readme";
-       description = "LRU cache";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lrucaching_0_3_2" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, hashable
      , hspec, psqueues, QuickCheck, transformers, vector
      }:
@@ -123965,7 +123948,6 @@ self: {
        homepage = "https://github.com/cocreature/lrucaching#readme";
        description = "LRU cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ls-usb" = callPackage
@@ -128472,22 +128454,6 @@ self: {
      }) {};
 
   "microlens-mtl" = callPackage
-    ({ mkDerivation, base, microlens, mtl, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "microlens-mtl";
-       version = "0.1.10.0";
-       sha256 = "17dk2i7ggpipyjnb01wdlqcg4fnmgdbq7xhm34zaw97k03qc9pmi";
-       libraryHaskellDepends = [
-         base microlens mtl transformers transformers-compat
-       ];
-       homepage = "http://github.com/aelve/microlens";
-       description = "microlens support for Reader/Writer/State from mtl";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-mtl_0_1_11_0" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
      }:
@@ -128501,27 +128467,9 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "microlens support for Reader/Writer/State from mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-platform" = callPackage
-    ({ mkDerivation, base, hashable, microlens, microlens-ghc
-     , microlens-mtl, microlens-th, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "microlens-platform";
-       version = "0.3.8.0";
-       sha256 = "113g10zij6afjfm022cdxsmicccp51h17mn5wzj75pidjq85l6z3";
-       libraryHaskellDepends = [
-         base hashable microlens microlens-ghc microlens-mtl microlens-th
-         text unordered-containers vector
-       ];
-       homepage = "http://github.com/aelve/microlens";
-       description = "Feature-complete microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-platform_0_3_9_0" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
      }:
@@ -128536,7 +128484,6 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "Feature-complete microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-th" = callPackage
@@ -128698,27 +128645,6 @@ self: {
      }) {};
 
   "midi-music-box" = callPackage
-    ({ mkDerivation, base, containers, diagrams-lib
-     , diagrams-postscript, event-list, midi, non-empty
-     , optparse-applicative, utility-ht
-     }:
-     mkDerivation {
-       pname = "midi-music-box";
-       version = "0.0.0.3";
-       sha256 = "0hg199mpy0gd20sgp04djf487970j2wzlvba6xhkbg2nxvzcx676";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base containers diagrams-lib diagrams-postscript event-list midi
-         non-empty optparse-applicative utility-ht
-       ];
-       homepage = "http://hub.darcs.net/thielema/midi-music-box";
-       description = "Convert MIDI file to music box punch tape";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "midi-music-box_0_0_0_4" = callPackage
     ({ mkDerivation, base, containers, diagrams-lib
      , diagrams-postscript, event-list, midi, non-empty
      , optparse-applicative, utility-ht
@@ -129766,26 +129692,6 @@ self: {
      }) {};
 
   "mockery" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, directory, filepath
-     , hspec, logging-facade, temporary
-     }:
-     mkDerivation {
-       pname = "mockery";
-       version = "0.3.4";
-       sha256 = "0f19b057cphfslw3brc690v4hq86xwjlllfc9idbilfgz7s3bzih";
-       libraryHaskellDepends = [
-         base base-compat bytestring directory filepath logging-facade
-         temporary
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring directory filepath hspec logging-facade
-         temporary
-       ];
-       description = "Support functions for automated testing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mockery_0_3_5" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, directory, filepath
      , hspec, logging-facade, temporary
      }:
@@ -129803,7 +129709,6 @@ self: {
        ];
        description = "Support functions for automated testing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modbus-tcp" = callPackage
@@ -130117,14 +130022,14 @@ self: {
      }:
      mkDerivation {
        pname = "mollie-api-haskell";
-       version = "0.1.0.2";
-       sha256 = "0mg2c24721w1mmdw0azmng2blsad11ghf4i0ynb4jk7bwgqi6j1d";
+       version = "0.2.0.0";
+       sha256 = "1k2sx65d486dzb9xs2byi3p4ppacj2qjknhqx2kd0020zi7w9s5n";
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-client http-client-openssl
          http-types mtl text time
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/paramanders/mollie-api-haskell";
+       homepage = "https://github.com/paramander/mollie-api-haskell";
        description = "Mollie API client for Haskell http://www.mollie.com";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130268,22 +130173,6 @@ self: {
      }) {};
 
   "monad-control" = callPackage
-    ({ mkDerivation, base, stm, transformers, transformers-base
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "monad-control";
-       version = "1.0.1.0";
-       sha256 = "1x018gi5irznx5rgzmkr2nrgh26r8cvqwkcfc6n6y05pdjf21c6l";
-       libraryHaskellDepends = [
-         base stm transformers transformers-base transformers-compat
-       ];
-       homepage = "https://github.com/basvandijk/monad-control";
-       description = "Lift control operations, like exception catching, through monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-control_1_0_2_0" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
      }:
@@ -130297,7 +130186,6 @@ self: {
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-control-aligned" = callPackage
@@ -131687,8 +131575,8 @@ self: {
        pname = "monoid-extras";
        version = "0.4.2";
        sha256 = "07r86ip6jfa2ka84dpilap01g1pg8r5bqz2nk7js6mlnbh2lxzqk";
-       revision = "1";
-       editedCabalFile = "1nmrv2i3lg0rdl0rkxnhxl160j14p1x1ikz1b6jbr00yxxs8zdry";
+       revision = "2";
+       editedCabalFile = "04h78r48rg2ppi53869vb8y226g135fxgy9ryi1v08nqsiqi1vvw";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Various extra monoid-related definitions and utilities";
@@ -131732,28 +131620,6 @@ self: {
      }) {};
 
   "monoid-subclasses" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
-     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
-     }:
-     mkDerivation {
-       pname = "monoid-subclasses";
-       version = "0.4.3.1";
-       sha256 = "1kc34w94w59vd3s4ird0mwksv9gqwmb4d4m2gld6155n2rwx0w51";
-       revision = "1";
-       editedCabalFile = "1fplps682kir8phq2fkzrnbp8qf9i29rgikg47wc5diw70g2wy26";
-       libraryHaskellDepends = [
-         base bytestring containers primes text vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers primes QuickCheck quickcheck-instances
-         tasty tasty-quickcheck text vector
-       ];
-       homepage = "https://github.com/blamario/monoid-subclasses/";
-       description = "Subclasses of Monoid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoid-subclasses_0_4_3_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
@@ -131771,7 +131637,6 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -132048,37 +131913,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, code-page, containers
-     , criterion, deepseq, Earley, http-client, http-client-tls
-     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
-     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
-     , tasty-quickcheck, text, text-format, transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.6.7";
-       sha256 = "16h33fk02zyjf73xvz73p5aqvvv2i6ax8b42fv87rybabsa3h0j5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text text-format transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         base code-page optparse-applicative text text-format
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion system-filepath text ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_9" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, http-client, http-client-tls
      , microlens, microlens-mtl, mtl, optparse-applicative, pipes
@@ -132107,7 +131941,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -135779,6 +135612,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network_2_6_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
+     , test-framework-hunit, unix
+     }:
+     mkDerivation {
+       pname = "network";
+       version = "2.6.3.1";
+       sha256 = "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p";
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [
+         base bytestring doctest HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/haskell/network";
+       description = "Low-level networking interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network" = callPackage
     ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework
      , test-framework-hunit, unix
@@ -137025,8 +136876,8 @@ self: {
     ({ mkDerivation, async, base, bytestring, template-haskell, unix }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.3.2.1";
-       sha256 = "0rmvws1k58iqlcb0h0089l4niki1v90hr15mifjj2jbzrmlas26n";
+       version = "0.3.2.2";
+       sha256 = "1755v5gjbygiywb91a071iys69rp240pl6p2k3w18qm8z74zk7gp";
        libraryHaskellDepends = [
          async base bytestring template-haskell unix
        ];
@@ -139784,8 +139635,8 @@ self: {
      }:
      mkDerivation {
        pname = "opencv";
-       version = "0.0.0.0";
-       sha256 = "1y2mjb6a6iym6h6m7c214lwrmcjhm9snsqgf1jrbq27fr346mrkb";
+       version = "0.0.1.0";
+       sha256 = "1ar5h1z875bqz52j2d1kqmb1v78prwwwn5nmwqz37kg5qk3lhzkf";
        configureFlags = [
          "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++"
        ];
@@ -139817,8 +139668,8 @@ self: {
      }:
      mkDerivation {
        pname = "opencv-extra";
-       version = "0.0.0.0";
-       sha256 = "18r1y9ppw5i324fyfcbc3wm40gg16816javaxmsny5jc0vbl56gq";
+       version = "0.0.0.1";
+       sha256 = "0z0ym7mg6w67vxyj09zybybnhvqvvrdr1n04vzyqj2b5lqbryrw6";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bindings-DSL bytestring containers inline-c inline-c-cpp
@@ -143635,28 +143486,6 @@ self: {
      }) {};
 
   "patat" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
-     , bytestring, containers, directory, filepath, mtl
-     , optparse-applicative, pandoc, skylighting, terminal-size, text
-     , time, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "patat";
-       version = "0.5.2.0";
-       sha256 = "1rpl61n8i0x01fbhr9k8ac8hw3azjrik4vxlwrx7i9n3ncdga7q5";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson ansi-terminal ansi-wl-pprint base bytestring containers
-         directory filepath mtl optparse-applicative pandoc skylighting
-         terminal-size text time unordered-containers yaml
-       ];
-       homepage = "http://github.com/jaspervdj/patat";
-       description = "Terminal-based presentations using Pandoc";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "patat_0_5_2_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
      , bytestring, containers, directory, filepath, mtl, network
      , network-uri, optparse-applicative, pandoc, skylighting
@@ -143677,7 +143506,6 @@ self: {
        homepage = "http://github.com/jaspervdj/patat";
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "patch-combinators" = callPackage
@@ -145686,16 +145514,22 @@ self: {
 
   "pg-store" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
-     , haskell-src-meta, mtl, postgresql-libpq, scientific
-     , template-haskell, text, time
+     , hashable, haskell-src-meta, mtl, postgresql-libpq, QuickCheck
+     , scientific, tagged, template-haskell, test-framework
+     , test-framework-quickcheck2, text, time
      }:
      mkDerivation {
        pname = "pg-store";
-       version = "0.2";
-       sha256 = "1dl33jspcs2lv30h9ji58iydf5l7mhzirjmg8j4wwkgb87zzn928";
+       version = "0.4.2";
+       sha256 = "1i1ma0m7qmn2v2qswv5kj1rbbfscqirkcvyr5nf07czbghwpx1v6";
        libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder bytestring haskell-src-meta mtl
-         postgresql-libpq scientific template-haskell text time
+         aeson attoparsec base blaze-builder bytestring hashable
+         haskell-src-meta mtl postgresql-libpq scientific tagged
+         template-haskell text time
+       ];
+       testHaskellDepends = [
+         base bytestring mtl postgresql-libpq QuickCheck scientific
+         test-framework test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/vapourismo/pg-store";
        description = "Simple storage interface to PostgreSQL";
@@ -145857,8 +145691,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "phaser";
-       version = "1.0.0.0";
-       sha256 = "06m7a61fs6kmd4pgfj1zp7ijzprkdaximynzjv9wm9ynz3fplkzs";
+       version = "1.0.0.1";
+       sha256 = "1ig3hcalfg2qxb092krii6zv95kvq0kng4acvq7l3wz03x66wj29";
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/quickdudley/phaser";
        description = "Incremental multiple pass parser library";
@@ -146613,21 +146447,6 @@ self: {
      }) {};
 
   "pipes-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pipes-bytestring";
-       version = "2.1.4";
-       sha256 = "1svd8ssdqf8lp083g3lray823854i178hhn4ys3qhlxa53g74gvc";
-       libraryHaskellDepends = [
-         base bytestring pipes pipes-group pipes-parse transformers
-       ];
-       description = "ByteString support for pipes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-bytestring_2_1_5" = callPackage
     ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
      , transformers
      }:
@@ -146640,7 +146459,6 @@ self: {
        ];
        description = "ByteString support for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-bzip" = callPackage
@@ -150258,8 +150076,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.37";
-       sha256 = "1qli01x2cbh8sfr4fxbyiq88n28cdmmziaz5qaqa3ii3wm1ajjaf";
+       version = "0.0.39";
+       sha256 = "019apng4q6hz14xnjjs6iyzkrr13pw4pclr9h39s2qjc17xjwc4d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150948,10 +150766,8 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter-ansi-terminal";
-       version = "1.0.1";
-       sha256 = "03vdnkvrwmny0y8p7bkw43l8x6a3b39nw20ii87pys4jr7aadd7c";
-       revision = "1";
-       editedCabalFile = "1yc598kz1p4w0whhl7h7b62fx4lcsyph908anscq299w89xp40lh";
+       version = "1.1";
+       sha256 = "0z2vi26qhrw5z36yy449x5yynv3wyx1c02z4m2lf7la7r9jwwfbj";
        libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
        testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/quchen/prettyprinter";
@@ -151295,8 +151111,8 @@ self: {
      }:
      mkDerivation {
        pname = "privileged-concurrency";
-       version = "0.6";
-       sha256 = "0ns24fvxjdjlhqb0f9fh73r6q8al9ixi197nc30g5b2b7csnixv7";
+       version = "0.6.1";
+       sha256 = "0dky434kdnb84a4wxlx3jcg1f7c7g4xh0llfiqv48wpk7lwkaic2";
        libraryHaskellDepends = [
          base contravariant lifted-base monad-control stm transformers-base
        ];
@@ -151426,24 +151242,6 @@ self: {
      }) {};
 
   "process-extras" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, deepseq
-     , generic-deriving, HUnit, ListLike, mtl, process, text
-     }:
-     mkDerivation {
-       pname = "process-extras";
-       version = "0.7.1";
-       sha256 = "03ykpjk2li6392vwqi1vi4pwvqbzyady98xbhq7vjq2rh8l64pyj";
-       libraryHaskellDepends = [
-         base bytestring data-default deepseq generic-deriving ListLike mtl
-         process text
-       ];
-       testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/seereason/process-extras";
-       description = "Process extras";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "process-extras_0_7_2" = callPackage
     ({ mkDerivation, base, bytestring, data-default, deepseq
      , generic-deriving, HUnit, ListLike, mtl, process, text
      }:
@@ -151459,7 +151257,6 @@ self: {
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-iterio" = callPackage
@@ -152362,21 +152159,6 @@ self: {
      }) {};
 
   "proto-lens-optparse" = callPackage
-    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
-     mkDerivation {
-       pname = "proto-lens-optparse";
-       version = "0.1.0.2";
-       sha256 = "1mi4q21i7zzlk6bs8p6ir07bfw2n1kavamxb90v90vdjy42bdbyn";
-       libraryHaskellDepends = [
-         base optparse-applicative proto-lens text
-       ];
-       homepage = "https://github.com/google/proto-lens";
-       description = "Adapting proto-lens to optparse-applicative ReadMs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "proto-lens-optparse_0_1_0_3" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
@@ -160458,6 +160240,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "req_0_3_0" = callPackage
+    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
+     , bytestring, case-insensitive, connection, data-default-class
+     , hspec, hspec-core, http-api-data, http-client, http-client-tls
+     , http-types, mtl, QuickCheck, retry, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "req";
+       version = "0.3.0";
+       sha256 = "1wmj2grzkdwhi2cksp4xzxlrb99y9wysjxzvbbfy75dz2pkkwz3m";
+       libraryHaskellDepends = [
+         aeson authenticate-oauth base blaze-builder bytestring
+         case-insensitive connection data-default-class http-api-data
+         http-client http-client-tls http-types mtl retry text time
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive
+         data-default-class hspec hspec-core http-client http-types mtl
+         QuickCheck retry text time unordered-containers
+       ];
+       homepage = "https://github.com/mrkkrp/req";
+       description = "Easy-to-use, type-safe, expandable, high-level HTTP library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "req-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
      , http-client, req, resourcet, temporary, transformers, weigh
@@ -160484,6 +160294,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "req-conduit_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
+     , http-client, req, resourcet, temporary, transformers, weigh
+     }:
+     mkDerivation {
+       pname = "req-conduit";
+       version = "0.2.0";
+       sha256 = "0yf5lmmf3fv4lfxyrk0kpzk8p0pzhfany05d7ny8l11mr99grpwg";
+       libraryHaskellDepends = [
+         base bytestring conduit http-client req resourcet transformers
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-extra hspec req resourcet temporary
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit conduit-extra req resourcet temporary weigh
+       ];
+       homepage = "https://github.com/mrkkrp/req-conduit";
+       description = "Conduit helpers for the req HTTP client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reqcatcher" = callPackage
     ({ mkDerivation, base, http-client, http-types, HUnit, lens
      , network, tasty, tasty-hunit, text, wai, warp, wreq
@@ -164216,8 +164050,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.2.3";
-       sha256 = "1hqq3qz6xbbc2di85larf3ixj2gxsn6vhcxdhzxfn72lxdr9xgir";
+       version = "2.2.6";
+       sha256 = "0b26wd3mnpx4yx9q4nyacl43wisqjrck4b8lzykyzdn0fg7xlscc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -168492,7 +168326,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-subscriber_0_6_0_0" = callPackage
+  "servant-subscriber_0_6_0_1" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, filepath
      , http-types, lens, lifted-base, monad-control, monad-logger
@@ -168502,10 +168336,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-subscriber";
-       version = "0.6.0.0";
-       sha256 = "0pa0zwb8qqs6y2fcs8acwljym9jmha273gb2v5nyhhfyimdl8x8q";
-       revision = "1";
-       editedCabalFile = "16r1ry5zd67mj5f2mi2sv9ls3vvc6y78ryijp8fcw1rif7mynf7h";
+       version = "0.6.0.1";
+       sha256 = "0fbqmh0lzcb0ixw09ldjddz21xcfy7knfwhh3hfzlgy08xmqb89x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169080,18 +168912,6 @@ self: {
      }) {};
 
   "setlocale" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "setlocale";
-       version = "1.0.0.4";
-       sha256 = "1sd73zgpijr9xjdj5p562cmlcxmx5iff5k8xh9b6rpcgrgnnlf9j";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
-       description = "Haskell bindings to setlocale";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "setlocale_1_0_0_5" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "setlocale";
@@ -169101,7 +168921,6 @@ self: {
        homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
        description = "Haskell bindings to setlocale";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setoid" = callPackage
@@ -170242,18 +170061,18 @@ self: {
      }:
      mkDerivation {
        pname = "shikensu";
-       version = "0.3.3";
-       sha256 = "15a2favvch2ph3sh0y1915vzqisl3bhkpnqp1kfmlyzpdw75h8yn";
+       version = "0.3.6";
+       sha256 = "121ff1a68lrzclx8qq7y5yn8rxqzj6bn92naws5v15ps9mx1b34r";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath flow Glob text
          unordered-containers
        ];
        testHaskellDepends = [
-         aeson base bytestring directory filepath flow tasty tasty-hunit
-         text unordered-containers
+         aeson base bytestring directory filepath flow Glob tasty
+         tasty-hunit text unordered-containers
        ];
-       homepage = "https://github.com/icidasset/shikensu#README";
-       description = "A small toolset for building static websites";
+       homepage = "https://github.com/icidasset/shikensu#readme";
+       description = "Run a sequence of functions on in-memory representations of files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -170266,8 +170085,8 @@ self: {
        pname = "shine";
        version = "0.1.0.0";
        sha256 = "1839whd680f1jm0789i6aqlkfbs8af6szzpfyhxzbxhdqjrz63mj";
-       revision = "1";
-       editedCabalFile = "06hzxlhb2ijhiq3vw74pbanjzfid0mk2j1cxvaz8w61yg2sq01b5";
+       revision = "2";
+       editedCabalFile = "0rq1p8w4yp6y5yf49fw0bpaxjcrb3dkqw9x9fl9j614d5xg03gxj";
        libraryHaskellDepends = [
          base ghcjs-dom ghcjs-prim keycode mtl time transformers
        ];
@@ -170582,6 +170401,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "si-clock" = callPackage
+    ({ mkDerivation, base, bytestring, hsI2C, read-env-var, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "si-clock";
+       version = "0.1.0";
+       sha256 = "18qgibfy0rj3wxz51rj0ks9bxp574wxpdjxdkjgf8xzsl1hs9h8i";
+       libraryHaskellDepends = [
+         base bytestring hsI2C read-env-var time transformers
+       ];
+       description = "An interface to the Silicon Labs Si5351 clock chip";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sibe" = callPackage
     ({ mkDerivation, base, Chart, Chart-cairo, containers
      , data-default-class, deepseq, directory, hmatrix, JuicyPixels
@@ -172824,8 +172658,8 @@ self: {
     ({ mkDerivation, base, hspec, megaparsec, QuickCheck, text }:
      mkDerivation {
        pname = "smiles";
-       version = "0.1.0.1";
-       sha256 = "1bmnzwb8i6l8frfwzac1lv6r2iwipd84pwchnl9pam6w7gj0ncck";
+       version = "0.1.1.0";
+       sha256 = "054s7c6xbakbv0kc64iyv1gsqnddgv8kc07hplk8ksbzg8q5x8jz";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
        homepage = "https://github.com/zmactep/smiles#readme";
@@ -175584,21 +175418,6 @@ self: {
      }) {};
 
   "spdx" = callPackage
-    ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
-     mkDerivation {
-       pname = "spdx";
-       version = "0.2.1.0";
-       sha256 = "1wl0r4q6li6srvcbp4h1bk4k164vd7z8fcy12ixms7r0iq4xdw57";
-       revision = "1";
-       editedCabalFile = "0qffjk0iz3fnd4099n9bqzakpma6ffw6znk99x67j3i8qdmk1fmd";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [ base tasty tasty-quickcheck ];
-       homepage = "https://github.com/phadej/spdx";
-       description = "SPDX license expression language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "spdx_0_2_2_0" = callPackage
     ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
      mkDerivation {
        pname = "spdx";
@@ -175609,7 +175428,6 @@ self: {
        homepage = "https://github.com/phadej/spdx";
        description = "SPDX license expression language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spe" = callPackage
@@ -177184,6 +177002,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stack2nix" = callPackage
+    ({ mkDerivation, async, base, bytestring, Cabal, containers
+     , data-fix, directory, filepath, Glob, hnix, monad-parallel
+     , optparse-applicative, process, SafeSemaphore, temporary, text
+     , yaml
+     }:
+     mkDerivation {
+       pname = "stack2nix";
+       version = "0.1.2.0";
+       sha256 = "1zq5d9f4livy3gkwcw4gajzil96klfbn2pzr7gnh74c323i9df9y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring Cabal containers data-fix directory filepath
+         Glob hnix monad-parallel process SafeSemaphore temporary text yaml
+       ];
+       executableHaskellDepends = [ base Cabal optparse-applicative ];
+       description = "Convert stack.yaml files into Nix build instructions.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage" = callPackage
     ({ mkDerivation, base, stackage-build-plan, stackage-cabal
      , stackage-cli, stackage-install, stackage-sandbox, stackage-setup
@@ -178968,6 +178807,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_4_3" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.4.3";
+       sha256 = "0cwqni8n13jkk3m6blvppmx5lgnb91mc19xfa51xlpsfcdsfm101";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring hashable lens template-haskell
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring directory hashable hlint lens
+         tasty tasty-hspec template-haskell text unordered-containers
+       ];
+       homepage = "https://github.com/frontrowed/stratosphere#readme";
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -183665,6 +183529,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-hspec_1_1_3_2" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
+     , tagged, tasty, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-hspec";
+       version = "1.1.3.2";
+       sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv";
+       libraryHaskellDepends = [
+         base hspec hspec-core QuickCheck random tagged tasty
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
+       description = "Hspec support for the Tasty test framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-html" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
      , generic-deriving, mtl, stm, tagged, tasty, text, transformers
@@ -183842,14 +183724,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-quickcheck_0_9" = callPackage
+  "tasty-quickcheck_0_9_1" = callPackage
     ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged
      , tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "tasty-quickcheck";
-       version = "0.9";
-       sha256 = "00h7vvmadiq07bzd9dpi8maw1apshz66si9vkkqzxmgvnv9src33";
+       version = "0.9.1";
+       sha256 = "03db6aknm5rdl14mn98lxhb38357ywvs7agygyz1hbc5iv7rggxa";
        libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
        homepage = "http://documentup.com/feuerbach/tasty";
@@ -184733,22 +184615,6 @@ self: {
      }) {};
 
   "temporary" = callPackage
-    ({ mkDerivation, base, directory, exceptions, filepath
-     , transformers, unix
-     }:
-     mkDerivation {
-       pname = "temporary";
-       version = "1.2.0.4";
-       sha256 = "0qk741yqnpd69sksgks2vb7zi50rglp9m498lzw4sh268a017rsi";
-       libraryHaskellDepends = [
-         base directory exceptions filepath transformers unix
-       ];
-       homepage = "http://www.github.com/feuerbach/temporary";
-       description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "temporary_1_2_1" = callPackage
     ({ mkDerivation, base, base-compat, directory, exceptions, filepath
      , tasty, tasty-hunit, transformers, unix
      }:
@@ -184765,7 +184631,6 @@ self: {
        homepage = "https://github.com/feuerbach/temporary";
        description = "Portable temporary file and directory support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporary-rc" = callPackage
@@ -187247,23 +187112,6 @@ self: {
      }) {};
 
   "th-reify-many" = callPackage
-    ({ mkDerivation, base, containers, mtl, safe, template-haskell
-     , th-expand-syns
-     }:
-     mkDerivation {
-       pname = "th-reify-many";
-       version = "0.1.6";
-       sha256 = "1b76zjxkj0v0n8zj9l0nwav2irm0c43rx6qjihfw8klmmxvx59df";
-       libraryHaskellDepends = [
-         base containers mtl safe template-haskell th-expand-syns
-       ];
-       testHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/mgsloan/th-reify-many";
-       description = "Recurseively reify template haskell datatype info";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-reify-many_0_1_7" = callPackage
     ({ mkDerivation, base, containers, mtl, safe, template-haskell
      , th-expand-syns
      }:
@@ -187278,7 +187126,6 @@ self: {
        homepage = "http://github.com/mgsloan/th-reify-many";
        description = "Recurseively reify template haskell datatype info";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-sccs" = callPackage
@@ -187744,8 +187591,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-editors";
-       version = "0.2.0.11";
-       sha256 = "0wq8s88l3pdl2n00gfyzg99dg2fd7d7gcq7pssxhg3z4rv72fdif";
+       version = "0.2.0.13";
+       sha256 = "159zqxcnlvn03hqyy3d1gxd7hmr2ky11x7sa3n67m5xl2in3qrjb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -187929,19 +187776,20 @@ self: {
      }) {};
 
   "throwable-exceptions" = callPackage
-    ({ mkDerivation, base, either, safe-exceptions, tasty
+    ({ mkDerivation, base, doctest, either, safe-exceptions, tasty
      , tasty-discover, tasty-hunit, template-haskell, text
      }:
      mkDerivation {
        pname = "throwable-exceptions";
-       version = "0.1.0.5";
-       sha256 = "1f4aaj37j0wni1qgshf1n72kid74wz4gj6dydzzasrxq4ls51cvn";
+       version = "0.1.0.6";
+       sha256 = "0mfc5jc23l7wxsl8c5r5s3i1kvhi2jqzlhif3wb00bh292g1p9ak";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base safe-exceptions template-haskell ];
        executableHaskellDepends = [ base safe-exceptions ];
        testHaskellDepends = [
-         base either safe-exceptions tasty tasty-discover tasty-hunit text
+         base doctest either safe-exceptions tasty tasty-discover
+         tasty-hunit text
        ];
        homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md";
        description = "throwable-exceptions gives the easy way to throw exceptions";
@@ -189512,8 +189360,8 @@ self: {
      }:
      mkDerivation {
        pname = "tmp-postgres";
-       version = "0.1.0.6";
-       sha256 = "0h3rhli1vm0rq2943fz1z4l26s6nzrx5sccwdx6wc998wbgbdq15";
+       version = "0.1.0.7";
+       sha256 = "0cx0b0743fv2p651sf6s95aqhpq8rk20mxdk06dw8v8bgdyvncq2";
        libraryHaskellDepends = [
          base directory network process temporary unix
        ];
@@ -191829,29 +191677,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , criterion, directory, doctest, foldl, hostname, managed
-     , optional-args, optparse-applicative, process, semigroups, stm
-     , system-fileio, system-filepath, temporary, text, time
-     , transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.3.5";
-       sha256 = "0ry3d42s3g3hbdg8gjdlcadd0cfmf4harb30w4l2r6p94vj25453";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock directory foldl hostname
-         managed optional-args optparse-applicative process semigroups stm
-         system-fileio system-filepath temporary text time transformers unix
-         unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_3_6" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , criterion, directory, doctest, foldl, hostname, managed
      , optional-args, optparse-applicative, process, semigroups, stm
@@ -191872,7 +191697,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -194137,6 +193961,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unfoldable_0_9_4" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
+     , random, transformers
+     }:
+     mkDerivation {
+       pname = "unfoldable";
+       version = "0.9.4";
+       sha256 = "0qqjr060d79g5lnsdzx9ff6ava78441h8wvkn38hs7y3rvzw9vzd";
+       libraryHaskellDepends = [
+         base containers ghc-prim one-liner QuickCheck random transformers
+       ];
+       homepage = "https://github.com/sjoerdvisscher/unfoldable";
+       description = "Class of data structures that can be unfolded";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unfoldable-restricted" = callPackage
     ({ mkDerivation, base, constraints, containers, hashable
      , transformers, unfoldable, unit-constraint, unordered-containers
@@ -197470,19 +197311,6 @@ self: {
      }) {};
 
   "vector-fftw" = callPackage
-    ({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
-     mkDerivation {
-       pname = "vector-fftw";
-       version = "0.1.3.7";
-       sha256 = "0xl1gymdl20j4n4z7rn9ngm4yfzkc2q75af5ls15rd5zsqk1ihp3";
-       libraryHaskellDepends = [ base primitive storable-complex vector ];
-       librarySystemDepends = [ fftw ];
-       homepage = "http://hackage.haskell.org/package/vector-fftw";
-       description = "A binding to the fftw library for one-dimensional vectors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) fftw;};
-
-  "vector-fftw_0_1_3_8" = callPackage
     ({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
      mkDerivation {
        pname = "vector-fftw";
@@ -197493,7 +197321,6 @@ self: {
        homepage = "http://hackage.haskell.org/package/vector-fftw";
        description = "A binding to the fftw library for one-dimensional vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fftw;};
 
   "vector-functorlazy" = callPackage
@@ -198959,6 +198786,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_0_20_0" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, HUnit, iproute, lifted-base, network, old-locale
+     , resourcet, streaming-commons, stringsearch, text, time
+     , transformers, unix, unix-compat, vault, void, wai, wai-logger
+     , word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.20.0";
+       sha256 = "0w8r0azjhl132sa8wzqjd8vs359h8dc7l6afr3g5wbw1kr9clqxd";
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types iproute lifted-base network
+         old-locale resourcet streaming-commons stringsearch text time
+         transformers unix unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive cookie fast-logger
+         hspec http-types HUnit resourcet text time transformers wai zlib
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-frontend-monadcgi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, cgi
      , containers, http-types, transformers, wai
@@ -204529,28 +204386,6 @@ self: {
      }) {};
 
   "xml-conduit-parse" = callPackage
-    ({ mkDerivation, base, conduit, conduit-parse, containers
-     , data-default, exceptions, hlint, parsers, resourcet, tasty
-     , tasty-hunit, text, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit-parse";
-       version = "0.3.1.0";
-       sha256 = "1mbjqmp9bib6m49y3lrfpspc05ihjddj10lqz30nq89ys36sma32";
-       libraryHaskellDepends = [
-         base conduit conduit-parse containers exceptions parsers text
-         xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         base conduit conduit-parse data-default hlint parsers resourcet
-         tasty tasty-hunit
-       ];
-       homepage = "https://github.com/k0ral/xml-conduit-parse";
-       description = "Streaming XML parser based on conduits";
-       license = "unknown";
-     }) {};
-
-  "xml-conduit-parse_0_3_1_1" = callPackage
     ({ mkDerivation, base, conduit, conduit-parse, containers
      , data-default, exceptions, hlint, parsers, resourcet, tasty
      , tasty-hunit, text, xml-conduit, xml-types
@@ -204570,7 +204405,6 @@ self: {
        homepage = "https://github.com/k0ral/xml-conduit-parse";
        description = "Streaming XML parser based on conduits";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-writer" = callPackage
@@ -205750,8 +205584,8 @@ self: {
     ({ mkDerivation, base, word8 }:
      mkDerivation {
        pname = "yabi";
-       version = "0.1.1.0";
-       sha256 = "05avn1m1mmgvzx9vkjy0fyyy38vmz39km0b190lz7lhy9qrwa2bb";
+       version = "0.2.0.0";
+       sha256 = "1iihmhq87z5k9wzv8j8ydyy100m0401yqm576z27fk01i1a6fq3x";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base word8 ];
@@ -205911,37 +205745,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
-     , bytestring, conduit, containers, directory, filepath, hspec
-     , HUnit, libyaml, mockery, resourcet, scientific, semigroups
-     , template-haskell, temporary, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.8.23";
-       sha256 = "0p0ya8vgydsjc9nvc92kncz7239lixjh1rdw3gprnqs2h8a3f428";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         filepath resourcet scientific semigroups template-haskell text
-         transformers unordered-containers vector
-       ];
-       libraryPkgconfigDepends = [ libyaml ];
-       executableHaskellDepends = [ aeson base bytestring ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring conduit directory hspec
-         HUnit mockery resourcet temporary text transformers
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/snoyberg/yaml/";
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_23_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, filepath, hspec
      , HUnit, libyaml, mockery, resourcet, scientific, semigroups
@@ -205970,7 +205773,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-combinators" = callPackage
@@ -206518,6 +206320,8 @@ self: {
        pname = "yesod-angular-ui";
        version = "0.1.1.0";
        sha256 = "08rr8w4bibjjchgfp1j9gywldr8v10vg8ddmkxj6dx5b6w2kvm8k";
+       revision = "1";
+       editedCabalFile = "1nak49v5ggsmpgawa8q8li88vf1nw6kn0f9fii7d6xbnfxpx6w6x";
        libraryHaskellDepends = [
          base blaze-html containers directory hjsmin mtl resourcet
          shakespeare template-haskell text transformers yesod yesod-core
@@ -207407,6 +207211,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form-richtext_0_1_0_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text
+     , xss-sanitize, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-form-richtext";
+       version = "0.1.0.1";
+       sha256 = "0bmngw13lgacni8xn5jwpnf77qf0nmg3cqhb0mshp7cccky7cg7y";
+       libraryHaskellDepends = [
+         base blaze-builder blaze-html shakespeare text xss-sanitize
+         yesod-core yesod-form
+       ];
+       homepage = "http://github.com/geraldus/yesod-form-richtext#readme";
+       description = "Various rich-text WYSIWYG editors for Yesod forms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-gitrepo" = callPackage
     ({ mkDerivation, base, directory, enclosed-exceptions, http-types
      , lifted-base, process, temporary, text, wai, yesod-core
@@ -208215,6 +208037,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_5_7" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, containers, cookie
+     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
+     , monad-control, network, persistent, pretty-show, text, time
+     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
+     , yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.5.7";
+       sha256 = "04q1hp09wbr4y77v0296c9z9hp5rgaz5pvahw6p1hk3vfypjlss2";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive containers cookie hspec-core html-conduit
+         http-types HUnit monad-control network persistent pretty-show text
+         time transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit
+         lifted-base text wai xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -208458,18 +208308,19 @@ self: {
 
   "yi-core" = callPackage
     ({ mkDerivation, array, attoparsec, base, binary, bytestring
-     , containers, data-default, directory, dlist, dynamic-state, dyre
-     , exceptions, filepath, hashable, Hclip, ListLike
-     , microlens-platform, mtl, old-locale, oo-prototypes, parsec
-     , pointedlist, process, process-extras, safe, semigroups, split
-     , tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time
-     , transformers-base, unix, unix-compat, unordered-containers
-     , word-trie, xdg-basedir, yi-language, yi-rope
+     , containers, criterion, data-default, deepseq, directory, dlist
+     , dynamic-state, dyre, exceptions, filepath, hashable, Hclip
+     , ListLike, microlens-platform, mtl, old-locale, oo-prototypes
+     , parsec, pointedlist, process, process-extras, quickcheck-text
+     , safe, semigroups, split, tasty, tasty-hunit, tasty-quickcheck
+     , text, text-icu, time, transformers-base, unix, unix-compat
+     , unordered-containers, word-trie, xdg-basedir, yi-language
+     , yi-rope
      }:
      mkDerivation {
        pname = "yi-core";
-       version = "0.13.5";
-       sha256 = "0ac8drczsiigic6q086dqz7qx0jf3zqhpkvz7ld81ybw1gs4jjxq";
+       version = "0.13.7";
+       sha256 = "0i2n8jx15fic32kakppj9lz935dcm0090b736f8w711x6aib6nmg";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-default
          directory dlist dynamic-state dyre exceptions filepath hashable
@@ -208482,10 +208333,19 @@ self: {
          array attoparsec base binary bytestring containers data-default
          directory dlist dynamic-state dyre exceptions filepath hashable
          Hclip ListLike microlens-platform mtl old-locale oo-prototypes
-         parsec pointedlist process process-extras safe semigroups split
-         tasty tasty-hunit tasty-quickcheck text text-icu time
-         transformers-base unix unix-compat unordered-containers word-trie
-         xdg-basedir yi-language yi-rope
+         parsec pointedlist process process-extras quickcheck-text safe
+         semigroups split tasty tasty-hunit tasty-quickcheck text text-icu
+         time transformers-base unix unix-compat unordered-containers
+         word-trie xdg-basedir yi-language yi-rope
+       ];
+       benchmarkHaskellDepends = [
+         array attoparsec base binary bytestring containers criterion
+         data-default deepseq directory dlist dynamic-state dyre exceptions
+         filepath hashable Hclip ListLike microlens-platform mtl old-locale
+         oo-prototypes parsec pointedlist process process-extras safe
+         semigroups split text text-icu time transformers-base unix
+         unix-compat unordered-containers word-trie xdg-basedir yi-language
+         yi-rope
        ];
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor core library";
@@ -208587,15 +208447,15 @@ self: {
   "yi-frontend-vty" = callPackage
     ({ mkDerivation, base, containers, data-default, dlist
      , microlens-platform, pointedlist, stm, text, vty, yi-core
-     , yi-language
+     , yi-language, yi-rope
      }:
      mkDerivation {
        pname = "yi-frontend-vty";
-       version = "0.13.5";
-       sha256 = "1crpl6810xiz4mk4yj56w9anxs7yz09m12gmi859vjp0sbglrrsv";
+       version = "0.13.7";
+       sha256 = "0sgk9cx6q7mxjc1w7396mrrlds0gbilky2w04j4cj7c57nq42n93";
        libraryHaskellDepends = [
          base containers data-default dlist microlens-platform pointedlist
-         stm text vty yi-core yi-language
+         stm text vty yi-core yi-language yi-rope
        ];
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Vty frontend for Yi editor";
@@ -208628,8 +208488,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-fuzzy-open";
-       version = "0.13.5";
-       sha256 = "0bcyxlq66mmcdwn44knpkrzfki201jkcyiadnqy1bfwq8p8ky757";
+       version = "0.13.7";
+       sha256 = "0gqab3cdl2mrdp7wymhn6gy63mnd438m6ax6wis22kq1xpc5hdqd";
        libraryHaskellDepends = [
          base binary containers data-default directory filepath mtl text
          transformers-base vector yi-core yi-language yi-rope
@@ -208676,8 +208536,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-ireader";
-       version = "0.13.5";
-       sha256 = "0j3v7ph93qlf40q5abcv2396hjnz4l5a81yd292sm1w3jp5pbzhg";
+       version = "0.13.7";
+       sha256 = "1f4nj22nkk33s3w8gwa38cab50232laifkc4kd89ybaj4w9yawfj";
        libraryHaskellDepends = [
          base binary bytestring containers data-default microlens-platform
          text yi-core yi-language yi-rope
@@ -208711,8 +208571,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-cua";
-       version = "0.13.5";
-       sha256 = "1iap9lgzj2gg3yqrpli4alhklsppfnlczrjqddidc8vy174017nl";
+       version = "0.13.7";
+       sha256 = "0fm2kgafmzbn8fvksl0mx0c5r0aqvdmnh6pnp5ql5xr73k4n4pmf";
        libraryHaskellDepends = [
          base microlens-platform text yi-core yi-keymap-emacs yi-rope
        ];
@@ -208746,8 +208606,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-emacs";
-       version = "0.13.5";
-       sha256 = "05h4xgg7w1m0hiimrx9xrhjc53h0vdhgsaal7g0sb0bgrilx06c0";
+       version = "0.13.7";
+       sha256 = "1whxh7jznfq27ps9wnqaarhc8dcmfx19i01m0h6pbh7zmlyl2ddn";
        libraryHaskellDepends = [
          base containers filepath Hclip microlens-platform mtl oo-prototypes
          semigroups text transformers-base yi-core yi-language yi-misc-modes
@@ -208788,8 +208648,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-keymap-vim";
-       version = "0.13.5";
-       sha256 = "01s9qx2yd297gda53j7f9kv39lxy09qj4kk8ms21ajjzj7q4hyn3";
+       version = "0.13.7";
+       sha256 = "0d91lpcrsbwwacqycmkdmxkwnx7rn116cj76ddb7wrnikaj6vv1j";
        libraryHaskellDepends = [
          attoparsec base binary containers data-default directory filepath
          Hclip microlens-platform mtl oo-prototypes pointedlist safe
@@ -208846,8 +208706,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-language";
-       version = "0.13.5";
-       sha256 = "1zgw4amvmm0qhid8mcdakb4q8vlasnk5vqy9hsx9v0nc6w6c36fm";
+       version = "0.13.7";
+       sha256 = "1cfa44fv2kvsk695ny9rvi3ih55d3gzak5873zmb35bdc64v2k66";
        libraryHaskellDepends = [
          array base binary containers data-default hashable
          microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
@@ -208901,8 +208761,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-misc-modes";
-       version = "0.13.5";
-       sha256 = "1a91p4yrs38ra93szds00rm5w5lgbm672lhs65c7vwqk300w52aq";
+       version = "0.13.7";
+       sha256 = "0gyy7rg0wgblsilx83hrdb0fgc54skhljxw2csq41qdb5z756nqg";
        libraryHaskellDepends = [
          array base binary data-default filepath microlens-platform
          semigroups text yi-core yi-language yi-rope
@@ -208943,8 +208803,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-mode-haskell";
-       version = "0.13.5";
-       sha256 = "16bg0kr21zdwcbclmyl4b7y3g0nza21vmn804c3r2lz4d95v68s3";
+       version = "0.13.7";
+       sha256 = "00p9hmvdd3llm0xnm0xrz8n9a74jh8lmazsm9ng4c3l0a5f3kxqq";
        libraryHaskellDepends = [
          array base binary data-default microlens-platform text yi-core
          yi-language yi-rope
@@ -208988,8 +208848,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-mode-javascript";
-       version = "0.13.5";
-       sha256 = "071qhr626zkpc1472jvk54mc9nmcqw3hnyp1nqmy2v5h7yqb4v8m";
+       version = "0.13.7";
+       sha256 = "0fifk329g66r2k5a0j4jw8lcwlxc9v4r66sggrizgcqmcfxj895a";
        libraryHaskellDepends = [
          array base binary data-default dlist filepath microlens-platform
          mtl text yi-core yi-language yi-rope
@@ -209056,20 +208916,21 @@ self: {
      }) {};
 
   "yi-snippet" = callPackage
-    ({ mkDerivation, base, binary, containers, data-default, free, lens
-     , mtl, tasty-hunit, tasty-th, text, vector, yi-core, yi-rope
+    ({ mkDerivation, base, binary, containers, data-default, free
+     , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
+     , yi-core, yi-rope
      }:
      mkDerivation {
        pname = "yi-snippet";
-       version = "0.13.5";
-       sha256 = "04xblqv2sglwzgplfcn737v7gk0w6zfyf2l72c01jv0sq247rdpk";
+       version = "0.13.7";
+       sha256 = "18h67vc2fb35jfmz4zq3sc7av5nrl5cqa8q5vhdywhhhp6bsvi00";
        libraryHaskellDepends = [
-         base binary containers data-default free lens mtl text vector
-         yi-core yi-rope
+         base binary containers data-default free microlens-platform mtl
+         text vector yi-core yi-rope
        ];
        testHaskellDepends = [
-         base binary containers data-default free lens mtl tasty-hunit
-         tasty-th text vector yi-core yi-rope
+         base binary containers data-default free microlens-platform mtl
+         tasty-hunit tasty-th text vector yi-core yi-rope
        ];
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Snippet support for yi";
@@ -209179,7 +209040,7 @@ self: {
        description = "An embedded language for programming the Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
+     }) {inherit (pkgs) gmp; yices = null;};
 
   "yjftp" = callPackage
     ({ mkDerivation, base, directory, ftphs, haskeline, hsConfigure
@@ -209731,8 +209592,8 @@ self: {
      }:
      mkDerivation {
        pname = "zeromq4-haskell";
-       version = "0.6.5";
-       sha256 = "1hp7k5kzj6fbv0jkvcgxx6pg0nd200dsa4ynwd658s92i37vd6bf";
+       version = "0.6.6";
+       sha256 = "1pblwyn2lly3px9843g4a2wpkqhnffd53kam1b9kx31zpplfhbx8";
        libraryHaskellDepends = [
          async base bytestring containers exceptions monad-control
          semigroups transformers transformers-base
@@ -209746,15 +209607,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) zeromq;};
 
-  "zeromq4-haskell_0_6_6" = callPackage
+  "zeromq4-haskell_0_6_7" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, exceptions
      , monad-control, QuickCheck, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, transformers, transformers-base, zeromq
      }:
      mkDerivation {
        pname = "zeromq4-haskell";
-       version = "0.6.6";
-       sha256 = "1pblwyn2lly3px9843g4a2wpkqhnffd53kam1b9kx31zpplfhbx8";
+       version = "0.6.7";
+       sha256 = "1kjgmy8pbq9b00s8ak469afwgvhvnyyk7430x20amw01jcjbicll";
        libraryHaskellDepends = [
          async base bytestring containers exceptions monad-control
          semigroups transformers transformers-base
-- 
GitLab


From 5148757e8c4d4ffaa8f661f76515b3949f544618 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Jun 2017 11:19:13 +0200
Subject: [PATCH 1145/1490] haskell-hspec-core: break infinity dependency cycle

Test suite dependencies silently and temporary depend on hspec-core in their
test suites.
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 464ea25aee1..404784c02bc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -37,6 +37,7 @@ self: super: {
   hasql-postgres = dontCheck super.hasql-postgres;
   hspec-expectations = dontCheck super.hspec-expectations;
   hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; };
   HTTP = dontCheck super.HTTP;
   nanospec = dontCheck super.nanospec;
   options = dontCheck super.options;
-- 
GitLab


From bc208863458f7b1880847d584aadd9731c975915 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 21 Jun 2017 13:22:36 +0200
Subject: [PATCH 1146/1490] git-annex: enable shell completions for zsh and
 fish

The latest optparse-applicative version can do that.
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 404784c02bc..fccde7426c6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -74,6 +74,7 @@ self: super: {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
+    optparse-applicative = self.optparse-applicative_0_14_0_0;
   };
 
   # https://github.com/froozen/kademlia/issues/2
-- 
GitLab


From d83fb640db31e0485da8498c4280e6017eb86505 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Jun 2017 15:34:45 +0200
Subject: [PATCH 1147/1490] haskell-opencv: ensure that the underlying C++
 library has contrib code enabled

https://github.com/NixOS/nixpkgs/commit/0335b93284b156291d77ff121ea51a01c07527c5#commitcomment-22638850
---
 pkgs/development/haskell-modules/configuration-nix.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 58ab8024369..584ea5eb71d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -461,4 +461,7 @@ self: super: builtins.intersectAttrs super {
   liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint;
   liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell);
 
+  # Haskell OpenCV bindings need contrib code enabled in the C++ library.
+  opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; };
+
 }
-- 
GitLab


From 8ddaef6ddf552a13397cba48294d37cdd9fc93d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Jun 2017 17:41:24 +0200
Subject: [PATCH 1148/1490] haskell: fix logic error in generic builder
 introduced in 00892b7e4ed2e8eb52227db8e8312a06bd1d6699

Closes https://github.com/NixOS/nixpkgs/issues/26760.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 38d74178e2e..97a3adaf220 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -34,7 +34,7 @@
 , license
 , maintainers ? []
 , doCoverage ? false
-, doHaddock ? (!ghc.isHaLVM or true)
+, doHaddock ? !(ghc.isHaLVM or false)
 , passthru ? {}
 , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
-- 
GitLab


From 6b6cf6942c7917854fb81a6368df8e28fed1d1a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Jun 2017 20:42:25 +0200
Subject: [PATCH 1149/1490] haskell-optparse-applicative: fix build with
 pre-8.0.x versions of GHC

---
 .../haskell-modules/configuration-ghc-7.2.x.nix            | 7 ++-----
 .../haskell-modules/configuration-ghc-7.4.x.nix            | 3 ++-
 .../haskell-modules/configuration-ghc-7.6.x.nix            | 3 ++-
 .../haskell-modules/configuration-ghc-7.8.x.nix            | 3 ++-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index b3f78e5b753..421eaf832ed 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -72,13 +72,10 @@ self: super: {
   # Newer versions require bytestring >=0.10.
   tar = super.tar_0_4_1_0;
 
-  # Needs void on pre 7.10.x compilers.
+  # These builds need additional dependencies on old compilers.
   conduit = addBuildDepend super.conduit self.void;
-
-  # Needs tagged on pre 7.6.x compilers.
   reflection = addBuildDepend super.reflection self.tagged;
-
-  # Needs nats on pre 7.6.x compilers.
   semigroups = addBuildDepend super.semigroups self.nats;
+  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 3b61b7bc065..ec78e44211f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -97,8 +97,9 @@ self: super: {
   # Needs tagged on pre 7.6.x compilers.
   reflection = addBuildDepend super.reflection self.tagged;
 
-  # These builds Need additional dependencies on pre 7.6.x compilers.
+  # These builds need additional dependencies on old compilers.
   semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]);
   QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
+  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 4ef1aa56211..43ec45bf821 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -93,12 +93,13 @@ self: super: {
   # Needs void on pre 7.10.x compilers.
   conduit = addBuildDepend super.conduit self.void;
 
-  # Needs additional inputs on pre 7.10.x compilers.
+  # Needs additional inputs on old compilers.
   semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
   distributive = addBuildDepend super.distributive self.semigroups;
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   void = addBuildDepends super.void (with self; [hashable semigroups]);
+  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
 
   # Need a newer version of Cabal to interpret their build instructions.
   cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 1a151efcf38..a97cbfde4fc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -143,12 +143,13 @@ self: super: {
   hashable = dontCheck super.hashable;
   unordered-containers = dontCheck super.unordered-containers;
 
-  # Needs additional inputs on pre 7.10.x compilers.
+  # Needs additional inputs on old compilers.
   semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
   distributive = addBuildDepend super.distributive self.semigroups;
   QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
   void = addBuildDepends super.void (with self; [hashable semigroups]);
+  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
 
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;
-- 
GitLab


From e31b99c18796194c2f07e5ffe678fd2b46d41eab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 22 Jun 2017 20:53:37 +0200
Subject: [PATCH 1150/1490] haskell-network: use older version to compile with
 GHC 7.4.x and before

Recent versions of network no longer support base libraries that old.
---
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix  | 4 ++++
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 4 ++++
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix  | 4 ++++
 .../haskell-modules/configuration-hackage2nix.yaml            | 1 +
 4 files changed, 13 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 58a3002b035..c2a7e001405 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -80,4 +80,8 @@ self: super: {
   # Needs nats on pre 7.6.x compilers.
   semigroups = addBuildDepend super.semigroups self.nats;
 
+  # Newer versions don't compile any longer.
+  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
+  network = self.network_2_6_3_1;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 421eaf832ed..911fb8640f4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -78,4 +78,8 @@ self: super: {
   semigroups = addBuildDepend super.semigroups self.nats;
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
 
+  # Newer versions don't compile any longer.
+  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
+  network = self.network_2_6_3_1;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index ec78e44211f..8a6d22bcc7e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -102,4 +102,8 @@ self: super: {
   QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]);
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
 
+  # Newer versions don't compile any longer.
+  network_2_6_3_1 = dontCheck super.network_2_6_3_1;
+  network = self.network_2_6_3_1;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 78b0ecb3182..c6db553f9cb 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2449,6 +2449,7 @@ extra-packages:
   - hpack < 0.18                        # required by stack-1.4.0
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
+  - network == 2.6.3.1                  # newer versions don't compile with GHC 7.4.x and below
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
-- 
GitLab


From d79b4766a5b123ec078045d9945c805c489e053b Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Thu, 22 Jun 2017 15:50:37 +0200
Subject: [PATCH 1151/1490] erlangR20: init

---
 pkgs/development/interpreters/erlang/R20.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix              |  3 ++-
 pkgs/top-level/beam-packages.nix             |  8 ++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/erlang/R20.nix

diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix
new file mode 100644
index 00000000000..8866d9848e7
--- /dev/null
+++ b/pkgs/development/interpreters/erlang/R20.nix
@@ -0,0 +1,10 @@
+{ mkDerivation, fetchurl }:
+
+mkDerivation rec {
+  version = "20.0";
+  sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0";
+
+  prePatch = ''
+    substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2973e2d9b0f..990bd593d4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5984,7 +5984,8 @@ with pkgs;
     erlang_basho_R16B02 erlang_basho_R16B02_odbc
     erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac
     erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac
-    erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac;
+    erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac
+    erlangR20;
 
   inherit (beam.packages)
     rebar rebar3-open rebar3
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 3451816c0c5..3ac854c962f 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -36,6 +36,14 @@ rec {
     erlangR19_odbc_javac = erlangR19.override {
       javacSupport = true; odbcSupport = true;
     };
+    erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
+      wxGTK = wxGTK30;
+    };
+    erlangR20_odbc = erlangR20.override { odbcSupport = true; };
+    erlangR20_javac = erlangR20.override { javacSupport = true; };
+    erlangR20_odbc_javac = erlangR20.override {
+      javacSupport = true; odbcSupport = true;
+    };
 
     # Bash fork, using custom builder.
     erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix {
-- 
GitLab


From 75872f31617ef867f7ec77c2d50e1253fc0cad60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 23 Jun 2017 14:48:10 +0200
Subject: [PATCH 1152/1490] knot-dns: security 2.5.1 -> 2.5.2

https://lists.nic.cz/pipermail/knot-dns-users/2017-June/001144.html
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 57c3acbd534..f1ae382aa38 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "1643q2pj5sjhgv19jp8r2bhvqyk6mmlajdmr6qhjcbhql30cs23c";
+    sha256 = "286671a4ee35a5207b2e45fd0812962b481b1b543bf3d5df3a8c319c26e2f5e9";
   };
 
   outputs = [ "bin" "out" "dev" ];
-- 
GitLab


From c76f8d9c7ab01119bbf051529e78d541e6f25d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 23 Jun 2017 14:48:29 +0200
Subject: [PATCH 1153/1490] knot-resolver: maintenance 1.3.0 -> 1.3.1

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

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 1fec8ef11b7..b0c493b6248 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "667002dc3ee0b0f755628997ef4f71be769a06fb8b9ccd935db329c8709c2af4";
+    sha256 = "cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 0d1a1a49547215ccc36197a53e49d14edf193faa Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 23 Jun 2017 09:55:04 -0500
Subject: [PATCH 1154/1490] plasma-workspace: no propagatedBuildInputs

Only libraries may have propagatedBuildInputs.
---
 pkgs/desktops/plasma-5/plasma-workspace/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index b866ebab0e5..b28a1e87fb6 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -20,8 +20,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     isocodes libdbusmenu libSM libXcursor libXtst pam wayland
-  ];
-  propagatedBuildInputs = [
+
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
     knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
-- 
GitLab


From 8a714e3bb6fc81eaf8466904f04508e2eaf431c8 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 23 Jun 2017 11:01:05 -0400
Subject: [PATCH 1155/1490] elpa-packages: 2017-06-23

---
 .../editors/emacs-modes/elpa-generated.nix    | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 9bf51fc0904..7c0a7df2649 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1221,10 +1221,10 @@
     metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "metar";
-        version = "0.2";
+        version = "0.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/metar-0.2.el";
-          sha256 = "0rfzq79llh6ixw02kjpn8s2shxrabvfvsq48pagwak1jl2s0askf";
+          url = "https://elpa.gnu.org/packages/metar-0.3.el";
+          sha256 = "07gv0v0xwb5yzynwagmvf0n5c9wljy1jg4ympnxpa2d9r1zqc02g";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1445,10 +1445,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170606";
+        version = "20170622";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170606.tar";
-          sha256 = "0m2gln3wz9v3aflyxxy2317808yy05rrzrjx35spw2d90d10hmkz";
+          url = "https://elpa.gnu.org/packages/org-20170622.tar";
+          sha256 = "0922lcbr2r7bkswljqzbm5y3ny1n67qfrmf7h7z9hsw2wy0505dp";
         };
         packageRequires = [];
         meta = {
@@ -1771,10 +1771,10 @@
     soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "soap-client";
-        version = "3.1.2";
+        version = "3.1.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/soap-client-3.1.2.tar";
-          sha256 = "0crfpp2ksqvzf2j3q44qq6z8zh1r10q9kw12cxbmjiih89q01b68";
+          url = "https://elpa.gnu.org/packages/soap-client-3.1.3.tar";
+          sha256 = "1s5m6dc7z532wchdih2ax2a791khyajjxb2xaw5rklk47yc5v3nk";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -2100,14 +2100,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    websocket = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
         pname = "websocket";
         version = "1.8";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/websocket-1.8.tar";
           sha256 = "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/websocket.html";
           license = lib.licenses.free;
-- 
GitLab


From a10c8a97b40dfa828c4b4fd68995e6d55092526a Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 23 Jun 2017 11:01:21 -0400
Subject: [PATCH 1156/1490] org-packages: 2017-06-23

---
 .../editors/emacs-modes/org-generated.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 31d116fa2cb..7e8715f32a9 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170606";
+        version = "20170622";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170606.tar";
-          sha256 = "11x6s30j6k0y3jfzcp16qyqn48mki9j18iblnpl5dr1bk8kyvd0x";
+          url = "http://orgmode.org/elpa/org-20170622.tar";
+          sha256 = "0z4ypv6q4nx4icir69xchzn58xzndnxlkg0v4pb62gqghdxng6vy";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170606";
+        version = "20170622";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170606.tar";
-          sha256 = "0r6a5spzdbx6qdz5aziycmhjxm392v7iifv7mnln4s5lgnsswb1h";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170622.tar";
+          sha256 = "0ix4gmr6y9nrna9sc9cy30533mxlnvlfnf25492ky6dkssbxb10s";
         };
         packageRequires = [];
         meta = {
-- 
GitLab


From 40e17794ce8122aac38c3b62ecf3951105b490f1 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 23 Jun 2017 11:02:58 -0400
Subject: [PATCH 1157/1490] melpa-stable-packages: 2017-06-23

---
 .../emacs-modes/melpa-stable-generated.nix    | 334 +++++++++++-------
 1 file changed, 209 insertions(+), 125 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index f156494b83f..23b6ff049c1 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -216,8 +216,8 @@
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "ac-clang";
-          rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686";
-          sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y";
+          rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd";
+          sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -527,12 +527,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.7.8";
+        version = "1.7.9";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
-          sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
+          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
+          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -548,12 +548,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "1.7.8";
+        version = "1.7.9";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
-          sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
+          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
+          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1837,12 +1837,12 @@
     async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "async";
-        version = "1.9.1";
+        version = "1.9.2";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "666066d30a420d86801d8380f5991f2b82471107";
-          sha256 = "1hjyac7dm0yvg5y32fii6508wwhl5q493i8ikf3fszafz03nc6sc";
+          rev = "d6222c2959caaca5c4980038756097da8a51e505";
+          sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -1900,12 +1900,12 @@
     auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auctex-latexmk";
-        version = "1.0.1";
+        version = "1.0.2";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "auctex-latexmk";
-          rev = "b7053f71f578ffb0d247f8a9e8d5152efd86e096";
-          sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql";
+          rev = "4d353522650d7685acbf1d38f7dbc504f734bd84";
+          sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk";
@@ -2170,6 +2170,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-minor-mode";
+        version = "20170620";
+        src = fetchFromGitHub {
+          owner = "joewreschnig";
+          repo = "auto-minor-mode";
+          rev = "c91c566cbaf8eac1fff0c7d9eef88308a566cc43";
+          sha256 = "0nq95k2wmq17awjz0kvzwnhpnda0813gdyjzlqpzpqb56092sbif";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
+          sha256 = "1dpdylrpw1pvlmhh229b3lqs07drx9kdhw4vcv5a48qah14dz6qa";
+          name = "auto-minor-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/auto-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-package-update";
@@ -3460,12 +3481,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "0.4.0";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a";
-          sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3";
+          rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2";
+          sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -3817,12 +3838,12 @@
     cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cheat-sh";
-        version = "1.3";
+        version = "1.6";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "cheat-sh.el";
-          rev = "760cff945839a8397d44ac95aeec94cc28a51691";
-          sha256 = "10rr4bnhq2rjd6bx2r0d3cxa7ixk4la58agg5a83y3z52a673rqv";
+          rev = "ee9a51f4b2a8b2f26008e00a84b6c344b6664e85";
+          sha256 = "1hzv0l6vc7zdj93cimmi9rz6i6xsg25yf4rcfqlhcax10bhnjsd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
@@ -4459,12 +4480,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.9.0pre2";
+        version = "3.9.0pre4";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "010b50fda71feaff3abec4d13910f4a4bd1f13b0";
-          sha256 = "0b77hm5l18fbzphg3wcdzrblbhh65wx7c1b98driky1634kn9j10";
+          rev = "8fe54172fcb37e39e0f7e506e575bdd8c7171e8d";
+          sha256 = "0yv4avlzg4wbljdi5yfizmhpsf4m5p7gfc8mx5qx91mvjs71jmam";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5089,12 +5110,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "1.7.8";
+        version = "1.7.9";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
-          sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
+          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
+          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5284,12 +5305,12 @@
     company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590";
-          sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
+          rev = "d042a673b4d717c3ca9d641f120bfe16c994c740";
+          sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -5998,12 +6019,12 @@
     cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cython-mode";
-        version = "0.25.2";
+        version = "0.26alpha0";
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2";
-          sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03";
+          rev = "5528995cc6d138456be9b9d42a422a3c5de7800a";
+          sha256 = "1fd3335f2ay24nhicncmy1sz0mcdrminphsv630wkifmykarz9zh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -6878,12 +6899,12 @@
     direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "direnv";
-        version = "1.2.0";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-direnv";
-          rev = "2cdf87ea96f9a08dee98762b18b5f8a5198ecf63";
-          sha256 = "172jyl8v4zy9bbha8nndq63x8svn9xqkafkj3q17z289na8iaylh";
+          rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa";
+          sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -8100,12 +8121,12 @@
     ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "0.12.7";
+        version = "0.12.8";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "334bb4600051d96d5eb82655e6e2c2ef926e701e";
-          sha256 = "07h3za6cwznmgwm5854yyc3paidbjlpwsj71ii7qlga7j00b7ak2";
+          rev = "2dcec6a2c4d3258a92f77a35de1899cc00d2f537";
+          sha256 = "0n8qvdj88d679ijjqs04cnnhz8prk8s3whijbp3lhlr5n034n8xa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -9571,12 +9592,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20.0pre2";
+        version = "20.0";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "d106c5fffb3832fffbdf99cca905390fe15d489f";
-          sha256 = "14hgl356fjkbx056fqhjif4kjs05ih08r9mi9qj58k0hxpva2l8c";
+          rev = "040bdce67f88d833bfb59adae130a4ffb4c180f0";
+          sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -10851,11 +10872,11 @@
     exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exiftool";
-        version = "0.2";
+        version = "0.3";
         src = fetchgit {
           url = "https://git.systemreboot.net/exiftool.el/";
-          rev = "799076ae62d96e9d502f1189217b04ffdda2dc1a";
-          sha256 = "0yfa6w0518179v8hzzwrs6swrc1ak1nkyy0a7lkryrw310107j5n";
+          rev = "8dd70ba5214a73960361a0c6220bb4aa72b9e478";
+          sha256 = "0sb71bj8djppzac02bpl3v7fy0jlidd4aagg8bmmgyp7zx84xws8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
@@ -10955,12 +10976,12 @@
     exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "47952c09e74fc0da3135e7ba0d4fef0eb88f98dc";
-          sha256 = "14mf388iygirlv7j5db2x5avn70b54mm34kd3y851n6i6yzgz7jw";
+          rev = "1304aaf6d09323cb519c93167a75000a81e56247";
+          sha256 = "1bs32nq4y94dpq11326d6180maqrq17a8xjiy9rmc2gcizlv60dg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -12243,12 +12264,12 @@
     flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
     melpaBuild {
         pname = "flycheck-ycmd";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590";
-          sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
+          rev = "d042a673b4d717c3ca9d641f120bfe16c994c740";
+          sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -13083,12 +13104,12 @@
     fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "1.9.7";
+        version = "1.9.8";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e";
-          sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3";
+          rev = "9766952bd7830cb0d319736961af8e42e67d42fe";
+          sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -13362,12 +13383,12 @@
     geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geben";
-        version = "1.1.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben";
-          rev = "1308c93c1eb6c96c0e322f09fcb784f5df208a04";
-          sha256 = "0fva9xmwh887d0fdm8id67azs5rjbqk7qpjlwh7nlhrwgxsnzr7d";
+          rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc";
+          sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -14811,12 +14832,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "0.14.0";
+        version = "0.15.0";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3";
-          sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65";
+          rev = "b63044e5f833781eb7b305bc035392480ee06a82";
+          sha256 = "1p0xnhcm7kx4g9wvy18nnij2wfirp0fccv24jz6v1i9bc64n7zka";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -15743,12 +15764,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.7.1";
+        version = "2.8.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582";
-          sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s";
+          rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d";
+          sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -16079,12 +16100,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.7.1";
+        version = "2.8.0";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582";
-          sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s";
+          rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d";
+          sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -16331,12 +16352,12 @@
     helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-git-grep";
-        version = "0.9.0";
+        version = "0.10.1";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-git-grep";
-          rev = "6ca2fcd44510305cf019815d61bf65eca200c238";
-          sha256 = "0qmxccwpv7l5lbhv9n7ylikzcggdr99qzci868ghf33p4zhqyrj5";
+          rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3";
+          sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
@@ -17192,12 +17213,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "0.4.3";
+        version = "0.5.3";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "0885339369b65bc5d06829d82af734560dc45555";
-          sha256 = "088bpikbnsaxsjfq896fcg7y9qgvfbq7iwxsh391yc6h46zgarkk";
+          rev = "89a7564edc6b23ffba52b02353528b9b6285c729";
+          sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -17696,12 +17717,12 @@
     hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-todo";
-        version = "1.7.4";
+        version = "1.8.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "a23312464fc6462d559462a44cd74735e9f73421";
-          sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8";
+          rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2";
+          sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
@@ -19162,15 +19183,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy-dired-history";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "ivy-dired-history";
+          rev = "3604840f85e4ff2d7ecab6233e820cb2ec5c8733";
+          sha256 = "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history";
+          sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl";
+          name = "ivy-dired-history";
+        };
+        packageRequires = [ cl-lib counsel ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-dired-history";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.2.3";
+        version = "0.2.4";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "2d93b1b0ec1705e449f2e0f43073aacc8f1e3242";
-          sha256 = "0lrnd5r9ycy2qqggqd0sr6b2w7s28yfm15pgyh0r0rjdxky4a5vm";
+          rev = "117369f882f81fb9cc88459a4072a2789138c136";
+          sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -20171,12 +20213,12 @@
     keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keymap-utils";
-        version = "2.1.0";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keymap-utils";
-          rev = "a4f6ff724eeade5612c01c6f6bf401f264687793";
-          sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl";
+          rev = "0130f32e5ade649dd2738206a80570e450906ef6";
+          sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
@@ -22082,12 +22124,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.7.12";
+        version = "0.7.13";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "31c68839bd1de8e79fe7bce6bdeade4bacdbc737";
-          sha256 = "1hm8w04d0cyy21dnciblz4gg15k5axfvaxx788hfz2pmbp435yni";
+          rev = "a764751e89ad7bc1717e1d3c6e3b4364b11832d6";
+          sha256 = "06vd4lvybfa7kwyplavlbfwln6229g7s7pwbamjdvgz48xgiqym1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22145,12 +22187,12 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "2.5.4";
+        version = "2.5.5";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "420416f182d2ea2a2285ab4bd22e5898dfb20a83";
-          sha256 = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh";
+          rev = "957e551140587f0cd83d9186a06fba10a38c6084";
+          sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -23572,12 +23614,12 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.9";
+        version = "1.11.11";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "5d59ec86d4cf07a705407a9e538869dd25ec7d9d";
-          sha256 = "0ankhmx4raaims2q0q1yffq5z6hqil01zpj6vynrqi1n7z4rjr90";
+          rev = "026f4f9ae881d9196422981f1f85fa3137525014";
+          sha256 = "016c0ghqw7wmgdk47biqc0i4bav2igd5ayh6wr9bygrik81n126z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -24349,8 +24391,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "7ca20bb808dd51adbd83e0c18885c4300548d032";
-          sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590";
+          rev = "7070f2a64de65e0446536fb974c940399a4097a3";
+          sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -25151,12 +25193,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "1.1.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "785765d575ef4c28581f6790e9814d75eaeec4ab";
-          sha256 = "18f5fppipandbirhhs5jlrk4gl7jxyrswfwr36859433x2wkfj70";
+          rev = "db6c52f41faba686a378a8c57356a563f5cef496";
+          sha256 = "0kx6w3zz5gmlmr9bx1mdq1k8ykkbnll6m91z90p6f2xm96j627j6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -26294,12 +26336,12 @@
     parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsebib";
-        version = "2.2";
+        version = "2.3.1";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "parsebib";
-          rev = "621a87d444d9b9c479221fffcd8f7cb5ce2f7717";
-          sha256 = "14rvqjd24xwp2pvl4r00jvhvq7p2wndpz3yy1ml9yymkkn1p1hnh";
+          rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3";
+          sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -26793,6 +26835,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pfuture";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "pfuture";
+          rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5";
+          sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
+          sha256 = "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s";
+          name = "pfuture";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pfuture";
+          license = lib.licenses.free;
+        };
+      }) {};
     ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ph";
@@ -27948,12 +28011,12 @@
     protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "protobuf-mode";
-        version = "3.3.1";
+        version = "3.3.2";
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "49a56da93ff3ab7d9a2252639344ad28db8cdff6";
-          sha256 = "0rq8q7viyy2nfmk2b0pik4amdndi6z51fww3m0p8a7l4yfkn14wb";
+          rev = "5532abc15b97f3489183b266b41844306052a3fa";
+          sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -28491,6 +28554,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "qt-pro-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "EricCrosson";
+          repo = "qt-pro-mode";
+          rev = "66601441cc728a609765b149ee0d7dcfb74dc8bf";
+          sha256 = "0azx8a7kwgn5byijgwar2rib9xv2p9w7w3yyb5bk19g3id2f8gdw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e9af710be77ccde8ffa5f22168d2c8a06b73dd6a/recipes/qt-pro-mode";
+          sha256 = "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf";
+          name = "qt-pro-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/qt-pro-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quasi-monochrome-theme";
@@ -30760,12 +30844,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "0.0.4";
+        version = "0.0.5";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f";
-          sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3";
+          rev = "3c3378afcbcf9a6fc30a1386dcc5465c51d312ad";
+          sha256 = "10i93w01272i1ydf6xjm4yx9xaja0yawd246av05aw8cq6nmai9j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -31138,12 +31222,12 @@
     slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slstats";
-        version = "1.7";
+        version = "1.8";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "slstats.el";
-          rev = "a2f640f724fee7ecbd1cf28fc78297180cd959bc";
-          sha256 = "0gzpwcrmlbd7fphgyv6g04wjavd9i3vgn3y1fnh178iswmpsxj62";
+          rev = "7488623cbe406eaafccc36d293e8c42bbd308085";
+          sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -32644,22 +32728,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    switch-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "switch-window";
-        version = "1.0.0";
+        version = "1.5.0";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "switch-window";
-          rev = "cd4b06121aa5bac4c4b13b63526a99008def5f2b";
-          sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
+          rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b";
+          sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/switch-window";
           license = lib.licenses.free;
@@ -33695,12 +33779,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "1.7";
+        version = "1.7.5";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "d5878b0ed6da2a561aa795b31848e31e7c696197";
-          sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3";
+          rev = "b517e31c63239d20055462bd8a1b4f594d7351c3";
+          sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -33716,12 +33800,12 @@
     treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
     melpaBuild {
         pname = "treemacs-evil";
-        version = "1.7";
+        version = "1.7.5";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "d5878b0ed6da2a561aa795b31848e31e7c696197";
-          sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3";
+          rev = "b517e31c63239d20055462bd8a1b4f594d7351c3";
+          sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -35527,12 +35611,12 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "2.5.10";
+        version = "2.5.11";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "with-editor";
-          rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0";
-          sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn";
+          rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395";
+          sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -36159,8 +36243,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "c996fbcc2e79";
-          sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y";
+          rev = "e9299b77df1f";
+          sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -36197,12 +36281,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590";
-          sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w";
+          rev = "d042a673b4d717c3ca9d641f120bfe16c994c740";
+          sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
-- 
GitLab


From eea95af5d1ef81b832dde30320cd70f5b6ec30c0 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 23 Jun 2017 11:04:24 -0400
Subject: [PATCH 1158/1490] melpa-packages: 2017-06-23

Removals:
 - todochiku - Removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 1275 +++++++++--------
 1 file changed, 653 insertions(+), 622 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index daea504c24c..629f094bbc1 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -316,12 +316,12 @@
     ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
     melpaBuild {
         pname = "ac-clang";
-        version = "20170608.958";
+        version = "20170615.838";
         src = fetchFromGitHub {
           owner = "yaruopooner";
           repo = "ac-clang";
-          rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686";
-          sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y";
+          rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd";
+          sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -738,8 +738,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea";
-          sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs";
+          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
+          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -755,12 +755,12 @@
     ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
     melpaBuild {
         pname = "ac-php-core";
-        version = "20170327.542";
+        version = "20170612.2134";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea";
-          sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs";
+          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
+          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -801,8 +801,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
-          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
+          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
+          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1011,8 +1011,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-link";
-          rev = "99787dc79ed9ec14a2b87257d6c8ce5b8ec0a0b0";
-          sha256 = "103pb0c5g25fsnbjcjgj04aq4damxwhm2fg86fgxihrch8a7bhcn";
+          rev = "8af476ac323e56d3c69ec2ecd1c095de56ecd18e";
+          sha256 = "0218qfmpjw57842w1wn6p5bkn1qmn39scnnsnc0a1xn8ywz1ivw0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1466,12 +1466,12 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "alchemist";
-        version = "20170402.2339";
+        version = "20170614.218";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "46d09a6abaa8adf5e06184b77d04638ff3aa9087";
-          sha256 = "1wvbn4capcf049y33633b4v8k1aqwi94lscif810f7p3m0xdai30";
+          rev = "38c0d2a21e3fedf71eda5f21f51aa79a0fddeb3b";
+          sha256 = "1hvkx35hjnpj8jfl41b510mcqfcxbv5msc8zmvd7jmdfx5gcn2d7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1491,8 +1491,8 @@
         src = fetchFromGitHub {
           owner = "jgkamat";
           repo = "alda-mode";
-          rev = "8bf40e0ed78c3d2b6536bee3a4b50a9f78a0c1a1";
-          sha256 = "167lmzh4grz4k47pw0pcq5pqbwjncfgw2wgzhvvg5jp66p7pmwqp";
+          rev = "e32d3908e40287648b3e88014aa9c2c977a9b715";
+          sha256 = "0993zm6dn2k85pkyvwf63ccqc90z1s8b3qaqpxm9qprinimxff6h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1592,12 +1592,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170516.158";
+        version = "20170623.357";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "7134b7467a7061b57c8cda3503e9644d4ed92a2a";
-          sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x";
+          rev = "2a0971cbadd39f6a89963351fe3fbcf9ca54566e";
+          sha256 = "08a676qnh7vab39zngrllmi0w54k97c9kmig5j3yxr7jki1g5c4y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -2999,12 +2999,12 @@
     auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auctex-latexmk";
-        version = "20160923.7";
+        version = "20170618.936";
         src = fetchFromGitHub {
           owner = "tom-tan";
           repo = "auctex-latexmk";
-          rev = "0315925ac9a892e73859cf4b720f36f2727f47f1";
-          sha256 = "0cdc2wkyqs4c6iypkynm0s540isp7yyyavp80rg5x3cid3hsbinm";
+          rev = "4d353522650d7685acbf1d38f7dbc504f734bd84";
+          sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk";
@@ -3562,12 +3562,12 @@
     auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-minor-mode";
-        version = "20170601.1421";
+        version = "20170620.1001";
         src = fetchFromGitHub {
           owner = "joewreschnig";
           repo = "auto-minor-mode";
-          rev = "92871449782f8679f15573ad178b9c2247da8bfd";
-          sha256 = "14kh6p34mrqfqyjzr0wvxx4acp72pz2b75w96y3jyhiswvaqfcr1";
+          rev = "c91c566cbaf8eac1fff0c7d9eef88308a566cc43";
+          sha256 = "0nq95k2wmq17awjz0kvzwnhpnda0813gdyjzlqpzpqb56092sbif";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
@@ -3730,12 +3730,12 @@
     auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }:
     melpaBuild {
         pname = "auto-virtualenvwrapper";
-        version = "20170518.1442";
+        version = "20170618.52";
         src = fetchFromGitHub {
           owner = "robert-zaremba";
           repo = "auto-virtualenvwrapper.el";
-          rev = "e2fb997e452e62e8bf9f80691941d3d25208e944";
-          sha256 = "0c0llr8kpq54zy1k2qjhhln76ii7r0nmgb85s3nrzar5l1z57zqg";
+          rev = "516cb0406a98fd5a41d389f37544f11b28b1d027";
+          sha256 = "0y82n8354nri2qpz7bn58rbhpjkqiaf82q9izhl6jy12g63g416l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper";
@@ -4403,12 +4403,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170606.1402";
+        version = "20170613.1031";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "be8f3ea35a2f58a218db062934ce3a1a054db3df";
-          sha256 = "01pdwvv1pbphnsw3h38x087xbdp5ry1h18bqiiispzvhyc56xvak";
+          rev = "0ed117ef35a599f01fa1f9387c84c600faf26c78";
+          sha256 = "0bsfn8fvs7mzhi452zdl1wa0sk3m1xm5gb0k83xm37fa1sxl7nkf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4819,12 +4819,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "20170605.541";
+        version = "20170618.503";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "28806d09207e4a194a39eb385650824a0121e0cd";
-          sha256 = "17qhbgq3ciyjjl4a1mm6qn5g5y39plmncad6i4kijcda9kx44w48";
+          rev = "0aa6033b55a2833e6f0810ee677c258f6c3e3fbf";
+          sha256 = "1qrqdvqhjaz0y0q4298vr85cm73526srirxz7zyalkl172jzwhgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -4882,12 +4882,12 @@
     better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "better-defaults";
-        version = "20170425.834";
+        version = "20170613.2104";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "better-defaults";
-          rev = "6f502fd2d7aa8940a31fd630f883a63e04a002e6";
-          sha256 = "15vayr1wy4qzgsv37pg8gjbv6b5zm9r51ql5j5l5q1x1ks9b6w2f";
+          rev = "12d9e6dbf24a8a3369b19650d74471b17b27f78d";
+          sha256 = "1rx3p6syp6axnxbscg0l73yihgwdq7bdnkcrvfikz79yflxrsnmq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7bb729c1ad8602a5c0c27e81c9442981a54a924a/recipes/better-defaults";
@@ -5136,8 +5136,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3";
-          sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4";
+          rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400";
+          sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5592,12 +5592,12 @@
     boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "boogie-friends";
-        version = "20170521.1917";
+        version = "20170621.1207";
         src = fetchFromGitHub {
           owner = "boogie-org";
           repo = "boogie-friends";
-          rev = "38ab3efc2021318cd62f9187214b69d34b4afca6";
-          sha256 = "01yccb86gzag2anmqj1p196m5374mxnxha1fbhv7krc2avx2j71x";
+          rev = "27c372592e19678bda5012f1ec3c60bcf9df78d4";
+          sha256 = "1qcjbmkx6qim2j1sbzjjidqhrakjsipay9bdssyfyi4bwwp8mnq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends";
@@ -6487,12 +6487,12 @@
     c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "c-eldoc";
-        version = "20170227.809";
+        version = "20170618.845";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "c-eldoc";
-          rev = "2232000692f6f891456fecf23c538d5b47302a60";
-          sha256 = "0mr49mvjak30c6x8n4c13xi4rjfnbpnizq27f4zmryx5k8w5f9fp";
+          rev = "0899f497e98e285d7d2e9cf897e305587b4b0790";
+          sha256 = "0yw59pm25a5xrcdl6mv30i08wnhljy6gndvnlpi09vp2dln37kbq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc";
@@ -6764,8 +6764,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "camcorder.el";
-          rev = "c96b3392c99b9f83c968bffa330ec4356c41518e";
-          sha256 = "0am8asrzjs3iwak9c86fxb4zwgx5smbb9ywp0zn4y7j37blygswj";
+          rev = "b13d939990e6709492efefc0945798adc1c0fcb9";
+          sha256 = "0y8hw463w77rvf7cn5bqjnfww8h8kfkn37wi1kfjfq8hyirw4zrb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/camcorder";
@@ -6783,7 +6783,7 @@
         version = "20151009.845";
         src = fetchsvn {
           url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/";
-          rev = "16557";
+          rev = "16558";
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
@@ -6821,12 +6821,12 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20170203.35";
+        version = "20170621.1316";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a";
-          sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3";
+          rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2";
+          sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6993,7 +6993,7 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "25057a27543788079e7040bf42b139e0aa0635b5";
+          rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643";
           sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f";
         };
         recipeFile = fetchurl {
@@ -7035,7 +7035,7 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "25057a27543788079e7040bf42b139e0aa0635b5";
+          rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643";
           sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f";
         };
         recipeFile = fetchurl {
@@ -7244,8 +7244,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "036c5898eb89e846fa1b86537a5c0569868dbaf0";
-          sha256 = "0cz4cwisnlbkclc6cn7rlz7pkpwh5p0646dzrkw92bk5vmwh89pg";
+          rev = "e82320b90ebaae9e1f8f1b709455f465a773ed0f";
+          sha256 = "0awyj4rp9f2q7562xz52cm8zklsmlm5xyykw7x7n4d0qa72igm3j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7284,7 +7284,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12230";
+          rev = "12255";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7301,12 +7301,12 @@
     challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "challenger-deep-theme";
-        version = "20170428.301";
+        version = "20170623.311";
         src = fetchFromGitHub {
           owner = "MaxSt";
           repo = "challenger-deep";
-          rev = "a1e32cc882de952b887824bcc100aa095cb87b94";
-          sha256 = "0f71ws2an3ivy4hyjqm141xxd7r62xh783n6fp21z7ya4zkzlvb5";
+          rev = "22022667437e94c2309c7c77a14268970de16146";
+          sha256 = "1prvdrc8wjb7dy8dqj5gvjzzdiz6hqv252inlwcyjrqiq4apipxz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme";
@@ -7427,12 +7427,12 @@
     cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cheat-sh";
-        version = "20170606.727";
+        version = "20170616.259";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "cheat-sh.el";
-          rev = "512c74b0cb0798a75303c5384ee165c8a5f3356b";
-          sha256 = "1m65k2gqd5irwk4cj97p33q14shn4cpz0zxcpg4m3bgiwl8qmxhs";
+          rev = "ee9a51f4b2a8b2f26008e00a84b6c344b6664e85";
+          sha256 = "1hzv0l6vc7zdj93cimmi9rz6i6xsg25yf4rcfqlhcax10bhnjsd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
@@ -7908,12 +7908,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170525.255";
+        version = "20170620.207";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "7ffc207cf0e56305963e1a3387dce3114325544d";
-          sha256 = "1n4pik7fp4xlc0xdcnw649mx2r2qaiv1f5w9bbz1n4r4pqhmy5q7";
+          rev = "55a579f56a05d945e6ce5764002d2cadafa581eb";
+          sha256 = "1lni2a9gy44xna62w6kfv678j8zk1dawwaqrbyn3mdy1s7d3mcj9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8184,8 +8184,8 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "305184";
-          sha256 = "1hs00lf2f2fmxv2abhskrlqr96395j3ywbgs8aacadbzigdx4iq5";
+          rev = "306094";
+          sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -8570,12 +8570,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170608.2315";
+        version = "20170622.2345";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "eacd330f28513276da18e4d6f2607f9041314c49";
-          sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw";
+          rev = "197298e93af19f755cc2c54049dc5aeb04ce6553";
+          sha256 = "0l5aw6hj0ry58b2ws2m0dlrasp5w8x62qcsbbzilapk2ysb9h787";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8595,8 +8595,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "eacd330f28513276da18e4d6f2607f9041314c49";
-          sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw";
+          rev = "197298e93af19f755cc2c54049dc5aeb04ce6553";
+          sha256 = "0l5aw6hj0ry58b2ws2m0dlrasp5w8x62qcsbbzilapk2ysb9h787";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8826,8 +8826,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "abd1216c1f8a1211d348568bb7695c30505de84e";
-          sha256 = "1z3c0wjvk5ry69sjmslvw2mnnri63dk1vk6lbx881fxf67r4wf7f";
+          rev = "4c7caf15e4feef244f7e1772c1c932cc790e2cab";
+          sha256 = "1bizy68m7ggsbd98dm0c4cchr8r9h3lh3jfvcwcbpvmrlx0w4clm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9176,12 +9176,12 @@
     color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-identifiers-mode";
-        version = "20161019.1314";
+        version = "20170615.1338";
         src = fetchFromGitHub {
           owner = "ankurdave";
           repo = "color-identifiers-mode";
-          rev = "2b02b8d4ed0233d63a698a7f929b87fcaa8d0048";
-          sha256 = "1jqvdask079373q9lgfp058892apx8qcchnrwwwd2zgfnwhjhy1q";
+          rev = "d57e162c2dcb926291ded21cbe46b98ad0ca32c8";
+          sha256 = "1n12z7qfwgsdvdzzi5gkgkmdaazbrg5064s08xsc6gsfs4rb5d17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
@@ -9593,12 +9593,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170611.1356";
+        version = "20170617.1502";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "950c54721f85e68fd21f1e92991d597fd38685e4";
-          sha256 = "1gkjin7ikghh4zbnpbg7gzhdj1hg125h8kq694aa4ag9379vivw7";
+          rev = "9dbabd146c5884c1a1940eef010bcf834510a8e2";
+          sha256 = "03nrim8r28d6zj7c6vgf5wldyfq7yfpc6yw37cmamkiqi0rhnc40";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9769,12 +9769,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20170504.1519";
+        version = "20170615.1842";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "eddb16e5ed9bd2945c57054b2c0054dee600b985";
-          sha256 = "18l442b2gnbgzn6x1qfdcfqn4ilh646fw694qam9g996vd0ncajb";
+          rev = "642c0b5b539692242c476eb00af7bacc91d7fcc0";
+          sha256 = "0mykqf03c7fbdb851fqdczb97cq6wq1lkinnjc2jaim5j4hc3gig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -10070,12 +10070,12 @@
     company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
     melpaBuild {
         pname = "company-irony";
-        version = "20170611.1403";
+        version = "20170612.1308";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "company-irony";
-          rev = "f68c1b46d64b9f95cfc2a6d611089d0442ed58ba";
-          sha256 = "0kfv89vma93qv97vh1ajg74wq62sq7f6gr39pm8hmfvmk0d6y51y";
+          rev = "b8001ffc4da7403172835d47bc740cfbac35364d";
+          sha256 = "03ym65ckpx6n03l633lwvxiwvcdhm8kjsw91ql1y4f44vijlh2xi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
@@ -10242,8 +10242,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea";
-          sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs";
+          rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
+          sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10374,8 +10374,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
-          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
+          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
+          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10538,12 +10538,12 @@
     company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "20170606.49";
+        version = "20170622.146";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6";
-          sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf";
+          rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2";
+          sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10894,12 +10894,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170610.2335";
+        version = "20170622.1103";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c";
-          sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878";
+          rev = "f0426613062ba8305ebac41672d853a95cd9bbca";
+          sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11020,12 +11020,12 @@
     counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-spotify";
-        version = "20170523.1321";
+        version = "20170612.1132";
         src = fetchFromGitHub {
           owner = "Lautaro-Garcia";
           repo = "counsel-spotify";
-          rev = "7cecb359224f24e1e922b513b545187e6774d207";
-          sha256 = "0lbh9z0w1czxvrdlbch71gys9wjsc9zr9i6xwq3ah40aydx251x2";
+          rev = "dba8c1bf92e15f34f12a9e22b5958a93f10b46c5";
+          sha256 = "1j7rzf8mws2yzdvfz8a6k48b5x6cn11lfvfya5s4c90kyy92j8ag";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify";
@@ -11693,8 +11693,8 @@
         src = fetchFromGitHub {
           owner = "mortberg";
           repo = "cubicaltt";
-          rev = "1fd1023bd5f2ec2f457f13d0d0a165a98c05fde2";
-          sha256 = "0gxn0kdzzsc801h5vhbpnn5p6msj6gv5lpy5qq6gyvvd0djp06mn";
+          rev = "3c024a91109657088eda0f858be639c8d40c451c";
+          sha256 = "03ppp20d98g824nnc4mnii3yzc58b5x3cbcifznr0pb0i4w5h42f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11960,8 +11960,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "0898a2f2bdc4dd01cc5ffacdf5dad45c9e38e32b";
-          sha256 = "0chfmiy1nk12yalq2bd812580fr38x3di5vjf6z2kyi96p11jw6l";
+          rev = "9db5c060c2f8c5e38b9865b8496c6057bba3044f";
+          sha256 = "0qwjb3jqgnrk515l7931drp8agjc7l8bsrik6dzd5zik5zg7448i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12082,12 +12082,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20170424.247";
+        version = "20170620.439";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "764382bdcb1056e96f31a66f7910c16de39c7801";
-          sha256 = "0gj2hqcmf88i12vlc6i8pr7r6d1hczqhg7ablnycj673hnzzc5jh";
+          rev = "6973f81ae5b97710b617754e7080027e0931eea6";
+          sha256 = "1b62ibhcjbfdblr5f6sl5k6vn5hgz7ydipd8qlwslyyiqfypj17n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -12100,22 +12100,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dante";
-        version = "20170508.2347";
+        version = "20170622.34";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "dante";
-          rev = "05141a7f1ea9c368b469825cdc31c54194740c9d";
-          sha256 = "158b083jlx4zi219z63nlim02gj7vds51bxxpvbhyw7222m5ddyv";
+          rev = "b4e8e2b735408087a338813fc56979a5f2556d59";
+          sha256 = "002m6mpq6kk0dqa3vlpr5dj9fxmyzphzxqgf1zzwrfrig4bipzsp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
           sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
           name = "dante";
         };
-        packageRequires = [ dash emacs flycheck ];
+        packageRequires = [ dash emacs f flycheck s ];
         meta = {
           homepage = "https://melpa.org/#/dante";
           license = lib.licenses.free;
@@ -12334,12 +12334,12 @@
     dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dash";
-        version = "20170523.219";
+        version = "20170613.151";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "524e6fe86ba240d4405d3de1c862921fb8085c8d";
-          sha256 = "0ipgfwz5xvqm6lk3r3z0pxr49j7rqwsc4zd9d061dh5f9s5vv2qx";
+          rev = "1e14307e2d829d3e4d502991d572eb9a5d7f173f";
+          sha256 = "1mvafh0zs3kns1l41qry2vf5vfrwllyhgcj97gmvczm9slqxp01a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12380,8 +12380,8 @@
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "dash.el";
-          rev = "524e6fe86ba240d4405d3de1c862921fb8085c8d";
-          sha256 = "0ipgfwz5xvqm6lk3r3z0pxr49j7rqwsc4zd9d061dh5f9s5vv2qx";
+          rev = "1e14307e2d829d3e4d502991d572eb9a5d7f173f";
+          sha256 = "1mvafh0zs3kns1l41qry2vf5vfrwllyhgcj97gmvczm9slqxp01a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12590,7 +12590,7 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "25057a27543788079e7040bf42b139e0aa0635b5";
+          rev = "b2baa9297cce22e628c213549e0a2fe98f2ad643";
           sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f";
         };
         recipeFile = fetchurl {
@@ -13106,12 +13106,12 @@
     diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diff-hl";
-        version = "20170519.1530";
+        version = "20170617.1540";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "diff-hl";
-          rev = "63f1687aafb4449761bb19f3f5f1b677ab1b5d91";
-          sha256 = "0zaaik87ndbcc77swakhfkh8pbl0zgk5ajq9wfpr7i27mf1x7n2y";
+          rev = "09b9354a8e703d24c132ee08d6c92eee1421fbd9";
+          sha256 = "03pk4d1l2vqhvp00z06kbgp4jyfw4nlqia6036kgwg2bp5pnc4aj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
@@ -13438,12 +13438,12 @@
     dired-explorer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-explorer";
-        version = "20160809.200";
+        version = "20170614.1956";
         src = fetchFromGitHub {
           owner = "jidaikobo-shibata";
           repo = "dired-explorer";
-          rev = "f9ac7c511c4b2e349952eb4b99635047f3603907";
-          sha256 = "03zax8q9wwj4q9l13zsznrx18b6d1rqrfgvmvzlkd3y4sqj2i64w";
+          rev = "b02b08d73821512853c6a14113c794dded1df75a";
+          sha256 = "1kc2j9iw4rsxkbssn6idfi1avxshn23aiv006a0yx8bhgwclnbq4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acd40e02185847dfdcd70b3cacea703133e4356d/recipes/dired-explorer";
@@ -13935,12 +13935,12 @@
     direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "direnv";
-        version = "20170501.218";
+        version = "20170622.1128";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "emacs-direnv";
-          rev = "2cdf87ea96f9a08dee98762b18b5f8a5198ecf63";
-          sha256 = "172jyl8v4zy9bbha8nndq63x8svn9xqkafkj3q17z289na8iaylh";
+          rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa";
+          sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -14801,12 +14801,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170611.1109";
+        version = "20170615.437";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-themes";
-          rev = "4b6482765e3be2c51a9d8d23bbbfb9a0c80bf4ac";
-          sha256 = "0g1883qz5a0fra1hsn6kx9r1hply61ba0bxhb8xx08j2zxbwj65s";
+          rev = "55d2f8eb0b6ed6a1964741c61d898c97ed934b7a";
+          sha256 = "0wbhjfiidl1fbxhdrpk9f7wc3kvb4nshwzfxd1vrgpx48kaiahgb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15236,7 +15236,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1798436";
+          rev = "1799660";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15337,12 +15337,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170611.1336";
+        version = "20170613.1206";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "9743f3f2736c0e84c5dff860a142c78a0c4ed861";
-          sha256 = "19pdgwziriamf31vjca3y4fxcz4pcfdhr8ac2djz1gsfslq9n236";
+          rev = "aa44169d1d343010e56af0f17bf5448d0dbd2c8f";
+          sha256 = "1gz1n1nmb0hbcw0wcm5l87zpi3wr14aqhdi66kqcahqzrk8xz86d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -16597,22 +16597,30 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, skewer-mode, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170606.1325";
+        version = "20170616.1117";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "d9c81f3d900f2ffd78fd314685023d66d6d16438";
-          sha256 = "1vf2bxxk3dj0npgab0yzqfx6dvfh5aj1bhmbpw1xfhssciyg8q47";
+          rev = "d3a40af5743c865e71b165600e8f1d0d2b72df53";
+          sha256 = "1jsdj0ll6m80xjxgy20ngkdfhak7scx1d474w3s46vvgcjl6z7p2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
           sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
           name = "ein";
         };
-        packageRequires = [ cl-generic dash deferred request websocket ];
+        packageRequires = [
+          auto-complete
+          cl-generic
+          dash
+          deferred
+          request
+          skewer-mode
+          websocket
+        ];
         meta = {
           homepage = "https://melpa.org/#/ein";
           license = lib.licenses.free;
@@ -16663,12 +16671,12 @@
     ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20170328.706";
+        version = "20170621.348";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "9595e72e85e7edef0d9df5accf166d232824cd3d";
-          sha256 = "0h0ryi027f4vqv9m6dz8dgf9scqmcabcgin692yysxp9b5jkg8d3";
+          rev = "438e4f5995285d28fe7dddceacac212c2250dfe2";
+          sha256 = "01nxgv2yz9clbqr35kdl36zmip0nkqa45ab6b06npdxpcs4438nq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -17476,8 +17484,8 @@
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "85319b9e75dea9f79e6d16011ee2a15be11eb9c0";
-          sha256 = "1gnjx7ay0c167vnl7k9gxmvm93ipqfs93jmcmvy56rlvc7yyk39x";
+          rev = "b15af913435023fb6ce91e4ed79f8e9a1f936f6f";
+          sha256 = "15sga6fr6k29cncasfx5n71wspwshag8wcrmwa5py74ba31y98q5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17703,12 +17711,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170519.1544";
+        version = "20170613.1339";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "2cf34afa0c3e7249149a65c0ae89e6c593050f2c";
-          sha256 = "0i57dhljf0ymsqlqjr1bz0hxr108k7iiw267s24a3bm3p3ac5lfi";
+          rev = "4970cbb55767e5f31913b21fb1ae733b6479ccd0";
+          sha256 = "0v0gw8ba073k6n48vrksp1bkrsh0fyg7wmc0mpjf13qcbcwn3ydd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -18235,12 +18243,12 @@
     embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "embrace";
-        version = "20170508.1526";
+        version = "20170615.1131";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "embrace.el";
-          rev = "02396165b6672c8c4cc800d25bdcc31e28b7f3da";
-          sha256 = "045xdfm1li0wkhrcd2h77bviw7n4bxid7d4f482gala16y9mbjvx";
+          rev = "394863dd7271e831cb9c257a1cd2249302ba962a";
+          sha256 = "14qs180p5kv1h4p9qsv4jj61pq7d7bsrvwm0wm85lhgpx8v64q7i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -18297,11 +18305,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20170601.1651";
+        version = "20170619.1156";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/emms.git";
-          rev = "0481ca3b8f8d558e545582440dde6dac514818fe";
-          sha256 = "1z2kzaw2jr4m189gd8978g6wy6z9wicf1klyh48l623lh7cv48ic";
+          rev = "a4ec6697e45a006753bfd79c22f14524748df493";
+          sha256 = "07czram3jjhkc3ahjz86qq0fsh8ysdgvlpfyyvj3jmfah1sfk5d7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18569,12 +18577,12 @@
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20170528.147";
+        version = "20170617.931";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "033e3b2fa171d73b932ecf27df237be2fd6e1c36";
-          sha256 = "0x8ydqzacrps0kl3j50ajp8fwxg8vnggvjpjbnrglkpwwn2j1kzr";
+          rev = "a93f3d424a2ca07d81debbb024053d0e207e999a";
+          sha256 = "09vmn8ya3zbmwycaxw5kvlmfmqk0jn07zzajlrwds65p3k8ddcrl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18791,12 +18799,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170611.1428";
+        version = "20170618.333";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "86a52709a0c45e2f84737319f8f95abd0ea55ff2";
-          sha256 = "10ix3yx916c929i8fj2bqkjjm409mwpjzydji6x8n8v5s8lnw6m2";
+          rev = "8c7f659a170a2af248f912e56ec8ac25453fc867";
+          sha256 = "0yzdvqmsrssk56czsccakw0qj7xjmck8npmlmf9zy1389aw0g6ji";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19432,8 +19440,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "dd9e39dc2b97e30c03b24a00eb757be7d2c2bdc2";
-          sha256 = "1q5pd9a5d5513brw5s2x6652fmmql7y7lcnzv18kw3wc4qvccl24";
+          rev = "f52748254f17ba42e344798e8c787a1e3361fa33";
+          sha256 = "1jxnzhclsdbszpams4nbz23f3sjv4i966maadrb6x929jab85fm3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19658,12 +19666,12 @@
     escreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "escreen";
-        version = "20091203.1013";
+        version = "20170613.1534";
         src = fetchFromGitHub {
           owner = "emacsmirror";
           repo = "escreen";
-          rev = "e3fd46225fec70943024d950c6b6c2eb88e00b96";
-          sha256 = "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc";
+          rev = "153dc05b2b7e6e2d4cbd7b6cbe8b10d6a70f73f3";
+          sha256 = "0xz3dkvgrbgv91dxgdfcir9zld5qsqpzrmp4q6fxqa548advn9ak";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c64c21a42fd8436bd60e490980ad4ed824b212d1/recipes/escreen";
@@ -20263,12 +20271,12 @@
     euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "euslisp-mode";
-        version = "20170315.2046";
+        version = "20170621.945";
         src = fetchFromGitHub {
           owner = "iory";
           repo = "euslisp-mode";
-          rev = "fbaa35e77eee91da5ce86fbf5342648722b97d7c";
-          sha256 = "0y9l6h1824a7sd4w26s1ql8ffim42pcz8szadmwk2v4p64cya76l";
+          rev = "16ee25d6d84d0e0b1b153791c51acedafd8d572b";
+          sha256 = "1a496xzw6vs6rv7pp6yv3zmjdxbypjz132r6s6595gjcvwrfisr5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode";
@@ -20389,12 +20397,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170612.100";
+        version = "20170623.34";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "d45772929db630be8226e2786132d46e2c6bdb2c";
-          sha256 = "07mc036lz2lj0csg10a8gdqxqsf8mxsjfy3ha9wsrmbqhsvwixn9";
+          rev = "d35f3a225feb27002b2aa207e955ca7b305b9ca8";
+          sha256 = "07y3rhxcxrmhcjz2pdcx4wlb1q5j95jhkimcj91gw30jvqn89yq5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20914,12 +20922,12 @@
     evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "evil-magit";
-        version = "20170611.1237";
+        version = "20170613.510";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-magit";
-          rev = "f851e5896fa90ae94dfde3d2a7554b4d5f9e665c";
-          sha256 = "127ccll30526b38g64pagagnia8mw0bs9db95xri0n48x4vginkd";
+          rev = "91c96e6ffdc6e7d5e49fd9b0ffb7df8794f0f2db";
+          sha256 = "1nwibif8syk5dfygzcafsbh41gaxaps187zxdv75z2hbdbvqx1l3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -21124,12 +21132,12 @@
     evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "evil-org";
-        version = "20170611.1149";
+        version = "20170622.1310";
         src = fetchFromGitHub {
           owner = "Somelauw";
           repo = "evil-org-mode";
-          rev = "4da3d179d71113b906173a974fec933e9f55afa8";
-          sha256 = "16d9x89plmy6qrjvc8czrqpc1y53xbcaclc20yd8yyi722sdd4x1";
+          rev = "975109dc665f53cef221b3c668612664340b7940";
+          sha256 = "0fr0wxd53a0lv2akvayi844fncn8klj88hmld73x2d1igig38p4q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21208,12 +21216,12 @@
     evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-replace-with-register";
-        version = "20161127.2159";
+        version = "20170616.813";
         src = fetchFromGitHub {
           owner = "Dewdrops";
           repo = "evil-ReplaceWithRegister";
-          rev = "c979aa2f4d730d2a741358e357d18544edd46cd2";
-          sha256 = "168qqbsjwblhrq92mw0v1f86d3q1m2f5rh37xikj1bk589c2izp9";
+          rev = "0d8a67b578849c00a7a50540daf809dd2ee2b476";
+          sha256 = "1azxhb41f8ar3p5grdknpdljx85v2i6zjsp2qd7y8ij69kdw2z0b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register";
@@ -21296,8 +21304,8 @@
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "d6d60b077e31755b6d543337dd165ab7e1c67d36";
-          sha256 = "05fxr48r7qilh52ycm6bi108y9kd1zw62mckf8ddhsjrvszx97nb";
+          rev = "c23864f13689c6bb80974fd483062074cfa38637";
+          sha256 = "05lsb6xl74pxzn59af39mgg9as28kr17mk5yajwsyqfhj8bl1bfq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21338,8 +21346,8 @@
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-surround";
-          rev = "a4fc4483dff0bb0e544d832a845fdc6fb85c6214";
-          sha256 = "0xqvpr8irkv4qw82gcgnnfb9mjavb4jj9a11cw32wqjdg0106dlr";
+          rev = "43a266461517d2eb715338da0a31dc6616073116";
+          sha256 = "04pzlkblziir91g38kmlmr7p1q5cxjw4q7difwhly3iz567minkq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@@ -21443,8 +21451,8 @@
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "evil-textobj-anyblock";
-          rev = "66dd87d10843f99cb4b7f76e55f00fca9dd48ac3";
-          sha256 = "0a0vr4nqnigrdblr0wfxzl6n3xv4sfi7w3rdrsq8n4sywfdzwlap";
+          rev = "b611a54e62a6e6ce40bbb8b5094bd88028fc7efd";
+          sha256 = "1wgdzl14hrzjsh6wvc83njfd0321rnbhc68mzcvn27g04zx9a1d0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock";
@@ -21691,11 +21699,11 @@
     exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exiftool";
-        version = "20170301.232";
+        version = "20170613.1342";
         src = fetchgit {
           url = "https://git.systemreboot.net/exiftool.el/";
-          rev = "b678cffcac678ed0254c5f9e881dc4486816d3c8";
-          sha256 = "0afc77iz391y67jlimqzppz59my8ndz7acpp639a24m121xm3zwm";
+          rev = "1c9c6feba21b98337665b6f2b4064b2bf5b75af6";
+          sha256 = "1m3jn127w95sb4y34f9lb1cv445pxfs4b90f6ia5cjs75706fn03";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
@@ -21837,12 +21845,12 @@
     exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170606.2038";
+        version = "20170623.446";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "ff656107e55458cb2b453eb4637ad203007068f1";
-          sha256 = "1ssbqcrhcprfd1n4bvcbczp3dqhq4hcl75qaz6alc9y11r2jb4ar";
+          rev = "d94d4353d4264f006c8c45dd70be4f699640243f";
+          sha256 = "0dfsaibb1h9i1m0ckwfsf0xw6mzfzw4h7mwzjql8nslfsq5q7iys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -22314,12 +22322,12 @@
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20170602.1912";
+        version = "20170615.1143";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "2e3abe356b464b30350c08e243988a3116818b19";
-          sha256 = "0cplg10mhr2r3cp4wcaykyvbzilmjma90hkv4h1m8d8xrfdmmi7g";
+          rev = "cddd216402c9a9b4228b5f82afa1bd637b2e0c37";
+          sha256 = "0kvn9ikxnv9ahz0cqal3drxv95slwbf758sp37irih6fqh3ybgbl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -22604,8 +22612,8 @@
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "eb9fec502a2622b46301ca49183147b6b1fcaff6";
-          sha256 = "1hrdqdps76c1sfq9m9l6nid32lklsli2hgwzd4sl5ypb0zqhn25k";
+          rev = "a6e59891973f3e40ca2e414ca66799cc686d8626";
+          sha256 = "16wxw5bxb3nmw6glx2iqcfr75fsya1a9kxd6khv46zy5z85n1bng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -23503,12 +23511,12 @@
     flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-clang-tidy";
-        version = "20170222.512";
+        version = "20170621.202";
         src = fetchFromGitHub {
           owner = "ch1bo";
           repo = "flycheck-clang-tidy";
-          rev = "fe49836f30b37eae308e2255acbdcb0195d3a2ba";
-          sha256 = "14i8f5gid9pnrgsvhibwclv4m53j86i05wbfjfj15aprhbf2ii94";
+          rev = "5b1c86477f7d1eaabd781bc83dd1bd105c79335c";
+          sha256 = "1zd6rqbrpvjxa9sclkldffb91mgyljh1jcvlvvd2cdlajcv98ciw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy";
@@ -23965,12 +23973,12 @@
     flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-haskell";
-        version = "20170604.447";
+        version = "20170622.1248";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-haskell";
-          rev = "84a8853d2ed4bd74038bb45d531dfbff0a3b1de0";
-          sha256 = "1lzf5wahmbxfqa7944z5gjbs7vfbm5qsv02jc7x3cvj8z22kf4fd";
+          rev = "2aeb2ed5cdde7770cd5da9950981390d7b44f74c";
+          sha256 = "0h7zb1f0j3b44ad7ikdyv3mhddvh9hfg61g2aic3x3ms8rph86q5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
@@ -24431,8 +24439,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
-          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
+          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
+          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24595,12 +24603,12 @@
     flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-vale";
-        version = "20170521.109";
+        version = "20170619.2322";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "flycheck-vale";
-          rev = "7ca0a2a29b6185761bd07369c565774269c909dd";
-          sha256 = "1crlyphv00a1zm8wbsysxfxhfasv34bbnckc4a3psnvl913nc1gn";
+          rev = "97df981468120aaedeaa4cf8ecfd68b07046d998";
+          sha256 = "1zic9mirz2xi25pcj3d6r9sclambyn9q5dp7v9jvvxqkml3vy88c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale";
@@ -24637,12 +24645,12 @@
     flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
     melpaBuild {
         pname = "flycheck-ycmd";
-        version = "20170327.1418";
+        version = "20170614.1434";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6";
-          sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf";
+          rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2";
+          sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25498,12 +25506,12 @@
     focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "focus";
-        version = "20170520.901";
+        version = "20170612.743";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "Focus";
-          rev = "155da77a324f28fd37f6167d5c843c491dc3327d";
-          sha256 = "0jkfwammgzvfdhs4pg751rkljhrkmbyvqfs762i3smpqw95jqh2w";
+          rev = "a84ade00a2b57e47430d5b2df5246069f197356f";
+          sha256 = "0qz52gak45nbi6pgsdl3h2a01d89gbzm0glpv1jjy5dvabr98835";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
@@ -25748,12 +25756,12 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "20170221.1327";
+        version = "20170618.1048";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94";
-          sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb";
+          rev = "96e37ca81a42061f0e837cc3c4dec1844f682e91";
+          sha256 = "0hbz2q9sm70r7sxk56dlnzwh71ckrww7w43xxy3ys1r3p7b3j3aq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
@@ -26205,12 +26213,12 @@
     fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "20170606.925";
+        version = "20170617.1330";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e";
-          sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3";
+          rev = "9766952bd7830cb0d319736961af8e42e67d42fe";
+          sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -26266,8 +26274,8 @@
         version = "20170601.1205";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "dc0b8994f00bd46de99398f92bf949a784c7a9ee";
-          sha256 = "1wka0ldx68psxjp3bl6xwx48mlnawqccvyig1lr4c5vi1avkf6dk";
+          rev = "c53895e03d76de257a92f4f91e4787fc1ca0901e";
+          sha256 = "1x21d23543czdrz8pgfz0wc418lm7gns4gz1gbpl6b02l9kqz750";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26388,12 +26396,12 @@
     futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "futhark-mode";
-        version = "20170506.1334";
+        version = "20170622.701";
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "19015c8d84abc84cfd5f39295b02af8af5ef2e94";
-          sha256 = "1vp24kgi3hv2j7df6nmczhfy847725c6jpjizmgfl9r2d7d1v9bs";
+          rev = "5286c51bbc8e050157f2ab589d9dad45467db57b";
+          sha256 = "1ka3z60iqshr1hk7znvjw7kw016q36ixaqqnr7jdjv5z37p7ngqy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26655,12 +26663,12 @@
     geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geben";
-        version = "20170125.1937";
+        version = "20170620.2012";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben";
-          rev = "7639411604552fcb6352afe88522a9ff1c8132fc";
-          sha256 = "02pic12kfa9794sz7qj57ca5ld8x1pk0apfr3h2xzr6zdsmsdday";
+          rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc";
+          sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -27033,12 +27041,12 @@
     ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ghub";
-        version = "20170518.358";
+        version = "20170614.840";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "ghub";
-          rev = "715dfef4a926228c059674bc68a16e27d4f539ee";
-          sha256 = "1y6crh3v3g7g0i225pcp9ff18pcfl5fnpc22yf4wcbf1if7pd2vs";
+          rev = "efdc28e3d27dd0847ceece593ecd1e9ed3287c9f";
+          sha256 = "0vh6y36b219vg2iwxbcdkdsnpnmb4kkvr9pz2kgiayyqrmz3ck37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub";
@@ -27247,8 +27255,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "622c994183294b02893ff286210bffd5255296df";
-          sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i";
+          rev = "7987db94c0041f68664d5ed91ce241c31fd8d1d1";
+          sha256 = "0bwgxhzd81nh69dbhswdq70y152ikwsxlh23d3ng36kix8s6fgsg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27726,12 +27734,12 @@
     github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-theme";
-        version = "20170413.2100";
+        version = "20170620.2100";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
           repo = "emacs-github-theme";
-          rev = "cf3c1325eb33d3593ba1cc4ad692eff287c33779";
-          sha256 = "0abrbhhllkimidv4mi95nlzzigbr3qvjnd683rpv6f3sdqwcyw5f";
+          rev = "849b0e8939b1ee5a693e268f07ea3d732784c5f7";
+          sha256 = "0zbaxwgcnb4mgspqilb8cqls3yqvs1vmvg8lhg33vh8d5wjhfz8y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
@@ -28757,8 +28765,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "142b0e64babdb0066d2ffebfedb3c886fe75c680";
-          sha256 = "0vccg70zf0c7xx6acffrdvhvvih95fcgxq9dw4bsax46p2pffc6q";
+          rev = "85799e8cd3040b960e4dcc544cc9bb7c9cd716c3";
+          sha256 = "16khvjfiv4x1rghac2d970875w6jyg2fl7pbj801q0ia5cm7cxz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -29028,8 +29036,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "98f52561d70fd95cfb7a5155ec9e62282bc55dc2";
-          sha256 = "0vqnsyn80h06qi2ypql4j66a9w1dsnd5f95gcnj5dgwk0scgpfxp";
+          rev = "aeb6edb322c30b8fb484caad0a37404b58996c84";
+          sha256 = "1ks360lfaaka9rhpqmpnzmilys01ikq6k2v9vgldlli5mlm6sbhn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29154,8 +29162,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "816182124457bed620678f9a92b349787cbf87bd";
-          sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj";
+          rev = "a42584b9f86bf1970ed63b68bc95dc16884d0268";
+          sha256 = "06kxwac17rhfa9siw712dlra40dpd5ivc4qnnim44i48cr771a8v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29535,12 +29543,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170609.1120";
+        version = "20170615.513";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "816182124457bed620678f9a92b349787cbf87bd";
-          sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj";
+          rev = "a42584b9f86bf1970ed63b68bc95dc16884d0268";
+          sha256 = "06kxwac17rhfa9siw712dlra40dpd5ivc4qnnim44i48cr771a8v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29682,12 +29690,12 @@
     guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guess-language";
-        version = "20170521.404";
+        version = "20170620.308";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "guess-language.el";
-          rev = "65dccb18df4d0c766d516c5f1423994bae445b51";
-          sha256 = "0w189k3nnkzgh6gqw4zknhjykigym42rxjhcr5xl1b3h3mn0zz7j";
+          rev = "1f1602f74d7159e7fb8c90f92ec5a3d1df5429da";
+          sha256 = "1764v96sdn3zvpd35ppn31ib4p8cvdrj0bfmbplxg2xhp7xkgmca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
@@ -29745,12 +29753,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170608.303";
+        version = "20170619.1045";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "af57f5e969004dc5141cdb1d4c77c55ece0c6868";
-          sha256 = "0nv85nlcac7k5pld2sg9wsbggq394jlmpcayzkrm81yy8a5grm5d";
+          rev = "b2c32f398aade6c83300c20b6fde9b6e8a20c7b1";
+          sha256 = "0563mzd54b4qg9icy1d8hksw9lsfajkp18198m84v09cl2zdxvqn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30253,8 +30261,8 @@
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "c46bdf129fb7ac241b84e0cfffcd3c7588dfb1af";
-          sha256 = "095y6zg8frdl9z7r4xp4dysf93d947srwiylngss8fclav7fjq2y";
+          rev = "7eb94b5a5d9478a0da869bd26ba51d08e574d843";
+          sha256 = "1bj077gpg2xzzjcriv9zixjqalppv0ya5s3bpxn2w93jkzxa9xd5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30518,12 +30526,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170611.701";
+        version = "20170622.126";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9f532785d43389339ed73d90357d4aea9d966020";
-          sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5";
+          rev = "8d0ef8f7ba56a78d7c1292d3db65f993518b8a78";
+          sha256 = "0y5gp4mmf6p244bpdnnv29gz0psfgh8338m5cns2z923pcllpjg3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30956,22 +30964,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }:
+    helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-cider";
-        version = "20170209.2316";
+        version = "20170617.2254";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "helm-cider";
-          rev = "8e092d0d2e9cf27195296c684b4fab831208b98a";
-          sha256 = "081wkmp4mcdszyirgifdn4qzpvc9bz3qkvwnlp0c9jzimkizpgsl";
+          rev = "7dafd5ba9c961ef22fd3ba617f13a411034f68be";
+          sha256 = "01wabgaka3mjllmqm117rv28jxmcp1znaxbgrabgcndhgyd7ycyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider";
           sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x";
           name = "helm-cider";
         };
-        packageRequires = [ cider emacs helm-core seq ];
+        packageRequires = [ cider emacs helm-core ];
         meta = {
           homepage = "https://melpa.org/#/helm-cider";
           license = lib.licenses.free;
@@ -31127,12 +31135,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170611.135";
+        version = "20170622.1355";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "9f532785d43389339ed73d90357d4aea9d966020";
-          sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5";
+          rev = "8d0ef8f7ba56a78d7c1292d3db65f993518b8a78";
+          sha256 = "0y5gp4mmf6p244bpdnnv29gz0psfgh8338m5cns2z923pcllpjg3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31565,6 +31573,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-frame = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-frame";
+        version = "20170515.1250";
+        src = fetchFromGitLab {
+          owner = "chee";
+          repo = "helm-frame";
+          rev = "389e6461a423d649b7062ba99a2234bef7770059";
+          sha256 = "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/febb2599e50518dadb30088bc9576aea2af092a7/recipes/helm-frame";
+          sha256 = "18wbwm4r3ra9214whhdbxnjrxzra4pn12wqgq5lxli1khylihm3i";
+          name = "helm-frame";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-frame";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-fuzzier = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-fuzzier";
@@ -31694,12 +31723,12 @@
     helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-git-grep";
-        version = "20170530.830";
+        version = "20170614.711";
         src = fetchFromGitHub {
           owner = "yasuyk";
           repo = "helm-git-grep";
-          rev = "e3ae5f60585ac0213876dca5093aca467db1ac5b";
-          sha256 = "0bld5kjzgjhkjcjc7b66kg55yb7pzrbnxfqx79f5glxckbp2pxjr";
+          rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3";
+          sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep";
@@ -32617,12 +32646,12 @@
     helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20170328.2152";
+        version = "20170613.14";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "c987e81ededdcb69c5a7b2bb6efc32bc2398ce54";
-          sha256 = "06ygcmpdpr7qzpx6l7qlbdif10vpzw009zg8z8yl1p1r30qdcbs0";
+          rev = "0e9ba276b3fbc420b8cbdc1b99262ccd5c750db7";
+          sha256 = "155df7jyhjgqdks3ba1ca1k8w8aqka9vv3nhzpkvgz7wj84c95pq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -32915,8 +32944,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
-          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
+          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
+          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33205,12 +33234,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "20170419.135";
+        version = "20170616.1725";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "f88715d495b7f6d65904bd05dee549404ca250d3";
-          sha256 = "0sdhbk4vpq5vl9rz5dcfnjmkcvsfw9146f1bvjgfi0fqhb3pq8da";
+          rev = "89a7564edc6b23ffba52b02353528b9b6285c729";
+          sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@@ -33472,12 +33501,12 @@
     helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helpful";
-        version = "20170612.205";
+        version = "20170619.1537";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "fdabfe7d88853e052cd5a20614585ed3cc1faeac";
-          sha256 = "0x8d28s6fi8lmdyp8nyqi0dryf06703kddws079qr0l4p5jiibxr";
+          rev = "c86b39eea2a787557e13a814a626c839d2caef2a";
+          sha256 = "0ya4axgq2k7yn1n07gfyc9amz98ffvas0ir8060ba3jhw8bmd940";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -33556,12 +33585,12 @@
     hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hexo";
-        version = "20170308.205";
+        version = "20170621.1953";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "hexo.el";
-          rev = "f7b8803fd81e738e25425e0eeeed4cf2adc6a5e8";
-          sha256 = "0hbfgzs4kg2vqm034falm9rhhin9ii0n0rc50qli5v3a85c7ayrw";
+          rev = "1f6acb4305484b0177e04b3c55eabf9745e11dd0";
+          sha256 = "1ifdm7wkbnjs8jflgf3kjl5800rddjdy5dl5kz5g3qvxk0ma1rgf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo";
@@ -33779,12 +33808,12 @@
     hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hierarchy";
-        version = "20170605.842";
+        version = "20170617.1126";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "hierarchy";
-          rev = "d26f566d386a56e752d8ca1c813932d68b088bde";
-          sha256 = "1dk5hdcjakxi91q29lbnwvbfhr834sxmsr2mrxr5mqhp3wfg3qga";
+          rev = "e71c2970dc4eb90e5473f7a038e7ccba4dac6c36";
+          sha256 = "10mlbz3xlbvka5bw5cxymbha5vkkbb9sfziwxgfx5bwrhjp6n90z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -34256,8 +34285,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "b858104fab63257de4b172b085b28e24ecacfed0";
-          sha256 = "1yzmlflzx9gvm0dysgjwi0a5nm7w7diczwqp4zggd4bl8bb45fip";
+          rev = "aa0f954c345e85ee8784431af5fa1a529c9cf715";
+          sha256 = "0aa67r8isall8h8rwaydzpbap185xh889a09s4b1i3984dvpgm80";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34501,10 +34530,10 @@
       }) {};
     hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hl-line-plus";
-        version = "20170604.1526";
+        version = "20170621.734";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-line+.el";
-          sha256 = "09dwllzhw0441fbhkw7nb4isfnll6nbpp0il4yc7wgjvg4s94hw6";
+          sha256 = "03bgx651nrnwqbclbfaabkw4h2iaiswnndqgms0w6lp3jjfc10wc";
           name = "hl-line+.el";
         };
         recipeFile = fetchurl {
@@ -34582,12 +34611,12 @@
     hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hl-todo";
-        version = "20161102.1337";
+        version = "20170621.1257";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "hl-todo";
-          rev = "a23312464fc6462d559462a44cd74735e9f73421";
-          sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8";
+          rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2";
+          sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo";
@@ -34603,12 +34632,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170606.644";
+        version = "20170619.945";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "bee9cee09d6909cf35f80582aee5a1de6c90db39";
-          sha256 = "0jzl2qjyl7kbb16barh365kl5qziamgv87nx934s608498dyl4j6";
+          rev = "d7b62a8dea6ff3e210ed2139dceaf09be8df465a";
+          sha256 = "1m7jn89kr2kl03fngcbz28b72lmna8bhilhaq1188mr0hxag8h9a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35147,12 +35176,12 @@
     hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hy-mode";
-        version = "20151025.543";
+        version = "20170621.1354";
         src = fetchFromGitHub {
           owner = "hylang";
           repo = "hy-mode";
-          rev = "50d7d24a52aefd7079c3f26a90c8eaf3065884a1";
-          sha256 = "0wn83n1780bvrzx9p870wln51n9rfdghsxl79dp968dxycyhyxvj";
+          rev = "f34bc19e9a58c7014c1f672d0655d2edee997ad2";
+          sha256 = "049f3746dfg9jh29904qnk2asym2rjqqgzn1zimk4bs3v8xnys1c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
@@ -35193,8 +35222,8 @@
         src = fetchFromGitHub {
           owner = "hydandata";
           repo = "hydandata-light-theme";
-          rev = "169c0d9ab1272b0f4a1f29eb5f1cd5ffb2365e1e";
-          sha256 = "19q63kg1higqxf26bhwnqwvqxpayjq2j24yi54b1wkvwbv5f28nr";
+          rev = "0fbc91678ef65e1f65d7ec6792ff0b2f104d16a9";
+          sha256 = "0bkj5cw173l829fkgigghs07mc2i84ngvs2y9g6kamrpg6zhq7g8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/413c617f15947782891159a240e0c9014f1f7d11/recipes/hydandata-light-theme";
@@ -36044,12 +36073,12 @@
     ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ids-edit";
-        version = "20160324.1522";
+        version = "20170621.946";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ids-edit";
-          rev = "3073f03267dd3527718e1edf1010055b6e55929e";
-          sha256 = "18dca47ds5fiihijd1vv7nif44n4b4nv4za2djjfqbhbvizra1fd";
+          rev = "8df65dcfe35a06fc70775d485387fd31a1822b64";
+          sha256 = "1l8a14f9dpz8ddx99yh7h656ncrvr7s6yqih0rlniak5zxfnxjra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f12d49b6ece6d2ac8ecb80d881db560367ddc4ba/recipes/ids-edit";
@@ -36604,12 +36633,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170609.923";
+        version = "20170622.743";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "e9b0104bb36b1ce349bf048979746e0ad738d43d";
-          sha256 = "14a0gpp71045j4hs5s2kmisv3466imzyag7f43r1gsg4b0gp4c8m";
+          rev = "b5bd4aab9be3587ce7c6ba58a4aabf00d4dcd907";
+          sha256 = "1mpy7645i7nvkj0ixml4db2l11jx8h150c39a4r0ah7m34005rdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -36646,12 +36675,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170520.914";
+        version = "20170620.808";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "9ba23b0e8369a5dfa17e544288b366008516e6f9";
-          sha256 = "079hsk05isagcnj0fbdaxkaj8zfhrvm60zbz35id4101s4053frh";
+          rev = "74e84231ec9565c4420019b913e3f16521dea542";
+          sha256 = "1lmvdmcy47swgj1nqhq91w50fh9iz0zwn06ygns1z06s9gcqc6sm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36709,12 +36738,12 @@
     inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-ruby";
-        version = "20170530.1824";
+        version = "20170615.335";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "62c1c72d8e2a8e1ca8430010c19be930f54e6daa";
-          sha256 = "1w9jgrvly07056f72xf4ink0i8q1xv3rnpv5kbifsjfxzz05crbb";
+          rev = "c14a68d1643ac3f439234da6a8275b48cae970d3";
+          sha256 = "0b6qp9xljxn4mrh1xcv6fzklq963hrchq8iab4746kvylhn1xmsk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -37168,12 +37197,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170611.437";
+        version = "20170615.104";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "70c9c524b3de8dce739df7fe0fdb5128fc8adf11";
-          sha256 = "1jb28d9mcnn2098lmlq4jfk64jjdfn24pmwl8gax80v4p81b54vm";
+          rev = "fe791fbefa4689c944a00a356b331ed0516c5cfe";
+          sha256 = "10d9w4hp5hhbvbhbd605vpvzw0vhg862ikwjchq6jyly80kf3a60";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37501,10 +37530,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20170529.1907";
+        version = "20170614.928";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "1lg8gciy9i44y80v9g2h5q8mg6dhi6abx2ssg6jws3nci0y5c0bl";
+          sha256 = "19jk4c39bqbqbfwmhkiwqfij556nv82syy99g07s7gz1bqkrm7pl";
           name = "isearch+.el";
         };
         recipeFile = fetchurl {
@@ -37729,12 +37758,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170609.943";
+        version = "20170621.721";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c";
-          sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878";
+          rev = "f0426613062ba8305ebac41672d853a95cd9bbca";
+          sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37768,6 +37797,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy-dired-history";
+        version = "20170617.812";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "ivy-dired-history";
+          rev = "3604840f85e4ff2d7ecab6233e820cb2ec5c8733";
+          sha256 = "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history";
+          sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl";
+          name = "ivy-dired-history";
+        };
+        packageRequires = [ cl-lib counsel ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-dired-history";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
@@ -37838,8 +37888,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c";
-          sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878";
+          rev = "f0426613062ba8305ebac41672d853a95cd9bbca";
+          sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37922,8 +37972,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
-          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
+          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
+          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38880,12 +38930,12 @@
     js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-comint";
-        version = "20161212.2125";
+        version = "20170617.628";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "2f42249c0a18ad2e17cfb272d75aa9fd3ec5e4ec";
-          sha256 = "17f99cih28lfral5iq43pjrvimlx0bnigirv44wm81n58widismy";
+          rev = "9113cb538c9b9e1a1ccf0b6a4e8197b5f03faa51";
+          sha256 = "0m5d9f449g3z3p0gydyaw5gw8b0da6az3nfyvvjvfssacbnrcm8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
@@ -39111,12 +39161,12 @@
     json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
     melpaBuild {
         pname = "json-mode";
-        version = "20170418.1900";
+        version = "20170619.1701";
         src = fetchFromGitHub {
           owner = "joshwnj";
           repo = "json-mode";
-          rev = "c3a7ab350533dddf6d18b4c55423bc0d1b40f3fb";
-          sha256 = "1zfzpylckna92zdx1l9ssj3xvrx5fizhypcmmpl2fsm56p97l8c5";
+          rev = "39ba450ba5dcc72e317e679a0b61d8aa94383966";
+          sha256 = "19qklwzad6qj27jbsms88bbnva4pvl64c89arpf66yjby3hnqbg3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
@@ -39590,12 +39640,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170611.1344";
+        version = "20170618.919";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "e0c14489867eaafa3ab39bb271e3e466cebb632e";
-          sha256 = "0zk2crzqzrbn1051fdkpxzyr6d2rknh7nznnbqyw3k75agiq3lm9";
+          rev = "06ab7e6c00d6a176712f27b583fea3823c6c360e";
+          sha256 = "141hjj56vax24mjkr0y0h51fc8wk7gjzknljwibaiwbmx9fyfm7f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39863,12 +39913,12 @@
     keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keymap-utils";
-        version = "20161212.957";
+        version = "20170614.1134";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keymap-utils";
-          rev = "a4f6ff724eeade5612c01c6f6bf401f264687793";
-          sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl";
+          rev = "0130f32e5ade649dd2738206a80570e450906ef6";
+          sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
@@ -40098,8 +40148,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "27e3b90eae2a0155b22a435f1b6f65c913519db6";
-          sha256 = "0c6qxnhmhwsb7gqib40fgg2p7krvmxdx75xka8gh3j47zww0pylp";
+          rev = "c3bdd4839c3a205a95f007d620bacfdb731761cc";
+          sha256 = "05j6ir26qf6jvlvy8dv6zvivzyrhsxrpdp1h5axvn1wzl4wmzvg0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40868,12 +40918,12 @@
     ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170612.123";
+        version = "20170616.2223";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "1afc0c9a3b1a25fdf510c13bf7764f6c4867a897";
-          sha256 = "1niww7czhqxn2dpnjbdghplva7l7ymrx77ka3djjln70x0gnvv2v";
+          rev = "0e577560f0c01f9e4bbd5280edf113020e65c3f3";
+          sha256 = "01ndc6llqfdz8x64k5c1bjvvx47nd2dag4fn48xfsb8vrpnp78i2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -41124,8 +41174,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "e231e8325765cde4ec3faa73d57bb5064a35620b";
-          sha256 = "1k2s7s3wq7pgncrj1hs8vbd393kp8zmxygbci5jq4gvymmsb6qza";
+          rev = "446f61280f984f17d4b923150f3b5c58f520ecaa";
+          sha256 = "1vnck52yj8h0zahqgxlx70h7pqk9dnd5sy3jdl92rkj0bimhqr9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41439,12 +41489,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170515.855";
+        version = "20170622.803";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "5306bb969047cb12b0fd4c6804198afb719acdb3";
-          sha256 = "0lgjxaic8vwxhzm2w0prrydlz0fchk3bwvf0i9j96pi6x227b066";
+          rev = "c52da852547356cc0bc51cb549dad57cb818b8aa";
+          sha256 = "1hh0cdiaivpggrg3l14m7g3h9fl2rc69fy4hnmak91xf9lap37vz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41589,8 +41639,8 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "list-unicode-display";
-          rev = "59770cf3572bd36c3e9ba044846dc420c0dca09b";
-          sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
+          rev = "1719e7e90035c78dcc8a780c34cd18e6b3dcc6b1";
+          sha256 = "1xy06vlwlhz872099xplzsz7rbyf6jsvcqyg6qpry4b2c57zjx8d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8e2a974a56665b97d7622b0428994edadc88a0/recipes/list-unicode-display";
@@ -41861,8 +41911,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "f6d6d2b0f7ca39f7b64137c4c90241af7099ebe8";
-          sha256 = "1kjyf2gj3kj9blyabri3z808krs1a7wq0ffxsz8378pl8dl8vcwc";
+          rev = "f066646d1ff5722da365888053371bc734e5f3f0";
+          sha256 = "11jqlw58wifx1slfmmsp9lbkd1asalddlcjkmd7sz11wvdjm8hdk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -42280,8 +42330,8 @@
         src = fetchFromGitHub {
           owner = "emacs-lsp";
           repo = "lsp-java";
-          rev = "5c58fc74872e318b2894f11331bec8f699f34c77";
-          sha256 = "0b6n1hlhzqqnih26f412ag77dz5bc550ma9ijcbs0n3vbd5z45hs";
+          rev = "ba797f9588944ae917ccbfa15c40ee1e427ea6e5";
+          sha256 = "0plccx57j85b53s8nmhkcw8h1hznm147v3ajhzx2j1adbb2j0h3f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
@@ -42652,12 +42702,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170609.2322";
+        version = "20170621.710";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "622c994183294b02893ff286210bffd5255296df";
-          sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i";
+          rev = "7987db94c0041f68664d5ed91ce241c31fd8d1d1";
+          sha256 = "0bwgxhzd81nh69dbhswdq70y152ikwsxlh23d3ng36kix8s6fgsg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42680,12 +42730,12 @@
     magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-annex";
-        version = "20170429.756";
+        version = "20170621.1328";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "b8f191e37d0b3136aa0b00345961b6f7cf2e5789";
-          sha256 = "097x8jblz83h750syxxcra9rswmghdwbpnx2xv8wbgwg3axch7rm";
+          rev = "15eca25c59bef89da75f9a741d194698d0e708eb";
+          sha256 = "184873b01b9dvwjjx6xsfz4v8rwhwsz9knjw7yjggmql20lxdpqq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -42852,8 +42902,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "622c994183294b02893ff286210bffd5255296df";
-          sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i";
+          rev = "7987db94c0041f68664d5ed91ce241c31fd8d1d1";
+          sha256 = "0bwgxhzd81nh69dbhswdq70y152ikwsxlh23d3ng36kix8s6fgsg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43310,12 +43360,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170514.1827";
+        version = "20170614.306";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "1bdcbcb42248d67029b0288c8572372fc1cafb29";
-          sha256 = "1g4vgybkqn8bf95dl0gxd68lv4gw69bxms75s6k85i665fa2njal";
+          rev = "d38183e5025beca7873b2e17bc605107e3adece9";
+          sha256 = "139y9r3wm7fnshfdmm07m6v4zq5himrx6d4q6vryzhlmfchxfy7n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43486,12 +43536,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170611.1532";
+        version = "20170623.509";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "0fa1d523fe95a15a8cebaaba7d4af3002ddbeef5";
-          sha256 = "0y6j5gdlxw9kp961sgdpnkprxdmnndcjd6s3v9jbz8py2k3pqpxx";
+          rev = "3154320d8fcd9eb22bcceb39e181ccf930a9739a";
+          sha256 = "06nnyl952nizrygil83939mrm4v6qh6y841dxgnbyhbbyryvdval";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -43724,12 +43774,12 @@
     mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mastodon";
-        version = "20170518.1031";
+        version = "20170619.1050";
         src = fetchFromGitHub {
           owner = "jdenen";
           repo = "mastodon.el";
-          rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac";
-          sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7";
+          rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318";
+          sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -44057,12 +44107,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170610.1806";
+        version = "20170611.2347";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "f8ebc163a289532ce99134716008440a515e65ea";
-          sha256 = "00z9w8nzf1adh6kic485w332dj6m53qdmb99w4aqz70ygq6i2s89";
+          rev = "a764751e89ad7bc1717e1d3c6e3b4364b11832d6";
+          sha256 = "06vd4lvybfa7kwyplavlbfwln6229g7s7pwbamjdvgz48xgiqym1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44224,10 +44274,10 @@
       }) {};
     menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "menu-bar-plus";
-        version = "20170412.1036";
+        version = "20170618.1417";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
-          sha256 = "1rxy2yp1f5fi5wk8lg04dmg943131rvvqiif1k18n0gajg1x8hxx";
+          sha256 = "1ah2yjagpkvwahki81ixviq9pgwnjna8z893xad31rj0qmwr8bzw";
           name = "menu-bar+.el";
         };
         recipeFile = fetchurl {
@@ -44248,8 +44298,8 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "420416f182d2ea2a2285ab4bd22e5898dfb20a83";
-          sha256 = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh";
+          rev = "957e551140587f0cd83d9186a06fba10a38c6084";
+          sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -44619,12 +44669,12 @@
     mini-header-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mini-header-line";
-        version = "20161108.137";
+        version = "20170621.521";
         src = fetchFromGitHub {
           owner = "ksjogo";
           repo = "mini-header-line";
-          rev = "d8c3b6e93ad631d22564c273f61463dc9ded49ba";
-          sha256 = "07r231xz45k1b3pzix308jn24s0gl8vgdbcd4vdh6p154znvcbm5";
+          rev = "73b6724e0a26c4528d93768191c8aa59e6bce2e5";
+          sha256 = "187xynmpgkx498an246ywrqdhyyp2ag1l7yxnm0x0rbfgw67q5j1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/122db5436ff9061713c0d3d8f44c47494067843e/recipes/mini-header-line";
@@ -45448,12 +45498,12 @@
     monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monroe";
-        version = "20170522.632";
+        version = "20170623.103";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "1705eca01924210504d4270af7dab57278194875";
-          sha256 = "19yca80zghb9zmyqdq155743plzzjghkfbi9zb5z8x2fvppixvwn";
+          rev = "2bb59ac84e030f7047e7443e2df25185b397a5d3";
+          sha256 = "0jcyidk62djd47dv4m53k7wky92982pzz87n8zq1fijqic63iib9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -45700,8 +45750,8 @@
         src = fetchFromGitHub {
           owner = "retroj";
           repo = "mowedline";
-          rev = "832e81b7f90f6c2e753f89737c0b57a260544424";
-          sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5";
+          rev = "bca452544b5e200034d0505a767090a975a21a28";
+          sha256 = "07bjkcgy2qvnkrlb5ypgbf969ka0pchz305326r7vfswlvkvihdg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -47432,8 +47482,8 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "d6eb8baf8130ab93140395dceca363774092135d";
-          sha256 = "02dwb8xv4rz08wigr6im8rdfjjlhrpf620a7faq1ka2gn41hv1qv";
+          rev = "7bbc708ff08f5660f4cff4b3e8c675bec428a1f2";
+          sha256 = "1iqv268yvvhs7nxf28105g3ya16js1ibzxl0is13i4hlkx9wiqw1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -47474,8 +47524,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "186571965dccf57d15b9f37c1cca92a57187b7b3";
-          sha256 = "1iz48szkby5b3f4935c8pnry84f6mh4f2xklv7zdykrczdqy5b0r";
+          rev = "c7346a275c4cdcb59b3961241ddc52b79452d716";
+          sha256 = "17vyi7215pwffa1hfsgkmgc1xkxkqqmrmg06rsxdy747mi4vpvr0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47533,12 +47583,12 @@
     nlinum-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }:
     melpaBuild {
         pname = "nlinum-hl";
-        version = "20170609.440";
+        version = "20170613.1748";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-nlinum-hl";
-          rev = "294037f5231375ac63836637651585f8b82b962d";
-          sha256 = "048zm3x62wjp2ym0q8jn4ll0f11nak5i41q6mdcabq3zwg42zbqi";
+          rev = "d5ca1490e0cde0605e34a6a17de8cc236c9810da";
+          sha256 = "0rj2ay2x7mqnj2vpnndfzr47sldx7i6zxj4nn81yamrdxgv19ajd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl";
@@ -47617,12 +47667,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170515.1945";
+        version = "20170621.1348";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "4bb6640ddc4c9453318133e777f09ca5c429d057";
-          sha256 = "0m0grzppcnk447ysyh03dw6nz6vhdnihgf7s4rlqcy0b4qb7fmxw";
+          rev = "1f10dbf40266c8e675e2e10f708f87ec61413ab5";
+          sha256 = "03dndvbvb3f9ia1sk03zhbi43mq2irxbcxdaazvvyfk021bffbzs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -47803,11 +47853,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170530.454";
+        version = "20170614.349";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "1ec634461ea25d87cc16dbeb1318f8e30a07c9f1";
-          sha256 = "00sqb0vl0990c5fxg0znwdfgq20q0zbx1pnhpr3dmnydqzmh7wwr";
+          rev = "a83ab29930161d999ad1c45b6eb9cfbaa5e90ceb";
+          sha256 = "15gmpvkgf75wiczi2iknyrdffk8q8yqmvkwdcdps0g31m9869iv5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47989,12 +48039,12 @@
     nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nubox";
-        version = "20170611.725";
+        version = "20170619.210";
         src = fetchFromGitHub {
           owner = "martijnat";
           repo = "nubox";
-          rev = "2c6c1cae665dfc9cd000aacd84b9843eac0c74cb";
-          sha256 = "13zjrql7arj0fklvajmr7xr7486i9917b9x54mxzmkwnbas4rg04";
+          rev = "84aa965f0cb4bde293237e4cc586643d1f662f83";
+          sha256 = "0i1x0sd61c8k4q9ijgxyz21gvj1gah273990qfjzj9a25r4hzvlj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox";
@@ -48513,12 +48563,12 @@
     ob-ml-marklogic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-ml-marklogic";
-        version = "20160508.932";
+        version = "20170622.1133";
         src = fetchFromGitHub {
           owner = "ndw";
           repo = "ob-ml-marklogic";
-          rev = "58e101a8b79d408d5c9da2fbcbc0f38e80eb7208";
-          sha256 = "15mzra45jcihgvddv69yxpml34hy15yz2hxcxz6a4la8vk6mw3ky";
+          rev = "f678af0f440b3030e311ed6fbc444200be04da91";
+          sha256 = "1fszg6bn927bi1dx4zgiq0wr7zxrjv8sjrwgn9mansbljszbmccm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edce412552d4798450493e0a3dbe768f38f77cc7/recipes/ob-ml-marklogic";
@@ -49332,12 +49382,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20170601.1329";
+        version = "20170620.719";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "7ca20bb808dd51adbd83e0c18885c4300548d032";
-          sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590";
+          rev = "7070f2a64de65e0446536fb974c940399a4097a3";
+          sha256 = "1hf93rm0vi37rmcgbf1w1a3gqvzszhs979fa8yhk905wl8zhz08a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -49846,8 +49896,8 @@
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "org-brain";
-          rev = "de138a717813a8c269c07c0d284dfd71265bbf20";
-          sha256 = "1nr78r0zsn6s626knay4zybk0222ng5yn6wh8ji7gl0bq47kqq75";
+          rev = "17309b16d40fcb850f9d978ffb6f6d987395daad";
+          sha256 = "0n2z6y6m14iiypvy97l7rk4d6c452c860sj8f4x8xzizsxapi26y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -49884,12 +49934,12 @@
     org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-caldav";
-        version = "20170610.945";
+        version = "20170615.724";
         src = fetchFromGitHub {
           owner = "dengste";
           repo = "org-caldav";
-          rev = "57dce0b4f0f234d9f4a72e5f0b811ee399e6d989";
-          sha256 = "180amsndil1y24675xbdr9l6qad7lxq1pr7nlqgspmw0nccp0al4";
+          rev = "07e6ccda6756754a115d567f2ad3a760514b731d";
+          sha256 = "0gaqkbdqkb7v6k2bg21c8c7c38g9rkgk8gy79s4gi6hzd4j717mp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav";
@@ -50259,22 +50309,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-edit-latex";
-        version = "20170420.1738";
+        version = "20170621.758";
         src = fetchFromGitHub {
           owner = "et2010";
           repo = "org-edit-latex";
-          rev = "945f4cffb501d3aa2b1c6dcaef7c18a83c090a89";
-          sha256 = "1bwa4sb6yybvl2jdbxmx84s2bivqkil1dxy1y5wypv4cnib5skn3";
+          rev = "323d0b39d0284cef730b706dce7c0e58ed35530f";
+          sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
           sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry";
           name = "org-edit-latex";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ auctex emacs org ];
         meta = {
           homepage = "https://melpa.org/#/org-edit-latex";
           license = lib.licenses.free;
@@ -50579,8 +50629,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86";
-          sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn";
+          rev = "cc631078ad0ad5def8b726d98c49927232edc5b7";
+          sha256 = "12zcvjkn07i738wjyzv1yiyqgavlxbyxhpq8viy26i3kvnckzgv6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -50599,8 +50649,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86";
-          sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn";
+          rev = "cc631078ad0ad5def8b726d98c49927232edc5b7";
+          sha256 = "12zcvjkn07i738wjyzv1yiyqgavlxbyxhpq8viy26i3kvnckzgv6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51049,12 +51099,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170611.1357";
+        version = "20170623.523";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "b84634891be4323ccba938dc68b971150ae9a609";
-          sha256 = "1m8g9laf2fij5vm3sqb087323gqncnww35jx8bbn888zjzxnsiy9";
+          rev = "5f2f596eccd776e21c98f68e9b11013c4ea54a75";
+          sha256 = "0qriaj0kycygbf2b25nr3nxqwa44j8gzm9lmd35w3h21vh97p66d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51207,12 +51257,12 @@
     org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-sync-snippets";
-        version = "20170319.902";
+        version = "20170614.641";
         src = fetchFromGitHub {
           owner = "abrochard";
           repo = "org-sync-snippets";
-          rev = "80d89985ae52c3adf445deba851b6eadc794eef3";
-          sha256 = "0vgq51im5124f7qzbqbyfyv4qbhjw4z4q1ksz3p5axd9hgir6520";
+          rev = "e96bc94ff8865b4d408d90c4f3e39cc7cbb6cec8";
+          sha256 = "0913klrly2xb1pxh91yvvfpzpackxn7sqpsajf4q8adbnlkn0w96";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets";
@@ -51522,12 +51572,12 @@
     org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
     melpaBuild {
         pname = "org2blog";
-        version = "20170611.1836";
+        version = "20170617.1730";
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "256c0af68004fde8cf35d4824acb938803b10e7c";
-          sha256 = "17ib0rsfdw3krvvz9gmfsqsn9gagqlvwh0ydfyaqpdiq9q2nllbs";
+          rev = "ba2a943af674fc0703e3b81fc591d8f48758e05d";
+          sha256 = "1fgz884m51nmg6ynpzxpblf5bbipzmrz15hhakprr9fr2grp3qzh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -52194,12 +52244,12 @@
     ox-asciidoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-asciidoc";
-        version = "20160120.523";
+        version = "20170622.346";
         src = fetchFromGitHub {
           owner = "yashi";
           repo = "org-asciidoc";
-          rev = "da5f66d881c79cc780290d80caa528c1dd219509";
-          sha256 = "03ivnvqxc5xdcik4skk32fhr686yv2y5mj8w7v27dhyc0vdpfhvy";
+          rev = "83cc8afad239bf386832e1da49fa273ab5a3e466";
+          sha256 = "0slv4mp9vlazzd4c503zvqx66dxl6qwr9qrdi1grmshq0vnfxlyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b268064f09ae5c3d15064b7d197c7af767fb278/recipes/ox-asciidoc";
@@ -52240,8 +52290,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "2080e5fcbce8147ef6931457c678309f7a679c49";
-          sha256 = "0kmga1zm8zyby9yrczybrqm0gj56lk29v2nan4rhzhfnb87v9r28";
+          rev = "68859169a416700bf031ab696fceac50008c8e7b";
+          sha256 = "1cn4h6f0grz461bhjvmvxzqx5ccnyqd9pc7k60549p3p9yw5r735";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -52782,12 +52832,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170608.1006";
+        version = "20170617.2227";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "bef9e37fd8a9cb726e9b8a0e28baddc773a65912";
-          sha256 = "10h6zlyhaw8waxd6g1x2xqprq0y9prl3jgndhgnmlq7zcmh7fjrd";
+          rev = "1c92011b1a78b043054f7d725a281b5ec5bd46e9";
+          sha256 = "0k23bwbxwn7ll9k7fqbv4mr6f4bbrli2xh1d6ix9x6z3nkn8iq4s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -53303,12 +53353,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "20170430.321";
+        version = "20170612.1048";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "f5de68ae43a93f537f6f6b2266ba3952b56ccf2f";
-          sha256 = "1g8bjlw0ygwjsf9p8r48bml7zw4jybb2g3r8a7qq5k75dz81k4f7";
+          rev = "972d413b4d8284ba67ab43513a6a709692325f20";
+          sha256 = "16f2jimhdbqhpgq66qrakk6ajp87ixihgmzvx9aip6icnp10mhgc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -54581,12 +54631,12 @@
     phi-search-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo, phi-search }:
     melpaBuild {
         pname = "phi-search-migemo";
-        version = "20150116.506";
+        version = "20170618.221";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "phi-search-migemo";
-          rev = "57623e4b67ee766cbb299da00a212f3ebf7d6fb0";
-          sha256 = "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh";
+          rev = "308909ebfc8003d16673f97ca9eb26a667b72969";
+          sha256 = "07pi72jnd6k5xj9ypmxa0pbb03r07safpgf8vlp1m0xda5ixl0wf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b78e07146a4e954e050349a1798ac46ecba10bab/recipes/phi-search-migemo";
@@ -54749,12 +54799,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170609.1728";
+        version = "20170621.2242";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "dc30cb8110f395fffbc42c6271141887a0c0ec60";
-          sha256 = "1zgyy3mnn6sciy0ml2l0crfqy9mlcy1iqck5kracbbz41ygigsqy";
+          rev = "3a9076b6f6146326c1314c580acddce9cbb5a290";
+          sha256 = "11ily856xk6i00hqfvfxwjch77sigb5lym10dj0zj689gp8jd0wc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -55524,8 +55574,8 @@
         version = "20170419.303";
         src = fetchgit {
           url = "https://git.savannah.gnu.org/git/gettext.git";
-          rev = "a6f9caf8cc7614665d1be694485dd7bc30399e0f";
-          sha256 = "0gpbixx68bfxvpx3y9fv0v4kgxwacydkwid6gmh1lgjc65ky0fy7";
+          rev = "0df827ef0bd0b0f858cc6dfd6ea83a4502e5f13b";
+          sha256 = "0z836mvpnm7pvv0b7ygls0s602yaydv1farrazscnx6sk8303qd9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -56312,12 +56362,12 @@
     prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "prettier-js";
-        version = "20170606.612";
+        version = "20170613.2323";
         src = fetchFromGitHub {
           owner = "prettier";
           repo = "prettier-emacs";
-          rev = "f8ab2e5fb74beaf9e3023baafc118828526c5bb7";
-          sha256 = "00gjzw855xa6ahghdlq6yygz6b279xbp47s6vj0rjsyghf65xkf6";
+          rev = "4bfc8b3f8e459235dca24796f18a3587d59f4aef";
+          sha256 = "1nzb0gf6hac35nnz6scqkfcwgp8ahwzv8qql9g1gkd5vhiag21ac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js";
@@ -56812,12 +56862,12 @@
     projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "projectile-git-autofetch";
-        version = "20161109.1429";
+        version = "20170612.1011";
         src = fetchFromGitHub {
           owner = "andrmuel";
           repo = "projectile-git-autofetch";
-          rev = "3d4eae6493607b9a0461c5161d195659c268184b";
-          sha256 = "1db4jq4vn9mk8c9ma7yma7q00hwhwba25w2hy8jyagyb83lk2zgj";
+          rev = "51b40134000a2411c6342e865e63f74c950a9310";
+          sha256 = "0g4g4sjinmigyxs1irxv0yg524iq2hy8za09ksm3wbnbfa7w35ml";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch";
@@ -57152,8 +57202,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "96095f3a8577cd61ded2191d267cca70f221a9c9";
-          sha256 = "1ia0krk66l0cl5bklprdk4bbrzv9j8lszvkakcd0fd9ikcdv68a1";
+          rev = "eca0f4ee919480a4f516b825cf6809c6a7df4f50";
+          sha256 = "1qs2y4nahs8a22hc0cd436l6gf28q5g5jq8q53zhjc6209i0lbkc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57194,8 +57244,8 @@
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "04de7bd8a14ea71eaed568127428b8a44f325b24";
-          sha256 = "14dbg9cvph8b0shs49g6sfh5xrzpr9nn7c5rzxsnaaijys3z47rn";
+          rev = "fb19c2624d209919204a1e247741595c500b5b74";
+          sha256 = "0732l03h37xqamnfqbazzbbx99rc8kn8k0rfxrk0ncjmfpj60jiy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -57410,12 +57460,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170528.904";
+        version = "20170614.2215";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "c5a0fc884d0f33c3140585c9c7699ce0bc969f63";
-          sha256 = "0s9nza9v1qpjip5zig3374bn5jqw8fsn57ayqymbnp70nxdwcw6n";
+          rev = "3ffc2de8416b4ea389d5800a4a05d0885d9a8608";
+          sha256 = "0dlss3brh4654avq361yma4xbxsv6q5s8qlhp7v470ix88wx4v8r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -57916,8 +57966,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "2e820672609c489458dc2cf39d811e8c10255fe4";
-          sha256 = "1nvylps33w5lbxh33qc704rvl998cniwhvwzj1x8fqlsnh1qaxfd";
+          rev = "59ce0c377c1b72d4496a483cc00716848047530c";
+          sha256 = "0pxg3zmxha9x47nzgfnczx2h8wn6l4ybphiznbxvrwgaakby0bd6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -57933,12 +57983,12 @@
     pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pytest";
-        version = "20161014.815";
+        version = "20170614.745";
         src = fetchFromGitHub {
           owner = "ionrock";
           repo = "pytest-el";
-          rev = "91d8b7fe568527f51c172d6caadaad4f49e53bdd";
-          sha256 = "1s2s8bf0r1nidypmqiawj8i6jwb3y3wslgrhr8nzbz8c7lf626s3";
+          rev = "013fccd684fc8f2092d6e1ec4203ec574e12051d";
+          sha256 = "0yjnq2lyh6jr5xz29n6xxmp4lcy28wrcmw05j0zgcjdshri1pd43";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33a854a27adbaf57d344340199f90d52747b8450/recipes/pytest";
@@ -58290,12 +58340,12 @@
     quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
     melpaBuild {
         pname = "quelpa";
-        version = "20170205.2155";
+        version = "20170620.2318";
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa";
-          rev = "a39ab429d6544dff17e933f8d98530da4f8c636f";
-          sha256 = "002r4vc2a5yjm448xsk2dsfzm9p1whiwrcb0pccyy2597ba87w55";
+          rev = "dbb57da3eba3b5a04ab9b5184634ec139d68ddcd";
+          sha256 = "1jszkgf9rkkjscfaijbz84kpbpw46p15zvlvfmvil30gs5vp2pk4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -58500,12 +58550,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170607.737";
+        version = "20170617.1942";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "02fe949875a7db935693af7d20109d29521b4276";
-          sha256 = "0aqv9j36abmhd82fd443khaj3i4mww5xs4f9p3d65glg07wm2j7q";
+          rev = "9c5bcb7b7db979b34c6e99ade84b443651d62ab7";
+          sha256 = "1cxpjkds24afi5b9i13dkgzv0yy6cgg3r9vsrif8mfhhfrr7sx1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -59514,8 +59564,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "e0d467cfc50546d88f286383ea8ab54aa36cd5a9";
-          sha256 = "1lyj4h2qpl88hwxfrk2f1vr729bdyr5vvm8ra8p73rcz40zwdamr";
+          rev = "de1239ac489ec2c03801c5a92ad716c82140d3ae";
+          sha256 = "04dfir58zhd244a8kci3xs31i691wiqldkfay6819lqvq5pfna5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -59844,12 +59894,12 @@
     remember-last-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "remember-last-theme";
-        version = "20170304.29";
+        version = "20170619.1433";
         src = fetchFromGitHub {
           owner = "anler";
           repo = "remember-last-theme";
-          rev = "14b4b5a03bb59b4e7040da96d7c261ee8f7884e9";
-          sha256 = "069bzswwaq1disnq0j49c3xq69xrz7rn6z3zc0cv2cspn2hk1x5p";
+          rev = "57e8e2a475ea89316dbb5c4d2ea047f56a2cbcdf";
+          sha256 = "0sb110rb6pnjnvyqn0kji19bhbn8mk4x32yps00aq2g2v9pc1jzr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme";
@@ -59865,12 +59915,12 @@
     repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "repeatable-motion";
-        version = "20150629.1112";
+        version = "20170620.1148";
         src = fetchFromGitHub {
           owner = "willghatch";
           repo = "emacs-repeatable-motion";
-          rev = "e664b0a4a3e39c4085378a28b5136b349a0afb22";
-          sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
+          rev = "77aa35b27c8a76dc8deef87c9f71ef7e6fd289ee";
+          sha256 = "0pm9z0w402430j66167s1az37jxw89sck1b7lm9gjnc3gslh0lpm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion";
@@ -60260,12 +60310,12 @@
     reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "reverse-im";
-        version = "20170611.2334";
+        version = "20170614.230";
         src = fetchFromGitHub {
           owner = "a13";
           repo = "reverse-im.el";
-          rev = "341e1d7955d9b25778a0e28921abc4d31704ec3b";
-          sha256 = "1mcggccv75v9xrd1i1x2csjnk432ws2h93bh5y4wm3sp3ky8lg6d";
+          rev = "59368a504a67d1a93f56cd6e58797ca19ab578b4";
+          sha256 = "0xsmz92f8bcyq3nq7fwca1x1brrgvd1cg1x6f7j939wmcqql5mnf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
@@ -60384,12 +60434,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "20170603.1202";
+        version = "20170622.1135";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "fa63228680add9b30735fec571a3eea572345914";
-          sha256 = "0bh23avfdcadfx2awkbd0mld54g6ir0bg1szbwi8m0w9pwa4w4mk";
+          rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000";
+          sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -60636,12 +60686,12 @@
     rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rope-read-mode";
-        version = "20170325.831";
+        version = "20170620.237";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "rope-read-mode";
-          rev = "66c02e3efab84e12c2857cb2b56d524e98b7bc87";
-          sha256 = "1hmp7k17q5d5i6286x99jmfq954d9ys5347xk3aph9m5pmybvfrf";
+          rev = "bbb67d54a31ce238e4a8b1aae677ef055aea27ba";
+          sha256 = "1l00km1rrnybskv0rv0kqxdrqimmfwz4mmil64m2d6vl0nqickb0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
@@ -60787,8 +60837,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa";
-          sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a";
+          rev = "1c2ffdf7c5d6ed27985b150c4de1fa8b90544f17";
+          sha256 = "1yviyhq8ff46mn8hdkm0yx8dw5mmvmpcccmvm8vc7ncbhmwdr805";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -60849,7 +60899,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59070";
+          rev = "59162";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -60930,7 +60980,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59070";
+          rev = "59162";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -61364,22 +61414,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
+    salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
     melpaBuild {
         pname = "salt-mode";
-        version = "20170611.420";
+        version = "20170620.1518";
         src = fetchFromGitHub {
           owner = "glynnforrest";
           repo = "salt-mode";
-          rev = "bfcfa72093974f36635413a845e7a5df7c5ea974";
-          sha256 = "1x974csw8xyd90xf8ns5h6c0s9fszy02hdmcdax6ywi8vxksmjsy";
+          rev = "624603a87aa21a388fdb17daf48e7184ee6e0222";
+          sha256 = "14pr58rgrg8v8j594lrkfpwnf98g11jkpfn4n2bfzir100vgxi5k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
           sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym";
           name = "salt-mode";
         };
-        packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ];
+        packageRequires = [ emacs mmm-jinja2 mmm-mode yaml-mode ];
         meta = {
           homepage = "https://melpa.org/#/salt-mode";
           license = lib.licenses.free;
@@ -61807,12 +61857,12 @@
     scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scratch";
-        version = "20170523.2046";
+        version = "20170614.1401";
         src = fetchFromGitHub {
           owner = "ieure";
           repo = "scratch-el";
-          rev = "3363e861cf7c135873ccf273f759d72dd0bb5854";
-          sha256 = "0k4y7kqd7izaqpa0xmp7ag84vpnrgz5mi6cgh5ap1vspxg3pycz4";
+          rev = "2cdf2b841ce7a0987093f65b0cc431947549f897";
+          sha256 = "0wscsndynjmnliajqaz28r1ww81j8wh84zwaaswx51abhwgl0idf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72/recipes/scratch";
@@ -63225,12 +63275,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "20170610.1147";
+        version = "20170613.1717";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f";
-          sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3";
+          rev = "ff8e0a6d36cd84408dfaa2040cc0fa16db14b531";
+          sha256 = "1rf4816278cfzm0w21j5v9abb2icqr0m4iyhgg7k4pl92db79hrx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -63581,12 +63631,12 @@
     simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "simplenote2";
-        version = "20170317.335";
+        version = "20170618.644";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "simplenote2.el";
-          rev = "5f267d6289b103d77feb2f038baedeae39deee75";
-          sha256 = "07rmwga7qd8g71km5p3g3vjmmiy8cr5snyrvhiwi9lcnai83kc50";
+          rev = "78ab3d818633c0d6575cd1895c119bd690003bf6";
+          sha256 = "0z9zary8apzjsx031fhy94ggqancm94mjhj335kr743s8zr3511g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
@@ -63623,12 +63673,12 @@
     skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "skeletor";
-        version = "20170413.2030";
+        version = "20170616.1746";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "skeletor.el";
-          rev = "376958e6e39dcf32df945c617c230dba3bcc076d";
-          sha256 = "152kqsbhn1z3nf55vrrz6iv96c4jkzp2bglgp2bqb37nfh722frz";
+          rev = "01c330ec115fc29bba5d9bdf6c15beb4a44e2281";
+          sha256 = "0i3axni8y4s5n2s7qbqzz3sadcfhr3369q7qn8psk29qbicjw5wv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor";
@@ -63749,12 +63799,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170610.841";
+        version = "20170612.900";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "b020352573a14e452a5c8a18bbd0ab23539a52cc";
-          sha256 = "1nqax756ya008glr1qffqa222hcz45grjwfnncsq48k1nj5b0dpf";
+          rev = "94f1a311de0c79c8245784543b05359714550d72";
+          sha256 = "1ypsl1vin5h90sr4cc127f8gm23h4pkag6zwfwx53h2yrsj7vvrh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -63812,12 +63862,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170511.1221";
+        version = "20170622.1604";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "7ccaa81b4266d478ed92003fba097756afc6ae19";
-          sha256 = "1l4idfy98qh7c3vaxiv91irhw14nz8h2mvfs3g7j4abv51102kx5";
+          rev = "74c1a83711a0c2b96e9387f3fa03f387a6713193";
+          sha256 = "05rs4da1dgwvcwvbq70angwqh3zjhsxnjvp5rpfvk5lzw9p8ng9r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -64001,12 +64051,12 @@
     slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slstats";
-        version = "20170602.304";
+        version = "20170612.725";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "slstats.el";
-          rev = "07f515f835c92b6be538d2f39dda31ed281f1054";
-          sha256 = "12fzcfw4fxf6g0zadzcr8mx46a8x8969shpcmkn0f8ixn014w7ax";
+          rev = "7488623cbe406eaafccc36d293e8c42bbd308085";
+          sha256 = "1q3zm9qfivbd1k9kjilwvzhlcbzv6dwnd78bfzzkrppbjcpkxz3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -64359,8 +64409,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "3656417ec06ba448f940d65e96bddb57fdc79244";
-          sha256 = "1vm96cb693mgzf7x9wl3sy3z90rq4mgbrnhy9hb746ypdpkfd3am";
+          rev = "f6f0c0a81c1e4265bf95dad49a02579d8e859ac9";
+          sha256 = "0srwjvyhqmy3g0dlfs33f93x0f55da0zl9cs35hjls2adwlqk2cr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -64380,8 +64430,8 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "3656417ec06ba448f940d65e96bddb57fdc79244";
-          sha256 = "1vm96cb693mgzf7x9wl3sy3z90rq4mgbrnhy9hb746ypdpkfd3am";
+          rev = "f6f0c0a81c1e4265bf95dad49a02579d8e859ac9";
+          sha256 = "0srwjvyhqmy3g0dlfs33f93x0f55da0zl9cs35hjls2adwlqk2cr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
@@ -64523,12 +64573,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170606.725";
+        version = "20170619.149";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "3bc7f1d38a0b5800e62a612e16fe42d9b0c0e11e";
-          sha256 = "1xghvmwx66mns3kzk1jw2g08553qqa50h1sq1jg5n2apjl4gprdh";
+          rev = "a806e2fd18e3b9923f570a2ad2ba6323a38a43b5";
+          sha256 = "1wfaihamb2h5bf8z8fs2xpm4fxzfhlm4s1j0yv6b6dw2b6g2bx7c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -65051,8 +65101,8 @@
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-solaire-mode";
-          rev = "70e3b9cc171d4d9171c652c6d255bf03dcd0ad9a";
-          sha256 = "15plb1gh7wz558008653v1xskz0bby477vvs7d7a752vrd8s6jcr";
+          rev = "d2744f8d2d8e1af5d5784021bcb8772e163be800";
+          sha256 = "0zsm00lggvmps0krlhyb5vvs0m0kikzmamj9mq5hw3k372jv4djm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -65432,12 +65482,12 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20170530.434";
+        version = "20170621.45";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "d86fc0353cbf1a95df261e40ec5b7292b0d557f3";
-          sha256 = "1pj1rdfm2dxri6v2c1m8slpabdmbgqqr0cp23s5w4s39g0mmphvg";
+          rev = "b1c41ddd290153fcc1df8f1d0fb54062e9943894";
+          sha256 = "1ga6h2jbnkjkf5f1hqg5jy5fw0cwlgzpn2f1mcrj04302i2vliv4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -65474,12 +65524,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170611.1307";
+        version = "20170621.718";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "a7e76aeb0a62f986e0469183728407c7bcbf4993";
-          sha256 = "17gbrijf62qdk5s02lish5nf6l8mfqrkly98hpkwzz3js4xkykkb";
+          rev = "be01cae704dc73e6a4b53766e655fb0dfba1bbc1";
+          sha256 = "0c8mx9ivalgvazhn51lbmskayhdhwnmvq5jp5wi7925p05i0kb3z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -65558,12 +65608,12 @@
     sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20170418.231";
+        version = "20170619.255";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642";
-          sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s";
+          rev = "c06eac2abae29ae55794e61ebd06890909edda7c";
+          sha256 = "08w88wv3yd1l87zzwlrfj586hh3l2k1xq80f1mzskr7vkzi2ailx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -67412,8 +67462,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c";
-          sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878";
+          rev = "f0426613062ba8305ebac41672d853a95cd9bbca";
+          sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67555,12 +67605,12 @@
     symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symbol-overlay";
-        version = "20170604.2240";
+        version = "20170615.1919";
         src = fetchFromGitHub {
           owner = "wolray";
           repo = "symbol-overlay";
-          rev = "3eb0864b65f9fe0e7c98fae7e9bcfd6330c471a0";
-          sha256 = "178ny3cbxm2hvmh0f49hvi2m15r72f2by3k076d4rzawab0gnp1p";
+          rev = "1c40cd921d573bbbd2cd9770c0bafc484b23a2ad";
+          sha256 = "1npgjhjdky298n70n1lh1qi6d1km1d9vy82n2x4rjn45699gkrl8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -67700,12 +67750,12 @@
     synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "synosaurus";
-        version = "20160812.723";
+        version = "20170621.957";
         src = fetchFromGitHub {
           owner = "hpdeifel";
           repo = "synosaurus";
-          rev = "24d194992d9c57df29256257b80960fdb1c4c2a7";
-          sha256 = "022fj1pfbjjl6khzmns9pwigwg1cll3vlccf48i8amk4n1m1wgmc";
+          rev = "acc4c634eb7c7f6dd9bce8610efa7fc900e9c47b";
+          sha256 = "0q8ggyfzvclgxvma2nvkfc89870hmii9cc8022ff0n7729rfj7m0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus";
@@ -68185,8 +68235,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "37d65c003224b88108d035732bfa729b2a14e8ab";
-          sha256 = "1dva713chyv3y4d689a81zpmrk22spvx56lkdmbvq5hfp467kayq";
+          rev = "c823729104873d0d1eeff4256eb15ee4c1dbfa36";
+          sha256 = "1zkjyj3jm2q23yfjvrvikrm6c6lvcysnnhivfvvrh0qr7qlqvwfz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -68626,8 +68676,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb";
-          sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59";
+          rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326";
+          sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -68647,8 +68697,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb";
-          sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59";
+          rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326";
+          sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -69144,8 +69194,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "b8ee72de5bf9318d50846852082325d0f932682b";
-          sha256 = "0gaiy81zvhx6d7yfnxy0hlpb8q5crg312xhqxbx8lgw0m702k6a3";
+          rev = "c55fdb95340417a4ba2dda41e9e872a4bcc63459";
+          sha256 = "13x72ksfpq047xr74v86ycfa6qwymx91bp4r7j08a1qlgw4adgdq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -69202,12 +69252,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170609.753";
+        version = "20170621.1159";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "dda031ba33e1c61674c1c17861abef6b5c37fe28";
-          sha256 = "17r7vjpcj4wxq8zxvm5bzm8xg0y29ybgff608s8hq6vkbj5sflm2";
+          rev = "ec4a2b7a68c2503a6bdb31f1b6977321ad588102";
+          sha256 = "1dj29365ia50gf4cicwvpcidlcp67hndyv60w6cgy6fghsslldnn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -69444,8 +69494,8 @@
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "tiny-menu.el";
-          rev = "f1fc844f514f57fd93602ff5e00c6125b0e93254";
-          sha256 = "125ckmfsvzacd5icsnldcbfl4rkxpfal6qfindy80i84vk0qw47g";
+          rev = "05563b94537b6eb22aeddedef2a6e59e3f88d073";
+          sha256 = "0k0djq60mwhjiwy9dpy9m9bs507b9p19pdl3g2s8sd9i2fk53rfy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82700c97ca40130e7508c151f60220d3f23bf23c/recipes/tiny-menu";
@@ -69503,12 +69553,12 @@
     tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tldr";
-        version = "20170401.2140";
+        version = "20170621.2059";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "tldr.el";
-          rev = "05da2ac1d82f9918b493e0895e98cd59666d3e28";
-          sha256 = "14ni301cn6s793157k1fkz65ab1xgh94n3g12hcj1xnmbdvnlymy";
+          rev = "2d80571cbffc5c02aad771da4b00502d86242926";
+          sha256 = "14gc1ihiyk7j4vf33r2kq3sbj37gw9s17p3gykj2sfviq295s006";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
@@ -69563,25 +69613,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    todochiku = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
-        pname = "todochiku";
-        version = "20150112.1254";
-        src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/todochiku.el?revision=16";
-          sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5";
-          name = "todochiku.el";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/todochiku";
-          sha256 = "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96";
-          name = "todochiku";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://melpa.org/#/todochiku";
-          license = lib.licenses.free;
-        };
-      }) {};
     todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "todotxt";
@@ -70195,12 +70226,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170607.1239";
+        version = "20170622.1241";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "d5878b0ed6da2a561aa795b31848e31e7c696197";
-          sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3";
+          rev = "b517e31c63239d20055462bd8a1b4f594d7351c3";
+          sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -70216,12 +70247,12 @@
     treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
     melpaBuild {
         pname = "treemacs-evil";
-        version = "20170604.315";
+        version = "20170615.336";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "d5878b0ed6da2a561aa795b31848e31e7c696197";
-          sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3";
+          rev = "b517e31c63239d20055462bd8a1b4f594d7351c3";
+          sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71497,12 +71528,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170524.2245";
+        version = "20170616.1454";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3";
-          sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4";
+          rev = "5bd87be2c99196c5342de7ffd56dd9e703a7e400";
+          sha256 = "10q6zwhp6501sl92p4ag9bp0awagbkn7757iy0ysprxnpc2ajznf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -71543,8 +71574,8 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "06460235d6f6ffd82dd2d973c2ad1004a4a2619b";
-          sha256 = "19ffqy52r52c7kjpb54flfilgnfkmxa7pkq5w0mw6xiaw3qvha2w";
+          rev = "4fcf11ae5f3ddc5ebc8f8f973fcf3f995c29c38d";
+          sha256 = "1pw8h6bwjmr61l7ncl36w9lqxsq4z9pbsi93nc0sfr67ram5ri47";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -72566,12 +72597,12 @@
     vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
     melpaBuild {
         pname = "vue-mode";
-        version = "20170514.2341";
+        version = "20170621.652";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "vue-mode";
-          rev = "35d803b19a302e7206d1a54db47b6dcbb674ce88";
-          sha256 = "1j7qvj653gf7dwimwl26zvz5ki04bp7vlkwcxqkc9fshcjm5py1q";
+          rev = "b5ecf28ec78033ddaac69065492fa4fd1d07637e";
+          sha256 = "0bybqffh2fbaah8iyib029v8wq0q9prcaydca4k2fr7hh5snrzwz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -73003,12 +73034,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170603.632";
+        version = "20170613.959";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "290f0ecb43dc6a636e45f55cf95c0d8fbda3fdc2";
-          sha256 = "00i697brchwdz3hviq2khhxcih7zi90dym1s5m9vk5azi2qly8ys";
+          rev = "8c35710775de9369f0637a9bd5fde39e4074db72";
+          sha256 = "02l948kffqp5fds2gka6klv7myphnaakjk68g35sm98nxvzhf5cl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -73108,12 +73139,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20170611.345";
+        version = "20170612.1352";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "90a96d21fc3c7edc7c339b343462696bfc6d21ff";
-          sha256 = "0q2fdxdlyfggrlgyfbq63n5k7qfjyr08cjy0k4i74sjphdss1bcl";
+          rev = "655a364fb1a6c9f3d49a0bbaf338bbf492b5b4d1";
+          sha256 = "11dqcch0fcxkqnnfzk9hxmimxckimpj74fz7rx3b7bvkmrh9snyy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -74319,12 +74350,12 @@
     writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
     melpaBuild {
         pname = "writeroom-mode";
-        version = "20170528.639";
+        version = "20170623.327";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "writeroom-mode";
-          rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a";
-          sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z";
+          rev = "9e924dd7dd83f10b026c89cddef7e1646f1a3869";
+          sha256 = "1v7hbmi9dqdqyr3png1xwhg3k05jr2q6jdjmj48bxiixl9zhcq9p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
@@ -74382,12 +74413,12 @@
     wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
     melpaBuild {
         pname = "wttrin";
-        version = "20170322.2041";
+        version = "20170614.506";
         src = fetchFromGitHub {
           owner = "bcbcarl";
           repo = "emacs-wttrin";
-          rev = "00ae9ee54056b16bb20c5b35e6bd262e6bda7eb5";
-          sha256 = "09vxi1vm5vsh7q9dqjbya8qrrclwid8r2hq9ycc46mbhx5blyz45";
+          rev = "df5427ce2a5ad4dab652dbb1c4a1834d7ddc2abc";
+          sha256 = "1ai655f10iayb4vw0ass2j3x83f4vsv90326mnywkzfl3sxd432z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin";
@@ -74529,12 +74560,12 @@
     xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20170511.2126";
+        version = "20170620.1705";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "7cd242de67d9567c343d5f530134759c2a8115d2";
-          sha256 = "10z2c1hbprgi2hil72g4w109namgns4mibgd4v8j9wggphjy8v6y";
+          rev = "1ecbe880d6aea24a77a8bd903e2c82225a35caf4";
+          sha256 = "14081cmsm5xrcmfpz5jh92ml0yir0fwvn9pxpf4x93x1wmp6d5r7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -74571,12 +74602,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170531.554";
+        version = "20170620.1932";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "4d871873024520168572babd174adc203776c71c";
-          sha256 = "0xiyh9qam40c2by0qp26x8ki090z2yv0319qrn5d4lsz69ivnpy0";
+          rev = "b18be452791b1468ecdd84aea7cac772519218e9";
+          sha256 = "00ncmin6azfkfhi4ns39wpjprfgc0bfiqvd5ccapbn12x48y2hra";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -75222,12 +75253,12 @@
     yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yahtzee";
-        version = "20170608.836";
+        version = "20170617.20";
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "0a4c06ce68868133498e0ce1ab5efdf296fa4862";
-          sha256 = "12vmgn118bwrrjpp1a1s47zk1q80gx7pakjhll03vpsyw08yvg13";
+          rev = "d7dcf24c1b9a04f4eb482b6c9cc29f80cff3a733";
+          sha256 = "1kf2szbiz3fkm72zrjcidwx4cphrwi7gjs24pnh0mii7dxkvmwhg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -75534,11 +75565,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170603.725";
+        version = "20170611.1642";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "c996fbcc2e79";
-          sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y";
+          rev = "e9299b77df1f";
+          sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -75596,12 +75627,12 @@
     ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
     melpaBuild {
         pname = "ycmd";
-        version = "20170515.2255";
+        version = "20170622.146";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6";
-          sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf";
+          rev = "43d690e4922dbf44e5deffc89cd06f2b1bd79ad2";
+          sha256 = "1vzsh8yj7v4qc5byb73pm25d408c28nm9cm780j289bpgx56p83s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -76252,11 +76283,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170608.2201";
+        version = "20170620.2134";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "66d2f665daa1";
-          sha256 = "1fgggwivp405qm0nvbqk8vrnprimg336mcv3am37yavi9da48fi8";
+          rev = "d5aa3fb7d4cd";
+          sha256 = "0154cij71gczwpc0rxpa669dx6ds6b383y9f3fi1hh6i6w5dw1dm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
-- 
GitLab


From a9c9040a02ba4acce12c15b85c4dc967bcc752aa Mon Sep 17 00:00:00 2001
From: Ivan Jager <aij+git@mrph.org>
Date: Thu, 22 Jun 2017 13:47:39 -0500
Subject: [PATCH 1159/1490] libatomic_ops: Provide alternate URL

www.ivmaisoft.com is currently down.
---
 pkgs/development/libraries/libatomic_ops/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index 33209f2fd44..eedc0993d73 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -5,7 +5,10 @@ stdenv.mkDerivation rec {
   version = "7.6.0";
 
   src = fetchurl {
-    url = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz";
+    urls = [
+      "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
+      "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
+    ];
     sha256 ="03ylfr29g9zc0r6b6axz3i68alj5qmxgzknxwam3jlx0sz8hcb4f";
   };
 
-- 
GitLab


From 54a370ff5f216a19ba622d1b5d38ad3b0372c201 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 23 Jun 2017 19:42:31 +0200
Subject: [PATCH 1160/1490] beam-packages: add erlangR20

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

diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 6b97c0d131b..46b0d12a5e9 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -73,6 +73,7 @@ rec {
     erlangR17 = packagesWith interpreters.erlangR17;
     erlangR18 = packagesWith interpreters.erlangR18;
     erlangR19 = packagesWith interpreters.erlangR19;
+    erlangR20 = packagesWith interpreters.erlangR20;
 
   };
 }
-- 
GitLab


From 0fafa0d7d7c89dfb8c3c7fbc5977cfe7959ebb78 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 23 Jun 2017 19:46:05 +0200
Subject: [PATCH 1161/1490] erlang: remove erlangR16 and all versioned variants
 from all-packages

Fixes #24047

All of the variants are still available in the beam.interpreters attrset.
---
 pkgs/top-level/all-packages.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b7b80fb4d2..7efd84d2cbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5989,14 +5989,8 @@ with pkgs;
 
   inherit (beam.interpreters)
     erlang erlang_odbc erlang_javac erlang_odbc_javac
-    elixir
-    lfe
-    erlangR16 erlangR16_odbc
-    erlang_basho_R16B02 erlang_basho_R16B02_odbc
-    erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac
-    erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac
-    erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac
-    erlangR20;
+    erlangR17 erlangR18 erlangR19 erlangR20
+    erlang_basho_R16B02 elixir lfe;
 
   inherit (beam.packages.erlang)
     rebar rebar3-open rebar3
-- 
GitLab


From 06271b6eba7ce754a305df1d90925de976b915d2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 23 Jun 2017 21:48:41 +0200
Subject: [PATCH 1162/1490] krita: Fix build dependencies

First of all, we need a newer version of Vc, because at least version
1.1.0 is required for Krita 3.1.3.

Also, qtmultimedia and qtx11extras were missing.

Built and tested successfully on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
---
 pkgs/applications/graphics/krita/default.nix | 2 ++
 pkgs/top-level/all-packages.nix              | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 121afdf2084..50720f854db 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -4,6 +4,7 @@
 , kio, kcrash
 , boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr
 , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase
+, qtmultimedia, qtx11extras
 }:
 
 mkDerivation rec {
@@ -23,6 +24,7 @@ mkDerivation rec {
     ki18n kitemmodels kitemviews kwindowsystem kio kcrash
     boost libraw fftw eigen exiv2 lcms2 gsl openexr
     openjpeg opencolorio vc poppler_qt5 curl ilmbase
+    qtmultimedia qtx11extras
   ];
 
   NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b7b80fb4d2..b99290127f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14698,7 +14698,6 @@ with pkgs;
   konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
 
   krita = libsForQt5.callPackage ../applications/graphics/krita {
-    vc = vc_0_7;
     openjpeg = openjpeg_1;
   };
 
-- 
GitLab


From 328617accdc4e9d9f37d1d6e43f55e4fc52cbfd1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 23 Jun 2017 19:24:19 -0400
Subject: [PATCH 1163/1490] rkt: 1.26.0 -> 1.27.0

---
 pkgs/applications/virtualization/rkt/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 41c2397d59e..bca2e558b38 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,15 +12,15 @@ let
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.26.0";
+  version = "1.27.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
   src = fetchFromGitHub {
-      owner = "coreos";
-      repo = "rkt";
-      rev = "v${version}";
-      sha256 = "16zwrx5v6pjjw1c6nbl19cchq71fj0bp5ci52rrfvl5mbn8xrs70";
+    owner = "coreos";
+    repo = "rkt";
+    rev = "v${version}";
+    sha256 = "153nkl4mp2p0llv4bpdhdd6127qyaz27jsnxmjgvxhaia0ab79v2";
   };
 
   stage1BaseImage = fetchurl {
-- 
GitLab


From 39497df1eff6b5ebea1b4dc35dc0814e074a5aec Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 23 Jun 2017 20:01:36 +0200
Subject: [PATCH 1164/1490] erlang: change default R18 -> R19

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

diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 46b0d12a5e9..acdbea67332 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -7,10 +7,10 @@ rec {
   interpreters = rec {
 
     # R18 is the default version.
-    erlang = erlangR18; # The main switch to change default Erlang version.
-    erlang_odbc = erlangR18_odbc;
-    erlang_javac = erlangR18_javac;
-    erlang_odbc_javac = erlangR18_odbc_javac;
+    erlang = erlangR19; # The main switch to change default Erlang version.
+    erlang_odbc = erlangR19_odbc;
+    erlang_javac = erlangR19_javac;
+    erlang_odbc_javac = erlangR19_odbc_javac;
 
     # These are standard Erlang versions, using the generic builder.
     erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {};
-- 
GitLab


From dc1ae6f18d719fba92123d33b1d30bcadc2b31cb Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 24 Jun 2017 01:51:00 +0200
Subject: [PATCH 1165/1490] erlang: use R18 for packages that don't work with
 R19

---
 pkgs/top-level/all-packages.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b99290127f3..50990745561 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6001,7 +6001,9 @@ with pkgs;
   inherit (beam.packages.erlang)
     rebar rebar3-open rebar3
     hexRegistrySnapshot fetchHex beamPackages
-    hex2nix cuter relxExe;
+    hex2nix cuter;
+
+  inherit (beam.packages.erlangR18) relxExe;
 
   groovy = callPackage ../development/interpreters/groovy { };
 
@@ -11460,7 +11462,9 @@ with pkgs;
 
   xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
 
-  yaws = callPackage ../servers/http/yaws { };
+  yaws = callPackage ../servers/http/yaws {
+    erlang = erlangR18;
+  };
 
   zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {});
 
@@ -16423,7 +16427,9 @@ with pkgs;
 
   winswitch = callPackage ../tools/X11/winswitch { };
 
-  wings = callPackage ../applications/graphics/wings { };
+  wings = callPackage ../applications/graphics/wings {
+    erlang = erlangR18;
+  };
 
   wireguard = callPackage ../os-specific/linux/wireguard { };
 
-- 
GitLab


From 276adb96fad79ea45b66c58e3799524eb226b24e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 24 Jun 2017 12:49:07 +0800
Subject: [PATCH 1166/1490] heimdall: 1.4.1 -> 1.4.2

---
 pkgs/tools/misc/heimdall/default.nix | 43 +++++++++++++---------------
 pkgs/top-level/all-packages.nix      |  4 ++-
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 4fb71b688c3..b1205df6199 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -1,49 +1,46 @@
-{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5, enableGUI ? false }:
+{ stdenv, fetchFromGitHub, cmake
+, zlib, libusb1
+, enableGUI ? false, qtbase ? null }:
 
-let version = "1.4.1-37-gb6fe7f8"; in
-
-stdenv.mkDerivation {
-  name = "heimdall-${version}";
+stdenv.mkDerivation rec {
+  name = "heimdall-${if enableGUI then "gui-" else ""}${version}";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner  = "Benjamin-Dobell";
     repo   = "Heimdall";
     rev    = "v${version}";
-    sha256 = "10c71k251wxd05j6c76qlar5sd73zam1c1g2cq3cscqayd7rzafg";
+    sha256 = "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz";
   };
 
-  buildInputs = [ zlib libusb1 cmake ];
+  buildInputs = [
+    zlib libusb1
+  ] ++ stdenv.lib.optional enableGUI qtbase;
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
-    "-DBUILD_TYPE=Release"
     "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}"
-  ] ++ stdenv.lib.optionals enableGUI [
-    "-DQt5Widgets_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Widgets"
-    "-DQt5Gui_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Gui"
-    "-DQt5Core_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Core"
   ];
 
   preConfigure = ''
     # Give ownership of the Galaxy S USB device to the logged in user.
     substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
-
-    # Fix version string reported by the executable.
-    sed -i -e 's/version = "v.*"/version = "v${version}"/' heimdall/source/Interface.cpp
   '';
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/doc/heimdall $out/lib/udev/rules.d
-    cp "bin/"* $out/bin/
-    cp ../Linux/README $out/share/doc/heimdall
-    cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d
+    mkdir -p $out/{bin,share/doc/heimdall,lib/udev/rules.d}
+    install -m755 -t $out/bin                bin/*
+    install -m644 -t $out/share/doc/heimdall ../Linux/README
+    install -m644 -t $out/lib/udev/rules.d   ../heimdall/60-heimdall.rules
   '';
 
   enableParallelBuilding = true;
 
-  meta = {
-    homepage = "http://www.glassechidna.com.au/products/heimdall/";
+  meta = with stdenv.lib; {
+    homepage    = http://www.glassechidna.com.au/products/heimdall/;
     description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b99290127f3..ff4a86293d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2367,7 +2367,9 @@ with pkgs;
 
   heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {};
 
-  heimdall = callPackage ../tools/misc/heimdall { };
+  heimdall = libsForQt5.callPackage ../tools/misc/heimdall { enableGUI = false; };
+
+  heimdall-gui = libsForQt5.callPackage ../tools/misc/heimdall { enableGUI = true; };
 
   hevea = callPackage ../tools/typesetting/hevea { };
 
-- 
GitLab


From 68a4dc82c046b627a97c475bb3cb7869893c6971 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 24 Jun 2017 13:18:01 +0800
Subject: [PATCH 1167/1490] heimdall: add OSX docs too

---
 pkgs/tools/misc/heimdall/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index b1205df6199..9e21ab5e38f 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -30,8 +30,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/{bin,share/doc/heimdall,lib/udev/rules.d}
     install -m755 -t $out/bin                bin/*
-    install -m644 -t $out/share/doc/heimdall ../Linux/README
     install -m644 -t $out/lib/udev/rules.d   ../heimdall/60-heimdall.rules
+    install -m644 ../Linux/README   $out/share/doc/heimdall/README.linux
+    install -m644 ../OSX/README.txt $out/share/doc/heimdall/README.osx
   '';
 
   enableParallelBuilding = true;
-- 
GitLab


From 76e019ad9f0cbf459fdb85fda0c79a960dfe1998 Mon Sep 17 00:00:00 2001
From: ajevans <github@agileand.me>
Date: Sat, 24 Jun 2017 16:19:30 +1000
Subject: [PATCH 1168/1490] crashplan: 4.8.2 -> 4.8.3

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

diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index 25842d4a989..3bfee48b8cd 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
 
 stdenv.mkDerivation rec {
-  version = "4.8.2";
+  version = "4.8.3";
   rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
   name = "crashplan-${version}-r${rev}";
 
   src = fetchurl {
     url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
-    sha256 = "0wh8lcm06ilcyncnp4ckg4yhyf9z3gb6v1kr111j4bpgmnd0v1yf";
+    sha256 = "c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From a087e5a53a850b0d827524c455219f527a4aa7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 21:42:46 +0100
Subject: [PATCH 1169/1490] lttng-modules: 2.9.1 -> 2.9.3

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

diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 2f5b50b3b58..d323c277814 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   pname = "lttng-modules-${version}";
   name = "${pname}-${kernel.version}";
-  version = "2.9.1";
+  version = "2.9.3";
 
   src = fetchurl {
     url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
-    sha256 = "0m0d8sp7fj1qha7qz1204yzpsyfd8a8fawjbvdlmk9jc4piqy1v2";
+    sha256 = "1zms8q199489ym0x1ri54napyi6pva80641x9x3qg9q23flbq4gr";
   };
 
   hardeningDisable = [ "pic" ];
-- 
GitLab


From 088ab901c513230b0ea95b5b6637d95a5eca0764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 21:43:14 +0100
Subject: [PATCH 1170/1490] lttng-ust: 2.9.0 -> 2.9.1

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

diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index 2d3fc656052..8994d0c3512 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -4,7 +4,7 @@
 #   ./configure ...
 #   [...]
 #   LTTng-UST will be built with the following options:
-#   
+#
 #   Java support (JNI): Disabled
 #   sdt.h integration:  Disabled
 #   [...]
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   name = "lttng-ust-${version}";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
-    sha256 = "1bsxxaqhkh9bwr1ll5acb41hvis2lhkl00h5ra2wdps27y31lm2d";
+    sha256 = "196snxrs1p205jz566rwxh7dqzsa3k16c7vm6k7i3gdvrmkx54dq";
   };
 
   buildInputs = [ liburcu ];
-- 
GitLab


From dc6e5dce2d7635c117609a5b79e4c87d9646be91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 21:43:38 +0100
Subject: [PATCH 1171/1490] lttng-tools: 2.9.3 -> 2.9.5

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

diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 733399ebf7d..9e29487a2f3 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lttng-tools-${version}";
-  version = "2.9.3";
+  version = "2.9.5";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
-    sha256 = "0kmj0ya5625mn2khbnghhsdmjr66xs0mhrvbrsdvrp3pm6mbmrm6";
+    sha256 = "073kzfiwgvz7c10hihjwn1p53hh1jwvdkkway0jj2rbczjv9x0vp";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-- 
GitLab


From 5e2de6d846e7e7f88378b730936b07f2fb410e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 25 May 2017 22:50:14 +0100
Subject: [PATCH 1172/1490] iwd: 2017-04-21 -> 2017-06-02

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

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 028ce53275c..adaca90650d 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -7,12 +7,12 @@ let
      sha256 = "12k1f1iarm29j8k16mhw83xx7r3bama4lp0fchhnj7iwxrpgs4gh";
   };
 in stdenv.mkDerivation rec {
-  name = "iwd-unstable-2017-04-21";
+  name = "iwd-unstable-2017-06-02";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
-    rev = "f64dea81b8490e5e09888be645a4325419bb269c";
-    sha256 = "0maqhx5264ykgmwaf90s2806i1kx2028if34ph2axlirxrhdd3lg";
+    rev = "6c64ae34619bf7f18cba007d8b0374badbe7c17e";
+    sha256 = "19rkf6lk213hdfs40ija7salars08zw6k5i5djdlpcn1j6y69i36";
   };
 
   configureFlags = [
-- 
GitLab


From de0e9e7a86c2603d0f978b0a6e51040a3adf01ea Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sat, 24 Jun 2017 12:30:04 +0200
Subject: [PATCH 1173/1490] erlang: refactor: switch to lib.makeExtensible

Use standardized implementation of attribute set extensibility mechanism
instead of manually re-implementing it.

Suggested by @cstrahan at https://github.com/NixOS/nixpkgs/pull/26668.
---
 pkgs/development/beam-modules/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 0db695befe6..d1a2a785a9c 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, pkgs, erlang, overrides ? (self: super: {}) }:
+{ stdenv, pkgs, erlang }:
 
 let
-  inherit (stdenv.lib) fix' extends getVersion versionAtLeast;
+  inherit (stdenv.lib) getVersion versionAtLeast makeExtensible;
 
   lib = pkgs.callPackage ./lib.nix {};
 
@@ -50,4 +50,4 @@ let
         cuter = callPackage ../tools/erlang/cuter {};
         relxExe = callPackage ../tools/erlang/relx-exe {};
       };
-in fix' (extends overrides packages)
+in makeExtensible packages
-- 
GitLab


From 0123200dee6bd3f94dbf6fed376b3208dcefe309 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sat, 24 Jun 2017 12:42:56 +0200
Subject: [PATCH 1174/1490] stdenv: add stawman docs for `makeOverridable`

Also fix a typo in docs in haskell-modules.
---
 lib/customisation.nix                          | 18 ++++++++++++++++++
 .../haskell-modules/make-package-set.nix       |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 6d6c0234087..98a46ca6c61 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -51,6 +51,24 @@ rec {
        else { }));
 
 
+  /* `makeOverridable` takes a function from attribute set to attribute set and
+     injects `override` attibute which can be used to override arguments of
+     the function.
+
+       nix-repl> x = {a, b}: { result = a + b; }
+
+       nix-repl> y = lib.makeOverridable x { a = 1; b = 2; }
+
+       nix-repl> y
+       { override = «lambda»; overrideDerivation = «lambda»; result = 3; }
+
+       nix-repl> y.override { a = 10; }
+       { override = «lambda»; overrideDerivation = «lambda»; result = 12; }
+
+     Please refer to "Nixpkgs Contributors Guide" section
+     "<pkg>.overrideDerivation" to learn about `overrideDerivation` and caveats
+     related to its use.
+  */
   makeOverridable = f: origArgs:
     let
       ff = f origArgs;
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index cc161e3ca2d..6ed8d0864ca 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -130,7 +130,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
         in generateExprs name src {}) overrides;
 
     # : { root : Path
-    #   , source-overrides : Defaulted (Either Path VersionNumber
+    #   , source-overrides : Defaulted (Either Path VersionNumber)
     #   , overrides : Defaulted (HaskellPackageOverrideSet)
     #   } -> NixShellAwareDerivation
     # Given a path to a haskell package directory whose cabal file is
-- 
GitLab


From b8658f629b598d9a5bb0acba2421e0ad99f67847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 18 Jun 2017 13:42:39 +0200
Subject: [PATCH 1175/1490] fetchgit: support "git@server:repo" URLs

Update the code that extracts the base name from a git repo URL so that
it can deal with URLs like "git@server:repo".
---
 pkgs/build-support/fetchgit/default.nix      | 3 ++-
 pkgs/build-support/fetchgit/nix-prefetch-git | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index a5f81ef1794..8e060b87ebd 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,6 +1,7 @@
 {stdenv, git, cacert}: let
   urlToName = url: rev: let
-    base = baseNameOf (stdenv.lib.removeSuffix "/" url);
+    inherit (stdenv.lib) removeSuffix splitString last;
+    base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
 
     matched = builtins.match "(.*).git" base;
 
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 3d656eba5ff..9e4f346f7a5 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -120,9 +120,8 @@ hash_from_ref(){
 url_to_name(){
     local url=$1
     local ref=$2
-    # basename removes the / and .git suffixes
     local base
-    base=$(basename "$url" .git)
+    base=$(basename "$url" .git | cut -d: -f2)
 
     if [[ $ref =~ ^[a-z0-9]+$ ]]; then
         echo "$base-${ref:0:7}"
-- 
GitLab


From 22b10bac78eb2b27e45248015d30e5e658174ca6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 17 Jun 2017 11:26:19 -0500
Subject: [PATCH 1176/1490] qt5: 5.8.0 -> 5.9.0

Qt 5.8 is immediately removed because its support window is ended.

The qtlocation module is built with `enableParallelBuilding = false` so that the
clipper library will be built before the components which link to it.

kjs now depends directly on pcre. The dependency was previously propagated from
qtbase, which now depends on pcre2.
---
 .../libraries/kde-frameworks/kjs.nix          |   4 +-
 pkgs/development/libraries/qt-5/5.8/fetch.sh  |   3 -
 .../qt-5/5.8/qtbase/xdg-config-dirs.patch     |  41 ---
 .../qt-5/5.8/qtwebengine/default.nix          |  97 -----
 pkgs/development/libraries/qt-5/5.8/srcs.nix  | 325 -----------------
 .../libraries/qt-5/{5.8 => 5.9}/default.nix   |   0
 pkgs/development/libraries/qt-5/5.9/fetch.sh  |   3 +
 .../{5.8 => 5.9}/qtbase/cmake-paths.patch     |  64 ++--
 .../qtbase/compose-search-path.patch          |   8 +-
 .../qt-5/{5.8 => 5.9}/qtbase/default.nix      |   4 +-
 .../qt-5/{5.8 => 5.9}/qtbase/dlopen-gl.patch  |  10 +-
 .../{5.8 => 5.9}/qtbase/dlopen-gtkstyle.patch |   0
 .../qtbase/dlopen-libXcursor.patch            |  13 +-
 .../{5.8 => 5.9}/qtbase/dlopen-resolv.patch   |  16 +-
 .../{5.8 => 5.9}/qtbase/library-paths.patch   |   8 +-
 .../qt-5/{5.8 => 5.9}/qtbase/libressl.patch   |   0
 .../qt-5/{5.8 => 5.9}/qtbase/qgtk-env.patch   |   0
 .../qtbase/qnativesocketengine-type-pun.patch |   0
 .../libraries/qt-5/{5.8 => 5.9}/qtbase/series |   1 -
 .../qt-5/{5.8 => 5.9}/qtbase/tzdir.patch      |   8 +-
 .../qt-5/{5.8 => 5.9}/qtconnectivity.nix      |   0
 .../{5.8 => 5.9}/qtdeclarative/default.nix    |   0
 .../qtdeclarative/import-paths.patch          |   0
 .../qt-5/{5.8 => 5.9}/qtdeclarative/series    |   0
 .../libraries/qt-5/{5.8 => 5.9}/qtdoc.nix     |   0
 .../qt-5/{5.8 => 5.9}/qtgraphicaleffects.nix  |   0
 .../qt-5/{5.8 => 5.9}/qtimageformats.nix      |   0
 .../qt-5/{5.8 => 5.9}/qtlocation.nix          |   2 +
 .../qt-5/{5.8 => 5.9}/qtmacextras.nix         |   0
 .../qt-5/{5.8 => 5.9}/qtmultimedia.nix        |   0
 .../qt-5/{5.8 => 5.9}/qtquickcontrols.nix     |   0
 .../qt-5/{5.8 => 5.9}/qtquickcontrols2.nix    |   0
 .../qtscript/0001-glib-2.32.patch             |   0
 .../qt-5/{5.8 => 5.9}/qtscript/default.nix    |   0
 .../libraries/qt-5/{5.8 => 5.9}/qtsensors.nix |   0
 .../{5.8 => 5.9}/qtserialport/default.nix     |   0
 .../qtserialport-dlopen-udev.patch            |   0
 .../qt-5/{5.8 => 5.9}/qtserialport/series     |   0
 .../libraries/qt-5/{5.8 => 5.9}/qtsvg.nix     |   0
 .../{5.8 => 5.9}/qttools/cmake-paths.patch    |   0
 .../qt-5/{5.8 => 5.9}/qttools/default.nix     |   0
 .../qt-5/{5.8 => 5.9}/qttools/series          |   0
 .../qt-5/{5.8 => 5.9}/qttranslations.nix      |   0
 .../libraries/qt-5/{5.8 => 5.9}/qtwayland.nix |   2 +-
 .../qt-5/{5.8 => 5.9}/qtwebchannel.nix        |   0
 .../qt-5/5.9/qtwebengine/default.nix          | 113 ++++++
 .../qtwebengine-paxmark-mksnapshot.patch      |  24 +-
 .../qt-5/{5.8 => 5.9}/qtwebkit/default.nix    |   0
 .../qtwebkit/qtwebkit-dlopen-gtk.patch        |   0
 .../qtwebkit/qtwebkit-dlopen-udev.patch       |   0
 .../qtwebkit/qtwebkit-icucore-darwin.patch    |   0
 .../qt-5/{5.8 => 5.9}/qtwebkit/series         |   0
 .../qt-5/{5.8 => 5.9}/qtwebsockets.nix        |   0
 .../qt-5/{5.8 => 5.9}/qtx11extras.nix         |   0
 .../qt-5/{5.8 => 5.9}/qtxmlpatterns.nix       |   0
 pkgs/development/libraries/qt-5/5.9/srcs.nix  | 333 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  10 +-
 57 files changed, 536 insertions(+), 553 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/fetch.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/srcs.nix
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/default.nix (100%)
 create mode 100644 pkgs/development/libraries/qt-5/5.9/fetch.sh
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/cmake-paths.patch (89%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/compose-search-path.patch (78%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/default.nix (98%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/dlopen-gl.patch (73%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/dlopen-gtkstyle.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/dlopen-libXcursor.patch (57%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/dlopen-resolv.patch (55%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/library-paths.patch (76%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/libressl.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/qgtk-env.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/qnativesocketengine-type-pun.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/series (88%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/tzdir.patch (88%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtconnectivity.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtdeclarative/default.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtdeclarative/import-paths.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtdeclarative/series (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtdoc.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtgraphicaleffects.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtimageformats.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtlocation.nix (73%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtmacextras.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtmultimedia.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtquickcontrols.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtquickcontrols2.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtscript/0001-glib-2.32.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtscript/default.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtsensors.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtserialport/default.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtserialport/qtserialport-dlopen-udev.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtserialport/series (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtsvg.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qttools/cmake-paths.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qttools/default.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qttools/series (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qttranslations.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwayland.nix (88%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebchannel.nix (100%)
 create mode 100644 pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebengine/qtwebengine-paxmark-mksnapshot.patch (59%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/default.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/qtwebkit-dlopen-gtk.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/qtwebkit-dlopen-udev.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/qtwebkit-icucore-darwin.patch (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/series (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebsockets.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtx11extras.nix (100%)
 rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtxmlpatterns.nix (100%)
 create mode 100644 pkgs/development/libraries/qt-5/5.9/srcs.nix

diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix
index 62bcc0065b3..311f07241d6 100644
--- a/pkgs/development/libraries/kde-frameworks/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjs.nix
@@ -1,12 +1,12 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  qtbase,
+  pcre, qtbase,
 }:
 
 mkDerivation {
   name = "kjs";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ pcre qtbase ];
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/fetch.sh b/pkgs/development/libraries/qt-5/5.8/fetch.sh
deleted file mode 100644
index 2e21cdefba6..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/fetch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/ \
-            http://download.qt.io/community_releases/5.8/5.8.0-final/ \
-            -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
deleted file mode 100644
index b5c21f064a4..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings.cpp
-+++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp
-@@ -1134,6 +1134,23 @@ QConfFileSettingsPrivate::QConfFileSetti
-         confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
-     confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
- 
-+#if !defined(Q_OS_WIN)
-+    // Add directories specified in $XDG_CONFIG_DIRS
-+    const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
-+    if (!pathEnv.isEmpty()) {
-+        const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
-+        if (!pathEntries.isEmpty()) {
-+            int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
-+            for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
-+                const QString& path = pathEntries.at(k);
-+                if (!application.isEmpty())
-+                    confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
-+                confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
-+            }
-+        }
-+    }
-+#endif
-+
-     for (i = 0; i < NumConfFiles; ++i) {
-         if (confFiles[i]) {
-             spec = i;
-Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings_p.h
-+++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h
-@@ -246,7 +246,7 @@ public:
-         F_Organization = 0x1,
-         F_User = 0x0,
-         F_System = 0x2,
--        NumConfFiles = 4
-+        NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
-     };
- 
-     QSettings::Format format;
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
deleted file mode 100644
index 871fb21c106..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel
-
-, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
-, fontconfig, freetype, harfbuzz, icu, dbus
-, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
-, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
-, alsaLib
-, libcap
-, pciutils
-, systemd
-
-, bison, flex, git, which, gperf
-, coreutils
-, pkgconfig, python2
-, enableProprietaryCodecs ? true
-
-, lib, stdenv # lib.optional, needsPax
-}:
-
-with stdenv.lib;
-
-qtSubmodule {
-  name = "qtwebengine";
-  qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
-  buildInputs = [ bison flex git which gperf ];
-  nativeBuildInputs = [ pkgconfig python2 coreutils ];
-  doCheck = true;
-  outputs = [ "out" "dev" "bin" ];
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
-    substituteInPlace ./src/3rdparty/chromium/build/common.gypi \
-      --replace /bin/echo ${coreutils}/bin/echo
-    substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \
-      --replace /bin/echo ${coreutils}/bin/echo
-    substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \
-      --replace /bin/echo ${coreutils}/bin/echo
-
-    # Fix library paths
-    sed -i \
-      -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
-      -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
-      -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
-      src/core/web_engine_library_info.cpp
- '' + optionalString (!stdenv.isDarwin) ''
-    sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
-      src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
-
-    sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
-      src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-  '';
-
-  qmakeFlags = optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
-
-  propagatedBuildInputs = [
-    # Image formats
-    libjpeg libpng libtiff libwebp
-
-    # Video formats
-    srtp libvpx
-
-    # Audio formats
-    libopus
-
-    # Text rendering
-    harfbuzz icu
-  ]
-  ++ optionals (!stdenv.isDarwin) [
-    dbus zlib minizip snappy nss protobuf jsoncpp libevent
-
-    # Audio formats
-    alsaLib
-
-    # Text rendering
-    fontconfig freetype
-
-    libcap
-    pciutils
-
-    # X11 libs
-    xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
-    xlibs.libXcomposite
-  ];
-  patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
-  postInstall = ''
-    cat > $out/libexec/qt.conf <<EOF
-    [Paths]
-    Prefix = ..
-    EOF
-
-    paxmark m $out/libexec/QtWebEngineProcess
-
-    moveToOutput "$qtQmlPrefix" "$bin"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.8/srcs.nix b/pkgs/development/libraries/qt-5/5.8/srcs.nix
deleted file mode 100644
index 02bd5c4f18b..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/srcs.nix
+++ /dev/null
@@ -1,325 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
-{ fetchurl, mirror }:
-
-{
-  qt3d = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qt3d-opensource-src-5.8.0.tar.xz";
-      sha256 = "1rca1k8lf0xy2x1w3kp9rnpi77bbrm8v7db302n9a8cjziv4a8is";
-      name = "qt3d-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtactiveqt-opensource-src-5.8.0.tar.xz";
-      sha256 = "1a9m87chmp2m3ljadryh9ggvwpvclmazz081h3p68n092dbl2ylj";
-      name = "qtactiveqt-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtandroidextras-opensource-src-5.8.0.tar.xz";
-      sha256 = "1wgbxi579fdnripp481qhcqma95hm4zcc16n4ljjpl0yzn1zx8qa";
-      name = "qtandroidextras-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtbase = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtbase-opensource-src-5.8.0.tar.xz";
-      sha256 = "01f07yjly7y24njl2h4hyknmi7pf8yd9gky23szcfkd40ap12wf1";
-      name = "qtbase-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtcanvas3d = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtcanvas3d-opensource-src-5.8.0.tar.xz";
-      sha256 = "18yaikbwk4d7sh09psi3kjn1mxjp4d2f3qchfzgq5x96yn8gfijl";
-      name = "qtcanvas3d-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtcharts = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtcharts-opensource-src-5.8.0.tar.xz";
-      sha256 = "11m5g1fxip6z2xk1z6g6h4rq7v282qbkxflan8hs87hadnzars03";
-      name = "qtcharts-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtconnectivity-opensource-src-5.8.0.tar.xz";
-      sha256 = "1w97na5s420y08dcydqinbqb0rd9h4pfdnjbwslr0qvzsvlh2bbv";
-      name = "qtconnectivity-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtdatavis3d = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtdatavis3d-opensource-src-5.8.0.tar.xz";
-      sha256 = "1n2vdf6n7pr9xrjwbvbar899q74shx6cy19x32adxfn2iilygwbp";
-      name = "qtdatavis3d-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtdeclarative-opensource-src-5.8.0.tar.xz";
-      sha256 = "0ilaf2sprpk9fg2j3905hxnhm0xbnm88ppk4zifp7n0jmnwix51j";
-      name = "qtdeclarative-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtdoc-opensource-src-5.8.0.tar.xz";
-      sha256 = "13jpml9hdcxvf8j2033x5liw26r3q8idpjmx2rij63w2956c84ii";
-      name = "qtdoc-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtgamepad = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtgamepad-opensource-src-5.8.0.tar.xz";
-      sha256 = "0dwcrq60h802z694h4108figlr3yvp8fpzhwjzbjm503v8yaxw5j";
-      name = "qtgamepad-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtgraphicaleffects-opensource-src-5.8.0.tar.xz";
-      sha256 = "06frknb7m8bgg55rs7jjm61iziisy2ykzrrc5dy3vj0aad89najz";
-      name = "qtgraphicaleffects-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtimageformats-opensource-src-5.8.0.tar.xz";
-      sha256 = "0vv0wh5q5sih294x661djzwvgdwy7r6xpnxsc111k5hwq7m5w13m";
-      name = "qtimageformats-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtlocation-opensource-src-5.8.0.tar.xz";
-      sha256 = "1fqssa8rhq83lnxjcdh4ijqck3lmqglpk8yax8x17w49v6gf78a8";
-      name = "qtlocation-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtmacextras-opensource-src-5.8.0.tar.xz";
-      sha256 = "049lbxy6yxv7yii7zxibfbix0q2p8fn58dsbc33rn40gbs7rj9zf";
-      name = "qtmacextras-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtmultimedia-opensource-src-5.8.0.tar.xz";
-      sha256 = "01sakngvsqr90qhrxyghfqdpddpxwbjyzzhm34k0hlpr6i409g58";
-      name = "qtmultimedia-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtnetworkauth = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtnetworkauth-opensource-src-5.8.0.tar.xz";
-      sha256 = "1hz4lcm4cai56v0q7h1q6zc29ykkb2191iqmf8h7l5l9m71q2mb1";
-      name = "qtnetworkauth-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtpurchasing = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtpurchasing-opensource-src-5.8.0.tar.xz";
-      sha256 = "0mdkw73yx1csz9mf3wl0w1x1b8cv9j5px4nvakrknkjzaa9qgzdk";
-      name = "qtpurchasing-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols-opensource-src-5.8.0.tar.xz";
-      sha256 = "09mkswxw7wa2l8xz9fbblxr1pbi86hggis55j4k8ifnrrw60vrq4";
-      name = "qtquickcontrols-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtquickcontrols2 = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols2-opensource-src-5.8.0.tar.xz";
-      sha256 = "06yy98x4vic2yrlpp83gf4kvl7kd93q62k178w0cy4sgqxp8d6dh";
-      name = "qtquickcontrols2-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtscript-opensource-src-5.8.0.tar.xz";
-      sha256 = "1lssbsjf2p2ag02fjq6k6vk7vywhj4jsl286r2fqi78q5lfvjfi9";
-      name = "qtscript-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtscxml = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtscxml-opensource-src-5.8.0.tar.xz";
-      sha256 = "1i4xl24q4i32mbhyndrwaz0xj79d9n84s320gmkf5rwnfcwrvfxn";
-      name = "qtscxml-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtsensors-opensource-src-5.8.0.tar.xz";
-      sha256 = "15p7bp21yj4cdl5yfc9qnn4lhhiwiwx3b71lrb431kgqxhwhcp9s";
-      name = "qtsensors-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtserialbus = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtserialbus-opensource-src-5.8.0.tar.xz";
-      sha256 = "02n1b1wrvfg6c7z15c5c5gv9r5gd4pp58jrd1a8d8fg3ybcksd2q";
-      name = "qtserialbus-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtserialport-opensource-src-5.8.0.tar.xz";
-      sha256 = "1b86al3zn1pxyk0n59vh8bqxrpz2m0j33ygclaqbxl1sszg7ycaj";
-      name = "qtserialport-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtspeech = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtspeech-opensource-src-5.8.0.tar.xz";
-      sha256 = "0i2cx1b6ssj56p5blf7n16bbrq1g0hb27m3b5r6dh6py7mcq2spi";
-      name = "qtspeech-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtsvg-opensource-src-5.8.0.tar.xz";
-      sha256 = "12fwzbp28szqw1sk3flb8i6xnxgl94siwyy41ffdmd0s44f1jwwq";
-      name = "qtsvg-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qttools = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qttools-opensource-src-5.8.0.tar.xz";
-      sha256 = "10wx4vydj91yag30457c7azx4ihrwky42l7zzwkbmdlksdv8xv4m";
-      name = "qttools-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qttranslations-opensource-src-5.8.0.tar.xz";
-      sha256 = "0bpwqclidji12f3f20hfpafr1b7b9wc7nhp4yhms1hhbqlpgfz1v";
-      name = "qttranslations-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtvirtualkeyboard = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtvirtualkeyboard-opensource-src-5.8.0.tar.xz";
-      sha256 = "0772yhb8w6rzxqgrdmvbw61vk2gagcs9zics56v3a2ckknrzbz9m";
-      name = "qtvirtualkeyboard-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwayland-opensource-src-5.8.0.tar.xz";
-      sha256 = "06ilh55vaxbkyv7irw0n11gxgc34ypx2qhqawxzy7kllzg9zcl7z";
-      name = "qtwayland-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwebchannel-opensource-src-5.8.0.tar.xz";
-      sha256 = "0jhbgp9rdp5lpwjrykxmg4lb60wk7gm3dldz5kp3b8ms2dab3xav";
-      name = "qtwebchannel-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwebengine-opensource-src-5.8.0.tar.xz";
-      sha256 = "1gkrvb8wa04p91hras2pa7i26n1q5xgsiq5gfw3fc488cvqj4g92";
-      name = "qtwebengine-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtwebkit = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/community_releases/5.8/5.8.0-final/qtwebkit-opensource-src-5.8.0.tar.xz";
-      sha256 = "1v0vj6slyh19mjrrpbqdzb47fr0f4xk7bc8803xjzybb11h8dbkr";
-      name = "qtwebkit-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtwebkit-examples = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/community_releases/5.8/5.8.0-final/qtwebkit-examples-opensource-src-5.8.0.tar.xz";
-      sha256 = "18ar35mg32knm3r0wgqv1hmxl9pqhi1y0yhd3lbskca0f0csxiw4";
-      name = "qtwebkit-examples-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwebsockets-opensource-src-5.8.0.tar.xz";
-      sha256 = "1xa5p36grqxz3fa08amn7r3dy6k28g6y0gkc6jgj7lyhjzr0l4da";
-      name = "qtwebsockets-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtwebview = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwebview-opensource-src-5.8.0.tar.xz";
-      sha256 = "1lvzab6vjmpsl3rq73afhvjv6hkkgj19sl6sd03fgx0iikfd9n5p";
-      name = "qtwebview-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwinextras-opensource-src-5.8.0.tar.xz";
-      sha256 = "1761qaqbrsqqpznv2mrkc44fk4x3lc13x6s0z3ahjms6pna7pzr7";
-      name = "qtwinextras-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtx11extras-opensource-src-5.8.0.tar.xz";
-      sha256 = "03i8lk9qcdf8h2k4f3rkqqkzbrlnyaspv9mgjkn4k61s2asz5mxy";
-      name = "qtx11extras-opensource-src-5.8.0.tar.xz";
-    };
-  };
-  qtxmlpatterns = {
-    version = "5.8.0";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtxmlpatterns-opensource-src-5.8.0.tar.xz";
-      sha256 = "016s75j2cml7kc8scdm9a6pmxm8jhs424lml2h9znm1flmgadzvv";
-      name = "qtxmlpatterns-opensource-src-5.8.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/default.nix
rename to pkgs/development/libraries/qt-5/5.9/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh
new file mode 100644
index 00000000000..60acf2cea9d
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh
@@ -0,0 +1,3 @@
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.0/submodules/ \
+            http://download.qt.io/community_releases/5.9/5.9.0-final/ \
+            -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/cmake-paths.patch
similarity index 89%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/cmake-paths.patch
index 3408b235e0c..9616f5812cf 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/cmake-paths.patch
@@ -1,7 +1,7 @@
-Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+Index: qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+--- qtbase-opensource-src-5.9.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
  endif()
  !!ENDIF
@@ -97,7 +97,7 @@ Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
      )
  !!ELSE
      set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -255,7 +221,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+@@ -281,7 +247,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
  !!IF isEmpty(CMAKE_DEBUG_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -106,7 +106,7 @@ Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
  !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
      if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
  !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
-@@ -263,13 +229,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+@@ -289,13 +255,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
  !!ELSE // CMAKE_STATIC_WINDOWS_BUILD
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
@@ -122,7 +122,7 @@ Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
  !!ENDIF
-@@ -292,7 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+@@ -318,7 +284,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
  !!IF isEmpty(CMAKE_RELEASE_TYPE)
  !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -131,7 +131,7 @@ Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
  !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
      if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
-@@ -300,13 +266,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+@@ -326,13 +292,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
  !!ELSE // CMAKE_STATIC_WINDOWS_BUILD
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
@@ -147,7 +147,7 @@ Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
-@@ -328,11 +294,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
+@@ -354,11 +320,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME
      macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
          set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
  
@@ -160,10 +160,10 @@ Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cm
          _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
          set_target_properties(Qt5::${Plugin} PROPERTIES
              \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-Index: qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.9.0/src/gui/Qt5GuiConfigExtras.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
+--- qtbase-opensource-src-5.9.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
++++ qtbase-opensource-src-5.9.0/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -2,7 +2,7 @@
  !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
  
@@ -189,10 +189,10 @@ Index: qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in
  !!ELSE
      set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
  !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.9.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+--- qtbase-opensource-src-5.9.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
++++ qtbase-opensource-src-5.9.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
      add_executable(Qt5::uic IMPORTED)
  
@@ -202,10 +202,10 @@ Index: qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtras.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
+--- qtbase-opensource-src-5.9.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
      add_executable(Qt5::qmake IMPORTED)
  
@@ -251,10 +251,10 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in
  !!ELSE
      set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
  !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+Index: qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+--- qtbase-opensource-src-5.9.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
++++ qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
 @@ -1,6 +1,6 @@
  
  !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
@@ -263,10 +263,10 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForIn
  !!ELSE
  set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+Index: qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+--- qtbase-opensource-src-5.9.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
++++ qtbase-opensource-src-5.9.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
 @@ -1,6 +1,6 @@
  
  !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
@@ -275,10 +275,10 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmak
  !!ELSE
  set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
  !!ENDIF
-Index: qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
+Index: qtbase-opensource-src-5.9.0/src/dbus/Qt5DBusConfigExtras.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
-+++ qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
+--- qtbase-opensource-src-5.9.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
++++ qtbase-opensource-src-5.9.0/src/dbus/Qt5DBusConfigExtras.cmake.in
 @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
      add_executable(Qt5::qdbuscpp2xml IMPORTED)
  
@@ -297,10 +297,10 @@ Index: qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in
  !!ELSE
      set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
  !!ENDIF
-Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+Index: qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+--- qtbase-opensource-src-5.9.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
++++ qtbase-opensource-src-5.9.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 @@ -2,10 +2,10 @@
  add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
  
@@ -314,10 +314,10 @@ Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.c
  !!ENDIF
  
  list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
-Index: qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
+Index: qtbase-opensource-src-5.9.0/mkspecs/features/create_cmake.prf
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/mkspecs/features/create_cmake.prf
-+++ qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf
+--- qtbase-opensource-src-5.9.0.orig/mkspecs/features/create_cmake.prf
++++ qtbase-opensource-src-5.9.0/mkspecs/features/create_cmake.prf
 @@ -136,28 +136,28 @@ contains(CONFIG, plugin) {
  
      win32 {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/compose-search-path.patch
similarity index 78%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/compose-search-path.patch
index 225d47f8e22..720e7d81fa2 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/compose-search-path.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+Index: qtbase-opensource-src-5.9.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -258,12 +258,9 @@ void TableGenerator::initPossibleLocatio
+--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
++++ qtbase-opensource-src-5.9.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocatio
      m_possibleLocations.reserve(7);
      if (qEnvironmentVariableIsSet("QTCOMPOSE"))
          m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
similarity index 98%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
rename to pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
index 93be661b7da..a4451a486ce 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix
@@ -9,7 +9,7 @@
 
   dbus, dconf, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite,
   libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
-  libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, sqlite, udev,
+  libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre2, sqlite, udev,
   xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs,
   zlib,
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs =
     [
-      libxml2 libxslt openssl pcre16 sqlite zlib
+      libxml2 libxslt openssl pcre2 sqlite zlib
 
       # Text rendering
       harfbuzz icu
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gl.patch
similarity index 73%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gl.patch
index c835f2bfe44..9385c7f6678 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gl.patch
@@ -1,9 +1,9 @@
-Index: qtbase-opensource-src-5.8.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+Index: qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-+++ qtbase-opensource-src-5.8.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
-@@ -576,7 +576,14 @@ QFunctionPointer QGLXContext::getProcAdd
- #ifndef QT_NO_LIBRARY
+--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
++++ qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAdd
+ #if QT_CONFIG(library)
                  extern const QString qt_gl_library_name();
  //                QLibrary lib(qt_gl_library_name());
 +                // Check system library paths first
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gtkstyle.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gtkstyle.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-gtkstyle.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-libXcursor.patch
similarity index 57%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-libXcursor.patch
index d0e82cf122a..31339abc785 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-libXcursor.patch
@@ -1,9 +1,9 @@
-Index: qtbase-opensource-src-5.8.0/src/plugins/platforms/xcb/qxcbcursor.cpp
+Index: qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/qxcbcursor.cpp
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ qtbase-opensource-src-5.8.0/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -309,13 +309,13 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
- #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY)
+--- qtbase-opensource-src-5.9.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp
++++ qtbase-opensource-src-5.9.0/src/plugins/platforms/xcb/qxcbcursor.cpp
+@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
+ #if defined(XCB_USE_XLIB) && QT_CONFIG(library)
      static bool function_ptrs_not_initialized = true;
      if (function_ptrs_not_initialized) {
 -        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
@@ -15,6 +15,3 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platforms/xcb/qxcbcursor.cpp
              xcursorFound = xcursorLib.load();
          }
          if (xcursorFound) {
-             ptrXcursorLibraryLoadCursor =
-                 (PtrXcursorLibraryLoadCursor) xcursorLib.resolve("XcursorLibraryLoadCursor");
-             ptrXcursorLibraryGetTheme =
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-resolv.patch
similarity index 55%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-resolv.patch
index ef7cd4a910a..598456a49ff 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/dlopen-resolv.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp
+Index: qtbase-opensource-src-5.9.0/src/network/kernel/qdnslookup_unix.cpp
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/network/kernel/qdnslookup_unix.cpp
-+++ qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp
-@@ -90,7 +90,7 @@ static bool resolveLibraryInternal()
+--- qtbase-opensource-src-5.9.0.orig/src/network/kernel/qdnslookup_unix.cpp
++++ qtbase-opensource-src-5.9.0/src/network/kernel/qdnslookup_unix.cpp
+@@ -92,7 +92,7 @@ static bool resolveLibraryInternal()
      if (!lib.load())
  #endif
      {
@@ -11,11 +11,11 @@ Index: qtbase-opensource-src-5.8.0/src/network/kernel/qdnslookup_unix.cpp
          if (!lib.load())
              return false;
      }
-Index: qtbase-opensource-src-5.8.0/src/network/kernel/qhostinfo_unix.cpp
+Index: qtbase-opensource-src-5.9.0/src/network/kernel/qhostinfo_unix.cpp
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/network/kernel/qhostinfo_unix.cpp
-+++ qtbase-opensource-src-5.8.0/src/network/kernel/qhostinfo_unix.cpp
-@@ -100,7 +100,7 @@ static bool resolveLibraryInternal()
+--- qtbase-opensource-src-5.9.0.orig/src/network/kernel/qhostinfo_unix.cpp
++++ qtbase-opensource-src-5.9.0/src/network/kernel/qhostinfo_unix.cpp
+@@ -102,7 +102,7 @@ static bool resolveLibraryInternal()
      if (!lib.load())
  #endif
      {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/library-paths.patch
similarity index 76%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/library-paths.patch
index 38eecbe2c64..4c24d73ed36 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/library-paths.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
+Index: qtbase-opensource-src-5.9.0/src/corelib/kernel/qcoreapplication.cpp
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/kernel/qcoreapplication.cpp
-+++ qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
-@@ -2476,6 +2476,15 @@ QStringList QCoreApplication::libraryPat
+--- qtbase-opensource-src-5.9.0.orig/src/corelib/kernel/qcoreapplication.cpp
++++ qtbase-opensource-src-5.9.0/src/corelib/kernel/qcoreapplication.cpp
+@@ -2533,6 +2533,15 @@ QStringList QCoreApplication::libraryPat
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.9/qtbase/series
similarity index 88%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/series
rename to pkgs/development/libraries/qt-5/5.9/qtbase/series
index f3387694518..4f354e87c84 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/series
@@ -1,7 +1,6 @@
 dlopen-resolv.patch
 tzdir.patch
 dlopen-libXcursor.patch
-xdg-config-dirs.patch
 library-paths.patch
 libressl.patch
 dlopen-gl.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch
similarity index 88%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
rename to pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch
index b8c05815a78..d57f24c3ed0 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
+++ b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch
@@ -1,7 +1,7 @@
-Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp
+Index: qtbase-opensource-src-5.9.0/src/corelib/tools/qtimezoneprivate_tz.cpp
 ===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp
+--- qtbase-opensource-src-5.9.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
++++ qtbase-opensource-src-5.9.0/src/corelib/tools/qtimezoneprivate_tz.cpp
 @@ -70,7 +70,11 @@ typedef QHash<QByteArray, QTzTimeZone> Q
  // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
  static QTzTimeZoneHash loadTzTimeZones()
@@ -15,7 +15,7 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp
      if (!QFile::exists(path))
          path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
  
-@@ -642,12 +646,16 @@ void QTzTimeZonePrivate::init(const QByt
+@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByt
          if (!tzif.open(QIODevice::ReadOnly))
              return;
      } else {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
rename to pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch
rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/series
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/series
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdoc.nix b/pkgs/development/libraries/qt-5/5.9/qtdoc.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtdoc.nix
rename to pkgs/development/libraries/qt-5/5.9/qtdoc.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix
rename to pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.9/qtimageformats.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtimageformats.nix
rename to pkgs/development/libraries/qt-5/5.9/qtimageformats.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix
similarity index 73%
rename from pkgs/development/libraries/qt-5/5.8/qtlocation.nix
rename to pkgs/development/libraries/qt-5/5.9/qtlocation.nix
index 0eabe04e478..24f0b648723 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix
@@ -8,4 +8,6 @@ qtSubmodule {
     moveToOutput "$qtPluginPrefix" "$bin"
     moveToOutput "$qtQmlPrefix" "$bin"
   '';
+  # Linking with -lclipper fails with parallel build enabled
+  enableParallelBuild = false;
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtmacextras.nix b/pkgs/development/libraries/qt-5/5.9/qtmacextras.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtmacextras.nix
rename to pkgs/development/libraries/qt-5/5.9/qtmacextras.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
rename to pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix
rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.9/qtscript/0001-glib-2.32.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch
rename to pkgs/development/libraries/qt-5/5.9/qtscript/0001-glib-2.32.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.9/qtscript/default.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtscript/default.nix
rename to pkgs/development/libraries/qt-5/5.9/qtscript/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtsensors.nix
rename to pkgs/development/libraries/qt-5/5.9/qtsensors.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
rename to pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch
rename to pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/series b/pkgs/development/libraries/qt-5/5.9/qtserialport/series
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtserialport/series
rename to pkgs/development/libraries/qt-5/5.9/qtserialport/series
diff --git a/pkgs/development/libraries/qt-5/5.8/qtsvg.nix b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtsvg.nix
rename to pkgs/development/libraries/qt-5/5.9/qtsvg.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch
rename to pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qttools/default.nix
rename to pkgs/development/libraries/qt-5/5.9/qttools/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/series b/pkgs/development/libraries/qt-5/5.9/qttools/series
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qttools/series
rename to pkgs/development/libraries/qt-5/5.9/qttools/series
diff --git a/pkgs/development/libraries/qt-5/5.8/qttranslations.nix b/pkgs/development/libraries/qt-5/5.9/qttranslations.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qttranslations.nix
rename to pkgs/development/libraries/qt-5/5.9/qttranslations.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix
similarity index 88%
rename from pkgs/development/libraries/qt-5/5.8/qtwayland.nix
rename to pkgs/development/libraries/qt-5/5.9/qtwayland.nix
index 7b7bd2f6ebc..3e5deea7ec1 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix
@@ -8,6 +8,6 @@ qtSubmodule {
   outputs = [ "out" "dev" "bin" ];
   postInstall = ''
     moveToOutput "$qtPluginPrefix" "$bin"
-    moveToOutput "$qtQmlPrefix "$bin"
+    moveToOutput "$qtQmlPrefix" "$bin"
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
rename to pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix
diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
new file mode 100644
index 00000000000..1684e6aac70
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix
@@ -0,0 +1,113 @@
+{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel
+
+, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which
+
+, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
+, fontconfig, freetype, harfbuzz, icu, dbus
+, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus
+, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent
+, alsaLib
+, libcap
+, pciutils
+, systemd
+
+, enableProprietaryCodecs ? true
+
+, lib, stdenv # lib.optional, needsPax
+}:
+
+with stdenv.lib;
+
+qtSubmodule {
+  name = "qtwebengine";
+  qtInputs = [ qtquickcontrols qtlocation qtwebchannel ];
+  nativeBuildInputs = [
+    bison coreutils flex git gperf ninja pkgconfig python2 which
+  ];
+  doCheck = true;
+  outputs = [ "out" "dev" "bin" ];
+
+  enableParallelBuilding = true;
+
+  postPatch =
+    # Patch Chromium build tools
+    ''
+      ( cd src/3rdparty/chromium; patchShebangs . )
+    ''
+    # Patch Chromium build files
+    + ''
+      substituteInPlace ./src/3rdparty/chromium/build/common.gypi \
+        --replace /bin/echo ${coreutils}/bin/echo
+      substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \
+        --replace /bin/echo ${coreutils}/bin/echo
+      substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \
+        --replace /bin/echo ${coreutils}/bin/echo
+    ''
+    # Patch library paths in Qt sources
+    + ''
+      sed -i \
+        -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
+        -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \
+        -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \
+        src/core/web_engine_library_info.cpp
+    ''
+    # Patch library paths in Chromium sources
+    + optionalString (!stdenv.isDarwin) ''
+      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
+        src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
+
+      sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
+        src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
+    '';
+
+  preConfigure = ''
+    export MAKEFLAGS=-j$NIX_BUILD_CORES
+ '';
+
+  qmakeFlags =
+    [
+      # Use system Ninja because bootstrapping it is fragile
+      "WEBENGINE_CONFIG+=use_system_ninja"
+    ] ++ optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
+
+  propagatedBuildInputs = [
+    # Image formats
+    libjpeg libpng libtiff libwebp
+
+    # Video formats
+    srtp libvpx
+
+    # Audio formats
+    libopus
+
+    # Text rendering
+    harfbuzz icu
+  ]
+  ++ optionals (!stdenv.isDarwin) [
+    dbus zlib minizip snappy nss protobuf jsoncpp libevent
+
+    # Audio formats
+    alsaLib
+
+    # Text rendering
+    fontconfig freetype
+
+    libcap
+    pciutils
+
+    # X11 libs
+    xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
+    xlibs.libXcomposite
+  ];
+  patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
+  postInstall = ''
+    cat > $out/libexec/qt.conf <<EOF
+    [Paths]
+    Prefix = ..
+    EOF
+
+    paxmark m $out/libexec/QtWebEngineProcess
+
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
similarity index 59%
rename from pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
rename to pkgs/development/libraries/qt-5/5.9/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
index 49d4c4f042b..5e170567ce5 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
+++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
@@ -1,23 +1,25 @@
---- qtwebengine-opensource-src-5.8.0-orig/src/3rdparty/chromium/v8/src/v8.gyp	2016-03-04 01:48:36.000000000 +1100
-+++ qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/v8/src/v8.gyp	2016-05-01 19:15:44.052770543 +1000
-@@ -33,6 +33,7 @@
-     'embed_script%': "",
-     'v8_extra_library_files%': [],
+Index: qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/v8/src/v8.gyp
+===================================================================
+--- qtwebengine-opensource-src-5.9.0.orig/src/3rdparty/chromium/v8/src/v8.gyp
++++ qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/v8/src/v8.gyp
+@@ -36,6 +36,7 @@
+     'v8_experimental_extra_library_files%': [],
+     'v8_enable_inspector%': 0,
      'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
 +    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
-     'remove_v8base_debug_symbols%': 0,
+     'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)',
+     'v8_os_page_size%': 0,
    },
-   'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
-@@ -1913,7 +1914,7 @@
+@@ -2432,7 +2433,7 @@
          ]
      },
      {
 -      'target_name': 'mksnapshot',
 +      'target_name': 'mksnapshot_u',
        'type': 'executable',
-       'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'],
-       'include_dirs+': [
-@@ -1936,5 +1937,26 @@
+       'dependencies': [
+         'v8_base',
+@@ -2485,5 +2486,26 @@
          }],
        ],
      },
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebkit/default.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
rename to pkgs/development/libraries/qt-5/5.9/qtwebkit/default.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch b/pkgs/development/libraries/qt-5/5.9/qtwebkit/qtwebkit-dlopen-gtk.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch
rename to pkgs/development/libraries/qt-5/5.9/qtwebkit/qtwebkit-dlopen-gtk.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.9/qtwebkit/qtwebkit-dlopen-udev.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-udev.patch
rename to pkgs/development/libraries/qt-5/5.9/qtwebkit/qtwebkit-dlopen-udev.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-icucore-darwin.patch b/pkgs/development/libraries/qt-5/5.9/qtwebkit/qtwebkit-icucore-darwin.patch
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-icucore-darwin.patch
rename to pkgs/development/libraries/qt-5/5.9/qtwebkit/qtwebkit-icucore-darwin.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/series b/pkgs/development/libraries/qt-5/5.9/qtwebkit/series
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtwebkit/series
rename to pkgs/development/libraries/qt-5/5.9/qtwebkit/series
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
rename to pkgs/development/libraries/qt-5/5.9/qtwebsockets.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.9/qtx11extras.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtx11extras.nix
rename to pkgs/development/libraries/qt-5/5.9/qtx11extras.nix
diff --git a/pkgs/development/libraries/qt-5/5.8/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.9/qtxmlpatterns.nix
similarity index 100%
rename from pkgs/development/libraries/qt-5/5.8/qtxmlpatterns.nix
rename to pkgs/development/libraries/qt-5/5.9/qtxmlpatterns.nix
diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix
new file mode 100644
index 00000000000..021cd935a14
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix
@@ -0,0 +1,333 @@
+# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
+{ fetchurl, mirror }:
+
+{
+  qt3d = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qt3d-opensource-src-5.9.0.tar.xz";
+      sha256 = "1a8v70svsqxissj0rmna71f9g2w56w0zgk5s41m5acgvi9byzywy";
+      name = "qt3d-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtactiveqt = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtactiveqt-opensource-src-5.9.0.tar.xz";
+      sha256 = "0d8n4q3r54kkb340ap802cc97jznhffzx1m7h2775q0h2nzvmiyp";
+      name = "qtactiveqt-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtandroidextras = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtandroidextras-opensource-src-5.9.0.tar.xz";
+      sha256 = "0xq3nd8nlbmd617lq60nb2lxblc84lk8wh14n18b3q81nsvc2yln";
+      name = "qtandroidextras-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtbase = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtbase-opensource-src-5.9.0.tar.xz";
+      sha256 = "0v19spxa4sfq0a35nab9n8n2s3jd0443px0k45zhhg103apv4zi6";
+      name = "qtbase-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtcanvas3d = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtcanvas3d-opensource-src-5.9.0.tar.xz";
+      sha256 = "1jrv79rhpqyp4ip5fnf40plqcq9byl1fy8287ghq4jfhpm9bq5yq";
+      name = "qtcanvas3d-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtcharts = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtcharts-opensource-src-5.9.0.tar.xz";
+      sha256 = "17m86csjymvcnprk8m4y6hx1qhlk9811rhqwwkqdymyyswx6xs3l";
+      name = "qtcharts-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtconnectivity-opensource-src-5.9.0.tar.xz";
+      sha256 = "0k52acsywr849nw86dfjqcv1lqgnq01akqrm0qjs7ysm1ayg8mcp";
+      name = "qtconnectivity-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtdatavis3d = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdatavis3d-opensource-src-5.9.0.tar.xz";
+      sha256 = "1wvilla48jlw6zv2hc32ra0bs8p13s68sqbgr91bzbn7h7qaysv9";
+      name = "qtdatavis3d-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdeclarative-opensource-src-5.9.0.tar.xz";
+      sha256 = "1g9yz7q2laqs80m4i6zngxrq3pd7z5khr2f48glma8cmiw4p56rw";
+      name = "qtdeclarative-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtdoc-opensource-src-5.9.0.tar.xz";
+      sha256 = "1k67i67npcjyr89hlnljjxw5jkh49ql8yzw9m9b4gld7nk9dr4kr";
+      name = "qtdoc-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtgamepad = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtgamepad-opensource-src-5.9.0.tar.xz";
+      sha256 = "0lpj2qspidx6s2568m5v40j2zdnrl8zwjdp40zg4y2q6hy2gg597";
+      name = "qtgamepad-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtgraphicaleffects-opensource-src-5.9.0.tar.xz";
+      sha256 = "1cz4ykwlm1c0hbv4d8y07bwyz87nkz5l9ss3f65vadm8zcabqw55";
+      name = "qtgraphicaleffects-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtimageformats-opensource-src-5.9.0.tar.xz";
+      sha256 = "10alm3kz3md835hf5hx7322bak9pp9igi2knvymxsjqr8x87jq94";
+      name = "qtimageformats-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtlocation = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtlocation-opensource-src-5.9.0.tar.xz";
+      sha256 = "1xia1y1pjill9m880rgmsl2zshcg1nvwkyfdb2lz8g8x9fj0pvp3";
+      name = "qtlocation-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtmacextras = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtmacextras-opensource-src-5.9.0.tar.xz";
+      sha256 = "1przk4dbyjdy18a5x1c4m04v40d70nkgwc569zjccpbqz0a0agbx";
+      name = "qtmacextras-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtmultimedia-opensource-src-5.9.0.tar.xz";
+      sha256 = "1vk0vlp9wapj1pip5v0v0sxynlig38m3a1qbjhid3rm27f971cqb";
+      name = "qtmultimedia-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtnetworkauth = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtnetworkauth-opensource-src-5.9.0.tar.xz";
+      sha256 = "157byylzir8cr5y407qpjmz9ag0b0qaz99n99nl2xjxkyll8ph0g";
+      name = "qtnetworkauth-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtpurchasing = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtpurchasing-opensource-src-5.9.0.tar.xz";
+      sha256 = "0xcka24qjdydqhf7fhn2i2ycn3zsi4vzqv9s77wzmaksrazwb13q";
+      name = "qtpurchasing-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtquickcontrols = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtquickcontrols-opensource-src-5.9.0.tar.xz";
+      sha256 = "1zjl2wp5407y8iabwi30j4jpxh2j4y0ijb5jvvpdq583nbzgyg8p";
+      name = "qtquickcontrols-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtquickcontrols2 = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtquickcontrols2-opensource-src-5.9.0.tar.xz";
+      sha256 = "170xgk4jw1b1rpq8838dc5sb0dyv1jap3yfgg5hymrjzrk0nzaq9";
+      name = "qtquickcontrols2-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtremoteobjects = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtremoteobjects-opensource-src-5.9.0.tar.xz";
+      sha256 = "0f8dv7sswzck0l2md1zl44cbvi54mm6iiz4qh2hh3vqwyj9k5xyr";
+      name = "qtremoteobjects-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtscript-opensource-src-5.9.0.tar.xz";
+      sha256 = "0r697ap324l8lnbqbhrrqzsl9k4nmk6lcijxlaqn3ksxgfzbcciw";
+      name = "qtscript-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtscxml = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtscxml-opensource-src-5.9.0.tar.xz";
+      sha256 = "0f2jnhl30ij6y4wzlvgjsqgpaywq4g0wc4yjw8s888vcfl062nb4";
+      name = "qtscxml-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtsensors-opensource-src-5.9.0.tar.xz";
+      sha256 = "0jdaw0i6rirs66x4cjh8l24fsyp020x1mv1psyf3ffbkdq1pngjx";
+      name = "qtsensors-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtserialbus = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtserialbus-opensource-src-5.9.0.tar.xz";
+      sha256 = "1zw32ha5hz7zsdp8m2dk58kivxd66vkzijbnhi8jvzjp4nf0pm1f";
+      name = "qtserialbus-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtserialport-opensource-src-5.9.0.tar.xz";
+      sha256 = "0zwxfbyn5rg6vyrgpi5c3n852vd32m37ghzyj4l50ljndlz2w0l0";
+      name = "qtserialport-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtspeech = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtspeech-opensource-src-5.9.0.tar.xz";
+      sha256 = "0da7q3j49hn9j2wy0ny4ym4nxy33yi8p62v9vrq9r9lb4xqjipcl";
+      name = "qtspeech-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtsvg = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtsvg-opensource-src-5.9.0.tar.xz";
+      sha256 = "0zpy53vb0ckaj71ffl450qv9kipl8gwwcbbras8kbg6bpl8srl8g";
+      name = "qtsvg-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qttools = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qttools-opensource-src-5.9.0.tar.xz";
+      sha256 = "1vl5lapnbaam51pfw89pshh6rxqwfrbpj0j8gdhzdngr6n79dzk4";
+      name = "qttools-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qttranslations = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qttranslations-opensource-src-5.9.0.tar.xz";
+      sha256 = "0xsgvk8j7zl4infgmrkhdmjkizcihddqn9sc5g1dv2d94gc83jaw";
+      name = "qttranslations-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtvirtualkeyboard = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtvirtualkeyboard-opensource-src-5.9.0.tar.xz";
+      sha256 = "0xks7n70631p5ij7vbww5ihni6iscx9hkdw8c97nnzb1bvvaqx19";
+      name = "qtvirtualkeyboard-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtwayland = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwayland-opensource-src-5.9.0.tar.xz";
+      sha256 = "0zlxlxrc15x69jwhcc6h0xi4mfchbb3pf27y3zy22yi3ynv2p04v";
+      name = "qtwayland-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebchannel-opensource-src-5.9.0.tar.xz";
+      sha256 = "1fg1g2h9s9v6lg10ix59pzws35fyh3hh5x2005pyp84xdg47mvqj";
+      name = "qtwebchannel-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtwebengine = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebengine-opensource-src-5.9.0.tar.xz";
+      sha256 = "085qq852kwb8rqw12w96647vfvsgqvw33wc4xn3cb2gwn1wsbm1f";
+      name = "qtwebengine-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtwebkit = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz";
+      sha256 = "012fd8khiasfn8wx5ci310y94ap3y90a011f66cajm80fhxikbcd";
+      name = "qtwebkit-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtwebkit-examples = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/community_releases/5.9/5.9.0-final/qtwebkit-examples-opensource-src-5.9.0.tar.xz";
+      sha256 = "0zj700z90k4sss1b5zg4rlg5pkq79q72pql1d6zglrgp505s9a7x";
+      name = "qtwebkit-examples-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtwebsockets = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebsockets-opensource-src-5.9.0.tar.xz";
+      sha256 = "1ml60p50hr3f68l0fiyqg2pf6n37flzxafzasis42jm4m757m5v2";
+      name = "qtwebsockets-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtwebview = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwebview-opensource-src-5.9.0.tar.xz";
+      sha256 = "0ayjsdyymg9hrryn2y0c796cbwdf4hdpjdwjqkib57rblh5g39qw";
+      name = "qtwebview-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtwinextras = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtwinextras-opensource-src-5.9.0.tar.xz";
+      sha256 = "12xh6wqjn1wmvy7rzay6a0wyc31lgv1zida87kr67dbwblmax03j";
+      name = "qtwinextras-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtx11extras = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtx11extras-opensource-src-5.9.0.tar.xz";
+      sha256 = "0smzs29zqi77s1038ddkj3wzcchajqrjymwa5jgva7n2dn2x40wy";
+      name = "qtx11extras-opensource-src-5.9.0.tar.xz";
+    };
+  };
+  qtxmlpatterns = {
+    version = "5.9.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.9/5.9.0/submodules/qtxmlpatterns-opensource-src-5.9.0.tar.xz";
+      sha256 = "1f2mly7ddw4hpr3x0lpdahcikivwhiwa3238yrg4gz2c3lxj5y21";
+      name = "qtxmlpatterns-opensource-src-5.9.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 818c73495e9..22d9f994a30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9722,8 +9722,8 @@ with pkgs;
 
   libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5);
 
-  qt58 = recurseIntoAttrs (makeOverridable
-    (import ../development/libraries/qt-5/5.8) {
+  qt59 = recurseIntoAttrs (makeOverridable
+    (import ../development/libraries/qt-5/5.9) {
       inherit newScope;
       inherit stdenv fetchurl makeSetupHook makeWrapper;
       bison = bison2; # error: too few arguments to function 'int yylex(...
@@ -9735,10 +9735,10 @@ with pkgs;
       inherit (gnome3) gtk3 dconf;
     });
 
-  libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5);
+  libsForQt59 = recurseIntoAttrs (lib.makeScope qt59.newScope mkLibsForQt5);
 
-  qt5 = qt58;
-  libsForQt5 = libsForQt58;
+  qt5 = qt59;
+  libsForQt5 = libsForQt59;
 
   qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 
-- 
GitLab


From 69153f12e4706898588716d752351d0e887c789a Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Fri, 23 Jun 2017 13:33:57 +0900
Subject: [PATCH 1177/1490] networkmanager: fix arping path

---
 pkgs/tools/networking/network-manager/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 585ffe1d3b1..3ef4188052b 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
        --replace /usr/bin/ping ${inetutils}/bin/ping \
        --replace /usr/bin/ping6 ${inetutils}/bin/ping
     substituteInPlace src/devices/nm-arping-manager.c \
-       --replace '("arping", NULL, NULL);' '("arping", "${inetutils}/bin/arping", NULL);'
+       --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);'
     substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe
     substituteInPlace data/84-nm-drivers.rules \
       --replace /bin/sh ${stdenv.shell}
-- 
GitLab


From 3a68f0bb78b2653c3b9fa945864cc690270f260e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 24 Jun 2017 11:20:32 -0400
Subject: [PATCH 1178/1490] linux: 4.11.6 -> 4.11.7

---
 pkgs/os-specific/linux/kernel/common-config.nix | 5 ++++-
 pkgs/os-specific/linux/kernel/linux-4.11.nix    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ec90620fce1..c05760175cd 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -593,7 +593,10 @@ with stdenv.lib;
   FW_LOADER_USER_HELPER_FALLBACK? n
 
   # Disable various self-test modules that have no use in a production system
-  ARM_KPROBES_TEST? n
+  ${optionalString (versionOlder version "4.11") ''
+    ARM_KPROBES_TEST? n
+  ''}
+
   ASYNC_RAID6_TEST? n
   ATOMIC64_SELFTEST? n
   BACKTRACE_SELF_TEST? n
diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index 92525b115ee..f74b8f62120 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11.6";
+  version = "4.11.7";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ccna0hrqcza3jz83gaxlcg5vijl83w5w3g87v93a5x06ky9nlr5";
+    sha256 = "1v94lkc4lzb2k9c3y7j6h4zx827abcy7jqm9jlp5n15dlbmj6bsk";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From b06cb59fc1f623e21722dc34aa20108db97afaba Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 24 Jun 2017 11:22:56 -0400
Subject: [PATCH 1179/1490] linux: 4.9.33 -> 4.9.34

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 pkgs/os-specific/linux/kernel/linux-4.9.nix     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index c05760175cd..c46ee1b9331 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -593,7 +593,7 @@ with stdenv.lib;
   FW_LOADER_USER_HELPER_FALLBACK? n
 
   # Disable various self-test modules that have no use in a production system
-  ${optionalString (versionOlder version "4.11") ''
+  ${optionalString (versionOlder version "4.9") ''
     ARM_KPROBES_TEST? n
   ''}
 
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 521f53e309b..38d63a22f70 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.33";
+  version = "4.9.34";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0d2cai3bq1bkmisbsl6l27di765xmzn3lscwray30ldbssijpjpm";
+    sha256 = "0ij55aqdhqf92a79n9xqw0p32bsksw4zxpn2zhcylhgsn78mkl8k";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From 6bb5e991abe012fb401936daf800df869f16e29b Mon Sep 17 00:00:00 2001
From: Hector Jusforgues <hector.jusforgues@gmail.com>
Date: Sat, 24 Jun 2017 17:25:19 +0200
Subject: [PATCH 1180/1490] perl-packages: fix typo in comment (#26819)

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5d8ae3ddc1d..fe6e513dec9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3,7 +3,7 @@
    them.  Also, because most Nix expressions for CPAN packages are
    trivial, most are actually defined here.  I.e. there's no function
    for each package in a separate file: the call to the function would
-   be almost as must code as the function itself. */
+   be almost as much code as the function itself. */
 
 {pkgs, overrides}:
 
-- 
GitLab


From 1be7323f5a14acf9c3be258af36cd00bb07677b1 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sat, 24 Jun 2017 08:24:33 -0700
Subject: [PATCH 1181/1490] hugo: 0.24 -> 0.24.1

---
 pkgs/applications/misc/hugo/default.nix | 4 ++--
 pkgs/applications/misc/hugo/deps.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 80e3eb072da..595c58db992 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.24";
+  version = "0.24.1";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "gohugoio";
     repo = "hugo";
     rev = "v${version}";
-    sha256 = "1q398afrkmg480c2an9pyhqkbi9iw266q4svwqrvm408gzjprdzp";
+    sha256 = "0zphxi11rny6wh1ysz7508fdrsbxj3n138q2bkkqaz0rrdab710a";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index d24fcaf70f2..4a3f4ff15cb 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/BurntSushi/toml";
-      rev = "b26d9c308763d68093482582cea63d69be07a0f0";
-      sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry";
+      rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab";
+      sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg";
     };
   }
   {
-- 
GitLab


From 85b9ff29e998f3462dd053c27f147de35779e1f1 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 23 Jun 2017 05:47:46 +0000
Subject: [PATCH 1182/1490] rrdtool: apply upstream patch to fix file
 permission

fixes #26780 #26782
---
 pkgs/tools/misc/rrdtool/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 6d961c69b13..ee5c37ef6bb 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff
+{ fetchurl, fetchpatch, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff
 , tcl-8_5, darwin }:
 
 stdenv.mkDerivation rec {
@@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr";
   };
 
+  patches = [
+    # fix regression https://github.com/oetiker/rrdtool-1.x/issues/794
+    (fetchpatch {
+      url = "https://github.com/oetiker/rrdtool-1.x/compare/0f28f99...f1edd12.patch";
+      sha256 = "10g56zy0rdjpv3kvvmf6vvaysmla05wi8byy3l0xrz2x8m02ylqq";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ gettext perl libxml2 pango cairo groff ]
-- 
GitLab


From 5d7fd7e7fa2a488d6df92da30933c27aad7530b6 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <disasm@gmail.com>
Date: Sat, 24 Jun 2017 12:05:34 -0400
Subject: [PATCH 1183/1490] mailhog: init at 1.0.0 (#26821)

* mailhog: init at 1.0.0

* formatting nitpicks
---
 lib/maintainers.nix                     |   1 +
 nixos/modules/module-list.nix           |   1 +
 nixos/modules/services/mail/mailhog.nix |  43 ++++++
 pkgs/servers/mail/mailhog/default.nix   |  25 ++++
 pkgs/servers/mail/mailhog/deps.nix      | 191 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |   2 +
 6 files changed, 263 insertions(+)
 create mode 100644 nixos/modules/services/mail/mailhog.nix
 create mode 100644 pkgs/servers/mail/mailhog/default.nix
 create mode 100644 pkgs/servers/mail/mailhog/deps.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e0b0d89c016..c4eed05f41c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -141,6 +141,7 @@
   dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>";
   dgonyeo = "Derek Gonyeo <derek@gonyeo.com>";
   dipinhora = "Dipin Hora <dipinhora+github@gmail.com>";
+  disassembler = "Samuel Leathers <disasm@gmail.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   DmitryTsygankov = "Dmitry Tsygankov <dmitry.tsygankov@gmail.com>";
   dmjio = "David Johnson <djohnson.m@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7f94d6569e9..07be6555b23 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -252,6 +252,7 @@
   ./services/mail/exim.nix
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
+  ./services/mail/mailhog.nix
   ./services/mail/mlmmj.nix
   ./services/mail/offlineimap.nix
   ./services/mail/opendkim.nix
diff --git a/nixos/modules/services/mail/mailhog.nix b/nixos/modules/services/mail/mailhog.nix
new file mode 100644
index 00000000000..206fb50d31a
--- /dev/null
+++ b/nixos/modules/services/mail/mailhog.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.mailhog;
+in {
+  ###### interface
+
+  options = {
+
+    services.mailhog = {
+      enable = mkEnableOption "MailHog";
+      user = mkOption {
+        type = types.str;
+        default = "mailhog";
+        description = "User account under which mailhog runs.";
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.mailhog = {
+      name = cfg.user;
+      description = "MailHog service user";
+    };
+
+    systemd.services.mailhog = {
+      description = "MailHog service";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.mailhog}/bin/MailHog";
+        User = cfg.user;
+      };
+    };
+  };
+}
diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix
new file mode 100644
index 00000000000..554634d5a79
--- /dev/null
+++ b/pkgs/servers/mail/mailhog/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "MailHog-${version}";
+  version = "1.0.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/mailhog/MailHog";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "mailhog";
+    repo = "MailHog";
+    sha256 = "0r6zidkffb8q12zyxd063jy0ig2x93llna4zb5i2qjh9gb971i83";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Web and API based SMTP testing";
+    homepage = "https://github.com/mailhog/MailHog";
+    maintainers = with maintainers; [ disassembler ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/servers/mail/mailhog/deps.nix b/pkgs/servers/mail/mailhog/deps.nix
new file mode 100644
index 00000000000..9967c3a549a
--- /dev/null
+++ b/pkgs/servers/mail/mailhog/deps.nix
@@ -0,0 +1,191 @@
+[
+  {
+    goPackagePath = "github.com/gorilla/pat";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/pat";
+      rev = "cf955c3d1f2c27ee96f93e9738085c762ff5f49d";
+      sha256 = "1jnhdhba3cwgsgv6qf7shvmk2nbbp8z30n9cimz9w6vd940ipisf";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/context";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/context";
+      rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a";
+      sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/mux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/mux";
+      rev = "bcd8bc72b08df0f70df986b97f95590779502d31";
+      sha256 = "0majd18zn8v1b1agn015vnk3xk2v8j5nyckczlf72gm3kaq3icga";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "3ab3a8b8831546bd18fd182c20687ca853b2bb13";
+      sha256 = "17y94ngp1yrswq5pxxy97naiw6jgxz2yvm8zydi83gfixdgs99fc";
+    };
+  }
+  {
+    goPackagePath = "github.com/ian-kent/go-log";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ian-kent/go-log";
+      rev = "5731446c36ab9f716106ce0731f484c50fdf1ad1";
+      sha256 = "1qr0myg68r9zq43fnx0rbnxcny2jpyg3gc269pc2riskqk0a731d";
+    };
+  }
+  {
+    goPackagePath = "github.com/ian-kent/envconf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ian-kent/envconf";
+      rev = "c19809918c02ab33dc8635d68c77649313185275";
+      sha256 = "1085863rnx4h0q9xvg4zlsc7xf7jngfmjrq83cpcv1ayi664mzdx";
+    };
+  }
+  {
+    goPackagePath = "github.com/ian-kent/goose";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ian-kent/goose";
+      rev = "c3541ea826ad9e0f8a4a8c15ca831e8b0adde58c";
+      sha256 = "0v98d2554vlrm8mzk2zx8wj3daq076273w0zs8ww1aa57a1l74qv";
+    };
+  }
+  {
+    goPackagePath = "github.com/ian-kent/linkio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ian-kent/linkio";
+      rev = "77fb4b01842cb4b019137c0227df9a8f9779d0bd";
+      sha256 = "0fixidplxzmw7aakw19d64nvrykwm5xk55fj1q74n70s8j5d8hiq";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailhog/MailHog-Server";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailhog/MailHog-Server";
+      rev = "50f74a1aa2991b96313144d1ac718ce4d6739dfd";
+      sha256 = "1h0qs66bvgygpq0sz3w6y445vm3pvlrljr5x7xr13y0087mrpjla";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailhog/MailHog-UI";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailhog/MailHog-UI";
+      rev = "24b31a47cc5b65d23576bb9884c941d2b88381f7";
+      sha256 = "0309jmryhx3n0yksssk2j4xkh1xb01468i5f2sy3a83xkz9p3d54";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailhog/http";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailhog/http";
+      rev = "2e653938bf190d0e2fbe4825ce74e5bc149a62f2";
+      sha256 = "18j03lvyis7z0mv3fym3j9a7pi2qvnhggmhpxnjbwvwb86dhxjm8";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailhog/mhsendmail";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailhog/mhsendmail";
+      rev = "002527025ef50364446d7560600aedc5daaa1997";
+      sha256 = "11l2y0xb7hwk0zs7pwif3xkclhz32sc0jff3jkaxi3jdf3q3kz91";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailhog/data";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailhog/data";
+      rev = "024d554958b5bea5db220bfd84922a584d878ded";
+      sha256 = "0dgh0pcsn0xrxsn1qlxgdssaimch57kxj5vyvhqjnsdnh814g9vf";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailhog/smtp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailhog/smtp";
+      rev = "0c4e9b7e0625fec61d0c30d7b2f6c62852be6c54";
+      sha256 = "1w46w3asdxsgzyall16hi2s4jvkka1k3a1l52ryfhrzg187krir6";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailhog/storage";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailhog/storage";
+      rev = "6d871fb23ecd873cb10cdfc3a8dec5f50d2af8fa";
+      sha256 = "1ya0xigm2xysin59zlp2sbqncnmw9h77r9dn9k7vxhf0z8vvbibk";
+    };
+  }
+  {
+    goPackagePath = "github.com/ogier/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ogier/pflag";
+      rev = "32a05c62658bd1d7c7e75cbc8195de5d585fde0f";
+      sha256 = "1lyrr9wx0j087mnpsxcbspjcgh9a5c6bqwrasd8s237jlyc50qmj";
+    };
+  }
+  {
+    goPackagePath = "github.com/tinylib/msgp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tinylib/msgp";
+      rev = "02d047e07459c5a7b02b1244161d0f2f6d8f660d";
+      sha256 = "12y7qz1x266m0a0w3zwd49achxbh036yhkmx93xfs2283xh70q1r";
+    };
+  }
+  {
+    goPackagePath = "github.com/philhofer/fwd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/philhofer/fwd";
+      rev = "1612a298117663d7bc9a760ae20d383413859798";
+      sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl";
+    };
+  }
+  {
+    goPackagePath = "github.com/t-k/fluent-logger-golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/t-k/fluent-logger-golang";
+      rev = "0f8ec08f2057a61574b6943e75045fffbeae894e";
+      sha256 = "0ic5bj87wpq1kncixd5mklwqn1jjwqfqfvkyl0mrnwp3p5p24v5c";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6";
+      sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/mgo.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/mgo.v2";
+      rev = "d90005c5262a3463800497ea5a89aed5fe22c886";
+      sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff4a86293d3..903cee5afe5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2994,6 +2994,8 @@ with pkgs;
 
   maildrop = callPackage ../tools/networking/maildrop { };
 
+  mailhog = callPackage ../servers/mail/mailhog {};
+
   mailnag = callPackage ../applications/networking/mailreaders/mailnag { };
 
   mailsend = callPackage ../tools/networking/mailsend { };
-- 
GitLab


From c0cdf58807f11bf112e8ebbbf2e1088caf6de5f2 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 24 Jun 2017 16:06:05 +0200
Subject: [PATCH 1184/1490] plex: fix preStart permissions

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

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index ecd9a6f52da..e37b486375b 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -82,7 +82,7 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''
-        test -d "${cfg.dataDir}" || {
+        test -d "${cfg.dataDir}/Plex Media Server" || {
           echo "Creating initial Plex data directory in \"${cfg.dataDir}\"."
           mkdir -p "${cfg.dataDir}/Plex Media Server"
           chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}"
-- 
GitLab


From 09c1768afdfe49d8916ce616dd553c5434b54b78 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 24 Jun 2017 19:00:30 +0200
Subject: [PATCH 1185/1490] plex: 1.5.5 -> 1.5.7

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 618bc17d0a7..a1d5ce4147f 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.5.5.3634";
-    vsnHash = "995f1dead";
-    sha256 = "0zk2zv7r4mf582gfbv4ahxzl8pbspzkf3514qmqhhx2z4grng49h";
+    version = "1.5.7.4016";
+    vsnHash = "25d94bad9";
+    sha256 = "0lc1shlyg7rvzfpjm9kww7rva33b3bip2bms64a4d5nb3lj4wilh";
   };
 
 in stdenv.mkDerivation rec {
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
     homepage = http://plex.tv/;
     license = licenses.unfree;
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones ];
+    maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones lnl7 ];
     description = "Media / DLNA server";
     longDescription = ''
       Plex is a media server which allows you to store your media and play it
-- 
GitLab


From ada12f46dc3ca9b57e896831d1052e7a49d311f5 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 23 Jun 2017 12:48:42 -0400
Subject: [PATCH 1186/1490] root: 6.09.02 -> 6.10.00

also workaround #26197
---
 .../science/misc/root/ROOT-8728-extra.patch   | 25 -------------------
 .../science/misc/root/default.nix             | 12 ++++-----
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch
index ec8c160c6f3..a396a848f14 100644
--- a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch
+++ b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch
@@ -1,16 +1,3 @@
-diff --git a/core/base/inc/ROOT/StringConv.hxx b/core/base/inc/ROOT/StringConv.hxx
-index 629fc18..4efa54a 100644
---- a/core/base/inc/ROOT/StringConv.hxx
-+++ b/core/base/inc/ROOT/StringConv.hxx
-@@ -89,7 +89,7 @@ EFromHumanReadableSize FromHumanReadableSize(std::string_view str, T &value)
-       size_t size = str.size();
-       size_t cur;
-       // Parse leading numeric factor
--      const double coeff = stod(str, &cur);
-+      const double coeff = stod(static_cast<std::string>(str), &cur);
- 
-       // Skip any intermediate white space
-       while (cur<size && isspace(str[cur])) ++cur;
 diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
 index d71cb74..076facb 100644
 --- a/core/metacling/src/TCling.cxx
@@ -186,15 +173,3 @@ index 94a8b28..0b67867 100644
                                                        DataInfo(), "" );
  
     MethodBase *method = (dynamic_cast<MethodBase*>(im));
-diff -aru a/core/base/inc/TString.h b/core/base/inc/TString.h
---- a/core/base/inc/TString.h
-+++ b/core/base/inc/TString.h
-@@ -106,7 +106,7 @@
-    char          operator[](Ssiz_t i) const;     // Index with bounds checking
- 
-    operator std::string_view() const { return std::string_view(Data(),fExtent); }
--   operator std::string() const { return std::string_view(Data(),fExtent).to_string(); }
-+   operator std::string() const { return static_cast<std::string>(std::string_view(Data(),fExtent)); }
- 
-    const char   *Data() const;
-    Ssiz_t        Length() const          { return fExtent; }
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 726f6352c95..8916a9fd167 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "root-${version}";
-  version = "6.09.02";
+  version = "6.10.00";
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    sha256 = "0fc6b0l7bw66cyckxs4ikvyzcv1zlfx88205jx153smdhih0jj2k";
+    sha256 = "1rxqcpqf1b3sxig5xbh3mkvarhg9lgj2f0gv0j48klfw8kgfwlsp";
   };
 
   buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ]
@@ -23,10 +23,6 @@ stdenv.mkDerivation rec {
     ./thisroot.patch
 
     # https://sft.its.cern.ch/jira/browse/ROOT-8728
-    (fetchpatch {
-      url = "https://sft.its.cern.ch/jira/secure/attachment/20025/0001-std-string_view-has-no-more-to_string.patch";
-      sha256 = "0ngyk960xfrcsj4vhr1ax8h85fx0g1cfycxi3k35a6ych2zmyg8q";
-    })
     ./ROOT-8728-extra.patch
   ];
 
@@ -47,6 +43,7 @@ stdenv.mkDerivation rec {
     "-Dfftw3=OFF"
     "-Dfitsio=OFF"
     "-Dfortran=OFF"
+    "-Dimt=OFF"
     "-Dgfal=OFF"
     "-Dgviz=OFF"
     "-Dhdfs=OFF"
@@ -66,7 +63,8 @@ stdenv.mkDerivation rec {
     "-Dxml=ON"
     "-Dxrootd=OFF"
   ]
-  ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include";
+  ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include"
+  ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks";
 
   enableParallelBuilding = true;
 
-- 
GitLab


From 267ea506043a5645fea9e7c8cef6cdd43bd32991 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 24 Jun 2017 20:35:21 +0200
Subject: [PATCH 1187/1490] bitlbee-facebook: 1.1.0 -> 1.1.1

---
 .../instant-messengers/bitlbee-facebook/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index 5645e1cebaa..14a0a54feda 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "bitlbee-facebook-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "jgeboski";
     repo = "bitlbee-facebook";
-    sha256 = "0qclyc2zz8144dc42bhfv2xxrahpiv9j2iwq9h3cmfxszvkb8r3s";
+    sha256 = "08ibjqqcrmq1a5nmj8z93rjrdabi0yy2a70p31xalnfrh200m24c";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
-- 
GitLab


From 03aed4cfcf553df9ca466607980b7a7443dd03a3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 24 Jun 2017 14:50:41 -0400
Subject: [PATCH 1188/1490] linux-copperhead: 4.11.6.d -> 4.11.7.a

---
 pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 0cc73849941..36a01921512 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.11.6";
-  revision = "d";
-  sha256 = "1wpfvcbcs93gx8v87h2z7l2dzbyl9vlcqxpfz8y65achhjj7kqlg";
+  version = "4.11.7";
+  revision = "a";
+  sha256 = "0gvg0gnhl2hi0zw705zh1a8wrwm9831jmw5llr1miq6av7hgxw7n";
 in
 
 import ./generic.nix (args // {
-- 
GitLab


From 9929e83607ddf6f71a54281955a34ad7505c3a75 Mon Sep 17 00:00:00 2001
From: Kai <kai.harries@gmail.com>
Date: Sat, 24 Jun 2017 21:33:34 +0200
Subject: [PATCH 1189/1490] systemd-boot-builder.py: add support for profiles
 (#26318)

* systemd-boot-builder.py: add support for profiles

This will also list the generations of other profiles than `system` in
the boot menu. See the documentation of the `--profile-name` option of
nixos-rebuild for more information on profiles.

* Fix errors introduced by previous commit
---
 .../systemd-boot/systemd-boot-builder.py      | 85 ++++++++++++-------
 1 file changed, 55 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index cb2a17f18f4..779005c0df5 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -11,35 +11,42 @@ import errno
 import warnings
 import ctypes
 libc = ctypes.CDLL("libc.so.6")
+import re
 
 def copy_if_not_exists(source, dest):
     if not os.path.exists(dest):
         shutil.copyfile(source, dest)
 
-def system_dir(generation):
-    return "/nix/var/nix/profiles/system-%d-link" % (generation)
+def system_dir(profile, generation):
+    if profile:
+        return "/nix/var/nix/profiles/system-profiles/%s-%d-link" % (profile, generation)
+    else:
+        return "/nix/var/nix/profiles/system-%d-link" % (generation)
 
-BOOT_ENTRY = """title NixOS
+BOOT_ENTRY = """title NixOS{profile}
 version Generation {generation}
 linux {kernel}
 initrd {initrd}
 options {kernel_params}
 """
 
-def write_loader_conf(generation):
+def write_loader_conf(profile, generation):
     with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f:
         if "@timeout@" != "":
             f.write("timeout @timeout@\n")
-        f.write("default nixos-generation-%d\n" % generation)
+        if profile:
+            f.write("default nixos-%s-generation-%d\n" % (profile, generation))
+        else:
+            f.write("default nixos-generation-%d\n" % (generation))
         if not @editor@:
             f.write("editor 0");
     os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")
 
-def profile_path(generation, name):
-    return os.readlink("%s/%s" % (system_dir(generation), name))
+def profile_path(profile, generation, name):
+    return os.readlink("%s/%s" % (system_dir(profile, generation), name))
 
-def copy_from_profile(generation, name, dry_run=False):
-    store_file_path = profile_path(generation, name)
+def copy_from_profile(profile, generation, name, dry_run=False):
+    store_file_path = profile_path(profile, generation, name)
     suffix = os.path.basename(store_file_path)
     store_dir = os.path.basename(os.path.dirname(store_file_path))
     efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix)
@@ -47,22 +54,26 @@ def copy_from_profile(generation, name, dry_run=False):
         copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
     return efi_file_path
 
-def write_entry(generation, machine_id):
-    kernel = copy_from_profile(generation, "kernel")
-    initrd = copy_from_profile(generation, "initrd")
+def write_entry(profile, generation, machine_id):
+    kernel = copy_from_profile(profile, generation, "kernel")
+    initrd = copy_from_profile(profile, generation, "initrd")
     try:
-        append_initrd_secrets = profile_path(generation, "append-initrd-secrets")
+        append_initrd_secrets = profile_path(profile, generation, "append-initrd-secrets")
         subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)])
     except FileNotFoundError:
         pass
-    entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation)
-    generation_dir = os.readlink(system_dir(generation))
+    if profile:
+        entry_file = "@efiSysMountPoint@/loader/entries/nixos-%s-generation-%d.conf" % (profile, generation)
+    else:
+        entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation)
+    generation_dir = os.readlink(system_dir(profile, generation))
     tmp_path = "%s.tmp" % (entry_file)
     kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir)
     with open("%s/kernel-params" % (generation_dir)) as params_file:
         kernel_params = kernel_params + params_file.read()
     with open(tmp_path, 'w') as f:
-        f.write(BOOT_ENTRY.format(generation=generation,
+        f.write(BOOT_ENTRY.format(profile=" [" + profile + "]" if profile else "",
+                    generation=generation,
                     kernel=kernel,
                     initrd=initrd,
                     kernel_params=kernel_params))
@@ -77,29 +88,33 @@ def mkdir_p(path):
         if e.errno != errno.EEXIST or not os.path.isdir(path):
             raise
 
-def get_generations(profile):
+def get_generations(profile=None):
     gen_list = subprocess.check_output([
         "@nix@/bin/nix-env",
         "--list-generations",
         "-p",
-        "/nix/var/nix/profiles/%s" % (profile),
+        "/nix/var/nix/profiles/%s" % ("system-profiles/" + profile if profile else "system"),
         "--option", "build-users-group", ""],
         universal_newlines=True)
     gen_lines = gen_list.split('\n')
     gen_lines.pop()
-    return [ int(line.split()[0]) for line in gen_lines ]
+    return [ (profile, int(line.split()[0])) for line in gen_lines ]
 
 def remove_old_entries(gens):
-    slice_start = len("@efiSysMountPoint@/loader/entries/nixos-generation-")
-    slice_end = -1 * len(".conf")
+    rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$")
+    rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-(.*)\.conf$")
     known_paths = []
     for gen in gens:
-        known_paths.append(copy_from_profile(gen, "kernel", True))
-        known_paths.append(copy_from_profile(gen, "initrd", True))
-    for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos-generation-[1-9]*.conf"):
+        known_paths.append(copy_from_profile(*gen, "kernel", True))
+        known_paths.append(copy_from_profile(*gen, "initrd", True))
+    for path in glob.iglob("@efiSysMountPoint@/loader/entries/nixos*-generation-[1-9]*.conf"):
         try:
-            gen = int(path[slice_start:slice_end])
-            if not gen in gens:
+            if rex_profile.match(path):
+                prof = rex_profile.sub(r"\1", path)
+            else:
+                prof = "system"
+            gen = int(rex_generation.sub(r"\1", path))
+            if not (prof, gen) in gens:
                 os.unlink(path)
         except ValueError:
             pass
@@ -107,6 +122,14 @@ def remove_old_entries(gens):
         if not path in known_paths:
             os.unlink(path)
 
+def get_profiles():
+    if os.path.isdir("/nix/var/nix/profiles/system-profiles/"):
+        return [x
+            for x in os.listdir("/nix/var/nix/profiles/system-profiles/")
+            if not x.endswith("-link")]
+    else:
+        return []
+
 def main():
     parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files')
     parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot')
@@ -141,12 +164,14 @@ def main():
     mkdir_p("@efiSysMountPoint@/efi/nixos")
     mkdir_p("@efiSysMountPoint@/loader/entries")
 
-    gens = get_generations("system")
+    gens = get_generations()
+    for profile in get_profiles():
+        gens += get_generations(profile)
     remove_old_entries(gens)
     for gen in gens:
-        write_entry(gen, machine_id)
-        if os.readlink(system_dir(gen)) == args.default_config:
-            write_loader_conf(gen)
+        write_entry(*gen, machine_id)
+        if os.readlink(system_dir(*gen)) == args.default_config:
+            write_loader_conf(*gen)
 
     # Since fat32 provides little recovery facilities after a crash,
     # it can leave the system in an unbootable state, when a crash/outage
-- 
GitLab


From 2c6fbc737f84186f4bce5458e820dcff393da4f0 Mon Sep 17 00:00:00 2001
From: Der Pfirsich <gregor.michels@web.de>
Date: Sat, 24 Jun 2017 21:41:05 +0200
Subject: [PATCH 1190/1490] spotify: 1.0.55.487.g256699aa-16 ->
 1.0.57.474.gca9c9538-30 (#26794)

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index e5dbf0aab84..266e221649e 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -8,7 +8,7 @@ let
   # Please update the stable branch!
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
-  version = "1.0.55.487.g256699aa-16";
+  version = "1.0.57.474.gca9c9538-30";
 
   deps = [
     alsaLib
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-    sha256 = "09rhm0jp5prcvyf8zpw4pl422yiy8nkazcjc3lv61ngpznk3n1r0";
+    sha256 = "fe46f2084c45c756bee366f744d2821d79e82866b19942e30bb2a20c1e597437";
   };
 
   buildInputs = [ dpkg makeWrapper ];
-- 
GitLab


From 69438a397ffce9ad999cb05c451c14e55b9ebc90 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 24 Jun 2017 15:18:58 -0500
Subject: [PATCH 1191/1490] khotkeys: fix intermittant parallel build failure

---
 pkgs/desktops/plasma-5/khotkeys.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index abfb85a867c..c54d5486ee9 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -13,4 +13,5 @@ mkDerivation {
     plasma-framework plasma-workspace qtx11extras
   ];
   outputs = [ "out" "dev" "bin" ];
+  enableParallelBuild = false;
 }
-- 
GitLab


From 6916f24e84ea4233f671ebc75de0ba10187c86b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 24 Jun 2017 22:22:48 +0200
Subject: [PATCH 1192/1490] treewide: enableParallelBuild ->
 enableParallelBuilding

---
 pkgs/desktops/plasma-5/khotkeys.nix                | 2 +-
 pkgs/development/libraries/qt-5/5.9/qtlocation.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index c54d5486ee9..77f1002c08a 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -13,5 +13,5 @@ mkDerivation {
     plasma-framework plasma-workspace qtx11extras
   ];
   outputs = [ "out" "dev" "bin" ];
-  enableParallelBuild = false;
+  enableParallelBuilding = false;
 }
diff --git a/pkgs/development/libraries/qt-5/5.9/qtlocation.nix b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix
index 24f0b648723..6270bc577cf 100644
--- a/pkgs/development/libraries/qt-5/5.9/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix
@@ -9,5 +9,5 @@ qtSubmodule {
     moveToOutput "$qtQmlPrefix" "$bin"
   '';
   # Linking with -lclipper fails with parallel build enabled
-  enableParallelBuild = false;
+  enableParallelBuilding = false;
 }
-- 
GitLab


From 378c5e7689b517ae56dcf85aa45ba56cd26c8143 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 11 Jun 2017 14:04:42 +0200
Subject: [PATCH 1193/1490] maintainers: add rvolosatovs

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c4eed05f41c..328a5d772db 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -479,6 +479,7 @@
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
   rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>";
   rvlander = "Gaëtan André <rvlander@gaetanandre.eu>";
+  rvolosatovs = "Roman Volosatovs <rvolosatovs@riseup.net";
   ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>";
   ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>";
   ryantm = "Ryan Mulligan <ryan@ryantm.com>";
-- 
GitLab


From 90f85a2de5504bdd0a5f6c02ecb7f2989fc066e8 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 11 Jun 2017 14:01:37 +0200
Subject: [PATCH 1194/1490] pythonPackages.uritools: init at 2.0.0

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

diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix
new file mode 100644
index 00000000000..d680c29e224
--- /dev/null
+++ b/pkgs/development/python-modules/uritools/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, ipaddress }:
+
+buildPythonPackage rec {
+  pname = "uritools";
+  name = "uritools-${version}";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "20d7881a947cd3c3bb452e2b541f44acc52febe9c4e3f6d05c55d559fb208c50";
+  };
+
+  propagatedBuildInputs = [ ipaddress ];
+
+  meta = with stdenv.lib; {
+    description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse";
+    license = licenses.mit;
+    maintainers = [ maintainers.rvolosatovs ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 427fac20e41..103b584e410 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30444,6 +30444,8 @@ EOF
 
   gensim = callPackage  ../development/python-modules/gensim { };
 
+  uritools = callPackage ../development/python-modules/uritools { };
+
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From a59dc61e106fe9e8e528c837887178dbfe37daf5 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 11 Jun 2017 14:04:42 +0200
Subject: [PATCH 1195/1490] maintainers: add rvolosatovs

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c4eed05f41c..328a5d772db 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -479,6 +479,7 @@
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
   rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>";
   rvlander = "Gaëtan André <rvlander@gaetanandre.eu>";
+  rvolosatovs = "Roman Volosatovs <rvolosatovs@riseup.net";
   ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>";
   ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>";
   ryantm = "Ryan Mulligan <ryan@ryantm.com>";
-- 
GitLab


From ca69972f9ac4ef59798700ff5997135a4c159869 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 11 Jun 2017 14:01:10 +0200
Subject: [PATCH 1196/1490] pythonPackages.spotipy: init at 2.4.4

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

diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
new file mode 100644
index 00000000000..5c51b844151
--- /dev/null
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests2 }:
+
+buildPythonPackage rec {
+  pname = "spotipy";
+  name = "spotipy-${version}";
+  version = "2.4.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1l8ya0cln936x0mx2j5ngl1xwpc0r89hs3wcvb8x8paw3d4dl1ab";
+  };
+
+  propagatedBuildInputs = [ requests2 ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://spotipy.readthedocs.org/";
+    description = "A light weight Python library for the Spotify Web API";
+    license = licenses.mit;
+    maintainers = [ maintainers.rvolosatovs ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 427fac20e41..0cbcba33981 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30444,6 +30444,8 @@ EOF
 
   gensim = callPackage  ../development/python-modules/gensim { };
 
+  spotipy = callPackage ../development/python-modules/spotipy { };
+
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 4abb292f7558027f3741565b0da8262ec90f39b3 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sat, 24 Jun 2017 23:58:36 +0200
Subject: [PATCH 1197/1490] pythonPackages.spotipy: requests2 -> requests

Seems like this breaks build of #26518
---
 pkgs/development/python-modules/spotipy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
index 5c51b844151..326975e7155 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests2 }:
+{ stdenv, buildPythonPackage, fetchPypi, requests }:
 
 buildPythonPackage rec {
   pname = "spotipy";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "1l8ya0cln936x0mx2j5ngl1xwpc0r89hs3wcvb8x8paw3d4dl1ab";
   };
 
-  propagatedBuildInputs = [ requests2 ];
+  propagatedBuildInputs = [ requests ];
 
   meta = with stdenv.lib; {
     homepage = "http://spotipy.readthedocs.org/";
-- 
GitLab


From 33e4afa172cd48ec1928646d211c2a9f879f9bf2 Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Sun, 25 Jun 2017 01:08:00 +0300
Subject: [PATCH 1198/1490] tiled: 0.18.2 -> 1.0.1

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

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 9bfa3998926..7e8a85cf48a 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -5,13 +5,13 @@ let
 #  qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
 in stdenv.mkDerivation rec {
   name = "tiled-${version}";
-  version = "0.18.2";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "bjorn";
     repo = "tiled";
     rev = "v${version}";
-    sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2";
+    sha256 = "062ja3j84v5s4qslp01gqif8c6i1klkkxpxyyrrvjhxmbyn6nmgd";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
-- 
GitLab


From 4ebaed854f9b112d772050ce58dafc39fddff818 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 11 Jun 2017 14:02:02 +0200
Subject: [PATCH 1199/1490] mopidy-local-images: init at 1.0.0

---
 .../audio/mopidy-local-images/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/audio/mopidy-local-images/default.nix

diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix
new file mode 100644
index 00000000000..e9538273568
--- /dev/null
+++ b/pkgs/applications/audio/mopidy-local-images/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "mopidy-local-images-${version}";
+
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "mopidy";
+    repo = "mopidy-local-images";
+    rev = "v${version}";
+    sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d";
+  };
+
+  propagatedBuildInputs = [
+    mopidy
+    pythonPackages.pykka
+    pythonPackages.uritools
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mopidy/mopidy-local-images";
+    description = "Mopidy local library proxy extension for handling embedded album art";
+    license = licenses.asl20;
+    maintainers = [ maintainers.rvolosatovs ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31fc83d4516..38b18997c5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14986,6 +14986,8 @@ with pkgs;
 
   mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { };
 
+  mopidy-local-images = callPackage ../applications/audio/mopidy-local-images { };
+
   mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { };
 
   mopidy-moped = callPackage ../applications/audio/mopidy-moped { };
-- 
GitLab


From 649a036dccfd2f23179582c3b995046833bd0b26 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 24 Jun 2017 23:14:57 +0000
Subject: [PATCH 1200/1490] nailgun: init at 0.9.1

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

diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix
new file mode 100644
index 00000000000..ec19606eea9
--- /dev/null
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre }:
+
+let
+  version = "0.9.1";
+  nailgun-server = fetchMavenArtifact {
+    groupId = "com.martiansoftware";
+    artifactId = "nailgun-server";
+    inherit version;
+    sha256 = "09ggkkd1s58jmpc74s6m10d3hyf6bmif31advk66zljbpykgl625";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "nailgun-${version}";
+
+  src = fetchFromGitHub {
+    owner = "martylamb";
+    repo = "nailgun";
+    rev = "1ad9ad9d2d17c895144a9ee0e7acb1d3d90fb66f";
+    sha256 = "1f8ac5kg7imhix9kqdzwiav1bxh8vljv2hb1mq8yz4rqsrx2r4w3";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  installPhase = ''
+    install -D ng $out/bin/ng
+    install -D ${nailgun-server.jar} $out/share/java/nailgun-server-${version}.jar
+
+    cat > $out/bin/ng-server << EOF
+    #!${bash}/bin/bash
+
+    ${jre}/bin/java -cp $out/share/java/nailgun-server-${version}.jar:\$CLASSPATH com.martiansoftware.nailgun.NGServer "\$@"
+    EOF
+    chmod +x $out/bin/ng-server
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead";
+    homepage = http://martiansoftware.com/nailgun/;
+    license = licenses.apsl20;
+    platforms = platforms.linux;
+    maintainer = with maintainers; [ volth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31fc83d4516..c809a10b457 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6931,6 +6931,8 @@ with pkgs;
     };
   };
 
+  nailgun = callPackage ../development/tools/nailgun { };
+
   nant = callPackage ../development/tools/build-managers/nant { };
 
   ninja = callPackage ../development/tools/build-managers/ninja { };
-- 
GitLab


From 60e19e7393d9978bfafd4b981a35cb48d22d3c52 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sat, 24 Jun 2017 03:05:20 +0000
Subject: [PATCH 1201/1490] plv8: init at 2.0.3

---
 pkgs/servers/sql/postgresql/plv8/default.nix | 34 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/servers/sql/postgresql/plv8/default.nix

diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/plv8/default.nix
new file mode 100644
index 00000000000..15863373562
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/plv8/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, v8, perl, postgresql }:
+
+stdenv.mkDerivation rec {
+  name = "plv8-${version}";
+  version = "2.0.3";
+
+  nativeBuildInputs = [ perl ];
+  buildInputs = [ v8 postgresql ];
+
+  src = fetchFromGitHub {
+    owner = "plv8";
+    repo = "plv8";
+    rev = "v${version}";
+    sha256 = "0cn7ynckmdb08dkzjilvc55xz61d1jiya7yrnphizw404j84y3qc";
+  };
+
+  preConfigure = ''
+    substituteInPlace Makefile --replace '-lv8_libplatform' '-lv8_libplatform -lv8_libbase'
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D plv8.so                                         -t $out/lib
+    install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "PL/v8 - A Procedural Language in JavaScript powered by V8";
+    homepage = https://pgxn.org/dist/plv8/;
+    maintainers = with maintainers; [ volth ];
+    platforms = platforms.linux;
+    license = licenses.postgresql;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31fc83d4516..8be72bc6724 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9588,6 +9588,8 @@ with pkgs;
 
   pgroonga = callPackage ../servers/sql/postgresql/pgroonga {};
 
+  plv8 = callPackage ../servers/sql/postgresql/plv8 {};
+
   phonon = callPackage ../development/libraries/phonon {};
 
   phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};
-- 
GitLab


From 5b7fd8f3b8602259ef0640db3d7b7ec1a7fe93eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 25 Jun 2017 07:46:51 +0100
Subject: [PATCH 1202/1490] nailgun: use makeWrapper

---
 pkgs/development/tools/nailgun/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix
index ec19606eea9..aef851e6476 100644
--- a/pkgs/development/tools/nailgun/default.nix
+++ b/pkgs/development/tools/nailgun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre }:
+{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }:
 
 let
   version = "0.9.1";
@@ -21,16 +21,13 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=$(out)";
 
+  buildInputs = [ makeWrapper ];
+
   installPhase = ''
     install -D ng $out/bin/ng
-    install -D ${nailgun-server.jar} $out/share/java/nailgun-server-${version}.jar
-
-    cat > $out/bin/ng-server << EOF
-    #!${bash}/bin/bash
 
-    ${jre}/bin/java -cp $out/share/java/nailgun-server-${version}.jar:\$CLASSPATH com.martiansoftware.nailgun.NGServer "\$@"
-    EOF
-    chmod +x $out/bin/ng-server
+    makeWrapper ${jre}/bin/java $out/bin/ng-server \
+      --add-flags '-cp ${nailgun-server.jar}:$CLASSPATH com.martiansoftware.nailgun.NGServer'
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 5d5dde671e1770b98eb739a68659e2c82b10ce63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 25 Jun 2017 08:16:58 +0100
Subject: [PATCH 1203/1490] pythonPackages.spotipy: keep alphabetic ordering

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0cbcba33981..bcca77de47d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23596,6 +23596,8 @@ in {
     };
   });
 
+  spotipy = callPackage ../development/python-modules/spotipy { };
+
   Pweave = buildPythonPackage (rec {
     name = "Pweave-0.25";
 
@@ -23624,8 +23626,6 @@ in {
     rope = if isPy3k then null else self.rope;
   };
 
-
-
   sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
 
   SQLAlchemy-ImageAttach = buildPythonPackage rec {
@@ -30444,8 +30444,6 @@ EOF
 
   gensim = callPackage  ../development/python-modules/gensim { };
 
-  spotipy = callPackage ../development/python-modules/spotipy { };
-
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 6aad18a668e45c6cd664076b6bf890fb030b8bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 25 Jun 2017 08:23:29 +0100
Subject: [PATCH 1204/1490] pythonPackages.uritools: keep alphabetic order

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f99ffb8c183..e17a99a059a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24970,6 +24970,8 @@ in {
     };
   };
 
+  uritools = callPackage ../development/python-modules/uritools { };
+
   traceback2 = buildPythonPackage rec {
     version = "1.4.0";
     name = "traceback2-${version}";
@@ -30444,8 +30446,6 @@ EOF
 
   gensim = callPackage  ../development/python-modules/gensim { };
 
-  uritools = callPackage ../development/python-modules/uritools { };
-
 });
 
 in fix' (extends overrides packages)
-- 
GitLab


From 69eddfa090e9cf6c16c198aed7ad7b3fbe8a0f1f Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@users.noreply.github.com>
Date: Sun, 25 Jun 2017 09:32:05 +0200
Subject: [PATCH 1205/1490] pythonPackages.pylast: 0.5.11 -> 1.8.0 (#26825)

* maintainers: add rvolosatovs

* pythonPackages.pylast: 0.5.11 -> 1.8.0

* pythonPackages.pylast: refactor

- Update homepage
- Add rvolosatovs to maintainers
- Fix test comment

* pylast: move out of python-packages.nix
---
 .../python-modules/pylast/default.nix         | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +--------------
 2 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/pylast/default.nix

diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
new file mode 100644
index 00000000000..aa0d1d5f575
--- /dev/null
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, certifi, six }:
+
+buildPythonPackage rec {
+  pname = "pylast";
+  version = "1.8.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "85f8dd96aef0ccba5f80379c3d7bc1fabd72f59aebab040daf40a8b72268f9bd";
+  };
+
+  propagatedBuildInputs = [ certifi six ];
+
+  # tests require last.fm credentials
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/pylast/pylast";
+    description = "A python interface to last.fm (and compatibles)";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ rvolosatovs ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e17a99a059a..906f9b6b391 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12926,24 +12926,7 @@ in {
 
   kitchen = callPackage ../development/python-modules/kitchen/default.nix { };
 
-  pylast = buildPythonPackage rec {
-    name = "pylast-${version}";
-    version = "0.5.11";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pylast/${name}.tar.gz";
-      sha256 = "bf35820be35447d55564d36072d40b09ac8a7fd41a6f1a7a9d408f4d0eaefac4";
-    };
-
-    # error: invalid command 'test'
-    doCheck = false;
-
-    meta = {
-      homepage = http://code.google.com/p/pylast/;
-      description = "A python interface to last.fm (and compatibles)";
-      license = licenses.asl20;
-    };
-  };
+  pylast = callPackage ../development/python-modules/pylast/default.nix { };
 
   pylru = buildPythonPackage rec {
     name = "pylru-${version}";
-- 
GitLab


From e600317768110d0dddeecaded87e42a6c2352dd4 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Sun, 25 Jun 2017 02:45:50 -0400
Subject: [PATCH 1206/1490] calibre: 2.84.0 -> 3.1.1

links-privacy patch was removed as the content server was
rewritten in calibre 3.0.

The rewrite also needed a couple more python packages.
---
 pkgs/applications/misc/calibre/default.nix    | 11 ++-----
 .../calibre/dont_build_unrar_plugin.patch     | 30 +++----------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 5845fe85ccb..f4cbc142d6b 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,29 +5,23 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.84.0";
+  version = "3.1.1";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1kvnmb6hsby4bdnx70bcy32f4dz1axzlr310dr6mkvnc8bqw59km";
+    sha256 = "1lh1gz0915r49igfhy1icz79qx36s3d8m32qlih0g3zn7jahp86g";
   };
 
   patches = [
     # Patches from Debian that:
     # - disable plugin installation (very insecure)
-    # - disables loading of web bug for privacy
     # - switches the version update from enabled to disabled by default
     (fetchpatch {
       name = "disable_plugins.patch";
       url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/disable_plugins.py-20111220183043-dcl08ccfagjxt1dv-1/disable_plugins.py";
       sha256 = "19spdx52dhbrfn9lm084yl3cfwm6f90imd51k97sf7flmpl569pk";
     })
-    (fetchpatch {
-      name = "links_privacy.patch";
-      url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/linksprivacy.patch-20160417214308-6hvive72pc0r4awc-1/links-privacy.patch";
-      sha256 = "0f6pq2b7q56pxrq2j8yqd7bksc623q2zgq29qcli30f13vga1w60";
-    })
     (fetchpatch {
       name = "no_updates_dialog.patch";
       url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/no_updates_dialog.pa-20081231120426-rzzufl0zo66t3mtc-16/no_updates_dialog.patch";
@@ -57,6 +51,7 @@ stdenv.mkDerivation rec {
   ] ++ (with python2Packages; [
     apsw cssselect cssutils dateutil lxml mechanize netifaces pillow
     python pyqt5 sip
+    regex msgpack
     # the following are distributed with calibre, but we use upstream instead
     chardet cherrypy html5lib_0_9999999 odfpy routes
   ]);
diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
index 71cc688f7da..45e27984ed5 100644
--- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
+++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
@@ -1,34 +1,12 @@
-diff --git a/setup/extensions.json b/setup/extensions.json
-index 1f6d1fb..1273904 100644
---- a/setup/extensions.json
-+++ b/setup/extensions.json
-@@ -211,16 +211,5 @@
-         "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
-         "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
-         "libraries": "mtp"
--    },
--    {
--        "name": "unrar",
--        "sources": "unrar/rar.cpp unrar/strlist.cpp unrar/strfn.cpp unrar/pathfn.cpp unrar/savepos.cpp unrar/smallfn.cpp unrar/global.cpp unrar/file.cpp unrar/filefn.cpp unrar/filcreat.cpp unrar/archive.cpp unrar/arcread.cpp unrar/unicode.cpp unrar/system.cpp unrar/isnt.cpp unrar/crypt.cpp unrar/crc.cpp unrar/rawread.cpp unrar/encname.cpp unrar/resource.cpp unrar/match.cpp unrar/timefn.cpp unrar/rdwrfn.cpp unrar/consio.cpp unrar/options.cpp unrar/ulinks.cpp unrar/errhnd.cpp unrar/rarvm.cpp unrar/secpassword.cpp unrar/rijndael.cpp unrar/getbits.cpp unrar/sha1.cpp unrar/extinfo.cpp unrar/extract.cpp unrar/volume.cpp unrar/list.cpp unrar/find.cpp unrar/unpack.cpp unrar/cmddata.cpp unrar/filestr.cpp unrar/scantree.cpp calibre/utils/unrar.cpp",
--        "inc_dirs": "unrar",
--        "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE",
--        "windows_defines": "SILENT RARDLL UNRAR",
--        "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE",
--        "haiku_libraries": "bsd",
--        "optimize_level": 2,
--        "windows_libraries": "User32 Advapi32 kernel32 Shell32"
-     }
- ]
 diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
 index 938ab24..1e095f8 100644
 --- a/src/calibre/ebooks/metadata/archive.py
 +++ b/src/calibre/ebooks/metadata/archive.py
-@@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin):
-     description = _('Extract common e-book formats from archives '
-         '(zip/rar) files. Also try to autodetect if they are actually '
-         'cbz/cbr files.')
+@@ -44,7 +44,7 @@
+     description = _('Extract common e-book formats from archive files '
+         '(ZIP/RAR). Also try to autodetect if they are actually '
+         'CBZ/CBR files.')
 -    file_types = set(['zip', 'rar'])
 +    file_types = set(['zip'])
      supported_platforms = ['windows', 'osx', 'linux']
      on_import = True
- 
-- 
GitLab


From c7bc8b42f2246a89120f6a42d8a38873bcdf1539 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Jun 2017 09:48:38 +0200
Subject: [PATCH 1207/1490] kdeconnect: fix build

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

diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 743a20b6bfc..0d8db33bc17 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -11,6 +11,7 @@
 , qca-qt5
 , libfakekey
 , libXtst
+, qtx11extras
 }:
 
 stdenv.mkDerivation rec {
@@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
     knotifications
     libfakekey
     libXtst
+    qtx11extras
   ];
 
   nativeBuildInputs = [ extra-cmake-modules ];
-- 
GitLab


From fdf181237b3826054ce631c460a44e0724b0c158 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Jun 2017 09:48:49 +0200
Subject: [PATCH 1208/1490] yakuake: fix build

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

diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 4a25f88ac75..8db48a7b3e6 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -15,6 +15,7 @@
 , konsole
 , kparts
 , kwindowsystem
+, qtx11extras
 }:
 
 let
@@ -39,6 +40,7 @@ in mkDerivation rec {
       knotifyconfig
       kparts
       kwindowsystem
+      qtx11extras
     ];
 
   propagatedBuildInputs = [
-- 
GitLab


From fcd5804d7f72c1252e6dfc10924d17eb52409379 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 25 Jun 2017 09:49:10 +0200
Subject: [PATCH 1209/1490] konversation: 1.6.2 -> 1.7.2 and fix build

---
 pkgs/applications/networking/irc/konversation/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 4cfde1f9b07..5b86e79e99a 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -8,6 +8,7 @@
 , kconfig
 , kconfigwidgets
 , kcoreaddons
+, kcrash
 , kdbusaddons
 , kemoticons
 , kglobalaccel
@@ -17,6 +18,7 @@
 , kitemviews
 , knotifications
 , knotifyconfig
+, kwindowsystem
 , kio
 , kparts
 , kwallet
@@ -27,13 +29,13 @@
 
 let
   pname = "konversation";
-  version = "1.6.2";
+  version = "1.7.2";
 in mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
+    sha256 = "0616h59bsw5c3y8lij56v3fhv9by0rwdfcaa83yfxqg4rs26xyaz";
   };
 
   buildInputs = [
@@ -42,6 +44,7 @@ in mkDerivation rec {
     kconfig
     kconfigwidgets
     kcoreaddons
+    kcrash
     kdbusaddons
     kdoctools
     kemoticons
@@ -52,6 +55,7 @@ in mkDerivation rec {
     kitemviews
     knotifications
     knotifyconfig
+    kwindowsystem
     kio
     kparts
     kwallet
-- 
GitLab


From f319442b77bcbf6465119b84da548b6b41f820e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 25 Jun 2017 09:36:06 +0100
Subject: [PATCH 1210/1490] keepassxc: fix 4.9 compatibility

---
 pkgs/applications/misc/keepassx/community.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index e103f62fd3c..9e83aa50a77 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub,
+{ stdenv, fetchFromGitHub, fetchpatch,
   cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror
 , withKeePassHTTP ? true
 }:
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "1znnw2xpv58x0rbpmm4y662377mbmcilhf8mhhjsz8vhahms33a8";
   };
 
+  patches = [
+    (fetchpatch { # qt 4.9
+      url = "https://github.com/keepassxreboot/keepassxc/commit/2b6059dee3a95591d787e8b8c931cd68c059d43f.patch";
+      sha256 = "1v140z358rk75f7wsqawpai3x8v8qcqalnv9r0l1d4p1gxm1j766";
+    })
+  ];
+
   cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ];
 
   buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror ];
-- 
GitLab


From 24e9ec31665a1d8bd4593820b9d3e14049117174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 25 Jun 2017 09:38:11 +0100
Subject: [PATCH 1211/1490] marble: fix src hash

---
 pkgs/applications/kde/srcs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 0fa168e0a23..66498b0d280 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -2054,7 +2054,7 @@
     version = "17.04.2";
     src = fetchurl {
       url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz";
-      sha256 = "1z24infjp65d2s2zlcvr0v9425a6wxwkaz262mvqqvx64qmhd6ca";
+      sha256 = "1c6xmpkqilxd9zxz8kz7g47hwsa4hw27qcy96wxcg24hg8b5zr09";
       name = "marble-17.04.2.tar.xz";
     };
   };
-- 
GitLab


From f506b723086e1739765d9065e468499eab3a2e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 25 Jun 2017 10:18:01 +0100
Subject: [PATCH 1212/1490] krita: 3.1.3 -> 3.1.4

---
 pkgs/applications/graphics/krita/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 50720f854db..ccac9dd0ed1 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules
+{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules
 , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
 , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
 , kio, kcrash
@@ -9,12 +9,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  ver_min = "3.1.3";
-  version = "${ver_min}";
+  version = "3.1.4";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/krita/${ver_min}/${name}.tar.gz";
-    sha256 = "125js6c8aw4bqhs28pwnl3rbgqx5yx4zsklw7bfdhy3vf6lrysw1";
+    url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz";
+    sha256 = "1al27v17s70hihk2mcmz3l2g6rl9qzpxaifapdfpkyias6q3f63l";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
@@ -27,6 +26,13 @@ mkDerivation rec {
     qtmultimedia qtx11extras
   ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/KDE/krita/commit/2f59d0d1.patch";
+      sha256 = "0sdlcjn6i3faln3c0aczw3pg4pvmccgszmy8n914mgsccrqrazlr";
+    })
+  ];
+
   NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
 
   meta = with lib; {
-- 
GitLab


From 9721c545927610b77a304011d4aee72e098352cb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Jun 2017 12:07:51 +0200
Subject: [PATCH 1213/1490] git-annex: replacing optparse-applicative needs a
 deep override

 | Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.
 | package wai-app-static-3.1.6.1 requires optparse-applicative-0.13.2.0
 | package tasty-rerun-1.1.6 requires optparse-applicative-0.13.2.0
 | package tasty-0.11.2.1 requires optparse-applicative-0.13.2.0
 | package git-annex-6.20170520 requires optparse-applicative-0.14.0.0
---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index fccde7426c6..3ee452e4845 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -63,7 +63,7 @@ self: super: {
 
   # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
   # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
-  git-annex = ((overrideCabal super.git-annex (drv: {
+  git-annex = (((overrideCabal super.git-annex (drv: {
     src = pkgs.fetchgit {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
@@ -74,8 +74,9 @@ self: super: {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
+  }).overrideScope (self: super: {
     optparse-applicative = self.optparse-applicative_0_14_0_0;
-  };
+  });
 
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;
-- 
GitLab


From b4973a5bbbae610b465f7882aad5f99468a43a81 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 24 Jun 2017 03:01:00 +0200
Subject: [PATCH 1214/1490] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ec9f3d302b1e1f8b204426e1c4e8bd4f6d658eda.
---
 .../haskell-modules/hackage-packages.nix      | 424 ++++++++++++++----
 1 file changed, 345 insertions(+), 79 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2038bc9ba84..65ad24320c8 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -32981,7 +32981,7 @@ self: {
        description = "Bindings to the Yices theorem prover";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gmp; yices = null;};
+     }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "bindynamic" = callPackage
     ({ mkDerivation, base, binary, bytestring, rank1dynamic }:
@@ -39795,6 +39795,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cassava-conduit_0_4_0_0" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
+     , conduit, conduit-extra, containers, criterion, mtl, QuickCheck
+     , text
+     }:
+     mkDerivation {
+       pname = "cassava-conduit";
+       version = "0.4.0.0";
+       sha256 = "1pl3vbkyjvgz08ijm75rdxnxx5h27mya7bgzi9jpws7v2dwxlg22";
+       libraryHaskellDepends = [
+         array base bifunctors bytestring cassava conduit conduit-extra
+         containers mtl text
+       ];
+       testHaskellDepends = [
+         base bytestring cassava conduit conduit-extra QuickCheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/domdere/cassava-conduit";
+       description = "Conduit interface for cassava package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cassava-megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers, hspec
      , hspec-megaparsec, megaparsec, unordered-containers, vector
@@ -49024,7 +49047,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "criterion_1_2_0_0" = callPackage
+  "criterion_1_2_1_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary
      , bytestring, cassava, code-page, containers, deepseq, directory
      , exceptions, filepath, Glob, HUnit, js-flot, js-jquery
@@ -49035,8 +49058,8 @@ self: {
      }:
      mkDerivation {
        pname = "criterion";
-       version = "1.2.0.0";
-       sha256 = "0rbmfjgxba7qsp79lj7k00yzphmknimqh5r20nw1bc6i1v4civ6f";
+       version = "1.2.1.0";
+       sha256 = "0hbhm6fcbvh38m8hazlzjh3z09adjrzcv5jq63792bvnm24bpx6r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51922,6 +51945,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-diverse" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, hspec, lens, tagged }:
+     mkDerivation {
+       pname = "data-diverse";
+       version = "0.2.0.0";
+       sha256 = "1lffgpy3pz0hyq6l4r7l4aqsldgis5wbd9jpllankhfxghxx9gvn";
+       libraryHaskellDepends = [ base containers ghc-prim lens tagged ];
+       testHaskellDepends = [ base hspec lens ];
+       homepage = "https://github.com/louispan/data-diverse#readme";
+       description = "Extensible records and polymorphic variants";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-dword" = callPackage
     ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty
      , tasty-quickcheck, template-haskell
@@ -62414,6 +62450,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "entropy_0_3_8" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , process, unix
+     }:
+     mkDerivation {
+       pname = "entropy";
+       version = "0.3.8";
+       sha256 = "1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl";
+       setupHaskellDepends = [ base Cabal directory filepath process ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       homepage = "https://github.com/TomMD/entropy";
+       description = "A platform independent entropy source";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "enumerable" = callPackage
     ({ mkDerivation, base, control-monad-omega, tagged }:
      mkDerivation {
@@ -63942,21 +63994,22 @@ self: {
      }) {};
 
   "eventful-core" = callPackage
-    ({ mkDerivation, aeson, base, containers, hlint, hspec
-     , http-api-data, HUnit, path-pieces, sum-type-boilerplate
+    ({ mkDerivation, aeson, base, containers, contravariant, hlint
+     , hspec, http-api-data, HUnit, path-pieces, sum-type-boilerplate
      , template-haskell, text, transformers, uuid
      }:
      mkDerivation {
        pname = "eventful-core";
-       version = "0.1.2";
-       sha256 = "0vlhn54qiwi6cvvf9r4nwgnlp747y3i1nh9y2dxr8g9zkpj0wcyn";
+       version = "0.1.3";
+       sha256 = "1lify1ama6a479w0mcvr4qmp0mrfgwf6nsy902hrx20sn5ik02h9";
        libraryHaskellDepends = [
-         aeson base containers http-api-data path-pieces
+         aeson base containers contravariant http-api-data path-pieces
          sum-type-boilerplate template-haskell text transformers uuid
        ];
        testHaskellDepends = [
-         aeson base containers hlint hspec http-api-data HUnit path-pieces
-         sum-type-boilerplate template-haskell text transformers uuid
+         aeson base containers contravariant hlint hspec http-api-data HUnit
+         path-pieces sum-type-boilerplate template-haskell text transformers
+         uuid
        ];
        homepage = "https://github.com/jdreaver/eventful#readme";
        description = "Core module for eventful";
@@ -63971,8 +64024,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventful-dynamodb";
-       version = "0.1.2";
-       sha256 = "0q8wvnxcprh4gz74d4jsia5ripgn87lb2mw037mrf817g0w63dgl";
+       version = "0.1.3";
+       sha256 = "1ymzryyz77705vwb05nhjhw6sz2ksjfpld5g569pnbdlr03m257y";
        libraryHaskellDepends = [
          aeson amazonka amazonka-dynamodb base bytestring conduit
          eventful-core lens safe text unordered-containers vector
@@ -63995,8 +64048,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventful-memory";
-       version = "0.1.2";
-       sha256 = "0kq8f6x7q19vlwgfz7mwlisik0j5wi8pxwlliyv2ispa37rlmvgx";
+       version = "0.1.3";
+       sha256 = "0r35bg40j4bdpf5ibxi5acjnmdl9piaysyzswapwcjq4jyibcdk9";
        libraryHaskellDepends = [
          base containers eventful-core mtl safe stm
        ];
@@ -64016,8 +64069,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventful-postgresql";
-       version = "0.1.2";
-       sha256 = "0aim6907mkjxlwiwkhmjmmfcbagkaq7z633447xr4mw931v8k84l";
+       version = "0.1.3";
+       sha256 = "0vc36qfi2q1im60nwzb9ivpsz7kk2y83rbzbbv4b2mjk3cvvjnyr";
        libraryHaskellDepends = [
          aeson base bytestring eventful-core eventful-sql-common mtl
          persistent text
@@ -64039,8 +64092,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventful-sql-common";
-       version = "0.1.2";
-       sha256 = "05q1v64l007saazflvp70sz4579dpzpr08qcgzhg2b1m2ga3pwhn";
+       version = "0.1.3";
+       sha256 = "0mddqciaiq90cgf0syw0y1qvvkpvqbx0lkx8mwz3g8zf57h98awc";
        libraryHaskellDepends = [
          aeson base bytestring eventful-core mtl persistent
          persistent-template text uuid
@@ -64057,8 +64110,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventful-sqlite";
-       version = "0.1.2";
-       sha256 = "191c8fcw7wyr9bvviz1h9nbwcyrh5sl31arv4s9b3rjw847zg50j";
+       version = "0.1.3";
+       sha256 = "08xk3kyxm23843kr2y9l39d9d9ykcahz2q2730c1skgnwcd3y0c2";
        libraryHaskellDepends = [
          aeson base bytestring eventful-core eventful-sql-common mtl
          persistent text uuid
@@ -64075,14 +64128,14 @@ self: {
 
   "eventful-test-helpers" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra
-     , hspec, monad-logger
+     , hspec, monad-logger, text
      }:
      mkDerivation {
        pname = "eventful-test-helpers";
-       version = "0.1.2";
-       sha256 = "17i55zi9npjj7c97lc6fzad5aak46agcr73d5lv3yycm4lk2hj1g";
+       version = "0.1.3";
+       sha256 = "16ba3184niy3dsh6h08czj7x0bd4abx7ji2aaddd5pvxra9494xl";
        libraryHaskellDepends = [
-         aeson aeson-casing base eventful-core extra hspec monad-logger
+         aeson aeson-casing base eventful-core extra hspec monad-logger text
        ];
        homepage = "https://github.com/jdreaver/eventful#readme";
        description = "Common module used for eventful tests";
@@ -87415,6 +87468,8 @@ self: {
        pname = "hashable";
        version = "1.2.6.1";
        sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll";
+       revision = "1";
+       editedCabalFile = "1saaj9izz0faj85svdd45z4iygqb9z8i130br9vlqp3py7f2ymzz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98665,8 +98720,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.18.0";
-       sha256 = "1z738mw0kzic4wx5dpihh1c1gimpjkl14wl6w2nmmdfx2bdjm5rv";
+       version = "0.18.1";
+       sha256 = "1ssawa6187m0xzn7i5hn154qajq46jlpbvz1s28qk4bigpv38m7k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114698,6 +114753,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "katip_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , bytestring, containers, criterion, deepseq, directory, either
+     , exceptions, hostname, microlens, microlens-th, monad-control, mtl
+     , old-locale, quickcheck-instances, regex-tdfa, resourcet
+     , semigroups, string-conv, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, time
+     , time-locale-compat, transformers, transformers-base
+     , transformers-compat, unagi-chan, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "katip";
+       version = "0.4.0.0";
+       sha256 = "1l9zpq7gr5madmqmm4cp3p6lid0krxaf6gki2qcxlkvsm39cr9vz";
+       libraryHaskellDepends = [
+         aeson async auto-update base bytestring containers either
+         exceptions hostname microlens microlens-th monad-control mtl
+         old-locale resourcet semigroups string-conv template-haskell text
+         time transformers transformers-base transformers-compat unagi-chan
+         unix unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory microlens quickcheck-instances
+         regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
+         template-haskell text time time-locale-compat unordered-containers
+       ];
+       benchmarkHaskellDepends = [
+         aeson async base blaze-builder criterion deepseq text time
+         transformers unix
+       ];
+       homepage = "https://github.com/Soostone/katip";
+       description = "A structured logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "katip-elasticsearch" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, containers
      , criterion, deepseq, enclosed-exceptions, exceptions, http-client
@@ -117849,8 +117940,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-sally";
-       version = "0.1.0.1";
-       sha256 = "0zbq1sjf96hpsidnx2cqwh4g4q3s5zqq6iv92y4rwff58j2fdy35";
+       version = "0.1.1.0";
+       sha256 = "10ddikcavh7ppmm5issii7mv9nagrs0841cngz3alfw0sw6bw47v";
        libraryHaskellDepends = [
          ansi-wl-pprint base bytestring containers text
        ];
@@ -120435,6 +120526,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-async_0_9_2" = callPackage
+    ({ mkDerivation, async, base, constraints, criterion, deepseq
+     , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
+     , tasty-th, transformers-base
+     }:
+     mkDerivation {
+       pname = "lifted-async";
+       version = "0.9.2";
+       sha256 = "14p8fbbvcr35kkv8ayxlsqcfn55am9lyzmszciww13y8mx7b214z";
+       libraryHaskellDepends = [
+         async base constraints lifted-base monad-control transformers-base
+       ];
+       testHaskellDepends = [
+         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
+         tasty-th
+       ];
+       benchmarkHaskellDepends = [ async base criterion deepseq ];
+       homepage = "https://github.com/maoe/lifted-async";
+       description = "Run lifted IO operations asynchronously and wait for their results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-base" = callPackage
     ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
      , test-framework, test-framework-hunit, transformers
@@ -123854,8 +123968,8 @@ self: {
      }:
      mkDerivation {
        pname = "loup";
-       version = "0.0.6";
-       sha256 = "0lvz5pkb2b4r18hcm4951bc06yb503wywkx20iihax76vgssxr8b";
+       version = "0.0.8";
+       sha256 = "0chb4pp8czc0i0nn0dx78r7j7gr3d9mi0f51kdrimk301dpcca29";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -130588,6 +130702,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-mock" = callPackage
+    ({ mkDerivation, base, constraints, exceptions, hspec
+     , monad-control, mtl, transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-mock";
+       version = "0.1.0.0";
+       sha256 = "0ax46lh6j2xxs6xidj1i6jw2yv2i1p79807fcwfqrkb1rl6xchx4";
+       libraryHaskellDepends = [
+         base constraints exceptions monad-control mtl transformers-base
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/cjdev/monad-mock#readme";
+       description = "A monad transformer for mocking mtl-style typeclasses";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "monad-open" = callPackage
     ({ mkDerivation, base, exceptions, mtl, transformers }:
      mkDerivation {
@@ -139635,8 +139766,8 @@ self: {
      }:
      mkDerivation {
        pname = "opencv";
-       version = "0.0.1.0";
-       sha256 = "1ar5h1z875bqz52j2d1kqmb1v78prwwwn5nmwqz37kg5qk3lhzkf";
+       version = "0.0.1.1";
+       sha256 = "095vljv7y7am7dfn7hp9rncfcbcmmqvgzwgw6iwrp6s3z0qv10jn";
        configureFlags = [
          "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++"
        ];
@@ -139668,8 +139799,8 @@ self: {
      }:
      mkDerivation {
        pname = "opencv-extra";
-       version = "0.0.0.1";
-       sha256 = "0z0ym7mg6w67vxyj09zybybnhvqvvrdr1n04vzyqj2b5lqbryrw6";
+       version = "0.1.0.0";
+       sha256 = "1ah6jipanqag0vk4fjd35rr5xi479w2iym0ix6wd9g9zswb89k8j";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base bindings-DSL bytestring containers inline-c inline-c-cpp
@@ -147851,6 +147982,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ploton" = callPackage
+    ({ mkDerivation, base, hspec, optparse-applicative, process }:
+     mkDerivation {
+       pname = "ploton";
+       version = "0.1.0.0";
+       sha256 = "0iv4ngwf7zj20wglpa2klj5a39nfqmwbh7s1kivrlia1mi0xck3d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base optparse-applicative process ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/ishiy1993/ploton#readme";
+       description = "A useful cli tool to draw figures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plots" = callPackage
     ({ mkDerivation, adjunctions, base, base-orphans, colour
      , containers, data-default, diagrams-core, diagrams-lib, directory
@@ -149401,6 +149548,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-schema_0_1_11" = callPackage
+    ({ mkDerivation, base, basic-prelude, optparse-applicative
+     , postgresql-simple, shelly, text, time, time-locale-compat
+     }:
+     mkDerivation {
+       pname = "postgresql-schema";
+       version = "0.1.11";
+       sha256 = "1xhaqxc389dghf77hlz6zy6pa6phxv8by42lzs91ymjhvwhnb7bl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base basic-prelude postgresql-simple shelly text
+       ];
+       executableHaskellDepends = [
+         base basic-prelude optparse-applicative shelly text time
+         time-locale-compat
+       ];
+       homepage = "https://github.com/mfine/postgresql-schema";
+       description = "PostgreSQL Schema Management";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-simple" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, bytestring-builder, case-insensitive, containers
@@ -150795,15 +150965,13 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter-compat-ansi-wl-pprint";
-       version = "1";
-       sha256 = "1w84df99n1fwzwyflfjh6bsbrv03yzdsq8b42ziqcb3m1mq5hf1v";
-       revision = "2";
-       editedCabalFile = "1bcj2y4b4pj028lllljpj52m622h6rv0qngfyq2xc8jzn7pls5ca";
+       version = "1.0.1";
+       sha256 = "0gzpjddnxl4z8pvb0lyal13jbr94dk900k8g4qwcq9fs26vnnb81";
        libraryHaskellDepends = [
          base prettyprinter prettyprinter-ansi-terminal text
        ];
        homepage = "http://github.com/quchen/prettyprinter";
-       description = "Prettyprinter compatibility module for previous users of the ansi-wl-pprint package";
+       description = "Drop-in compatibility package to migrate from »ansi-wl-pprint« to »prettyprinter«";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
@@ -152118,6 +152286,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-arbitrary_0_1_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens-family
+     , proto-lens, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-arbitrary";
+       version = "0.1.0.3";
+       sha256 = "029liw55v5k9f5bsfpsadd85sgrriwvrhfk242d2wfp3fypafd39";
+       libraryHaskellDepends = [
+         base bytestring containers lens-family proto-lens QuickCheck text
+       ];
+       homepage = "https://github.com/google/proto-lens";
+       description = "Arbitrary instances for proto-lens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-combinators" = callPackage
     ({ mkDerivation, base, Cabal, data-default-class, HUnit
      , lens-family, lens-family-core, proto-lens, proto-lens-protoc
@@ -159725,6 +159910,8 @@ self: {
        pname = "repa";
        version = "3.4.1.2";
        sha256 = "0myw05dicby7dhkmjvv9wphfnnx2jj3dxaa50357n76zysxhpy2p";
+       revision = "1";
+       editedCabalFile = "0pagab03fw7xp1vvgrc87g6g6zdr60plqhjjxk3fwwm1gs0jj61k";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -167129,8 +167316,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.4.7.0";
-       sha256 = "0237kjsvgi6wfn8qisbf93w3irp73i00728zd4v1z3s5a435kgff";
+       version = "0.4.7.1";
+       sha256 = "0mswxxq2b6n1f3laz15y87nxnsw5l1bmpl9kfdif4spd286wgaa8";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers mtl pwstore-fast
          servant-auth-token-api servant-server text time transformers uuid
@@ -167150,8 +167337,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-acid";
-       version = "0.4.1.0";
-       sha256 = "0m1kpjyl9s6xxmmg6sxq2ipg2ylw0ccvwbqzjg0lx26h9h44wzai";
+       version = "0.4.1.1";
+       sha256 = "01y3dis2v984a7g4hfl28ygac6jp6dcr5kzp8b45c4lywsi6pd7a";
        libraryHaskellDepends = [
          acid-state aeson-injector base bytestring containers ghc-prim
          monad-control mtl safe safecopy servant-auth-token
@@ -167170,8 +167357,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.4.2.1";
-       sha256 = "06sn1k17acznmldknlqhfdvlb7cs7wiihsjcfk5xs9wzc6ssrvqf";
+       version = "0.4.2.2";
+       sha256 = "0dnaqhri1hg1c3gmlpnpyk21q4cq9j513fnd3g1m9k7mkc6h6bgv";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -167191,8 +167378,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-leveldb";
-       version = "0.4.2.0";
-       sha256 = "09pnqdm6n3l5nivcrlczjp4sax0l1cg3l42hxwkw0s0prwvq1vi8";
+       version = "0.4.2.1";
+       sha256 = "0i7h05jsc0r644prgifbvj7xrjpr7qsmwhqcc93p33f1wznn9h5n";
        libraryHaskellDepends = [
          aeson-injector base bytestring concurrent-extra containers
          exceptions lens leveldb-haskell monad-control mtl resourcet safe
@@ -167214,8 +167401,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-persistent";
-       version = "0.5.1.0";
-       sha256 = "0kvhk4wd8qdiaqjgs3k8s8jlxhph9jddpgq8caf7yldw6wz2kqi2";
+       version = "0.5.1.1";
+       sha256 = "09np7cilm1ij7ra06zyx7wqcm8ynras0q6fsfkkklpr5w632ifh1";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers monad-control mtl
          persistent persistent-template servant-auth-token
@@ -167237,8 +167424,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-rocksdb";
-       version = "0.4.2.0";
-       sha256 = "0268i74lf0ib7kc6nc8nqyfdn761vkdgjl1xyjcz8c8vlg0624vb";
+       version = "0.4.2.1";
+       sha256 = "0zl5xr12pnz99798pz1rn6q2msir57df97h6xayj3167zmmdv2fy";
        libraryHaskellDepends = [
          aeson-injector base bytestring concurrent-extra containers
          exceptions lens monad-control mtl resourcet rocksdb safe
@@ -168722,16 +168909,18 @@ self: {
      }) {};
 
   "serviette" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, generic-deriving, text }:
+    ({ mkDerivation, aeson, base, bytestring, generic-deriving, text
+     , text-show
+     }:
      mkDerivation {
        pname = "serviette";
-       version = "0.1.0.4";
-       sha256 = "1i5k12y547z3l2hb4h1zafvv9sbfh5x60hajjw78dnk2p4v1gzl4";
+       version = "0.1.0.6";
+       sha256 = "00bh2c73g11bglw5z96g9d1bqkcd783byd3jrf5amgay28xk2l5d";
        libraryHaskellDepends = [
-         aeson base bytestring generic-deriving text
+         aeson base bytestring generic-deriving text text-show
        ];
        homepage = "https://github.com/v0d1ch/serviette#readme";
-       description = "JSON to raw Sql string";
+       description = "JSON to Sql";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -170061,8 +170250,8 @@ self: {
      }:
      mkDerivation {
        pname = "shikensu";
-       version = "0.3.6";
-       sha256 = "121ff1a68lrzclx8qq7y5yn8rxqzj6bn92naws5v15ps9mx1b34r";
+       version = "0.3.7";
+       sha256 = "1gi1l8rs093s2jxyqwpg7yjbyjc9km87hdxai2j832viwrd828b5";
        libraryHaskellDepends = [
          aeson base bytestring directory filepath flow Glob text
          unordered-containers
@@ -170083,10 +170272,8 @@ self: {
      }:
      mkDerivation {
        pname = "shine";
-       version = "0.1.0.0";
-       sha256 = "1839whd680f1jm0789i6aqlkfbs8af6szzpfyhxzbxhdqjrz63mj";
-       revision = "2";
-       editedCabalFile = "0rq1p8w4yp6y5yf49fw0bpaxjcrb3dkqw9x9fl9j614d5xg03gxj";
+       version = "0.2.0.1";
+       sha256 = "07d990gkvgd804a6k85n0m8cxss6855gsgg7d52r341l1l706aca";
        libraryHaskellDepends = [
          base ghcjs-dom ghcjs-prim keycode mtl time transformers
        ];
@@ -170103,8 +170290,8 @@ self: {
        pname = "shine-varying";
        version = "0.1.0.0";
        sha256 = "13mnzf8i9y7ifn73mvsrzv0dh01vc20cymqli29j384z1491sc40";
-       revision = "1";
-       editedCabalFile = "133i3r6kv109vq5hn1y6yq06p79hkfk4cd7qgb6caidgn422cm7v";
+       revision = "3";
+       editedCabalFile = "1icg7mcfw6zrdf884kh2g0ss2lki0zf0b3r0yqzmz4h2cwvxl910";
        libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ];
        testHaskellDepends = [ base ghcjs-dom keycode shine varying ];
        homepage = "https://github.com/fgaz/shine-varying";
@@ -170402,15 +170589,13 @@ self: {
      }) {};
 
   "si-clock" = callPackage
-    ({ mkDerivation, base, bytestring, hsI2C, read-env-var, time
-     , transformers
-     }:
+    ({ mkDerivation, base, bytestring, hsI2C, time, transformers }:
      mkDerivation {
        pname = "si-clock";
-       version = "0.1.0";
-       sha256 = "18qgibfy0rj3wxz51rj0ks9bxp574wxpdjxdkjgf8xzsl1hs9h8i";
+       version = "0.1.1";
+       sha256 = "1wcw3ws1125lpazar5934v93y76shdl279ll02z8911d3hcx0vh5";
        libraryHaskellDepends = [
-         base bytestring hsI2C read-env-var time transformers
+         base bytestring hsI2C time transformers
        ];
        description = "An interface to the Silicon Labs Si5351 clock chip";
        license = stdenv.lib.licenses.bsd3;
@@ -181231,6 +181416,70 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "symantic" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, mono-traversable
+     , symantic-document, symantic-grammar, text, transformers
+     }:
+     mkDerivation {
+       pname = "symantic";
+       version = "6.0.0.20170623";
+       sha256 = "0g4gfy8hjdwg95hr2jka2b3jvhb5dy27m71sb8kidbk954si8fhy";
+       libraryHaskellDepends = [
+         base containers ghc-prim mono-traversable symantic-document
+         symantic-grammar text transformers
+       ];
+       description = "Library for Typed Tagless-Final Higher-Order Composable DSL";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "symantic-document" = callPackage
+    ({ mkDerivation, ansi-terminal, base, text }:
+     mkDerivation {
+       pname = "symantic-document";
+       version = "0.0.0.20170623";
+       sha256 = "0va9q2lp6vp81sm0vfm10s7ybp34i89bk6p2ry2f0fcr0lhb09i0";
+       libraryHaskellDepends = [ ansi-terminal base text ];
+       description = "Document symantics";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "symantic-grammar" = callPackage
+    ({ mkDerivation, base, megaparsec, tasty, tasty-hunit, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "symantic-grammar";
+       version = "0.0.0.20170623";
+       sha256 = "0ds1r71n96kjsr60l5jlv4kb56v7pplrwp93bzni6hiddfm6g917";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [
+         base megaparsec tasty tasty-hunit text transformers
+       ];
+       description = "Library for symantic grammars";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "symantic-lib" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, megaparsec
+     , monad-classes, mono-traversable, symantic, symantic-grammar
+     , tasty, tasty-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "symantic-lib";
+       version = "0.0.2.20170623";
+       sha256 = "10wj4p8dj2qb3qk73gkikfazq5szg8yrhjwdhj37xks7hvsfqgsv";
+       libraryHaskellDepends = [
+         base containers ghc-prim monad-classes mono-traversable symantic
+         symantic-grammar text transformers
+       ];
+       testHaskellDepends = [
+         base containers megaparsec monad-classes mono-traversable symantic
+         symantic-grammar tasty tasty-hunit text transformers
+       ];
+       description = "Symantics for common types";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "symbol" = callPackage
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
@@ -187460,6 +187709,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "thread-local-storage_0_1_2" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, criterion }:
+     mkDerivation {
+       pname = "thread-local-storage";
+       version = "0.1.2";
+       sha256 = "0nfl0i9g0d2z199a824ja6vb2h9nqswizv0hn266j0mpid1p3hl5";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ atomic-primops base ];
+       benchmarkHaskellDepends = [ atomic-primops base criterion ];
+       homepage = "https://github.com/rrnewton/thread-local-storage";
+       description = "Several options for thread-local-storage (TLS) in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "threadPool" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
@@ -187781,8 +188045,8 @@ self: {
      }:
      mkDerivation {
        pname = "throwable-exceptions";
-       version = "0.1.0.6";
-       sha256 = "0mfc5jc23l7wxsl8c5r5s3i1kvhi2jqzlhif3wb00bh292g1p9ak";
+       version = "0.1.0.7";
+       sha256 = "1afxzk9xvxlvi13ysda9gcv6zzr7njcvi5p15lbn9bg68nrwqazj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base safe-exceptions template-haskell ];
@@ -202430,19 +202694,19 @@ self: {
   "wolf" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring
      , conduit, directory, exceptions, filemanip, filepath, http-types
-     , lifted-async, lifted-base, monad-control, optparse-generic
-     , preamble, process, resourcet, shakers, time, uuid, yaml
+     , lifted-async, lifted-base, optparse-generic, preamble, process
+     , shakers, time, uuid, yaml
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.18";
-       sha256 = "08wpjp1m6szx2sp4g7h03ks7r2ryadzz3a3apchd2vymhlb1qaxb";
+       version = "0.3.19";
+       sha256 = "1bgwcklmxygc7f44nrcckdccdwg7f1y4s1qhfzn33ji1dkkhdp8m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson amazonka amazonka-swf base bytestring conduit directory
          exceptions filemanip filepath http-types lifted-async lifted-base
-         monad-control preamble process resourcet time uuid yaml
+         preamble process time uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
        homepage = "https://github.com/swift-nav/wolf";
@@ -203052,6 +203316,8 @@ self: {
        pname = "writer-cps-morph";
        version = "0.1.0.2";
        sha256 = "1n6m7wpxvvnxgkjz8qfiqz9jn2d83qb9wj4gmp476fg8vjvhf7g9";
+       revision = "1";
+       editedCabalFile = "0dqpbpaidwa7ahk0n7pv397mv7ncr26p3vcrjh1xzl6vk26bdah5";
        libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
        homepage = "https://github.com/louispan/writer-cps-morph#readme";
        description = "MFunctor instance for CPS style WriterT and RWST";
@@ -209040,7 +209306,7 @@ self: {
        description = "An embedded language for programming the Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gmp; yices = null;};
+     }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "yjftp" = callPackage
     ({ mkDerivation, base, directory, ftphs, haskeline, hsConfigure
-- 
GitLab


From 6e52efe9ebf2e96fd797a5e98a5981ec111de5b0 Mon Sep 17 00:00:00 2001
From: Unai Zalakain <unai@gisa-elkartea.org>
Date: Sun, 25 Jun 2017 12:29:18 +0200
Subject: [PATCH 1215/1490] qgo: init at unstable-2016-06-23

---
 pkgs/games/qgo/default.nix      | 48 +++++++++++++++++++++++++++++++
 pkgs/games/qgo/fix-paths.patch  | 50 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 100 insertions(+)
 create mode 100644 pkgs/games/qgo/default.nix
 create mode 100644 pkgs/games/qgo/fix-paths.patch

diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
new file mode 100644
index 00000000000..b6a76001ad0
--- /dev/null
+++ b/pkgs/games/qgo/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, makeWrapper, qmake, qt56 }:
+
+stdenv.mkDerivation rec {
+  name = "qgo-${version}";
+  version = "unstable-2016-06-23";
+
+  meta = with stdenv.lib; {
+    description = "A Go client based on Qt5";
+    longDescription = ''
+      qGo is a Go Client based on Qt 5. It supports playing online at
+      IGS-compatible servers (including some special tweaks for WING and LGS,
+      also NNGS was reported to work) and locally against gnugo (or other
+      GTP-compliant engines). It also has rudimentary support for editing SGF
+      files and parital support for CyberORO/WBaduk, Tygem, Tom, and eWeiqi
+      (developers of these backends are currently inactive, everybody is welcome
+      to take them over).
+
+      Go is an ancient Chinese board game. It's called "圍棋(Wei Qi)" in
+      Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean.
+    '';
+    homepage = "https://github.com/pzorin/qgo";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ zalakain ];
+  };
+
+  src = fetchFromGitHub {
+    owner = "pzorin";
+    repo = "qgo";
+    rev = "1e65b0c74914e534ea4d040f8f0ef8908383e374";
+    sha256 = "1xzkayclmhsi07p9mnbf8185jw8n5ikxp2mik3x8qz1i6rmrfl5b";
+  };
+
+  patches = [ ./fix-paths.patch ];
+  postPatch = ''
+    sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h
+  '';
+  nativeBuildInputs = [ makeWrapper qmake ];
+  # qt58 does not provide platform plugins
+  # We need lib/qt*/plugins/platforms/libqxcb.so
+  buildInputs = with qt56; [ qtbase.out qtmultimedia qttranslations ];
+  enableParallelBuilding = true;
+  postFixup = ''
+    # libQt5XcbQpa is a platform plugin dependency and doesn't get linked
+    patchelf --add-needed libQt5XcbQpa.so.5 $out/bin/qgo
+    wrapProgram $out/bin/qgo \
+      --set QT_QPA_PLATFORM_PLUGIN_PATH "${qt56.qtbase}/lib/qt-5.6/plugins/platforms/"
+  '';
+}
diff --git a/pkgs/games/qgo/fix-paths.patch b/pkgs/games/qgo/fix-paths.patch
new file mode 100644
index 00000000000..c1d1e399ec1
--- /dev/null
+++ b/pkgs/games/qgo/fix-paths.patch
@@ -0,0 +1,50 @@
+diff --git a/src/defines.h b/src/defines.h
+index 5d40955..82d0627 100644
+--- a/src/defines.h
++++ b/src/defines.h
+@@ -48,7 +48,7 @@
+ * GNUgo default level
+ */
+ #define DEFAULT_ENGINE "gnugo"
+-#define DEFAULT_ENGINE_PATH "/usr/games/"
++#define DEFAULT_ENGINE_PATH ""
+ #define DEFAULT_ENGINE_OPTIONS "--mode gtp --quiet --level 10"
+ 
+ 
+@@ -220,8 +220,8 @@ extern QString applicationPath;
+ 	#define SOUND_PATH_PREFIX			"qGo.app/Contents/Resources/Sounds/"
+     #define TRANSLATIONS_PATH		"qGo.app/Contents/Resources/Translations/"
+ #else
+-    #define SOUND_PATH_PREFIX		"/usr/share/qgo/sounds/"
+-    #define TRANSLATIONS_PATH		"/usr/share/qgo/languages"
++    #define SOUND_PATH_PREFIX		"/@out@/share/qgo/sounds/"
++    #define TRANSLATIONS_PATH		"/@out@/share/qgo/languages"
+ #endif
+ 
+ #endif
+diff --git a/src/src.pro b/src/src.pro
+index f989ce7..b7d691f 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -165,17 +165,17 @@ SOURCES += displayboard.cpp \
+     newgamedialog.cpp
+ 
+ unix*:!macx-* {
+-    QGO_INSTALL_PATH = /usr/share/qgo
+-    QGO_INSTALL_BIN_PATH = /usr/bin
++    QGO_INSTALL_PATH = @out@/share/qgo
++    QGO_INSTALL_BIN_PATH = /@out@/bin
+ 
+-    icon.path = /usr/share/pixmaps
++    icon.path = @out@/share/pixmaps
+     icon.files = resources/pics/qgo.png
+     icon.files += resources/pics/qgo_16x16.xpm
+     icon.files += resources/pics/qgo_32x32.xpm
+     icon.files += resources/pics/qgo_48x48.png
+     icon.files += resources/pics/qgo_48x48.xpm
+     INSTALLS += icon
+-    desktopfile.path = /usr/share/applications
++    desktopfile.path = @out@/share/applications
+     desktopfile.files = qgo.desktop
+     INSTALLS += desktopfile
+ }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a051c724956..ae049c56e80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12938,6 +12938,8 @@ with pkgs;
 
   poppler_data = callPackage ../data/misc/poppler-data { };
 
+  qgo = libsForQt5.callPackage ../games/qgo { };
+
   quattrocento = callPackage ../data/fonts/quattrocento {};
 
   quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {};
-- 
GitLab


From f5665e9ab4dc2b4c8123cdd452ba7949dc41c558 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 25 Jun 2017 12:39:30 +0200
Subject: [PATCH 1216/1490] geogebra: 5-0-361-0 -> 5-0-369-0

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

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 2712388ffe7..b4b730d3343 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
-  version = "5-0-361-0";
+  version = "5-0-369-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "14kidnk8bidklv474zqipv3f77qnfmc697pl407v0rja481c649a";
+    sha256 = "0b5015z1ff3ksnkmyn2hbfwvhqp1572pdn8llpws32k7w1lb0jnk";
   };
 
   srcIcon = fetchurl {
-- 
GitLab


From c610f99d8fc25dbdcd8530aca17a838c32ac569f Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Wed, 14 Jun 2017 23:36:27 +0200
Subject: [PATCH 1217/1490] Expose custom Rust registry versions

This allows users to specify a custom registry src,
because currently every packager would need to create
an outdated Cargo.lock just to be compatible with the
probably outdated rustRegistry in nixpkgs.

Currently there is no easy way to convince cargo to
do that, so this makes that workaround unnecessary.
---
 pkgs/build-support/rust/default.nix |  7 ++++++-
 pkgs/top-level/all-packages.nix     |  3 ---
 pkgs/top-level/rust-packages.nix    | 28 ++++++++++------------------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 2275a065594..6e2c4455225 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, rust, rustRegistry }:
+{ stdenv, callPackage, path, cacert, git, rust }:
 { name, depsSha256
 , src ? null
 , srcs ? null
@@ -8,9 +8,14 @@
 , cargoUpdateHook ? ""
 , cargoDepsHook ? ""
 , cargoBuildFlags ? []
+, registry ? null
 , ... } @ args:
 
 let
+  lib = stdenv.lib;
+  rustRegistry = callPackage (path + /pkgs/top-level/rust-packages.nix)
+    (lib.optionalAttrs (registry != null) { src = registry; });
+
   fetchDeps = import ./fetchcargo.nix {
     inherit stdenv cacert git rust rustRegistry;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18d1b4a6e3c..d7a34f55f7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5795,7 +5795,6 @@ with pkgs;
   rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {
      buildRustPackage = callPackage ../build-support/rust {
        rust = rustNightlyBin;
-       rustRegistry = callPackage ./rust-packages.nix { };
      };
   });
 
@@ -5812,8 +5811,6 @@ with pkgs;
     in {
       inherit rust;
 
-      rustRegistry = callPackage ./rust-packages.nix { };
-
       buildRustPackage = callPackage ../build-support/rust {
         inherit rust;
       };
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 45e4d8e812e..67351b7bec0 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -4,24 +4,16 @@
 # version that we define here. If you're having problems downloading / finding
 # a Rust library, try updating this to a newer commit.
 
-{ runCommand, fetchFromGitHub, git }:
-
-let
-  version = "2017-06-16";
-  rev = "cda0f689f844710a3d73c7ff459efa64997f73b5";
-  sha256 = "1b3brl9nn3qqaysd8lx9gaazd863grqx547iw7y9j6mkcc7sakvc";
-
-  src = fetchFromGitHub {
-      inherit rev;
-      inherit sha256;
-
-      owner = "rust-lang";
-      repo = "crates.io-index";
-  };
-
-in
-
-runCommand "rustRegistry-${version}-${builtins.substring 0 7 rev}" { inherit src; } ''
+{ runCommand, fetchFromGitHub, git
+, src ? fetchFromGitHub {
+    owner = "rust-lang";
+    repo = "crates.io-index";
+    rev = "cda0f689f844710a3d73c7ff459efa64997f73b5";
+    sha256 = "1b3brl9nn3qqaysd8lx9gaazd863grqx547iw7y9j6mkcc7sakvc";
+  }
+}:
+
+runCommand "rustRegistry" { inherit src; } ''
   # For some reason, cargo doesn't like fetchgit's git repositories, not even
   # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone
   # the repository (tested with registry rev
-- 
GitLab


From 7a10cc84a0cd532c8a248d26dedf61d15615fb4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 15 Jun 2017 22:12:31 +0100
Subject: [PATCH 1218/1490] rustRegistry: switch to mkDerivation

fixes #26582
---
 pkgs/build-support/rust/default.nix | 10 ++--
 pkgs/top-level/all-packages.nix     |  2 +
 pkgs/top-level/rust-packages.nix    | 72 +++++++++++++++--------------
 3 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 6e2c4455225..36130289fba 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,5 +1,10 @@
-{ stdenv, callPackage, path, cacert, git, rust }:
+{ stdenv, callPackage, path, cacert, git, rust, rustRegistry }:
+
+let
+  rustRegistry' = rustRegistry;
+in
 { name, depsSha256
+, rustRegistry ? rustRegistry'
 , src ? null
 , srcs ? null
 , sourceRoot ? null
@@ -8,13 +13,10 @@
 , cargoUpdateHook ? ""
 , cargoDepsHook ? ""
 , cargoBuildFlags ? []
-, registry ? null
 , ... } @ args:
 
 let
   lib = stdenv.lib;
-  rustRegistry = callPackage (path + /pkgs/top-level/rust-packages.nix)
-    (lib.optionalAttrs (registry != null) { src = registry; });
 
   fetchDeps = import ./fetchcargo.nix {
     inherit stdenv cacert git rust rustRegistry;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7a34f55f7a..51014116137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5777,6 +5777,8 @@ with pkgs;
     inherit (darwin) apple_sdk;
   };
 
+  rustRegistry = callPackage ./rust-packages.nix { };
+
   rust = rustStable;
   rustStable = callPackage ../development/compilers/rust {
     inherit (llvmPackages_4) llvm;
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 67351b7bec0..aed51a44873 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -4,39 +4,43 @@
 # version that we define here. If you're having problems downloading / finding
 # a Rust library, try updating this to a newer commit.
 
-{ runCommand, fetchFromGitHub, git
-, src ? fetchFromGitHub {
+{ stdenv, fetchFromGitHub, git }:
+
+stdenv.mkDerivation {
+  name = "rustRegistry-2017-06-25";
+
+  src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "crates.io-index";
-    rev = "cda0f689f844710a3d73c7ff459efa64997f73b5";
-    sha256 = "1b3brl9nn3qqaysd8lx9gaazd863grqx547iw7y9j6mkcc7sakvc";
-  }
-}:
-
-runCommand "rustRegistry" { inherit src; } ''
-  # For some reason, cargo doesn't like fetchgit's git repositories, not even
-  # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone
-  # the repository (tested with registry rev
-  # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message:
-  #
-  # "Target OID for the reference doesn't exist on the repository"
-  #
-  # So we'll just have to create a new git repository from scratch with the
-  # contents downloaded with fetchgit...
-
-  mkdir -p $out
-
-  cp -r ${src}/* $out/
-
-  cd $out
-
-  git="${git}/bin/git"
-
-  $git init
-  $git config --local user.email "example@example.com"
-  $git config --local user.name "example"
-  $git add .
-  $git commit --quiet -m 'Rust registry commit'
-
-  touch $out/touch . "$out/.cargo-index-lock"
-''
+    rev = "9714616bf3b7836cb827d8d1eabef017d730fb5e";
+    sha256 = "02lpmjsqwa16j14y3jzgw4dpzfy001nfyi78x9b8rgp1w3qdjbkr";
+  };
+  phases = [ "unpackPhase" "installPhase" ];
+  installPhase = ''
+    # For some reason, cargo doesn't like fetchgit's git repositories, not even
+    # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone
+    # the repository (tested with registry rev
+    # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message:
+    #
+    # "Target OID for the reference doesn't exist on the repository"
+    #
+    # So we'll just have to create a new git repository from scratch with the
+    # contents downloaded with fetchgit...
+
+    mkdir -p $out
+
+    cp -r ./* $out/
+
+    cd $out
+
+    git="${git}/bin/git"
+
+    $git init
+    $git config --local user.email "example@example.com"
+    $git config --local user.name "example"
+    $git add .
+    $git commit --quiet -m 'Rust registry commit'
+
+    touch $out/touch . "$out/.cargo-index-lock"
+  '';
+}
-- 
GitLab


From ed515c80803e975e454e654d2de9e692aa1f3af1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 25 Jun 2017 14:03:18 +0200
Subject: [PATCH 1219/1490] weechat: 1.8 -> 1.9

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

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 17816e6a735..94ffda9fede 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -21,12 +21,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "1.8";
+  version = "1.9";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-    sha256 = "10km0437lg9ms6f16h20s89l2w9f9g597rykybxb16s95ql48z08";
+    sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc";
   };
 
   outputs = [ "out" "doc" ];
-- 
GitLab


From dac2a7693a27030e2f113b26d8544194504b7a46 Mon Sep 17 00:00:00 2001
From: Bram Duvigneau <bram@bramd.nl>
Date: Sat, 24 Jun 2017 10:19:33 +0000
Subject: [PATCH 1220/1490] brltty: 5.4 -> 5.5

---
 pkgs/tools/misc/brltty/default.nix   |  6 ++----
 pkgs/tools/misc/brltty/systemd.patch | 22 ----------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/misc/brltty/systemd.patch

diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index f466da91dff..af9861ea6ed 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/pkgs/tools/misc/brltty/default.nix
@@ -4,14 +4,12 @@ assert alsaSupport -> alsaLib != null;
 assert systemdSupport -> systemd != null;
 
 stdenv.mkDerivation rec {
-  name = "brltty-5.4";
+  name = "brltty-5.5";
   
   src = fetchurl {
     url = "http://brltty.com/archive/${name}.tar.gz";
-    sha256 = "1993brxa76yf7z3ckax0bbmqv6jp8vjwxp19h425v4gpm0m17k7l";
+    sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci";
   };
-
-  patches = [ ./systemd.patch ];
   
   buildInputs = [ pkgconfig bluez ]
     ++ stdenv.lib.optional alsaSupport alsaLib
diff --git a/pkgs/tools/misc/brltty/systemd.patch b/pkgs/tools/misc/brltty/systemd.patch
deleted file mode 100644
index 24a0d617b30..00000000000
--- a/pkgs/tools/misc/brltty/systemd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/config.mk.in b/config.mk.in
-index 5093b9c..b707bd4 100644
---- a/config.mk.in
-+++ b/config.mk.in
-@@ -235,7 +235,7 @@ TUNE_OBJECTS = tune.$O notes.$O $(BEEP_OBJECTS) $(PCM_OBJECTS) $(MIDI_OBJECTS) $
- ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O
- BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS)
- OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS)
--PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
-+PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS)
- 
- CC = @CC@
- CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@
-@@ -248,7 +248,7 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@
- 
- LD = @LD@
- LDFLAGS = @LDFLAGS@
--LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@
-+LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) $(SERVICE_LIBS) @LIBS@
- 
- MKOBJ = @MKOBJ@
- MKMOD = @MKMOD@
-- 
GitLab


From fd0f02628b4e761b7ecd7bced2531f41e09bd14d Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 25 Jun 2017 14:17:36 +0200
Subject: [PATCH 1221/1490] mopidy-local-sqlite: init at 1.0.0

---
 .../audio/mopidy-local-sqlite/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/audio/mopidy-local-sqlite/default.nix

diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy-local-sqlite/default.nix
new file mode 100644
index 00000000000..54501895e31
--- /dev/null
+++ b/pkgs/applications/audio/mopidy-local-sqlite/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, pythonPackages, mopidy }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "mopidy-local-sqlite-${version}";
+
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "mopidy";
+    repo = "mopidy-local-sqlite";
+    rev = "v${version}";
+    sha256 = "1fjd9ydbfwd1n9b9zw8zjn4l7c5hpam2n0xs51pjkjn82m3zq9zv";
+  };
+
+  propagatedBuildInputs = [
+    mopidy
+    pythonPackages.uritools
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mopidy/mopidy-local-sqlite";
+    description = "Mopidy SQLite local library extension";
+    license = licenses.asl20;
+    maintainers = [ maintainers.rvolosatovs ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4964553e7d2..873465bb55c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14991,6 +14991,8 @@ with pkgs;
 
   mopidy-local-images = callPackage ../applications/audio/mopidy-local-images { };
 
+  mopidy-local-sqlite = callPackage ../applications/audio/mopidy-local-sqlite { };
+
   mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { };
 
   mopidy-moped = callPackage ../applications/audio/mopidy-moped { };
-- 
GitLab


From 252e9ec84a7d00f93fa1e1ec4f3f4e706d505f4f Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 25 Jun 2017 17:41:57 +0200
Subject: [PATCH 1222/1490] microcodeIntel: 20161104 -> 20170511

---
 pkgs/os-specific/linux/microcode/intel.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index ee9d25dfe20..facab712826 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "microcode-intel-${version}";
-  version = "20161104";
+  version = "20170511";
 
   src = fetchurl {
-    url = "http://downloadmirror.intel.com/26400/eng/microcode-${version}.tgz";
-    sha256 = "1lg3bvznvwcxf66k038c57brkcxfva8crpnzj5idmczr5yk4q5bh";
+    url = "http://downloadmirror.intel.com/26798/eng/microcode-${version}.tgz";
+    sha256 = "18w1ysklvkf4l9xgnl1wvhbgr3wbdaiphv56056pafs0hwnzsxrg";
   };
 
   buildInputs = [ libarchive ];
-- 
GitLab


From 999892fd1e6b15f12bf05d02f6c4bfa409cb2c52 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 25 Jun 2017 18:45:39 +0200
Subject: [PATCH 1223/1490] skrooge: 2.7.0 -> 2.8.1

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

diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index 38ec107bcf7..c8b8c8c9ca4 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -2,18 +2,18 @@
   cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee,
   kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
   kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
-  knotifyconfig, krunner, libofx }:
+  knotifyconfig, krunner, libofx, shared_mime_info }:
 
 mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.7.0";
+  version = "2.8.1";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
+    sha256 = "0q34fh86yjd471jf6xa87vy4l8i1s3gqjzqrxbh0rnr79avns5lg";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules ];
+  nativeBuildInputs = [ cmake extra-cmake-modules shared_mime_info ];
 
   buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
     kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
-- 
GitLab


From 883148ef265761adcfde487d16f56e077bc0aa69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 25 Jun 2017 18:55:07 +0200
Subject: [PATCH 1224/1490] pip-tools: fix build

---
 .../development/python-modules/pip-tools/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index df2bcc03de4..5fa03a18aaa 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, pip, pytest, click, six, first, glibcLocales }:
+{ stdenv, fetchurl, buildPythonPackage, pip, pytest, click, six, first, setuptools_scm, glibcLocales }:
 buildPythonPackage rec {
   pname = "pip-tools";
   version = "1.9.0";
   name = "pip-tools-${version}";
 
-  src = fetchFromGitHub {
-    owner = "jazzband";
-    repo = "pip-tools";
-    rev = version;
-    sha256 = "0706feb27263a2dade6d39cc508e718282bd08f455d0643f251659f905be4d56";
+  src = fetchurl {
+    url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
+    sha256 = "0mjdpq2zjn8n4lzn9l2myh4bv0l2f6751k1rdpgdm8k3fargw1h7";
   };
 
   LC_ALL = "en_US.UTF-8";
   buildInputs = [ pytest glibcLocales ];
-  propagatedBuildInputs = [ pip click six first ];
+  propagatedBuildInputs = [ pip click six first setuptools_scm ];
 
   checkPhase = ''
     export HOME=$(mktemp -d)
-- 
GitLab


From c43a2d392ffbba0e9a4627a69c90dc30189208f9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Jun 2017 21:23:28 +0200
Subject: [PATCH 1225/1490] git-annex: the overrideScope must be applied first
 to avoid bug https://github.com/NixOS/nixpkgs/issues/26852

---
 .../haskell-modules/configuration-common.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3ee452e4845..abf477189f0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -63,20 +63,20 @@ self: super: {
 
   # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
   # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
-  git-annex = (((overrideCabal super.git-annex (drv: {
+  git-annex = (overrideCabal (super.git-annex.overrideScope (self: super: {
+      optparse-applicative = self.optparse-applicative_0_14_0_0;
+    })) (drv: {
     src = pkgs.fetchgit {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
       sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx";
     };
-  }))).override {
+  })).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
-  }).overrideScope (self: super: {
-    optparse-applicative = self.optparse-applicative_0_14_0_0;
-  });
+  };
 
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;
-- 
GitLab


From cbb39f4382a84c23ce4dbb6f77ef298e68e89afa Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 25 Jun 2017 15:35:59 -0400
Subject: [PATCH 1226/1490] krfb: add new qtx11extras dependency

---
 pkgs/applications/kde/krfb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index 0f4aecb83d4..d6de2521533 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kdelibs4support, kdnssd, libvncserver, libXtst
+  kdelibs4support, kdnssd, libvncserver, libXtst, qtx11extras
 }:
 
 mkDerivation {
@@ -11,6 +11,6 @@ mkDerivation {
     maintainers = with lib.maintainers; [ jerith666 ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ libvncserver libXtst ];
+  buildInputs = [ libvncserver libXtst qtx11extras ];
   propagatedBuildInputs = [ kdelibs4support kdnssd ];
 }
-- 
GitLab


From bd63daae03d6a3c014d0b5a526f2698c60f69e6f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 25 Jun 2017 22:37:50 +0200
Subject: [PATCH 1227/1490] chromium: Add installation of libGLESv2.so

The following errors occur when you start Chromium prior to this commit:

[2534:2534:0625/202928.673160:ERROR:gl_implementation.cc(246)] Failed to
load .../libexec/chromium/swiftshader/libGLESv2.so:
../libexec/chromium/swiftshader/libGLESv2.so: cannot open shared object
file: No such file or directory
[2534:2534:0625/202928.674434:ERROR:gpu_child_thread.cc(174)] Exiting
GPU process due to errors during initialization

While in theory we do not strictly need libGLESv2.so, in practice this
means that the GPU process isn't starting up at all which in turn leads
to crawling rendering performance on some sites.

So let's install all shared libraries in swiftshader.

I've tested this with the chromium.stable NixOS VM test and also locally
on my machine and the errors as well as the performance issues are gone.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/browser.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 75f2dcda6a6..993d81ff96e 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -12,10 +12,11 @@ mkChromiumDerivation (base: rec {
   sandboxExecutableName = "__chromium-suid-sandbox";
 
   installPhase = ''
-    mkdir -p "$libExecPath"
+    mkdir -p "$libExecPath/swiftshader"
     cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
     cp -v "$buildPath/icudtl.dat" "$libExecPath/"
     cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
+    cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/"
     cp -v "$buildPath/chrome" "$libExecPath/$packageName"
 
     if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then
-- 
GitLab


From 572786387d1669b24c84f5ec4e0ca6f8ebee4ba5 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 25 Jun 2017 22:16:48 +0200
Subject: [PATCH 1228/1490] gitlab-runner: 9.2.0 -> 9.3.0

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index e3f6e3c623c..7e11cf53199 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "9.2.0";
+  version = "9.3.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "0x6pwh3wjq2czvzb8rl8npa8a58snwf1f9dwr6rbbxijaf886jfc";
+    sha256 = "1svml4k1zkmnw49sg4ipzl4fzvxx9rbj0643lwf6vm55j8xykhrq";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "1y6i5dn1l1qlwyg95qw4sff2y9zypxwmvsw4mb0555vf157h88kg";
+    sha256 = "0xbbbjd7hvhlzi47rzf09fzcpkd7jrf80xk1y736px75yyvq3jr2";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "0gz6byjnnfn9acy40hcbyzdql4199xn0yvjx2cfjjjzd9kryjrxp";
+    sha256 = "0ddsh31sqjp9xs6mv5jbmqvjq2hcy6j21grrn1m73z8blk4ylxsd";
   };
 
   patches = [ ./fix-shell-path.patch ];
-- 
GitLab


From bb16bced36be4f61d19c7472ecb14949eb2d6914 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Sun, 25 Jun 2017 20:17:20 -0300
Subject: [PATCH 1229/1490] toxvpn: 20161230 -> 2017-06-25

---
 nixos/modules/services/networking/toxvpn.nix | 16 ++++++++++++-
 pkgs/tools/networking/toxvpn/default.nix     | 25 +++++++++++++-------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index 911836fdee4..5e13402d764 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -18,6 +18,13 @@ with lib;
         default     = 33445;
         description = "udp port for toxcore, port-forward to help with connectivity if you run many nodes behind one NAT";
       };
+
+      auto_add_peers = mkOption {
+        type        = types.listOf types.string;
+        default     = [];
+        example     = ''[ "toxid1" "toxid2" ]'';
+        description = "peers to automacally connect to on startup";
+      };
     };
   };
 
@@ -33,8 +40,13 @@ with lib;
         chown toxvpn /run/toxvpn
       '';
 
+      path = [ pkgs.toxvpn ];
+
+      script = ''
+        exec toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port} ${lib.concatMapStringsSep " " (x: "-a ${x}") config.services.toxvpn.auto_add_peers}
+      '';
+
       serviceConfig = {
-        ExecStart = "${pkgs.toxvpn}/bin/toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port}";
         KillMode  = "process";
         Restart   = "on-success";
         Type      = "notify";
@@ -43,6 +55,8 @@ with lib;
       restartIfChanged = false; # Likely to be used for remote admin
     };
 
+    environment.systemPackages = [ pkgs.toxvpn ];
+
     users.extraUsers = {
       toxvpn = {
         uid        = config.ids.uids.toxvpn;
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix
index 05e833f2f8e..c7fa1c7a271 100644
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/pkgs/tools/networking/toxvpn/default.nix
@@ -1,29 +1,36 @@
-{ stdenv, fetchFromGitHub, cmake, lib
-, libtoxcore, jsoncpp, libsodium, systemd, libcap }:
+{ stdenv, fetchFromGitHub, cmake, nlohmann_json,
+libtoxcore, libsodium, systemd, libcap, zeromq }:
 
-with lib;
+with stdenv.lib;
 
-stdenv.mkDerivation rec {
+let
+  systemdOrNull = if stdenv.system == "x86_64-darwin" then null else systemd;
+  if_systemd = optional (systemdOrNull != null);
+in stdenv.mkDerivation rec {
   name = "toxvpn-${version}";
-  version = "20161230";
+  version = "2017-06-25";
 
   src = fetchFromGitHub {
     owner  = "cleverca22";
     repo   = "toxvpn";
-    rev    = "4b7498a5fae680484cb5779ac01fb08ad3089bdd";
-    sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp";
+    rev    = "7bd6f169d69c511affa8c9672e8f794e4e205a44";
+    sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0";
   };
 
-  buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd;
+  buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ]
+    ++ if_systemd systemd
+    ++ optional (stdenv.system != "x86_64-darwin") libcap;
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];
 
+  postInstall = "$out/bin/toxvpn -h";
+
   meta = with stdenv.lib; {
     description = "A powerful tool that allows one to make tunneled point to point connections over Tox";
     homepage    = https://github.com/cleverca22/toxvpn;
     license     = licenses.gpl3;
     maintainers = with maintainers; [ cleverca22 obadz ];
-    platforms   = platforms.linux;
+    platforms   = platforms.linux ++ platforms.darwin;
   };
 }
-- 
GitLab


From 22773a20e52abc066c89a7d7eda3d5bc4cb7e37f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 26 Jun 2017 09:08:28 +0900
Subject: [PATCH 1230/1490] thunderbird-bin: 52.2.0 -> 52.2.1

---
 .../thunderbird-bin/release_sources.nix       | 474 +++++++++---------
 1 file changed, 237 insertions(+), 237 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 889d931c706..c3ce77adb9e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,595 +1,595 @@
 {
-  version = "52.2.0";
+  version = "52.2.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ar/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ar/thunderbird-52.2.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "d25bdeda7f5ee563176809811c5373d5232842ddb68315f31992754100e5cc96e5a2d0427897d245fcf9bbfc647331492e9b1fa79e0adb64f4f2169dd66ddc29";
+      sha512 = "5b19b8fb7b7a6a4dd03ee5ab163f07ee664dd7b6d701571e57b6b3943d8aebf69291958d9a51b7720c5e5935daabacfd6149229e7626557927133b00a6c8750d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ast/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ast/thunderbird-52.2.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "f7d3f2caa404fa5b97b7c966bb4ddd6fc0f26531802d4db9930d984d9b4ca635c41f9b025ca3c0ccba93a288da9c229b43b760759969b269082402584eed14f0";
+      sha512 = "d0d2a562834e865cb31648255a94b120419c7cf4bba20d0a43368a05c3590333443da9416f7940eb0ed1fd774bd161d85585154b389d01b468124b6da310d5a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/be/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/be/thunderbird-52.2.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "baa46c3e1d07b284e6cbca0f6c61710d4760f2a33e829056b8fb4e05b63162e4e4c7c8414dd9b3733c6983b74765e2ed2129122feadeb5972f037a1a739eba1e";
+      sha512 = "2809c98f9b64b778c1bced8f91657a9cb8e57963d273ff380740db9be2aa999df5c32eeca7b6e63a4db65854f4e5654cc81f58a35e26eec8038520a9e78f263e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bg/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/bg/thunderbird-52.2.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "166e64acbb8464142e78222ffb00e5ee421dbfee6789f544439963f4d3476e46795d53050e60195bbce648a3400f24edcef7a8f4cb47d5c3db0441ca564ad6d4";
+      sha512 = "cd6a67c530f7ce0e3da897ed5701ce2b85f5bcb30df8db85af38918e951e7cc75e446f5709d7b02b1f54092cd8cc54c15ec46e5bfe893cd85fccdb0851a4579c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bn-BD/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/bn-BD/thunderbird-52.2.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "817202f39eb6b0f79d07da92b7ad62c6dda9e8d196021828303030ac5eff97d5574ba99ae8a2d236cddf2eaa6cda4c85a17f23a6f84461654e8f0856156dc6bb";
+      sha512 = "f117b3f56a79b5fd4a947a83ae6a3d28f0bd83f5ecb65cde674c12191517f51956535e1872547b985a35a9c0c398abc610a3f2fc2d7c9893bf7299222e5fbad7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/br/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/br/thunderbird-52.2.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "46eab89538b48e02237950207ce8e3d955ba87c7ffa7a030812bafa4bb54da5113a3ff53bfa1e1b243a77c1dcf32b5aa475382e824538536a759da0448cca305";
+      sha512 = "72af56a4376a28ec2f3c091614b2d5907b12c2e66f2d3dda27b46ceb8b199a32d495454a2ea167180e44b1f9ef7aba89aea47bfed0976892d5d9af7102d5f5df";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ca/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ca/thunderbird-52.2.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "7bcb35886fd0344c18f29d5221d765a91da48db3c32f7be4c4ca0e9808dee2f6577bfafff32e8b9676a00e488f7617c66dc6e2cce5238569c24fc1679ac6c1d8";
+      sha512 = "85da428c53f3a2467f5be661c4f40e0f9434609fd6509e01e3c28dec522f5342d225a4f19c30a59187e42540905f156897b1f0e0ab76b2419d263923be844b3f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cs/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/cs/thunderbird-52.2.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "8bda94fbe1043168894fb70edc3d87b670830377faee7397c26805bf8c2dd23bbbb5c4b1d797468875fb653fa02b8bc211aa3766793d3f9b21a139265651692b";
+      sha512 = "f1fc63e25fd30b1f379689fbc9d7f24e94f061b39d3b0494226f25702dd6bd610dc031e2105957e2abefab1d7f8e90e81f4381f6d69cb43b815d8b80b9588715";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cy/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/cy/thunderbird-52.2.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "65818715e994ab314ef4ac8a7d3e7c61e8918cd1d0d0ea4f51461f50d207d1c998c6452740c6f3fc07d70ebc1d24e5bebef622787d8e6f79f57ace1fc85e1e16";
+      sha512 = "b15b4c2766ef32b5e8023e8002f05fa82fd1e71784d5b5f2d63c62c4b20076c46d470a253f8e0a59f1bb1425a2d297b403c32117e43ce2e4851795511604cfb2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/da/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/da/thunderbird-52.2.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "1b7166d185ff6fc8cbe826d11e7b96ccc4528ce6421a7ad73f82d9c9c0f35a8de043b30fdec1e6ea3cc6d48645f42173b941cd6f8cc6d526264d4301c2943ade";
+      sha512 = "98750936e15b469d489e31eb65935d9013a0f4250543267f03b5eb9615587f8fe592b84bddf51176ecfe0864bc5c35ad5408e42861d45ed3af61f43764f5f9b0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/de/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/de/thunderbird-52.2.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "af6005f229a4cbc84c4f99ea1b13413d5a40ab506163786cacf513460170f77b3cb866a4b76b0691facc43cdccc39de68e9010550220f9d6cf288aac53909a40";
+      sha512 = "7653e5e9e02aba7cacaaeb82e7106dfd7e49e4611eb3fb347c8192fcab3749ed98b2a2342788fe8f0e23c932ae5f9ae71266464d3d6b83629231f83ef8efa7c8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/dsb/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/dsb/thunderbird-52.2.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "c326aa0c775e414fbfab466be742b804dbb364f60b084b4890c783f6c9e7bbe5da05b09b1608d51535ec3b60eaad5f775eb36834dd69d66f18a4746b7fe55c68";
+      sha512 = "abf52e2f55f9582a5a1f5243a35e3fc2196beddb128a690479d6e82ac5f3cb7967640418f02fcc57c5525debce716345da23e4105e551ab0682dc5df5b6b3cc1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/el/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/el/thunderbird-52.2.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "b18fe1345c27095b2ea0afdec088b56d2cfccd57e285e881f1bbae4bd6eed6e39e76d24ada963d2337729eb93775d948195139815f694cb45978978a33682e08";
+      sha512 = "e86bfe27cddf7b1deb2fe499df2c37488863e5af24614986ced8f9063eb8494f64e637691fe3f69f6b448a50a655725f866313cf0a881425ba5cb669c9fb9940";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-GB/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/en-GB/thunderbird-52.2.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "622c2c3979b30f724be73b5c6bc54f944f24a797cb1c3cafd11c2a08381e692621b29eadf64438b8207dd9254bddfa8b524211f7802e83453c1eeec99ab27108";
+      sha512 = "57970ed60a24e6c02383b99ff4886ea9d90f49fe466f8175b3b9ec16294acd5900191b4a8fd7be08f5d987eebe547a9fd5004e516d13da8bfd702b82baeb7b8b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-US/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/en-US/thunderbird-52.2.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "76505876b7a408cc296ee575dea6f89db9cafd31f58e961bd0c1c5cf021771cdaa8bb4dfa508a4bde386846f97be6eccbd499725dab8e5a692bfd48125f1bf82";
+      sha512 = "787b0c18e5cf7115ee7f317d0949f7c8d35be15f3f0c6a07b75372c07992601194a860568879164b2c5a49c276b1b48c4a723b68be46b8cd4d3bdb4144db2606";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-AR/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/es-AR/thunderbird-52.2.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "38f32cb430c679c63b8c6ab7d22bf5cb2af85bfa17fcbedc94d9fafa27874b917c7f34d7ddaa6a4dfa5d1674c09b3901cc19de5e217a965890eac5ef9246b22f";
+      sha512 = "65e6d0726d733b9f4929a946bc9890e5eff5ad9e22d50bbaad40d2dc259028643e666b619eef25ba7d906f5a05d0e9ea456ab0d298cab5ecccc9a4a494a6f4bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-ES/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/es-ES/thunderbird-52.2.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "049e9445a850da0df09a0675cc9524d1bcb6ac4dc0ba8178df07ae4fcb9b4d9ff4677229968573119c5ca2c61a6f35da96167ece9d2da97e6b4e541bd9fc04b1";
+      sha512 = "7266fe0dfcdc7f119e521873ea0ddc3106c6ca3d147a9cc8f9a88d563a6647d97f4c46d26547a24afaa6b10d115a3d4effc58fe2621c62395c7fc99f9587e2d1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/et/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/et/thunderbird-52.2.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "e2bb4aaa7e6a447f63456adbc35feb56e5e6ceac791ae54a2f34eb283cf3a61565c06cc09f66fcf01d722b8ed0972e51da33a94dfd333108fee2e967346eb9cd";
+      sha512 = "048cd4d824ddc0b075bcc6d9e7a8a3905031c3333ab8bc55893278435316fd310d6002b9fa1d7b270f8b94f3bf79679e96571b083305d687c36106b903389066";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/eu/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/eu/thunderbird-52.2.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "eacfbee76dc62b15e9a807db9409d63b2991f976faa109ef5991b2a6befadfeed8c341a448c0af84d1fc8f6914e4d515860294f2e54bb97f4ce2727c4d73a030";
+      sha512 = "09b4d12b0a09de492082dc315173baccf603b387d391317a350fa67c04339b0d720a6c682e4d1c7fc7ea54e04569b004b6697d9e27a14c4f5095449f2f4e4471";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fi/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fi/thunderbird-52.2.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "c6ba259c3729535199905773674800f2772bf952a8596e11eb73785a9176072434ae47abb40c35e8cb0f66b4c46162d48ae699985857ad9a208c645cf76f0189";
+      sha512 = "21f1069f46a8dd2dc54326bfa32d0722dd5d139f3ac10702a3cfba7d5ba462362c126ac2656ddae8c2071b20e7f96ce8fddd8049b4df9d66438e7f32f53f9316";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fr/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fr/thunderbird-52.2.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "eacdc3ce1967ef7913012c448c4a4898463c80fac41fb5bf16d924eb31ea2e68e7ad46ee88b5ce107e85a18789a19e05006ae4786a5d9e9a2f93c05013aa9f4a";
+      sha512 = "ae30bd2a9eccb925ed4cf6acda17363e9cbbca0b185b9477a9b5611b613e332647907bc4653f6d677677dfca9347026d02f0aec3a42f29ed532a4b71b2c207ce";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fy-NL/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fy-NL/thunderbird-52.2.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "450011ce8012918dc8196b68a32f4b2ab27dd893a15ebd621fa17923ba5a63bff6fb634e1cc22cca3fa64d61dcc23565ceda518e04e7f92d91a0bc86fcd0dda7";
+      sha512 = "7d35d3a78f9ab79fa8528260160d8b5fa1ee0198b53b94fdeb86e400f95320aa0d695bf1b4e1c73733ba09d6bc78d8d39f1825744e49cef1a22873f35d8a30fb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ga-IE/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ga-IE/thunderbird-52.2.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ba8271e67b61e92bb819b0739351cfbfb128ecd3842f1c7ad69f7e9c26f4d52c10cf71f5d8cb45dc1f30d3168dc0acb991be4ef208e6947c3c36f4e5c0071f69";
+      sha512 = "9886d5b9654e7cfaedd5dd60c59a6888929bc2001d4c43a2cf40f92a098ca725cfee8fc819af13c5ea2c9eeeeb3d6103289124b8fd05a234eba04f4570b5986c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gd/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/gd/thunderbird-52.2.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "324044728236a52fe136c62f250218d6d2e364bda7b9f781a5f1c05561e37e09c9180733be0dd69f170e2229924c9ff7f2db10def13b86a7d21d5801d171a3b0";
+      sha512 = "18f62933d213197ae618226aea192e30875f76568fc0a17343b49152526a32c10ad79ed4d6eb36feda0c8e287d915a99bdbff70ca942b4a313ea81ca04b257c8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gl/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/gl/thunderbird-52.2.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "a31f01bf15d17d8efc645ebe4184bf4b5f02107f24765721eee87dc10463c7e8219a1ba3d60468e132f6b934f6f138b441f94d3d3e790f2fbad45107210f69d9";
+      sha512 = "c6e447722e284beba304b42d643a16b835f525d053714577425660087b03aebdcb93c57071a2e9f143ec5393616f7a0cde9a52f5bdaf42c9df1aed8b509de415";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/he/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/he/thunderbird-52.2.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c8356bc183eb9837c3049288d63e1c13098143cf7a80cc5452d9852ffd2407eb85aa5ed574063700f93fb503c53c2b733a1bebc62cb890d408af75f8e4970856";
+      sha512 = "7445dc1299038b412a39baf594c11444875d29332afd1c36a8ec603893c3f34d442566c2c18cfcee60c5b84e1bd1bf53675d1a32530dee7fc801554605d7fe4b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hr/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hr/thunderbird-52.2.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "8ed3f1c84f28a4435a3a6c9b136d4c27f6fdd3a41089b34afa04b74d5ca15cd535e179070cfdc862d3b3f5559fbafa7ae6c620f448afc8279765aa6518cdbd9c";
+      sha512 = "9812c41f77cc76a6de78ca009989623071a3b95f992658f584bfc58b5be65a3db48d9135025f578f8877bc2f9426182f3f2dff39f50f1018ffb7b6ff272affc3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hsb/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hsb/thunderbird-52.2.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "bd14c07d1c2f5b8aebbee64914db544823ab90b70cc2a4e5d9fda28e9611310a5d6a6fb0f17d07e60534e9d5082506f0ffe22b1b4da1351f5657620612add6b5";
+      sha512 = "af4fb4ca49ac982e28fb5b77d1ec7ec5be69cb097138bb7de865d8a0167b8ce13074d2b2ca80e11dbd68c7fec8533163b9285ed4495545da833f726dac484e7c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hu/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hu/thunderbird-52.2.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "9cb1430ef3036f4ce06d0734775e83ec09c551ce573cf3b50b5a2484f411e76ca09ae0295d6285d15e1f8a71f27c804f9dc328a4e4b534fbad34a97676ec2d7e";
+      sha512 = "f1026a8fb44424b95e29051ab778313c417b6119fb9959d3116d6fcace96f1786f26b419eedd7f83790c13c89aba2c339c52ca5b5cfa2d62572518cebd12db9a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hy-AM/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hy-AM/thunderbird-52.2.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "0c1d84777286fb55c2d8d25d5f5abf5498575bd09261331cca680e1f18497dab80597e5a132618019c5d03350cc4d49f4856053b8d255f8a1d56d1029434b776";
+      sha512 = "fa18a6113852d231dfcecdf682c6c1fd18f2ec5176fd9fd694a3134deb511ebaf01e00c0a336dac4a79918606136232d62f2b443ba60d25e40c573f696fca7ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/id/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/id/thunderbird-52.2.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "8adfabb7885b2442c9dd8ee1128675865690bc632185da20caa894b38c388cfff34a696c4932ffaab2217dd4c742e8c35acb2e10bee39a561aa83b19cce1ad6d";
+      sha512 = "313e713ae5d1b4bc48789c2c33850b5177d8f497d9965606ad2530f26075cded2943351da7c13057aaeab72a60d4dca193b2fc8c4b8cc97734132b721d4df8fe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/is/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/is/thunderbird-52.2.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "b5608a993d5a2a50a38516ba346cef8aa5f173f81eda2b29c06b77e8cc8964dc174fbd9a67294a66caa366956a0ae79aaf8c0e0d612935e871174b1073647f70";
+      sha512 = "6f0f8444d230cbdb5dcc81530cd05fe08ea9e2482ea7560157ece9ef938d12b7cf86a259bcc72e132717ac143a6f3e203c869f1c37715bb87fd7b248366c7554";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/it/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/it/thunderbird-52.2.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "06bb846f018d1f8cc1bbda5e707b9aff31bf94ddd8a7aaa699c67f1c18ea8a4c92657587ae6c9a07571d2a6371d50e31b1000bec719aa432404924938a162274";
+      sha512 = "f0633c2a46c66b4db18b2e70fffd9459d1c6732e872afaf8a1ef7fcac20114a09d32ec666305963acefa6caf6ec9b902d3f9d2143f68951674c12af462cb3673";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ja/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ja/thunderbird-52.2.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "9019ec44f39918796c5da7fb2b23e19918e20d5688b8e55aa986e2b8a4f2abaf6ae87149b1bbbdedd2227c3152f48e4042078c979930db5d521d3a641312599e";
+      sha512 = "5893bd100cc44aefe160a8ecfc5e9e5b581e1b9c59a1aab02ea9c63f8c062d8dc0f0c069a4a8adf4b11e5be614b3390d195df91ba3c2f3845f13ae7734e7295e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/kab/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/kab/thunderbird-52.2.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "1ed0950fd1b5cf82efe2c031abbb8d34ab3a0ef93182467592a9f77610bf494ed61a2e1d0117132abd5bd0f835bdcad75bf202588097210acdfbd67a1be5caf0";
+      sha512 = "3777a5caf8208f429db9e828b6812dd16c549511e539375ff2ecb74ddeea8b8823f93194c73fc8e708ab17f8fe37c72af6ca36b5ed0ecaa2994620be7ab21de9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ko/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ko/thunderbird-52.2.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "65ae48fbc79da6e3e20f5d325d4c93b2e945a95eaffe572c83cee08cefbe6718bd202c7e54095ef74d3069148b58aea1d2b0b795e94230b4da99b9a42fb39155";
+      sha512 = "6a3e800d909db23c7abcc10a9e07feb5df47c57c072544ba84246c84ad364c8027e6b383a65867d9d0f1523682c45a929fb1c628999b18df2c959e32d374a15a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/lt/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/lt/thunderbird-52.2.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "f8870ee532dd73a0a387c00a1295209ebb965b3e7a63abcce7f17457c38636a07334ff7f4dd99c60349e748510645487ab3761efdbde985d1f3cd9038613cd05";
+      sha512 = "486691138c9548343e6841ab1e84d2e795f280fbcfbef06769c7ad816e2dec79381a1d7bc0a4bdf0d5723d48f62ffa1acb7170ff6f1f1a5364ba6872a7b34fbc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nb-NO/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nb-NO/thunderbird-52.2.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "d4316434d0e8a824b3502bd413abe112bdb9b6da28acb39127ca83b43f8fa3f7b80bdde15758f2ca5a5013abcb374382ce79dd16ea48342fb6f6283eb242e162";
+      sha512 = "0f3745ef22be9cb7fab9d5540a1ba9433e4450511398442debce3909577ca97e1ad5ec3a41c834b31ff60852a8479321dba44559fa2262afeadc16947f69eca9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nl/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nl/thunderbird-52.2.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "da6c7cf68f5502ea29a1600f2040953dcd064859a9b82856ae419472ae039bff5c2b31f56c282961eb02ae0c86c8ce63131fdc4aaaa712da03d76ee05726ba0c";
+      sha512 = "6ad18ac7eb19eee591b64d6118de057ec49736e93f60b18ad979536a722a2d5df4b55a8b3d69a335eb0ef96451d2516c0a160a9218fd2ccd92c290752fca61fa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nn-NO/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nn-NO/thunderbird-52.2.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "9a5203e6f451aab318500eea9b7fcbdf70fcd22d6cf42e838926fa9fae14176f1abee875ac085823adeb40d2fd2e2992d538c34ad817b408fdae19248302aa88";
+      sha512 = "879e402e2dade3acaf1354b8566d1abc11994b749c90f5c1169b1fdff5ea5dd19ae31fbfd1628adaa02c93f2346c02cc69a8625de8302e9965724d8f79c5d384";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pa-IN/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pa-IN/thunderbird-52.2.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "43e86e758f547363bfd5bb1c9c16506bbf6314354aee4265fed588fc29759d87482a86c442ba9d3e16c50477c4a5542b02a1539de8833052ee23811d61bcdba8";
+      sha512 = "f23942c425238016e1a13b84e6407badac50efa6f11960c9996e4bf7845d3a56537721bb4b6e1c1002870739534f2dd7ce6fb74781bb8e9986e744f36b704c8f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pl/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pl/thunderbird-52.2.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d418735505f1152a3cf1a1c2ff36d4cba4801327b1f01e3743c6411d30b7fdad7f0ae72fa78de9b356bfb712bc834c6eef46df9c251be7d18119f5da423f3ca1";
+      sha512 = "0ce3854480f0d9969e6c836e92ba7aecca8f662aec5c7784d8e0e9986239cd8e721baf0aae1142f43dcdc54d66708fe7b7d8f1d32c3410c69306e57e1d663159";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-BR/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pt-BR/thunderbird-52.2.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "3e33431860b0f815153845ebde36de52d8bd0c2e1828e127009b467c33710c70d38c4b9f70c5572e09778b17c30f7688f1e802e48ce7cb0a6a015d0fa1e26648";
+      sha512 = "13d2b36dcbc85016066b4fecd61b695eabdcfdf729996eb37ee3aabac3b6b06fb619db915fbca6d59e4827b9e724e9ce0f8308e033c5469ac906d8766bf7021c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-PT/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pt-PT/thunderbird-52.2.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "953143e100d3ffcb76224da98ee5ae1d98342d2806565ab048fbb6d8de65f6a02c3b6dd87aec4cecff676ff724d4790964b2e82ebbc64a3eae8beb343ebab211";
+      sha512 = "9bce5873c1266fece8d14df41d44dfed545eaa7a9435336650cf102f765a99978d117c787d1ea0f0987407139bfd07765728c6fb188699e8e70dea557e4b4f12";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/rm/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/rm/thunderbird-52.2.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b5aa940b99282bd84748e47d8f51a53e250d20cf0c7b68e5f66719ae88d9c241f290b2d637fe3e711948f9a6c6df8304cf9514599d73e387eb268a1c8f8c8397";
+      sha512 = "d15bcd925d9be3d0a27478c62d178c99ed1ee474799dfb1a63b505cff3560f1d4a287a5067d6ed4b67cd05c6e8a7398a09468269f262fc001b934e5e6cef1bc7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ro/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ro/thunderbird-52.2.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "26dc1b0c57b468ba815154b035c3fe382051b638bdc673db69a88c879a8524f55a24626c655026cb67c2688a29b6c946e2b495cd7dec4f16d8fbba21d5a493bb";
+      sha512 = "7ef381e722553644d8f3842be5c0fcd1c2f08b4128a53380a6aeb54f4d7d8dba5f73ccecc60d5212429ccac96045eb9dffd77b39b42b637020ea0142daf98097";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ru/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ru/thunderbird-52.2.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5d17e85ec3eeac8ea3916f0dc71be7560bb1c4877c505a1f29421a9d496d8aafe48b9236c225f1de48a4dffbc9ed536f91dffed7d6c823480ef1e0c5b6e400be";
+      sha512 = "1f71926edd82ba36e98045e8135b4c60fcc59ab0b0a097385231a5dcc40a2d7628d6f3f3691981056f013d01a4a3b1765a58d3cab683ecd55fcfdbf1b974d138";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/si/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/si/thunderbird-52.2.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "d4599a3814173d8bce2f24b6b015492d7b24547d4e53d17cad45cc9c01c8b65be3447f8b89ab8ef2f573140ef7e1aae7eef7943102e21611525abc6efcd02694";
+      sha512 = "453b2d6898cfe04580f2846da0d534eedb77aa9627a39d7e7b6af1287c9e2feb695bf3d1e5b51b9d15f293579df2ebb1d2f9afb6cfdc3071ad24618e43ae925c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sk/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sk/thunderbird-52.2.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "a990104e68df9c2bf833c821eefdc1cbefc16f6e782bb8202683261f395f33c419afb967119ced710dc08966978043731c1adcf16dc716ff6eac8275b03f1834";
+      sha512 = "c604c83470157e881f3563c04e3e5ad368fb2d0d1cc3fb58b176cfd03953141fe037baa14120f857e238071f55ab1a3d2c1ca06c847eaabf8012b96de1409c8c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sl/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sl/thunderbird-52.2.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "2fab7f52ceebee1895e520c6d185bbb92793a31c52ed2398731c0cf36e3888a58d945d92f5777fc87a0a55b96418406a0be15cdd95b0f54482e821ea1cf29ced";
+      sha512 = "da7a37a7fe21a338ed2ebbe13e46a2395cebde8036a5544e8678083cddf092fd47ee80ad7e7fef66dcae59567cecb1bd15b99d470d4ee083d328e5c2932ad518";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sq/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sq/thunderbird-52.2.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "f201861a30f993306378043ecab288970c4a311a91a3d232cdfe9a4d9339052f026ceb35bc6dbc2bb452f58faa5e3eccd273b87e96af5cfcf292dfcf94612077";
+      sha512 = "1b1e592b2eeab57e843eb4fd6745886946dbba451b5bc78e2212400a4e10fffaa5159034e8ea5d32a0f3dab7527e91b642209a7233140e0fd9c1c44363da9fef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sr/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sr/thunderbird-52.2.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "6f8962d8c30086434764f0d037801bfefeef13c67e46f2b639bc4f5a93ac0094630af375bffcc54574d50ecd8c7b5c5decdd9e2083666dc4394e6237fac0b746";
+      sha512 = "836d1b2c786e787e07be4df837efb2051f8fb5a964facc94e82cbc05aca77ae54e1553e285a868f4703b48e72e2a0b739ae5e92e7b3da55e4ffc70567e1ce992";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sv-SE/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sv-SE/thunderbird-52.2.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "b29f506138f62350717ba2d2881cf8852dbef0c9797da64b9d5d9affa884cd1057483e2d0e357e967d9567ff4e861d1ad79596b39aa02a36087041e1f94d9d67";
+      sha512 = "ddb52211226353c021350dd94014061a42ce1ee06d2b4e8c612bcfb5e17525bf41ead152f91c466e69ae3041136fb7350ec58de21ed2726cab2d6695dacac332";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ta-LK/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ta-LK/thunderbird-52.2.1.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "3bc50fdc95776aeca2de94fa1b895d5a17cedafb95aa08f2d0100fbb4c3acd31990b96a57fad451c82b56d8cab7ea5066642da7b000857f00ba8f0bf94051f5a";
+      sha512 = "c8c79641c7d80391d5007155b4ec3bb0ff36c2ae3e1dfb908013274ce6c64e03563a68a2ed4fbfed8e4684c4c49e7f9710050aab6851cbff2e77609ce6e25f34";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/tr/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/tr/thunderbird-52.2.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "8e1481a03ba5de00bc64aa252f779dc0ceb14c238985d11bb49467a719ca88bc4e7946086b039951f03ed43e11a15a5bbe98139d158f63dc3cdbf01686ec91e2";
+      sha512 = "3c6740c9512b0d2d7f809312ba9f375be8635dc41a477e5084007cdffec9fae3c3677faf96745b61a384a4b899f48c5e9c239f52549faea00e198539181f8ba8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/uk/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/uk/thunderbird-52.2.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "e9bfce635b1d56d646baf06bc642a7914846a6a796e983c4b0f78b912833ccee850719f0857ceb7199d328415a976b436706d72c95f01da1d0d0b4c0c5d0d732";
+      sha512 = "0950bfca73dd4907e493e9b15667f70be1f1174ca755baeefbd2ed40160bec3f41e1c67207454e31afed919bc72314e671ed47492509c9b2c0c207bfe3e22088";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/vi/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/vi/thunderbird-52.2.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "ea989bcf275162c8d72ad595bee767b9652f192ac18f61119cae8f084f9a25c0d0a83caa14cbbf901fa675f1a0c0a6b40ef46454f9c8f1fc3d5173a0ef1397be";
+      sha512 = "0107c16694feaffb18160e4eac666ec840b7efda706ddd04596cd4f54feaad07a95e9168eb8eb78cf800b4c60f3f4d229d6d217e3d3c681d2a2b0182ff65251b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-CN/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/zh-CN/thunderbird-52.2.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "35637dedad6da1662057fc1506b2e21bc6269eb0256e332ff6b12bcdb71906e28dc0f361bd7aded2fa52d982589f0e319667acb7ccd405e2fbfa8ba991e5aeb2";
+      sha512 = "879cd62661967b85919fddc90658d40a3119715eb2cfa95edfa60e7ef3dbc3eb23c2d317a9c632d1c2055900f03e8437af635d72efbf14d7b9fee7f87ed5b19e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-TW/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/zh-TW/thunderbird-52.2.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "286ed00a024029f7e6ce30709cac3da3d6bf00576248622a09bd9ce1ae2e965a0fe158d718d35f1e088f51ac4e271d57aaa98446c87c0bdcdecfa0d36d988e92";
+      sha512 = "2c26ff8ed886aa5abf82511bb61fe96fc5817b211dcbfaf91deabb992b1cc968baccafcf1787b6f11b26052e18ff7f0da1d86de7ce45579bf2f6f403b11e9613";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ar/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ar/thunderbird-52.2.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "8783d0cfba31ead11e49bf1a8afb5b66b1387b29681acf3c63217ba4a399a6fe496eb0357e0871c98e8b6465abc6539e6ccbd9d40e799e04674f3ab2dee25390";
+      sha512 = "5d0971ab1c51c50a9f44967a13ea7c8cd7828f14625c5d5fc02ef001adbf69f7895ec6aa691a05c7a5ce5b038854d4dcfda0204c50533b028c2458adf5a6de97";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ast/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ast/thunderbird-52.2.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "213f0457760072fd2e6cd2daa56677d8b67b8c345f44faebb2623f073ecf141ba4d30d2176fd5680efe91e46086b4add86462385fe5b9e72978cf2828eb8ed68";
+      sha512 = "26e55787bc6e7a9fa8e3a40d0cee9912201026ec04454cbb117dbbad97d448dab1de9aba0c84e8cb10dda5cf818fd0c98116590b9e62849b5b714e63029d0fd7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/be/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/be/thunderbird-52.2.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "645d7eceac4d98ab37b8c85c2d0c58499bdba1c8db495690bc665c80b5aae414b0a8caad16931a74768137812f3ba8ce173f5080e95bd44e95e51d6f544cbf03";
+      sha512 = "432295c9cbcbd59ea6bfca3d3509f9ba3ea07bc4004cd96bdfaff468210f30f9401e372c1f19c6504895e35db907d35c282d39666eb1c99e5362f46fe6dd9ecd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bg/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/bg/thunderbird-52.2.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b9030a61e8d964dd18362e472d18d7a9d6a7636679c016bca82b254b06e221c6551aebb166f829977fb4f0d1809b18b820cb1d842e6949f44dd4e5becbf98651";
+      sha512 = "137f4baad093df14da263ec707aaa64edfe0972b36e6441b864722a1577cc1683d4205649f79fac9262c5a53f7adcf045991bbdd3168cde74365ca2938bc8df5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bn-BD/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/bn-BD/thunderbird-52.2.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "fcf50581bb2f1548f4aab01b8f7a89e351e642a49ca76e05fc47d77b9e2459f2ff700501079180b92120727ab2ba74c3c6990fc7d6d9018b9ee4ec1d27c42aaf";
+      sha512 = "fc33faeec367b1161c969b82c0ec703fd4f443908284b0cae309f44942473cf6042723de8895442ca21da40d404f24a8c1a490313352b95cb949e568db56b953";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/br/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/br/thunderbird-52.2.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "5359fa3b6f745db0da286a0180773d3fd43c446c78d8351cc0c5589ade332fec5ccb6106a84ed3bc96e34ec7ca2d72f93c22f6653aa39250df05b0e39108fa89";
+      sha512 = "69c71b3af91d6bd5c63198937f43d5ac4c29c1c075b9faa64a94362cc544d5abd9182b339936a88da87bb69ec3201c6b54185c67d0dff1defede541a48d721a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ca/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ca/thunderbird-52.2.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "e5d6d77ad204d279abcd34b9734ef5489d5b8522558af7cfb26de77fc0d22a5ce669dd6ff9fce7046745aa9ef75323fadaa70ad3ca4fa0f05aad85add6c1e7fd";
+      sha512 = "b3b33c69e411cb4e920a72cb9a4eaf41469c709e0b04199e53094856121ed7fefe84d3987045442317dfed27069686692e9e0ea00562856a15c916c74c4f8e90";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cs/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/cs/thunderbird-52.2.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "4bee0154e7f1658ea88c7cf7cb5d89e354d29516c727090bd704945ecb2c0988551e98de2c8b44d5899e44ae141a6e3c230550392d34b5dac121cd1c4d6ce994";
+      sha512 = "c38deac7a95fe30166f8a22e6e4c76039fa3ec31ddc4ffb4e84f78c549bd76ced476efeb0b4abac0d73b4f5ab54e6f9a7181804450f882c123f41b8c2dfa9f25";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cy/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/cy/thunderbird-52.2.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "23779727198092d4d8e7ed1d40615b020858999ae5023ebf81553dfdc62b7cc03cf864eae262450d75d6088f6b283ef7f791073901f5fda367df96e291e9537f";
+      sha512 = "0ad5a4e40d03d0f329c479c56ad43a6151e262faa225e6f0280e4e60c7a13dd2ea949695f84514034031b796a8cf190fdab519cd58d998a254ad9238c337057e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/da/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/da/thunderbird-52.2.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "e780597823f156e273832ff731adb2cb39a58e6e232d910f9f0a3b05dee68411ee3e8345462137d74a8aa2a6dd0c3d5e93bb889bd425c051ed7befcd4da5c711";
+      sha512 = "e681d601bbeebad6c2abbd7784041b700bf0d2abcd490fa41165b608334e3a98ab2a8bd2291935622788c506c475de89ab5a868be734225219c499ad147d02be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/de/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/de/thunderbird-52.2.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "1c35b4aab4bb27569955f3c29034e8c301c32d24547075c4662e162bfe1c19feb602b3fcc3c561956651328fa33605f60ed29ae52b50b06eecf39e43e82663e6";
+      sha512 = "f6388f6992e1057906e5343adcef5d3cc08c983d3319b2880190d7ad3a42266c1635f5a04914f44edea6487dbba64ec8a916383938d6c1c064eb06ead06da39d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/dsb/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/dsb/thunderbird-52.2.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "59fb994bd8b2db74ae5024e8c2f6c859b93afd247a159c552bffe8c2337a0d4229bd17433635f8c87420af614c7725af7b0ecd144938654f9372fe6d39a4152c";
+      sha512 = "661f1eef600803d2c76f623be25a0b3143dceda01e146c12075b8aab32112922bdfbdafcb0d1f9be88ec1414f8447a7804494d1b5e6ab91873eb5ab00039e29b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/el/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/el/thunderbird-52.2.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "87e43e3c66db44c6c1d659eff81b72bae4d6961045c37ce776531ab6e4f4a3e6c8d3774f39fd437e5ca4cc289bbae25fae8dbf8ed3e21aa2327cc166d4f17f47";
+      sha512 = "7c6cfdd5c97c7a721ccd02ecc6d000d759aafd9c1a05dd77da09ff077f2a284a5349a5c14371af35a5a9ab4829e4fb93d93042d75fd9eeefb95e2fc368dc458f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-GB/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/en-GB/thunderbird-52.2.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "b397fb3142c0693282405d9e6d4515f368b3c6aba581e6eb0712c3d161f8fc9dbe034a913a67ea034dd89860b32072f82dbf2b767bd0c360f3bc9c0c8944d045";
+      sha512 = "a76afaab47e279ebf5ebacf510a1ad39cebc7f1abfda826bb9b5a6af9d4de9a02066f040affe33238aba40e875402a35aa819ab1f4895ebafe370bb3d32e7d74";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-US/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/en-US/thunderbird-52.2.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "05926a74f6ecef5caa43884a3fa2cdf85f40c53da58ffa24cdd2c8c31efd1b3e90a0d06ddba33d612a3b88f31d4c72fe92f49e31b4f3ba3479c510a02d91eb33";
+      sha512 = "09e72c7a26e52973bf63e18e8c85f49c0aed00a7b4ea238bcb82c55964a019965cc24f5e71d3a7ab6f5d8f288a64609ce15bb584a2fddc08aea03ff5e6d071b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-AR/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/es-AR/thunderbird-52.2.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "4652c005c0c28760d1a2657b691b13fcf7882763cff4ff05313d1dc5786661e76ca74a4fa23e1e71e4315818c9c2a386407151a996fab4d2f3bf343a353038db";
+      sha512 = "412cf566707a02d62cc8a60d65a1974c608eaaf4ed666830facf137f7611a0346319a2cb560ae04742bffe776299facb7ea214e637248774bf406d5e7aab08ba";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-ES/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/es-ES/thunderbird-52.2.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "64e8eedb59df8ebc5a568aa05d0df5217a3c91311455a090b4614dddbb2bd0d09add02e11c712b84696f3d203bb5503959dee9ec8e0aee7ba5d0ef2e606942a4";
+      sha512 = "a56988ffdae668c2321f999b0cebf8008bbddbfc3469f053135d848d4cbfaccfac75ae2db325b6a080eacdb8ede5dc91e8c2fa2be255b2e72c3a47c761e63f02";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/et/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/et/thunderbird-52.2.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "2773894ea50cb0bc889ad1cd887bd7c34d594a19ae69fe48cc181d5bb31a9a15bf6e0e41fa1493ff86e481715e888d35db5b100b22516b187cbbb4e35f36fdbb";
+      sha512 = "0df3306cebff726d26cd3b46e8ef14ccbe730ff2002b80c463185c6fa1b491eec1c3262dc792db8fd96da2b4394e00ed8abe21700f85cf2f969dc8bc9b548421";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/eu/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/eu/thunderbird-52.2.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "8a73144e9085f4f07db7d24da388808ebe94b4cbd2c3cb1f327ed0c44a3144c94fd61171b74c18c3e4ee72fd809791a8c942adc0a4b3bcaebaa2f02dbf26d572";
+      sha512 = "ddf6542c17196aa7877409a4e37948eb351ea4fa7e10dfae21e4b8c21aa92b8bb3065c504b526784efcaa41c621889bc5ecebe4cf95ff56b0f2788d3b5cb7190";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fi/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fi/thunderbird-52.2.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "ba53c735c136901bbcfebff6fa646d884aaeb919a77744c1ec412a109f39853b2d74d70a56f85e4bdc3b7780475283284c46b0db79c64980a7655eb8f0bbe0f6";
+      sha512 = "e86c14d4416939cd04d2a23849afc3cb991c352b9bdc3ecbc8f83aaa14360b30c706aa74ffbfef2bd369f62610c057232ec9e621871010d187965c177ed06e85";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fr/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fr/thunderbird-52.2.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "fe93f41bbf357eb1b60c0418dd64afbb37310ec25aeb66521472f84eebc6205d87d19090df6f38de3d9fee29f7f961e68e9794a65f51a0fcd103a40a16a919fa";
+      sha512 = "b0fdd4da60b3278e4639a17e896d1c817ab80a44207edf21845614a8c32c70bc2094184e8d90e1b831a3516dd5b18088f21a35b09e9e8c52d72ee41764bb45d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fy-NL/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fy-NL/thunderbird-52.2.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "1739f96789414049ebb5a8fa47f0455a630bdfbc9757fd96f81a8fe0fbf6c0b522bdf04a315b590c968d1832ee2faa2bdd98fa4ef6e86cd8ab2d0a338e8a47f2";
+      sha512 = "b314386f0cf27ee7f46f703c50eec9bbd879e0bc6c304c07f75f2b1455bb29c067c9c3c3d168fe3986f3018c406cf10815edde01a74764aa6d3f48a3999ff409";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ga-IE/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ga-IE/thunderbird-52.2.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b42fb3d2cb8ba5be74d3f4212aa80fbf2af0366bdd9eceba69555eb766f0a96c1a8092a3b1e39c0ddc8bae7cc7efb59f56806f90c0de95d3073db15e3d894a20";
+      sha512 = "0dafbe71c9f8da9bb6b2c2ea29498a9e6f120e59d6f352d96c89a2e3c5ea1b2b072e91943490320ba52e070fe5b2a39332945edf34c729b672a83a2afe16a86c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gd/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/gd/thunderbird-52.2.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "0921d25bd235d2a234c75f24297ef38568d0532fbe1dbfe98f2b9ca3641ea95db6c4df0dba3f8a8313a2fd169d2d86f7adab21db795a96f68fa566117db2c2e9";
+      sha512 = "50809368c1fdde1181e163c9d77c79191454a68d0ebf4429d52c4e95ebf651adbfb7769b07ba4e3b365312ff12ed2fbb96be60dc3d90c6b8fc6fe35f3ea8c1de";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gl/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/gl/thunderbird-52.2.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "7fe9346fcb26a7d4a96cb6cd2d804874bdf2f3f89c9b9791742f9a2a03a7a865fc20766f8618c04e7d7fbe1fcf0fc907b4db5834770218f4e1fbe8d8df37e94f";
+      sha512 = "f08d5bf61cca0e2fce5894619736a267be1851e8ad66fe2800b7a1dea2d847300bfa434c9dd539eaf966a63ee32a383cdede9029ce71758fb88e3fa6b35670d7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/he/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/he/thunderbird-52.2.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7082a591a52e8a0e7bf112dec08dc3e130791eebee6e7d39baf052f40b8b9fbc350518b7785f3bf7ec62df8dbe05a256fa322714ba7a4f704a9cddf40cd4b11c";
+      sha512 = "0a0a502e8da5945057c30f5a3de0fb623111e48d585cb7707addf0ea608e8683a882c0525e19ef4300f3d827e8d7989f09ff643955b3dc9379fcd6506e1415f9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hr/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hr/thunderbird-52.2.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "397a1214ab27b187df6129f6f2f863ec1b76ce2af41c0ef5650f255451c57f07741f6a7d0674ad38432c7ea9c95fc2b36606d31defc698fffa4b676549b2c197";
+      sha512 = "954cc5c1f3687945c6a66698ddb45ce74731bdc72f34b9ed874883b732149ad9a50773acfa1f19eec16840be3aeeec7d37ca140158def750c68d7ef6d5a2ffd4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hsb/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hsb/thunderbird-52.2.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "f0c76d90ae2b47e8d5c66a536ee1b2572f60164f76424b61b491326e719f4454448a9af4b6ceb8e1055f7e44adb6490a0fc4df086c344d160861d877766e227f";
+      sha512 = "15b7f0ae3741e6578e492b14ba3e43dd60e6d9f3768053cb43cd88d91d40fa247b6035b9746c173d272f752d86da2f5778779b3e3677792b976da68ff460c542";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hu/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hu/thunderbird-52.2.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d26eb645574d9298c75bd334371fc7a4baaa9b358b37c5d8da6e61b6d8fdf3fe165a5ea1855a840a742c6b19e3a15fbe7879e43bb29b187daffa63c59a863e06";
+      sha512 = "32938f7f6a4f2f611a6e057a5eef8a1af67eee710f8de6053d4c9d1ef9b92fef5af29dfcc3c37939811f07dbdf89c529a9481ef4823aacfab7fa753f47144a5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hy-AM/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hy-AM/thunderbird-52.2.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "add66a00fd3a8be7c71276d02588ffafd0ed0a8b2e4875dab3b82e4fe9b2be3964096509ce6b0e67350f62cc814b7c7ed069f481516f72f19a8039967123346a";
+      sha512 = "0cceb38a1b6d679b3a5dfa63a44b90255a271ad0b9808d55408fb18cfa1e034b7010365b32a86cd72a29020fe211f404b7fc640f2b24428c3bc3945b4970ce8f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/id/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/id/thunderbird-52.2.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "b793e65e9e9f8d30ad0193f019acf33bfbfb165313a960f120bfabeb4df0c769cc9fc5b7e34ea05eaa085a5c0872134d606862b381852d04748c2e97ed1bf9f7";
+      sha512 = "89b8172a07ae809b153ea6c48dca1bf0ae7fcbc7dea6e13b78bce99f2e84d6bb3d23e3d7955344e71c918b1c26729b920429c1efdb6a4bd5db1bb24001220ccd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/is/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/is/thunderbird-52.2.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "d4f163358a2c8830e3a77a5a82b8ee42d2aff39f19fb95171a249d1cde5119c66ee29bc894f5e6ea023c34e030282194025b25c04af25f647df8745d2b8aa2b9";
+      sha512 = "54875ec1b89501f52ad3525233ee8f7c9f50b1cf0b3061dc734a0733c0cf72c537f7279729b1c3afcfcdc411f708a519a4585877858c5c040e7455a0c5d30342";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/it/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/it/thunderbird-52.2.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "9e73d51cfac30480fe0ef46c02df12c771fdd827bf4c2971b99cad7b3db42d3d60a2355c20c0b3601c7d27be5b9c2d1748a1e3b8954523ef919d120429153103";
+      sha512 = "4766a810c7c49049ff20e52045100ab4a46a687e37613cb6161e680cdffe6fce708251a830c2b38f9fa5e93d6c31c5afa0856a79a20a9ac972c1624e77da932e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ja/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ja/thunderbird-52.2.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "ce3d8342c0fc63a9c6ab10a2d15f6ef79d8d827cbf542cf0eead9d01d1a26567edb48269ba2ed66dcf81bf83e35a120190614f740898181a3b2cd7fcbfd5e739";
+      sha512 = "ef031bb68f1edf02c43887ec3c7d092c43e3b0694b18951997a3e2356675e09cd1f6be12a33945f8ebf877678c86266e61e1d3802ffbb42c7a7d1c3832f25eed";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/kab/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/kab/thunderbird-52.2.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "9ef94353b58ade84737debbd58a26aca9b8c5358c3fb852f2dd925e9c8eec46f091d4edeb0a4fe46da45eb9860ab76f43a97605085907fa79d2ba90751ea64e7";
+      sha512 = "6876c464c3e23640a3a03cc977b727fd1fea9925efacf9bb8a14afa575ef88041b85dc30569035fab700663eca1224928584b98b99735fdd6a68d9f00071e75a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ko/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ko/thunderbird-52.2.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "651ab9ae9b966e10f420802937140a689a3c925a67732cc3082e8f265d2f98fe88195188632386d64f892338b1c4ba659c7e475951810d5b6ee48a7339155413";
+      sha512 = "0e2f64e9499d0cfc7597fe76214de6d9312804eaafdaef07d95e8ab84927db1d27232c9ac8b9283f24cf04e8bfac8667a253e7e229116e9241005ea433476019";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/lt/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/lt/thunderbird-52.2.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "f64c0869033ac939538f982ff66b0a88cb566e7000838e549d63fa6509afe8a29865fce3cb6c7fea84c78b5ffd07a4f8b11b44b14c234ae957f22439f7a84a99";
+      sha512 = "6e3c400dacb213a767699263a7106e08183d7c8b0fa06976ff5626aeb35be1d839a4383fb7cd61cf2437a1ab33e6315fdac8b921b2f0967bfd991a90ca2fe157";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nb-NO/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nb-NO/thunderbird-52.2.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "9dbd31177470ba94a646d7d63890dcc2465681a4c6fc684f7cbe61eeebc788c03a863ed5a01a1baeb26ffa61d7af4631bebd74261c22ee1a109ceaf928ce4925";
+      sha512 = "dce647bac69f3d7d7bee0e3ef622eedc6f7d97adf991a244718f24d8ba2c33a75c470c05e95d66109535a832c65d6cd2c064157e4e9806e44cd0f6f950de6de6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nl/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nl/thunderbird-52.2.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "3616bce4895db1c2f3b02773b05586bf6e38550ad7abd5beb3b31a6c5b414120972b5475c080bed782e7f2b09fe47bde3e5b41f4c3fdb7ffd823767c976dca0a";
+      sha512 = "e797cf5d6300b6478435c554ed39d4d1ef5ff9a61cd47557a2db1766912f8da9b1e60599b66e35ca9138d3e04e234b2f443a675d0329639b21f37cd787faea4c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nn-NO/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nn-NO/thunderbird-52.2.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "4ec009d5aca053ffbbb6cd5c84572f0305f22f33cd24eec13eb3fd04aa4eccd3447701edb53e4929914ebd2f7acc8e3d7f8e5d91c9e7a7f0b9e9c18493f74d55";
+      sha512 = "f30cf85b92a024a2c7133e97203c60ed18d2ddba2ddf081779962ea1af2be893cd820638b08dbbb09304ff1412df94a4dd5f6e9e05b49527a5d6d15011a4f024";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pa-IN/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pa-IN/thunderbird-52.2.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "584c5cf7fc62f4f6435d9ed2ba9aa200012aa65e7fcd249aae10dc2b3dde8b4db724b11beb206a727f3eb2f60e4a8c0e5e1abbd4e621645d651cba449bc4a474";
+      sha512 = "b6256747abfe759c0c65a0dd3431e9e498339259caff450b0988e1936ce10e9f2f019a241b21d7f2c1e9911e4396a055ab9640fcfd9a22d5f520ed461d476411";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pl/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pl/thunderbird-52.2.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "aa02a2910513159c2621dc17aff373a8c2124bf9aebb24bf54c239d823d0080a1c05c330185af5dce21084d7ac9060a2b8daf890a3227650416d82afd0fa8e9a";
+      sha512 = "a6cd073fd83eb0a31e1cbcadd149e5c1be90e0bd8d890cde0ceec19bf4be15582fcceb5d6987c1682492a4e6370c215995c3ea49f3ae25529be6c5b1534c198b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-BR/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pt-BR/thunderbird-52.2.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "b5b2654bf153bd7f7c85534b95f836892550e519e254312584b22981bcdf7205f31babb5cf32033f7d676eee2bf2400f88503b52268f2ef10286da82b2713704";
+      sha512 = "016eeaa8804945f34a89d0fbb60133f1e0beca5c6ccd695201f09ab8fe529b85f98f0d992875ba8ce866d147ce9f92807773d44f9932ba1de73fdb1398fdece1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-PT/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pt-PT/thunderbird-52.2.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "3d557b432531a757bad6f18754b9d2fb2359bdba49f20faf797f7eba821926aeb8476c89a93b475273514bf26a6f471637505c5eb8a1cc08d1cf830b28b21fca";
+      sha512 = "e76b5313089da90a6cb34190bd07e65cb7fda4a34ee0581009fcdf9d0135c42b698f2a6c575cc13e63d749ca0ee0f3485fb05308419b5f7e72c9a1ff89601a69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/rm/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/rm/thunderbird-52.2.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "434122ff7524630ec45a7e6a0e5f90e74ea1397b31bf67ce9e3046f8a31114a8320e56a5dedf1686e2eebc8c648e4a94fd0cdbe523bdcd6312448100d548e302";
+      sha512 = "fcb0fc5ef00a370396f01bdb885f3bedd551344849f6eba53057506a573486af5ec781f2850aaf1e6fede9a3613c9c94629511c0a7d445565db8fe1cabcec29c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ro/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ro/thunderbird-52.2.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "6f2c74d119ad7380961c50d5bb91afd4bb9455737776a08eb5168c17e83143fefacfeaa3b98e1816d1fe96a7f2022256cd2acf7b697508e4139d792562be2176";
+      sha512 = "fafff899f366c17bc81b4432a4b1c6cae8fd6bff6c307bd377a314b9b4f520fbce4ba23b144a816d24fad65e90b33e17b25767c60f4ef10136dac6701f3d326f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ru/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ru/thunderbird-52.2.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "d9eff15876619a1bf0b8467847df18b0dba20c598e05428037b81e0cd90797b8baafc44541fed2a29dfb27075da19730919159495712099a54c9b488a693e3ca";
+      sha512 = "0a0598479ced443e18d9b29bd0e0deca39176303f81e25999282af9fa1d67ffe5d0e66ad4f4461a24fbd94ca960876e2836ad2d69ba0fb4bbe81c1e471555625";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/si/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/si/thunderbird-52.2.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "a2e58a6b2632f8c2f6eaf6113e2af9e98ea222c5d2c98f0cfb4443804ce260bb3dba64bd5165590563fa946b500bbaed4341629eb25ea0c5388c61c69f4be5cf";
+      sha512 = "5aff4f01e7902140e817b206dd543a73b003a808bea448478918be7214de0601568151814baa96c4ae2ea193c76e7c8daa411f742b719df34dc275b4e9f8d52b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sk/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sk/thunderbird-52.2.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "0b26b3848864def3a5b485c2d67d3c907b58d9977ae91db58d91218da278243c04eeac781fe0063b762d0797809dcbee18010824aa5d25926f8f48011e2a5bb4";
+      sha512 = "560557b1662f58311a2ba694544a6b329a4fa709bc1702e12351c90b2647b974ffca4ac7c78e0c2430193cd6fcf194fb40f078c8c7c4cbb628e9b8e4a8abc37f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sl/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sl/thunderbird-52.2.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "7158c776ec3776ac269402973482e2dfedb3c17aeac11fcae3bee6a982717443068223cc901ee71e6b7a42a8073f05d2a54047804997d992761fbe71d46bd223";
+      sha512 = "c3689c69bad7cd2f8ae58e430de4141b593db86adfc58e1f4b65258aa2a74c68595bbdaa966437a732502aae8f8c6952e10a27e453e632e2a162457261426a55";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sq/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sq/thunderbird-52.2.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "1a838db31f4db574669987614dfcbd5f7f1eb061dc4f2fd0c9ca206d5a5291ac348efce3ce59b30f89fdc375e72467531d9d96b8ce43ffe28e92916f2864908c";
+      sha512 = "6ab246a7878e68204c2d4548a1583edb7293a7d7c671ad2be4767e098d7e5ab2308e5f5d8f02a7081bf6aead42207e88b16a38667ebde5f76bfb8fcf398545d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sr/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sr/thunderbird-52.2.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "beb9eee26aa5474ac5e70c168e2ee32c84216d919528c9edce4d45ab6c522d5fc888ba2f8c57cfcd47d299367ddb7c367dafc9ccd3d29c5700de28eb2efe08fe";
+      sha512 = "923fd4d862bb8c363f20a5f05dc67a98de3266b961790299c667492c1c528b860524bf7197377c73f68c849dca8a96ac7adccfd32b0e9513d631550e786c43b6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sv-SE/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sv-SE/thunderbird-52.2.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e4c2320e547b2e61991feb586b7f9e4180cbeb88dc90cd0dfd2c026b062e4e1858d1d1b331cfde1e373cacec2231f7cb2ba61b5e4ef02a36802edbc96b39cf72";
+      sha512 = "81d7662ebaa211208f435b8d66a5766289ca9bc897c81aeef9666f10157a5c6b3cd5226585e144ceb2ac3a2ca9edb336e82e4b3d9097e4a4097e5b6de5626e1a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ta-LK/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ta-LK/thunderbird-52.2.1.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "aa42add8ba31edb5a40fd62304f10ac55006918d5196f71ca0330c3ca52dbbf4d9b5d39a07e977ee89c6b913e6ac4d4a4c9460da194b41760826d96e89e7bffb";
+      sha512 = "dd8bd65fe029cb0fa7016119b354fc0e2d1a3bac2b89e899edcdc03e3514aad4ae91707f72d19156b1d24e778f0b7a54fbbdff049e553a3daeaf56c6486dec47";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/tr/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/tr/thunderbird-52.2.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "ceb90e08e906d5a2520152c40c4e32ab85da31c746ea285280b6e9bfbd60e9178886799357f39d54e0e072c616059ae7fe1948c39f6152b5f0d1b196185c8475";
+      sha512 = "3a71dcf6e9562d2e196e7bd76c662f5181f11cc6cc121a1ed1724e13e5e897777f1c36a4eeef36bf8a606ab8f13fbe8c4b3b345e9c70f42f8c22155ac7da3963";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/uk/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/uk/thunderbird-52.2.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "9d9fc486d556dbe3a216a3d4e822750cfa1cd0348af37ddaa5a19f9c390170e348a41b8251fff1499d2dc6d92feb34061286ff5400a4f9b6ed4fdee27064078c";
+      sha512 = "6094592ebae6b37073e7c15da36f5fd39ccbbfbc104dac8faea889ebf00f9c6e7cd5f0a2bbd54b53c0495a7166ed871b7aa4c3abe4b97827d15646b4d002b010";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/vi/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/vi/thunderbird-52.2.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "010bc7ce4ee4329857291796e2077e0872593f2b52799b1524720fa7fca11f2f4b760610bc97db171421552eb59a36725f80d4852cd77d30c8e7eb6c6c523d2d";
+      sha512 = "f96d09771ebd3ff63d35f95e42e77b2227c5b48a459f6e1e782a1259a845c2d6d819afb3a12333f19d5440cc6098db98b502514c5bb68c509a5a4778a5b88501";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-CN/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/zh-CN/thunderbird-52.2.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "c07d2559296acb160c19af2db9f516254d33e1d55c78b2397d2c28764a8296e3da0b74409d48702e889bbf34f06115b493bbcea2666ad8b4884ea01fed6ad12f";
+      sha512 = "eba8d0ee4cc69f386dc114019501fac6b5ebeb3828755062167519ca062fa1e60d2327aec6db647459efd9ce83d31dbfeff28ea7821f52e9254de362a46ee472";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-TW/thunderbird-52.2.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/zh-TW/thunderbird-52.2.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "8fa1da0c35584cfb8013df9e86a37268e6ffed1ee5ba4617d3db185975b874af5dba3f3af5498b8ebfdf85e40409fb9fee8d517f84f4942cf69deaa94f3c64a1";
+      sha512 = "f0af41f4faa7259f6caa2a675e60880aea434b0f2bcbde3db00001c32362c001c92b10c14d06d1ea344390d16e20f87f0cb5a7e7ecfcfbb0b3ec1da9ece8f5dd";
     }
     ];
 }
-- 
GitLab


From 800deb5273ead18f585beedd8fa715bc938a9ee3 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 26 Jun 2017 09:08:38 +0900
Subject: [PATCH 1231/1490] thunderbird: 52.2.0 -> 52.2.1

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index ccced87a550..4374e51f6d1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.2.0";
+  version = "52.2.1";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89";
+    sha512 = "f30ba358b1bfc57265b26da3d2205a8a77c6cd1987278de40cde6c1c1241db3c2fedc60aebb6ff56ffb340492c5580294420158f4b7c4787f558e79f72e3d7fb";
   };
 
   # New sed no longer tolerates this mistake.
-- 
GitLab


From 0e14a8621dbcd5ae8fa4217c32568ee0a4a22920 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 25 Jun 2017 21:08:17 -0300
Subject: [PATCH 1232/1490] mpv: eliminate `config.mpv` options

Removing all `config.mpv.*` options will improve readability. MPV has many
configurable options, and using the config approach is prone to confusion and
unnecessary code duplication. If needed, the user can `override` the relevant
variables in the function itself, so no functionality is lost.

Closes issue #26786
---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f64f901dfb..40a1727be9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15062,10 +15062,6 @@ with pkgs;
     lua = lua5_1;
     lua5_sockets = lua5_1_sockets;
     youtube-dl = pythonPackages.youtube-dl;
-    bs2bSupport = config.mpv.bs2bSupport or true;
-    youtubeSupport = config.mpv.youtubeSupport or true;
-    cacaSupport = config.mpv.cacaSupport or true;
-    vaapiSupport = config.mpv.vaapiSupport or false;
     libva = libva-full;
   };
 
-- 
GitLab


From 1a25495b6344c832dc3750dc9b8a95fd2d68583c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 25 Jun 2017 21:13:23 -0400
Subject: [PATCH 1233/1490] git: 2.13.1 -> 2.13.2

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

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index bb00a22730b..fd9aa94c543 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2.13.1";
+  version = "2.13.2";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1zl88rlga9nhgaqc9d04vp1l1g4x6qj1d02698asnxrzk36vxh9v";
+    sha256 = "1rfx2gj7dw9rw0w22ihi940zv3wdrj1xmjv25djq2vs6a4vsq40d";
   };
 
   hardeningDisable = [ "format" ];
-- 
GitLab


From 3156263876719c75ef5d98c36d701363eb4565ef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 Jun 2017 03:09:36 +0200
Subject: [PATCH 1234/1490] rsync: build with iconv, zlib & popt from nixpkgs

The rsync binary was previously built without iconv support which is needed
for utf-8 conversions on darwin. Fixes #26864.

Additionally rsync used to be built with bundled versions of zlib and popt
that were outdated. This decreases the size of the rsync binary by ~82KB.
---
 pkgs/applications/networking/sync/rsync/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 53b723f5ec2..b24be07b8ee 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl
+{ stdenv, fetchurl, perl, libiconv, zlib, popt
 , enableACLs ? true, acl ? null
 , enableCopyDevicesPatch ? false
 }:
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
   patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
 
-  buildInputs = stdenv.lib.optional enableACLs acl;
+  buildInputs = [libiconv zlib popt] ++ stdenv.lib.optional enableACLs acl;
   nativeBuildInputs = [perl];
 
-  configureFlags = "--with-nobody-group=nogroup";
+  configureFlags = ["--with-nobody-group=nogroup" "--without-included-zlib"];
 
   meta = base.meta // {
     description = "A fast incremental file transfer utility";
-- 
GitLab


From 356bac704a07f6b57bd94448e5396ebcf4189ca6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 Jun 2017 03:44:15 +0200
Subject: [PATCH 1235/1490] burp: 1.4.40 -> 2.0.54

---
 pkgs/tools/backup/burp/burp_1.4.40.patch | 12 ----------
 pkgs/tools/backup/burp/default.nix       | 28 ++++++++++++------------
 2 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/backup/burp/burp_1.4.40.patch

diff --git a/pkgs/tools/backup/burp/burp_1.4.40.patch b/pkgs/tools/backup/burp/burp_1.4.40.patch
deleted file mode 100644
index fe57202bc34..00000000000
--- a/pkgs/tools/backup/burp/burp_1.4.40.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur burp~/Makefile.in burp/Makefile.in
---- burp~/Makefile.in	2015-11-01 21:14:52.621376413 +0000
-+++ burp/Makefile.in	2015-11-01 22:09:25.098997115 +0000
-@@ -90,8 +90,6 @@
- 	$(MKDIR) $(DESTDIR)$(sbindir)
- 	$(MKDIR) $(DESTDIR)$(sysconfdir)
- 	$(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client
--	$(MKDIR) $(DESTDIR)/var/run
--	$(MKDIR) $(DESTDIR)/var/spool/burp
- 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi
- 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi
- 	@if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index eb4240d33c6..783a0796e91 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchgit, acl, librsync, ncurses, openssl, zlib }:
+{ stdenv, fetchFromGitHub, autoreconfHook
+, acl, librsync, ncurses, openssl, zlib, uthash }:
 
 stdenv.mkDerivation rec {
-  name = "burp-1.4.40";
+  name = "burp-${version}";
+  version = "2.0.54";
 
-  src = fetchgit {
-    url = "https://github.com/grke/burp.git";
-    rev = "1e8eebac420f2b0dc29102602b7e5e437d58d5b7";
-    sha256 = "02gpgcyg1x0bjk8349019zp3m002lmdhil6g6n8xv0kzz54v6gaw";
+  src = fetchFromGitHub {
+    owner = "grke";
+    repo = "burp";
+    rev = version;
+    sha256 = "1z1w013hqxbfjgri0fan2570qwhgwvm4k4ghajbzqg8kly4fgk5x";
   };
 
-  patches = [ ./burp_1.4.40.patch ];
-
-  buildInputs = [ librsync ncurses openssl zlib ]
-    # next two lines copied from bacula, as burp needs acl as well
-    # acl relies on attr, which I can't get to build on darwin
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ librsync ncurses openssl zlib uthash ]
     ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
 
-  configureFlags = [
-    "--sbindir=$out/bin"
-  ];
+  configureFlags = [ "--localstatedir=/var" ];
+
+  installFlags = [ "localstatedir=/tmp" ];
 
   meta = with stdenv.lib; {
     description = "BURP - BackUp and Restore Program";
-- 
GitLab


From 1a7f330335c3fb17b3c41d043ca94306584e095e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 Jun 2017 03:45:10 +0200
Subject: [PATCH 1236/1490] burp_1_3: remove

---
 pkgs/tools/backup/burp/1.3.48.nix        | 30 ------------------------
 pkgs/tools/backup/burp/burp_1.3.48.patch | 12 ----------
 pkgs/top-level/all-packages.nix          |  2 --
 3 files changed, 44 deletions(-)
 delete mode 100644 pkgs/tools/backup/burp/1.3.48.nix
 delete mode 100644 pkgs/tools/backup/burp/burp_1.3.48.patch

diff --git a/pkgs/tools/backup/burp/1.3.48.nix b/pkgs/tools/backup/burp/1.3.48.nix
deleted file mode 100644
index bff46992d8b..00000000000
--- a/pkgs/tools/backup/burp/1.3.48.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchgit, acl, librsync_0_9, ncurses, openssl, zlib }:
-
-stdenv.mkDerivation rec {
-  name = "burp-1.3.48";
-
-  src = fetchgit {
-    url = "https://github.com/grke/burp.git";
-    rev = "3636ce0a992904a374234d68170fc1c265bff357";
-    sha256 = "1vycivml5r87y4fmcpi9q82nhiydrq3zqvkr2gsp9d1plwsbgizz";
-  };
-
-  patches = [ ./burp_1.3.48.patch ];
-
-  buildInputs = [ librsync_0_9 ncurses openssl zlib ]
-    # next two lines copied from bacula, as burp needs acl as well
-    # acl relies on attr, which I can't get to build on darwin
-    ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
-
-  configureFlags = [
-      "--sbindir=$out/bin"
-  ];
-
-  meta = with stdenv.lib; {
-    description = "BURP - BackUp and Restore Program";
-    homepage    = http://burp.grke.org;
-    license     = licenses.agpl3;
-    maintainers = with maintainers; [ tokudan ];
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/tools/backup/burp/burp_1.3.48.patch b/pkgs/tools/backup/burp/burp_1.3.48.patch
deleted file mode 100644
index fe57202bc34..00000000000
--- a/pkgs/tools/backup/burp/burp_1.3.48.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur burp~/Makefile.in burp/Makefile.in
---- burp~/Makefile.in	2015-11-01 21:14:52.621376413 +0000
-+++ burp/Makefile.in	2015-11-01 22:09:25.098997115 +0000
-@@ -90,8 +90,6 @@
- 	$(MKDIR) $(DESTDIR)$(sbindir)
- 	$(MKDIR) $(DESTDIR)$(sysconfdir)
- 	$(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client
--	$(MKDIR) $(DESTDIR)/var/run
--	$(MKDIR) $(DESTDIR)/var/spool/burp
- 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi
- 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi
- 	@if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40a1727be9b..5bb3750340d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1198,8 +1198,6 @@ with pkgs;
 
   bup = callPackage ../tools/backup/bup { };
 
-  burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { };
-
   burp = callPackage ../tools/backup/burp { };
 
   buku = callPackage ../applications/misc/buku {
-- 
GitLab


From edf5cbdc33cec8c473160a660cf98b729c285d80 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 Jun 2017 03:46:06 +0200
Subject: [PATCH 1237/1490] librsync: 1.0.0 -> 2.0.0

---
 pkgs/development/libraries/librsync/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index 2e3df7cf9e0..3409948f59e 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -1,21 +1,18 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, perl, zlib, bzip2, popt }:
+{ stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }:
 
 stdenv.mkDerivation rec {
   name = "librsync-${version}";
-  version = "1.0.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "librsync";
     repo = "librsync";
     rev = "v${version}";
-    sha256 = "0rc2pksdd0mhdvk8y1yix71rf19wdx1lb2ryrkhi7vcy240rvgvc";
+    sha256 = "0yad7nkw6d8j824qkxrj008ak2wq6yw5p894sbhr35yc1wr5mki6";
   };
 
-  buildInputs = [ autoreconfHook perl zlib bzip2 popt ];
-
-  configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared";
-
-  CFLAGS = "-std=gnu89";
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ perl zlib bzip2 popt ];
 
   crossAttrs = {
     dontStrip = true;
-- 
GitLab


From d80f2e18c62c3b88b4ea5a39d2fa9f2f0fda0611 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 Jun 2017 03:46:22 +0200
Subject: [PATCH 1238/1490] uthash: 1.9.9 -> 2.0.2

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

diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix
index 511129de1e8..9c252004656 100644
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/pkgs/development/libraries/uthash/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl }:
 
 let
-  version = "1.9.9";
+  version = "2.0.2";
 in
 stdenv.mkDerivation rec {
   name = "uthash-${version}";
 
   src = fetchurl {
     url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz";
-    sha256 = "035z3cs5ignywgh4wqxx358a2nhn3lj0x1ifij6vj0yyyhah3wgj";
+    sha256 = "1la82gdlyl7m8ahdjirigwfh7zjgkc24cvydrqcri0vsvm8iv8rl";
   };
 
   dontBuild = false;
-- 
GitLab


From e5def4442e6d4ce66bf66716dc85c97481fce156 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 25 Jun 2017 18:38:03 +0200
Subject: [PATCH 1239/1490] minio: 20170316 -> 20170613

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 28b6136d90e..48b5279772a 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
   name = "minio-${shortVersion}";
 
-  shortVersion = "20170316";
-  longVersion = "2017-03-16T21-50-32Z";
+  shortVersion = "20170613";
+  longVersion = "2017-06-13T19-01-01Z";
 
   src = fetchurl {
     url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz";
-    sha256 = "1331lxsfr22x1sh7cyh9xz3aa70715wm1bk1f1r053kyz03q903c";
+    sha256 = "1rrlgn0nsvfn0lr9ffihjdb96n4znsvjlz1h7bwvz8nwhbn0lfsf";
   };
 
   buildInputs = [ go ];
-- 
GitLab


From aa66c9ad372448277ff113bd78039e6a30034662 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 25 Jun 2017 18:43:10 +0200
Subject: [PATCH 1240/1490] minio service: add inital service

features:
- change listen port and address
- configure config and data directory
- basic test to check if minio server starts
---
 nixos/modules/misc/ids.nix                   |  2 +
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/web-servers/minio.nix | 69 ++++++++++++++++++++
 nixos/tests/minio.nix                        | 19 ++++++
 4 files changed, 91 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/minio.nix
 create mode 100644 nixos/tests/minio.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d7459e3fe91..22059bb7fbb 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -295,6 +295,7 @@
       aria2 = 277;
       clickhouse = 278;
       rslsync = 279;
+      minio = 280;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -559,6 +560,7 @@
       aria2 = 277;
       clickhouse = 278;
       rslsync = 279;
+      minio = 280;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 07be6555b23..5d9b062f204 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -588,6 +588,7 @@
   ./services/web-servers/lighttpd/default.nix
   ./services/web-servers/lighttpd/gitweb.nix
   ./services/web-servers/lighttpd/inginious.nix
+  ./services/web-servers/minio.nix
   ./services/web-servers/nginx/default.nix
   ./services/web-servers/phpfpm/default.nix
   ./services/web-servers/shellinabox.nix
diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix
new file mode 100644
index 00000000000..1893edf3a77
--- /dev/null
+++ b/nixos/modules/services/web-servers/minio.nix
@@ -0,0 +1,69 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.minio;
+in
+{
+  meta.maintainers = [ maintainers.bachp ];
+
+  options.services.minio = {
+    enable = mkEnableOption "Minio Object Storage";
+
+    listenAddress = mkOption {
+      default = ":9000";
+      type = types.str;
+      description = "Listen on a specific IP address and port.";
+    };
+
+    dataDir = mkOption {
+      default = "/var/lib/minio/data";
+      type = types.path;
+      description = "The data directory, for storing the objects.";
+    };
+
+    configDir = mkOption {
+      default = "/var/lib/minio/config";
+      type = types.path;
+      description = "The config directory, for the access keys and other settings.";
+    };
+
+    package = mkOption {
+      default = pkgs.minio;
+      defaultText = "pkgs.minio";
+      type = types.package;
+      description = "Minio package to use.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.minio = {
+      description = "Minio Object Storage";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        # Make sure directories exist with correct owner
+        mkdir -p ${cfg.configDir}
+        chown -R minio:minio ${cfg.configDir}
+        mkdir -p ${cfg.dataDir}
+        chown minio:minio ${cfg.dataDir}
+      '';
+      serviceConfig = {
+        PermissionsStartOnly = true;
+        ExecStart = "${cfg.package}/bin/minio server --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}";
+        Type = "simple";
+        User = "minio";
+        Group = "minio";
+        LimitNOFILE = 65536;
+      };
+    };
+
+    users.extraUsers.minio = {
+      group = "minio";
+      uid = config.ids.uids.minio;
+    };
+
+    users.extraGroups.minio.gid = config.ids.uids.minio;
+  };
+}
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
new file mode 100644
index 00000000000..462a3bc4768
--- /dev/null
+++ b/nixos/tests/minio.nix
@@ -0,0 +1,19 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "minio";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ bachp ];
+  };
+
+  machine = { config, pkgs, ... }: {
+    services.minio.enable = true;
+  };
+
+  testScript =
+    ''
+      startAll;
+      $machine->waitForUnit("minio.service");
+      $machine->waitForOpenPort(9000);
+      $machine->succeed("curl --fail http://localhost:9000/minio/index.html");
+      $machine->shutdown;
+    '';
+})
-- 
GitLab


From f0dbe18e9b0fe59e8369dbbb02252ccbbd98f0bd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 25 Jun 2017 21:56:39 +0200
Subject: [PATCH 1241/1490] =?UTF-8?q?ocamlPackages.twt:=20don=E2=80=99t=20?=
 =?UTF-8?q?strip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/twt/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix
index e5831be93bd..207a7b183e6 100644
--- a/pkgs/development/ocaml-modules/twt/default.nix
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, ocaml, findlib }:
 
 stdenv.mkDerivation {
-  name = "ocaml-twt-0.94.0";
+  name = "ocaml${ocaml.version}-twt-0.94.0";
 
   src = fetchzip {
     url = https://github.com/mlin/twt/archive/v0.94.0.tar.gz;
@@ -20,6 +20,8 @@ stdenv.mkDerivation {
 
   installFlags = "PREFIX=$(out)";
 
+  dontStrip = true;
+
   meta = with stdenv.lib; {
     homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/;
     description = "“The Whitespace Thing” for OCaml";
-- 
GitLab


From 7829eb794f9ec6572217260323db473a685be541 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Jun 2017 03:44:55 +0200
Subject: [PATCH 1242/1490] ocamlPackages.reason: 1.13.4 -> 2.0.0

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

diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 7bd4750551f..e364f536c88 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -2,12 +2,12 @@
   ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }:
 
 let 
-  version = "1.13.4";
+  version = "2.0.0";
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "reason";
     rev = version;
-    sha256 = "03r2ciikgwaq1dkzgzc8n7h7y0q95ajh6n9bb2n5bpgfhwkr1wqi";
+    sha256 = "0l3lwfvppplah707rq5nqjav2354lq6d7xfflfigkzhn74hlx6iy";
   };
   meta = with stdenv.lib; {
     homepage = https://facebook.github.io/reason/;
-- 
GitLab


From 459f17a8d5d67871ad3a3646df034e2d1793f664 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Jun 2017 04:08:57 +0200
Subject: [PATCH 1243/1490] =?UTF-8?q?ocamlPackages.uri=5Fp4:=20disable=20f?=
 =?UTF-8?q?or=20OCaml=20=E2=89=A5=204.03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/uri/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index ae41c872960..f08ee7fc2fc 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -4,7 +4,9 @@
 , sexplib_p4
 }:
 
-assert stdenv.lib.versionAtLeast ocaml.version "4";
+if !stdenv.lib.versionAtLeast ocaml.version "4"
+|| legacyVersion && stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "uri${stdenv.lib.optionalString legacyVersion "_p4"} is not available for OCaml ${ocaml.version}" else
 
 with
   if legacyVersion
-- 
GitLab


From 41b3b2c0776ff637fd33d4b12f33cbbbf95e8017 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Jun 2017 04:38:49 +0200
Subject: [PATCH 1244/1490] =?UTF-8?q?ocamlPackages.sexplib=5Fp4:=20disable?=
 =?UTF-8?q?=20for=20OCaml=20=E2=89=A5=204.03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/sexplib/108.08.00.nix | 4 +++-
 pkgs/development/ocaml-modules/sexplib/111.25.00.nix | 5 ++++-
 pkgs/development/ocaml-modules/sexplib/112.24.01.nix | 6 +++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
index a8acee1c538..685f2afb0b4 100644
--- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
+++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
@@ -1,6 +1,8 @@
 {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
 
-assert stdenv.lib.versionOlder "3.12" ocaml.version;
+if !stdenv.lib.versionAtLeast ocaml.version "3.12"
+|| stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "sexlib-108.08.00 is not available for OCaml ${ocaml.version}" else
 
 stdenv.mkDerivation {
   name = "ocaml-sexplib-108.08.00";
diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
index a8724f23cfe..e98a2ecdb30 100644
--- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
+++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
@@ -1,6 +1,9 @@
 {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
 
-assert stdenv.lib.versionOlder "4.00" ocaml.version;
+if !stdenv.lib.versionAtLeast ocaml.version "4.00"
+|| stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "sexlib-111.25.00 is not available for OCaml ${ocaml.version}" else
+
 
 stdenv.mkDerivation {
   name = "ocaml-sexplib-111.25.00";
diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
index b63b5af05e8..24cdb497189 100644
--- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
+++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
@@ -1,4 +1,8 @@
-{stdenv, buildOcaml, fetchurl, type_conv, camlp4}:
+{ stdenv, buildOcaml, fetchurl, ocaml, type_conv, camlp4 }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+|| stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "sexlib-112.24.01 is not available for OCaml ${ocaml.version}" else
 
 buildOcaml rec {
   minimumSupportedOcamlVersion = "4.02";
-- 
GitLab


From e082162f09a74ef0c5c962da6c27d33f77c7af56 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Jun 2017 05:02:42 +0200
Subject: [PATCH 1245/1490] =?UTF-8?q?=20ocamlPackages.type=5Fconv-{108,109?=
 =?UTF-8?q?}:=20disable=20for=20OCaml=20=E2=89=A5=204.03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/type_conv/108.08.00.nix | 4 +++-
 pkgs/development/ocaml-modules/type_conv/109.60.01.nix | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
index 4a3d8c58f0b..f17e5a7b89e 100644
--- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
+++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
@@ -1,6 +1,8 @@
 {stdenv, fetchurl, ocaml, findlib, camlp4}:
 
-assert stdenv.lib.versionOlder "3.12" ocaml.version;
+if !stdenv.lib.versionAtLeast ocaml.version "3.12"
+|| stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else
 
 stdenv.mkDerivation {
   name = "ocaml-type_conv-108.08.00";
diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
index ae2b62f6b36..5e6f5967d13 100644
--- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
@@ -1,6 +1,8 @@
 {stdenv, fetchurl, ocaml, findlib, camlp4}:
 
-assert stdenv.lib.versionOlder "4.00" ocaml.version;
+if !stdenv.lib.versionAtLeast ocaml.version "4.00"
+|| stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else
 
 stdenv.mkDerivation {
   name = "ocaml-type_conv-109.60.01";
-- 
GitLab


From 6b89bcbaa6a31f3ab30449a7fb21d257c2308917 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Jun 2017 07:57:17 +0200
Subject: [PATCH 1246/1490] =?UTF-8?q?ocamlPackages.core=5Fbench:=20fix=20o?=
 =?UTF-8?q?n=20OCaml=20=E2=89=A5=204.03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4486049ef91..127f228bc9c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -754,6 +754,8 @@ let
       else bin_prot_p4;
 
     core_bench =
+      if lib.versionOlder "4.03" ocaml.version
+      then janeStreet.core_bench else
       callPackage ../development/ocaml-modules/janestreet/core_bench.nix {};
 
     core_kernel =
-- 
GitLab


From 8d8fdce611f973d2364281aaa2d7ff492a291109 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Jun 2017 08:27:03 +0200
Subject: [PATCH 1247/1490] =?UTF-8?q?ocamlPackages.lablgtk:=20don=E2=80=99?=
 =?UTF-8?q?t=20strip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/lablgtk/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index 7408ee4b478..67f579eb469 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
   '';
 
+  dontStrip = true;
+
   meta = with stdenv.lib; {
     platforms = ocaml.meta.platforms or [];
     maintainers = with maintainers; [
-- 
GitLab


From 7df83abe85490525241f1c37565e1d9a8a8b0c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 26 Jun 2017 07:22:05 +0100
Subject: [PATCH 1248/1490] keepassx-community: 2.1.4 -> 2.2.0

---
 pkgs/applications/misc/keepassx/community.nix | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 9e83aa50a77..b88291194eb 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch,
-  cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror
+  cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales
 , withKeePassHTTP ? true
 }:
 
@@ -7,25 +7,24 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassx-community-${version}";
-  version = "2.1.4";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "1znnw2xpv58x0rbpmm4y662377mbmcilhf8mhhjsz8vhahms33a8";
+    sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc";
   };
 
-  patches = [
-    (fetchpatch { # qt 4.9
-      url = "https://github.com/keepassxreboot/keepassxc/commit/2b6059dee3a95591d787e8b8c931cd68c059d43f.patch";
-      sha256 = "1v140z358rk75f7wsqawpai3x8v8qcqalnv9r0l1d4p1gxm1j766";
-    })
-  ];
+  cmakeFlags = [ "-DWITH_GUI_TESTS=ON" ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON");
 
-  cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ];
+  doCheck = true;
+  checkPhase = ''
+    export LC_ALL="en_US.UTF-8"
+    make test ARGS+="-E testgui --output-on-failure"
+  '';
 
-  buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror ];
+  buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales ];
 
   meta = {
     description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
-- 
GitLab


From 4c0203b094c5a4d334daaf4ab8c6dc98c67fa8d0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Jun 2017 08:38:52 +0200
Subject: [PATCH 1249/1490] =?UTF-8?q?ocamlPackages.lablgtk=5F2=5F14:=20dis?=
 =?UTF-8?q?able=20for=20OCaml=20=E2=89=A5=204.04?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
index ba966b68002..2aa0842c55f 100644
--- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
 
+if stdenv.lib.versionAtLeast ocaml.version "4.04"
+then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else
+
 let
   pname = "lablgtk";
 in
-- 
GitLab


From 35e5719fe9ed67b1502b79616c51fd4211e51599 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 22 Jun 2017 16:43:49 +0200
Subject: [PATCH 1250/1490] elasticsearch: 5.4.0 -> 5.4.2

---
 pkgs/development/tools/misc/kibana/5.x.nix | 6 +++---
 pkgs/misc/logging/beats/default.nix        | 2 +-
 pkgs/servers/search/elasticsearch/5.x.nix  | 2 +-
 pkgs/tools/misc/logstash/5.x.nix           | 2 +-
 pkgs/top-level/all-packages.nix            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix
index 4a4fc3e214f..71e21d31bb7 100644
--- a/pkgs/development/tools/misc/kibana/5.x.nix
+++ b/pkgs/development/tools/misc/kibana/5.x.nix
@@ -11,9 +11,9 @@ let
   elasticArch = archOverrides."${arch}" or arch;
   plat = elemAt info 1;
   shas = {
-    "x86_64-linux"  = "1g5i81wq77fk6pyaq3rpfqs2m23xsbz2cndh3rg4b59ibg5qv0sq";
-    "i686-linux"    = "0pxnpg3g8l6hy8qz404kbkk5rd9y65jrzd0y9j8wr5fd4pqs7vgv";
-    "x86_64-darwin" = "0pffl2hbck3s271jlzdibp5698djm5fdvj15w2knm815rs2kfbl5";
+    "x86_64-linux"  = "0b3kxd2s66pps5262khnh9yvp2mlwan6461ggxba380hfm7xxi6y";
+    "i686-linux"    = "1vfl1xmzvrr064nbsbwr597r7hbxyh27397n981scgb1j1y7qja9";
+    "x86_64-darwin" = "19iw39qi7i8685s3mg3y6wsqnsddc6fj06g80vqbg76x8160z7dl";
   };
 in stdenv.mkDerivation rec {
   name = "kibana-${version}";
diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix
index d4c78389e66..ec2fc975b33 100644
--- a/pkgs/misc/logging/beats/default.nix
+++ b/pkgs/misc/logging/beats/default.nix
@@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec {
         owner = "elastic";
         repo = "beats";
         rev = "v${version}";
-        sha256 = "1if16sqbhgxc7ahn9pak8av9rq9l8ldk44hr4w4g7lhxnqhmhsji";
+        sha256 = "03pvzikl5wa6agf3aszx96xvd6yjbvdf0kdwjsr4vfga0h797s32";
       };
 
       goPackagePath = "github.com/elastic/beats";
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
index 512337cf382..6f9895509ee 100644
--- a/pkgs/servers/search/elasticsearch/5.x.nix
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
-    sha256 = "1ml2dvwxxhj3azj13wa8xd08kpapal2477lpcaxzw5gnzizgyx5z";
+    sha256 = "0l31i6dp3q6d6gqsnji1ym0abqphzf1yxswwn4s3na8s216i41h2";
   };
 
   patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix
index 13387b5c1a9..2628c777140 100644
--- a/pkgs/tools/misc/logstash/5.x.nix
+++ b/pkgs/tools/misc/logstash/5.x.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz";
-    sha256 = "019bhsnbbbg1a4g9jf02j3jb1xhhmrr3i7882s5l4pmkyn1d3gd1";
+    sha256 = "1z3rwpwafrn6h0rzdsmripnwj8ad33v92ryxq8xf9y7331rqb2gs";
   };
 
   dontBuild         = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5bb3750340d..570bb3a5051 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1728,7 +1728,7 @@ with pkgs;
   evemu = callPackage ../tools/system/evemu { };
 
   # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic.
-  elk5Version = "5.4.0";
+  elk5Version = "5.4.2";
 
   elasticsearch = callPackage ../servers/search/elasticsearch { };
   elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
-- 
GitLab


From 80e0cda7ff92233edc94161eae5838a1c423e5e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= <michal.palka@chalmers.se>
Date: Mon, 26 Jun 2017 07:00:00 +0000
Subject: [PATCH 1251/1490] xen: patch for XSAs: 216, 217, 218, 219, 220, 221,
 222, and 224

XSA-216 Issue Description:

> The block interface response structure has some discontiguous fields.
> Certain backends populate the structure fields of an otherwise
> uninitialized instance of this structure on their stacks, leaking
> data through the (internal or trailing) padding field.

More: https://xenbits.xen.org/xsa/advisory-216.html

XSA-217 Issue Description:

> Domains controlling other domains are permitted to map pages owned by
> the domain being controlled.  If the controlling domain unmaps such a
> page without flushing the TLB, and if soon after the domain being
> controlled transfers this page to another PV domain (via
> GNTTABOP_transfer or, indirectly, XENMEM_exchange), and that third
> domain uses the page as a page table, the controlling domain will have
> write access to a live page table until the applicable TLB entry is
> flushed or evicted.  Note that the domain being controlled is
> necessarily HVM, while the controlling domain is PV.

More: https://xenbits.xen.org/xsa/advisory-217.html

XSA-218 Issue Description:

> We have discovered two bugs in the code unmapping grant references.
>
> * When a grant had been mapped twice by a backend domain, and then
> unmapped by two concurrent unmap calls, the frontend may be informed
> that the page had no further mappings when the first call completed rather
> than when the second call completed.
>
> * A race triggerable by an unprivileged guest could cause a grant
> maptrack entry for grants to be "freed" twice.  The ultimate effect of
> this would be for maptrack entries for a single domain to be re-used.

More: https://xenbits.xen.org/xsa/advisory-218.html

XSA-219 Issue Description:

> When using shadow paging, writes to guest pagetables must be trapped and
> emulated, so the shadows can be suitably adjusted as well.
>
> When emulating the write, Xen maps the guests pagetable(s) to make the final
> adjustment and leave the guest's view of its state consistent.
>
> However, when mapping the frame, Xen drops the page reference before
> performing the write.  This is a race window where the underlying frame can
> change ownership.
>
> One possible attack scenario is for the frame to change ownership and to be
> inserted into a PV guest's pagetables.  At that point, the emulated write will
> be an unaudited modification to the PV pagetables whose value is under guest
> control.

More: https://xenbits.xen.org/xsa/advisory-219.html

XSA-220 Issue Description:

> Memory Protection Extensions (MPX) and Protection Key (PKU) are features in
> newer processors, whose state is intended to be per-thread and context
> switched along with all other XSAVE state.
>
> Xen's vCPU context switch code would save and restore the state only
> if the guest had set the relevant XSTATE enable bits.  However,
> surprisingly, the use of these features is not dependent (PKU) or may
> not be dependent (MPX) on having the relevant XSTATE bits enabled.
>
> VMs which use MPX or PKU, and context switch the state manually rather
> than via XSAVE, will have the state leak between vCPUs (possibly,
> between vCPUs in different guests).  This in turn corrupts state in
> the destination vCPU, and hence may lead to weakened protections
>
> Experimentally, MPX appears not to make any interaction with BND*
> state if BNDCFGS.EN is set but XCR0.BND{CSR,REGS} are clear.  However,
> the SDM is not clear in this case; therefore MPX is included in this
> advisory as a precaution.

More: https://xenbits.xen.org/xsa/advisory-220.html

XSA-221 Issue Description:

> When polling event channels, in general arbitrary port numbers can be
> specified.  Specifically, there is no requirement that a polled event
> channel ports has ever been created.  When the code was generalised
> from an earlier implementation, introducing some intermediate
> pointers, a check should have been made that these intermediate
> pointers are non-NULL.  However, that check was omitted.

More: https://xenbits.xen.org/xsa/advisory-221.html

XSA-222 Issue Description:

> Certain actions require removing pages from a guest's P2M
> (Physical-to-Machine) mapping.  When large pages are in use to map
> guest pages in the 2nd-stage page tables, such a removal operation may
> incur a memory allocation (to replace a large mapping with individual
> smaller ones).  If this allocation fails, these errors are ignored by
> the callers, which would then continue and (for example) free the
> referenced page for reuse.  This leaves the guest with a mapping to a
> page it shouldn't have access to.
>
> The allocation involved comes from a separate pool of memory created
> when the domain is created; under normal operating conditions it never
> fails, but a malicious guest may be able to engineer situations where
> this pool is exhausted.

More: https://xenbits.xen.org/xsa/advisory-222.html

XSA-224 Issue Description:

> We have discovered a number of bugs in the code mapping and unmapping
> grant references.
>
> * If a grant is mapped with both the GNTMAP_device_map and
> GNTMAP_host_map flags, but unmapped only with host_map, the device_map
> portion remains but the page reference counts are lowered as though it
> had been removed. This bug can be leveraged cause a page's reference
> counts and type counts to fall to zero while retaining writeable
> mappings to the page.
>
> * Under some specific conditions, if a grant is mapped with both the
> GNTMAP_device_map and GNTMAP_host_map flags, the operation may not
> grab sufficient type counts.  When the grant is then unmapped, the
> type count will be erroneously reduced.  This bug can be leveraged
> cause a page's reference counts and type counts to fall to zero while
> retaining writeable mappings to the page.
>
> * When a grant reference is given to an MMIO region (as opposed to a
> normal guest page), if the grant is mapped with only the
> GNTMAP_device_map flag set, a mapping is created at host_addr anyway.
> This does *not* cause reference counts to change, but there will be no
> record of this mapping, so it will not be considered when reporting
> whether the grant is still in use.

More: https://xenbits.xen.org/xsa/advisory-224.html
---
 pkgs/applications/virtualization/xen/4.5.nix | 60 ++++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix    | 17 ++++++
 pkgs/top-level/all-packages.nix              |  4 ++
 3 files changed, 81 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index c6aa1522160..5fe4fa823fe 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -71,6 +71,10 @@ callPackage (import ./generic.nix (rec {
           name = "211-qemuu-4.6";
           sha256 = "1g090xs8ca8676vyi78b99z5yjdliw6mxkr521b8kimhf8crx4yg";
         })
+        (xsaPatch {
+          name = "216-qemuu-4.5";
+          sha256 = "0nh5akbal93czia1gh1pzvwq7gc4zwiyr1hbyk1m6wwdmqv6ph61";
+        })
       ];
       meta.description = "Xen's fork of upstream Qemu";
     };
@@ -342,6 +346,62 @@ callPackage (import ./generic.nix (rec {
         name = "215";
         sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs";
       })
+      (xsaPatch {
+        name = "217-4.5";
+        sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4";
+      })
+      (xsaPatch {
+        name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures";
+        sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq";
+      })
+      (xsaPatch {
+        name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race";
+        sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k";
+      })
+      (xsaPatch {
+        name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry";
+        sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc";
+      })
+      (xsaPatch {
+        name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses";
+        sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2";
+      })
+      (xsaPatch {
+        name = "219-4.5";
+        sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm";
+      })
+      (xsaPatch {
+        name = "220-4.5";
+        sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp";
+      })
+      (xsaPatch {
+        name = "221";
+        sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
+      })
+      (xsaPatch {
+        name = "222-1-4.6";
+        sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf";
+      })
+      (xsaPatch {
+        name = "222-2-4.5";
+        sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd";
+      })
+      (xsaPatch {
+        name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
+        sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h";
+      })
+      (xsaPatch {
+        name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to";
+        sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq";
+      })
+      (xsaPatch {
+        name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m";
+        sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08";
+      })
+      (xsaPatch {
+        name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
+        sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav";
+      })
     ];
 
   # Fix build on Glibc 2.24.
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 1747d34fe11..cbba50710b5 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -156,4 +156,21 @@ rec {
         sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
       };
     };
+
+  # https://xenbits.xen.org/xsa/advisory-216.html
+  xen_XSA_216 =
+    { name = "xen_XSA-216";
+      patch = fetchpatch {
+        url = "https://xenbits.xen.org/xsa/xsa216-linux-4.11.patch";
+        sha256 = "14h017n6qwnraw5bv72q9xkg2w7xvx290505kny5zfwx891xahs8";
+      };
+    };
+
+  xen_XSA_216_4-4 =
+    { name = "xen_XSA-216-4.4";
+      patch = fetchpatch {
+        url = "https://xenbits.xen.org/xsa/xsa216-linux-4.4.patch";
+        sha256 = "1lv50wpr4lr49i4vp04vl778wcs9xn1jm51hp91h87jr0g3pbvi2";
+      };
+    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5bb3750340d..4d635a38575 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11905,6 +11905,7 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.p9_fixes
         kernelPatches.cpu-cgroup-v2."4.4"
+        kernelPatches.xen_XSA_216_4-4
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11919,6 +11920,7 @@ with pkgs;
         kernelPatches.p9_fixes
         kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.xen_XSA_216
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11935,6 +11937,7 @@ with pkgs;
         # when adding a new linux version
         kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.xen_XSA_216
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11948,6 +11951,7 @@ with pkgs;
       kernelPatches.bridge_stp_helper
       kernelPatches.p9_fixes
       kernelPatches.modinst_arg_list_too_long
+      kernelPatches.xen_XSA_216
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu
       kernelPatches.mips_fpu_sigill
-- 
GitLab


From 994998e475f051df664150feaecad72e6cd2c68a Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuel_rosa@aol.com>
Date: Sun, 25 Jun 2017 17:10:24 -0400
Subject: [PATCH 1252/1490] thunderbird: 52.2.0 -> 52.2.1

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index ccced87a550..4374e51f6d1 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -22,11 +22,11 @@ let
   wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "52.2.0";
+  version = "52.2.1";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89";
+    sha512 = "f30ba358b1bfc57265b26da3d2205a8a77c6cd1987278de40cde6c1c1241db3c2fedc60aebb6ff56ffb340492c5580294420158f4b7c4787f558e79f72e3d7fb";
   };
 
   # New sed no longer tolerates this mistake.
-- 
GitLab


From b788956239172eccd3cb07c5a9c9ccd0891627c8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 25 Jun 2017 21:18:00 +0200
Subject: [PATCH 1253/1490] libcgroup: do not set suid bit in nix store

---
 pkgs/os-specific/linux/libcgroup/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
index b51211e9aaf..a70ab13db62 100644
--- a/pkgs/os-specific/linux/libcgroup/default.nix
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pam yacc flex ];
 
+  postPatch = ''
+    substituteInPlace src/tools/Makefile.in \
+      --replace 'chmod u+s' 'chmod +x'
+  '';
+
   meta = {
     description = "Library and tools to manage Linux cgroups";
     homepage    = "http://libcg.sourceforge.net/";
-- 
GitLab


From 813feae594783fd5b2e43850f6ae250f17dde01e Mon Sep 17 00:00:00 2001
From: Nicolas Truessel <ntruessel@njsm.de>
Date: Fri, 23 Jun 2017 15:44:29 +0200
Subject: [PATCH 1254/1490] chromium: 59.0.3071.86 -> 59.0.3071.109

---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 0cc53a0c31e..bb4f9a1371b 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "151a7w2gqrv1svabhzmalrjr2pdbb9ys8zhrfz02779rjhzfz916";
-    sha256bin64 = "1957q2wdkymibxqzpcq71fj3q6gca888r7gr621z0c03p0izlb7z";
-    version = "60.0.3112.24";
+    sha256 = "1lr8yc1inj0r0znak4rq37c9r0jhmag0ny9dqxng2jpgqq7mkp2g";
+    sha256bin64 = "1yyw7i50jkgkwrgp4by83m0xwsi44bkxsyw47lrqbfzask3zazbm";
+    version = "60.0.3112.40";
   };
   dev = {
-    sha256 = "15642f0nalx3zqdlr5ldcbrpxnadav3z6sl3imvzj2ssv3nbh25m";
-    sha256bin64 = "0lbma509m3ppy3hg34r10ijhw3m92qxm147qhw0k4lpwdcmm6fnm";
-    version = "60.0.3112.20";
+    sha256 = "1xhv32bxiwz56gcbw47syl88a54x5gira4drh378zp8cwgh9pz4z";
+    sha256bin64 = "18k3wml6yl2qghhnxb2w2d0k2397i0829nk0sqc38qz2sjbbvzna";
+    version = "61.0.3135.4";
   };
   stable = {
-    sha256 = "1rxc555l3bxczg9vigr2p0y7j1gswy99gs5yhkbj3raakym32563";
-    sha256bin64 = "1bvkibhvxdcszbh44x77cynnaqhrm5ngf79fp7rdljfhlflvsnw9";
-    version = "59.0.3071.86";
+    sha256 = "1naqlxz9w07nlnwxkmxwf9jnxvmagj88xcjqh9r873a26wsypyl3";
+    sha256bin64 = "1h086irdsjs27n7ch54hy7zbiypc4swr8wnxjha1q39wc1bpc7hl";
+    version = "59.0.3071.109";
   };
 }
-- 
GitLab


From ea44ca47f31b4c798e26e4fe074c63920ecb2ba0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 25 Jun 2017 21:42:07 +0200
Subject: [PATCH 1255/1490] security-wrapper: run activation script after
 specialfs

Ensures that parentWrapperDir exists before it is used.

Closes #26851
---
 nixos/modules/security/wrappers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index dc1227c5628..a6dc8faaae9 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -171,7 +171,7 @@ in
 
     ###### setcap activation script
     system.activationScripts.wrappers =
-      lib.stringAfter [ "users" ]
+      lib.stringAfter [ "specialfs" "users" ]
         ''
           # Look in the system path and in the default profile for
           # programs to be wrapped.
-- 
GitLab


From 003cd41310b5b7839eb4c402d84dc25068026c3e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 26 Jun 2017 10:49:02 +0200
Subject: [PATCH 1256/1490] zsh: extend default $fpath configured by NixOS to
 find "vendor-completions"

---
 nixos/modules/programs/zsh/zsh.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index acb3e987aee..b276bf9bb73 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -117,7 +117,7 @@ in
 
         # Tell zsh how to find installed completions
         for p in ''${(z)NIX_PROFILES}; do
-          fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions)
+          fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
         done
 
         ${if cfg.enableCompletion then "autoload -U compinit && compinit" else ""}
-- 
GitLab


From 1b792b4edf763e88ed163c99f59d98242113425b Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 26 Jun 2017 11:01:55 +0200
Subject: [PATCH 1257/1490] nano: 2.8.4 -> 2.8.5

See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00012.html
for release information.
---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 29e76f7d23a..f3527d85fd7 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.8.4";
+  version = "2.8.5";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "04bvmimrw40cbcnm3xm5l5lir0qy7cncfkmwrlzg8jiy1x7jdky7";
+    sha256 = "1hl9gni3qmblr062a7w6vz16gvxbswgc5c19c923ja0bk48vyhyb";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
-- 
GitLab


From 24156c64b4286c981dd387844d0b3b8da976a25e Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Mon, 26 Jun 2017 10:15:44 +0100
Subject: [PATCH 1258/1490] dfhack: 0.43.05-alpha4 -> 0.43.05-r1

---
 pkgs/games/dwarf-fortress/dfhack/default.nix  |  6 ++---
 .../dwarf-fortress/dfhack/skip-ruby.patch     | 24 +++++++------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index ce935512178..ba9cd1e5805 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -7,12 +7,12 @@ let
   dfVersion = "0.43.05";
   # version = "${dfVersion}-r1";
   # rev = "refs/tags/${version}";
-  version = "${dfVersion}-alpha4";
+  version = "${dfVersion}-r1";
   rev = "refs/tags/${version}";
-  sha256 = "0wnwdapw955k69ds5xh5qsh7h0l547wjxgcy8hkvly6wp5c16sls";
+  sha256 = "1hw0miimzx52p36jm9bimsm5j68rb7dd9kw0yivcwbwixbajsi1w";
 
   # revision of library/xml submodule
-  xmlRev = "bb4228f58b1601c4868c95be6763f5ff2e5d0a08";
+  xmlRev = "a8e80088b9cc934da993dc244ece2d0ae14143da";
 
   arch =
     if stdenv.system == "x86_64-linux" then "64"
diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
index 619060dc253..877f6c3d215 100644
--- a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
+++ b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
@@ -1,16 +1,10 @@
-diff -ru3 dfhack-ae59b4f/plugins/ruby/CMakeLists.txt dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt
---- dfhack-ae59b4f/plugins/ruby/CMakeLists.txt	1970-01-01 03:00:01.000000000 +0300
-+++ dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt	2016-11-23 15:29:09.907286546 +0300
-@@ -1,3 +1,4 @@
-+IF(FALSE)
- IF (APPLE)
-     SET(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/osx${DFHACK_BUILD_ARCH}/libruby.dylib)
-     SET(RUBYLIB_INSTALL_NAME "libruby.dylib")
-@@ -48,6 +49,7 @@
-             "482c1c418f4ee1a5f04203eee1cda0ef")
-     ENDIF()
- ENDIF()
-+ENDIF()
+diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt
+index f1ef12ac..0976e18a 100644
+--- a/plugins/ruby/CMakeLists.txt
++++ b/plugins/ruby/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # Allow build system to turn off downloading of libruby.so.
+-OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." ON)
++OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." OFF)
  
- IF (APPLE OR UNIX)
-     SET(RUBYAUTOGEN ruby-autogen-gcc.rb)
+ IF (DOWNLOAD_RUBY)
-- 
GitLab


From c90a4b8541e2046b84cbf5dd7e8fab0ae3f8d6ec Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 26 Jun 2017 09:58:37 -0400
Subject: [PATCH 1259/1490] linux: 4.12-rc6 -> 4.12-rc7

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 6bde598c47a..a2f07560c19 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12-rc6";
-  modDirVersion = "4.12.0-rc6";
+  version = "4.12-rc7";
+  modDirVersion = "4.12.0-rc7";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0yqs65kmrksphca8f959g9ca9kpdwbp3ad5v594wvwsdk0q4sqgc";
+    sha256 = "1svfswv0b4gagv1yiavwb22p726h0w81lgxjqq0h9m3gf4xlqp3x";
   };
 
   features.iwlwifi = true;
-- 
GitLab


From a9ba1e101e0eb59dc0292790604b4e90c347eafa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 26 Jun 2017 15:17:43 +0100
Subject: [PATCH 1260/1490] rustNightlyBin: 2017-05-30 -> 2017-06-26

---
 pkgs/development/compilers/rust/nightlyBin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index bdb11bd5b52..af06835c5de 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -7,7 +7,7 @@ let
 
   bootstrapHash =
     if stdenv.system == "x86_64-linux"
-    then "21f38f46bf16373d3240a38b775e1acff9bb429f1570a4d4da8b3000315d0085"
+    then "0svlm4bxsdhdn4jsv46f278kid23a9w978q2137qrba4xnyb06kf"
     else throw "missing bootstrap hash for platform ${stdenv.system}";
 
   src = fetchurl {
@@ -15,7 +15,7 @@ let
      sha256 = bootstrapHash;
   };
 
-  version = "2017-05-30";
+  version = "2017-06-26";
 in import ./binaryBuild.nix
   { inherit stdenv fetchurl makeWrapper cacert zlib buildRustPackage curl;
     inherit version src platform;
-- 
GitLab


From ac83ef3994e055cfba752476d1b1a673d94cd53e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Jun 2017 19:24:33 +0200
Subject: [PATCH 1261/1490] glsurf: 3.3 -> 3.3.1

---
 .../science/math/glsurf/default.nix           | 22 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  6 ++++-
 pkgs/top-level/ocaml-packages.nix             |  6 -----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index eae4b0ceb62..3e4c8c70286 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchdarcs, ocaml, findlib,  lablgl, camlimages, mesa, freeglut, ocaml_mysql, mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }:
+{ stdenv, fetchurl, ocamlPackages, mesa, freeglut
+, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib
+}:
 
 stdenv.mkDerivation {
-  name = "glsurf-3.3";
+  name = "glsurf-3.3.1";
 
-  src = fetchdarcs {
-    url = "http://lama.univ-savoie.fr/~raffalli/GlSurf";
-    rev = "3.3";
-    sha256 = "0ljvvzz31j7l8rvsv63x1kj70nhw3al3k294m79hpmwjvym1mzfa";
+  src = fetchurl {
+    url = "http://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz";
+    sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
   };
 
-  buildInputs = [ ocaml findlib freeglut mesa
-  	          lablgl camlimages ocaml_mysql mysql.lib mlgmp mpfr gmp
-		  libtiff libjpeg libpng giflib ];
+  buildInputs = [ freeglut mesa mysql.lib mpfr gmp
+    libtiff libjpeg libpng giflib ]
+  ++ (with ocamlPackages; [
+    ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
+  ]);
 
   installPhase = ''
     mkdir -p $out/bin $out/share/doc/glsurf
@@ -23,6 +26,5 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf;
     description = "A program to draw implicit surfaces and curves";
-    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 570bb3a5051..92bfbdef2af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7853,7 +7853,11 @@ with pkgs;
 
   glpk = callPackage ../development/libraries/glpk { };
 
-  inherit (ocamlPackages) glsurf;
+  glsurf = callPackage ../applications/science/math/glsurf {
+    libpng = libpng12;
+    giflib = giflib_4_1;
+    ocamlPackages = ocaml-ng.ocamlPackages_4_01_0;
+  };
 
   glui = callPackage ../development/libraries/glui {};
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 127f228bc9c..1038e13dbcd 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -849,12 +849,6 @@ let
       else {}
     );
 
-    glsurf = callPackage ../applications/science/math/glsurf {
-      libpng = pkgs.libpng12;
-      giflib = pkgs.giflib_4_1;
-      camlimages = camlimages_4_0;
-    };
-
     google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
 
 
-- 
GitLab


From 456089b74db4d93e33dff2c3f8abd58f6281f738 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 26 Jun 2017 19:38:47 +0200
Subject: [PATCH 1262/1490] =?UTF-8?q?ocamlPackages.mlgmp:=20disable=20for?=
 =?UTF-8?q?=20OCaml=20=E2=89=A5=204.03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix
index 0c51fe71ce1..20455cc6016 100644
--- a/pkgs/development/ocaml-modules/mlgmp/default.nix
+++ b/pkgs/development/ocaml-modules/mlgmp/default.nix
@@ -1,5 +1,8 @@
 {stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }:
 
+if stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "mlgmp is not available for OCaml ${ocaml.version}" else
+
 let
   pname = "mlgmp";
 in
-- 
GitLab


From ce8178ed931a0f6036a8a71919fd67b0a103e687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 26 Jun 2017 19:45:14 +0200
Subject: [PATCH 1263/1490] qtinstaller: fix broken meta

The invalid meta.outputsToInstall has been blocking channel updates.
https://mailman.science.uu.nl/pipermail/nix-dev/2017-June/023991.html
---
 pkgs/development/libraries/qtinstaller/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix
index 2fc8a894056..a03ddb9b78a 100644
--- a/pkgs/development/libraries/qtinstaller/default.nix
+++ b/pkgs/development/libraries/qtinstaller/default.nix
@@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
     moveToOutput "lib/libinstaller.so.1.0.0" "$out"
   '';
 
-  meta = (qtbase.meta) // {
+  meta = {
     description = ''Qt installer framework'';
+    inherit (qtbase.meta) platforms license homepage;
   };
 }
-- 
GitLab


From 107fabf41c35be91e42c801e5bbc08a70fc1b7e2 Mon Sep 17 00:00:00 2001
From: Michael Zaccari <michael.zaccari@accelerated.com>
Date: Mon, 26 Jun 2017 14:45:15 -0400
Subject: [PATCH 1264/1490] jruby: 9.0.5.0 -> 9.1.5.0

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

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index e17dd363873..8fed11829ca 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "9.0.5.0";
+  version = "9.1.5.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha256 = "1wysymqzc7591743f2ycgwpm232y6i050izn72lck44nhnyr5wwy";
+    sha256 = "0rmpbg62cy06pq8xxmnkqc2m2c5kg1kj816wbrf7qjdlzfpg7r18";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 2da82a1d19ce47c9c23cd2832cdbab6e297b97c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 26 Jun 2017 15:58:10 +0100
Subject: [PATCH 1265/1490] racerd: 2016-12-24 -> 2017-02-17

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

diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index 95f014cc2d7..7aaa62fef59 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchgit, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
 
 with rustPlatform;
 
 buildRustPackage rec {
   name = "racerd-${version}";
-  version = "2016-12-24";
-  src = fetchgit {
-    url = "git://github.com/jwilm/racerd.git";
-    rev = "dc090ea11d550cd513416d21227d558dbfd2fcb6";
-    sha256 = "0jfryb1b32m6bn620gd7y670cfipaswj1cppzkybm4xg6abqh07b";
+  version = "2017-02-17";
+  src = fetchFromGitHub {
+    owner = "jwilm";
+    repo = "racerd";
+    rev = "e3f3ff010fce2c67195750d9a6a669ffb3c2ac5f";
+    sha256 = "125pmbkjnjh83xwikcwfbb8g150nldz7wh0ly1gv9kl1b521dydk";
   };
 
   doCheck = false;
 
-  depsSha256 = "1vv6fyisi11bcajxkq3ihpl59yh504xmnsr222zj15hmivn0jwf2";
+  depsSha256 = "0db18m0vxzvg821gb5g8njhlnxw7im81m089i4982n8hmnhm1497";
 
   buildInputs = [ makeWrapper ];
 
-- 
GitLab


From c3da83cd40176b6c18db1ca311e448b9602fbe1e Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Thu, 22 Jun 2017 21:18:47 +0200
Subject: [PATCH 1266/1490] v8_3_16_14: fix OS X build

Issues addressed:
- xcode build failed with
    ... was built for newer OSX version (10.10) than being linked (10.5)
  fixed by setting GYP mac deployment target to the nix value
- a gyp bug when SDKROOT is not set (and removed an orphaned gyp patch
- path to python in generated gyp-mac-tool
- noisy build due to static assert warnings, by silencing warnings
- use of system xcodebuild and libtool replaced by darwin.cctools
---
 pkgs/development/libraries/v8/3.16.14.nix     | 14 ++--
 .../python-modules/gyp/no-xcode.patch         | 70 +++----------------
 pkgs/top-level/all-packages.nix               |  1 +
 pkgs/top-level/python-packages.nix            |  1 +
 4 files changed, 18 insertions(+), 68 deletions(-)

diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index 91a8763d43f..73f5febb668 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, gyp, readline, python, which, icu, utillinux}:
+{ stdenv, lib, fetchurl, gyp, readline, python, which, icu, utillinux, cctools }:
 
 assert readline != null;
 
@@ -24,9 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''
-    ln -s /usr/bin/xcodebuild $TMPDIR
-    ln -s /usr/bin/libtool $TMPDIR
-    export PATH=$TMPDIR:$PATH
+    export GYP_DEFINES="mac_deployment_target=$MACOSX_DEPLOYMENT_TARGET"
   '' + ''
     PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \
       ${gyp}/bin/gyp \
@@ -41,12 +39,16 @@ stdenv.mkDerivation rec {
         ${lib.optionalString armHardFloat "-Dv8_use_arm_eabi_hardfloat=true"} \
         --depth=. -Ibuild/standalone.gypi \
         build/all.gyp
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's@/usr/bin/env python@${python}/bin/python@g' out/gyp-mac-tool
   '';
 
   nativeBuildInputs = [ which ];
-  buildInputs = [ readline python icu ] ++ lib.optional stdenv.isLinux utillinux;
+  buildInputs = [ readline python icu ]
+                  ++ lib.optional stdenv.isLinux utillinux
+                  ++ lib.optional stdenv.isDarwin cctools;
 
-  NIX_CFLAGS_COMPILE = "-Wno-error";
+  NIX_CFLAGS_COMPILE = "-Wno-error -w";
 
   buildFlags = [
     "-C out"
diff --git a/pkgs/development/python-modules/gyp/no-xcode.patch b/pkgs/development/python-modules/gyp/no-xcode.patch
index eb33a2b9987..d202b722474 100644
--- a/pkgs/development/python-modules/gyp/no-xcode.patch
+++ b/pkgs/development/python-modules/gyp/no-xcode.patch
@@ -1,66 +1,12 @@
-Index: pylib/gyp/xcode_emulation.py
-diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py
-index b2aab986a427d5285d70558bf97f0a42bfe1556e..20592c73fae660009aac621097cf3c4fb61d6cb6 100644
 --- a/pylib/gyp/xcode_emulation.py
 +++ b/pylib/gyp/xcode_emulation.py
-@@ -236,8 +236,14 @@ class XcodeSettings(object):
-     if sdk_root.startswith('/'):
-       return sdk_root
-     if sdk_root not in XcodeSettings._sdk_path_cache:
--      XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem(
--          sdk_root, 'Path')
-+      try:
-+        XcodeSettings._sdk_path_cache[sdk_root] = self._GetSdkVersionInfoItem(
-+            sdk_root, 'Path')
-+      except:
-+        # if this fails it's because xcodebuild failed, which means
-+        # the user is probably on a CLT-only system, where there
-+        # is no valid SDK root
-+        XcodeSettings._sdk_path_cache[sdk_root] = None
-     return XcodeSettings._sdk_path_cache[sdk_root]
- 
-   def _AppendPlatformVersionMinFlags(self, lst):
-@@ -340,10 +346,11 @@ class XcodeSettings(object):
- 
-     cflags += self._Settings().get('WARNING_CFLAGS', [])
- 
--    config = self.spec['configurations'][self.configname]
--    framework_dirs = config.get('mac_framework_dirs', [])
--    for directory in framework_dirs:
--      cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
+@@ -1470,7 +1470,8 @@
+     sdk_root = xcode_settings._SdkRoot(configuration)
+     if not sdk_root:
+       sdk_root = xcode_settings._XcodeSdkPath('')
+-    env['SDKROOT'] = sdk_root
 +    if sdk_root:
-+      config = self.spec['configurations'][self.configname]
-+      framework_dirs = config.get('mac_framework_dirs', [])
-+      for directory in framework_dirs:
-+        cflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
- 
-     self.configname = None
-     return cflags
-@@ -573,10 +580,11 @@ class XcodeSettings(object):
-     for rpath in self._Settings().get('LD_RUNPATH_SEARCH_PATHS', []):
-       ldflags.append('-Wl,-rpath,' + rpath)
- 
--    config = self.spec['configurations'][self.configname]
--    framework_dirs = config.get('mac_framework_dirs', [])
--    for directory in framework_dirs:
--      ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath()))
-+    if self._SdkPath():
-+      config = self.spec['configurations'][self.configname]
-+      framework_dirs = config.get('mac_framework_dirs', [])
-+      for directory in framework_dirs:
-+        ldflags.append('-F' + directory.replace('$(SDKROOT)', self._SdkPath()))
- 
-     self.configname = None
-     return ldflags
-@@ -701,7 +709,10 @@ class XcodeSettings(object):
-         l = '-l' + m.group(1)
-       else:
-         l = library
--    return l.replace('$(SDKROOT)', self._SdkPath(config_name))
-+    if self._SdkPath():
-+      return l.replace('$(SDKROOT)', self._SdkPath(config_name))
-+    else:
-+      return l
++      env['SDKROOT'] = sdk_root
  
-   def AdjustLibraries(self, libraries, config_name=None):
-     """Transforms entries like 'Cocoa.framework' in libraries into entries like
+   if not additional_settings:
+     additional_settings = {}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92bfbdef2af..5a9fe75b332 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10300,6 +10300,7 @@ with pkgs;
 
   v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
     inherit (python2Packages) python gyp;
+    cctools = darwin.cctools;
   };
 
   v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 906f9b6b391..6343a35791d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11915,6 +11915,7 @@ in {
 
     patches = optionals pkgs.stdenv.isDarwin [
       ../development/python-modules/gyp/no-darwin-cflags.patch
+      ../development/python-modules/gyp/no-xcode.patch
     ];
 
     disabled = isPy3k;
-- 
GitLab


From 72ed360277030956fa3f173d6dc0a273c4ba0d96 Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Tue, 27 Jun 2017 01:44:00 +0200
Subject: [PATCH 1267/1490] freeradius: 3.0.12 -> 3.0.14 (#26874)

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

diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index 117fa8782c9..ec6610b8245 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -40,11 +40,11 @@ assert withCollectd -> collectd != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "freeradius-${version}";
-  version = "3.0.12";
+  version = "3.0.14";
 
   src = fetchurl {
     url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
-    sha256 = "182xnb9pdsivlyfm471l90m37q9i04h7jadhkgm0ivvzrzpzcnja";
+    sha256 = "02ar0xn4dfrs95cmd4c798k95rmnzzvcryyyl2vjv53ak16igmpw";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From b8bfc8dae29d1b5daf156916faabac77783fb3cc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 Jun 2017 21:13:41 +0200
Subject: [PATCH 1268/1490] httpd: don't install suid executables into nix
 store

---
 pkgs/servers/http/thttpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
index 692bba846ea..96652515f7a 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     sed -i -e 's/getline/getlineX/' extras/htpasswd.c
+    sed -i -e 's/chmod 2755/chmod 755/' extras/Makefile.in
   '';
 
   preInstall = ''
-- 
GitLab


From 271d3f7a432f60f6367ffcbf1096fed15b397fa5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 26 Jun 2017 21:54:54 +0200
Subject: [PATCH 1269/1490] prometheus service: globalConfig.labels is obsolete

Due to the version bump in e60c958811186e46d9220cca8ce9700da174d9a1.
---
 nixos/modules/services/monitoring/prometheus/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index b9435c02b1d..c12b5f35dea 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -66,15 +66,6 @@ let
           How frequently to evaluate rules by default.
         '';
       };
-
-      labels = mkOption {
-        type = types.attrsOf types.str;
-        default = {};
-        description = ''
-          The labels to add to any timeseries that this Prometheus instance
-          scrapes.
-        '';
-      };
     };
   };
 
-- 
GitLab


From d8e5c75f75fe6f30815a3faf7420efb5bae35aca Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Mon, 26 Jun 2017 19:54:24 -0400
Subject: [PATCH 1270/1490] Remove old thunderbird-bin update script

`thunderbird-bin` appears to now use the
`maintainers/scripts/update.nix` script instead of this ruby script, so
the latter should be removed.
---
 .../thunderbird-bin/generate_sources.rb       | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb
deleted file mode 100644
index 43b41658413..00000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require "open-uri"
-
-version =
-  if ARGV.empty?
-    $stderr.puts("Usage: ruby generate_sources.rb <version> > sources.nix")
-    exit(-1)
-  else
-    ARGV[0]
-  end
-
-base_path = "http://archive.mozilla.org/pub/thunderbird/releases"
-
-Source = Struct.new(:hash, :arch, :locale, :filename)
-
-sources = open("#{base_path}/#{version}/SHA512SUMS") do |input|
-  input.readlines
-end.select do |line|
-  /\/thunderbird-.*\.tar\.bz2$/ === line && !(/source/ === line)
-end.map do |line|
-  hash, name = line.chomp.split(/ +/)
-  Source.new(hash, *(name.split("/")))
-end.sort_by do |source|
-  [source.locale, source.arch]
-end
-
-arches = ["linux-i686", "linux-x86_64"]
-
-puts(<<"EOH")
-# This file is generated from generate_sources.rb. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# ruby generate_sources.rb 45.1.1 > sources.nix
-
-{
-  version = "#{version}";
-  sources = [
-EOH
-
-sources.each do |source|
-  puts(%Q|    { locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|)
-end
-
-puts(<<'EOF')
-  ];
-}
-EOF
-- 
GitLab


From 32705450944254f3f49b09671efaadca31ed8a48 Mon Sep 17 00:00:00 2001
From: Calvin Cheng <linchuan.cheng@gmail.com>
Date: Thu, 9 Jul 2015 08:39:50 +0000
Subject: [PATCH 1271/1490] rethinkdb service: initial implementation

---
 .../modules/services/databases/rethinkdb.nix  | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 nixos/modules/services/databases/rethinkdb.nix

diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixos/modules/services/databases/rethinkdb.nix
new file mode 100644
index 00000000000..cd8c386b08d
--- /dev/null
+++ b/nixos/modules/services/databases/rethinkdb.nix
@@ -0,0 +1,110 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.rethinkdb;
+  rethinkdb = cfg.package;
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.rethinkdb = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable the RethinkDB server.";
+      };
+
+      #package = mkOption {
+      #  default = pkgs.rethinkdb;
+      #  description = "Which RethinkDB derivation to use.";
+      #};
+
+      user = mkOption {
+        default = "rethinkdb";
+        description = "User account under which RethinkDB runs.";
+      };
+
+      group = mkOption {
+        default = "rethinkdb";
+        description = "Group which rethinkdb user belongs to.";
+      };
+
+      dbpath = mkOption {
+        default = "/var/db/rethinkdb";
+        description = "Location where RethinkDB stores its data, 1 data directory per instance.";
+      };
+
+      pidpath = mkOption {
+        default = "/var/run/rethinkdb";
+        description = "Location where each instance's pid file is located.";
+      };
+
+      #cfgpath = mkOption {
+      #  default = "/etc/rethinkdb/instances.d";
+      #  description = "Location where RethinkDB stores it config files, 1 config file per instance.";
+      #};
+
+      # TODO: currently not used by our implementation.
+      #instances = mkOption {
+      #  type = types.attrsOf types.str;
+      #  default = {};
+      #  description = "List of named RethinkDB instances in our cluster.";
+      #};
+
+    };
+
+  };
+
+  ###### implementation
+  config = mkIf config.services.rethinkdb.enable {
+
+    environment.systemPackages = [ rethinkdb ];
+
+    systemd.services.rethinkdb = {
+      description = "RethinkDB server";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        # TODO: abstract away 'default', which is a per-instance directory name
+        #       allowing end user of this nix module to provide multiple instances,
+        #       and associated directory per instance
+        ExecStart = "${rethinkdb}/bin/rethinkdb -d ${cfg.dbpath}/default";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        User = cfg.user;
+        Group = cfg.group;
+        PIDFile = "${cfg.pidpath}/default.pid";
+        PermissionsStartOnly = true;
+      };
+
+      preStart = ''
+        if ! test -e ${cfg.dbpath}; then
+            install -d -m0755 -o ${cfg.user} -g ${cfg.group} ${cfg.dbpath}
+            install -d -m0755 -o ${cfg.user} -g ${cfg.group} ${cfg.dbpath}/default
+            chown -R ${cfg.user}:${cfg.group} ${cfg.dbpath}
+        fi
+        if ! test -e "${cfg.pidpath}/default.pid"; then
+            install -D -o ${cfg.user} -g ${cfg.group} /dev/null "${cfg.pidpath}/default.pid"
+        fi
+      '';
+    };
+
+    users.extraUsers.rethinkdb = mkIf (cfg.user == "rethinkdb")
+      { name = "rethinkdb";
+        description = "RethinkDB server user";
+      };
+
+    users.extraGroups = optionalAttrs (cfg.group == "rethinkdb") (singleton
+      { name = "rethinkdb";
+      });
+
+  };
+
+}
-- 
GitLab


From 842250064b776d0b19b449a00dbcbeb633946cbf Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 27 Jun 2017 01:28:59 +0000
Subject: [PATCH 1272/1490] libunwind: 1.1 -> 1.2.1

---
 .../libraries/libunwind/cve-2015-3239.patch   | 15 -----
 .../libraries/libunwind/default.nix           | 30 ++-------
 .../libunwind/libunwind-1.1-lzma.patch        | 63 -------------------
 3 files changed, 6 insertions(+), 102 deletions(-)
 delete mode 100644 pkgs/development/libraries/libunwind/cve-2015-3239.patch
 delete mode 100644 pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch

diff --git a/pkgs/development/libraries/libunwind/cve-2015-3239.patch b/pkgs/development/libraries/libunwind/cve-2015-3239.patch
deleted file mode 100644
index 247b2dab44f..00000000000
--- a/pkgs/development/libraries/libunwind/cve-2015-3239.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://git.savannah.gnu.org/cgit/libunwind.git/commit/?id=396b6c7ab737e2bff244d640601c436a26260ca1
-
-diff --git a/include/dwarf_i.h b/include/dwarf_i.h
-index 0e72845..86dcdb8 100644
---- a/include/dwarf_i.h
-+++ b/include/dwarf_i.h
-@@ -20,7 +20,7 @@
- extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
- /* REG is evaluated multiple times; it better be side-effects free!  */
- # define dwarf_to_unw_regnum(reg)					  \
--  (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
-+  (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
- #endif
- 
- #ifdef UNW_LOCAL_ONLY
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 419a14551ba..474b9175150 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,39 +1,20 @@
 { stdenv, fetchurl, fetchpatch, autoreconfHook, xz }:
 
 stdenv.mkDerivation rec {
-  name = "libunwind-1.1";
+  name = "libunwind-${version}";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "mirror://savannah/libunwind/${name}.tar.gz";
-    sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
+    sha256 = "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz";
   };
 
-  buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook;
-
-  patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch
-              # https://lists.nongnu.org/archive/html/libunwind-devel/2014-04/msg00000.html
-              (fetchpatch {
-                url = "https://raw.githubusercontent.com/dropbox/pyston/1b2e676417b0f5f17526ece0ed840aa88c744145/libunwind_patches/0001-Change-the-RBP-validation-heuristic-to-allow-size-0-.patch";
-                sha256 = "1a0fsgfxmgd218nscswx7pgyb7rcn2gh6566252xhfvzhgn5i4ha";
-              })
-            ] ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
-              url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/77709d1c6d5c39e23c1535b1bd584be1455f2551/extra/libunwind/libunwind-aarch64.patch";
-              sha256 = "1mpjs8izq9wxiaf5rl4gzaxrkz0s51f9qz5qc5dj72pr84mw50w8";
-            });
-
-  postPatch = ''
-    sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure
-  '';
+  nativeBuildInputs = [ autoreconfHook ];
 
   outputs = [ "out" "dev" ];
 
   propagatedBuildInputs = [ xz ];
 
-  preInstall = ''
-    mkdir -p "$out/lib"
-    touch "$out/lib/libunwind-generic.so"
-  '';
-
   postInstall = ''
     find $out -name \*.la | while read file; do
       sed -i 's,-llzma,${xz.out}/lib/liblzma.la,' $file
@@ -43,7 +24,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.nongnu.org/libunwind;
     description = "A portable and efficient API to determine the call-chain of a program";
+    maintainers = with maintainers; [ orivej ];
     platforms = platforms.linux;
-    license = licenses.gpl2;
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch b/pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch
deleted file mode 100644
index 09cefa02853..00000000000
--- a/pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 38c349bb000b427c376e756e3ecdb764a2b4d297 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 15 Feb 2014 21:00:59 -0500
-Subject: [PATCH] link sublibs against liblzma as needed
-
-The coredump/elf32/elf64/elfxx libs use lzma funcs but don't link against
-it.  This produces sub-shared libs that don't link against lzma and can
-make the linker angry due to underlinking like so:
-
-libtool: link: x86_64-pc-linux-gnu-gcc -O2 -march=amdfam10 -pipe -g \
-	-frecord-gcc-switches -Wimplicit-function-declaration -fexceptions \
-	-Wall -Wsign-compare -Wl,-O1 -Wl,--hash-style=gnu \
-	-o .libs/test-coredump-unwind test-coredump-unwind.o  \
-	../src/.libs/libunwind-coredump.so ../src/.libs/libunwind-x86_64.so
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_footer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_buffer_decode'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_end'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_uncompressed_size'
-../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_buffer_decode'
-collect2: error: ld returned 1 exit status
-
-So add LIBLZMA to the right LIBADD for each of these libraries.
-
-URL: https://bugs.gentoo.org/444050
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -169,7 +169,7 @@ libunwind_arm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libunwind_arm_la_LDFLAGS) $(LDFLAGS) -o $@
- @ARCH_ARM_TRUE@am_libunwind_arm_la_rpath = -rpath $(libdir)
--libunwind_coredump_la_LIBADD =
-+libunwind_coredump_la_LIBADD = $(LIBLZMA)
- am__libunwind_coredump_la_SOURCES_DIST = coredump/_UCD_accessors.c \
- 	coredump/_UCD_create.c coredump/_UCD_destroy.c \
- 	coredump/_UCD_access_mem.c coredump/_UCD_elf_map_image.c \
-@@ -214,15 +214,15 @@ am_libunwind_dwarf_local_la_OBJECTS = dwarf/Lexpr.lo dwarf/Lfde.lo \
- libunwind_dwarf_local_la_OBJECTS =  \
- 	$(am_libunwind_dwarf_local_la_OBJECTS)
- @REMOTE_ONLY_FALSE@@USE_DWARF_TRUE@am_libunwind_dwarf_local_la_rpath =
--libunwind_elf32_la_LIBADD =
-+libunwind_elf32_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf32_la_OBJECTS = elf32.lo
- libunwind_elf32_la_OBJECTS = $(am_libunwind_elf32_la_OBJECTS)
- @USE_ELF32_TRUE@am_libunwind_elf32_la_rpath =
--libunwind_elf64_la_LIBADD =
-+libunwind_elf64_la_LIBADD = $(LIBLZMA)
- am_libunwind_elf64_la_OBJECTS = elf64.lo
- libunwind_elf64_la_OBJECTS = $(am_libunwind_elf64_la_OBJECTS)
- @USE_ELF64_TRUE@am_libunwind_elf64_la_rpath =
--libunwind_elfxx_la_LIBADD =
-+libunwind_elfxx_la_LIBADD = $(LIBLZMA)
- am_libunwind_elfxx_la_OBJECTS = elfxx.lo
- libunwind_elfxx_la_OBJECTS = $(am_libunwind_elfxx_la_OBJECTS)
- @USE_ELFXX_TRUE@am_libunwind_elfxx_la_rpath =
--- 
-1.8.5.5
-
-- 
GitLab


From 9516bbf172aedb7e1211ef0369e09167f95d6a5d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 27 Jun 2017 09:51:06 +0200
Subject: [PATCH 1273/1490] geogebra: make `language` configurable

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

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index b4b730d3343..b6fdd6f58b9 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper }:
+{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }:
 
 stdenv.mkDerivation rec {
   name = "geogebra-${version}";
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
 
     makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \
       --set JAVACMD "${jre}/bin/java" \
-      --set GG_PATH "$out/libexec/geogebra"
+      --set GG_PATH "$out/libexec/geogebra" \
+      --add-flags "--language=${language}"
 
     install -Dm644 "${desktopItem}/share/applications/"* \
       -t $out/share/applications/
-- 
GitLab


From 71e495e10f363c91475f82683e6df3b49a5b3e7c Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 27 Jun 2017 02:00:49 -0700
Subject: [PATCH 1274/1490] winetricks: 20170327 -> 20170614

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 7cb45b08a98..043d305bbe8 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -47,8 +47,8 @@ in rec {
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20170327";
-    sha256 = "1iplk8nl37k94bhhy3q3jxkif0mnpc09xhwxn2xic16nvfavrmhy";
+    version = "20170614";
+    sha256 = "1xszflrdmixxr0v7vjby8fpnl8fgc9gldr1gnjpwzq1rnb84idqa";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;
-- 
GitLab


From 107d53f40c940a6495ee96c1f22aa9200647dce7 Mon Sep 17 00:00:00 2001
From: Robert <github@vllmrt.net>
Date: Tue, 27 Jun 2017 11:24:16 +0200
Subject: [PATCH 1275/1490] bundix: 2.2.0 -> 2.2.1 (#26894)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes `fetchurl-force.nix` not being installed, which breaks
bundix for some gems.

E.g.

```
$ nix-build --argstr url https://rubygems.org/gems/nio4r-2.1.0.gem /nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix
error: getting status of ‘/nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix’: No such file or directory
```
---
 pkgs/development/ruby-modules/bundix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix
index 919b4b00319..8ccc6dbf306 100644
--- a/pkgs/development/ruby-modules/bundix/default.nix
+++ b/pkgs/development/ruby-modules/bundix/default.nix
@@ -5,13 +5,13 @@ buildRubyGem rec {
 
   name = "${gemName}-${version}";
   gemName = "bundix";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "manveru";
     repo = "bundix";
     rev = version;
-    sha256 = "0lnzkwxprdz73axk54y5p5xkw56n3lra9v2dsvqjfw0ab66ld0iy";
+    sha256 = "1gh90yxm4k27jdjdl3r31fcg4sk7k54jlbw1zfm1p9q3i7k8x4i7";
   };
 
   buildInputs = [bundler];
-- 
GitLab


From f48e400133e6b21d958b69c1b27579927abc602a Mon Sep 17 00:00:00 2001
From: TANIGUCHI Kohei <a.d.xvii.kal.mai@gmail.com>
Date: Tue, 27 Jun 2017 20:24:30 +0900
Subject: [PATCH 1276/1490] fswatch: 1.5.0 -> 1.9.3

---
 pkgs/development/tools/misc/fswatch/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 8f3818fb6b4..b8e2a9a189b 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,24 +10,17 @@
 
 stdenv.mkDerivation rec {
   name = "fswatch-${version}";
-  version = "1.5.0";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "09np75m9df2nk7lc5y9wgq467ca6jsd2p5666d5rkzjvy6s0a51n";
+    sha256 = "1g329aapdvbzhr39wyh295shpfq5f0nlzsqkjnr8l6zzak7f4yrg";
   };
 
   buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ];
 
-  postFixup = ''
-    for prog in fswatch-run fswatch-run-bash; do
-      wrapProgram $out/bin/$prog \
-        --prefix PATH "${findutils}/bin"
-    done
-  '';
-
   meta = with stdenv.lib; {
     description = "A cross-platform file change monitor with multiple backends";
     homepage = https://github.com/emcrisostomo/fswatch;
@@ -35,5 +28,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = with maintainers; [ pSub ];
   };
-
 }
-- 
GitLab


From 2cb5246dd820c541539ca81ec8bf22414dbdc448 Mon Sep 17 00:00:00 2001
From: Josef Kemetmueller <josef.kemetmueller@zamg.ac.at>
Date: Tue, 27 Jun 2017 11:41:19 +0000
Subject: [PATCH 1277/1490] gogs: 0.10.18 -> 0.11.19

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

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index 4ab97cc06d2..bdbd7566166 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gogs-${version}";
-  version = "0.10.18";
+  version = "0.11.19";
 
   src = fetchFromGitHub {
     owner = "gogits";
     repo = "gogs";
     rev = "v${version}";
-    sha256 = "1f1dlickjpdilf4j295i9v2h4ig4pf5d2mnpbr59wh14bby4bh0y";
+    sha256 = "0smzklhpfv3smqgzd0cnjdif3zi5q7b02grrnb5zssmdi1b2dlsd";
   };
 
   patchPhase = ''
-- 
GitLab


From 074bccb43b30d4a385a8926c22ed07c617cacef6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 27 Jun 2017 06:58:34 -0500
Subject: [PATCH 1278/1490] plasma5: 5.10.2 -> 5.10.3

This is a scheduled bugfix release. Several fixes are related to integrating
Plasma 5.10 and Qt 5.9, particularly a serious bug in KWin.
---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 336 ++++++++++++++++----------------
 2 files changed, 169 insertions(+), 169 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 1ebc6553ff2..c1a6e867274 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.3/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 899f6a3f63c..d1824f30527 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,339 +3,339 @@
 
 {
   bluedevil = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/bluedevil-5.10.2.tar.xz";
-      sha256 = "1510gjbvyjr4bg00m28hz9ynz7m7h35c859ksq7r1y102kjxgyr7";
-      name = "bluedevil-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/bluedevil-5.10.3.tar.xz";
+      sha256 = "03qkd08nwqkc25wvj4964xgrj40m6vhzqg67fdqamav6d5np106g";
+      name = "bluedevil-5.10.3.tar.xz";
     };
   };
   breeze = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/breeze-5.10.2.tar.xz";
-      sha256 = "1wywa8y07ssxvl59xw4xifi41wj9dd594hy17vjigfp1xi7h62br";
-      name = "breeze-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/breeze-5.10.3.tar.xz";
+      sha256 = "048z84dsrx9ln5whg7vbp0amhhsnggh1jm4z6nmraizms2ay0w8a";
+      name = "breeze-5.10.3.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/breeze-grub-5.10.2.tar.xz";
-      sha256 = "0xb7gvl1yrh8g75w1f97wvwig99fwqfk8azkpxxhrg8j5nr4vaz2";
-      name = "breeze-grub-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/breeze-grub-5.10.3.tar.xz";
+      sha256 = "1ghg7vc9ad6bw0b0q88srjwm8h9khyl93ljr2riaw3wh23slkw5z";
+      name = "breeze-grub-5.10.3.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/breeze-gtk-5.10.2.tar.xz";
-      sha256 = "06pgbkf078zl57vyfvsmm1bll8g2x419fy2waqh9n7jkycihlinx";
-      name = "breeze-gtk-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/breeze-gtk-5.10.3.tar.xz";
+      sha256 = "0ai2hkd79g1y8clk0650qijq5w5fmaamhbapw6yddf4v4a40vspc";
+      name = "breeze-gtk-5.10.3.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/breeze-plymouth-5.10.2.tar.xz";
-      sha256 = "0db00k3h7vsp3pf7xnix8kazsw5wcjzkcj1wfkn4c7vdcvfv48pd";
-      name = "breeze-plymouth-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/breeze-plymouth-5.10.3.tar.xz";
+      sha256 = "1249ywi5s8ba5mzgi2773xz04g3shzc61bwsfcgpvzyc61q3dsl9";
+      name = "breeze-plymouth-5.10.3.tar.xz";
     };
   };
   discover = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/discover-5.10.2.tar.xz";
-      sha256 = "0ky5yk5nknipxy4hamy6i6m46jhv3n1lsmcs149j687jw2l6ryls";
-      name = "discover-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/discover-5.10.3.tar.xz";
+      sha256 = "189pv0zbl7mzswk65nlj8yq5ymj3ska8a52ws852blnccj8x18qn";
+      name = "discover-5.10.3.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kactivitymanagerd-5.10.2.tar.xz";
-      sha256 = "1x7fc3nszg9fcksyf2c9dyagsa9486ybh6yrrn4c6d6z813479qj";
-      name = "kactivitymanagerd-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kactivitymanagerd-5.10.3.tar.xz";
+      sha256 = "1y4xyg5swr2abiiqp67b95jfj4xbmgw1y51vj6njcdrkkkksz7qh";
+      name = "kactivitymanagerd-5.10.3.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kde-cli-tools-5.10.2.tar.xz";
-      sha256 = "0d1vfxgi0anggjirp1ncaqr1l7rlbniiv74gf5npb3f260h6yr0h";
-      name = "kde-cli-tools-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kde-cli-tools-5.10.3.tar.xz";
+      sha256 = "1xmk45hj96qmfcprccsnlzr0hms98yvnnz8wkylgbnj75rcfq7ws";
+      name = "kde-cli-tools-5.10.3.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kdecoration-5.10.2.tar.xz";
-      sha256 = "05mg8aacayfx63mx8yb6g1j6wx7kkk21msl33krks7bdqx0jx9kw";
-      name = "kdecoration-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kdecoration-5.10.3.tar.xz";
+      sha256 = "14ayrnv1q1rhjclh2pbjwnzssqk2m9zlpm64011y258r5q9mw8h3";
+      name = "kdecoration-5.10.3.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kde-gtk-config-5.10.2.tar.xz";
-      sha256 = "096dfl5nm65v6m4m6r1smwbcxv5fkxnbgrgi17x5lfipa9mmrf58";
-      name = "kde-gtk-config-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kde-gtk-config-5.10.3.tar.xz";
+      sha256 = "049dk79wgqgk2jiicqyv32m6nhj6k7hw5qrhagg8js28b6sqkw0m";
+      name = "kde-gtk-config-5.10.3.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kdeplasma-addons-5.10.2.tar.xz";
-      sha256 = "1yznzz0yrjckv4b1h58fsn0sww5iwmkqvsajdqhgzqw1cs4v98p0";
-      name = "kdeplasma-addons-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kdeplasma-addons-5.10.3.tar.xz";
+      sha256 = "1lzkwa51845f97qz43j1k284hwjbg05cry7lj16nlaq0rlwncgps";
+      name = "kdeplasma-addons-5.10.3.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kgamma5-5.10.2.tar.xz";
-      sha256 = "0hwnn057jbqpzbp8jryfcdp2qlypmyvh5zmfay8iy9vy068zzcmc";
-      name = "kgamma5-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kgamma5-5.10.3.tar.xz";
+      sha256 = "19mcdj1xcsf43k3n77ybqj9i99l6m8yryw3bhcbzfxk0c6ccx9cy";
+      name = "kgamma5-5.10.3.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/khotkeys-5.10.2.tar.xz";
-      sha256 = "1kdvdb5i0mjrv4h4m539kikdrb0vybgphaahxk4392npv2zqz1xs";
-      name = "khotkeys-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/khotkeys-5.10.3.tar.xz";
+      sha256 = "1xbxbqvpnci2fanwvdrr6rnwabh3yfamndfhmy4gjik26y0i8yz4";
+      name = "khotkeys-5.10.3.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kinfocenter-5.10.2.tar.xz";
-      sha256 = "1r0q8xmb9m0xgcw21a6klagfh560ywzdcnly6r36fpwj0hjv60hj";
-      name = "kinfocenter-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kinfocenter-5.10.3.tar.xz";
+      sha256 = "0a94wz7fbck08aw3xrvn2hjbj3px5ivfzkh6hhqcxblnc5ahr0fk";
+      name = "kinfocenter-5.10.3.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kmenuedit-5.10.2.tar.xz";
-      sha256 = "0dcy5r829dpzfmkqzmcbwxv5bqdamq0lvz7khd0n08f4h7a32wnz";
-      name = "kmenuedit-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kmenuedit-5.10.3.tar.xz";
+      sha256 = "1y4riijwp1g3bji2wd21m7raf95prajd3sxcgr140sg0lq8zg8h2";
+      name = "kmenuedit-5.10.3.tar.xz";
     };
   };
   kscreen = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kscreen-5.10.2.tar.xz";
-      sha256 = "0304vi87xq7p8l6dibgb74dzcf7721nps18cm6p9a05nnlvpr1l7";
-      name = "kscreen-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kscreen-5.10.3.tar.xz";
+      sha256 = "03l8ammyir82w8kdl4sm8lkp1nr0qghk04g838p34m05ah8hb7nl";
+      name = "kscreen-5.10.3.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kscreenlocker-5.10.2.tar.xz";
-      sha256 = "079vkca9q509qg5qq4kwlzl3dmnqrigs0xm6vyz000589cpg6ib5";
-      name = "kscreenlocker-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kscreenlocker-5.10.3.tar.xz";
+      sha256 = "07k0smksglzq44llpn80xs7p8salfryphihran7frb1mvyg09yzx";
+      name = "kscreenlocker-5.10.3.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/ksshaskpass-5.10.2.tar.xz";
-      sha256 = "1mjbpsaj3qyrd7f5yqnw0y81d8srjjd537sx7yjgvyijaf2v0vyz";
-      name = "ksshaskpass-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/ksshaskpass-5.10.3.tar.xz";
+      sha256 = "10cy8d4dbg8dzkh428x3vl6n2hh73b3fxnal8a2wwx23flhmg04c";
+      name = "ksshaskpass-5.10.3.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/ksysguard-5.10.2.tar.xz";
-      sha256 = "1ndz3l91chq1n3p9xrw57mkdxa7hw778baydk8y9pbdr2yr961cv";
-      name = "ksysguard-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/ksysguard-5.10.3.tar.xz";
+      sha256 = "0mgzqd3abhs03k815kij6n6jpiqhd13vzbyifcp4r0q8kh34b71s";
+      name = "ksysguard-5.10.3.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kwallet-pam-5.10.2.tar.xz";
-      sha256 = "01ki2rfn4sw8m8qh7lwwikcr9kxwiv9x7mv86h86ssd1hfzwzhda";
-      name = "kwallet-pam-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kwallet-pam-5.10.3.tar.xz";
+      sha256 = "0pysv9lfljar4krdkwns7fyyi0zz5629prfmdxs2aww6cq4d2x7m";
+      name = "kwallet-pam-5.10.3.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kwayland-integration-5.10.2.tar.xz";
-      sha256 = "1fna7llnimcqvzhmxb93m92gvicjiddqxd9lwqgyv7fww6bhsj3a";
-      name = "kwayland-integration-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kwayland-integration-5.10.3.tar.xz";
+      sha256 = "1gfx5mxy1zan5shhddi4b6k578l19rkld2zkfa4g97hhvc0h83s9";
+      name = "kwayland-integration-5.10.3.tar.xz";
     };
   };
   kwin = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kwin-5.10.2.tar.xz";
-      sha256 = "1gvby6k865snh6hsrnk53hwhb3242iamclz9nq9fzgy23a6g8mzj";
-      name = "kwin-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kwin-5.10.3.tar.xz";
+      sha256 = "0vbrf7vm8s7hrzkgsjsqggswadvrr1k2g85y7w1pb781way7xwj3";
+      name = "kwin-5.10.3.tar.xz";
     };
   };
   kwrited = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/kwrited-5.10.2.tar.xz";
-      sha256 = "1hz6p6il839c28bkf2bn9fqjpipiqdxk603v0h0iqvspfj00z7n8";
-      name = "kwrited-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/kwrited-5.10.3.tar.xz";
+      sha256 = "0cjyvz5wg37dbnacsf3hz05bkwzpbznmlsy5plhqxr6wmq6q6l9q";
+      name = "kwrited-5.10.3.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/libkscreen-5.10.2.tar.xz";
-      sha256 = "0w1adz5c32si1kcmxy015wzjxkln68f0inya2499jag2v9hd3vhn";
-      name = "libkscreen-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/libkscreen-5.10.3.tar.xz";
+      sha256 = "02hcsfmjzajbpki2pmpdycgccjqadd98vzam56sihsvivgxykw4h";
+      name = "libkscreen-5.10.3.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/libksysguard-5.10.2.tar.xz";
-      sha256 = "1x13mb3c5bzbi5nw3ahgy12x1df50qirr2h4c7igacxrv4m3zrih";
-      name = "libksysguard-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/libksysguard-5.10.3.tar.xz";
+      sha256 = "13s7j53jjyhd5kryyd1sy6yrx69h5smi7xg49d8as8zbf3rki08h";
+      name = "libksysguard-5.10.3.tar.xz";
     };
   };
   milou = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/milou-5.10.2.tar.xz";
-      sha256 = "06c4pb3gls1bgk1sffh6vj035i5vhiy04rmifypcp8gps98j6izw";
-      name = "milou-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/milou-5.10.3.tar.xz";
+      sha256 = "18bgwpxfv5n4nxvs6xj6ihk22bpmb1b4cs9dxhfn931r8lnzzixb";
+      name = "milou-5.10.3.tar.xz";
     };
   };
   oxygen = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/oxygen-5.10.2.tar.xz";
-      sha256 = "08d3rdj5vabrxrrlbzhw3ixnb3msm99idbhnpyzdkaw00l444f1p";
-      name = "oxygen-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/oxygen-5.10.3.tar.xz";
+      sha256 = "07jqm9nl84b2s9i461mz4b8i1x22376k9n1g9prcjzxyy3494flv";
+      name = "oxygen-5.10.3.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/plasma-desktop-5.10.2.tar.xz";
-      sha256 = "1mjz52n6jm1vi3v7432g9v9rh6bbgcwkrg12yahpzlz026hsyxrn";
-      name = "plasma-desktop-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/plasma-desktop-5.10.3.tar.xz";
+      sha256 = "1vwls9gavcipv8k2fwx9kzzldfcxch3g61nsc77dw0lrhcaf301d";
+      name = "plasma-desktop-5.10.3.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/plasma-integration-5.10.2.tar.xz";
-      sha256 = "0gzrv3plcn35rkwr7izn0363zbp91rdjw9k8n9s50p9rdx3rx8ly";
-      name = "plasma-integration-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/plasma-integration-5.10.3.tar.xz";
+      sha256 = "1vpgwzvqjcr6hgrh57777i21fbmixl6vrlyscdyk0912mdzplf5n";
+      name = "plasma-integration-5.10.3.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/plasma-nm-5.10.2.tar.xz";
-      sha256 = "0bw5vyzzvpklhgq02yhcq1sv7pz00kffvgvfjkgk45g5x47h7hw1";
-      name = "plasma-nm-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/plasma-nm-5.10.3.tar.xz";
+      sha256 = "1d8kncwcxw601n73m7igr2h09mk54qa2zgshrbd0h3496dw4xzxq";
+      name = "plasma-nm-5.10.3.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/plasma-pa-5.10.2.tar.xz";
-      sha256 = "1bbmlp5i2k4ygcn76frijjxzy88v3m5cpydslv7i5y41apm8bvip";
-      name = "plasma-pa-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/plasma-pa-5.10.3.tar.xz";
+      sha256 = "1dhkkfl39x17bd0hv3w0lclzlsialg7a7zydcjm345izpdgd11vx";
+      name = "plasma-pa-5.10.3.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/plasma-sdk-5.10.2.tar.xz";
-      sha256 = "0npccg4zzrd2cx4qa5qi0yr722x2yh8v0zd8dv76znqf8lsgwpj4";
-      name = "plasma-sdk-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/plasma-sdk-5.10.3.tar.xz";
+      sha256 = "0m426fj5d07bqj0n1gxcn7brjwf7xrsj50hy14hky246wchvqh43";
+      name = "plasma-sdk-5.10.3.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/plasma-tests-5.10.2.tar.xz";
-      sha256 = "1kyah0r138x3i35glb2slacwivdwbwvq19xp1hz2zrmiy52zq65i";
-      name = "plasma-tests-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/plasma-tests-5.10.3.tar.xz";
+      sha256 = "04pn5bzhs0y6msir2px985jghhswas9zn37jb4zdy0sxd9yhabqb";
+      name = "plasma-tests-5.10.3.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/plasma-workspace-5.10.2.tar.xz";
-      sha256 = "11q1p3ifs2fwrhm8ylvqacshz746dhl68w0s4dfykvr2r7mqqqf2";
-      name = "plasma-workspace-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-5.10.3.tar.xz";
+      sha256 = "0wfzdjpgd9fwycy4ww2j7xryh82wg4jfipnh9hicq2mss0x53mv9";
+      name = "plasma-workspace-5.10.3.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/plasma-workspace-wallpapers-5.10.2.tar.xz";
-      sha256 = "1hsm731fckv5bnl7faz7bbizi80df5zb35hmiz90fhdz4x2i7krp";
-      name = "plasma-workspace-wallpapers-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-wallpapers-5.10.3.tar.xz";
+      sha256 = "0vhdypkkcranpb7zv2ghh0d5x5698d7vvyv1k7xcgsd1bwf3037f";
+      name = "plasma-workspace-wallpapers-5.10.3.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/plymouth-kcm-5.10.2.tar.xz";
-      sha256 = "1fxz15yc081i6y3qvpxqy8ca6khm492hxxmji87ds30634d0033a";
-      name = "plymouth-kcm-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/plymouth-kcm-5.10.3.tar.xz";
+      sha256 = "0ss5wkqa729f2bs8s9ss4bslpj0946kylbg2g2vmfzzr5a68ri6d";
+      name = "plymouth-kcm-5.10.3.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.10.2";
+    version = "1-5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/polkit-kde-agent-1-5.10.2.tar.xz";
-      sha256 = "04s9338c8y7krqsp5k812vrwphx0ibplh5gg0w6n38m8am78cxnz";
-      name = "polkit-kde-agent-1-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/polkit-kde-agent-1-5.10.3.tar.xz";
+      sha256 = "0csllzr47f173f8dymfhhplig7w55j3kfqr14i12lc3yhy5g5ns6";
+      name = "polkit-kde-agent-1-5.10.3.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/powerdevil-5.10.2.tar.xz";
-      sha256 = "1gw9swqi2wsdb8wbjf3ns7j4bj3a1mc06ynk7xklb7wan5psa9my";
-      name = "powerdevil-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/powerdevil-5.10.3.tar.xz";
+      sha256 = "0xjk8andskvygmb8ll0hxk8spc9ac0v3kyzyrd444va3q617zbi7";
+      name = "powerdevil-5.10.3.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/sddm-kcm-5.10.2.tar.xz";
-      sha256 = "10pg414ddx86nx46zkhl3fbvsijk4sifsh5cim17rp4b5wjay38y";
-      name = "sddm-kcm-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/sddm-kcm-5.10.3.tar.xz";
+      sha256 = "1gcla1lk8idxj4j4sr13wv3q2v6c4ylhgjqj1ik9qr9rk7r2ny8c";
+      name = "sddm-kcm-5.10.3.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/systemsettings-5.10.2.tar.xz";
-      sha256 = "1p6jg1vaa9svz4liqpb2435wbirdhjsqd6l1qd1lsp1r5szmwpz8";
-      name = "systemsettings-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/systemsettings-5.10.3.tar.xz";
+      sha256 = "0mfcyvzl5z3yqq0bbpwzhphir0vjjhvpifp17ra4w80j3f2c14jh";
+      name = "systemsettings-5.10.3.tar.xz";
     };
   };
   user-manager = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/user-manager-5.10.2.tar.xz";
-      sha256 = "1ac10z44y7d2n618j04r00cnklxglyk7xdh5vp0pl4zfcm4cx98w";
-      name = "user-manager-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/user-manager-5.10.3.tar.xz";
+      sha256 = "10iis34bpi0vic3x4r6gss8frfxg4zv9v8mg1rpbmrrs5q8799fn";
+      name = "user-manager-5.10.3.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.10.2";
+    version = "5.10.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.10.2/xdg-desktop-portal-kde-5.10.2.tar.xz";
-      sha256 = "16qdvds3k4cjv3dvvxr26r5rjnysqabv4zqf18g52z9lsbc46imv";
-      name = "xdg-desktop-portal-kde-5.10.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.3/xdg-desktop-portal-kde-5.10.3.tar.xz";
+      sha256 = "1hnbw211fn6aayx46h92nmjvdc0ar1bsy1dn1lg2a5575kq2lzgd";
+      name = "xdg-desktop-portal-kde-5.10.3.tar.xz";
     };
   };
 }
-- 
GitLab


From 9e6bfbb2f92d8e1995365775bee63809631b132c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= <michal.palka@chalmers.se>
Date: Thu, 11 May 2017 10:12:47 +0000
Subject: [PATCH 1279/1490] xen_4_8: init at 4.8.1

This commit adds the xen_4_8 package to be used instead of
xen (currently at 4.5.5):
 * Add packages xen_4_8, xen_4_8-slim and xen_4_8-light
 * Add packages qemu_xen_4_8 and qemu_xen_4_8-light to be used
   with xen_4_8-slim and xen_4_8-light respectively.
 * Add systemd to buildInputs of xen (it is required by oxenstored)
 * Adapt xen service to work with the new version of xen
 * Use xen-init-dom0 to initlilise dom0 in xen-store
 * Currently, the virtualisation.xen.stored option is ignored
   if xen 4.8 is used
---
 nixos/modules/virtualisation/xen-dom0.nix     |  57 +++---
 pkgs/applications/virtualization/xen/4.8.nix  | 165 ++++++++++++++++++
 .../virtualization/xen/generic.nix            |  23 ++-
 .../virtualization/xen/packages.nix           |  50 ++++++
 pkgs/top-level/all-packages.nix               |   5 +
 5 files changed, 271 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/applications/virtualization/xen/4.8.nix

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index f6f2d5dad01..5239652d407 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -267,26 +267,36 @@ in
         mkdir -p /var/lib/xen # so we create them here unconditionally.
         grep -q control_d /proc/xen/capabilities
         '';
-      serviceConfig.ExecStart = ''
-        ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork
-        '';
+      serviceConfig = if cfg.package.version < "4.8" then
+        { ExecStart = ''
+            ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork
+            '';
+        } else {
+          ExecStart = ''
+            ${cfg.package}/etc/xen/scripts/launch-xenstore
+            '';
+          Type            = "notify";
+          RemainAfterExit = true;
+          NotifyAccess    = "all";
+        };
       postStart = ''
-        time=0
-        timeout=30
-        # Wait for xenstored to actually come up, timing out after 30 seconds
-        while [ $time -lt $timeout ] && ! `${cfg.package}/bin/xenstore-read -s / >/dev/null 2>&1` ; do
-            time=$(($time+1))
-            sleep 1
-        done
-
-        # Exit if we timed out
-        if ! [ $time -lt $timeout ] ; then
-            echo "Could not start Xenstore Daemon"
-            exit 1
-        fi
-
-        ${cfg.package}/bin/xenstore-write "/local/domain/0/name" "Domain-0"
-        ${cfg.package}/bin/xenstore-write "/local/domain/0/domid" 0
+        ${optionalString (cfg.package.version < "4.8") ''
+          time=0
+          timeout=30
+          # Wait for xenstored to actually come up, timing out after 30 seconds
+          while [ $time -lt $timeout ] && ! `${cfg.package}/bin/xenstore-read -s / >/dev/null 2>&1` ; do
+              time=$(($time+1))
+              sleep 1
+          done
+
+          # Exit if we timed out
+          if ! [ $time -lt $timeout ] ; then
+              echo "Could not start Xenstore Daemon"
+              exit 1
+          fi
+        ''}
+        echo "executing xen-init-dom0"
+        ${cfg.package}/lib/xen/bin/xen-init-dom0
         '';
     };
 
@@ -306,6 +316,7 @@ in
       description = "Xen Console Daemon";
       wantedBy = [ "multi-user.target" ];
       after = [ "xen-store.service" ];
+      requires = [ "xen-store.service" ];
       preStart = ''
         mkdir -p /var/run/xen
         ${optionalString cfg.trace "mkdir -p /var/log/xen"}
@@ -313,7 +324,9 @@ in
         '';
       serviceConfig = {
         ExecStart = ''
-          ${cfg.package}/bin/xenconsoled${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"}
+          ${cfg.package}/bin/xenconsoled\
+            ${optionalString ((cfg.package.version >= "4.8")) " -i"}\
+            ${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"}
           '';
       };
     };
@@ -323,6 +336,7 @@ in
       description = "Xen Qemu Daemon";
       wantedBy = [ "multi-user.target" ];
       after = [ "xen-console.service" ];
+      requires = [ "xen-store.service" ];
       serviceConfig.ExecStart = ''
         ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \
            -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null
@@ -333,7 +347,7 @@ in
     systemd.services.xen-watchdog = {
       description = "Xen Watchdog Daemon";
       wantedBy = [ "multi-user.target" ];
-      after = [ "xen-qemu.service" ];
+      after = [ "xen-qemu.service" "xen-domains.service" ];
       serviceConfig.ExecStart = "${cfg.package}/bin/xenwatchdogd 30 15";
       serviceConfig.Type = "forking";
       serviceConfig.RestartSec = "1";
@@ -426,6 +440,7 @@ in
       description = "Xen domains - automatically starts, saves and restores Xen domains";
       wantedBy = [ "multi-user.target" ];
       after = [ "xen-bridge.service" "xen-qemu.service" ];
+      requires = [ "xen-bridge.service" "xen-qemu.service" ];
       ## To prevent a race between dhcpcd and xend's bridge setup script
       ## (which renames eth* to peth* and recreates eth* as a virtual
       ## device), start dhcpcd after xend.
diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
new file mode 100644
index 00000000000..487758719e7
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -0,0 +1,165 @@
+{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit
+, withInternalQemu ? true
+, withInternalTraditionalQemu ? true
+, withInternalSeabios ? true
+, withSeabios ? !withInternalSeabios, seabios ? null
+, withInternalOVMF ? false # FIXME: tricky to build
+, withOVMF ? false, OVMF
+, withLibHVM ? true
+
+# qemu
+, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir
+, alsaLib
+, ... } @ args:
+
+assert withInternalSeabios -> !withSeabios;
+assert withInternalOVMF -> !withOVMF;
+
+with stdenv.lib;
+
+# Patching XEN? Check the XSAs at
+# https://xenbits.xen.org/xsa/
+# and try applying all the ones we don't have yet.
+
+let
+  xsaPatch = { name , sha256 }: (fetchpatch {
+    url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
+    inherit sha256;
+  });
+
+  qemuDeps = [
+    udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
+    alsaLib
+  ];
+in
+
+callPackage (import ./generic.nix (rec {
+  version = "4.8.1";
+
+  src = fetchurl {
+    url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
+    sha256 = "158kb1w61jmwxi3fc560s4269hhpxrin9xhm60ljj52njhxias8x";
+  };
+
+  # Sources needed to build tools and firmwares.
+  xenfiles = optionalAttrs withInternalQemu {
+    "qemu-xen" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/qemu-xen.git;
+        rev = "refs/tags/qemu-xen-${version}";
+        sha256 = "1v19pp86kcgwvsbkrdrn4rlaj02i4054avw8k70w1m0rnwgcsdbs";
+      };
+      buildInputs = qemuDeps;
+      patches = [
+        #(xsaPatch {
+        #  name = "197-4.5-qemuu";
+        #  sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx";
+        #})
+      ];
+      meta.description = "Xen's fork of upstream Qemu";
+    };
+  } // optionalAttrs withInternalTraditionalQemu {
+    "qemu-xen-traditional" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
+        rev = "refs/tags/xen-${version}";
+        sha256 = "0mryap5y53r09m7qc0b821f717ghwm654r8c3ik1w7adzxr0l5qk";
+      };
+      buildInputs = qemuDeps;
+      patches = [
+      ];
+      postPatch = ''
+        substituteInPlace xen-hooks.mak \
+          --replace /usr/include/pci ${pciutils}/include/pci
+      '';
+      meta.description = "Xen's fork of upstream Qemu that uses old device model";
+    };
+  } // optionalAttrs withInternalSeabios {
+    "firmware/seabios-dir-remote" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/seabios.git;
+        rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df";
+        sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm";
+      };
+      patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
+      meta.description = "Xen's fork of Seabios";
+    };
+  } // optionalAttrs withInternalOVMF {
+    "firmware/ovmf-dir-remote" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/ovmf.git;
+        rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8";
+        sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr";
+      };
+      meta.description = "Xen's fork of OVMF";
+    };
+  } // {
+    # TODO: patch Xen to make this optional?
+    "firmware/etherboot/ipxe.git" = {
+      src = fetchgit {
+        url = https://git.ipxe.org/ipxe.git;
+        rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d";
+        sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09";
+      };
+      meta.description = "Xen's fork of iPXE";
+    };
+  } // optionalAttrs withLibHVM {
+    "xen-libhvm-dir-remote" = {
+      src = fetchgit {
+        name = "xen-libhvm";
+        url = https://github.com/michalpalka/xen-libhvm;
+        rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c";
+        sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd";
+      };
+      buildPhase = ''
+        make
+        cd biospt
+        cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm
+      '';
+      installPhase = ''
+        make install
+        cp biospt/biospt $out/bin/
+      '';
+      meta = {
+        description = ''
+          Helper library for reading ACPI and SMBIOS firmware values
+          from the host system for use with the HVM guest firmware
+          pass-through feature in Xen'';
+        license = licenses.bsd2;
+      };
+    };
+  };
+
+  configureFlags = []
+    ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH
+    ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional"
+    ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional"
+
+    ++ optional (withSeabios) "--with-system-seabios=${seabios}"
+    ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios"
+
+    ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd"
+    ++ optional (withInternalOVMF) "--enable-ovmf";
+
+  patches =
+    [ (xsaPatch {
+        name = "213-4.8";
+        sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2";
+      })
+      (xsaPatch {
+        name = "214";
+        sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
+      })
+    ];
+
+  # Fix build on Glibc 2.24.
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
+  postPatch = ''
+    # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
+    sed 1i'#include <sys/sysmacros.h>' \
+      -i tools/blktap2/control/tap-ctl-allocate.c \
+      -i tools/libxl/libxl_device.c
+  '';
+
+})) args
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index b0b353c5fa2..434853b7cc1 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -14,7 +14,7 @@ config:
 # Scripts
 , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools
 , iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd
-, lvm2, utillinux, procps
+, lvm2, utillinux, procps, systemd
 
 # Documentation
 # python2Packages.markdown
@@ -61,7 +61,7 @@ stdenv.mkDerivation (rec {
     libiconv libuuid ncurses openssl perl python2Packages.python xz yajl zlib
 
     # oxenstored
-    ocamlPackages.findlib ocamlPackages.ocaml
+    ocamlPackages.findlib ocamlPackages.ocaml systemd
 
     # Python fixes
     python2Packages.wrapPython
@@ -153,12 +153,19 @@ stdenv.mkDerivation (rec {
     substituteInPlace tools/xenstat/Makefile \
       --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h
 
-    # TODO: use this as a template and support our own if-up scripts instead?
-    substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \
-      --replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts
+    ${optionalString (config.version >= "4.8") ''
+      substituteInPlace tools/hotplug/Linux/launch-xenstore.in \
+        --replace /bin/mkdir mkdir
+    ''}
 
-    # blktap is not provided by xen, but by xapi
-    sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules.in
+    ${optionalString (config.version < "4.6") ''
+      # TODO: use this as a template and support our own if-up scripts instead?
+      substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \
+        --replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts
+
+      # blktap is not provided by xen, but by xapi
+      sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules.in
+    ''}
 
     ${withTools "patches" (name: x: ''
       ${concatMapStringsSep "\n" (p: ''
@@ -191,7 +198,7 @@ stdenv.mkDerivation (rec {
   '';
 
   installPhase = ''
-    mkdir -p $out $out/share
+    mkdir -p $out $out/share $out/share/man
     cp -prvd dist/install/nix/store/*/* $out/
     cp -prvd dist/install/boot $out/boot
     cp -prvd dist/install/etc $out
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index 633ec4f3d12..8f5262acb02 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -57,6 +57,56 @@ rec {
     };
   };
 
+  xen_4_8-vanilla = callPackage ./4.8.nix {
+    # At the very least included seabios and etherboot need gcc49,
+    # so we have to build all of it with gcc49.
+    stdenv = overrideCC stdenv gcc49;
+
+    meta = {
+      description = "vanilla";
+      longDescription = ''
+        Vanilla version of Xen. Uses forks of Qemu and Seabios bundled
+        with Xen. This gives vanilla experince, but wastes space and
+        build time: typical NixOS setup that runs lots of VMs will
+        build three different versions of Qemu when using this (two
+        forks and upstream).
+      '';
+    };
+  };
+
+  xen_4_8-slim = xen_4_8-vanilla.override {
+    withInternalQemu = false;
+    withInternalTraditionalQemu = true;
+    withInternalSeabios = false;
+    withSeabios = true;
+
+    meta = {
+      description = "slim";
+      longDescription = ''
+        Slimmed-down version of Xen that reuses nixpkgs packages as
+        much as possible. Different parts may get out of sync, but
+        this builds faster and uses less space than vanilla. Use with
+        `qemu_xen` from nixpkgs.
+      '';
+    };
+  };
+
+  xen_4_8-light = xen_4_8-vanilla.override {
+    withInternalQemu = false;
+    withInternalTraditionalQemu = false;
+    withInternalSeabios = false;
+    withSeabios = true;
+
+    meta = {
+      description = "light";
+      longDescription = ''
+        Slimmed-down version of Xen without `qemu-traditional` (you
+        don't need it if you don't know what it is). Use with
+        `qemu_xen-light` from nixpkgs.
+      '';
+    };
+  };
+
   xen-vanilla = xen_4_5-vanilla;
   xen-slim = xen_4_5-slim;
   xen-light = xen_4_5-light;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5bb3750340d..67bada8dce4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12352,6 +12352,8 @@ with pkgs;
   # Building with `xen` instead of `xen-slim` is possible, but makes no sense.
   qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-slim; });
   qemu_xen-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-light; });
+  qemu_xen_4_8 = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen_4_8-slim; });
+  qemu_xen_4_8-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen_4_8-light; });
 
   qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; });
 
@@ -16631,6 +16633,9 @@ with pkgs;
   xen = xenPackages.xen_4_5-vanilla;
   xen-slim = xenPackages.xen_4_5-slim;
   xen-light = xenPackages.xen_4_5-light;
+  xen_4_8 = xenPackages.xen_4_8-vanilla;
+  xen_4_8-slim = xenPackages.xen_4_8-slim;
+  xen_4_8-light = xenPackages.xen_4_8-light;
 
   xkbset = callPackage ../tools/X11/xkbset { };
 
-- 
GitLab


From 7b5d72ce048ffc48ba437560247bf069a87b1c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pa=C5=82ka?= <michal.palka@chalmers.se>
Date: Mon, 26 Jun 2017 12:12:33 +0000
Subject: [PATCH 1280/1490] xen: patch for XSAs: 216, 217, 218, 219, 220, 221,
 222, and 224 (xen 4.8)

This commit contains security patches for xen 4.8. The patches
for XSA-216 applied to the kernel are omitted, as they are part of
80e0cda7ff92233edc94161eae5838a1c423e5e4.

XSA-216 Issue Description:

> The block interface response structure has some discontiguous fields.
> Certain backends populate the structure fields of an otherwise
> uninitialized instance of this structure on their stacks, leaking
> data through the (internal or trailing) padding field.

More: https://xenbits.xen.org/xsa/advisory-216.html

XSA-217 Issue Description:

> Domains controlling other domains are permitted to map pages owned by
> the domain being controlled.  If the controlling domain unmaps such a
> page without flushing the TLB, and if soon after the domain being
> controlled transfers this page to another PV domain (via
> GNTTABOP_transfer or, indirectly, XENMEM_exchange), and that third
> domain uses the page as a page table, the controlling domain will have
> write access to a live page table until the applicable TLB entry is
> flushed or evicted.  Note that the domain being controlled is
> necessarily HVM, while the controlling domain is PV.

More: https://xenbits.xen.org/xsa/advisory-217.html

XSA-218 Issue Description:

> We have discovered two bugs in the code unmapping grant references.
>
> * When a grant had been mapped twice by a backend domain, and then
> unmapped by two concurrent unmap calls, the frontend may be informed
> that the page had no further mappings when the first call completed rather
> than when the second call completed.
>
> * A race triggerable by an unprivileged guest could cause a grant
> maptrack entry for grants to be "freed" twice.  The ultimate effect of
> this would be for maptrack entries for a single domain to be re-used.

More: https://xenbits.xen.org/xsa/advisory-218.html

XSA-219 Issue Description:

> When using shadow paging, writes to guest pagetables must be trapped and
> emulated, so the shadows can be suitably adjusted as well.
>
> When emulating the write, Xen maps the guests pagetable(s) to make the final
> adjustment and leave the guest's view of its state consistent.
>
> However, when mapping the frame, Xen drops the page reference before
> performing the write.  This is a race window where the underlying frame can
> change ownership.
>
> One possible attack scenario is for the frame to change ownership and to be
> inserted into a PV guest's pagetables.  At that point, the emulated write will
> be an unaudited modification to the PV pagetables whose value is under guest
> control.

More: https://xenbits.xen.org/xsa/advisory-219.html

XSA-220 Issue Description:

> Memory Protection Extensions (MPX) and Protection Key (PKU) are features in
> newer processors, whose state is intended to be per-thread and context
> switched along with all other XSAVE state.
>
> Xen's vCPU context switch code would save and restore the state only
> if the guest had set the relevant XSTATE enable bits.  However,
> surprisingly, the use of these features is not dependent (PKU) or may
> not be dependent (MPX) on having the relevant XSTATE bits enabled.
>
> VMs which use MPX or PKU, and context switch the state manually rather
> than via XSAVE, will have the state leak between vCPUs (possibly,
> between vCPUs in different guests).  This in turn corrupts state in
> the destination vCPU, and hence may lead to weakened protections
>
> Experimentally, MPX appears not to make any interaction with BND*
> state if BNDCFGS.EN is set but XCR0.BND{CSR,REGS} are clear.  However,
> the SDM is not clear in this case; therefore MPX is included in this
> advisory as a precaution.

More: https://xenbits.xen.org/xsa/advisory-220.html

XSA-221 Issue Description:

> When polling event channels, in general arbitrary port numbers can be
> specified.  Specifically, there is no requirement that a polled event
> channel ports has ever been created.  When the code was generalised
> from an earlier implementation, introducing some intermediate
> pointers, a check should have been made that these intermediate
> pointers are non-NULL.  However, that check was omitted.

More: https://xenbits.xen.org/xsa/advisory-221.html

XSA-222 Issue Description:

> Certain actions require removing pages from a guest's P2M
> (Physical-to-Machine) mapping.  When large pages are in use to map
> guest pages in the 2nd-stage page tables, such a removal operation may
> incur a memory allocation (to replace a large mapping with individual
> smaller ones).  If this allocation fails, these errors are ignored by
> the callers, which would then continue and (for example) free the
> referenced page for reuse.  This leaves the guest with a mapping to a
> page it shouldn't have access to.
>
> The allocation involved comes from a separate pool of memory created
> when the domain is created; under normal operating conditions it never
> fails, but a malicious guest may be able to engineer situations where
> this pool is exhausted.

More: https://xenbits.xen.org/xsa/advisory-222.html

XSA-224 Issue Description:

> We have discovered a number of bugs in the code mapping and unmapping
> grant references.
>
> * If a grant is mapped with both the GNTMAP_device_map and
> GNTMAP_host_map flags, but unmapped only with host_map, the device_map
> portion remains but the page reference counts are lowered as though it
> had been removed. This bug can be leveraged cause a page's reference
> counts and type counts to fall to zero while retaining writeable
> mappings to the page.
>
> * Under some specific conditions, if a grant is mapped with both the
> GNTMAP_device_map and GNTMAP_host_map flags, the operation may not
> grab sufficient type counts.  When the grant is then unmapped, the
> type count will be erroneously reduced.  This bug can be leveraged
> cause a page's reference counts and type counts to fall to zero while
> retaining writeable mappings to the page.
>
> * When a grant reference is given to an MMIO region (as opposed to a
> normal guest page), if the grant is mapped with only the
> GNTMAP_device_map flag set, a mapping is created at host_addr anyway.
> This does *not* cause reference counts to change, but there will be no
> record of this mapping, so it will not be considered when reporting
> whether the grant is still in use.

More: https://xenbits.xen.org/xsa/advisory-224.html
---
 pkgs/applications/virtualization/xen/4.8.nix | 60 ++++++++++++++++++--
 1 file changed, 56 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix
index 487758719e7..f6205f5c467 100644
--- a/pkgs/applications/virtualization/xen/4.8.nix
+++ b/pkgs/applications/virtualization/xen/4.8.nix
@@ -51,10 +51,10 @@ callPackage (import ./generic.nix (rec {
       };
       buildInputs = qemuDeps;
       patches = [
-        #(xsaPatch {
-        #  name = "197-4.5-qemuu";
-        #  sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx";
-        #})
+        (xsaPatch {
+          name = "216-qemuu";
+          sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5ma1";
+        })
       ];
       meta.description = "Xen's fork of upstream Qemu";
     };
@@ -150,6 +150,58 @@ callPackage (import ./generic.nix (rec {
         name = "214";
         sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk";
       })
+      (xsaPatch {
+        name = "217";
+        sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj";
+      })
+      (xsaPatch {
+        name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race";
+        sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd";
+      })
+      (xsaPatch {
+        name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry";
+        sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc";
+      })
+      (xsaPatch {
+        name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses";
+        sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9";
+      })
+      (xsaPatch {
+        name = "219-4.8";
+        sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq";
+      })
+      (xsaPatch {
+        name = "220-4.8";
+        sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5";
+      })
+      (xsaPatch {
+        name = "221";
+        sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26";
+      })
+      (xsaPatch {
+        name = "222-1";
+        sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2";
+      })
+      (xsaPatch {
+        name = "222-2-4.8";
+        sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin";
+      })
+      (xsaPatch {
+        name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap";
+        sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4";
+      })
+      (xsaPatch {
+        name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to";
+        sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck";
+      })
+      (xsaPatch {
+        name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m";
+        sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2";
+      })
+      (xsaPatch {
+        name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth";
+        sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f";
+      })
     ];
 
   # Fix build on Glibc 2.24.
-- 
GitLab


From d2e199ca3c5e58a2e19ab88b6e840c5e82259294 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 27 Jun 2017 08:14:39 -0400
Subject: [PATCH 1281/1490] linux: 4.4.73 -> 4.4.74

---
 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 5328bb9a043..92bdc54f7ee 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.73";
+  version = "4.4.74";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1dj4gpv01si4wiihm8wijkhx0l6ashvydniqrbpq78sby6sn5180";
+    sha256 = "13l0axybmr0lz1br9kxyc6s3mzgais32f54xii7vs4nia1hss6f3";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From 725d25dbb30e8021743ea654742ad5ff13e038bd Mon Sep 17 00:00:00 2001
From: Christian Zagrodnick <cz@flyingcircus.io>
Date: Tue, 27 Jun 2017 16:34:03 +0200
Subject: [PATCH 1282/1490] doc / go building: improve

Move the paragraph about go2nix to the other paragraphs about dependencies.
---
 doc/languages-frameworks/go.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index 026acb4e8fb..54ea60c9021 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -13,7 +13,7 @@ standard Go programs.
 deis = buildGoPackage rec {
   name = "deis-${version}";
   version = "1.13.0";
-  
+
   goPackagePath = "github.com/deis/deis"; <co xml:id='ex-buildGoPackage-1' />
   subPackages = [ "client" ]; <co xml:id='ex-buildGoPackage-2' />
 
@@ -130,6 +130,9 @@ the following arguments are of special significance to the function:
 
 </para>
 
+<para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.
+  It can produce complete derivation and <varname>goDeps</varname> file for Go programs.</para>
+
 <para>
   <varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" />
   where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows:
@@ -160,7 +163,4 @@ done
 </screen>
 </para>
 
-<para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.
-  It can produce complete derivation and <varname>goDeps</varname> file for Go programs.</para>
 </section>
-
-- 
GitLab


From 45f6bb6ba5aad658f6799a632950e1e26f0052d6 Mon Sep 17 00:00:00 2001
From: tkatchev <tkatchev@gmail.com>
Date: Tue, 27 Jun 2017 18:00:40 +0300
Subject: [PATCH 1283/1490] boost-build: update to version 2016.03

---
 .../development/tools/boost-build/default.nix | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 240d24961e0..39dd0069b4c 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "boost-build-2.0-m12";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/${name}.tar.bz2";
-    sha256 = "10sbbkx2752r4i1yshyp47nw29lyi1p34sy6hj7ivvnddiliayca";
+  name = "boost-build-2.0-${version}";
+  version = "2016.03";
+
+  src = fetchFromGitHub {
+    owner = "boostorg";
+    repo = "build";
+    rev = version;
+    sha256 = "1qw5marmp7z09nwcjlqrmqdg9b6myfqj3zvfz888x9mbidrmhn6p";
   };
 
   hardeningDisable = [ "format" ];
@@ -17,30 +20,17 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
-    cd jam_src
-    ./build.sh
+    ./bootstrap.sh
   '';
 
   installPhase = ''
-    # Install Bjam
-    mkdir -p $out/bin
-    cd "$(ls | grep bin)"
-    cp -a bjam $out/bin
-
-    # Bjam is B2
-    ln -s bjam $out/bin/b2
-
-    # Install the shared files (don't include jam_src)
-    cd ../..
-    rm -rf jam_src
-    mkdir -p $out/share
-    cp -a . $out/share/boost-build
+    ./b2 install --prefix=$out
   '';
 
   meta = with stdenv.lib; {
     homepage = http://www.boost.org/boost-build2/;
     license = stdenv.lib.licenses.boost;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ ivan-tkatchev ];
   };
 }
-- 
GitLab


From 4dadb12a63d96fe2345141e1d2c83bd44f084dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 27 Jun 2017 17:08:25 +0200
Subject: [PATCH 1284/1490] hydra: restart daemons on config change

https://github.com/NixOS/hydra/pull/491
---
 .../modules/services/continuous-integration/hydra/default.nix  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 6d39affee48..fcc0f58637c 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -308,6 +308,7 @@ in
         requires = [ "hydra-init.service" ];
         after = [ "hydra-init.service" ];
         environment = serverEnv;
+        restartTriggers = [ hydraConf ];
         serviceConfig =
           { ExecStart =
               "@${cfg.package}/bin/hydra-server hydra-server -f -h '${cfg.listenHost}' "
@@ -324,6 +325,7 @@ in
         requires = [ "hydra-init.service" ];
         after = [ "hydra-init.service" "network.target" ];
         path = [ cfg.package pkgs.nettools pkgs.openssh pkgs.bzip2 config.nix.package ];
+        restartTriggers = [ hydraConf ];
         environment = env // {
           PGPASSFILE = "${baseDir}/pgpass-queue-runner"; # grrr
           IN_SYSTEMD = "1"; # to get log severity levels
@@ -345,6 +347,7 @@ in
         requires = [ "hydra-init.service" ];
         after = [ "hydra-init.service" "network.target" ];
         path = with pkgs; [ cfg.package nettools jq ];
+        restartTriggers = [ hydraConf ];
         environment = env;
         serviceConfig =
           { ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator";
-- 
GitLab


From b13245c2a331bfd9381a600cea7d5fafc93648a3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Jun 2017 16:14:29 +0000
Subject: [PATCH 1285/1490] ocamlPackages.bos: 0.1.4 -> 0.1.6

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

diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix
index eb1e8d15fea..f8590de2b15 100644
--- a/pkgs/development/ocaml-modules/bos/default.nix
+++ b/pkgs/development/ocaml-modules/bos/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-bos-${version}";
-	version = "0.1.4";
+	version = "0.1.6";
 	src = fetchurl {
 		url = "http://erratique.ch/software/bos/releases/bos-${version}.tbz";
-		sha256 = "1ly66lysk4w6mdy4k1n3ynlpfpq7lw4wshcpzgx58v6x613w5s7q";
+		sha256 = "1z9sbziqddf770y94pd0bffsp1wdr1v3kp2p00pr27adv7h7dgls";
 	};
 
 	unpackCmd = "tar xjf $src";
-- 
GitLab


From 068341b1c779bb048172c96eedef5483377d2e57 Mon Sep 17 00:00:00 2001
From: Trevor Joynson <github@trevor.joynson.io>
Date: Tue, 27 Jun 2017 10:27:13 -0700
Subject: [PATCH 1286/1490] iptstate: init at 2.2.6 (#26878)

* Add iptstate package

* iptstate: nit pick
---
 lib/maintainers.nix                         |  1 +
 pkgs/os-specific/linux/iptstate/default.nix | 26 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/os-specific/linux/iptstate/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 328a5d772db..21a0a183939 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -550,6 +550,7 @@
   tokudan = "Daniel Frank <git@danielfrank.net>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
   travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
+  trevorj = "Trevor Joynson <nix@trevor.joynson.io>";
   trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
   tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>";
   ttuegel = "Thomas Tuegel <ttuegel@mailbox.org>";
diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix
new file mode 100644
index 00000000000..a9be26a2026
--- /dev/null
+++ b/pkgs/os-specific/linux/iptstate/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, libnetfilter_conntrack, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "iptstate-${version}";
+  version = "2.2.6";
+
+  src = fetchurl {
+    url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${name}.tar.bz2";
+    sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068";
+  };
+
+  buildInputs = [ libnetfilter_conntrack ncurses ];
+
+  meta = with stdenv.lib; {
+    description = "Conntrack top like tool";
+    homepage = https://github.com/jaymzh/iptstate;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ trevorj ];
+    downloadPage = "https://github.com/jaymzh/iptstate/releases";
+  };
+
+  installPhase = ''
+    install -m755 -D iptstate $out/bin/iptstate
+  '';
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0ed06ef8f4..da51d52969e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11772,6 +11772,8 @@ with pkgs;
     flex = flex_2_5_35;
   };
 
+  iptstate = callPackage ../os-specific/linux/iptstate { } ;
+
   ipset = callPackage ../os-specific/linux/ipset { };
 
   irqbalance = callPackage ../os-specific/linux/irqbalance { };
-- 
GitLab


From 9c68a8b2d23270cca2746706fbccb8815a962fb9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Jun 2017 17:28:25 +0000
Subject: [PATCH 1287/1490] ocamlPackages.angstrom: 0.4.0 -> 0.5.1

---
 .../ocaml-modules/angstrom/default.nix            | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index fadb55907bf..4f968ce6c09 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -1,14 +1,25 @@
 { stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }:
 
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.03"
+  then {
+    version = "0.5.1";
+    sha256 = "0rm79xyszy9aqvflcc13y9xiya82z31fzmr3b3hx91pmqviymhgc";
+  } else {
+    version = "0.4.0";
+    sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2";
+  };
+in
+
 stdenv.mkDerivation rec {
-  version = "0.4.0";
+  inherit (param) version;
   name = "ocaml-angstrom-${version}";
 
   src = fetchFromGitHub {
     owner  = "inhabitedtype";
     repo   = "angstrom";
     rev    = "${version}";
-    sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2";
+    inherit (param) sha256;
   };
 
   createFindlibDestdir = true;
-- 
GitLab


From 53de56c0cc2861ee3a0c0e8e3e9e61dab8e3ea0e Mon Sep 17 00:00:00 2001
From: Radek Benkel <radoslaw.benkel@gmail.com>
Date: Tue, 27 Jun 2017 20:18:35 +0200
Subject: [PATCH 1288/1490] sauce-connect: 4.4.2 -> 4.4.7 (#26893)

---
 pkgs/development/tools/sauce-connect/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index f8569249c06..d32ea74cf7b 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -4,18 +4,18 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "sauce-connect-${version}";
-  version = "4.4.2";
+  version = "4.4.7";
 
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
-      sha256 = "0n3c9ihrxqy4y4mzgchggqa2v7c0y9jw2yqnjdd7cf4nd24fixbq";
+      sha256 = "0n7x9mvv6sww0h77k3d8rms78vah0j48ndsv4vnxq9znwjiglmva";
     } else if stdenv.system == "i686-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
-      sha256 = "1pdvx4apd4x1bsyl8lhzlpv3jp3xzyv7yrsl3wjrql17p2asaba6";
+      sha256 = "1vwp8iqc5sk5kf7r86dld4767w4sm36hympnh1n2qza57ni7vy0g";
     } else {
       url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
-      sha256 = "03kn7i0a6mpxfc6mz9h560wadhmw5qxn15is7cl9kgkz5j874xlz";
+      sha256 = "1dwjysj3kjydz096bm5x0s1g3jm4a7y0qkgbsc6bwl44vxz81f66";
     }
   );
 
-- 
GitLab


From b475d5f04c5223b98ed0e731b815f1061728ddbf Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 27 Jun 2017 18:10:25 +0000
Subject: [PATCH 1289/1490] ocamlPackages.atd: 1.1.2 -> 1.12.0

---
 .../development/ocaml-modules/atd/default.nix | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix
index c7f8bc3d10f..af52bd9aaaf 100644
--- a/pkgs/development/ocaml-modules/atd/default.nix
+++ b/pkgs/development/ocaml-modules/atd/default.nix
@@ -1,21 +1,36 @@
-{stdenv, menhir, easy-format, buildOcaml, fetchurl, which}:
+{ stdenv, menhir, easy-format, ocaml, findlib, fetchurl, jbuilder, which }:
 
-buildOcaml rec {
-  name = "atd";
-  version = "1.1.2";
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.02"
+  then {
+    version = "1.12.0";
+    sha256 = "1pcd4fqbilv8zm2mc1nj2s26vc5y8vnisg1q1y6bjx23wxidb09y";
+    buildPhase = "jbuilder build -p atd";
+    inherit (jbuilder) installPhase;
+  } else {
+    version = "1.1.2";
+    sha256 = "0ef10c63192aed75e9a4274e89c5f9ca27efb1ef230d9949eda53ad4a9a37291";
+    buildPhase = "";
+    installPhase = ''
+      mkdir -p $out/bin
+      make PREFIX=$out install
+    '';
+  };
+in
+
+stdenv.mkDerivation rec {
+  inherit (param) version buildPhase installPhase;
+  name = "ocaml${ocaml.version}-atd-${version}";
 
   src = fetchurl {
     url = "https://github.com/mjambon/atd/archive/v${version}.tar.gz";
-    sha256 = "0ef10c63192aed75e9a4274e89c5f9ca27efb1ef230d9949eda53ad4a9a37291";
+    inherit (param) sha256;
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    make PREFIX=$out install
-  '';
+  createFindlibDestdir = true;
 
-  buildInputs = [ which ];
-  propagatedBuildInputs = [ menhir easy-format ];
+  buildInputs = [ which jbuilder ocaml findlib menhir ];
+  propagatedBuildInputs = [ easy-format ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/mjambon/atd;
-- 
GitLab


From 55fc963122e865e673581881bc15a79c4f930dc7 Mon Sep 17 00:00:00 2001
From: Stefan Lau <github@stefanlau.com>
Date: Tue, 27 Jun 2017 21:06:26 +0200
Subject: [PATCH 1290/1490] rustRegistry: 2017-06-25 -> 2017-06-27

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index aed51a44873..eb15da9dfdc 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,13 +7,13 @@
 { stdenv, fetchFromGitHub, git }:
 
 stdenv.mkDerivation {
-  name = "rustRegistry-2017-06-25";
+  name = "rustRegistry-2017-06-27";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "crates.io-index";
-    rev = "9714616bf3b7836cb827d8d1eabef017d730fb5e";
-    sha256 = "02lpmjsqwa16j14y3jzgw4dpzfy001nfyi78x9b8rgp1w3qdjbkr";
+    rev = "de7301b4aa5a933658ab14dba972cc2cab77da1c";
+    sha256 = "0dyx5n789pkmvk7x876v8rnagzp7xc8r2iysj2b70vcsqdvidnax";
   };
   phases = [ "unpackPhase" "installPhase" ];
   installPhase = ''
-- 
GitLab


From 67e40722824834b9557c6b8f390aa4a6ea98e805 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 25 Jun 2017 13:11:11 -0400
Subject: [PATCH 1291/1490] k3b : Fix build by adding missing dependencies.

---
 pkgs/applications/kde/k3b.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index e1f1132a08f..79806dc93fb 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,11 +1,11 @@
 { mkDerivation, lib
 , extra-cmake-modules, kdoctools, makeWrapper
 , qtwebkit
-, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
+, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg, libmusicbrainz2, normalize, sox, transcode
+, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info
 }:
 
 mkDerivation {
@@ -20,7 +20,7 @@ mkDerivation {
     # qt
     qtwebkit
     # kde
-    libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
+    libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
     # formats
     flac lame libmad libmpcdec libvorbis
     # sound utilities
@@ -28,7 +28,7 @@ mkDerivation {
     # cd/dvd
     cdparanoia libdvdcss libdvdread
     # others
-    ffmpeg libmusicbrainz2
+    ffmpeg libmusicbrainz2 shared_mime_info
   ];
   postFixup =
     let k3bPath = lib.makeBinPath [
-- 
GitLab


From 551dcb67831e480b15be2d54c96d84645a637820 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Jun 2017 15:22:31 -0400
Subject: [PATCH 1292/1490] Add ansible 2.3

---
 .../python-modules/ansible/2.3.nix            | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/ansible/2.3.nix

diff --git a/pkgs/development/python-modules/ansible/2.3.nix b/pkgs/development/python-modules/ansible/2.3.nix
new file mode 100644
index 00000000000..e5152029f8f
--- /dev/null
+++ b/pkgs/development/python-modules/ansible/2.3.nix
@@ -0,0 +1,50 @@
+{ lib
+, fetchurl
+, buildPythonPackage
+, pycrypto
+, paramiko
+, jinja2
+, pyyaml
+, httplib2
+, boto
+, six
+, netaddr
+, dns
+, windowsSupport ? false
+, pywinrm ? null
+}:
+
+buildPythonPackage rec {
+  pname = "ansible";
+  version = "2.3.1.0";
+  name = "${pname}-${version}";
+
+
+  src = fetchurl {
+    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
+    sha256 = "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd";
+  };
+
+  prePatch = ''
+    sed -i "s,/usr/,$out," lib/ansible/constants.py
+  '';
+
+  doCheck = false;
+  dontStrip = true;
+  dontPatchELF = true;
+  dontPatchShebangs = false;
+
+  propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2
+    boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
+
+  meta = {
+    homepage = "http://www.ansible.com";
+    description = "A simple automation tool";
+    license = with lib.licenses; [ gpl3] ;
+    maintainers = with lib.maintainers; [
+      jgeerds
+      joamaki
+    ];
+    platforms = with lib.platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6343a35791d..e9596dd464b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -986,10 +986,11 @@ in {
   };
 
   ansible  = self.ansible2;
-  ansible2 = self.ansible_2_2;
+  ansible2 = self.ansible_2_3;
 
   ansible_2_1 = callPackage ../development/python-modules/ansible/2.1.nix {};
   ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {};
+  ansible_2_3 = callPackage ../development/python-modules/ansible/2.3.nix {};
 
   apipkg = buildPythonPackage rec {
     name = "apipkg-1.4";
-- 
GitLab


From 10126e13efa4344d48156dec134f6c370606f210 Mon Sep 17 00:00:00 2001
From: leenaars <leenaars@users.noreply.github.com>
Date: Tue, 27 Jun 2017 21:52:23 +0200
Subject: [PATCH 1293/1490] openpa: init at 1.0.4 (#26033)

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

diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix
new file mode 100644
index 00000000000..fa147a9d9cc
--- /dev/null
+++ b/pkgs/development/libraries/openpa/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, file }:
+
+stdenv.mkDerivation rec {
+  pname = "openpa";
+  version = "1.0.4";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${name}.tar.gz";
+    sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy";
+  };
+
+  prePatch = ''substituteInPlace configure --replace /usr/bin/file ${file}/bin/file'';
+
+  doCheck = true;
+
+  meta = {
+    description = "Atomic primitives for high performance, concurrent software";
+    homepage = "https://trac.mpich.org/projects/openpa";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ leenaars ];
+    platforms = with stdenv.lib.platforms; linux;
+    longDescription = ''
+      OPA (or sometimes OpenPA or Open Portable Atomics) is an
+      open source library intended to provide a consistent C API for performing
+      atomic operations on a variety of platforms. The main goal of the project is to
+      enable the portable usage of atomic operations in concurrent software.
+      Developers of client software can worry about implementing and improving their
+      concurrent algorithms instead of fiddling with inline assembly syntax and
+      learning new assembly dialects in order improve or maintain application
+      portability.
+    '';
+   };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 986e953e19c..66c9cb98787 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9506,6 +9506,8 @@ with pkgs;
   openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
   openjpeg = openjpeg_2_1;
 
+  openpa = callPackage ../development/libraries/openpa { };
+
   opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { };
 
   openscenegraph = callPackage ../development/libraries/openscenegraph { };
-- 
GitLab


From c710ddf7cde471f16ea9af6ffc5e5cc6efb17fc6 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 25 Jun 2017 13:48:54 -0400
Subject: [PATCH 1294/1490] okteta : Fix build by adding missing dependencies.

---
 pkgs/applications/kde/okteta.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index deeffa3207b..1d44bb27fa3 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,8 +1,9 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kconfig, kinit,
-  kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
+  qtscript, kconfig, kinit, karchive,
+  kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
+  shared_mime_info
 }:
 
 mkDerivation {
@@ -11,8 +12,10 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ peterhoeg ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
+  buildInputs = [ shared_mime_info ];
   propagatedBuildInputs = [
     kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
+    karchive
   ];
 }
-- 
GitLab


From 704e04b108b2051583b2a9a8dcb728b6324170b7 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Tue, 27 Jun 2017 22:11:17 +0200
Subject: [PATCH 1295/1490] dockerTools.buildImage: configurable timestamp

This way not all images have to be from 47 years ago, making it much easier to find the one you're looking for.
---
 pkgs/build-support/docker/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 6bc9b7475e1..a3a4b605a6d 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -380,6 +380,8 @@ rec {
     runAsRoot ? null,
     # Size of the virtual machine disk to provision when building the image.
     diskSize ? 1024,
+    # Time of creation of the image.
+    created ? "1970-01-01T00:00:01Z",
   }:
 
     let
@@ -387,7 +389,7 @@ rec {
 
       # Create a JSON blob of the configuration. Set the date to unix zero.
       baseJson = writeText "${baseName}-config.json" (builtins.toJSON {
-        created = "1970-01-01T00:00:01Z";
+        created = created;
         architecture = "amd64";
         os = "linux";
         config = config;
-- 
GitLab


From 54419f301633f1622b966f75dd07dcce2076e569 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Tue, 27 Jun 2017 22:22:08 +0200
Subject: [PATCH 1296/1490] using inherited instead

---
 pkgs/build-support/docker/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index a3a4b605a6d..4ebe3c0615d 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -389,10 +389,9 @@ rec {
 
       # Create a JSON blob of the configuration. Set the date to unix zero.
       baseJson = writeText "${baseName}-config.json" (builtins.toJSON {
-        created = created;
+        inherit created config;
         architecture = "amd64";
         os = "linux";
-        config = config;
       });
 
       layer =
-- 
GitLab


From 4d2597981dc227dfa2f9ccb167f710bc0371a2b2 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 27 Jun 2017 16:26:07 -0400
Subject: [PATCH 1297/1490] Partially revert "terraform: 0.9.4 -> 0.9.6."

Terraform point releases are significant changes, we need to keep old ones around

This reverts commit 6a27b46deef753202bf11cdbd0e823733e2418d1.
---
 .../networking/cluster/terraform/default.nix           | 10 ++++++++++
 pkgs/top-level/all-packages.nix                        |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 0173a898575..fa308c83956 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -48,6 +48,16 @@ in {
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
+  terraform_0_9_4 = generic {
+    version   = "0.9.4";
+    sha256    = "07vcmjyl0y48hm5lqqzdd51hmrxapvywzbdkg5f3rcqd7dn9c2xs";
+    postPatch = ''
+      rm builtin/providers/dns/data_dns_cname_record_set_test.go
+      rm builtin/providers/vsphere/resource_vsphere_file_test.go
+    '';
+    doCheck   = true;
+  };
+
   terraform_0_9_6 = generic {
     version = "0.9.6";
     sha256 = "1f6z1zkklzpqgc7akgdz1g306ccmhni5lmg7i6g762n3qai60bnv";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbd14d86786..ff58787a286 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18643,6 +18643,7 @@ with pkgs;
   inherit (callPackage ../applications/networking/cluster/terraform {})
     terraform_0_8_5
     terraform_0_8_8
+    terraform_0_9_4
     terraform_0_9_6;
 
   terraform_0_8 = terraform_0_8_8;
-- 
GitLab


From f2b97e061a05eeae30a2f8b5585388f45a1c226e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 27 Jun 2017 22:26:50 +0200
Subject: [PATCH 1298/1490] python.pkgs.intelhex: fix patch

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

diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix
index 9d0a7d08c0c..d6ddadea9ca 100644
--- a/pkgs/development/python-modules/intelhex/default.nix
+++ b/pkgs/development/python-modules/intelhex/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
+, fetchurl
 }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   };
 
   patches = [
-    (fetchpatch {
+    (fetchurl {
       url = https://github.com/bialix/intelhex/commit/f251aef214daa2116e15ff7f7dcec1639eb12d5b.patch;
       sha256 = "02i15qjmcz7mwbwvyj3agl5y7098rag2iwypdilkaadhbslsl9b9";
     })
-- 
GitLab


From 6739a1773e68839dcc9f99331def17ce3931e410 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 27 Jun 2017 22:26:16 +0200
Subject: [PATCH 1299/1490] sbcl: 1.3.17 -> 1.3.18

The attached patch updates sbcl version.

From efdeb164ab3ca748a960791b093638c982465e97 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 27 Jun 2017 22:15:17 +0200
Subject: [PATCH] sbcl: 1.3.17 -> 1.3.18
---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index dcd110954c1..036a3b9f3d4 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.17";
+  version = "1.3.18";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1bqd39cqcv129zxvp3w3z1x46m9g9nmgslnlrvcsbqwd69vgbfcl";
+    sha256 = "13irc67v02xa861n9g4lq7q80pnd8drkrgmigqdl9b2mp8n64bgv";
   };
 
   patchPhase = ''
-- 
GitLab


From 07dc20e436227cc54939a2365e9b19beaf99b234 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 25 Jun 2017 14:32:03 -0400
Subject: [PATCH 1300/1490] kcachegrind : Fix build by adding missing
 dependencies.

---
 pkgs/applications/kde/kcachegrind.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index a8833cfbf59..19e01aeebe9 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kio, ki18n,
+  kio, ki18n, karchive, qttools,
   perl, python, php
 }:
 
@@ -13,5 +13,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kio ];
-  buildInputs = [ perl python php ki18n ];
+  buildInputs = [ perl python php ki18n karchive qttools ];
 }
-- 
GitLab


From 6fd4c3956e6b799e371e94eb73adb8f90dac1af2 Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Tue, 27 Jun 2017 21:12:29 +0000
Subject: [PATCH 1301/1490] django-polymorphic: init at 1.2

---
 .../django-polymorphic/default.nix            | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-polymorphic/default.nix

diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
new file mode 100644
index 00000000000..2d06b41d2db
--- /dev/null
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, django }:
+
+buildPythonPackage rec {
+  pname = "django-polymorphic";
+  version = "1.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bz86711sx2b66rl2xz141xppsfmlxilkgjgq0jsavpw37vg7r3r";
+  };
+
+  checkInputs = [ django ];
+  propagatedBuildInputs = [ django ];
+
+  meta = {
+    homepage = "https://github.com/django-polymorphic/django-polymorphic";
+    description = "Improved Django model inheritance with automatic downcasting";
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e9596dd464b..5b72a097431 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10005,6 +10005,8 @@ in {
 
   django_guardian = callPackage ../development/python-modules/django_guardian.nix { };
 
+  django_polymorphic = callPackage ../development/python-modules/django-polymorphic { };
+
   django_tagging = buildPythonPackage rec {
     name = "django-tagging-0.4.5";
 
-- 
GitLab


From 5b90fa01518fc3c3d6e1ed014fe002f8bea2f573 Mon Sep 17 00:00:00 2001
From: Diego Pontoriero <dpontor@gmail.com>
Date: Tue, 27 Jun 2017 15:04:11 -0700
Subject: [PATCH 1302/1490] terraform: 0.9.6 -> 0.9.9.

---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 ++++++
 pkgs/top-level/all-packages.nix                            | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index fa308c83956..d5f223afd5d 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -63,4 +63,10 @@ in {
     sha256 = "1f6z1zkklzpqgc7akgdz1g306ccmhni5lmg7i6g762n3qai60bnv";
     doCheck = true;
   };
+
+  terraform_0_9_9 = generic {
+    version = "0.9.9";
+    sha256 = "1pa9dd87dcjnn7fm1qn63da5qx87l7xjqlwiczrswcjfbismvl1p";
+    doCheck = true;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff58787a286..ca2f444c3e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18644,10 +18644,11 @@ with pkgs;
     terraform_0_8_5
     terraform_0_8_8
     terraform_0_9_4
-    terraform_0_9_6;
+    terraform_0_9_6
+    terraform_0_9_9;
 
   terraform_0_8 = terraform_0_8_8;
-  terraform_0_9 = terraform_0_9_6;
+  terraform_0_9 = terraform_0_9_9;
   terraform = terraform_0_9;
 
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
-- 
GitLab


From 8e73afb2e13c3717044aea3de2ad6e7085caf589 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Tue, 27 Jun 2017 18:20:37 -0400
Subject: [PATCH 1303/1490] zoom-us: don't add mesa to the LD_LIBRARY_PATH

zoom-us was failing to launch under the proprietary nvidia drivers,
as described in the comments of #26596.

Closes #26916
---
 .../networking/instant-messengers/zoom-us/default.nix            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 45fb10da391..d77cf347e5a 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -29,7 +29,6 @@ in stdenv.mkDerivation {
     libpulseaudio
     libxml2
     libxslt
-    mesa
     nspr
     nss
     sqlite
-- 
GitLab


From 3dfa1d228261ec2a00355fc4e0ebeeb5b6e14846 Mon Sep 17 00:00:00 2001
From: Diego Pontoriero <dpontor@gmail.com>
Date: Tue, 27 Jun 2017 17:15:31 -0700
Subject: [PATCH 1304/1490] google-cloud-sdk: 155.0.0 -> 159.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index b66c4c041f7..4a30b68ecaf 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden
 
 stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "155.0.0";
+  version = "159.0.0";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
-        sha256 = "1xh8xy9p3qqmirvhih7vf96i5xn0z0zr5mmbqr6vfzx16r47bi2z";
+        sha256 = "12mksd9fj1106zj6k2knlfc3knzm5kkf0s85l5l9zr6f7n0jabpd";
       }
     else if stdenv.system == "x86_64-darwin" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
-        sha256 = "19pr1pld6vdp5ig5i7zddfl1l5xjv9nx5sn00va4l1nnb410ac69";
+        sha256 = "160zdf7rr2f43qv12yr9c682kk0dh3rlcdqzb2ahpqpajqmcz4qw";
       }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
-        sha256 = "18hnabhdlrprhg8micy2z63jxyah3qr3pv9pgb64i7lbv6lznr2b";
+        sha256 = "0ai2rvk47gsb96k80w6wim04cjxyj5lhrg8kv6dgj53m81sqah2v";
       };
 
   buildInputs = [python27 makeWrapper];
-- 
GitLab


From aad03268cb2d6bd5f656b4210eb1929a375565fe Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 27 Jun 2017 22:52:00 -0300
Subject: [PATCH 1305/1490] moka-icon-theme: 2017-02-13 -> 5.3.6

---
 pkgs/data/icons/moka-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
index 57dfe0797fa..5ac2a13be4d 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
   package-name = "moka-icon-theme";
-  version = "2017-02-13";
+  version = "5.3.6";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = package-name;
-    rev = "5ac530d2394574bdbd5360de46391d0dfc7aa2ab";
-    sha256 = "1zw1jm03706086gnplkkrdlrcyhgwm9kp4qax57wwc1s27bhc90n";
+    rev = "v${version}";
+    sha256 = "17f8k8z8xvib4hkxq0cw9j7bhdpqpv5frrkyc4sbyildcbavzzbr";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-- 
GitLab


From 8ca8293dbc5982684d0ce87babf3daf7729e549a Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 10 Feb 2017 23:48:28 -0500
Subject: [PATCH 1306/1490] libxml2: Don't use stdenv.cross

---
 pkgs/development/libraries/libxml2/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index fb397ace794..10dd4ee5dbe 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,7 +1,9 @@
 { stdenv, lib, fetchurl, fetchpatch
 , zlib, xz, python2, findXMLCatalogs, libiconv
-, pythonSupport ? (! stdenv ? cross)
-, icuSupport ? false, icu ? null }:
+, buildPlatform, hostPlatform
+, pythonSupport ? buildPlatform == hostPlatform
+, icuSupport ? false, icu ? null
+}:
 
 let
   python = python2;
@@ -45,7 +47,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin;
 
-  crossAttrs = lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
+  crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
     # creating the DLL is broken ATM
     dontDisableStatic = true;
     configureFlags = configureFlags ++ [ "--disable-shared" ];
-- 
GitLab


From 099b83f90d8996fcae2a03e5c85f13a8a3341d72 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 11 Feb 2017 01:51:13 -0500
Subject: [PATCH 1307/1490] libxslt: Don't use stdenv.cross

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

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 4647eecf87d..a9e98d41e75 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2
+, buildPlatform, hostPlatform
 , cryptoSupport ? false
-, pythonSupport ? (! stdenv ? cross)
+, pythonSupport ? buildPlatform == hostPlatform
 }:
 
 assert pythonSupport -> python2 != null;
-- 
GitLab


From f849eb2018665751163e747ff8bee2afd4daf8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 28 Jun 2017 08:08:58 +0100
Subject: [PATCH 1308/1490] jetbrains.datagrip: 2017.1.4 -> 2017.1.5

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index d1807a684ee..982e40e602d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -226,12 +226,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2017.1.4"; /* updated by script */
+    version = "2017.1.5"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "c351e44a176add5b1fc7462e780b3fbe157691c3e23552d9d6b6531ee3830338"; /* updated by script */
+      sha256 = "8847c35761fcf6fc7a1d3f2bed0fa3971fbf28721c144f41d21feb473bb212dc"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "datagrip_2017_1";
-- 
GitLab


From ce8802729430c21dd4b437f8441f278a869e4a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 28 Jun 2017 08:09:41 +0100
Subject: [PATCH 1309/1490] jetbrains.gogland: 171.4694.35 -> 171.4694.61

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 982e40e602d..99a1837f9f2 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -239,12 +239,12 @@ in
 
   gogland = buildGogland rec {
     name = "gogland-${version}";
-    version = "171.4694.35";
+    version = "171.4694.61"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "0q2f8bi2i49j0xcpn824sihz2015jhn338cjaqy0jd988nxik6jk";
+      sha256 = "8e9462fc7c5cc7dc110ea2257b920a55d7d52ea874a53567e5d19381a1fcb269"; /* updated by script */
     };
     wmClass = "jetbrains-gogland";
     update-channel = "gogland_1.0_EAP";
-- 
GitLab


From 33adb080803dae5ab8f5cf62aa0e9dc25130fab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 28 Jun 2017 09:40:31 +0100
Subject: [PATCH 1310/1490] boost-build: drop spurious version infix

---
 pkgs/development/tools/boost-build/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 39dd0069b4c..89c1b560eac 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "boost-build-2.0-${version}";
+  name = "boost-build-${version}";
   version = "2016.03";
 
   src = fetchFromGitHub {
-- 
GitLab


From 1856119466211694ff15e20a8472ca68c4a3c4a6 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Wed, 28 Jun 2017 04:42:13 -0400
Subject: [PATCH 1311/1490] python-gflags: 2.0 -> 3.1.1 (#26858)

* python-gflags: 2.0 -> 3.1.1

* python-gflags: split out to new python-modules dir

* python-gflags: fix tests
---
 .../python-modules/gflags/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 14 +---------
 2 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/gflags/default.nix

diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix
new file mode 100644
index 00000000000..48fff723056
--- /dev/null
+++ b/pkgs/development/python-modules/gflags/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, six, pytest }:
+
+buildPythonPackage rec {
+  version = "3.1.1";
+  name = "gflags-${version}";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "python-gflags";
+    sha256 = "0qvcizlz6r4511kl4jlg6fr34y1ka956dr2jj1q0qcklr94n9zxa";
+  };
+
+  buildInputs = [ pytest ];
+
+  propagatedBuildInputs = [ six ];
+
+  checkPhase = ''
+    # clashes with our pythhon wrapper (which is in argv0)
+    # AssertionError: 'gflags._helpers_test' != 'nix_run_setup.py'
+    py.test -k 'not testGetCallingModule'
+  '';
+
+  meta = {
+    homepage = https://github.com/google/python-gflags;
+    description = "A module for command line handling, similar to Google's gflags for C++";
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5b72a097431..f69ea599c77 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11609,19 +11609,7 @@ in {
   };
 
 
-  gflags = buildPythonPackage rec {
-    name = "gflags-2.0";
-
-    src = pkgs.fetchurl {
-      url = "http://python-gflags.googlecode.com/files/python-${name}.tar.gz";
-      sha256 = "1mkc7315bpmh39vbn0jq237jpw34zsrjr1sck98xi36bg8hnc41i";
-    };
-
-    meta = {
-      homepage = http://code.google.com/p/python-gflags/;
-      description = "A module for command line handling, similar to Google's gflags for C++";
-    };
-  };
+  gflags = callPackage ../development/python-modules/gflags { };
 
   ghdiff = callPackage ../development/python-modules/ghdiff.nix { };
 
-- 
GitLab


From a6cf6367e2abd9610da804286cc6c439d79717db Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 28 Jun 2017 10:55:50 +0200
Subject: [PATCH 1312/1490] network-manager: hostname option is deprecated

From log:
<warn>  [1498639184.8965] keyfile: 'hostname' option is deprecated and has no effect
---
 nixos/modules/services/networking/networkmanager.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index f8b7f26f5f2..58c93d8e2ac 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -16,8 +16,6 @@ let
     dns=${if cfg.useDnsmasq then "dnsmasq" else "default"}
 
     [keyfile]
-    ${optionalString (config.networking.hostName != "")
-      ''hostname=${config.networking.hostName}''}
     ${optionalString (cfg.unmanaged != [])
       ''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''}
 
-- 
GitLab


From 1a7745d6ecda1e6ea58844c3ae03f59553b32f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 28 Jun 2017 11:42:50 +0200
Subject: [PATCH 1313/1490] dmensamenu: init at 1.0.0

---
 lib/maintainers.nix                           |  1 +
 pkgs/applications/misc/dmensamenu/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/dmensamenu/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 03785e791ba..5d3de35cfc7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -147,6 +147,7 @@
   dmjio = "David Johnson <djohnson.m@gmail.com>";
   dochang = "Desmond O. Chang <dochang@gmail.com>";
   domenkozar = "Domen Kozar <domen@dev.si>";
+  dotlambda = "Robert Schütz <rschuetz17@gmail.com>";
   doublec = "Chris Double <chris.double@double.co.nz>";
   dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>";
   drets = "Dmytro Rets <dmitryrets@gmail.com>";
diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix
new file mode 100644
index 00000000000..0c9fa5ea2d2
--- /dev/null
+++ b/pkgs/applications/misc/dmensamenu/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, requests, dmenu }:
+
+buildPythonApplication rec {
+  name = "dmensamenu-${version}";
+  version = "1.0.0";
+
+  propagatedBuildInputs = [
+    requests
+    dmenu
+  ];
+
+  src = fetchFromGitHub {
+    owner = "dotlambda";
+    repo = "dmensamenu";
+    rev = "v${version}";
+    sha256 = "05wbpmgjpm0ik9pcydj7r9w7i7bfpcij24bc4jljdwl9ilw62ixp";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/dotlambda/dmensamenu;
+    description = "Print German canteen menus using dmenu and OpenMensa";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff58787a286..a0eaf562494 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13562,6 +13562,10 @@ with pkgs;
 
   dmenu2 = callPackage ../applications/misc/dmenu2 { };
 
+  dmensamenu = callPackage ../applications/misc/dmensamenu {
+    inherit (python3Packages) buildPythonApplication requests;
+  };
+
   dmtx = dmtx-utils;
 
   dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
-- 
GitLab


From b90bab7d58e755de953e0355cadb3ab4cf5ad590 Mon Sep 17 00:00:00 2001
From: Martin Wohlert <martin@b-root-force.de>
Date: Wed, 28 Jun 2017 11:53:05 +0200
Subject: [PATCH 1314/1490] libopus: 1.2 -> 1.2.1

> http://opus-codec.org/release/stable/2017/06/26/libopus-1_2_1.html

This Opus 1.2.1 minor release fixes a relatively rare issue where the 1.2 encoder would wrongly assume a signal to be bandlimited to 12 kHz and not encode frequencies between 12 and 20 kHz.
This only happens on a few clips, but it is good to update to avoid a potential loss of quality.

There are no other changes compared to 1.2.
---
 pkgs/development/libraries/libopus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 756def8ad90..66c7e7e882e 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -2,14 +2,14 @@
 , fixedPoint ? false, withCustomModes ? true }:
 
 let
-  version = "1.2";
+  version = "1.2.1";
 in
 stdenv.mkDerivation rec {
   name = "libopus-${version}";
 
   src = fetchurl {
     url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
-    sha256 = "1ad9q2g9vivx409jdsslv1hrh5r616qz2pjm96y8ymsigfl4bnvp";
+    sha256 = "0ch7yzgg4bn1g36bpjsfrgs4n19c84d7wpdida6yzifrrhwx7byg";
   };
 
   outputs = [ "out" "dev" ];
-- 
GitLab


From 69aa5f5540d315b71e629ddb40ffb08cd9e39cf5 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 28 Jun 2017 14:13:20 +0300
Subject: [PATCH 1315/1490] nas: init at 1.9.4

---
 pkgs/servers/nas/default.nix    | 38 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/servers/nas/default.nix

diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix
new file mode 100644
index 00000000000..1dba428e0ae
--- /dev/null
+++ b/pkgs/servers/nas/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, imake, bison, flex_2_6_1, gccmakedep
+, xproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }:
+
+let
+  pname = "nas";
+  version = "1.9.4";
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz";
+    sha256 = "17dk0ckm6mp1ajc0cd6bwyi638ynw2f6bhbn7gynrs0wfmiyldng";
+  };
+
+  nativeBuildInputs = [ imake bison flex_2_6_1 gccmakedep ];
+
+  buildInputs = [ xproto libXau libXt libXext libXaw libXpm ];
+
+  buildPhase = ''
+    xmkmf
+    make WORLDOPTS="" World
+  '';
+
+  installFlags = "LDLIBS=-lfl DESTDIR=\${out}";
+
+  postInstall = ''
+    mv $out/${xorgcffiles}/* $out
+    rm -r $out/nix
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A network transparent, client/server audio transport system";
+    homepage = http://radscan.com/nas.html;
+    license = licenses.mit;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf94bb7045a..59aefb55e14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11025,6 +11025,8 @@ with pkgs;
 
   myserver = callPackage ../servers/http/myserver { };
 
+  nas = callPackage ../servers/nas { };
+
   neard = callPackage ../servers/neard { };
 
   nginx = nginxStable;
-- 
GitLab


From 32e492251b2e4358a459d20ac4e8fdbc5841f112 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 28 Jun 2017 14:08:05 +0200
Subject: [PATCH 1316/1490] systemd: Apply fix for CVE-2017-9445

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 3092aba506b..41f9c1e3e99 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "systemd";
-    rev = "a5af87e469ed3bd806d1ac34716d4f17ce9d3464";
-    sha256 = "14slhk9p1f4ngxhhsmk8i1irl6jiffs1ln84ddcqc8iy22cyqvs3";
+    rev = "72782e7ad96f9da9b0e5873f87a64007068cee06";
+    sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rjr1lbh4nkl5mcwpa";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];
-- 
GitLab


From b5729a2571f7a157dad34f70c925e7b343295df6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Jun 2017 20:17:56 +0200
Subject: [PATCH 1317/1490] LTS Haskell 8.20

---
 .../configuration-hackage2nix.yaml            | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c6db553f9cb..70b41ca1a43 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 8.19
+  # LTS Haskell 8.20
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -346,7 +346,7 @@ default-package-overrides:
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
   - check-email ==1.0.2
-  - checkers ==0.4.6
+  - checkers ==0.4.7
   - chell ==0.4.0.1
   - choice ==0.2.1
   - chunked-data ==0.3.0
@@ -356,7 +356,7 @@ default-package-overrides:
   - cipher-camellia ==0.0.2
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
-  - circle-packing ==0.1.0.5
+  - circle-packing ==0.1.0.6
   - clang-pure ==0.2.0.2
   - clash-ghc ==0.7.2
   - clash-lib ==0.7.1
@@ -434,7 +434,7 @@ default-package-overrides:
   - cookie ==0.4.2.1
   - countable ==1.0
   - courier ==0.1.1.5
-  - cpphs ==1.20.5
+  - cpphs ==1.20.8
   - cprng-aes ==0.6.1
   - cpu ==0.1.2
   - cpuinfo ==0.1.0.1
@@ -626,7 +626,7 @@ default-package-overrides:
   - erf ==2.0.0.0
   - errors ==2.1.3
   - ersatz ==0.3.1
-  - esqueleto ==2.5.2
+  - esqueleto ==2.5.3
   - etc ==0.0.0.2
   - etcd ==1.0.5
   - ether ==0.4.2.0
@@ -705,7 +705,7 @@ default-package-overrides:
   - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
-  - foundation ==0.0.11
+  - foundation ==0.0.12
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
@@ -937,7 +937,7 @@ default-package-overrides:
   - HaRe ==0.8.4.0
   - harp ==0.4.2
   - hasbolt ==0.1.1.3
-  - hashable ==1.2.6.0
+  - hashable ==1.2.6.1
   - hashable-time ==0.2.0.1
   - hashmap ==1.3.2
   - hashtables ==1.2.1.1
@@ -975,7 +975,7 @@ default-package-overrides:
   - hatex-guide ==1.3.1.6
   - haxl ==0.5.0.0
   - haxl-amazonka ==0.1.1
-  - HaXml ==1.25.3
+  - HaXml ==1.25.4
   - haxr ==3000.11.2
   - hbeanstalk ==0.2.4
   - Hclip ==3.0.0.4
@@ -994,7 +994,7 @@ default-package-overrides:
   - heterocephalus ==1.0.5.0
   - hex ==0.1.2
   - hexml ==0.3.2
-  - hexpat ==0.20.10
+  - hexpat ==0.20.13
   - hexstring ==0.11.1
   - hflags ==0.4.2
   - hformat ==0.1.0.1
@@ -1308,10 +1308,10 @@ default-package-overrides:
   - lmdb ==0.2.5
   - loch-th ==0.2.1
   - log ==0.7
-  - log-base ==0.7.1
+  - log-base ==0.7.1.1
   - log-domain ==0.11.1
   - log-elasticsearch ==0.7
-  - log-postgres ==0.7
+  - log-postgres ==0.7.0.1
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
   - logging-effect ==1.1.3
@@ -1345,7 +1345,7 @@ default-package-overrides:
   - matplotlib ==0.4.5
   - matrices ==0.4.4
   - matrix ==0.3.5.0
-  - matrix-market-attoparsec ==0.1.0.7
+  - matrix-market-attoparsec ==0.1.0.8
   - maximal-cliques ==0.1.1
   - mbox ==0.3.3
   - mbox-utility ==0.0.1
@@ -1514,7 +1514,7 @@ default-package-overrides:
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
   - once ==0.2
-  - one-liner ==0.9
+  - one-liner ==0.9.1
   - OneTuple ==0.2.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.5.3.0
@@ -1578,7 +1578,7 @@ default-package-overrides:
   - persistable-record ==0.4.1.1
   - persistable-types-HDBC-pg ==0.0.1.4
   - persistent ==2.6.1
-  - persistent-mysql ==2.6.0.2
+  - persistent-mysql ==2.6.1
   - persistent-postgresql ==2.6.1
   - persistent-redis ==2.5.2
   - persistent-refs ==0.4
@@ -1804,7 +1804,7 @@ default-package-overrides:
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
-  - safe ==0.3.14
+  - safe ==0.3.15
   - safe-exceptions ==0.1.5.0
   - safe-exceptions-checked ==0.1.0
   - safecopy ==0.9.3.2
@@ -1924,7 +1924,7 @@ default-package-overrides:
   - speculation ==1.5.0.3
   - speedy-slice ==0.3.0
   - sphinx ==0.6.0.2
-  - Spintax ==0.3.1
+  - Spintax ==0.3.2
   - splice ==0.6.1.1
   - split ==0.2.3.2
   - Spock ==0.12.0.0
@@ -1975,7 +1975,7 @@ default-package-overrides:
   - store ==0.4.3.1
   - store-core ==0.4.1
   - Strafunski-StrategyLib ==5.0.0.10
-  - stratosphere ==0.4.2
+  - stratosphere ==0.4.3
   - streaming ==0.1.4.5
   - streaming-bytestring ==0.1.4.6
   - streaming-commons ==0.1.17
@@ -2037,7 +2037,7 @@ default-package-overrides:
   - tasty-expected-failure ==0.11.0.4
   - tasty-fail-fast ==0.0.2
   - tasty-golden ==2.3.1.1
-  - tasty-hspec ==1.1.3.1
+  - tasty-hspec ==1.1.3.2
   - tasty-html ==0.4.1.1
   - tasty-hunit ==0.9.2
   - tasty-kat ==0.0.3
@@ -2181,7 +2181,7 @@ default-package-overrides:
   - unbounded-delays ==0.1.1.0
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
-  - unfoldable ==0.9.3
+  - unfoldable ==0.9.4
   - unfoldable-restricted ==0.0.3
   - unicode ==0.0
   - unicode-show ==0.1.0.2
@@ -2259,7 +2259,7 @@ default-package-overrides:
   - wai-conduit ==3.0.0.3
   - wai-cors ==0.2.5
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.19.1
+  - wai-extra ==3.0.20.0
   - wai-handler-launch ==3.0.2.2
   - wai-logger ==2.3.0
   - wai-middleware-auth ==0.1.2.0
@@ -2387,7 +2387,7 @@ default-package-overrides:
   - yesod-eventsource ==1.4.1
   - yesod-fay ==0.8.0
   - yesod-form ==1.4.12
-  - yesod-form-richtext ==0.1.0.0
+  - yesod-form-richtext ==0.1.0.1
   - yesod-gitrepo ==0.2.1.0
   - yesod-gitrev ==0.1.0.0
   - yesod-markdown ==0.11.4
@@ -2397,7 +2397,7 @@ default-package-overrides:
   - yesod-static ==1.5.3
   - yesod-static-angular ==0.1.8
   - yesod-table ==2.0.3
-  - yesod-test ==1.5.6
+  - yesod-test ==1.5.7
   - yesod-websockets ==0.2.6
   - yi-core ==0.13.7
   - yi-frontend-vty ==0.13.7
@@ -2416,9 +2416,9 @@ default-package-overrides:
   - yoga ==0.0.0.1
   - youtube ==0.2.1
   - zero ==0.1.4
-  - zeromq4-haskell ==0.6.6
+  - zeromq4-haskell ==0.6.7
   - zip ==0.1.11
-  - zip-archive ==0.3.1
+  - zip-archive ==0.3.1.1
   - zippers ==0.2.3
   - ziptastic-client ==0.3.0.3
   - ziptastic-core ==0.2.0.3
-- 
GitLab


From 668c2c348b19ac48c532c1e358bbceb2fea1419b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Jun 2017 12:25:34 +0200
Subject: [PATCH 1318/1490] hackage2nix: disable broken hydra builds

---
 .../configuration-hackage2nix.yaml            | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 70b41ca1a43..700d209285d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2690,6 +2690,7 @@ dont-distribute-packages:
   air-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlanDeniseEricLauren:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alerta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alex-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2792,6 +2793,7 @@ dont-distribute-packages:
   applicative-parsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-quoters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-splice:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apply-refact:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   approximate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2822,6 +2824,7 @@ dont-distribute-packages:
   arrowapply-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrow-improve:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arrowp-qq:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   artery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2946,6 +2949,7 @@ dont-distribute-packages:
   beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   beautifHOL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bed-and-breakfast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beeminder-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Befunge93:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bein:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bench:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3067,6 +3071,7 @@ dont-distribute-packages:
   blip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bliplib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blockchain:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   blockhash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blogdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3112,6 +3117,7 @@ dont-distribute-packages:
   bson-mapping:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  btree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   buchhaltung:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3122,6 +3128,7 @@ dont-distribute-packages:
   buildbox-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildwrapper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bullet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  burnt-explorer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   burst-detection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3387,6 +3394,7 @@ dont-distribute-packages:
   cmdtheline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cndict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3782,6 +3790,7 @@ dont-distribute-packages:
   dgim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dgs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-check:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dhcp-lease-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   dia-functions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-boolean:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-builder:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3835,6 +3844,7 @@ dont-distribute-packages:
   discogs-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   discordian-calendar:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  discord-rest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   discount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DiscussionSupportSystem:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dish:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4128,6 +4138,7 @@ dont-distribute-packages:
   fclabels-monadlib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   FComp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fdo-trash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feature-flipper-postgres:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fedora-packages:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4284,6 +4295,7 @@ dont-distribute-packages:
   fsh-csv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fswait:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftdi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   FTGL-bytestring:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4336,6 +4348,7 @@ dont-distribute-packages:
   gencheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gender:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   genders:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Gene-CluEDO:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   general-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeneralTicTacToe:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   generators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4410,6 +4423,7 @@ dont-distribute-packages:
   ghc-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-syb-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-usage:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4420,6 +4434,8 @@ dont-distribute-packages:
   gi-gstaudio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstbase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-gstpbutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-gsttag:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstvideo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtk-hs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4520,6 +4536,7 @@ dont-distribute-packages:
   goat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-containerbuilder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-dataflow:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-firebase-dynamiclinks:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-iam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4530,7 +4547,9 @@ dont-distribute-packages:
   gogol-servicecontrol:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicemanagement:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-sheets:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-shopping-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-slides:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-youtube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4566,6 +4585,7 @@ dont-distribute-packages:
   graceful:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammar-combinators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grammatical-parsers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   grapefruit-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   grapefruit-frp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   grapefruit-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5386,6 +5406,7 @@ dont-distribute-packages:
   hsns:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsnsq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsntp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HSoM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsOpenSSL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsOpenSSL-x509-system:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsoptions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5402,6 +5423,7 @@ dont-distribute-packages:
   hspec-hedgehog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-jenkins:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-monad-control:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec-pg-transact:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-shouldbe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-snap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-test-sandbox:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5420,6 +5442,8 @@ dont-distribute-packages:
   hsqml-demo-manic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-morris:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-notes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml-demo-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-morris:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsreadability:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-re:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5546,6 +5570,7 @@ dont-distribute-packages:
   hydrogen-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-data:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-multimap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-prelude:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6155,6 +6180,7 @@ dont-distribute-packages:
   loris:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   loshadka:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lostcities:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  loup:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lowgl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lp-diagrams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6905,6 +6931,7 @@ dont-distribute-packages:
   pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pg-store:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pg-transact:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-numbers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-push:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7016,11 +7043,13 @@ dont-distribute-packages:
   posix-waitpid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   postcodes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-named:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-orm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-schema:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-bind:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-opts:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-simple-queue:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-sop:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7054,6 +7083,7 @@ dont-distribute-packages:
   press:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-error:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prettyprinter-vty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   PrimitiveArray:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7102,6 +7132,7 @@ dont-distribute-packages:
   proto-lens-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-optparse:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-protoc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   protolude-lifted:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   proton-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7226,6 +7257,7 @@ dont-distribute-packages:
   Range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   range-space:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rank2classes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-example-config:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-bufs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7414,6 +7446,8 @@ dont-distribute-packages:
   rhythm-game-tutorial:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   riak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   RichConditional:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ridley-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ridley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   riff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   riot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ripple-federation:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7637,6 +7671,9 @@ dont-distribute-packages:
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-subscriber:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-zeppelin-client:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-zeppelin-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-zeppelin-swagger:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   server-generic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-persistent:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-redis:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7696,6 +7733,7 @@ dont-distribute-packages:
   shikensu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shoap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   shorten-strings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ShortestPathProblems:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   showdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8139,6 +8177,7 @@ dont-distribute-packages:
   telegram-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   teleport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  teleshell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tellbot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-default:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-haskell-util:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8203,6 +8242,7 @@ dont-distribute-packages:
   text-position:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-register-machine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-render:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-short:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-show:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-show-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   textual:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8287,6 +8327,7 @@ dont-distribute-packages:
   tld:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tldr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tls-extra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tmp-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tn:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   toboggan:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   todos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8298,6 +8339,7 @@ dont-distribute-packages:
   tokyocabinet-haskell:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   toml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   toolshed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  top:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Top:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   topkata:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   torch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8333,6 +8375,7 @@ dont-distribute-packages:
   transient-universe-tls:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   translatable-intset:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   translate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trasa-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   trasa-reflex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis-meta-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   trawl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8894,6 +8937,7 @@ dont-distribute-packages:
   yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-dynamic-configuration:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-keymap-cua:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-keymap-emacs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8925,6 +8969,7 @@ dont-distribute-packages:
   zeno:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zeromq4-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeroth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ZFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-- 
GitLab


From 298c3bdac0fcbbde0c43b8966f039cb915dd4deb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 25 Jun 2017 12:27:25 +0200
Subject: [PATCH 1319/1490] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/8860e9a3222d2a5f7b2b9e4950b4e6ff9652382c.
---
 .../haskell-modules/hackage-packages.nix      | 1192 +++++++++--------
 1 file changed, 604 insertions(+), 588 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5694fe5faf8..d5d196f4a3d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6198,6 +6198,7 @@ self: {
        homepage = "https://github.com/choener/Gene-CluEDO";
        description = "Hox gene clustering";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GeneralTicTacToe" = callPackage
@@ -8323,6 +8324,7 @@ self: {
        homepage = "http://www.euterpea.com";
        description = "Library for computer music education";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSoundFile" = callPackage
@@ -8809,25 +8811,6 @@ self: {
      }) {};
 
   "HaXml" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , polyparse, pretty, random
-     }:
-     mkDerivation {
-       pname = "HaXml";
-       version = "1.25.3";
-       sha256 = "1iq74dnxvannx9x1whqc3ixn93r4v5z7b4yv21n9q5963kpafj34";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers filepath polyparse pretty random
-       ];
-       executableHaskellDepends = [ base directory polyparse pretty ];
-       homepage = "http://projects.haskell.org/HaXml/";
-       description = "Utilities for manipulating XML documents";
-       license = "LGPL";
-     }) {};
-
-  "HaXml_1_25_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , polyparse, pretty, random
      }:
@@ -8844,7 +8827,6 @@ self: {
        homepage = "http://projects.haskell.org/HaXml/";
        description = "Utilities for manipulating XML documents";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hach" = callPackage
@@ -9991,6 +9973,7 @@ self: {
        homepage = "https://github.com/iqsf/Hydrogen.git";
        description = "The library for generating a WebGL scene for the web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IDynamic" = callPackage
@@ -16129,6 +16112,7 @@ self: {
        homepage = "https://github.com/choener/ShortestPathProblems";
        description = "grammars for TSP and SHP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ShowF" = callPackage
@@ -16253,8 +16237,8 @@ self: {
      }:
      mkDerivation {
        pname = "SimpleServer";
-       version = "0.1.1.1";
-       sha256 = "1d6ydca54cw0cppvzd6axl5yamafgvcn93vqhchl8v46mmbdbwz3";
+       version = "0.1.1.2";
+       sha256 = "0nb8j2sgbmf0nk4fbs2y4a4kdiv3vxc7qqaczl40b11l60qz4ab3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -16537,20 +16521,6 @@ self: {
      }) {};
 
   "Spintax" = callPackage
-    ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
-     mkDerivation {
-       pname = "Spintax";
-       version = "0.3.1";
-       sha256 = "08f51y9zgib3nfyk30bfllspq0730klqn9grnjbkr8d099ai6pik";
-       libraryHaskellDepends = [
-         attoparsec base extra mtl mwc-random text
-       ];
-       homepage = "https://github.com/MichelBoucey/spintax";
-       description = "Random text generation based on spintax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spintax_0_3_2" = callPackage
     ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
@@ -16562,7 +16532,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/spintax";
        description = "Random text generation based on spintax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock" = callPackage
@@ -22288,6 +22257,7 @@ self: {
        homepage = "https://github.com/mjhopkins/alerta-client";
        description = "Bindings to the alerta REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex" = callPackage
@@ -26192,6 +26162,7 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apportionment" = callPackage
@@ -26980,6 +26951,7 @@ self: {
        homepage = "http://www.haskell.org/arrows/";
        description = "quasiquoter translating arrow notation into Haskell 98";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrows" = callPackage
@@ -27328,6 +27300,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aspell-pipe" = callPackage
+    ({ mkDerivation, base, process, text }:
+     mkDerivation {
+       pname = "aspell-pipe";
+       version = "0.2";
+       sha256 = "11m2w8365amqy0r9ll2xyfrc07i4gcizyfvf0ayihvzaw1ciynkg";
+       libraryHaskellDepends = [ base process text ];
+       description = "Pipe-based interface to the Aspell program";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "assembler" = callPackage
     ({ mkDerivation, base, containers, ghc-binary, parsec }:
      mkDerivation {
@@ -27459,6 +27442,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "astro" = callPackage
+    ({ mkDerivation, base, HUnit, matrix, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, time
+     }:
+     mkDerivation {
+       pname = "astro";
+       version = "0.4.1.2";
+       sha256 = "0zbrfw24rxp2hi2prq109ms5ppfvbhwrnzb8hybfqbxzc4l6ihjq";
+       libraryHaskellDepends = [ base matrix time ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 time
+       ];
+       homepage = "https://github.com/alexander-ignatyev/astro";
+       description = "Amateur astronomical computations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "astview" = callPackage
     ({ mkDerivation, astview-utils, base, bytestring, containers
      , directory, filepath, glade, glib, Glob, gtk, gtksourceview2, hint
@@ -28920,6 +28921,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "avers-server_0_0_19_0" = callPackage
+    ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
+     , bytestring, bytestring-conversion, containers, cookie, cryptonite
+     , either, http-types, memory, mtl, resource-pool
+     , rethinkdb-client-driver, servant, servant-server, stm, text, time
+     , transformers, wai, wai-websockets, websockets
+     }:
+     mkDerivation {
+       pname = "avers-server";
+       version = "0.0.19.0";
+       sha256 = "0qvfswp9ph96iy809q2jqg45j9msanpcvmh04dc12h86mlcwldg7";
+       libraryHaskellDepends = [
+         aeson avers avers-api base base64-bytestring bytestring
+         bytestring-conversion containers cookie cryptonite either
+         http-types memory mtl resource-pool rethinkdb-client-driver servant
+         servant-server stm text time transformers wai wai-websockets
+         websockets
+       ];
+       homepage = "http://github.com/wereHamster/avers-server";
+       description = "Server implementation of the Avers API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aviation-cessna172-diagrams" = callPackage
     ({ mkDerivation, aviation-cessna172-weight-balance, aviation-units
      , aviation-weight-balance, base, colour, diagrams-cairo
@@ -31020,6 +31045,7 @@ self: {
        ];
        description = "Bindings to the beeminder.com JSON API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bein" = callPackage
@@ -31899,6 +31925,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-orphans_0_1_7_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, case-insensitive, hashable
+     , QuickCheck, quickcheck-instances, scientific, tagged, tasty
+     , tasty-quickcheck, text, text-binary, time, unordered-containers
+     , vector, vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "binary-orphans";
+       version = "0.1.7.0";
+       sha256 = "1pv10g4a9sxjrsp2fj0w4n1sklxk2nf5w9q6na308smngbx3k1f9";
+       revision = "1";
+       editedCabalFile = "0k0griirhzac9h5wcf1331dmpxn32qdzx8pablaf1ny9r6pbjigy";
+       libraryHaskellDepends = [
+         aeson base binary case-insensitive hashable scientific tagged text
+         text-binary time unordered-containers vector
+         vector-binary-instances
+       ];
+       testHaskellDepends = [
+         aeson base binary case-insensitive hashable QuickCheck
+         quickcheck-instances scientific tagged tasty tasty-quickcheck text
+         time unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/binary-orphans#readme";
+       description = "Orphan instances for binary";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary-parser" = callPackage
     ({ mkDerivation, base-prelude, bytestring, success, text
      , transformers
@@ -32104,8 +32158,8 @@ self: {
        pname = "binary-tagged";
        version = "0.1.4.2";
        sha256 = "1167rlb2lnib1vin9p75hp7fzcjqxljlw56bhmkwn05c5f6an7ri";
-       revision = "6";
-       editedCabalFile = "02fw1994ln0f63v77qfr9zwsfzhl3pmmsck9dzcv43895jkq55pi";
+       revision = "7";
+       editedCabalFile = "04l05gfbf3hf0pnkjpclyfqb9jaa665z4f89kf43lmd19qml6h04";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          generics-sop hashable nats scientific semigroups SHA tagged text
@@ -34577,6 +34631,7 @@ self: {
        homepage = "https://github.com/TGOlson/blockchain";
        description = "Generic blockchain implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blockhash" = callPackage
@@ -35777,15 +35832,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_18" = callPackage
+  "brick_0_19" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-clist
      , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm
      , template-haskell, text, text-zipper, transformers, vector, vty
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.18";
-       sha256 = "1qk3ds8h1krqhl8gk3c6akblybq2zvs9686ispj14im88mzjma8r";
+       version = "0.19";
+       sha256 = "17n8qcds1pv5vijpzw0w47qijcjxcydf3glwjxj645y0k8lpdcl1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35993,6 +36048,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "btree" = callPackage
+    ({ mkDerivation, base, clock, compact-mutable, containers, ghc-prim
+     , hashable, prim-array, primitive, smallcheck, tasty, tasty-hunit
+     , tasty-smallcheck, transformers
+     }:
+     mkDerivation {
+       pname = "btree";
+       version = "0.1.0.0";
+       sha256 = "1l5dgaf3jwaan9mjncjgffr0dhjd225lbnrmxhrz3iiamiz7xizz";
+       libraryHaskellDepends = [
+         base compact-mutable ghc-prim prim-array primitive
+       ];
+       testHaskellDepends = [
+         base compact-mutable containers hashable prim-array primitive
+         smallcheck tasty tasty-hunit tasty-smallcheck transformers
+       ];
+       benchmarkHaskellDepends = [
+         base clock compact-mutable ghc-prim hashable
+       ];
+       homepage = "https://github.com/andrewthad/b-plus-tree#readme";
+       description = "B-Tree on the compact heap";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "btree-concurrent" = callPackage
     ({ mkDerivation, array, base, base64-bytestring, bytestring, cereal
      , containers, directory, filepath, hashable, mtl, QuickCheck
@@ -36326,6 +36406,7 @@ self: {
        homepage = "https://gitlab.com/KrzysiekJ/burnt-explorer";
        description = "List OP_RETURN cryptocurrency transaction outputs";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "burst-detection" = callPackage
@@ -38020,8 +38101,8 @@ self: {
     ({ mkDerivation, base, Cabal, QuickCheck }:
      mkDerivation {
        pname = "cabal-test-quickcheck";
-       version = "0.1.7";
-       sha256 = "0886vbd0z6svydd1c5hjz9zlf1xfi6nmxlvsk0ksalgmb9h793m4";
+       version = "0.1.8";
+       sha256 = "11i7726z7ic7xb3ssx69938ipanqasrdl055ym2swm9s2jmc9k6x";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
@@ -41162,17 +41243,6 @@ self: {
      }) {};
 
   "checkers" = callPackage
-    ({ mkDerivation, array, base, QuickCheck, random }:
-     mkDerivation {
-       pname = "checkers";
-       version = "0.4.6";
-       sha256 = "03wpvxl03rj8v8f17jjmkfi94wvm8h1icyfgvgw7np6cpz99rp1a";
-       libraryHaskellDepends = [ array base QuickCheck random ];
-       description = "Check properties on standard classes and data structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "checkers_0_4_7" = callPackage
     ({ mkDerivation, array, base, QuickCheck, random }:
      mkDerivation {
        pname = "checkers";
@@ -41181,7 +41251,6 @@ self: {
        libraryHaskellDepends = [ array base QuickCheck random ];
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chell" = callPackage
@@ -41830,17 +41899,6 @@ self: {
      }) {};
 
   "circle-packing" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "circle-packing";
-       version = "0.1.0.5";
-       sha256 = "17sw5wy76hdk34nldcd44sqbf5fdhwii0racpd3zfrkad77d26h4";
-       libraryHaskellDepends = [ base ];
-       description = "Simple heuristic for packing discs of varying radii in a circle";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "circle-packing_0_1_0_6" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "circle-packing";
@@ -41849,7 +41907,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "circlehs" = callPackage
@@ -42271,8 +42328,8 @@ self: {
        pname = "clash-prelude";
        version = "0.11.2";
        sha256 = "1ccbcqkqcq5kyfjfvpkis2z40ishc4yqjjjswfsg92qrklk38wcl";
-       revision = "1";
-       editedCabalFile = "1ckr7vjww2qfbgvqyxdg5j2pzca0nridwh17ydvpsmzchf4xdrqp";
+       revision = "2";
+       editedCabalFile = "16ak462j0722lvy8ajn2yv400z9jgv8c3l151pmfwh893q6b0i3l";
        libraryHaskellDepends = [
          array base constraints data-binary-ieee754 data-default deepseq
          ghc-prim ghc-typelits-extra ghc-typelits-knownnat
@@ -43163,6 +43220,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cloud-seeder" = callPackage
+    ({ mkDerivation, amazonka, amazonka-cloudformation, amazonka-core
+     , base, bytestring, deepseq, exceptions, fast-logger, hspec, lens
+     , monad-control, monad-logger, monad-time, mtl
+     , optparse-applicative, text, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "cloud-seeder";
+       version = "0.0.0.0";
+       sha256 = "1nh0qmj1fdxkqa2db8xpv7anrlqyl7dcphjd25qgq86gjcdn27bb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         amazonka amazonka-cloudformation amazonka-core base deepseq
+         exceptions lens monad-control monad-logger monad-time mtl
+         optparse-applicative text transformers transformers-base
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         amazonka-cloudformation base bytestring deepseq fast-logger hspec
+         lens monad-logger mtl text transformers
+       ];
+       homepage = "https://github.com/cjdev/cloud-seeder#readme";
+       description = "A tool for interacting with AWS CloudFormation";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "cloudfront-signer" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring
      , bytestring, crypto-pubkey-types, old-locale, RSA, time
@@ -43732,6 +43816,7 @@ self: {
        ];
        description = "Detailed visualization of CMs, HMMs and their comparisions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cnc-spec-compiler" = callPackage
@@ -44823,6 +44908,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "compact-mutable" = callPackage
+    ({ mkDerivation, base, containers, ghc-compact, ghc-prim
+     , prim-array, primitive, transformers
+     }:
+     mkDerivation {
+       pname = "compact-mutable";
+       version = "0.1";
+       sha256 = "0xc28aflb8cs8cbvp2mimswh0nflwpvzwlrh2dvqsq3qx02cvh36";
+       libraryHaskellDepends = [
+         base ghc-compact ghc-prim prim-array primitive
+       ];
+       testHaskellDepends = [
+         base containers ghc-compact ghc-prim prim-array primitive
+         transformers
+       ];
+       homepage = "https://github.com/andrewthad/compact-mutable#readme";
+       description = "Mutable arrays living on the compact heap";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {ghc-compact = null;};
+
   "compact-socket" = callPackage
     ({ mkDerivation, base, binary, bytestring, compact, deepseq
      , directory, filepath, network, unix
@@ -44871,8 +44977,8 @@ self: {
     ({ mkDerivation, base, containers, transformers, vector }:
      mkDerivation {
        pname = "compactable";
-       version = "0.1.0.1";
-       sha256 = "1h09hqxifi5xx25l1d3wz53zd1l51k9bb4cxva9vlzxy6yi0dj37";
+       version = "0.1.0.2";
+       sha256 = "19ra58dz8wcwx3f5znfqqc0dvnfhldkbd8rg9psc7cynf9xcf93m";
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A generalization for containers that can be stripped of Nothings";
        license = stdenv.lib.licenses.bsd3;
@@ -48066,8 +48172,8 @@ self: {
      }:
      mkDerivation {
        pname = "country";
-       version = "0.1";
-       sha256 = "108j6wvismx69p9a13rskr4lsfiicjpfhk0397sgxn2jawaz5vim";
+       version = "0.1.1";
+       sha256 = "00fmbljb9s1nfhgcv52ka9mavfqp6ljx6nzw5jmy8f1j8rvx49l6";
        libraryHaskellDepends = [
          base bytestring ghc-prim hashable primitive text
          unordered-containers
@@ -48211,26 +48317,6 @@ self: {
      }) {};
 
   "cpphs" = callPackage
-    ({ mkDerivation, base, directory, old-locale, old-time, polyparse
-     }:
-     mkDerivation {
-       pname = "cpphs";
-       version = "1.20.5";
-       sha256 = "1cx565wv9r60xw8la5mjfpvsry5wxh9h6ai40jbwd727nwq0r8y5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base directory old-locale old-time polyparse
-       ];
-       executableHaskellDepends = [
-         base directory old-locale old-time polyparse
-       ];
-       homepage = "http://projects.haskell.org/cpphs/";
-       description = "A liberalised re-implementation of cpp, the C pre-processor";
-       license = "LGPL";
-     }) {};
-
-  "cpphs_1_20_8" = callPackage
     ({ mkDerivation, base, directory, old-locale, old-time, polyparse
      }:
      mkDerivation {
@@ -48248,7 +48334,6 @@ self: {
        homepage = "http://projects.haskell.org/cpphs/";
        description = "A liberalised re-implementation of cpp, the C pre-processor";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cprng-aes" = callPackage
@@ -51949,10 +52034,10 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, hspec, lens, tagged }:
      mkDerivation {
        pname = "data-diverse";
-       version = "0.2.0.0";
-       sha256 = "1lffgpy3pz0hyq6l4r7l4aqsldgis5wbd9jpllankhfxghxx9gvn";
+       version = "0.3.0.0";
+       sha256 = "1h6i10qixy0603xamal2v54knznjmza081hg410a2s97cigclay8";
        libraryHaskellDepends = [ base containers ghc-prim lens tagged ];
-       testHaskellDepends = [ base hspec lens ];
+       testHaskellDepends = [ base hspec lens tagged ];
        homepage = "https://github.com/louispan/data-diverse#readme";
        description = "Extensible records and polymorphic variants";
        license = stdenv.lib.licenses.bsd3;
@@ -55510,6 +55595,7 @@ self: {
        homepage = "https://github.com/andrewthad/dhcp-lease-parser#readme";
        description = "Parse a DHCP lease file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "di" = callPackage
@@ -57142,6 +57228,7 @@ self: {
        homepage = "https://github.com/jano017/Discord.hs";
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "discord-types" = callPackage
@@ -57288,6 +57375,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diskhash" = callPackage
+    ({ mkDerivation, base, bytestring, directory, HUnit, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th
+     }:
+     mkDerivation {
+       pname = "diskhash";
+       version = "0.0.1.2";
+       sha256 = "10fmh48xndy3bs1aphm9y9rh8lax4spyysr675d69gabhxm3qcvb";
+       revision = "1";
+       editedCabalFile = "10kck6rz2x0c0vnzr916qy9ss5aq6fr2jq7c8mpking3668j3ann";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base bytestring directory HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 test-framework-th
+       ];
+       description = "Disk-based hash table";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "display-haskell-do" = callPackage
     ({ mkDerivation, aeson, base, text }:
      mkDerivation {
@@ -62035,6 +62142,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "email-validate_2_3" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "email-validate";
+       version = "2.3";
+       sha256 = "1zm6sqvaa3r412cz5ga7hcjl3b26hi4l8fc8z5im476rsjib8jf1";
+       libraryHaskellDepends = [
+         attoparsec base bytestring template-haskell
+       ];
+       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
+       homepage = "https://github.com/Porges/email-validate-hs";
+       description = "Email address validation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "email-validate-json" = callPackage
     ({ mkDerivation, aeson, base, email-validate, text }:
      mkDerivation {
@@ -63377,31 +63502,6 @@ self: {
      }) {};
 
   "esqueleto" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
-     , hspec, HUnit, monad-control, monad-logger, persistent
-     , persistent-sqlite, persistent-template, QuickCheck, resourcet
-     , tagged, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "esqueleto";
-       version = "2.5.2";
-       sha256 = "1hbwb6vzd5ykqg6v6f1jmbpbdin1hpjgghgnz1c986d9n6skm6wf";
-       libraryHaskellDepends = [
-         base blaze-html bytestring conduit monad-logger persistent
-         resourcet tagged text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base conduit containers hspec HUnit monad-control monad-logger
-         persistent persistent-sqlite persistent-template QuickCheck
-         resourcet text transformers
-       ];
-       homepage = "https://github.com/bitemyapp/esqueleto";
-       description = "Type-safe EDSL for SQL queries on persistent backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "esqueleto_2_5_3" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -66328,6 +66428,7 @@ self: {
        homepage = "https://github.com/toddmohney/flipper-postgres#readme";
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fec" = callPackage
@@ -67349,29 +67450,27 @@ self: {
      }) {};
 
   "find-clumpiness" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, clumpiness, containers
-     , optparse-applicative, text, text-show, tree-fun
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness
+     , containers, listsafe, optparse-applicative, text, text-show
+     , tree-fun, unordered-containers, vector
      }:
      mkDerivation {
        pname = "find-clumpiness";
-       version = "0.2.0.1";
-       sha256 = "08nsfhhlr2f32wafbbl6jd8r4rpgjm7gc0xcb4glhqi6380jmnw7";
-       revision = "1";
-       editedCabalFile = "1vq5xvv01xr8p56pzkj6ksw1w6rf8iaxbd2zssf9sy31j5dyp1la";
+       version = "0.2.1.2";
+       sha256 = "06gzzbqkkn6xjc0x0vky082g9s3hgmx0ihkwpggna8svfs7dikz9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base clumpiness containers text text-show tree-fun
-         unordered-containers vector
+         aeson base BiobaseNewick bytestring clumpiness containers listsafe
+         text text-show tree-fun unordered-containers vector
        ];
        executableHaskellDepends = [
-         aeson base bytestring clumpiness containers optparse-applicative
-         text tree-fun unordered-containers
+         aeson base BiobaseNewick bytestring clumpiness containers
+         optparse-applicative text tree-fun unordered-containers
        ];
        homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme";
        description = "Find the clumpiness of labels in a tree";
-       license = stdenv.lib.licenses.gpl2;
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -68596,8 +68695,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.2.9";
-       sha256 = "1pkmfya8vr9rrms0p2wyj4qwmi9ahp4hd1vaapdag686c4084dsg";
+       version = "0.5.3.0";
+       sha256 = "0g58anj96b482xm0vgxxf9v8m4m9x2lq4g1r0ynfc5zr9c64wb1n";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -69668,25 +69767,6 @@ self: {
      }) {};
 
   "foundation" = callPackage
-    ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
-     , tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "foundation";
-       version = "0.0.11";
-       sha256 = "0jgxcr532vb7376h43l88g0rjgbil2caqnknmznfsprawy6a9s1v";
-       libraryHaskellDepends = [ base ghc-prim ];
-       testHaskellDepends = [
-         base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/haskell-foundation/foundation";
-       description = "Alternative prelude with batteries and no dependencies";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "foundation_0_0_12" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -70823,6 +70903,7 @@ self: {
        homepage = "https://github.com/ixmatus/fswait";
        description = "Wait and observe events on the filesystem for a path, with a timeout";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fswatcher" = callPackage
@@ -72525,8 +72606,8 @@ self: {
        pname = "generics-sop-lens";
        version = "0.1.2.1";
        sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf";
-       revision = "1";
-       editedCabalFile = "0rsdfd4nxmy2casi4v8z4i93vfy3vba5kpb98v9ksgw16q286a7f";
+       revision = "2";
+       editedCabalFile = "1zavix9vzj6qnr6izfmq1ggsdzsqzz41dlmh228lpvfm2mddx6w2";
        libraryHaskellDepends = [ base generics-sop lens ];
        homepage = "https://github.com/phadej/generics-sop-lens#readme";
        description = "Lenses for types in generics-sop";
@@ -74053,6 +74134,7 @@ self: {
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
@@ -74911,6 +74993,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamer Plugins Base Utils bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gstreamer-pbutils = null;};
 
   "gi-gsttag" = callPackage
@@ -74932,6 +75015,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamer Tag bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gstreamer-tag = null;};
 
   "gi-gstvideo" = callPackage
@@ -75403,7 +75487,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ginger_0_5_1_3" = callPackage
+  "ginger_0_5_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
      , tasty-quickcheck, text, time, transformers, unordered-containers
@@ -75411,8 +75495,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.5.1.3";
-       sha256 = "06dywl7wi2qy2apc9gwcf5j9mxckyjbjpqddqdqgnj47wbssrmiz";
+       version = "0.5.2.1";
+       sha256 = "1axazqa84hbgrrswdmxkl5wc8kdfana9f6wzj5m83zn8pmjsixvk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -75867,25 +75951,25 @@ self: {
   "git-repair" = callPackage
     ({ mkDerivation, async, base, bytestring, Cabal, containers
      , data-default, directory, exceptions, filepath, hslogger, IfElse
-     , MissingH, mtl, network, network-uri, optparse-applicative
-     , process, QuickCheck, text, time, transformers, unix, unix-compat
+     , mtl, network, network-uri, optparse-applicative, process
+     , QuickCheck, split, text, time, transformers, unix, unix-compat
      , utf8-string
      }:
      mkDerivation {
        pname = "git-repair";
-       version = "1.20161118";
-       sha256 = "0vjssbmkd8bld7c3c4md9f2cj05s0gia0xks3wfhagq399n5fk6j";
+       version = "1.20170626";
+       sha256 = "0np6jd1d8qwr0ay6hx50fb35149ji67576nk7ds906hna8fjnkcb";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
          base bytestring Cabal data-default directory exceptions filepath
-         hslogger IfElse MissingH mtl process unix unix-compat
+         hslogger IfElse mtl process split unix unix-compat
        ];
        executableHaskellDepends = [
-         async base bytestring containers directory exceptions filepath
-         hslogger IfElse MissingH mtl network network-uri
-         optparse-applicative process QuickCheck text time transformers unix
-         unix-compat utf8-string
+         async base bytestring containers data-default directory exceptions
+         filepath hslogger IfElse mtl network network-uri
+         optparse-applicative process QuickCheck split text time
+         transformers unix unix-compat utf8-string
        ];
        homepage = "http://git-repair.branchable.com/";
        description = "repairs a damanged git repisitory";
@@ -78701,6 +78785,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Dataflow SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dataflow_0_2_0" = callPackage
@@ -80019,6 +80104,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Content API for Shopping SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-shopping-content_0_2_0" = callPackage
@@ -80357,6 +80443,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Data SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube_0_2_0" = callPackage
@@ -81174,6 +81261,7 @@ self: {
        homepage = "https://github.com/blamario/grampa/tree/master/grammatical-parsers";
        description = "parsers that can combine into grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-examples" = callPackage
@@ -85022,6 +85110,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, email-validate
+     , exceptions, filepath, http-client, http-client-tls, http-types
+     , tagsoup, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hailgun";
+       version = "0.4.1.4";
+       sha256 = "0qcfhprg5x0wb28zgn80x808a1w6il2hc6mykq8wv0ranmwj1lrx";
+       libraryHaskellDepends = [
+         aeson base bytestring email-validate exceptions filepath
+         http-client http-client-tls http-types tagsoup text time
+         transformers
+       ];
+       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
+       description = "Mailgun REST api interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -87432,34 +87540,6 @@ self: {
      }) {};
 
   "hashable" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
-     , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, unix
-     }:
-     mkDerivation {
-       pname = "hashable";
-       version = "1.2.6.0";
-       sha256 = "0lhadvg4l18iff2hg4d5akn5f3lrg9pfwxpkn1j2zxbsh8y6d6s2";
-       revision = "1";
-       editedCabalFile = "1psifhc6rx94vh4bikb6zrn4l2ndr7hwfd36cc2fmccgg1xlz2lg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring deepseq ghc-prim integer-gmp text
-       ];
-       testHaskellDepends = [
-         base bytestring ghc-prim HUnit QuickCheck random test-framework
-         test-framework-hunit test-framework-quickcheck2 text unix
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion ghc-prim integer-gmp siphash text
-       ];
-       homepage = "http://github.com/tibbe/hashable";
-       description = "A class for types that can be converted to a hash value";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hashable_1_2_6_1" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
      , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, unix
@@ -87485,7 +87565,6 @@ self: {
        homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-extras" = callPackage
@@ -92678,8 +92757,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedgehog";
-       version = "0.3";
-       sha256 = "0navcrq51wy7040a8vh9izzln61qpk06z4r4g33j7v6qk2hflwb7";
+       version = "0.4.1";
+       sha256 = "1zsfxls65pvfh57ig5lka3glw52f5h2pvnf7kk6aarasspyagx60";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring concurrent-output containers
          directory exceptions mmorph mtl pretty-show primitive random
@@ -93797,24 +93876,6 @@ self: {
      }) {};
 
   "hexpat" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, List, text
-     , transformers, utf8-string
-     }:
-     mkDerivation {
-       pname = "hexpat";
-       version = "0.20.10";
-       sha256 = "0bhfbsqw2q53v9qx5pqxxqfhnp1jvs25nyi8qdjk31w01sis3rir";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq List text transformers
-         utf8-string
-       ];
-       homepage = "http://haskell.org/haskellwiki/Hexpat/";
-       description = "XML parser/formatter based on expat";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hexpat_0_20_13" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, expat, List
      , text, transformers, utf8-string
      }:
@@ -94805,8 +94866,8 @@ self: {
      }:
      mkDerivation {
        pname = "hifi";
-       version = "0.1.0.0";
-       sha256 = "1pi0zrj43g3zxjmxjhyrfi553fcg1n1r659a8mb8m23fr2263zka";
+       version = "0.1.2.0";
+       sha256 = "0zhraby44j5zjrvjmqj22sa15qsl5jxhfs07gkggc8zfahvg822d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94815,7 +94876,7 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://gitlab.com/gonz/hifi";
-       description = "Initial project template from stack";
+       description = "WiFi connection script generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -95880,6 +95941,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hjsonpointer_1_2_0" = callPackage
+    ({ mkDerivation, aeson, base, hashable, hspec, http-types
+     , QuickCheck, semigroups, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hjsonpointer";
+       version = "1.2.0";
+       sha256 = "06rppqd9nnch3hmjv1izh7lkdrm54nywjg7p27wfar3ak1saw71g";
+       revision = "2";
+       editedCabalFile = "0clin0rbsjhj1dasha3di8as3chi4i7xvp2d54b4qk2bxs4bzcm2";
+       libraryHaskellDepends = [
+         aeson base hashable QuickCheck semigroups text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-types QuickCheck text unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/seagreen/hjsonpointer";
+       description = "JSON Pointer library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hjsonschema" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
@@ -95907,7 +95992,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hjsonschema_1_6_2" = callPackage
+  "hjsonschema_1_6_3" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-types, pcre-heavy, profunctors, protolude
@@ -95916,8 +96001,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.6.2";
-       sha256 = "1kwhfnl7f8jlf3g24yy3kh1cnlrx18klqasqzsdzbynvs0vzccdk";
+       version = "1.6.3";
+       sha256 = "1phvxkwqxzsi7jzxs4z2zsak7hsgfqvld7m95jk1a0qysxf9gzx3";
        libraryHaskellDepends = [
          aeson base bytestring containers file-embed filepath hashable
          hjsonpointer http-client http-types pcre-heavy profunctors
@@ -96149,10 +96234,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.2.1";
-       sha256 = "07jrd8cfy9srazad440b1c24m6s6fvla9jzrksr64gz6vkxkc9mw";
-       revision = "2";
-       editedCabalFile = "08a8r9cbljpjykqwgij7ilcd9rprq0jxx09gc7vvq8ml7rhg5yv8";
+       version = "1.2.2";
+       sha256 = "1d12fjqyrj0wy8iq096h8mq2v76j8ihc2d8j1xc5qckw2g29539a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98669,14 +98752,14 @@ self: {
      }:
      mkDerivation {
        pname = "hp2pretty";
-       version = "0.6";
-       sha256 = "1bma881ljhwhzirj2q9rqf0bxx9xfy0ng2z9mrhdnaywnw4d8v4c";
+       version = "0.7";
+       sha256 = "0b706fdq91n1pfsa8c9gqwpw6r14lgfc9p7c7iq6zm78kj3n8fgp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          array attoparsec base containers filepath floatshow mtl text
        ];
-       homepage = "http://code.mathr.co.uk/hp2pretty";
+       homepage = "https://code.mathr.co.uk/hp2pretty";
        description = "generate pretty graphs from heap profiles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102306,6 +102389,7 @@ self: {
        homepage = "https://github.com/jfischoff/pg-transact-hspec#readme";
        description = "Helpers for creating database tests with hspec and pg-transact";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-server" = callPackage
@@ -102751,6 +102835,7 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -102851,6 +102936,7 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -104417,6 +104503,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-media_0_7_0" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "http-media";
+       version = "0.7.0";
+       sha256 = "11d5dcax7i58zhmaz1x35g0mbqm9h9ayzz058cm4p1p2dm7rsag5";
+       revision = "1";
+       editedCabalFile = "1z8pq2xfqjb8z8xar3inc51wsid9b66lfxrzq2sdb45953rcrbpd";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers utf8-string
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive containers QuickCheck
+         test-framework test-framework-quickcheck2 utf8-string
+       ];
+       homepage = "https://github.com/zmthy/http-media";
+       description = "Processing HTTP Content-Type and Accept headers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-monad" = callPackage
     ({ mkDerivation, base, bytestring, containers, explicit-exception
      , HTTP, lazyio, network, network-uri, parsec, transformers
@@ -109219,8 +109329,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.2.1";
-       sha256 = "0sgc29kiflgq0b3h1irnnim1ih6sk8h309yk1xd3z9hwyd9c121w";
+       version = "1.2.2";
+       sha256 = "09fabf4yx0k1rb6i2msmlszvx1v318n35gmc9aakvicnzkvxarrm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109537,8 +109647,8 @@ self: {
        pname = "insert-ordered-containers";
        version = "0.2.1.0";
        sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp";
-       revision = "2";
-       editedCabalFile = "1sy3rz21sbpigqsn5dc58q4khm2mq8k2pssln21qawlnrz018bwp";
+       revision = "3";
+       editedCabalFile = "0ik4n32rvamxvlp80ixjrbhskivynli7b89s4hk6401bcy3ykp3g";
        libraryHaskellDepends = [
          aeson base base-compat hashable lens semigroupoids semigroups text
          transformers unordered-containers
@@ -114753,7 +114863,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "katip_0_4_0_0" = callPackage
+  "katip_0_4_1_0" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , bytestring, containers, criterion, deepseq, directory, either
      , exceptions, hostname, microlens, microlens-th, monad-control, mtl
@@ -114765,8 +114875,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.4.0.0";
-       sha256 = "1l9zpq7gr5madmqmm4cp3p6lid0krxaf6gki2qcxlkvsm39cr9vz";
+       version = "0.4.1.0";
+       sha256 = "0rhnp6qg19v180nazwghn2f4chc79fwn1g74wr3zdsqg0j211bnp";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either
          exceptions hostname microlens microlens-th monad-control mtl
@@ -114820,6 +114930,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "katip-elasticsearch_0_3_1_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bloodhound, containers
+     , criterion, deepseq, enclosed-exceptions, exceptions, http-client
+     , http-types, katip, lens, lens-aeson, quickcheck-instances, retry
+     , rng-utils, scientific, stm, stm-chans, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "katip-elasticsearch";
+       version = "0.3.1.0";
+       sha256 = "162ikrqpk0i8zh5gw3isc1lflg4a4bsqk3ci2rpirll0wf1dqgz9";
+       libraryHaskellDepends = [
+         aeson async base bloodhound enclosed-exceptions exceptions
+         http-client http-types katip retry scientific stm stm-chans text
+         time transformers unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson base bloodhound containers http-client http-types katip lens
+         lens-aeson quickcheck-instances scientific stm tasty tasty-hunit
+         tasty-quickcheck text time transformers unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bloodhound criterion deepseq rng-utils text
+         unordered-containers uuid
+       ];
+       description = "ElasticSearch scribe for the Katip logging framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "katt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ConfigFile, containers
      , directory, errors, filepath, lens, mtl, parsec, text, url, wreq
@@ -120526,15 +120667,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lifted-async_0_9_2" = callPackage
+  "lifted-async_0_9_3" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
      , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
      , tasty-th, transformers-base
      }:
      mkDerivation {
        pname = "lifted-async";
-       version = "0.9.2";
-       sha256 = "14p8fbbvcr35kkv8ayxlsqcfn55am9lyzmszciww13y8mx7b214z";
+       version = "0.9.3";
+       sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp";
        libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
@@ -122948,25 +123089,6 @@ self: {
      }) {};
 
   "log-base" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
-     , exceptions, monad-control, monad-time, mtl, semigroups, stm, text
-     , time, transformers-base, unordered-containers
-     }:
-     mkDerivation {
-       pname = "log-base";
-       version = "0.7.1";
-       sha256 = "1gx2j33f8nhynm6jhbp5z139bqdgg6rymzpk3inzgf7da5flisv3";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring deepseq exceptions monad-control
-         monad-time mtl semigroups stm text time transformers-base
-         unordered-containers
-       ];
-       homepage = "https://github.com/scrive/log";
-       description = "Structured logging solution (base package)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-base_0_7_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
      , exceptions, monad-control, monad-time, mtl, semigroups, stm, text
      , time, transformers-base, unordered-containers
@@ -122983,7 +123105,6 @@ self: {
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution (base package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-domain" = callPackage
@@ -123071,27 +123192,6 @@ self: {
      }) {};
 
   "log-postgres" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base
-     , mtl, semigroups, split, text, text-show, time
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "log-postgres";
-       version = "0.7";
-       sha256 = "0qzrfixdpag4fskzwy7l5hjgag6f2xkcx8lzrz91iw2s37zlwx1k";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring bytestring deepseq
-         hpqtypes http-client lifted-base log-base mtl semigroups split text
-         text-show time unordered-containers vector
-       ];
-       homepage = "https://github.com/scrive/log";
-       description = "Structured logging solution (PostgreSQL back end)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "log-postgres_0_7_0_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base
      , mtl, semigroups, split, text, text-show, time
@@ -123968,8 +124068,8 @@ self: {
      }:
      mkDerivation {
        pname = "loup";
-       version = "0.0.8";
-       sha256 = "0chb4pp8czc0i0nn0dx78r7j7gr3d9mi0f51kdrimk301dpcca29";
+       version = "0.0.9";
+       sha256 = "059alaci5rqlagm7hgkk6nl9i11ynjkn2rz70haklbw6di2l9niw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123980,6 +124080,7 @@ self: {
        homepage = "https://github.com/swift-nav/loup";
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lowgl" = callPackage
@@ -126706,25 +126807,6 @@ self: {
      }) {};
 
   "matrix-market-attoparsec" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, directory
-     , exceptions, hspec, QuickCheck, scientific
-     }:
-     mkDerivation {
-       pname = "matrix-market-attoparsec";
-       version = "0.1.0.7";
-       sha256 = "0cdv5gksmd812fwzf6ki10ksnm5lz1dm8pkjni7niz4gvrf6dhaj";
-       libraryHaskellDepends = [
-         attoparsec base bytestring exceptions scientific
-       ];
-       testHaskellDepends = [
-         base directory exceptions hspec QuickCheck
-       ];
-       homepage = "https://github.com/ocramz/matrix-market-attoparsec";
-       description = "Parsing and serialization functions for the NIST Matrix Market format";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "matrix-market-attoparsec_0_1_0_8" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory
      , exceptions, hspec, QuickCheck, scientific
      }:
@@ -126741,7 +126823,6 @@ self: {
        homepage = "https://github.com/ocramz/matrix-market-attoparsec";
        description = "Parsing and serialization functions for the NIST Matrix Market format";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "matrix-market-pure" = callPackage
@@ -127651,17 +127732,15 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "megaparsec_5_3_0" = callPackage
+  "megaparsec_5_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , exceptions, hspec, hspec-expectations, mtl, QuickCheck
      , scientific, text, transformers, weigh
      }:
      mkDerivation {
        pname = "megaparsec";
-       version = "5.3.0";
-       sha256 = "0lpf3f24lyid1chb2hrxiw97kciww844wzkp910zj811b6pbm6rs";
-       revision = "2";
-       editedCabalFile = "1gwvrg5vmxhlycav33g9r9157vq0f6j701bar0p7ck4mszs0v6zk";
+       version = "5.3.1";
+       sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions mtl QuickCheck
          scientific text transformers
@@ -129532,6 +129611,24 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "miso" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, lucid
+     , network-uri, text, vector
+     }:
+     mkDerivation {
+       pname = "miso";
+       version = "0.1.0.1";
+       sha256 = "1wg02nc8qa3f2dgfh0704cw0d4c5jnaqsz3iyf2s7xb8krivvkiz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers lucid network-uri text vector
+       ];
+       homepage = "http://github.com/dmjio/miso";
+       description = "A tasty Haskell front-end framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "missing-foreign" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -129686,6 +129783,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mltool" = callPackage
+    ({ mkDerivation, ascii-progress, base, deepseq, hmatrix
+     , hmatrix-gsl, hmatrix-gsl-stats, HUnit, MonadRandom, QuickCheck
+     , random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, vector
+     }:
+     mkDerivation {
+       pname = "mltool";
+       version = "0.1.0.0";
+       sha256 = "1wybicf7j412avj200ygl48kskb1q3607614h0cqbh7nd09svyks";
+       libraryHaskellDepends = [
+         ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-gsl-stats
+         MonadRandom random vector
+       ];
+       testHaskellDepends = [
+         base hmatrix hmatrix-gsl-stats HUnit MonadRandom QuickCheck random
+         test-framework test-framework-hunit test-framework-quickcheck2
+         vector
+       ];
+       homepage = "https://github.com/alexander-ignatyev/mltool";
+       description = "Machine Learning Toolbox";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mmap" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -130703,15 +130824,17 @@ self: {
      }) {};
 
   "monad-mock" = callPackage
-    ({ mkDerivation, base, constraints, exceptions, hspec
-     , monad-control, mtl, transformers-base
+    ({ mkDerivation, base, constraints, exceptions, haskell-src-exts
+     , haskell-src-meta, hspec, monad-control, mtl, template-haskell
+     , th-orphans, transformers-base
      }:
      mkDerivation {
        pname = "monad-mock";
-       version = "0.1.0.0";
-       sha256 = "0ax46lh6j2xxs6xidj1i6jw2yv2i1p79807fcwfqrkb1rl6xchx4";
+       version = "0.1.1.0";
+       sha256 = "0h09pm5db9wshl4lxwx7rppzafch8jwipjr3qijdnpzga2bad1ll";
        libraryHaskellDepends = [
-         base constraints exceptions monad-control mtl transformers-base
+         base constraints exceptions haskell-src-exts haskell-src-meta
+         monad-control mtl template-haskell th-orphans transformers-base
        ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/cjdev/monad-mock#readme";
@@ -130934,8 +131057,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "monad-st";
-       version = "0.2.4";
-       sha256 = "1j67s07p5lsr81cjl0ch5d1q7zarmpak5kmnwckhavihg3l5m3bi";
+       version = "0.2.4.1";
+       sha256 = "025zi9xzliwgyasq5hrfxwzg4ksj3kj0ys2kp62fi1n4ddbih64f";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/monad-st";
        description = "Provides a MonadST class";
@@ -137414,6 +137537,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "noether" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , criterion, deepseq, ghc-prim, hashable, hedgehog, mtl, mtl-compat
+     , pretty-show, safe, stm, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "noether";
+       version = "0.0.1";
+       sha256 = "1dc05qkbakw4gkqh3yh76lxdk0ab1k8milwjwgkibp4bs61f8rc8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async base bytestring containers deepseq ghc-prim hashable
+         mtl mtl-compat pretty-show safe stm text transformers vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hedgehog ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/mrkgnao/noether#readme";
+       description = "Math in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "nofib-analyse" = callPackage
     ({ mkDerivation, array, base, containers, regex-compat }:
      mkDerivation {
@@ -139387,25 +139533,6 @@ self: {
      }) {};
 
   "one-liner" = callPackage
-    ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
-     , profunctors, tagged, transformers
-     }:
-     mkDerivation {
-       pname = "one-liner";
-       version = "0.9";
-       sha256 = "1ds95j4wz8m3lpsrfc2n8r8qz35s3slyvg9yhj4czsxdslc9ywq6";
-       libraryHaskellDepends = [
-         base bifunctors contravariant ghc-prim profunctors tagged
-         transformers
-       ];
-       testHaskellDepends = [ base contravariant HUnit ];
-       homepage = "https://github.com/sjoerdvisscher/one-liner";
-       description = "Constraint-based generics";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "one-liner_0_9_1" = callPackage
     ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
      , profunctors, tagged, transformers
      }:
@@ -145158,26 +145285,6 @@ self: {
      }) {};
 
   "persistent-mysql" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, monad-control, monad-logger, mysql, mysql-simple
-     , persistent, resource-pool, resourcet, text, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-mysql";
-       version = "2.6.0.2";
-       sha256 = "0i6m70fh0qs05xgm7c6wpsb815xn370jn29s352zg994rhlkmv0i";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers
-         monad-control monad-logger mysql mysql-simple persistent
-         resource-pool resourcet text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "persistent-mysql_2_6_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-control, monad-logger, mysql, mysql-simple
      , persistent, resource-pool, resourcet, text, transformers
@@ -145688,6 +145795,7 @@ self: {
        homepage = "https://github.com/jfischoff/pg-transact#readme";
        description = "Another postgresql-simple transaction monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgdl" = callPackage
@@ -146632,6 +146740,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-cacophony_0_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }:
+     mkDerivation {
+       pname = "pipes-cacophony";
+       version = "0.5.0";
+       sha256 = "1p6vb1abyzifczn537iabd87g2x7mnhvr4sx1j6ay51zvvn5vh20";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring cacophony pipes ];
+       testHaskellDepends = [ base hlint ];
+       homepage = "https://github.com/centromere/pipes-cacophony#readme";
+       description = "Pipes for Noise-secured network connections";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-category" = callPackage
     ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-extras
      , transformers
@@ -149464,6 +149588,7 @@ self: {
        homepage = "https://github.com/cocreature/postgresql-named#readme";
        description = "Generic deserialization of PostgreSQL rows based on column names";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-orm" = callPackage
@@ -149692,6 +149817,7 @@ self: {
        homepage = "https://github.com/jfischoff/postgresql-queue#readme";
        description = "A PostgreSQL backed queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-sop" = callPackage
@@ -149733,6 +149859,8 @@ self: {
        pname = "postgresql-simple-url";
        version = "0.2.0.0";
        sha256 = "0k7anqkw9gn5mm3y93pzp8rqzlg1526pxikcllxcciyhgpz5mn7p";
+       revision = "1";
+       editedCabalFile = "1z9qk3kplc5y93h3xbb9gialhdmnblwrmf2943wkj70qg975hajb";
        libraryHaskellDepends = [
          base network-uri postgresql-simple split
        ];
@@ -150998,14 +151126,15 @@ self: {
        libraryHaskellDepends = [ base prettyprinter vty ];
        description = "prettyprinter backend for vty";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prim-array" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive }:
      mkDerivation {
        pname = "prim-array";
-       version = "0.1";
-       sha256 = "0k4askk73r6pm160lqgrdz787qacd7sv7j04awdwrxbr0mwqn5gk";
+       version = "0.2";
+       sha256 = "0h9n1v3xqvxf8pmycmj5qd4gw8zcxgy4l1fjxff9sfzhpsnvcmp9";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        homepage = "https://github.com/andrewthad/prim-array#readme";
        description = "Primitive byte array with type variable";
@@ -152369,6 +152498,7 @@ self: {
        homepage = "https://github.com/google/proto-lens";
        description = "Basic protocol buffer message types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-protoc" = callPackage
@@ -154223,6 +154353,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quantification" = callPackage
+    ({ mkDerivation, aeson, base, hashable, path-pieces, text }:
+     mkDerivation {
+       pname = "quantification";
+       version = "0.1";
+       sha256 = "0z7mwqpl83l8ss1ji8xna8z1s5nd78164ni9wmfiszhp4ghg2vpi";
+       libraryHaskellDepends = [ aeson base hashable path-pieces text ];
+       homepage = "https://github.com/andrewthad/quantification#readme";
+       description = "Data types and typeclasses to deal with universally and existentially quantified types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "quantities" = callPackage
     ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl
      , parsec, process, regex-compat
@@ -154724,6 +154866,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickcheck-special_0_1_0_5" = callPackage
+    ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific
+     , text
+     }:
+     mkDerivation {
+       pname = "quickcheck-special";
+       version = "0.1.0.5";
+       sha256 = "189gadjm06zm3jilr5dcqbmfgq8d6j91nsvnzwwp9kdn3j9m711p";
+       libraryHaskellDepends = [
+         base bytestring ieee754 QuickCheck scientific text
+       ];
+       homepage = "https://github.com/minad/quickcheck-special#readme";
+       description = "Edge cases and special values for QuickCheck Arbitrary instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-state-machine" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, constraints, containers
      , hspec, mtl, parallel-io, QuickCheck, random, singletons, stm
@@ -155941,6 +156100,8 @@ self: {
        pname = "range-set-list";
        version = "0.1.2.0";
        sha256 = "0rxb5dq228xypnilqvjyn97knlzfc7fl771w4qgziwfw8zs9qx1v";
+       revision = "1";
+       editedCabalFile = "061xbyarcjr4bcb08a5xyzqiyvagn9729p6hk5kzayzlkscx16j2";
        libraryHaskellDepends = [
          base containers deepseq hashable semigroups
        ];
@@ -156037,6 +156198,7 @@ self: {
        homepage = "https://github.com/blamario/grampa/tree/master/rank2classes";
        description = "a mirror image of some standard type classes, with methods of rank 2 types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rapid" = callPackage
@@ -157652,6 +157814,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "recursion-schemes_5_0_2" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, comonad, free
+     , HUnit, semigroups, template-haskell, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "recursion-schemes";
+       version = "5.0.2";
+       sha256 = "1lmayskniljw3lxk64apvshn9h90gwfpflgxilfivsqhrjxnaj9s";
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad free semigroups
+         template-haskell transformers transformers-compat
+       ];
+       testHaskellDepends = [ base HUnit template-haskell transformers ];
+       homepage = "http://github.com/ekmett/recursion-schemes/";
+       description = "Generalized bananas, lenses and barbed wire";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "recursive-line-count" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, gtk, mtl
      , process
@@ -158530,6 +158712,8 @@ self: {
        pname = "regex-applicative-text";
        version = "0.1.0.1";
        sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh";
+       revision = "1";
+       editedCabalFile = "1w8aqqq6j1lhwpi2d0qj9h32cia3nr9l43a0mspqawb1nsmpjyic";
        libraryHaskellDepends = [ base regex-applicative text ];
        homepage = "https://github.com/phadej/regex-applicative-text#readme";
        description = "regex-applicative on text";
@@ -161514,6 +161698,7 @@ self: {
        homepage = "https://github.com/iconnect/ridley#README";
        description = "Quick metrics to grow your app strong";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ridley-extras" = callPackage
@@ -161532,6 +161717,7 @@ self: {
        homepage = "https://github.com/iconnect/ridley/ridley-extras#readme";
        description = "Handy metrics that don't belong to ridley";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riemann" = callPackage
@@ -163289,19 +163475,6 @@ self: {
      }) {};
 
   "safe" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "safe";
-       version = "0.3.14";
-       sha256 = "13y8zlvifwwr5ybizqw0d1lzr763fnzlqsm8m5a1whpn933hqn6v";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/ndmitchell/safe#readme";
-       description = "Library of safe (exception free) functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "safe_0_3_15" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "safe";
@@ -163312,7 +163485,6 @@ self: {
        homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-access" = callPackage
@@ -168673,6 +168845,7 @@ self: {
        homepage = "https://github.com/martyall/servant-zeppelin#readme";
        description = "Client library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-zeppelin-server" = callPackage
@@ -168697,6 +168870,7 @@ self: {
        homepage = "https://github.com/martyall/servant-zeppelin#readme";
        description = "Server library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-zeppelin-swagger" = callPackage
@@ -168719,6 +168893,7 @@ self: {
        homepage = "https://github.com/martyall/servant-zeppelin#readme";
        description = "Swagger instances for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "server-generic" = callPackage
@@ -169698,8 +169873,8 @@ self: {
     ({ mkDerivation, base, basic-prelude, directory, shake }:
      mkDerivation {
        pname = "shakers";
-       version = "0.0.18";
-       sha256 = "1kl7sx4lf5pg6kdpvqfid0lx6l6fsxm1x9z4ccmlk7bq2x8djdgv";
+       version = "0.0.22";
+       sha256 = "1s6grydppi50xlfxpjgprv29nsdn2z7d34z87fa994jiimp5i3a8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base basic-prelude directory shake ];
@@ -172263,7 +172438,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "skylighting_0_3_3" = callPackage
+  "skylighting_0_3_3_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html
      , bytestring, case-insensitive, containers, criterion, Diff
      , directory, filepath, HUnit, hxt, mtl, pretty-show, random
@@ -172272,8 +172447,8 @@ self: {
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.3.3";
-       sha256 = "15zclx8as9ck209acsy8bdy4di8m5iw4qzgiavn5xla2adw431h9";
+       version = "0.3.3.1";
+       sha256 = "0msx7hwnfcqmq0rkn27lr3y6iybghfnm9p5bybzkmqfhlh8gkqgk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173131,12 +173306,12 @@ self: {
      }:
      mkDerivation {
        pname = "snap-accept";
-       version = "0.2.0";
-       sha256 = "0a698lq1djgz3k84q6yh2jq4gzj48kzmvwzwk5rqdz1v5whssraf";
+       version = "0.2.1";
+       sha256 = "0847vq58nkhhr9msiy27cg9app6fzsswzy1dp1iylxygc9wbws6q";
        libraryHaskellDepends = [
          base bytestring case-insensitive http-media snap-core
        ];
-       homepage = "http://github.com/zimothy/snap-accept";
+       homepage = "https://github.com/zmthy/snap-accept";
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177195,8 +177370,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack2nix";
-       version = "0.1.2.0";
-       sha256 = "1zq5d9f4livy3gkwcw4gajzil96klfbn2pzr7gnh74c323i9df9y";
+       version = "0.1.3.0";
+       sha256 = "13czryr73cw6brxp8jhszwdmvd0ck4h8g3f32yi1agn3l67nnqpy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -178969,30 +179144,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.4.2";
-       sha256 = "0rks6ick1fb1sk5mk90bmn0d63kybvkw5wribri351sfyjppm51p";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring hashable lens template-haskell
-         text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring directory hashable hlint lens
-         tasty tasty-hspec template-haskell text unordered-containers
-       ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_4_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
      , unordered-containers
@@ -179014,7 +179165,6 @@ self: {
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -183760,25 +183910,6 @@ self: {
      }) {};
 
   "tasty-hspec" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
-     , tagged, tasty, tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-hspec";
-       version = "1.1.3.1";
-       sha256 = "0i2lv0m8va2kirddgng5laaq9q78y56jg9li93iq8b9062smiila";
-       revision = "2";
-       editedCabalFile = "0d8cwpkqayf7qgg4xvs8aj4wxk3qkilmjfy74s3jkxyrxsg22d73";
-       libraryHaskellDepends = [
-         base hspec hspec-core QuickCheck random tagged tasty
-         tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
-       description = "Hspec support for the Tasty test framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-hspec_1_1_3_2" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
      , tagged, tasty, tasty-quickcheck, tasty-smallcheck
      }:
@@ -183793,7 +183924,6 @@ self: {
        homepage = "https://github.com/mitchellwrosen/tasty-hspec";
        description = "Hspec support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-html" = callPackage
@@ -184556,6 +184686,7 @@ self: {
        homepage = "https://github.com/andrewthad/teleshell#readme";
        description = "Telnet client and other things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tellbot" = callPackage
@@ -186563,6 +186694,7 @@ self: {
        ];
        description = "Memory-efficient representation of Unicode text strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show" = callPackage
@@ -187030,6 +187162,22 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "th-abstraction_0_2_3_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-abstraction";
+       version = "0.2.3.0";
+       sha256 = "00yy303rrnx26z9aam33j8m1v0dq5wxk71901fbl50jm9mdg4jwm";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       testHaskellDepends = [ base containers template-haskell ];
+       homepage = "https://github.com/glguy/th-abstraction";
+       description = "Nicer interface for reified information about data types";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-alpha" = callPackage
     ({ mkDerivation, base, containers, derive, mmorph, mtl, tasty
      , tasty-hunit, tasty-quickcheck, template-haskell, th-desugar
@@ -188620,6 +188768,8 @@ self: {
        pname = "time-parsers";
        version = "0.1.2.0";
        sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f";
+       revision = "1";
+       editedCabalFile = "1fvk31ab241v4ib7lg718q6qwrc3w7axq9kinccbdnn7b7d259gj";
        libraryHaskellDepends = [ base parsers template-haskell time ];
        testHaskellDepends = [
          attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -189636,6 +189786,7 @@ self: {
        homepage = "https://github.com/jfischoff/tmp-postgres#readme";
        description = "Start and stop a temporary postgres for testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tmpl" = callPackage
@@ -189997,6 +190148,7 @@ self: {
        homepage = "http://github.com/tittoassini/top";
        description = "Top (typed oriented protocol) API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "topkata" = callPackage
@@ -190892,6 +191044,7 @@ self: {
        ];
        description = "Type safe http requests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trasa-reflex" = callPackage
@@ -192033,23 +192186,26 @@ self: {
   "tweet-hs" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, composition, containers, criterion, data-default
-     , directory, extra, hspec, http-client, http-client-tls, http-types
-     , lens, optparse-applicative, split, text
+     , directory, extra, hspec, hspec-megaparsec, http-client
+     , http-client-tls, http-types, lens, megaparsec
+     , optparse-applicative, split, text
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "0.6.0.0";
-       sha256 = "1myvwhyzw4a9xdrp16ibzgafdv84kwyvn0pqcsnq8kf3lnic60n3";
+       version = "0.6.0.1";
+       sha256 = "1rd1isvbia2cvxbfxx6sxk8vz3vjckpwa7ci0sgpbmb6qcm0ddyr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint authenticate-oauth base bytestring composition
          containers data-default directory extra http-client http-client-tls
-         http-types lens optparse-applicative split text
+         http-types lens megaparsec optparse-applicative split text
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base bytestring hspec ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-megaparsec megaparsec
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
@@ -194210,22 +194366,6 @@ self: {
      }) {};
 
   "unfoldable" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
-     , random, transformers
-     }:
-     mkDerivation {
-       pname = "unfoldable";
-       version = "0.9.3";
-       sha256 = "0bf5qf6w6blwxbyz5cd8662hd6xv0s0wa8zcrx6s696f2qvjr10f";
-       libraryHaskellDepends = [
-         base containers ghc-prim one-liner QuickCheck random transformers
-       ];
-       homepage = "https://github.com/sjoerdvisscher/unfoldable";
-       description = "Class of data structures that can be unfolded";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unfoldable_0_9_4" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
      , random, transformers
      }:
@@ -194239,7 +194379,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -198047,14 +198186,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "viewprof_0_0_0_3" = callPackage
+  "viewprof_0_0_0_4" = callPackage
     ({ mkDerivation, base, brick, containers, ghc-prof, lens
      , scientific, text, vector, vector-algorithms, vty
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.3";
-       sha256 = "13rb9cgi65vcc6y6rj79li1rywzb711ayl1dwsm97b7nqz4007rk";
+       version = "0.0.0.4";
+       sha256 = "06a2bw0blamf29bf3hrwq5c98glx81argk9hsmnp6rjdjzwq6fcp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -199022,35 +199161,6 @@ self: {
      }) {};
 
   "wai-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, HUnit, iproute, lifted-base, network, old-locale
-     , resourcet, streaming-commons, stringsearch, text, time
-     , transformers, unix, unix-compat, vault, void, wai, wai-logger
-     , word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.0.19.1";
-       sha256 = "1xm744dmdajmvswr9wgzpkhb9jil2mkz4vzi96sqp1px692cmrzp";
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types iproute lifted-base network
-         old-locale resourcet streaming-commons stringsearch text time
-         transformers unix unix-compat vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring case-insensitive cookie fast-logger
-         hspec http-types HUnit resourcet text time transformers wai zlib
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_0_20_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -199077,7 +199187,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -205438,23 +205547,23 @@ self: {
      }) {};
 
   "xmonad-extras" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, hint
-     , libmpd, mtl, network, old-locale, old-time, parsec, process
-     , random, regex-posix, split, unix, X11, xmonad, xmonad-contrib
+    ({ mkDerivation, alsa-mixer, base, bytestring, containers
+     , directory, hint, libmpd, mtl, network, old-locale, old-time
+     , process, random, regex-posix, unix, X11, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "xmonad-extras";
-       version = "0.12.1";
-       sha256 = "14g8i3rvfiqp6mq1xhw8f9q0svcfz5nhlsgbz20zlk1az7673z55";
+       version = "0.13.0";
+       sha256 = "11clsfa5i174i6bfp6mdy06w11jyx2sydrbbczf2s9kg92ysbnqb";
        configureFlags = [
          "-f-with_hlist" "-fwith_parsec" "-fwith_split"
        ];
        libraryHaskellDepends = [
-         base bytestring containers directory hint libmpd mtl network
-         old-locale old-time parsec process random regex-posix split unix
-         X11 xmonad xmonad-contrib
+         alsa-mixer base bytestring containers directory hint libmpd mtl
+         network old-locale old-time process random regex-posix unix X11
+         xmonad xmonad-contrib
        ];
-       homepage = "http://projects.haskell.org/xmonad-extras";
+       homepage = "https://github.com/xmonad/xmonad-extras";
        description = "Third party extensions for xmonad with wacky dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207461,23 +207570,6 @@ self: {
      }) {};
 
   "yesod-form-richtext" = callPackage
-    ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text
-     , xss-sanitize, yesod-core, yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-form-richtext";
-       version = "0.1.0.0";
-       sha256 = "1l8idjn0ib0y6gjsgzkvnznm69mhy49cb9ppw99w3ajndp8zw15l";
-       libraryHaskellDepends = [
-         base blaze-builder blaze-html shakespeare text xss-sanitize
-         yesod-core yesod-form
-       ];
-       homepage = "http://github.com/geraldus/yesod-form-richtext#readme";
-       description = "Various rich-text WYSIWYG editors for Yesod forms";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form-richtext_0_1_0_1" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text
      , xss-sanitize, yesod-core, yesod-form
      }:
@@ -207492,7 +207584,6 @@ self: {
        homepage = "http://github.com/geraldus/yesod-form-richtext#readme";
        description = "Various rich-text WYSIWYG editors for Yesod forms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-gitrepo" = callPackage
@@ -208277,33 +208368,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, containers, cookie
-     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
-     , monad-control, network, persistent, pretty-show, text, time
-     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
-     , yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.5.6";
-       sha256 = "1zb3zm6id0nnsbpic8643b1p0x6yx1in8x1c7n36wbp9crinr0h3";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive containers cookie hspec-core html-conduit
-         http-types HUnit monad-control network persistent pretty-show text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit
-         lifted-base text wai xml-conduit yesod-core yesod-form
-       ];
-       homepage = "http://www.yesodweb.com";
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_5_7" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, containers, cookie
      , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
@@ -208328,7 +208392,6 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -208677,6 +208740,7 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Dynamic configuration support for Yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -209849,31 +209913,10 @@ self: {
        homepage = "https://github.com/itkovian/zeromq4-conduit#readme";
        description = "Conduit wrapper around zeromq4-haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeromq4-haskell" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, exceptions
-     , monad-control, QuickCheck, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, transformers, transformers-base, zeromq
-     }:
-     mkDerivation {
-       pname = "zeromq4-haskell";
-       version = "0.6.6";
-       sha256 = "1pblwyn2lly3px9843g4a2wpkqhnffd53kam1b9kx31zpplfhbx8";
-       libraryHaskellDepends = [
-         async base bytestring containers exceptions monad-control
-         semigroups transformers transformers-base
-       ];
-       libraryPkgconfigDepends = [ zeromq ];
-       testHaskellDepends = [
-         async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       homepage = "https://gitlab.com/twittner/zeromq-haskell/";
-       description = "Bindings to ZeroMQ 4.x";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) zeromq;};
-
-  "zeromq4-haskell_0_6_7" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, exceptions
      , monad-control, QuickCheck, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, transformers, transformers-base, zeromq
@@ -209893,7 +209936,6 @@ self: {
        homepage = "https://gitlab.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 4.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zeromq;};
 
   "zeroth" = callPackage
@@ -210111,31 +210153,6 @@ self: {
      }) {};
 
   "zip-archive" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , digest, directory, filepath, HUnit, mtl, old-time, pretty
-     , process, temporary, text, time, unix, zip, zlib
-     }:
-     mkDerivation {
-       pname = "zip-archive";
-       version = "0.3.1";
-       sha256 = "0ywy6isvyizs5d27lh108y6k4qnwmbcdmvzsrm3r45bwcj1nii5f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers digest directory filepath
-         mtl old-time pretty text time unix zlib
-       ];
-       testHaskellDepends = [
-         base bytestring directory HUnit old-time process temporary time
-         unix
-       ];
-       testToolDepends = [ zip ];
-       homepage = "http://github.com/jgm/zip-archive";
-       description = "Library for creating and modifying zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) zip;};
-
-  "zip-archive_0_3_1_1" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty
      , process, temporary, text, time, unix, zip, zlib
@@ -210158,7 +210175,6 @@ self: {
        homepage = "http://github.com/jgm/zip-archive";
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zip;};
 
   "zip-conduit" = callPackage
-- 
GitLab


From 2ed4b6fad8d4291eba056737652711375bf95bce Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 27 Jun 2017 21:15:44 -0500
Subject: [PATCH 1320/1490] qt59: fix qtCompatVersion

Qt 5.9 was incorrectly identified as being plugin-compatible with Qt 5.8.
---
 pkgs/development/libraries/qt-5/5.9/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
index fd4769a02c6..7aba54fb883 100644
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ b/pkgs/development/libraries/qt-5/5.9/default.nix
@@ -31,7 +31,7 @@ with stdenv.lib;
 
 let
 
-  qtCompatVersion = "5.8";
+  qtCompatVersion = "5.9";
 
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
-- 
GitLab


From 59f94b12f3dc5f0a6fa47a8f51f5fd72a3af63fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 27 Jun 2017 21:23:00 -0500
Subject: [PATCH 1321/1490] dropbox: 28.4.14 -> 29.4.20

---
 pkgs/applications/networking/dropbox/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index cda86d2e652..8eed4b7856a 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -24,11 +24,11 @@
 let
   # NOTE: When updating, please also update in current stable,
   # as older versions stop working
-  version = "28.4.14";
+  version = "29.4.20";
   sha256 =
     {
-      "x86_64-linux" = "02pfly33bg85c8y3igvkhyshra8ra089ghjibhzl1a4fmd45wf52";
-      "i686-linux"   = "10swkjbzkyf19cilzw7ja6byla4dllr52pbz19wjzb8rv088gcla";
+      "x86_64-linux" = "0w8n8q846mqq8f3yisn9xazf323sn579zyp1kwrdrmmqalwiwcl2";
+      "i686-linux"   = "0zgdnpizgkw2q6wglkdhpzzrhnpplfi2ldcw1z0k9r6slici5mfk";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
@@ -40,7 +40,7 @@ let
   # relative location where the dropbox libraries are stored
   appdir = "opt/dropbox";
 
-  ldpath = stdenv.lib.makeLibraryPath
+  libs =
     [
       dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
       libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
@@ -48,6 +48,7 @@ let
 
       qtbase qtdeclarative qtwebkit
     ];
+  ldpath = stdenv.lib.makeLibraryPath libs;
 
   desktopItem = makeDesktopItem {
     name = "dropbox";
@@ -70,9 +71,12 @@ in mkDerivation {
   sourceRoot = ".dropbox-dist";
 
   nativeBuildInputs = [ makeWrapper patchelf ];
+  buildInputs = libs;
   dontStrip = true; # already done
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p "$out/${appdir}"
     cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/"
 
@@ -102,9 +106,11 @@ in mkDerivation {
 
     rm $out/${appdir}/wmctrl
     ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl
+
+    runHook postInstall
   '';
 
-  fixupPhase = ''
+  preFixup = ''
     INTERP=$(cat $NIX_CC/nix-support/dynamic-linker)
     RPATH="${ldpath}:$out/${appdir}"
     getType='s/ *Type: *\([A-Z]*\) (.*/\1/'
-- 
GitLab


From cc63c5d32ccca412d6af77eeb69c4af5490755f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 27 Jun 2017 11:27:38 +0100
Subject: [PATCH 1322/1490] bench: add static executable from haskellPackages

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1cc1340b51..7939bca6940 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16881,6 +16881,8 @@ with pkgs;
 
   bean-add = callPackage ../applications/office/beancount/bean-add.nix { };
 
+  bench = haskell.lib.justStaticExecutables haskellPackages.bench;
+
   beret = callPackage ../games/beret { };
 
   bitsnbots = callPackage ../games/bitsnbots {
-- 
GitLab


From 8de4530b4acfcda703cac98448120aa837043983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 28 Jun 2017 16:21:19 +0200
Subject: [PATCH 1323/1490] Add static binary for stack2nix

---
 pkgs/top-level/all-packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7939bca6940..9fe533aeb3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -771,6 +771,14 @@ with pkgs;
     '';
   });
 
+  stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: {
+    executableToolDepends = [ makeWrapper ];
+    postInstall = ''
+      wrapProgram $out/bin/stack2nix \
+        --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin" 
+    '';
+  });
+
   caddy = callPackage ../servers/caddy { };
 
   capstone = callPackage ../development/libraries/capstone { };
-- 
GitLab


From 5015dea12a59264174e5d30d2605f3dfc4efdc85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 28 Jun 2017 16:35:08 +0200
Subject: [PATCH 1324/1490] stack2nix: depend on stack binary as well

---
 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 9fe533aeb3d..e9b6a7e1c61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -775,7 +775,7 @@ with pkgs;
     executableToolDepends = [ makeWrapper ];
     postInstall = ''
       wrapProgram $out/bin/stack2nix \
-        --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin" 
+        --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin"
     '';
   });
 
-- 
GitLab


From 855c1bde4285b3ece6c6a6bbd475b36ea0bc10b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 28 Jun 2017 15:58:36 +0100
Subject: [PATCH 1325/1490] suid-chroot: do not set suid bit during install

To be useful in nixos, it probably also requires a module to set up a hardening wrapper.
---
 pkgs/tools/system/suid-chroot/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix
index 1278480973f..ebedf5f544e 100644
--- a/pkgs/tools/system/suid-chroot/default.nix
+++ b/pkgs/tools/system/suid-chroot/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace Makefile --replace /usr $out
+    sed -i -e '/chmod u+s/d' Makefile
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 24c59a445275b726cec33242d741db8ad97c8ee9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 28 Jun 2017 11:59:54 -0400
Subject: [PATCH 1326/1490] neuron: enable GUI

---
 .../science/biology/iv/default.nix            | 31 +++++++++++++++++++
 .../science/biology/neuron/default.nix        |  5 +--
 pkgs/top-level/all-packages.nix               |  6 ++++
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/science/biology/iv/default.nix

diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix
new file mode 100644
index 00000000000..714b7fddd44
--- /dev/null
+++ b/pkgs/applications/science/biology/iv/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, neuron-version
+, libX11, libXext, patchelf
+}:
+
+stdenv.mkDerivation rec
+  { name = "iv-19";
+    src = fetchurl
+      { url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz";
+        sha256 = "1q22vjngvn3m61mjxynkik7pxvsgc9a0ym46qpa84hmz1v86mdrw";
+      };
+    nativeBuildInputs = [ patchelf ];
+    buildInputs = [ libXext ];
+    propagatedBuildInputs = [ libX11 ];
+    hardeningDisable = [ "format" ];
+    postInstall = ''
+      for dir in $out/*; do # */
+        if [ -d $dir/lib ]; then
+	  mv $dir/* $out # */
+          rmdir $dir
+          break
+        fi
+      done
+      patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so
+    '';
+    meta = with stdenv.lib;
+      { description = "InterViews graphical library for Neuron";
+        license     = licenses.bsd3;
+        homepage    = http://www.neuron.yale.edu/neuron;
+        platforms   = platforms.all;
+      };
+  }
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 136fba47eb7..bd300846cf0 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -9,6 +9,7 @@
 , which
 , python ? null
 , mpi ? null
+, iv
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
   version = "7.4";
 
   nativeBuildInputs = [ which pkgconfig automake autoconf libtool ];
-  buildInputs = [ ncurses readline python mpi  ];
+  buildInputs = [ ncurses readline python mpi iv ];
 
   src = fetchurl {
     url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz";
@@ -45,7 +46,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = with stdenv.lib;
-                    [ "--without-x" "--with-readline=${readline}" ]
+                    [ "--with-readline=${readline}" "--with-iv=${iv}" ]
                     ++  optionals (python != null)  [ "--with-nrnpython=${python.interpreter}" ]
                     ++ (if mpi != null then ["--with-mpi" "--with-paranrn"]
                         else ["--without-mpi"]);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9b6a7e1c61..82f39ee027e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17659,6 +17659,10 @@ with pkgs;
 
   igv = callPackage ../applications/science/biology/igv { };
 
+  iv = callPackage ../applications/science/biology/iv {
+    neuron-version = neuron.version;
+  };
+
   neuron = callPackage ../applications/science/biology/neuron {
     python = null;
   };
@@ -17667,6 +17671,8 @@ with pkgs;
     mpi = pkgs.openmpi;
   });
 
+  neuron-full = neuron-mpi.override { inherit python; };
+
   mrbayes = callPackage ../applications/science/biology/mrbayes { };
 
   minc_tools = callPackage ../applications/science/biology/minc-tools { };
-- 
GitLab


From 08ccf9e0595147c03a37de6529008b95f839cac9 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Wed, 28 Jun 2017 18:38:05 +0200
Subject: [PATCH 1327/1490] skopeo: 0.1.18 -> 0.1.22

---
 pkgs/development/tools/skopeo/default.nix |  8 ++++----
 pkgs/development/tools/skopeo/path.patch  | 25 +++++++++++------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index d1ea6a2e12b..f9c5ee1b7b9 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree }:
 
 with stdenv.lib;
 
 buildGoPackage rec {
   name = "skopeo-${version}";
-  version = "0.1.18";
+  version = "0.1.22";
   rev = "v${version}";
 
   goPackagePath = "github.com/projectatomic/skopeo";
   excludedPackages = "integration";
 
-  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ];
+  buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs pkgconfig ostree ];
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "projectatomic";
     repo = "skopeo";
-    sha256 = "13k29i5hx909hvddl2xkyw4qzxq2q20ay9bkal3xi063s6l0sh0z";
+    sha256 = "0aivs37bcvx3g22a9r3q1vj2ahw323g1vaq9jzbmifm9k0pb07jy";
   };
 
   patches = [
diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch
index deb63b27945..22a74ac944b 100644
--- a/pkgs/development/tools/skopeo/path.patch
+++ b/pkgs/development/tools/skopeo/path.patch
@@ -1,25 +1,24 @@
 diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go
-index 51f918d..6681d73 100644
+index 50e29b2..7108df5 100644
 --- a/cmd/skopeo/main.go
 +++ b/cmd/skopeo/main.go
 @@ -3,6 +3,7 @@ package main
  import (
  	"fmt"
  	"os"
-+  "path/filepath"
-
++        "path/filepath"
+ 
  	"github.com/Sirupsen/logrus"
  	"github.com/containers/image/signature"
-@@ -84,6 +85,12 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) {
+@@ -88,6 +89,11 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) {
  	policyPath := c.GlobalString("policy")
  	var policy *signature.Policy // This could be cached across calls, if we had an application context.
  	var err error
-+  var dir string
-+  if policyPath == "" {
-+    dir, err = filepath.Abs(filepath.Dir(os.Args[0]))
-+    policyPath = dir + "/../etc/default-policy.json"
-+  }
-+
- 	if policyPath == "" {
- 		policy, err = signature.DefaultPolicy(nil)
- 	} else {
++        var dir string
++        if policyPath == "" {
++              dir, err = filepath.Abs(filepath.Dir(os.Args[0]))
++              policyPath = dir + "/../etc/default-policy.json"
++        }
+ 	if c.GlobalBool("insecure-policy") {
+ 		policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}
+ 	} else if policyPath == "" {
-- 
GitLab


From add90948bc19e1e9397f4730da226bd0cd7a6766 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 28 Jun 2017 12:49:59 -0400
Subject: [PATCH 1328/1490] docker: 17.03.1-ce -> 17.03.2-ce

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

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index ffab4303c4a..d4e84f9f1e9 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -146,9 +146,9 @@ rec {
   };
 
   docker_17_03 = dockerGen rec {
-    version = "17.03.1-ce";
-    rev = "c6d412e"; # git commit
-    sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7";
+    version = "17.03.2-ce";
+    rev = "f5ec1e2"; # git commit
+    sha256 = "1y3rkzgg8vpjq61y473lnh0qyc6msl4ixw7ci2p56fyqrhkmhf96";
     runcRev = "54296cf40ad8143b62dbcaa1d90e520a2136ddfe";
     runcSha256 = "0ylymx7pi4jmvbqj94j2i8qspy8cpq0m91l6a0xiqlx43yx6qi2m";
     containerdRev = "4ab9917febca54791c5f071a9d1f404867857fcc";
-- 
GitLab


From 64ff2e271268d3bad6b8a64704d36b1ffb62c1e5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 28 Jun 2017 17:19:17 +0000
Subject: [PATCH 1329/1490] ocamlPackages.mtime: 0.8.3 -> 0.8.4, 1.1.0

---
 .../ocaml-modules/mtime/default.nix           | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index 5e18d1fd6e4..534bb4de48c 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -1,25 +1,36 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml
-, jsooSupport ? !(stdenv.lib.versionAtLeast ocaml.version "4.04")
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, js_of_ocaml
+, jsooSupport ? true
 }:
 
 with lib;
 
+let param =
+  if versionAtLeast ocaml.version "4.03"
+  then {
+    version = "1.1.0";
+    sha256 = "1qb4ljwirrc3g8brh97s76rjky2cpmy7zm87y7iqd6pxix52ydk3";
+  } else {
+    version = "0.8.4";
+    sha256 = "1adm8sc3lkjly99hyi5gqnxas748k7h62ljgn8x423nkn8gyp8dh";
+  };
+in
+
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-mtime-0.8.3";
+  name = "ocaml${ocaml.version}-mtime-${param.version}";
 
   src = fetchurl {
-    url = http://erratique.ch/software/mtime/releases/mtime-0.8.3.tbz;
-    sha256 = "1hfx4ny2dkw6jf3jppz0640dafl5xgn8r2si9kpwzhmibal8qrah";
+    url = "http://erratique.ch/software/mtime/releases/mtime-${param.version}.tbz";
+    inherit (param) sha256;
   };
 
   unpackCmd = "tar xjf $src";
 
-  buildInputs = [ ocaml findlib ocamlbuild opam ]
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg ]
   ++ stdenv.lib.optional jsooSupport js_of_ocaml;
 
-  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${boolToString jsooSupport}";
+  buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}";
 
-  installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+  inherit (topkg) installPhase;
 
   meta = {
     description = "Monotonic wall-clock time for OCaml";
-- 
GitLab


From 607650adacff4ff618e4f25dd3f3bd6324b54a03 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 28 Jun 2017 17:39:15 +0000
Subject: [PATCH 1330/1490] ocamlPackages.ptime: 0.8.2 -> 0.8.3

---
 pkgs/development/ocaml-modules/ptime/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix
index b8017134e52..bb4bbef516c 100644
--- a/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/pkgs/development/ocaml-modules/ptime/default.nix
@@ -1,28 +1,25 @@
-{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam}:
+{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam, js_of_ocaml }:
 
 buildOcaml rec {
-  version = "0.8.2";
+  version = "0.8.3";
   name = "ptime";
 
   src = fetchurl {
     url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
-    sha256 = "1lihkhzskzwxskiarh4mvf7gbz5nfv25vmazbfz81m344i32a5pj";
+    sha256 = "18jimskgnd9izg7kn6zk6sk35adgjm605dkv13plwslbb90kqr44";
   };
 
   unpackCmd = "tar -xf $curSrc";
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg opam js_of_ocaml ];
 
   propagatedBuildInputs = [ result ];
 
   buildPhase = ''
-    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml false
+    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml true
   '';
 
-  installPhase = ''
-    opam-installer --script --prefix=$out ptime.install | sh
-    ln -s $out/lib/ptime $out/lib/ocaml/${ocaml.version}/site-lib
-  '';
+  inherit (topkg) installPhase;
 
   meta = {
     homepage = http://erratique.ch/software/ptime;
-- 
GitLab


From 2014db3efcd2a50507494ae55eb02c96dc4f4ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Jun 2017 19:47:51 +0200
Subject: [PATCH 1331/1490] nixos xkb-layouts-exist: try to debug on Hydra

I hate having to do this.  We're unable to reproduce the problem locally.
---
 nixos/modules/services/x11/xserver.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 01e1659b30b..1f4fb05129d 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -651,6 +651,7 @@ in
     system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" {
       inherit (cfg) layout xkbDir;
     } ''
+      set -x
       sed -n -e ':i /^! \(layout\|variant\) *$/ {
         :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl
       }' "$xkbDir/rules/base.lst" | grep -qxF "$layout" && exec touch "$out"
-- 
GitLab


From 0bc3429e77e8a5ba1a29c2e9edcb984568d79fd0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 28 Jun 2017 15:56:27 +0200
Subject: [PATCH 1332/1490] lkl: 2017-03-24 -> 2017-06-27

Now based on Linux 4.11
---
 pkgs/applications/virtualization/lkl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index e40d054520f..d1bf5792a1b 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
 
 stdenv.mkDerivation rec {
-  name = "lkl-2017-03-24";
-  rev  = "a063e1631db5e2b9b04f184c5e6d185c1cd645cb";
+  name = "lkl-2017-06-27";
+  rev  = "0d91d102b046eec535a6d67df9829b80b24e9ce9";
 
   outputs = [ "dev" "lib" "out" ];
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     inherit rev;
     owner  = "lkl";
     repo   = "linux";
-    sha256 = "07dmira76i0ki577sra4fdl1wvzfzxzd75252lza0sc6jdzrrwvj";
+    sha256 = "1sc18fik2dm0hnsb5q4srvwbf6wgv27zlf3qa7x39g4vbj1jqgas";
   };
 
   # Fix a /usr/bin/env reference in here that breaks sandboxed builds
-- 
GitLab


From 179936d75c7b8aa34cdf40b49c959b0b156e5ee1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 13:34:21 -0500
Subject: [PATCH 1333/1490] mailman: Fix attempts to chmod g+s during
 installation

---
 pkgs/servers/mail/mailman/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix
index b18ab016c44..3c028b1ac17 100644
--- a/pkgs/servers/mail/mailman/default.nix
+++ b/pkgs/servers/mail/mailman/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   installTargets = "doinstall";         # Leave out the 'update' target that's implied by 'install'.
 
+  makeFlags = [ "DIRSETGID=:" ];
+
   meta = {
     homepage = "http://www.gnu.org/software/mailman/";
     description = "Free software for managing electronic mail discussion and e-newsletter lists";
-- 
GitLab


From 582c3edcfac7d2d5fb3bbcc96ce1aac092812940 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 28 Jun 2017 18:12:13 +0000
Subject: [PATCH 1334/1490] =?UTF-8?q?ocamlPackages.bap:=20mark=20as=20brok?=
 =?UTF-8?q?en=20on=20OCaml=20=E2=89=A5=204.03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/bap/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 25564a0a300..ea151d1e0e5 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -58,5 +58,6 @@ buildOcaml rec {
     homepage = https://github.com/BinaryAnalysisPlatform/bap/;
     maintainers = [ maintainers.maurer ];
     license = licenses.mit;
+    broken = versionAtLeast ocaml.version "4.03";
   };
 }
-- 
GitLab


From c8c673568c8ae5df78d472e14ff6bc0078666bc6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 28 Jun 2017 18:13:22 +0000
Subject: [PATCH 1335/1490] ocamlPackages.stringext: 1.4.0 -> 1.4.3

ocamlPackages.qcheck: 0.4.0.1 -> 0.6
---
 pkgs/development/ocaml-modules/qcheck/default.nix    | 12 ++++++------
 pkgs/development/ocaml-modules/stringext/default.nix |  6 +++---
 pkgs/top-level/ocaml-packages.nix                    |  4 +---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix
index 158c69ef11a..695a751c7a9 100644
--- a/pkgs/development/ocaml-modules/qcheck/default.nix
+++ b/pkgs/development/ocaml-modules/qcheck/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ounit }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
 
 stdenv.mkDerivation {
 
-  name = "ocaml-qcheck-0.4.0.1";
+  name = "ocaml${ocaml.version}-qcheck-0.6";
   src = fetchzip {
-    url = https://github.com/c-cube/qcheck/archive/0.4.0.1.tar.gz;
-    sha256 = "0j2jdrfz8rrslgjihnfgg8yy12860z2vvf7hqzjbmfmf03hz4pgv";
+    url = https://github.com/c-cube/qcheck/archive/0.6.tar.gz;
+    sha256 = "14rlg0jh4p12sd9xagppacsbfw0239anbq5r1aqhsqxlfmzbmi1p";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild oasis ounit ];
+  buildInputs = [ ocaml findlib ocamlbuild ounit ];
 
-  configureFlags = "--enable-tests --enable-ounit";
+  configureFlags = "--enable-tests";
 
   doCheck = true;
   checkPhase = "ocaml setup.ml -test";
diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix
index 9eb9ad514f7..c932bc3a46a 100644
--- a/pkgs/development/ocaml-modules/stringext/default.nix
+++ b/pkgs/development/ocaml-modules/stringext/default.nix
@@ -3,14 +3,14 @@
 , doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"
 }:
 
-let version = "1.4.0"; in
+let version = "1.4.3"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-stringext-${version}";
+  name = "ocaml${ocaml.version}-stringext-${version}";
 
   src = fetchzip {
     url = "https://github.com/rgrinberg/stringext/archive/v${version}.tar.gz";
-    sha256 = "1jp0x9rkss8a48z9wbnc4v5zvmnysin30345psl3xnxb2aqzwlii";
+    sha256 = "121k79vjazvsd254yg391fp4spsd1p32amccrahd0g6hjhf5w6sl";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ];
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1038e13dbcd..96adaff03dc 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -515,9 +515,7 @@ let
 
     pycaml = callPackage ../development/ocaml-modules/pycaml { };
 
-    qcheck = callPackage ../development/ocaml-modules/qcheck {
-      oasis = ocaml_oasis;
-    };
+    qcheck = callPackage ../development/ocaml-modules/qcheck { };
 
     qtest = callPackage ../development/ocaml-modules/qtest { };
 
-- 
GitLab


From 0a52cc1851f16eca0f8b9c7d08be4ea8fceb4b1c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 28 Jun 2017 20:07:49 +0200
Subject: [PATCH 1336/1490] eclipse-platform: 4.6.2 -> 4.7

---
 pkgs/applications/editors/eclipse/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index d6d8c7ed873..c6fe7c2a5ad 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -93,7 +93,7 @@ rec {
 
   ### Eclipse Platform
 
-  eclipse-platform = eclipse-platform-46; # always point to latest
+  eclipse-platform = eclipse-platform-47; # always point to latest
 
   eclipse-platform-46 = buildEclipse {
     name = "eclipse-platform-4.6.2";
@@ -110,6 +110,21 @@ rec {
     };
   };
 
+  eclipse-platform-47 = buildEclipse {
+    name = "eclipse-platform-4.7";
+    description = "Eclipse Platform Oxygen";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz;
+          sha256 = "0hrgijydxvd2zz1npv5qw8d79f48a6lsdw3qy1wqf7k59aqyg2fq";
+        };
+      "i686-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk.tar.gz;
+          sha256 = "00m89j26m8nj190q144wx8d88mldx1z6i797p8isg3rhbz3x5dbc";
+        };
+    };
+  };
+
   ### Eclipse Scala SDK
 
   eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest
-- 
GitLab


From 556a867186649021aba07ddbae5cc1087f2df7c8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 28 Jun 2017 20:08:36 +0200
Subject: [PATCH 1337/1490] eclipse-sdk: 4.6.2 -> 4.7

---
 pkgs/applications/editors/eclipse/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index c6fe7c2a5ad..e28278638e3 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -147,7 +147,7 @@ rec {
 
   ### Eclipse SDK
 
-  eclipse-sdk = eclipse-sdk-46; # always point to latest
+  eclipse-sdk = eclipse-sdk-47; # always point to latest
 
   eclipse-sdk-46 = buildEclipse {
     name = "eclipse-sdk-4.6.2";
@@ -164,6 +164,21 @@ rec {
     };
   };
 
+  eclipse-sdk-47 = buildEclipse {
+    name = "eclipse-sdk-4.7";
+    description = "Eclipse Oxygen Classic";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk-x86_64.tar.gz;
+          sha256 = "1nz0hl0gg4a8iffnaggbhdw0ra8a7wljlimvijbbybh0nhvfd9n3";
+        };
+      "i686-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk.tar.gz;
+          sha256 = "0dar69v7d7bkl18si45bccvil809a85ghb7k88m1q2cq1kd2r8z5";
+        };
+    };
+  };
+
   eclipse-sdk-37 = buildEclipse {
     name = "eclipse-sdk-3.7";
     description = "Eclipse Classic";
-- 
GitLab


From fa6e946383e5fb2d1cbe47617d34aff081a9c6f2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 28 Jun 2017 20:09:10 +0200
Subject: [PATCH 1338/1490] eclipse-plugin-jdt: 4.6.2 -> 4.7

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index f48378b1122..0f6d00ab40c 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -364,12 +364,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.6.2";
+    version = "4.7";
 
     src = fetchzip {
       stripRoot = false;
-      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/org.eclipse.jdt-4.6.2.zip";
-      sha256 = "1nnlrl05lh1hcsh14dlisnx0vwmj21agm4wia98rv0gl2gkp19n1";
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/org.eclipse.jdt-4.7.zip";
+      sha256 = "0y17shnlh90gg9226lraknvdnp2i71ck91dnxbbzvxl8b64v8v1p";
     };
 
     meta = with stdenv.lib; {
-- 
GitLab


From d339dc762c73564cfbd20ab6c9be803e9c12e1e0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 13:44:31 -0500
Subject: [PATCH 1339/1490] mailutils: Fix attempts to set unsupported
 ownership and perms

---
 pkgs/tools/networking/mailutils/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 0ae993db332..f83ea004db6 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
 
   patches = [ ./path-to-cat.patch ./no-gets.patch ./scm_c_string.patch ];
 
+  postPatch = ''
+    sed -i -e '/chown root:mail/d' \
+           -e 's/chmod [24]755/chmod 0755/' \
+      */Makefile{,.in,.am}
+  '';
+
   configureFlags = [
     "--with-gsasl"
     "--with-gssapi=${gss}"
-- 
GitLab


From ad825384232d68998a1d9d7d0b135575485665de Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Wed, 28 Jun 2017 20:33:58 +0200
Subject: [PATCH 1340/1490] ccl: create ccl symlink

Make it more intuitive for users to start ccl and avoid platform
dependent executable names.

https://github.com/NixOS/nixpkgs/issues/26934
---
 pkgs/development/compilers/ccl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 3e1784424e3..76caf12ffd3 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin"
     echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}"
     chmod a+x "$out"/bin/"${CCL_RUNTIME}"
+    ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 7492873014f64ab52bb945f8335364830530dc8b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 14:12:23 -0500
Subject: [PATCH 1341/1490] mcron: Fix attempt to set +s during install

---
 pkgs/tools/system/mcron/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix
index a90d6afdc61..5863504c704 100644
--- a/pkgs/tools/system/mcron/default.nix
+++ b/pkgs/tools/system/mcron/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
 
   patches = [ ./install-vixie-programs.patch ];
 
+  # don't attempt to chmod +s files in the nix store
+  postPatch = ''
+    substituteInPlace makefile.in --replace "rwxs" "rwx"
+  '';
+
   buildInputs = [ guile which ed ];
 
   doCheck = true;
-- 
GitLab


From 59bf263a593748bf5bb0510c5c638ef9c7c91045 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 14:14:57 -0500
Subject: [PATCH 1342/1490] netselect: Fix attempt to use unsupported
 permissions on files in store

---
 pkgs/tools/networking/netselect/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix
index f326059d9d7..6015ff9fbc7 100644
--- a/pkgs/tools/networking/netselect/default.nix
+++ b/pkgs/tools/networking/netselect/default.nix
@@ -8,10 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0y69z59vylj9x9nk5jqn6ihx7dkzg09gpv2w1q1rs8fmi4jr90gy";
   };
 
-  preBuild = "
+  preBuild = ''
     makeFlagsArray=(PREFIX=$out)
-    substituteInPlace Makefile --replace '-o root' '' --replace '-g root' ''
-  ";
+    substituteInPlace Makefile \
+      --replace "-o root" "" \
+      --replace "-g root" "" \
+      --replace "4755"    "0755"
+  '';
   
   meta = {
     homepage = http://alumnit.ca/~apenwarr/netselect/;
-- 
GitLab


From 15253a8dde07bfaaeb9980bdbd9b7cc65913b08e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 14:18:23 -0500
Subject: [PATCH 1343/1490] wcslib: fix attempts to use unsupported permissions
 during install

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

diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 6bbc7705671..64c5293fac7 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
     sha256 ="1s2nig327g4bimd9xshlk11ww09a7mrjmsbpdcd8smsmn2kl1glb";
   };
 
+  prePatch = ''
+    substituteInPlace GNUmakefile --replace 2775 0775
+    substituteInPlace C/GNUmakefile --replace 2775 0775
+  '';
+
   enableParallelBuilding = true;
 
   meta = {
-- 
GitLab


From 09d85c49c47c10f200ad377fa9940e613e016292 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 14:21:29 -0500
Subject: [PATCH 1344/1490] kbdlight: Fix installation permissions

Looks like NixOS creates a security wrapper for this already, FWIW.
---
 pkgs/os-specific/linux/kbdlight/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix
index 1bc07f357a8..44a63c9f1ec 100644
--- a/pkgs/os-specific/linux/kbdlight/default.nix
+++ b/pkgs/os-specific/linux/kbdlight/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace Makefile \
-      --replace /usr/local $out
+      --replace /usr/local $out \
+      --replace 4755 0755
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From 0d871bd108b4c10ddfa9a6ab845d0088c3bbde3d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 14:23:57 -0500
Subject: [PATCH 1345/1490] libutempter: Fixup unsupported permissions here as
 well

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

diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix
index 8481f857b2c..d54c82ae7f2 100644
--- a/pkgs/development/libraries/libutempter/default.nix
+++ b/pkgs/development/libraries/libutempter/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib ];
 
+  prePatch = ''
+    substituteInPlace Makefile --replace 2711 0711
+  '';
+
   installFlags = [
     "libdir=\${out}/lib"
     "libexecdir=\${out}/lib"
-- 
GitLab


From ed0ac2fece5baf028d44281f3f24a2815d47e6ac Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 14:26:24 -0500
Subject: [PATCH 1346/1490] leafnode: patch around setting special bits

---
 pkgs/servers/news/leafnode/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix
index a3579aa8309..9a8a0a80e52 100644
--- a/pkgs/servers/news/leafnode/default.nix
+++ b/pkgs/servers/news/leafnode/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--enable-runas-user=nobody";
 
+  prePatch = ''
+    substituteInPlace Makefile.in --replace 02770 0770
+  '';
+
   preConfigure = ''
     # configure uses id to check environment; we don't want this check
     sed -re 's/^ID[=].*/ID="echo whatever"/' -i configure
-- 
GitLab


From 707145a955ad0e771154cc45479038282c87dc41 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 14:29:17 -0500
Subject: [PATCH 1347/1490] firejail: don't try to set setuid bit

---
 pkgs/os-specific/linux/firejail/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index cf7fe8fc841..1bbe8dbb160 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   '';
 
   preBuild = ''
-    sed -e "s@/etc/@$out/etc/@g" -i Makefile
+    sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile
   '';
 
   meta = {
-- 
GitLab


From 8e5759e7d255f30253d7097c11da2f7e8e800fc7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 14:37:34 -0500
Subject: [PATCH 1348/1490] irods: Don't ask cmake to grant setuid permissions

---
 pkgs/tools/filesystems/irods/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 72118cada9f..db69fa64c84 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -40,6 +40,8 @@ in rec {
         -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib
         -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib
         "
+
+      substituteInPlace cmake/server.cmake --replace SETUID ""
     '';
 
     meta = common.meta // {
-- 
GitLab


From e82d1262123710b257038c5482a89f6a81ad6e81 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 28 Jun 2017 21:25:10 +0200
Subject: [PATCH 1349/1490] nixos/xserver: Don't use exec in xkb-layouts-exist

First of all, thanks to @pbogdan for getting this problem reproduced:

https://github.com/NixOS/nixpkgs/commit/2014db3efcd2a#commitcomment-22815396

Also thanks to @vcunat for bringing this to my attention:

https://github.com/NixOS/nixpkgs/commit/44c64fef16ed5#commitcomment-22813503

Although it is not entirely clear why Nix has killed the build prior to
finishing, it seems to be related to the process substition I was using.

So instead of using "exec touch", let's wrap this inside an if so we
don't exit too early.

Tested this against all sub-tests in nixos/tests/keymap.nix and also a
few configurations with wrong keyboard layout definitions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/x11/xserver.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 1f4fb05129d..01bab8fccad 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -651,10 +651,13 @@ in
     system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" {
       inherit (cfg) layout xkbDir;
     } ''
-      set -x
-      sed -n -e ':i /^! \(layout\|variant\) *$/ {
-        :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl
-      }' "$xkbDir/rules/base.lst" | grep -qxF "$layout" && exec touch "$out"
+      if sed -n -e ':i /^! \(layout\|variant\) *$/ {
+          :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl
+         }' "$xkbDir/rules/base.lst" | grep -qxF "$layout"
+      then
+        touch "$out"
+        exit 0
+      fi
 
       cat >&2 <<-EOF
 
-- 
GitLab


From bcaceabc3c5076b36ab451e6f23a9d9c1df940c1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 14:41:32 -0500
Subject: [PATCH 1350/1490] ddccontrol: Don't try to set special perms on
 ddcpci

---
 pkgs/tools/misc/ddccontrol/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix
index ddf9c38ec93..b3aca778cd9 100644
--- a/pkgs/tools/misc/ddccontrol/default.nix
+++ b/pkgs/tools/misc/ddccontrol/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation {
       oldPath+="{datadir}\/ddccontrol-db"
       sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac
       rm configure.ac.old
+
+      sed -e "s/chmod 4711/chmod 0711/" -i src/ddcpci/Makefile*
   '';
 
   meta = with stdenv.lib; {
-- 
GitLab


From fe2e3cea51d0f36b4a23026c3bc4a63f9f5cd94b Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Wed, 28 Jun 2017 21:42:59 +0200
Subject: [PATCH 1351/1490] gnome-control-center: add missing dependency on
 cracklib

---
 .../gnome-3/3.22/core/gnome-control-center/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
index 726f47d0cde..eac25b3e569 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
       gnome3.vino udev libcanberra_gtk3 libgudev
-      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ];
+      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker
+      cracklib ];
 
   preBuild = ''
     substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-- 
GitLab


From 338be9dbd4a6bfcc70244fb347f939091e1b75a7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 28 Jun 2017 22:18:08 +0200
Subject: [PATCH 1352/1490] Fresh SBCL is not compatible with not-fresh iolib

---
 .../lisp-modules/quicklisp-to-nix-overrides.nix        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index fc536adadc3..a760e0cb684 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -35,7 +35,7 @@ in
     };
   };
   hunchentoot = addNativeLibs [pkgs.openssl];
-  iolib = x: {
+  iolib = x: rec {
     propagatedBuildInputs = (x.propagatedBuildInputs or [])
      ++ (with pkgs; [libfixposix gcc])
      ++ (with qlnp; [
@@ -45,6 +45,14 @@ in
     testSystems = ["iolib" "iolib/syscalls" "iolib/multiplex" "iolib/streams"
       "iolib/zstreams" "iolib/sockets" "iolib/trivial-sockets"
       "iolib/pathnames" "iolib/os"];
+
+    version = "0.8.3";
+    src = pkgs.fetchFromGitHub {
+      owner = "sionescu";
+      repo = "iolib";
+      rev = "v${version}";
+      sha256 = "0pa86bf3jrysnmhasbc0lm6cid9xzril4jsg02g3gziav1xw5x2m";
+    };
   };
   cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
   clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
-- 
GitLab


From 8797e3edd28a917d6a62cf3f9a10d5a35a85ab0f Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 28 Jun 2017 21:15:16 +0000
Subject: [PATCH 1353/1490] certstrap: init at 1.0.1

---
 pkgs/tools/security/certstrap/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/security/certstrap/default.nix

diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix
new file mode 100644
index 00000000000..bf659f19e9b
--- /dev/null
+++ b/pkgs/tools/security/certstrap/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "certstrap-${version}";
+  version = "1.0.1";
+
+  goPackagePath = "github.com/square/certstrap";
+
+  src = fetchFromGitHub {
+    owner = "square";
+    repo = "certstrap";
+    rev = "v${version}";
+    sha256 = "0pw1g6nyb212ayic42rkm6i0cf4n2003f02qym6zp130m6aysb47";
+  };
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Tools to bootstrap CAs, certificate requests, and signed certificates";
+    platforms = platforms.all;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ volth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7939bca6940..d3436c1d18e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1388,6 +1388,8 @@ with pkgs;
 
   c14 = callPackage ../applications/networking/c14 { };
 
+  certstrap = callPackage ../tools/security/certstrap { };
+
   cfssl = callPackage ../tools/security/cfssl { };
 
   checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
-- 
GitLab


From a97c803b4b32d29343115b085bd0a62ca3764352 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 28 Jun 2017 15:27:14 -0500
Subject: [PATCH 1354/1490] mendeley: ignore errors attempting to install link
 handler on startup

It's not critical functionality and AFAICT only fails in environments
that wouldn't benefit from "successfully" installing it anyway.

Fixes #24709
Fixes #24821
---
 pkgs/applications/office/mendeley/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 7178a0930e7..c5ef0e8a277 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -110,8 +110,8 @@ stdenv.mkDerivation {
 
     wrapProgram $out/bin/mendeleydesktop \
       --add-flags "--unix-distro-build" \
-      ${stdenv.lib.optionalString autorunLinkHandler
-      ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop"''}
+      ${stdenv.lib.optionalString autorunLinkHandler # ignore errors installing the link handler
+      ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop ||:"''}
 
     # Remove bundled qt bits
     rm -rf $out/lib/qt
-- 
GitLab


From a11426c52376d0d6b82d24519a333a3c1f7dec71 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 18:38:34 -0400
Subject: [PATCH 1355/1490] ImageMagick: Don't use stdenv.cross

I'm guessing the salient aspect here is not cross compiling itself, but
just whether the host platform is MinGW, so I simplified the logic
accordingly
---
 pkgs/applications/graphics/ImageMagick/7.0.nix     | 7 ++++---
 pkgs/applications/graphics/ImageMagick/default.nix | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index bcad077b38c..5eaf488fff5 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -2,6 +2,7 @@
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
 , ApplicationServices
+, buildPlatform, hostPlatform
 }:
 
 let
@@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
       [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
         "--with-gslib"
       ]
-    ++ lib.optionals (stdenv.cross.libc or null == "msvcrt")
+    ++ lib.optionals hostPlatform.isMinGW
       [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM
     ;
 
@@ -57,13 +58,13 @@ stdenv.mkDerivation rec {
     [ zlib fontconfig freetype ghostscript
       libpng libtiff libxml2
     ]
-    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+    ++ lib.optionals (!hostPlatform.isMinGW)
       [ openexr librsvg openjpeg ]
     ++ lib.optional stdenv.isDarwin ApplicationServices;
 
   propagatedBuildInputs =
     [ bzip2 freetype libjpeg lcms2 ]
-    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+    ++ lib.optionals (!hostPlatform.isMinGW)
       [ libX11 libXext libXt libwebp ]
     ;
 
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 8f4d44932f5..39812b2cfc4 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -2,6 +2,7 @@
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
 , ApplicationServices
+, buildPlatform, hostPlatform
 }:
 
 let
@@ -18,7 +19,7 @@ let
   }
     # Freeze version on mingw so we don't need to port the patch too often.
     # FIXME: This version has multiple security vulnerabilities
-    // lib.optionalAttrs (stdenv.cross.libc or null == "msvcrt") {
+    // lib.optionalAttrs (hostPlatform.isMinGW) {
         version = "6.9.2-0";
         sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7";
         patches = [(fetchpatch {
@@ -59,7 +60,7 @@ stdenv.mkDerivation rec {
       [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
         "--with-gslib"
       ]
-    ++ lib.optionals (stdenv.cross.libc or null == "msvcrt")
+    ++ lib.optionals (hostPlatform.isMinGW)
       [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM
     ;
 
@@ -69,13 +70,13 @@ stdenv.mkDerivation rec {
     [ zlib fontconfig freetype ghostscript
       libpng libtiff libxml2
     ]
-    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+    ++ lib.optionals (!hostPlatform.isMinGW)
       [ openexr librsvg openjpeg ]
     ++ lib.optional stdenv.isDarwin ApplicationServices;
 
   propagatedBuildInputs =
     [ bzip2 freetype libjpeg lcms2 ]
-    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+    ++ lib.optionals (!hostPlatform.isMinGW)
       [ libX11 libXext libXt libwebp ]
     ;
 
-- 
GitLab


From c4443d70df83bc9591cdf892a3f2b7c7d98fffbb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 18:41:09 -0400
Subject: [PATCH 1356/1490] fbida: cc-wrapper can be relied on to export these
 env vars

---
 pkgs/applications/graphics/fbida/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index 5f0605bbf87..d06c3eb5ec1 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
     sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile
     '';
 
-  crossAttrs = {
-    makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP=" ];
-  };
-
   meta = with stdenv.lib; {
     description = "Image viewing and manipulation programs";
     homepage = https://www.kraxel.org/blog/linux/fbida/;
-- 
GitLab


From ca94de8c4c87f1cace032ccaa8e922e2db9405bb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 18:42:55 -0400
Subject: [PATCH 1357/1490] offrss: cc-wrapper can be relied on to export this
 env var

---
 pkgs/applications/networking/offrss/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix
index fd1406127ad..1cae91dbf86 100644
--- a/pkgs/applications/networking/offrss/default.nix
+++ b/pkgs/applications/networking/offrss/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation {
     preConfigure = ''
       sed 's/^PDF/#PDF/' -i Makefile
     '';
-    makeFlags = "CC=${stdenv.cross.config}-gcc";
   };
 
   buildInputs = [ curl libmrss podofo ]
-- 
GitLab


From ffa535a0cc321a502d49240c859f2a761f0455d9 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 18:45:40 -0400
Subject: [PATCH 1358/1490] fossil: Don't use stdenv.cross

---
 pkgs/applications/version-management/fossil/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 14a492f6cc2..69c763acd83 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     doCheck = false;
-    makeFlagsArray = [ "TCC=${stdenv.cross.config}-gcc" ];
+    makeFlags = [ "TCC=$CC" ];
   };
 
   meta = {
-- 
GitLab


From 9c163cebdd5924b223745ec59928f456cd4587fc Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 18:47:43 -0400
Subject: [PATCH 1359/1490] omxplayer: Don't use stdenv.cross

---
 pkgs/applications/video/omxplayer/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix
index 01a85f3d952..29345f7548d 100644
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/pkgs/applications/video/omxplayer/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, raspberrypifw, pcre, boost, freetype, zlib }:
+{ stdenv, fetchurl
+, raspberrypifw, pcre, boost, freetype, zlib
+, hostPlatform
+}:
 
 let
   ffmpeg = stdenv.mkDerivation rec {
@@ -46,10 +49,10 @@ let
     crossAttrs = {
       configurePlatforms = [];
       configureFlags = configureFlags ++ [
-        "--cross-prefix=${stdenv.cross.config}-"
+        "--cross-prefix=${stdenv.cc.prefix}"
         "--enable-cross-compile"
         "--target_os=linux"
-        "--arch=${stdenv.cross.arch}"
+        "--arch=${hostPlatform.arch}"
         ];
     };
 
-- 
GitLab


From deb8fae4c0b65f0b70642518a221db54058d2cac Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 18:58:21 -0400
Subject: [PATCH 1360/1490] make-initrd: Don't use stdenv.cross

---
 pkgs/build-support/kernel/make-initrd.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 092ab4586b3..70727f9b49d 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -12,7 +12,9 @@
 # `contents = {object = ...; symlink = /init;}' is a typical
 # argument.
 
-{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend }:
+{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend
+, hostPlatform
+}:
 
 let
   inputsFun = ubootName : [ perl cpio ]
@@ -22,9 +24,9 @@ in
 stdenv.mkDerivation {
   name = "initrd";
   builder = ./make-initrd.sh;
-  nativeBuildInputs = inputsFun stdenv.platform.uboot;
+  nativeBuildInputs = inputsFun hostPlatform.platform.uboot;
 
-  makeUInitrd = makeUInitrdFun stdenv.platform.uboot;
+  makeUInitrd = makeUInitrdFun hostPlatform.platform.uboot;
 
   # !!! should use XML.
   objects = map (x: x.object) contents;
@@ -36,9 +38,5 @@ stdenv.mkDerivation {
     map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents;
   pathsFromGraph = ./paths-from-graph.pl;
 
-  crossAttrs = {
-    nativeBuildInputs = inputsFun stdenv.cross.platform.uboot;
-    makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot;
-  };
   inherit compressor prepend;
 }
-- 
GitLab


From c3c5793ab29d3fe8b3c0faff2ad644cfe91618b9 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 19:06:36 -0400
Subject: [PATCH 1361/1490] guile: Don't use stdenv.cross

---
 pkgs/development/interpreters/guile/2.0.nix     | 6 ++++--
 pkgs/development/interpreters/guile/default.nix | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 04f31dda26a..5746300fca0 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -1,5 +1,7 @@
 { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }:
+, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
+, hostPlatform
+}:
 
 # Do either a coverage analysis build or a standard build.
 (if coverageAnalysis != null
@@ -84,7 +86,7 @@
   setupHook = ./setup-hook-2.0.sh;
 
   crossAttrs.preConfigure =
-    stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu")
+    stdenv.lib.optionalString (hostPlatform.isHurd)
        # On GNU, libgc depends on libpthread, but the cross linker doesn't
        # know where to find libpthread, which leads to erroneous test failures
        # in `configure', where `-pthread' and `-lpthread' aren't explicitly
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 8a2deeddff6..19217476b14 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,5 +1,7 @@
 { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }:
+, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
+, hostPlatform
+}:
 
 # Do either a coverage analysis build or a standard build.
 (if coverageAnalysis != null
@@ -80,7 +82,7 @@
   setupHook = ./setup-hook-2.2.sh;
 
   crossAttrs.preConfigure =
-    stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu")
+    stdenv.lib.optionalString (hostPlatform.isHurd)
        # On GNU, libgc depends on libpthread, but the cross linker doesn't
        # know where to find libpthread, which leads to erroneous test failures
        # in `configure', where `-pthread' and `-lpthread' aren't explicitly
-- 
GitLab


From 5d1e51a199917fa945cb59567597e354c6e4f56d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 19:11:17 -0400
Subject: [PATCH 1362/1490] lua 5: Don't use stdenv.cross, and use less make
 flags

cc-wrapper will define environment variables matching those now
---
 pkgs/development/interpreters/lua-5/5.2.nix | 12 ++++--------
 pkgs/development/interpreters/lua-5/5.3.nix | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index d14230c158e..3bd92186084 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, readline, compat ? false }:
+{ stdenv, fetchurl, readline, compat ? false
+, hostPlatform
+}:
 
 let
   dsoPatch = fetchurl {
@@ -55,21 +57,15 @@ stdenv.mkDerivation rec {
   '';
 
   crossAttrs = let
-    isMingw = stdenv.cross.libc == "msvcrt";
-    isDarwin = stdenv.cross.libc == "libSystem";
+    inherit (hostPlatform) isDarwin isMingw;
   in {
     configurePhase = ''
       makeFlagsArray=(
         INSTALL_TOP=$out
         INSTALL_MAN=$out/share/man/man1
-        CC=${stdenv.cross.config}-gcc
-        STRIP=:
-        RANLIB=${stdenv.cross.config}-ranlib
         V=${luaversion}
         R=${version}
         ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin ''
-        AR="${stdenv.cross.config}-ar rcu"
-        macosx
         ''}
       )
     '' + stdenv.lib.optionalString isMingw ''
diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
index a22e162b8e1..8290bd05c59 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, readline, compat ? false }:
+{ stdenv, fetchurl, readline, compat ? false
+, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "lua-${version}";
@@ -54,21 +56,15 @@ stdenv.mkDerivation rec {
   '';
 
   crossAttrs = let
-    isMingw = stdenv.cross.libc == "msvcrt";
-    isDarwin = stdenv.cross.libc == "libSystem";
+    inherit (hostPlatform) isDarwin isMingw;
   in {
     configurePhase = ''
       makeFlagsArray=(
         INSTALL_TOP=$out
         INSTALL_MAN=$out/share/man/man1
-        CC=${stdenv.cross.config}-gcc
-        STRIP=:
-        RANLIB=${stdenv.cross.config}-ranlib
         V=${luaversion}
         R=${version}
         ${if isMingw then "mingw" else stdenv.lib.optionalString isDarwin ''
-        AR="${stdenv.cross.config}-ar rcu"
-        macosx
         ''}
       )
     '' + stdenv.lib.optionalString isMingw ''
-- 
GitLab


From 80a857f8d7b797cfd661e2686c0f2e66d41255b5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 26 Jun 2017 19:14:45 -0400
Subject: [PATCH 1363/1490] SDL: Don't use stdenv.cross

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

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 8330dada4d3..eb470519b4e 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -4,6 +4,7 @@
 , x11Support ? true, libXext, libICE, libXrandr
 , pulseaudioSupport ? true, libpulseaudio
 , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
+, hostPlatform
 }:
 
 # OSS is no longer supported, for it's much crappier than ALSA and
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
     optional stdenv.isDarwin Cocoa;
 
   buildInputs = let
-    notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
+    notMingw = !hostPlatform.isMinGW;
   in optional notMingw audiofile
   ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ];
 
-- 
GitLab


From 67b5f39c7288073909302bc6ce2e7df094874c24 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 11:18:11 -0400
Subject: [PATCH 1364/1490] scummvm: Don't use stdenv.cross

---
 pkgs/games/scummvm/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 29ba75f9aa2..e965fc459ad 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa }:
+{ stdenv
+, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa
+, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "scummvm-1.9.0";
@@ -16,7 +19,7 @@ stdenv.mkDerivation rec {
     preConfigure = ''
       # Remove the --build flag set by the gcc cross wrapper setup
       # hook
-      export configureFlags="--host=${stdenv.cross.config}"
+      export configureFlags="--host=${hostPlatform.config}"
     '';
     postConfigure = ''
       # They use 'install -s', that calls the native strip instead of the cross
-- 
GitLab


From fcef0add76de4728b11cf9acba840a7e7d06abbb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 11:23:32 -0400
Subject: [PATCH 1365/1490] boost: Don't use stdenv.cross, and utilize new
 platform metadata

---
 pkgs/development/libraries/boost/generic.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 174e9fe4776..14d0c251c96 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
+, hostPlatform
 , toolset ? if stdenv.cc.isClang then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
 , enableSingleThreaded ? false
 , enableMultiThreaded ? true
-, enableShared ? !(stdenv.cross.libc or null == "msvcrt") # problems for now
+, enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now
 , enableStatic ? !enableShared
 , enablePIC ? false
 , enableExceptions ? false
@@ -76,11 +77,11 @@ let
     "--user-config=user-config.jam"
     "toolset=gcc-cross"
     "--without-python"
-  ] ++ optionals (stdenv.cross.libc == "msvcrt") [
+  ] ++ optionals (hostPlatform.libc == "msvcrt") [
     "target-os=windows"
     "threadapi=win32"
     "binary-format=pe"
-    "address-model=${if hasPrefix "x86_64-" stdenv.cross.config then "64" else "32"}"
+    "address-model=${toString hostPlatform.parsed.cpu.bits}"
     "architecture=x86"
   ];
   crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags);
@@ -110,8 +111,8 @@ let
       find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
         -exec sed '1i#line 1 "{}"' -i '{}' \;
     )
-  '' + optionalString (stdenv.cross.libc or null == "msvcrt") ''
-    ${stdenv.cross.config}-ranlib "$out/lib/"*.a
+  '' + optionalString (hostPlatform.libc == "msvcrt") ''
+    ${stdenv.cc.prefix}ranlib "$out/lib/"*.a
   '';
 
 in
@@ -177,7 +178,7 @@ stdenv.mkDerivation {
     buildPhase = builder crossB2Args;
     installPhase = installer crossB2Args;
     postFixup = fixup;
-  } // optionalAttrs (stdenv.cross.libc == "msvcrt") {
+  } // optionalAttrs (hostPlatform.libc == "msvcrt") {
     patches = fetchurl {
       url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/"
           + "boost-mingw.patch";
-- 
GitLab


From 38dbd4b1610362c67e6a17d0e103f459ff471002 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 11:34:23 -0400
Subject: [PATCH 1366/1490] ffmpeg: Don't use stdenv.cross

---
 .../libraries/ffmpeg-full/default.nix         | 26 ++++---------------
 pkgs/development/libraries/ffmpeg/generic.nix | 26 ++++---------------
 2 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 3f847bc752f..6246026e9ea 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm
+, hostPlatform
 /*
  *  Licensing options (yes some are listed twice, filters and such are not listed)
  */
@@ -428,30 +429,13 @@ stdenv.mkDerivation rec {
 
   /* Cross-compilation is untested, consider this an outline, more work
      needs to be done to portions of the build to get it to work correctly */
-  crossAttrs = let
-    os = ''
-      if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then
-        # Probably should look for mingw too
-        echo "cygwin"
-      elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then
-        echo "darwin"
-      elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then
-        echo "freebsd"
-      elif [ "${stdenv.cross.config}" = "*linux*" ] ; then
-        echo "linux"
-      elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then
-        echo "netbsd"
-      elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then
-        echo "openbsd"
-      fi
-    '';
-  in {
+  crossAttrs = {
     configurePlatforms = [];
     configureFlags = configureFlags ++ [
-      "--cross-prefix=${stdenv.cross.config}-"
+      "--cross-prefix=${stdenv.cc.prefix}"
       "--enable-cross-compile"
-      "--target_os=${os}"
-      "--arch=${stdenv.cross.arch}"
+      "--target_os=${hostPlatform.parsed.kernel.name}"
+      "--arch=${hostPlatform.arch}"
     ];
   };
 
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 762a4c9503f..a34b378552a 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -2,6 +2,7 @@
 , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
 , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
 , x264, x265, xvidcore, zlib, libopus
+, hostPlatform
 , openglSupport ? false, mesa ? null
 # Build options
 , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -169,30 +170,13 @@ stdenv.mkDerivation rec {
 
   /* Cross-compilation is untested, consider this an outline, more work
      needs to be done to portions of the build to get it to work correctly */
-  crossAttrs = let
-    os = ''
-      if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then
-        # Probably should look for mingw too
-        echo "cygwin"
-      elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then
-        echo "darwin"
-      elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then
-        echo "freebsd"
-      elif [ "${stdenv.cross.config}" = "*linux*" ] ; then
-        echo "linux"
-      elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then
-        echo "netbsd"
-      elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then
-        echo "openbsd"
-      fi
-    '';
-  in {
+  crossAttrs = {
     configurePlatforms = [];
     configureFlags = configureFlags ++ [
-      "--cross-prefix=${stdenv.cross.config}-"
+      "--cross-prefix=${stdenv.cc.prefix}"
       "--enable-cross-compile"
-      "--target_os=${os}"
-      "--arch=${stdenv.cross.arch}"
+      "--target_os=${hostPlatform.parsed.kernel}"
+      "--arch=${hostPlatform.arch}"
     ];
   };
 
-- 
GitLab


From 5c99b2f341572b025bf1c975e8604d55ecd9955d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 11:40:32 -0400
Subject: [PATCH 1367/1490] libvpx: Don't use stdenv.cross

---
 pkgs/development/libraries/libvpx/default.nix | 30 +++++++++----------
 pkgs/development/libraries/libvpx/git.nix     | 30 +++++++++----------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 09fc3a2a9da..4b50fe090e3 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchFromGitHub, perl, yasm
+{ stdenv, fetchFromGitHub, perl, yasm
+, hostPlatform
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
 , vp9DecoderSupport ? true # VP9 decoder
@@ -144,10 +145,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''moveToOutput bin "$bin" '';
 
-  crossAttrs = let
-    isCygwin = stdenv.cross.libc == "msvcrt";
-    isDarwin = stdenv.cross.libc == "libSystem";
-  in {
+  crossAttrs = {
     configurePlatforms = [];
     configureFlags = configureFlags ++ [
       #"--extra-cflags="
@@ -159,17 +157,17 @@ stdenv.mkDerivation rec {
       # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
       # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
       # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
-      "--force-target=${stdenv.cross.config}${(
-              if isDarwin then (
-                if      stdenv.cross.osxMinVersion == "10.10" then "14"
-                else if stdenv.cross.osxMinVersion == "10.9"  then "13"
-                else if stdenv.cross.osxMinVersion == "10.8"  then "12"
-                else if stdenv.cross.osxMinVersion == "10.7"  then "11"
-                else if stdenv.cross.osxMinVersion == "10.6"  then "10"
-                else if stdenv.cross.osxMinVersion == "10.5"  then "9"
-                else "8")
-              else "")}-gcc"
-      (if isCygwin then "--enable-static-msvcrt" else "")
+      "--force-target=${hostPlatform.config}${
+              if hostPlatform.isDarwin then
+                if      hostPlatform.osxMinVersion == "10.10" then "14"
+                else if hostPlatform.osxMinVersion == "10.9"  then "13"
+                else if hostPlatform.osxMinVersion == "10.8"  then "12"
+                else if hostPlatform.osxMinVersion == "10.7"  then "11"
+                else if hostPlatform.osxMinVersion == "10.6"  then "10"
+                else if hostPlatform.osxMinVersion == "10.5"  then "9"
+                else "8"
+              else ""}-gcc"
+      (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
     ];
   };
 
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index ceda1c26389..824449a347a 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchgit, perl, yasm
+{ stdenv, fetchgit, perl, yasm
+, hostPlatform
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
 , vp9DecoderSupport ? true # VP9 decoder
@@ -152,10 +153,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''moveToOutput bin "$bin" '';
 
-  crossAttrs = let
-    isCygwin = stdenv.cross.libc == "msvcrt";
-    isDarwin = stdenv.cross.libc == "libSystem";
-  in {
+  crossAttrs = {
     configurePlatforms = [];
     configureFlags = configureFlags ++ [
       #"--extra-cflags="
@@ -166,17 +164,17 @@ stdenv.mkDerivation rec {
       # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
       # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
       # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
-      "--force-target=${stdenv.cross.config}${(
-              if isDarwin then (
-                if      stdenv.cross.osxMinVersion == "10.10" then "14"
-                else if stdenv.cross.osxMinVersion == "10.9"  then "13"
-                else if stdenv.cross.osxMinVersion == "10.8"  then "12"
-                else if stdenv.cross.osxMinVersion == "10.7"  then "11"
-                else if stdenv.cross.osxMinVersion == "10.6"  then "10"
-                else if stdenv.cross.osxMinVersion == "10.5"  then "9"
-                else "8")
-              else "")}-gcc"
-      (if isCygwin then "--enable-static-msvcrt" else "")
+      "--force-target=${hostPlatform.config}${
+              if hostPlatform.isDarwin then
+                if      hostPlatform.osxMinVersion == "10.10" then "14"
+                else if hostPlatform.osxMinVersion == "10.9"  then "13"
+                else if hostPlatform.osxMinVersion == "10.8"  then "12"
+                else if hostPlatform.osxMinVersion == "10.7"  then "11"
+                else if hostPlatform.osxMinVersion == "10.6"  then "10"
+                else if hostPlatform.osxMinVersion == "10.5"  then "9"
+                else "8"
+              else ""}-gcc"
+      (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
     ];
   };
 
-- 
GitLab


From a40ceb2782a0f2554f854628a3bd5d8d941677d4 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 11:48:13 -0400
Subject: [PATCH 1368/1490] glew: Rely on cc-wrapper can to export these env
 vars

---
 pkgs/development/libraries/glew/1.10.nix    | 14 ++++++--------
 pkgs/development/libraries/glew/default.nix | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix
index 9d5ded5be15..8500a54f970 100644
--- a/pkgs/development/libraries/glew/1.10.nix
+++ b/pkgs/development/libraries/glew/1.10.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi
-, AGL ? null }:
+, buildPlatform, hostPlatform
+, AGL ? null
+}:
 
 with stdenv.lib;
 
@@ -36,13 +38,9 @@ stdenv.mkDerivation rec {
     cp -r README.txt LICENSE.txt doc $out/share/doc/glew
   '';
 
-  crossAttrs.makeFlags = [
-    "CC=${stdenv.cross.config}-gcc"
-    "LD=${stdenv.cross.config}-gcc"
-    "AR=${stdenv.cross.config}-ar"
-    "STRIP="
-  ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw"
-    ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin";
+  makeFlags = if hostPlatform == buildPlatform then null else [
+    "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel}"
+  ];
 
   meta = with stdenv.lib; {
     description = "An OpenGL extension loading library for C(++)";
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 02c87cf709a..f8df5d5baf0 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }:
+{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi
+, buildPlatform, hostPlatform
+}:
 
 with stdenv.lib;
 
@@ -37,13 +39,9 @@ stdenv.mkDerivation rec {
     rm $out/lib/*.a
   '';
 
-  crossAttrs.makeFlags = [
-    "CC=${stdenv.cross.config}-gcc"
-    "LD=${stdenv.cross.config}-gcc"
-    "AR=${stdenv.cross.config}-ar"
-    "STRIP="
-  ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw"
-    ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin";
+  makeFlags = if hostPlatform == buildPlatform then null else [
+    "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel}"
+  ];
 
   meta = with stdenv.lib; {
     description = "An OpenGL extension loading library for C(++)";
-- 
GitLab


From c23028bdadd3864e15bf25caa1785208db4ae773 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 11:54:21 -0400
Subject: [PATCH 1369/1490] cc-wrapper: Also export env var for windres, when
 it is present

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

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 0c624a1454a..ad6f6832298 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -71,7 +71,7 @@ let
 
     '' + stdenv.lib.optionalString (textFile == ./setup-hook.sh) ''
       cat << 'EOF' >> $out
-        for CMD in ar as nm objcopy ranlib strip strings size ld
+        for CMD in ar as nm objcopy ranlib strip strings size ld windres
         do
           # which is not part of stdenv, but compgen will do for now
           if
-- 
GitLab


From 60eff17b2799d6e5813a0899d506d455ad360f4b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 11:57:01 -0400
Subject: [PATCH 1370/1490] openssl: cc-wrapper can be relied on to export
 these env vars

---
 pkgs/development/libraries/openssl/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 8582c0a1833..b3ce2fdbbb0 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, buildPackages, perl
+, hostPlatform
 , withCryptodev ? false, cryptodevHeaders
-, enableSSL2 ? false }:
+, enableSSL2 ? false
+}:
 
 with stdenv.lib;
 
 let
 
-  opensslCrossSystem = stdenv.cross.openssl.system or
+  opensslCrossSystem = hostPlatform.openssl.system or
     (throw "openssl needs its platform name cross building");
 
   common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec {
@@ -23,8 +25,7 @@ let
       ++ optional (versionOlder version "1.1.0")
           (if stdenv.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch)
       ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
-      ++ optional
-           (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")))
+      ++ optional (versionOlder version "1.0.2" && hostPlatform.isDarwin)
            ./darwin-arch.patch;
 
     outputs = [ "bin" "dev" "out" "man" ];
@@ -89,10 +90,6 @@ let
       preConfigure=''
         # It's configure does not like --build or --host
         export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
-        # WINDRES and RANLIB need to be prefixed when cross compiling;
-        # the openssl configure script doesn't do that for us
-        export WINDRES=${stdenv.cross.config}-windres
-        export RANLIB=${stdenv.cross.config}-ranlib
       '';
       configureScript = "./Configure";
     };
-- 
GitLab


From aac32fe2d1677fdf82c8ef1560c048f16ddc5e47 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 12:02:31 -0400
Subject: [PATCH 1371/1490] vim: cc-wrapper can be relied on to export this env
 var

---
 pkgs/applications/editors/vim/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index b8fee7bd1e2..4eefb207fd7 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -36,9 +36,6 @@ stdenv.mkDerivation rec {
     "ac_cv_sizeof_int=4"
     "vim_cv_memmove_handles_overlap=yes"
     "vim_cv_memmove_handles_overlap=yes"
-
-    # TODO(@Ericson2314): wont' be needed soon.
-    "STRIP=${hostPlatform.config}-strip"
   ];
 
   postInstall = ''
-- 
GitLab


From f16ee76ca8b283a751f1fd4fc21de30243cc4640 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 13:59:42 -0400
Subject: [PATCH 1372/1490] qt 4.8: Don't use stdenv.cross

---
 .../libraries/qt-4.x/4.8/default.nix          | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index dee83306cc6..d3eaeed2f1e 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, fetchpatch, substituteAll
+, hostPlatform
 , libXrender, libXinerama, libXcursor, libXmu, libXv, libXext
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
 , libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
@@ -182,9 +183,7 @@ stdenv.mkDerivation rec {
       rm -rf $out/tests
     '';
 
-  crossAttrs = let
-    isMingw = stdenv.cross.libc == "msvcrt";
-  in {
+  crossAttrs = {
     # I've not tried any case other than i686-pc-mingw32.
     # -nomake tools:   it fails linking some asian language symbols
     # -no-svg: it fails to build on mingw64
@@ -194,14 +193,14 @@ stdenv.mkDerivation rec {
       -no-svg
       -make qmake -make libs -nomake tools
       -nomake demos -nomake examples -nomake docs
-    '' + optionalString isMingw " -xplatform win32-g++-4.6";
+    '' + optionalString hostPlatform.isMinGW " -xplatform win32-g++-4.6";
     patches = [];
     preConfigure = ''
-      sed -i -e 's/ g++/ ${stdenv.cross.config}-g++/' \
-        -e 's/ gcc/ ${stdenv.cross.config}-gcc/' \
-        -e 's/ ar/ ${stdenv.cross.config}-ar/' \
-        -e 's/ strip/ ${stdenv.cross.config}-strip/' \
-        -e 's/ windres/ ${stdenv.cross.config}-windres/' \
+      sed -i -e 's/ g++/ ${stdenv.cc.prefix}g++/' \
+        -e 's/ gcc/ ${stdenv.cc.prefix}gcc/' \
+        -e 's/ ar/ ${stdenv.cc.prefix}ar/' \
+        -e 's/ strip/ ${stdenv.cc.prefix}strip/' \
+        -e 's/ windres/ ${stdenv.cc.prefix}windres/' \
         mkspecs/win32-g++/qmake.conf
     '';
 
@@ -211,7 +210,7 @@ stdenv.mkDerivation rec {
     '';
     configurePlatforms = [];
     dontStrip = true;
-  } // optionalAttrs isMingw {
+  } // optionalAttrs hostPlatform.isMinGW {
     propagatedBuildInputs = [ ];
   };
 
-- 
GitLab


From 895c361480d489b620c96966ea653bb91db2628a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 14:11:08 -0400
Subject: [PATCH 1373/1490] WIP: optipng: cc-wrapper can be relied on to export
 these env vars

---
 pkgs/tools/graphics/optipng/default.nix | 28 ++++++++++++-------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix
index 0f7f7e2da2a..471e8ee8df4 100644
--- a/pkgs/tools/graphics/optipng/default.nix
+++ b/pkgs/tools/graphics/optipng/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libpng, static ? false }:
+{ stdenv, fetchurl, libpng, static ? false
+, buildPlatform, hostPlatform
+}:
 
 # This package comes with its own copy of zlib, libpng and pngxtern
 
@@ -15,20 +17,16 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpng ];
 
   LDFLAGS = optional static "-static";
-  configureFlags = "--with-system-zlib --with-system-libpng";
-
-  crossAttrs = {
-    CC="${stdenv.cross.config}-gcc";
-    LD="${stdenv.cross.config}-gcc";
-    AR="${stdenv.cross.config}-ar";
-    RANLIB="${stdenv.cross.config}-ranlib";
-    configurePhase = ''
-      ./configure -prefix="$out" --with-system-zlib --with-system-libpng
-    '';
-    postInstall = optional (stdenv.cross.libc == "msvcrt") ''
-      mv "$out"/bin/optipng "$out"/bin/optipng.exe
-    '';
-  };
+  configureFlags = [
+    "--with-system-zlib"
+    "--with-system-libpng"
+  ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
+    #"-prefix=$out"
+  ];
+
+  postInstall = if hostPlatform != buildPlatform && hostPlatform.isWindows then ''
+    mv "$out"/bin/optipng{,.exe}
+  '' else null;
 
   meta = with stdenv.lib; {
     homepage = http://optipng.sourceforge.net/;
-- 
GitLab


From da668f66c79bd031b7231e0bd1090ec2d48d87c4 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 14:23:59 -0400
Subject: [PATCH 1374/1490] zlib: cc-wrapper can be relied on to export this
 env var

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

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index e6468771cd4..40334f0b462 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   crossAttrs = {
     dontStrip = static;
     configurePlatforms = [];
-  } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
+  } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
     installFlags = [
       "BINARY_PATH=$(out)/bin"
       "INCLUDE_PATH=$(dev)/include"
@@ -68,14 +68,12 @@ stdenv.mkDerivation rec {
     ];
     makeFlags = [
       "-f" "win32/Makefile.gcc"
-      "PREFIX=${stdenv.cross.config}-"
+      "PREFIX=${stdenv.cc.prefix}"
     ] ++ stdenv.lib.optional (!static) "SHARED_MODE=1";
 
     # Non-typical naming confuses libtool which then refuses to use zlib's DLL
     # in some cases, e.g. when compiling libpng.
     postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll";
-  } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
-    makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ];
   };
 
   passthru.version = version;
-- 
GitLab


From e636454c4023aa557594c040284acae482f3bbac Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 28 Jun 2017 14:54:23 -0400
Subject: [PATCH 1375/1490] elpa-packages: 2017-06-28

---
 pkgs/applications/editors/emacs-modes/elpa-generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 7c0a7df2649..a7ac2325eac 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -821,10 +821,10 @@
     gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "gited";
-        version = "0.2.2";
+        version = "0.2.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gited-0.2.2.tar";
-          sha256 = "0ncxcrmiqhfzy18ssfkvbzmzwjbmr41ac1x7fpykrgihqiqglzfq";
+          url = "https://elpa.gnu.org/packages/gited-0.2.5.tar";
+          sha256 = "186cyay7nk2khnhilrwzjipb3syxl0s4n96b48j9plaba48azz11";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
-- 
GitLab


From b2e148faa048e31fddfd86705379549b544e8917 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 28 Jun 2017 18:35:13 -0400
Subject: [PATCH 1376/1490] melpa-stable-packages: 2017-06-28

Removals:
 - relative-line-numbers: removed from melpa
---
 .../emacs-modes/melpa-stable-generated.nix    | 321 +++++++++++++-----
 1 file changed, 234 insertions(+), 87 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 23b6ff049c1..1ed81a16f4a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -2764,6 +2764,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bifocal";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "riscy";
+          repo = "bifocal-mode";
+          rev = "19b54d1de8938448c88afd495d749fc7b6f6d281";
+          sha256 = "0mym4wqhfh58sr82z0w1z7kvj2p6s54b3j9davwpkj850j378x52";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
+          sha256 = "07qrxsby611l3cwsmw3d53h1n7cd1vg53j4vlc2isg56l2m4qks5";
+          name = "bifocal";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bifocal";
+          license = lib.licenses.free;
+        };
+      }) {};
     binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "binclock";
@@ -3436,22 +3457,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }:
+    calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "calfw";
-        version = "1.5";
+        version = "1.6";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "50e0e0261568f84f31fe7f87c9f863e21d30132f";
-          sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
+          rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
+          sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
-        packageRequires = [ google-maps ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/calfw";
           license = lib.licenses.free;
@@ -3838,12 +3859,12 @@
     cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cheat-sh";
-        version = "1.6";
+        version = "1.7";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "cheat-sh.el";
-          rev = "ee9a51f4b2a8b2f26008e00a84b6c344b6664e85";
-          sha256 = "1hzv0l6vc7zdj93cimmi9rz6i6xsg25yf4rcfqlhcax10bhnjsd0";
+          rev = "6409bb66241255cc9a0362f2acdcb0b34344f9f2";
+          sha256 = "1nmsja1s45fs93v2vbalfralixvzp88rgv47vf9p80i7x6w2149m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
@@ -4480,12 +4501,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.9.0pre4";
+        version = "3.9.0pre5";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "8fe54172fcb37e39e0f7e506e575bdd8c7171e8d";
-          sha256 = "0yv4avlzg4wbljdi5yfizmhpsf4m5p7gfc8mx5qx91mvjs71jmam";
+          rev = "372de3f8039f69b3a2edcf7120083ec4097f8bd3";
+          sha256 = "0yvh65b2fz4fpd2rx0q1c3gcidika5zx3nrm2rp4v6z69n2xgd13";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -6058,6 +6079,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dad-joke";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "dad-joke.el";
+          rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9";
+          sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
+          sha256 = "1cg8iaq79w5zx1s3dirdl7ymcp162mmsy5c4vly90v20yrijblad";
+          name = "dad-joke";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dad-joke";
+          license = lib.licenses.free;
+        };
+      }) {};
     dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dante";
@@ -9050,12 +9092,12 @@
     emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv";
-        version = "0.0.11";
+        version = "0.0.12";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "emms-player-mpv";
-          rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1";
-          sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb";
+          rev = "8c72282c98f9b10601e9a6901277040cda4b33aa";
+          sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
@@ -10431,12 +10473,12 @@
     evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-multiedit";
-        version = "1.3.3";
+        version = "1.3.8";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-multiedit";
-          rev = "5f263a9388dd3593b5acefe9f523c819bd3b338f";
-          sha256 = "0bsdyy5jw8adj26p85831n4f34d0sv4rrv9xlhjqkzx9gsr4h7d1";
+          rev = "c0cb6858399863e51935dae62c7c61ebc68f92eb";
+          sha256 = "010y4vxj7rr5kr4csbh72s60ndqzqxdrvgkyb65vxb5vskr1n1wm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -10617,22 +10659,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "2.0.3";
+        version = "2.0.8";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "c37aa6bcac8d78aa4115d5bc48e219a6ec8a8261";
-          sha256 = "0r6nna21w9hcwwhi6ij9lrmlhvgp6c67zl3pbc2iwwfw7bvca4xb";
+          rev = "dc62ac317fd29f018e9785c1b3b7dd7ad57b3938";
+          sha256 = "18j33smlajj7ynigfgm64z3kfys5idbxin2gd93civ2564n85r33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
-        packageRequires = [ cl-lib evil ];
+        packageRequires = [ cl-lib emacs evil ];
         meta = {
           homepage = "https://melpa.org/#/evil-snipe";
           license = lib.licenses.free;
@@ -10976,12 +11018,12 @@
     exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "1.1";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "1304aaf6d09323cb519c93167a75000a81e56247";
-          sha256 = "1bs32nq4y94dpq11326d6180maqrq17a8xjiy9rmc2gcizlv60dg";
+          rev = "1ab5ce73fd9aca5267416b998084e1a8e96122a7";
+          sha256 = "1ncnsqlnqikm1fv9ahv6jrmdp02czhcbmln346llwzwrpw31ly78";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -11925,6 +11967,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-julia";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "gdkrmr";
+          repo = "flycheck-julia";
+          rev = "67cdef277741f06c884525636a1cf1349efebbb4";
+          sha256 = "1qn2i643nbvb94vgdwc94himwh3z984cmg2fklvmlw8xyyxm7ny2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia";
+          sha256 = "0340bv0lifs8pajk7gh7rngdjg62vaggn5biyysng642dlg5fwqs";
+          name = "flycheck-julia";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-julia";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-kotlin";
@@ -15848,12 +15911,12 @@
     helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-backup";
-        version = "0.2.1";
+        version = "0.2.2";
         src = fetchFromGitHub {
           owner = "antham";
           repo = "helm-backup";
-          rev = "184026b9fe454aab8e7730106b4ca494fe307769";
-          sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
+          rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4";
+          sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -17924,6 +17987,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hugsql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "hugsql-ghosts";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "rkaercher";
+          repo = "hugsql-ghosts";
+          rev = "9d76acb41333c6377c7fe79e936008d10fe55420";
+          sha256 = "18wkqvmfr5v3mf3si0mwmwlc5gms82jzb5p3q3kpbmsayzg3xi8n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/969fd5e51bf93b5eff6919956c43c041a3b24d1e/recipes/hugsql-ghosts";
+          sha256 = "1v1iypis5iyimdr9796qpqw0qmhzijap0nbr0mhhyp4001kakkwz";
+          name = "hugsql-ghosts";
+        };
+        packageRequires = [ cider dash s ];
+        meta = {
+          homepage = "https://melpa.org/#/hugsql-ghosts";
+          license = lib.licenses.free;
+        };
+      }) {};
     hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hungry-delete";
@@ -19664,22 +19748,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }:
+    js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-comint";
-        version = "0.0.5";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "83978912073d554f3dc1185a8a46222317a90539";
-          sha256 = "0h0dfq2rrnlvdbm39l2wqmhzrps6z6ha65j26bnblwa03jr608l9";
+          rev = "2c19fafed953ea0972ff086614f86614f4d5dc13";
+          sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
-        packageRequires = [ nvm ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/js-comint";
           license = lib.licenses.free;
@@ -19832,6 +19916,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "json-navigator";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "json-navigator";
+          rev = "bc5634fc78d2e43ebd3c255350829877f3e4549c";
+          sha256 = "1j2lic9sn00j6pzq5qslv9m2z0rvsxkvz73z8swp7vcrsgz7qvqd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator";
+          sha256 = "0yfl31cg0mkgsbpgx00m9h2cxnhsavcf7zlspb0qr4g2zq6ya1wx";
+          name = "json-navigator";
+        };
+        packageRequires = [ emacs hierarchy ];
+        meta = {
+          homepage = "https://melpa.org/#/json-navigator";
+          license = lib.licenses.free;
+        };
+      }) {};
     json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "json-reformat";
@@ -20507,12 +20612,12 @@
     langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "langtool";
-        version = "1.5.1";
+        version = "1.6.0";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-langtool";
-          rev = "708799b021d4f4a765c312e33737e343d7e3c9bf";
-          sha256 = "1i8wbhc6i88plpq48ccka0avdj2x5rcxm81j93dmwp70ld0zws8p";
+          rev = "d976e4f0cadb2309b798540429558936f8f45889";
+          sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool";
@@ -21568,6 +21673,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-tbdiff";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-tbdiff";
+          rev = "2e7d54d290260e5834cca06863d78fc563d7373c";
+          sha256 = "07i0bnjkflgrrg246z996slzy28b2kjhhv13z0lcb72w46l935yr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
+          sha256 = "1wydmw4f1072k8frk8mi8aaky7dndinq8n7kn10q583bjlxgw80r";
+          name = "magit-tbdiff";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-tbdiff";
+          license = lib.licenses.free;
+        };
+      }) {};
     magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-topgit";
@@ -22124,12 +22250,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.7.13";
+        version = "0.8.1";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "a764751e89ad7bc1717e1d3c6e3b4364b11832d6";
-          sha256 = "06vd4lvybfa7kwyplavlbfwln6229g7s7pwbamjdvgz48xgiqym1";
+          rev = "77bc1c735b41acb6d43692dc3dcb60f323656cb5";
+          sha256 = "0b33bbmj7c62zn882max569wyybb9b04plb47sg55amv3nv8c8fr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22229,12 +22355,12 @@
     metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "metaweblog";
-        version = "0.1.1";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "metaweblog";
-          rev = "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb";
-          sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
+          rev = "2200eacde17edb66bbdde9c0b6b65481f40d498b";
+          sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
@@ -23488,12 +23614,12 @@
     neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neon-mode";
-        version = "1.1.0";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "neon-mode";
-          rev = "0822d6f42ef497e28e320a2fa924b8496bcac3df";
-          sha256 = "134i42cjyy33bdqprhk7ziy8iz8y3j6bw0vw5x8izmf9y1hnwyyh";
+          rev = "d0f8f003840081b57d4f372d9ff41c057422b1a1";
+          sha256 = "135b7h5vx0w7p6k2f5d8lcqxd5w199089wcar3kk0frb9vrk3xss";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@@ -24772,6 +24898,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-edit-latex";
+        version = "0.8.0";
+        src = fetchFromGitHub {
+          owner = "et2010";
+          repo = "org-edit-latex";
+          rev = "323d0b39d0284cef730b706dce7c0e58ed35530f";
+          sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
+          sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry";
+          name = "org-edit-latex";
+        };
+        packageRequires = [ auctex emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-edit-latex";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-elisp-help";
@@ -25243,6 +25390,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-static-blog";
+        version = "1.0.3";
+        src = fetchFromGitHub {
+          owner = "bastibe";
+          repo = "org-static-blog";
+          rev = "1a63f7eb0682a73126b534458b403ad0858273e8";
+          sha256 = "13k8rqh8r48hhdn8z580g379m6mgyc3jnh8a2kk0b22vlx6c3zap";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog";
+          sha256 = "07vh2k7cj0cs1yzfmrrz9p03x5mbfh0bigbl93s72h1wf7i05rkw";
+          name = "org-static-blog";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-static-blog";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-sync";
@@ -25498,12 +25666,12 @@
     org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
     melpaBuild {
         pname = "org2blog";
-        version = "0.9.3";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "9313bbce85cda3150a797d05c223ad6df79c275c";
-          sha256 = "1facdvgqwvv8pv96wx5hdh5x8q9yjwvxa07i69125fgw2sgrckk8";
+          rev = "e266ff4296661de520b73e6e18f201fb6378ba05";
+          sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -27195,12 +27363,12 @@
     plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plain-theme";
-        version = "5";
+        version = "7";
         src = fetchFromGitHub {
           owner = "yegortimoshenko";
           repo = "plain-theme";
-          rev = "1e484668cf272ab1883cb3c1ad9e1e8639de395d";
-          sha256 = "0qhr8mch5fvy5gck5prradlrnx84h6n8nvrcqk6ynqd1nh0pnnzd";
+          rev = "7c376f5bf9d653bf12e414176284736cbdd19108";
+          sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
@@ -29142,27 +29310,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "relative-line-numbers";
-        version = "0.3.3";
-        src = fetchFromGitHub {
-          owner = "Fanael";
-          repo = "relative-line-numbers";
-          rev = "38b5f9065aec008d9ad94fe5597338463aa1aa63";
-          sha256 = "00ixh7siyc8m7j6hfaxnnl3ynfhzkccpjfc89v8bp3z83m4v269w";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2901c841d221bd782dae9059a070ae8130e1ae/recipes/relative-line-numbers";
-          sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
-          name = "relative-line-numbers";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/relative-line-numbers";
-          license = lib.licenses.free;
-        };
-      }) {};
     relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "relax";
@@ -29355,12 +29502,12 @@
     resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "resize-window";
-        version = "0.5";
+        version = "0.6";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d";
-          sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7";
+          rev = "274a96e9754b606d85c9dd62cfed628ff4f736df";
+          sha256 = "0ax18sflqh9wg938gaz9m5r1i45761qym7r1lyqqxp24jzp4wa6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
@@ -29460,12 +29607,12 @@
     rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "rg";
-        version = "1.2.2";
+        version = "1.3.0";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "261ed756377285f0f8941b7a33866ef538465d74";
-          sha256 = "1fs367w5695v8kvwka1w9kykgpq3qp1209cxkxs096rlkxhbdvv5";
+          rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000";
+          sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -30844,12 +30991,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "0.0.5";
+        version = "0.0.6";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "3c3378afcbcf9a6fc30a1386dcc5465c51d312ad";
-          sha256 = "10i93w01272i1ydf6xjm4yx9xaja0yawd246av05aw8cq6nmai9j";
+          rev = "23d6d213a90e031dec8dbbaaeac5ddbe2cf050de";
+          sha256 = "0y96l6m7lnw2wsi5zbla88xgxmw3zksblnk36bgr153bik14waxf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -33779,12 +33926,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "1.7.5";
+        version = "1.7.6";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "b517e31c63239d20055462bd8a1b4f594d7351c3";
-          sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd";
+          rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
+          sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -33800,12 +33947,12 @@
     treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
     melpaBuild {
         pname = "treemacs-evil";
-        version = "1.7.5";
+        version = "1.7.6";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "b517e31c63239d20055462bd8a1b4f594d7351c3";
-          sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd";
+          rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
+          sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
-- 
GitLab


From 37f381a970962cdf26d25fae28fccb2b3165a02e Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 28 Jun 2017 18:36:52 -0400
Subject: [PATCH 1377/1490] melpa-packages: 2017-06-28

Removals:
 - relative-line-numbers: removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 968 +++++++++++-------
 1 file changed, 610 insertions(+), 358 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 629f094bbc1..55a6f691041 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -1342,12 +1342,12 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "20170515.927";
+        version = "20170627.1223";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "5a019ef01b29b46381b9263f0edb3eee72b60328";
-          sha256 = "1vgmkkdnns0xw2khyxprb1cv5pqjpx6vl71zdqrr41zb3kdfl628";
+          rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3";
+          sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1424,12 +1424,12 @@
     airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "airline-themes";
-        version = "20170501.705";
+        version = "20170623.958";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "8d2ed9f627c48c3a1c59be344624a3db619a8413";
-          sha256 = "1g6xbgzfw218nvm5lydrlshk6y243zrqq23smqvwjxibb7ljlvg3";
+          rev = "40cb03bbb56f09cfbfae07ff9ff97f3aaf8324be";
+          sha256 = "0pngxrs1zz0vr0m7sbrl11a5gnxsgbqk1kp9566nj79h02y81sd7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes";
@@ -1592,12 +1592,12 @@
     all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170623.357";
+        version = "20170627.538";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "2a0971cbadd39f6a89963351fe3fbcf9ca54566e";
-          sha256 = "08a676qnh7vab39zngrllmi0w54k97c9kmig5j3yxr7jki1g5c4y";
+          rev = "c491f5fa2267e7f8df180d7d125d9faeccbdea46";
+          sha256 = "080xdw3jz687dfpg2ad7j35axagbnlz7bbrxxj018gh9b5hy3i1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -4403,12 +4403,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170613.1031";
+        version = "20170626.1114";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "0ed117ef35a599f01fa1f9387c84c600faf26c78";
-          sha256 = "0bsfn8fvs7mzhi452zdl1wa0sk3m1xm5gb0k83xm37fa1sxl7nkf";
+          rev = "eeb0fbbc0115d87eeae4392d4d51f35346798bc0";
+          sha256 = "1v5wxb9ji4my99mgk5zivwjp57nz3ydjbsjmmanfjwdig98djak9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4819,12 +4819,12 @@
     beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "beginend";
-        version = "20170618.503";
+        version = "20170625.850";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "beginend";
-          rev = "0aa6033b55a2833e6f0810ee677c258f6c3e3fbf";
-          sha256 = "1qrqdvqhjaz0y0q4298vr85cm73526srirxz7zyalkl172jzwhgy";
+          rev = "c99bb0b2674ab704ba537fb46e5bf5d60376ea55";
+          sha256 = "1l20x3any7mrkm27ifl5xhq8xxacm2gq2cx9m644l8v4yji4835c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -5087,6 +5087,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bifocal";
+        version = "20170625.1258";
+        src = fetchFromGitHub {
+          owner = "riscy";
+          repo = "bifocal-mode";
+          rev = "e33923fd9970a6d46c9366264818abcb9856d6e4";
+          sha256 = "07vkqgz45di0ccjs21psywx74ji9k0bbgix15k0nnav66fzv1i47";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
+          sha256 = "07qrxsby611l3cwsmw3d53h1n7cd1vg53j4vlc2isg56l2m4qks5";
+          name = "bifocal";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/bifocal";
+          license = lib.licenses.free;
+        };
+      }) {};
     binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "binclock";
@@ -5612,7 +5633,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170512.1631";
+        version = "20170626.844";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
@@ -5842,12 +5863,12 @@
     browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "browse-at-remote";
-        version = "20170523.556";
+        version = "20170624.309";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "5de73fcaa54b638554fcbd59a693bc647ff9dee1";
-          sha256 = "04ad27g1jpy7gdbibyckwrv0y6psq9v66k0zd1hnll1aqlx1k70h";
+          rev = "e8b7533f6c37c4660e4ba97cd4856383f4e4ce32";
+          sha256 = "0650c2401qidw5zprgvnkvqbar9vs9yyj58njiwc394xf5xwzsmb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
@@ -6783,7 +6804,7 @@
         version = "20151009.845";
         src = fetchsvn {
           url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/";
-          rev = "16558";
+          rev = "16560";
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
@@ -7219,12 +7240,12 @@
     ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ceylon-mode";
-        version = "20170605.1450";
+        version = "20170626.1403";
         src = fetchFromGitHub {
           owner = "lucaswerkmeister";
           repo = "ceylon-mode";
-          rev = "00f790b3ed5ec48e2461e20a4d466ba45c634e13";
-          sha256 = "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640";
+          rev = "cd027d71a6cd29b94ba46919b4e067b86f267fc6";
+          sha256 = "06knyp3blini231ahlmkml3r0ypdajlz1dm41mwnzgcmg04x0s2h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
@@ -7244,8 +7265,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "e82320b90ebaae9e1f8f1b709455f465a773ed0f";
-          sha256 = "0awyj4rp9f2q7562xz52cm8zklsmlm5xyykw7x7n4d0qa72igm3j";
+          rev = "e33115d8a7516c49ea6ac7c570e9c63d34650672";
+          sha256 = "02j3sc1cj6pawsg2i9xw03xyzsa0irnxf0m0adcw2rylyz7bmwpa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7284,7 +7305,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12255";
+          rev = "12262";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7427,12 +7448,12 @@
     cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cheat-sh";
-        version = "20170616.259";
+        version = "20170627.422";
         src = fetchFromGitHub {
           owner = "davep";
           repo = "cheat-sh.el";
-          rev = "ee9a51f4b2a8b2f26008e00a84b6c344b6664e85";
-          sha256 = "1hzv0l6vc7zdj93cimmi9rz6i6xsg25yf4rcfqlhcax10bhnjsd0";
+          rev = "6409bb66241255cc9a0362f2acdcb0b34344f9f2";
+          sha256 = "1nmsja1s45fs93v2vbalfralixvzp88rgv47vf9p80i7x6w2149m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
@@ -8184,7 +8205,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "306094";
+          rev = "306591";
           sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
         };
         recipeFile = fetchurl {
@@ -8798,22 +8819,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
+    cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20170605.12";
+        version = "20170626.509";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "b7bb7bf36d442c377988a090fc648b03b50c8eff";
-          sha256 = "1iw0blpi38yykqqzl6s0w7z74ym0b56k1rxg5anyw0q9zkp0hb72";
+          rev = "0d05b0d4cf7252a381a28bd19577fb0d4ce6067b";
+          sha256 = "1gb5zjjjwsiz3lrm004qdki0ag8s5isczp1af2mgdgmc2626kqpd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
-        packageRequires = [ cl-lib emacs levenshtein seq ];
+        packageRequires = [ cl-lib emacs levenshtein s seq ];
         meta = {
           homepage = "https://melpa.org/#/cmake-ide";
           license = lib.licenses.free;
@@ -8826,8 +8847,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "4c7caf15e4feef244f7e1772c1c932cc790e2cab";
-          sha256 = "1bizy68m7ggsbd98dm0c4cchr8r9h3lh3jfvcwcbpvmrlx0w4clm";
+          rev = "e40e8f5c4216ac1e176342887d1af95965528344";
+          sha256 = "0l45qjyq8x64l96mikrpnbnw1919a8l8lrs40lzca35b429sbyqq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9322,12 +9343,12 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20170604.1611";
+        version = "20170626.1417";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "21b9b9ae14f2f0084497de00e5a0a00919b87c88";
-          sha256 = "0v69lzqknk8qr7digda9vwri7pkhr5600lb39xzlml15m693acin";
+          rev = "ffcec9177c8b4393f036acb5ca51b33b53916ea8";
+          sha256 = "0w59yfg7chx6srxpxsnwz7qrgyy35pdswv44j6lbh33hylxmclrh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -10032,8 +10053,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "843b7a63f621bb441274849d58671870adf1a5ce";
-          sha256 = "065fy0hy8mqsqfp06yfxavg8dqkrshacn46famar59ajy9610339";
+          rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61";
+          sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10894,12 +10915,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170622.1103";
+        version = "20170628.1034";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "f0426613062ba8305ebac41672d853a95cd9bbca";
-          sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8";
+          rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74";
+          sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11377,10 +11398,10 @@
     crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }:
     melpaBuild {
         pname = "crosshairs";
-        version = "20170221.1608";
+        version = "20170626.1548";
         src = fetchurl {
-          url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=39";
-          sha256 = "1wjj88zv37ak9zd12d7sy7j261x5y17wxmw5jrzk56shkpdvcbq0";
+          url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=40";
+          sha256 = "1dcynm83a3ixdccw3cqy533d9xwzswyi67cydaqmv35q88dg2nqw";
           name = "crosshairs.el";
         };
         recipeFile = fetchurl {
@@ -11397,12 +11418,12 @@
     crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "crux";
-        version = "20170510.2148";
+        version = "20170626.632";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "3b377b4fdd23df35f72bcb1021800d41fdccf863";
-          sha256 = "13z0hbkhzrsml30kp3maipc87qciilg99vy8w9lc0da5fv64i7ya";
+          rev = "e805ab780a4a1ce22a4436bde09b95e97d150e51";
+          sha256 = "007mhf60w8385ki2bqhsfjhhc4zq8k21ivgzpw15z83y641nyjp5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -11960,8 +11981,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "9db5c060c2f8c5e38b9865b8496c6057bba3044f";
-          sha256 = "0qwjb3jqgnrk515l7931drp8agjc7l8bsrik6dzd5zik5zg7448i";
+          rev = "20256403e4d81b7eea1165bf78b8faf8502e8204";
+          sha256 = "1njxnzss34w6wary9icj7vsazhmc9bz3ix1qf3bjacbi1n5q3k2c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12037,6 +12058,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dad-joke";
+        version = "20170626.252";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "dad-joke.el";
+          rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9";
+          sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
+          sha256 = "1cg8iaq79w5zx1s3dirdl7ymcp162mmsy5c4vly90v20yrijblad";
+          name = "dad-joke";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dad-joke";
+          license = lib.licenses.free;
+        };
+      }) {};
     dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dakrone-light-theme";
@@ -12082,12 +12124,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20170620.439";
+        version = "20170628.811";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "6973f81ae5b97710b617754e7080027e0931eea6";
-          sha256 = "1b62ibhcjbfdblr5f6sl5k6vn5hgz7ydipd8qlwslyyiqfypj17n";
+          rev = "7491ab2dfe5d0200f32cb3100671ea4db419dffe";
+          sha256 = "1bnhybals3b6bfngsqyksdp8n3kdar9ihffc5ppc77rvvjcl7p3w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -13689,10 +13731,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170530.1023";
+        version = "20170623.1621";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "121i39l4zaw3vhsxbh6r0b088982y3gvm0skf5b8wqldp4nsy55m";
+          sha256 = "14lkdkk6z2zx0rvz8vnhz9a7i87irm1a5wc3q39wmf8q5vh32pkc";
           name = "dired+.el";
         };
         recipeFile = fetchurl {
@@ -15236,7 +15278,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1799660";
+          rev = "1800204";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15337,12 +15379,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170613.1206";
+        version = "20170627.1309";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "aa44169d1d343010e56af0f17bf5448d0dbd2c8f";
-          sha256 = "1gz1n1nmb0hbcw0wcm5l87zpi3wr14aqhdi66kqcahqzrk8xz86d";
+          rev = "0328d922da4b1bbbb8f41848585c920608f6e9d3";
+          sha256 = "1l3s42y90d2canslkjvfs4n5zlpdxp0h4b1yrip9825gh2k4fan7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -16725,8 +16767,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "5b623bc5fa394389be7b0c00fd0b32e8e6b024c3";
-          sha256 = "0wisl97gpp9a2mbs34v4mas2q3hkry3zqxmlbll7l3h7r950wyqf";
+          rev = "f7bb3855b2393f667f597d30775749faa5038cfc";
+          sha256 = "0i89fmn8k3p3qciqq2vhbl86mn9s9l0hinn6kgs637v0fanyahsd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -17739,12 +17781,12 @@
     elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elquery";
-        version = "20170527.1930";
+        version = "20170624.1635";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "elquery";
-          rev = "d4309cfebb275495f071fc3449261bf6b23b0afe";
-          sha256 = "12qv4fg9dbgl6c05r501va9dcw16ml0yxkmvs32cr7wfffhxjy4w";
+          rev = "a5f7f3545330280991dd6334f4ce4f72aaa44145";
+          sha256 = "0yf29d1akj1ays5rqcmgmvyfm4gx7j6yibd12x72wpf5mygv1fxi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery";
@@ -18388,12 +18430,12 @@
     emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv";
-        version = "20161204.633";
+        version = "20170628.303";
         src = fetchFromGitHub {
           owner = "dochang";
           repo = "emms-player-mpv";
-          rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1";
-          sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb";
+          rev = "8c72282c98f9b10601e9a6901277040cda4b33aa";
+          sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv";
@@ -18799,12 +18841,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170618.333";
+        version = "20170625.617";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "8c7f659a170a2af248f912e56ec8ac25453fc867";
-          sha256 = "0yzdvqmsrssk56czsccakw0qj7xjmck8npmlmf9zy1389aw0g6ji";
+          rev = "e70a39d6e079dc1f818ad49d39c328fd3d9df1d9";
+          sha256 = "08qm2vbdimbmwhz4zdhc2kypkk8c0vhw8ihl5z8l9yfq4nw2wrc7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19440,8 +19482,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "f52748254f17ba42e344798e8c787a1e3361fa33";
-          sha256 = "1jxnzhclsdbszpams4nbz23f3sjv4i966maadrb6x929jab85fm3";
+          rev = "e629ff20dce103b4c38ee3a654c9b4a83867d41a";
+          sha256 = "1x34b7f4xkpa6w5gllvz7cmlnvvyy474gscbxvypszdf4ynxpcv1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -20397,12 +20439,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170623.34";
+        version = "20170624.1221";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "d35f3a225feb27002b2aa207e955ca7b305b9ca8";
-          sha256 = "07y3rhxcxrmhcjz2pdcx4wlb1q5j95jhkimcj91gw30jvqn89yq5";
+          rev = "cecbcfbdda16653e3b5ddc7de2eab25537ec154b";
+          sha256 = "0s6g822m19dq557ax42vwvgd017qff8hdajdjb03bfp2gd2zwb66";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20607,12 +20649,12 @@
     evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-ediff";
-        version = "20170213.539";
+        version = "20170623.707";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil-ediff";
-          rev = "4f3b9652e5df58ccc454d970df558f921958894d";
-          sha256 = "1nc7xq86v5ns3d47ifwnfm7x7x3qxb18rjqx37mqvga91nz2i1k3";
+          rev = "862310e244d406751cdc7eae8e8c0d88414a48c7";
+          sha256 = "0088xgvzsy3rmdkw6r90vnxgsxr9mmqkwaw18m9bm4fivday75b0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-ediff";
@@ -21048,12 +21090,12 @@
     evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-multiedit";
-        version = "20170515.337";
+        version = "20170623.1135";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-multiedit";
-          rev = "8d146312565949850328e4ef365e1f5d71216281";
-          sha256 = "1xw5r3mwyjfbpgdvnm1pv5dfg56qbzvmwhv929x93sjs0j4ybwml";
+          rev = "e135fd8662406807bc0d9d0f2688e7dbe89b98c8";
+          sha256 = "1dw3mf3dckjhnzvwj7jcwlgzkh592njvcg2xbs2wv1456rnnqaz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -21297,22 +21339,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-snipe";
-        version = "20170405.1644";
+        version = "20170623.1221";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "c23864f13689c6bb80974fd483062074cfa38637";
-          sha256 = "05lsb6xl74pxzn59af39mgg9as28kr17mk5yajwsyqfhj8bl1bfq";
+          rev = "dc62ac317fd29f018e9785c1b3b7dd7ad57b3938";
+          sha256 = "18j33smlajj7ynigfgm64z3kfys5idbxin2gd93civ2564n85r33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
-        packageRequires = [ cl-lib evil ];
+        packageRequires = [ cl-lib emacs evil ];
         meta = {
           homepage = "https://melpa.org/#/evil-snipe";
           license = lib.licenses.free;
@@ -21845,12 +21887,12 @@
     exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20170623.446";
+        version = "20170628.732";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "d94d4353d4264f006c8c45dd70be4f699640243f";
-          sha256 = "0dfsaibb1h9i1m0ckwfsf0xw6mzfzw4h7mwzjql8nslfsq5q7iys";
+          rev = "3b9367779653635cf5e0ab1554b9709b109859ed";
+          sha256 = "0802az9ywfjmainj1is335ni1dm8hfrj3rabhmhwjsa9h0crh5f5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -23364,12 +23406,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170601.608";
+        version = "20170626.1707";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "db3a745edb6b2678286e4d2bccebbb8d388c1a9e";
-          sha256 = "057yy3nmvlsczzq4h72a67qi4qbjl5ysv3vz4iw2nr1772a1y9ja";
+          rev = "4d9e16c03e935e926b61cf8446e43423cd93f577";
+          sha256 = "02b6cmrkacr7r34n1s9facdf0dvbv2084wn59xh4hbafpk9zcvhi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23508,6 +23550,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-clang-analyzer";
+        version = "20170623.446";
+        src = fetchFromGitHub {
+          owner = "alexmurray";
+          repo = "flycheck-clang-analyzer";
+          rev = "4c7d24a6a20ef528ee4ac28e5f783af6732b639a";
+          sha256 = "0ncp9jwxf1lqxzpxz6ivn4qhg6bn318ykmfrw4jp1iz73qxx0kh8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer";
+          sha256 = "0wby4vilvcmmncr6l6abh3v4wznx9m0zbk30vllj8bq98awfcy3a";
+          name = "flycheck-clang-analyzer";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-clang-analyzer";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-clang-tidy";
@@ -24054,6 +24117,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-julia";
+        version = "20170627.1310";
+        src = fetchFromGitHub {
+          owner = "gdkrmr";
+          repo = "flycheck-julia";
+          rev = "3aa2c26ed59310643a2f431e522dfc3c5daac085";
+          sha256 = "1nvqnwj94qya5s7zxxiwj20k49vmnhaiam72sfiannnpxawkj1q8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia";
+          sha256 = "0340bv0lifs8pajk7gh7rngdjg62vaggn5biyysng642dlg5fwqs";
+          name = "flycheck-julia";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-julia";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-kotlin";
@@ -26271,11 +26355,11 @@
     fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fuel";
-        version = "20170601.1205";
+        version = "20170627.1447";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "c53895e03d76de257a92f4f91e4787fc1ca0901e";
-          sha256 = "1x21d23543czdrz8pgfz0wc418lm7gns4gz1gbpl6b02l9kqz750";
+          rev = "7a9817aeb69f503cb8433510db59a2f110cd7f43";
+          sha256 = "0y755v2bv9lq9sban6in49d6kz7cgz3hyg4mpns53ibiqc0jf0sy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26396,12 +26480,12 @@
     futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "futhark-mode";
-        version = "20170622.701";
+        version = "20170623.756";
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "5286c51bbc8e050157f2ab589d9dad45467db57b";
-          sha256 = "1ka3z60iqshr1hk7znvjw7kw016q36ixaqqnr7jdjv5z37p7ngqy";
+          rev = "9e2a79856fd07fdad91113c9eb10566193b74586";
+          sha256 = "0a395l9kvx1flyzfp2npsz4izww4kqkj3sby3fv5knrhd4dz5jdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26877,8 +26961,8 @@
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "gh.el";
-          rev = "6efe3db1acb841c3366878baefc576caa2eb5e09";
-          sha256 = "0nchfzlnhzns1d6362yv5qa469qmgcvr15nx8ygcpw8ncf4pqjpw";
+          rev = "76255942ccc84d5cf918a2b6411a8ac98a7c8585";
+          sha256 = "09b09zqawll6lbrhl352x7g62s4spq97rd8x32shn9m01w6paz9r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
@@ -27255,8 +27339,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "7987db94c0041f68664d5ed91ce241c31fd8d1d1";
-          sha256 = "0bwgxhzd81nh69dbhswdq70y152ikwsxlh23d3ng36kix8s6fgsg";
+          rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53";
+          sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27528,8 +27612,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "0be857ef001adb9b58770bd4e70d3103d2557277";
-          sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz";
+          rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401";
+          sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode";
@@ -27566,12 +27650,12 @@
     gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gitconfig-mode";
-        version = "20160710.1913";
+        version = "20170627.854";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "0be857ef001adb9b58770bd4e70d3103d2557277";
-          sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz";
+          rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401";
+          sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode";
@@ -27668,6 +27752,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    github-modern-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "github-modern-theme";
+        version = "20170624.2230";
+        src = fetchFromGitHub {
+          owner = "philiparvidsson";
+          repo = "GitHub-Modern-Theme-For-Emacs";
+          rev = "4bdcaf765d87995be99e15775fe313fe98c3ee57";
+          sha256 = "1lkbx06dgwc19h9bxxwvqqwwdpy0dm8djazvzbsxw0x200cx2j2m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5506d93bd8cf59cd281091b377c1bb9a4243666/recipes/github-modern-theme";
+          sha256 = "1falal6cffiih3q8q9xdyv7bkzw43p56d8ln13g9ad1jz319b3fi";
+          name = "github-modern-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/github-modern-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-notifier";
@@ -27734,12 +27839,12 @@
     github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-theme";
-        version = "20170620.2100";
+        version = "20170624.2223";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
           repo = "emacs-github-theme";
-          rev = "849b0e8939b1ee5a693e268f07ea3d732784c5f7";
-          sha256 = "0zbaxwgcnb4mgspqilb8cqls3yqvs1vmvg8lhg33vh8d5wjhfz8y";
+          rev = "99dd601d7f80893d42531510204f8115ed27f32b";
+          sha256 = "03gnwg482m8mhhfdi7jlinyjwwv4l3jf8s84spkl4jl4d97brk04";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
@@ -27759,8 +27864,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "git-modes";
-          rev = "0be857ef001adb9b58770bd4e70d3103d2557277";
-          sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz";
+          rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401";
+          sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode";
@@ -28215,12 +28320,12 @@
     go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-autocomplete";
-        version = "20150903.1940";
+        version = "20170626.323";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "843b7a63f621bb441274849d58671870adf1a5ce";
-          sha256 = "065fy0hy8mqsqfp06yfxavg8dqkrshacn46famar59ajy9610339";
+          rev = "beae6bdcc6fc300059038961b7a3e977e0fb7c61";
+          sha256 = "0fhs17v2x24nhs0kd2yjzr56jni2767yrjxims6phsaxs9m5aih2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -29036,8 +29141,8 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "aeb6edb322c30b8fb484caad0a37404b58996c84";
-          sha256 = "1ks360lfaaka9rhpqmpnzmilys01ikq6k2v9vgldlli5mlm6sbhn";
+          rev = "af03c6dfde43f6f6d39a1363267d591cf76aab66";
+          sha256 = "1adgg08bsi8p03a6rpc1a23dxvrikc37zcljrdyc4j2z8ci839x4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29162,8 +29267,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "a42584b9f86bf1970ed63b68bc95dc16884d0268";
-          sha256 = "06kxwac17rhfa9siw712dlra40dpd5ivc4qnnim44i48cr771a8v";
+          rev = "525f899f69623828d75f0e744250316f27ed02a6";
+          sha256 = "01711l9g64d6sxhappn8cpxl315cprc3a5dnbkgm0vsaas6kl4xa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29275,12 +29380,12 @@
     graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "graphql-mode";
-        version = "20170503.537";
+        version = "20170625.652";
         src = fetchFromGitHub {
           owner = "davazp";
           repo = "graphql-mode";
-          rev = "2326c1fb185c89b05ad617bc71e1171d97d32ebd";
-          sha256 = "1lk5916sbqy6b007q9pjsq8ixanidalgcwcfxiq9cdapbxf4zxnq";
+          rev = "3c25bf5cbd5ba4c60dca9c96286412eb765de7c9";
+          sha256 = "09y7w6nipg1f59xrdpzmjiynyvjzkyhkmrpc5mbvz1lavkplh6rd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
@@ -29543,12 +29648,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20170615.513";
+        version = "20170628.1209";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "a42584b9f86bf1970ed63b68bc95dc16884d0268";
-          sha256 = "06kxwac17rhfa9siw712dlra40dpd5ivc4qnnim44i48cr771a8v";
+          rev = "525f899f69623828d75f0e744250316f27ed02a6";
+          sha256 = "01711l9g64d6sxhappn8cpxl315cprc3a5dnbkgm0vsaas6kl4xa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29606,12 +29711,12 @@
     gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruvbox-theme";
-        version = "20170426.150";
+        version = "20170627.215";
         src = fetchFromGitHub {
           owner = "Greduan";
           repo = "emacs-theme-gruvbox";
-          rev = "693dcf13ee929c1a3e6e5ac54f6fb5c7ec31f249";
-          sha256 = "0b6ppxq9yiwhn22f7bbq5l552650lajapqq6j73rixya74a37lzi";
+          rev = "1e41219fce47a8b5201de98f954e7040b4eea980";
+          sha256 = "0yaw60pny5q63ljn4pwx316rix7385rycvyiakcn7zfd00nwnvdh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -29753,12 +29858,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170619.1045";
+        version = "20170628.747";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "b2c32f398aade6c83300c20b6fde9b6e8a20c7b1";
-          sha256 = "0563mzd54b4qg9icy1d8hksw9lsfajkp18198m84v09cl2zdxvqn";
+          rev = "f4b0d8d83bad30b99a919639b387189350c6fc62";
+          sha256 = "0cif4d4n0l5apfksg67zsavh6wrv2pcpq2r0m8zjfg48hv6qmsad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30023,22 +30128,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+    haml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haml-mode";
-        version = "20170208.28";
+        version = "20170624.2148";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "haml-mode";
-          rev = "e232abdb908d92a1a346ee1a7671d4a3121310c5";
-          sha256 = "1qqwh28rf94pfcvazs0fl4yjz430aw6sadf07i4r408lq6r089dx";
+          rev = "c7c96a269f9b1a0302ff81360e1b5e693d784774";
+          sha256 = "0lh9m0598rmwx9qacb6wjd12hf6njx7r1srl25bw60fs1l5bnvqd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
-        packageRequires = [ ruby-mode ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/haml-mode";
           license = lib.licenses.free;
@@ -30526,12 +30631,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170622.126";
+        version = "20170627.155";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "8d0ef8f7ba56a78d7c1292d3db65f993518b8a78";
-          sha256 = "0y5gp4mmf6p244bpdnnv29gz0psfgh8338m5cns2z923pcllpjg3";
+          rev = "9d840649dd08f0c417add55c3b434d34f4b381a1";
+          sha256 = "0az1a95drpcmzkqn0jw9kc9kjbz7wbgphzrwcag4rg8ljkn7q80r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30694,12 +30799,12 @@
     helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-backup";
-        version = "20151213.1047";
+        version = "20170625.328";
         src = fetchFromGitHub {
           owner = "antham";
           repo = "helm-backup";
-          rev = "6f2c7648437be2a74380de8573e39b6258b3085a";
-          sha256 = "16350vdjmcv8n9dmvqik1mdcc927a2wgv3b72pzfpcjj1kx72fvk";
+          rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4";
+          sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -31139,8 +31244,8 @@
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "8d0ef8f7ba56a78d7c1292d3db65f993518b8a78";
-          sha256 = "0y5gp4mmf6p244bpdnnv29gz0psfgh8338m5cns2z923pcllpjg3";
+          rev = "9d840649dd08f0c417add55c3b434d34f4b381a1";
+          sha256 = "0az1a95drpcmzkqn0jw9kc9kjbz7wbgphzrwcag4rg8ljkn7q80r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31996,12 +32101,12 @@
     helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hunks";
-        version = "20170406.257";
+        version = "20170625.1523";
         src = fetchFromGitHub {
           owner = "torgeir";
           repo = "helm-hunks.el";
-          rev = "287685254002d47432f267884ac6a83de67ea07c";
-          sha256 = "0gfly5wv391cw7dpixxik0nqs2f7h1n8102pijjipk3g79f1f1ic";
+          rev = "56731db3968a57fbb2473529227c2998b7f404b0";
+          sha256 = "1kszp6jy4r39r71jjrr8p3nfpylbqyphrsfb4dghh6kl0zxic38j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
@@ -32520,12 +32625,12 @@
     helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "helm-pass";
-        version = "20170417.1033";
+        version = "20170627.1124";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "helm-pass";
-          rev = "8c4b330dad4be9df74eb44e312d72aedcbf628d4";
-          sha256 = "0q2vjnfiivb778cfnbg777y4srqk117k1kc5az4qk7n3hq0rg12l";
+          rev = "bf5e1ea85ca531f07372eb8e7b9a8812ff3d3a5e";
+          sha256 = "1l3dbgl65rcvw7cgqfxm3kvpfj65pj8jhkp9pg4yykli5y0wsbdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass";
@@ -33501,12 +33606,12 @@
     helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helpful";
-        version = "20170619.1537";
+        version = "20170625.1441";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "helpful";
-          rev = "c86b39eea2a787557e13a814a626c839d2caef2a";
-          sha256 = "0ya4axgq2k7yn1n07gfyc9amz98ffvas0ir8060ba3jhw8bmd940";
+          rev = "792e340352b3ddc579e34d8d6ffb4219bac5cbeb";
+          sha256 = "1af9xkzmn84374kr0czlivzxxfay35l2pw8rp7nkr0w0kjhmmxmr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -33585,12 +33690,12 @@
     hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hexo";
-        version = "20170621.1953";
+        version = "20170627.22";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "hexo.el";
-          rev = "1f6acb4305484b0177e04b3c55eabf9745e11dd0";
-          sha256 = "1ifdm7wkbnjs8jflgf3kjl5800rddjdy5dl5kz5g3qvxk0ma1rgf";
+          rev = "235264a99435552ebd57c0a7784ec0c500b7966a";
+          sha256 = "0j3z1zabzc2mmlvzzp21pmfv03p5lf0cjf0xadiy5df2z2xnrmfa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo";
@@ -34285,8 +34390,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "aa0f954c345e85ee8784431af5fa1a529c9cf715";
-          sha256 = "0aa67r8isall8h8rwaydzpbap185xh889a09s4b1i3984dvpgm80";
+          rev = "f4c463b99433d191b496055206552878e861f402";
+          sha256 = "1dq93rk33p35slkcpsw6lyyd18hd7zdll288riwkh7y4wdcbp5l8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34632,12 +34737,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170619.945";
+        version = "20170623.1400";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "d7b62a8dea6ff3e210ed2139dceaf09be8df465a";
-          sha256 = "1m7jn89kr2kl03fngcbz28b72lmna8bhilhaq1188mr0hxag8h9a";
+          rev = "24fef866f5aaee475da845145a516b3c368fde81";
+          sha256 = "0h3pn079i2vj9japba7wbsfap5s5qjglvvbmncmgjd26sl4q4hr0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -34799,12 +34904,12 @@
     hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "hound";
-        version = "20161130.1955";
+        version = "20170627.1259";
         src = fetchFromGitHub {
           owner = "ryoung786";
           repo = "hound.el";
-          rev = "dd95fc10b79029142c95307e895da0bc92bba28c";
-          sha256 = "0c0fjfb8l0ladxw8b2ylnrnzw8k0xffl40hnkrc4bdzbl48zn55g";
+          rev = "0c5a250ef82870dca737a429b6e9b9db93874ed3";
+          sha256 = "0kf2nhp5k3gk82ad1k9qi4aysqhw36x4mcdhg6kjckmcakfjw3g6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound";
@@ -35131,6 +35236,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hugsql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "hugsql-ghosts";
+        version = "20170612.1223";
+        src = fetchFromGitHub {
+          owner = "rkaercher";
+          repo = "hugsql-ghosts";
+          rev = "2f3f98b644b4da35f4fb80b7c3b63f986417b415";
+          sha256 = "0ng01pzxipzb3vkdn8yy5128kmnqnc4rhkszqji8lf8489jxfn8n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/969fd5e51bf93b5eff6919956c43c041a3b24d1e/recipes/hugsql-ghosts";
+          sha256 = "1v1iypis5iyimdr9796qpqw0qmhzijap0nbr0mhhyp4001kakkwz";
+          name = "hugsql-ghosts";
+        };
+        packageRequires = [ cider dash s ];
+        meta = {
+          homepage = "https://melpa.org/#/hugsql-ghosts";
+          license = lib.licenses.free;
+        };
+      }) {};
     hungarian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hungarian-holidays";
@@ -35446,7 +35572,7 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170609.903";
+        version = "20170625.1911";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087";
           sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
@@ -36052,12 +36178,12 @@
     idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
     melpaBuild {
         pname = "idris-mode";
-        version = "20170611.2243";
+        version = "20170628.1231";
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "8a2711efb7e2e4cc2a9a48cee422dba848c6155c";
-          sha256 = "0akp4mbsm4jmf5c652sbbb7gqf5w31ijfqdcckm28zxk2jwc1gz3";
+          rev = "e4347cfb75e4efdb43b52b01bd759c84aba84804";
+          sha256 = "0m26xwp0gysawf7dzx2k70hlxky0qbfpxqfs7clb17dv1i7ixa6y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -36073,12 +36199,12 @@
     ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ids-edit";
-        version = "20170621.946";
+        version = "20170628.810";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "ids-edit";
-          rev = "8df65dcfe35a06fc70775d485387fd31a1822b64";
-          sha256 = "1l8a14f9dpz8ddx99yh7h656ncrvr7s6yqih0rlniak5zxfnxjra";
+          rev = "3c133ce0074274bb6cf70566ba68a14047cdd61e";
+          sha256 = "00rrxdlr6wrkdwwl2ivsydblar6vhawvrf8f7cb62396z70xhrpi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f12d49b6ece6d2ac8ecb80d881db560367ddc4ba/recipes/ids-edit";
@@ -36633,12 +36759,12 @@
     indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "indium";
-        version = "20170622.743";
+        version = "20170626.312";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "Indium";
-          rev = "b5bd4aab9be3587ce7c6ba58a4aabf00d4dcd907";
-          sha256 = "1mpy7645i7nvkj0ixml4db2l11jx8h150c39a4r0ah7m34005rdx";
+          rev = "4747a94cf823deb5623368f71f2012f8c5fdc156";
+          sha256 = "11hsyqiy5lcvk721xrv1ihzp9ghdgk46n3qlaviy9alapl0v55d5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
@@ -37468,12 +37594,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170523.618";
+        version = "20170627.1045";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "db29f5851cb75f30e0bd1840f60a9d7d0e0b6dc1";
-          sha256 = "0rynn8sknyp8f9m4qf1i6c017gl1il7rsgaifm0l77zh1bplha96";
+          rev = "bf21cf4c442a930e6007b3ff5bd8af094318991f";
+          sha256 = "02fm2nwhglpb42qa5z2mrfkwqvwc3xvfdi0marlxbg3ramhn4s4i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -37758,12 +37884,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170621.721";
+        version = "20170623.1108";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "f0426613062ba8305ebac41672d853a95cd9bbca";
-          sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8";
+          rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74";
+          sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37800,12 +37926,12 @@
     ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-dired-history";
-        version = "20170617.812";
+        version = "20170625.2256";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "ivy-dired-history";
-          rev = "3604840f85e4ff2d7ecab6233e820cb2ec5c8733";
-          sha256 = "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l";
+          rev = "c9c67ea1ee5e68443f0e6006ba162d6c8d868b69";
+          sha256 = "1lim9zi57w011df5zppb18yjkaxkgfy796pc6i01p4dl32x0rpfv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history";
@@ -37888,8 +38014,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "f0426613062ba8305ebac41672d853a95cd9bbca";
-          sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8";
+          rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74";
+          sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38930,12 +39056,12 @@
     js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-comint";
-        version = "20170617.628";
+        version = "20170627.1952";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "9113cb538c9b9e1a1ccf0b6a4e8197b5f03faa51";
-          sha256 = "0m5d9f449g3z3p0gydyaw5gw8b0da6az3nfyvvjvfssacbnrcm8x";
+          rev = "2c19fafed953ea0972ff086614f86614f4d5dc13";
+          sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
@@ -39056,12 +39182,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170516.1643";
+        version = "20170624.1249";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "8a5f492c7ed427a3bdb1125e26a836e582bd2492";
-          sha256 = "1kaaa3gs1wm6834b1wd3nzl58vkbk7pcs53s2d93k12l5wzps8lp";
+          rev = "558f53f6b6749b09b03b858b0b1dfaeffbba4042";
+          sha256 = "1wr6hbd02raccvwqvy02va4hanjhqxpg418a7zxzjqj5mf1lj5nn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39186,8 +39312,8 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "json-navigator";
-          rev = "bc5634fc78d2e43ebd3c255350829877f3e4549c";
-          sha256 = "1j2lic9sn00j6pzq5qslv9m2z0rvsxkvz73z8swp7vcrsgz7qvqd";
+          rev = "d005a253fa73ed2c6c0b3ebbc7dc41be9270c304";
+          sha256 = "1dklr166p5gx5y3nzkh758wwr6jvw50c3si05m71247kirhs0f89";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator";
@@ -40148,8 +40274,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "c3bdd4839c3a205a95f007d620bacfdb731761cc";
-          sha256 = "05j6ir26qf6jvlvy8dv6zvivzyrhsxrpdp1h5axvn1wzl4wmzvg0";
+          rev = "aaca07b200702a6b40e0016556f8d3683fce6bb0";
+          sha256 = "1rg3n0bp8f2bz6rcf01656hvv7mn3a7wr3hc1c7j0830a1d7nn2w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -41489,12 +41615,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170622.803";
+        version = "20170623.1046";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "c52da852547356cc0bc51cb549dad57cb818b8aa";
-          sha256 = "1hh0cdiaivpggrg3l14m7g3h9fl2rc69fy4hnmak91xf9lap37vz";
+          rev = "5aab7fa4fcd42d2f73d226843b4247d61ad917ba";
+          sha256 = "1fkkp483bhk560h7jv1ppr5x39nghh8va7fnnr36br6fdn53c7ki";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41911,8 +42037,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "f066646d1ff5722da365888053371bc734e5f3f0";
-          sha256 = "11jqlw58wifx1slfmmsp9lbkd1asalddlcjkmd7sz11wvdjm8hdk";
+          rev = "a143b4a4f33d548f126e7d212e91b7742fe1af18";
+          sha256 = "1nl9sq71dsny6hm4bd9bh1nzxx4iqd7a91x2lyyjlfnnf1f4602a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -42009,6 +42135,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    lockfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lockfile-mode";
+        version = "20170624.2207";
+        src = fetchFromGitHub {
+          owner = "preetpalS";
+          repo = "emacs-lockfile-mode";
+          rev = "fcfef88460cb3cd67c4d83a1801d0326d282feac";
+          sha256 = "1dh41a8dj8h3lrhjajaz886vsimflshk6bc08w71rwvjyy2k8xil";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/12a383eb6c29acb007dae9dc777ace3ba84edac9/recipes/lockfile-mode";
+          sha256 = "13nr983xldja8m02a1rdnyqxc8g045hxjh6649wmqmqk4mk0m310";
+          name = "lockfile-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/lockfile-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     lodgeit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lodgeit";
@@ -42702,12 +42849,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170621.710";
+        version = "20170625.1144";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "7987db94c0041f68664d5ed91ce241c31fd8d1d1";
-          sha256 = "0bwgxhzd81nh69dbhswdq70y152ikwsxlh23d3ng36kix8s6fgsg";
+          rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53";
+          sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42898,12 +43045,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170609.2310";
+        version = "20170625.1144";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "7987db94c0041f68664d5ed91ce241c31fd8d1d1";
-          sha256 = "0bwgxhzd81nh69dbhswdq70y152ikwsxlh23d3ng36kix8s6fgsg";
+          rev = "524ee09dc4312c52bd8c23c13b18bee23f15bb53";
+          sha256 = "12294qy1v7h0lcgmc8x53nzw0iadjifwn0lqzqmbpjny4yns9h2n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42979,6 +43126,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-tbdiff";
+        version = "20170627.2023";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-tbdiff";
+          rev = "2e7d54d290260e5834cca06863d78fc563d7373c";
+          sha256 = "07i0bnjkflgrrg246z996slzy28b2kjhhv13z0lcb72w46l935yr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
+          sha256 = "1wydmw4f1072k8frk8mi8aaky7dndinq8n7kn10q583bjlxgw80r";
+          name = "magit-tbdiff";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-tbdiff";
+          license = lib.licenses.free;
+        };
+      }) {};
     magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-topgit";
@@ -43213,12 +43381,12 @@
     malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
     melpaBuild {
         pname = "malinka";
-        version = "20170523.1007";
+        version = "20170628.151";
         src = fetchFromGitHub {
           owner = "LefterisJP";
           repo = "malinka";
-          rev = "9a546487f9de5dd7277de34756499560579c2568";
-          sha256 = "06ikk9yapq5j401fql29vl3w06xwci2437narf0pjhnnzvnidiw0";
+          rev = "b8ec090cb57a78265650586f71f00c4c9e054e27";
+          sha256 = "0wii0ylgdci69r1zjcrk7bh68dl25ry63cfwgdii9x217lmbn9qw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
@@ -43364,8 +43532,8 @@
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "d38183e5025beca7873b2e17bc605107e3adece9";
-          sha256 = "139y9r3wm7fnshfdmm07m6v4zq5himrx6d4q6vryzhlmfchxfy7n";
+          rev = "c832bd706293f394c9b2ed9b2da96cde7f4347f3";
+          sha256 = "0n4iv1f7qp6n5hs28p30v9gg6qm8p25q1y301g0ljmsr2f55qjcf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43536,12 +43704,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20170623.509";
+        version = "20170627.900";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "3154320d8fcd9eb22bcceb39e181ccf930a9739a";
-          sha256 = "06nnyl952nizrygil83939mrm4v6qh6y841dxgnbyhbbyryvdval";
+          rev = "ae5eeecf1228d12b48f0d6bb22149ab2aaa9aba8";
+          sha256 = "110z98kpfb7bw8r7xn1cr2hjbmm91gcvv6il2pzxmha24qwswxgy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44107,12 +44275,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170611.2347";
+        version = "20170625.1942";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "a764751e89ad7bc1717e1d3c6e3b4364b11832d6";
-          sha256 = "06vd4lvybfa7kwyplavlbfwln6229g7s7pwbamjdvgz48xgiqym1";
+          rev = "77bc1c735b41acb6d43692dc3dcb60f323656cb5";
+          sha256 = "0b33bbmj7c62zn882max569wyybb9b04plb47sg55amv3nv8c8fr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44439,12 +44607,12 @@
     metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "metaweblog";
-        version = "20141130.605";
+        version = "20170626.750";
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "metaweblog";
-          rev = "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb";
-          sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
+          rev = "c039d1ffb618d19d160bde835fab389e9a7433a3";
+          sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog";
@@ -44820,8 +44988,8 @@
         src = fetchFromGitHub {
           owner = "arthurnn";
           repo = "minitest-emacs";
-          rev = "2997ba81456f2a0f3e25b6555b491586865ebb61";
-          sha256 = "10f1caszcas39g8kz0hfx1gq1jbpcnb5wwd1c262l9lwvla85nyl";
+          rev = "e5c82aac7542c5648881bb612fa20fe2b99ffb15";
+          sha256 = "09iqbmmvi28sn5c6iaq6r6q4a4003cy6bb4zihajq0di55zls3aa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest";
@@ -45288,12 +45456,12 @@
     modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "modern-cpp-font-lock";
-        version = "20170224.114";
+        version = "20170625.1306";
         src = fetchFromGitHub {
           owner = "ludwigpacifici";
           repo = "modern-cpp-font-lock";
-          rev = "f1a4413c40e933b8b5b380860656b1ef5663f121";
-          sha256 = "0hb40cp33fpgfs4c5g8phhvv9mbykygybidh73pbrcacyiz4g6jc";
+          rev = "0a5a4ae4d3115eb95ab6047faf8d1734a238ab70";
+          sha256 = "1ax7kvxj8z6ldfxr9017ws1lligjaxxdrcxb651i10m7jdw3bjd4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock";
@@ -47164,12 +47332,12 @@
     neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neon-mode";
-        version = "20170529.637";
+        version = "20170628.611";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "neon-mode";
-          rev = "69edc4b051604143db8e044606bbcc0904a3829c";
-          sha256 = "09753w4psyzh583264nswk9313d9yh5s4aad3jc9qq5mg6ycb6iy";
+          rev = "0666c4ca4ccf0c3b712115617a035413ca40df22";
+          sha256 = "14kcp5yy306gj9clqlzrabdhq71q3p5wsbwc4gcy1r1kmia1mp4c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@@ -47818,8 +47986,8 @@
         src = fetchFromGitHub {
           owner = "arcticicestudio";
           repo = "nord-emacs";
-          rev = "8962f7c77f2a27c0e0b649653c212fa310cce130";
-          sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1";
+          rev = "eb7929e41606776a45817946b5d6f79426767a93";
+          sha256 = "1cb7la2al8124i4xfmripfzhabpnzh929qi1266p4c7jchyz2gxw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -47853,11 +48021,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170614.349";
+        version = "20170625.557";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "a83ab29930161d999ad1c45b6eb9cfbaa5e90ceb";
-          sha256 = "15gmpvkgf75wiczi2iknyrdffk8q8yqmvkwdcdps0g31m9869iv5";
+          rev = "c9deb329331afbd16f42ef122aba92375ce6dad8";
+          sha256 = "1zzbg0i76m6pqmy5mh5bdrfmfa9hzw5z0r6vyxgy344ry6fq9bl7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48043,8 +48211,8 @@
         src = fetchFromGitHub {
           owner = "martijnat";
           repo = "nubox";
-          rev = "84aa965f0cb4bde293237e4cc586643d1f662f83";
-          sha256 = "0i1x0sd61c8k4q9ijgxyz21gvj1gah273990qfjzj9a25r4hzvlj";
+          rev = "1ccb8035ae42727ba6bdd5c1106fbceddeeed370";
+          sha256 = "02yh99rcgxdq6jn4xs8782nl6bjccmal8j78qslvpkrzrrxjajx6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox";
@@ -48270,12 +48438,12 @@
     ob-async = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-async";
-        version = "20170216.2011";
+        version = "20170624.1810";
         src = fetchFromGitHub {
           owner = "astahlman";
           repo = "ob-async";
-          rev = "6bdb5b63ff4a8853d03805d7a7042213003a3dee";
-          sha256 = "1n4zc4nfv7hzilnb0qng6vh19dj4kq12gwsillj6c3i89gjz73wr";
+          rev = "fc0020e515fe156fdda7fbf47f12c4b00029d44b";
+          sha256 = "1b2gpzml8hjcadb4sdhhwdj14h9hj1aawq9iic5sqffc8nsakfqc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
@@ -48455,6 +48623,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-fsharp = callPackage ({ emacs, fetchFromGitHub, fetchurl, fsharp-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-fsharp";
+        version = "20170618.729";
+        src = fetchFromGitHub {
+          owner = "juergenhoetzel";
+          repo = "ob-fsharp";
+          rev = "65ec2b626ac55313d8a04e746940370f615fed1e";
+          sha256 = "12k6z3zsh8av3avhl2a62v475bpxpcdy56v8i248bv1wgd3ma2mi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/89bc8c5fe6db0573109e82b3d1350d33d6d8aff5/recipes/ob-fsharp";
+          sha256 = "1b9052lvr03vyizkjz3qsa8cw3pjml4kb3yy13jwh09jz5q87qbf";
+          name = "ob-fsharp";
+        };
+        packageRequires = [ emacs fsharp-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-fsharp";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-go";
@@ -48500,12 +48689,12 @@
     ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-ipython";
-        version = "20160918.1001";
+        version = "20170628.1116";
         src = fetchFromGitHub {
           owner = "gregsexton";
           repo = "ob-ipython";
-          rev = "cfdd9c00e6286d31d647defdb813b7aabfadcbff";
-          sha256 = "0i441jwc32fnkd8rba512z373jaind8sdb20hf2yma7ny2iawcyk";
+          rev = "a0ae4add0310d131c6b4b15139b929955cec93dd";
+          sha256 = "019impk95mnplwzirllrrjjq17hczcq6aarqr959ca75jix8jysf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython";
@@ -48521,12 +48710,12 @@
     ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-kotlin";
-        version = "20150312.614";
+        version = "20170624.2050";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-kotlin";
-          rev = "c494f50184d25e196c009bf5cc105c4931b9464d";
-          sha256 = "01cjwg27m0iqndkwwl0v5w8vvk270xvi81za3y5hyrmb7dq6bfy7";
+          rev = "ebbd3fcd52a80c0579e896ad3cbb1484d0a55d00";
+          sha256 = "037msvgvw42nl2wi335q4pfi8bqh3d1a5a6rdvzvpm1vh2fwywab";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7aa74d349eb55aafddfc4327b6160ae2da80d689/recipes/ob-kotlin";
@@ -48707,6 +48896,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-rust";
+        version = "20170619.802";
+        src = fetchFromGitHub {
+          owner = "micanzhang";
+          repo = "ob-rust";
+          rev = "126ee38c6f560cac2ea6bbef034f92ff948d2664";
+          sha256 = "1szayb60ibihjfd5ihij0cvjdmvcays1701h5ak0wpvqirdmyc60";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/843affc2fd481647c5377bf9a96b636b39718034/recipes/ob-rust";
+          sha256 = "1syzwh399wcwqhg1f3fvl12978dr574wji7cknqvll3hyh0zwd65";
+          name = "ob-rust";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/ob-rust";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
     melpaBuild {
         pname = "ob-sagemath";
@@ -49892,12 +50102,12 @@
     org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-brain";
-        version = "20170521.1409";
+        version = "20170625.1444";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "org-brain";
-          rev = "17309b16d40fcb850f9d978ffb6f6d987395daad";
-          sha256 = "0n2z6y6m14iiypvy97l7rk4d6c452c860sj8f4x8xzizsxapi26y";
+          rev = "318d5a375b9d58e22ec8a80332ac8424916b9d7a";
+          sha256 = "15gqw87qlxbbvbcyxqp3h5vi1f0pashd131181mqjq5w3x8jk534";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -50581,6 +50791,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-link-minor-mode";
+        version = "20170616.516";
+        src = fetchFromGitHub {
+          owner = "seanohalpin";
+          repo = "org-link-minor-mode";
+          rev = "f7d986b4c63673e0e81ad87e9109237abc667893";
+          sha256 = "0i7xj6hp0mxc42y2yjv8cwgsflfyx47d63b9v4dmkjbs9fda06mj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b1d2add7baf96c9a18671766d61c8aa028756796/recipes/org-link-minor-mode";
+          sha256 = "1akb670mzzhmldw2202x3k6b7vwfcn0rs55znpxsrc4iqihdgka3";
+          name = "org-link-minor-mode";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-link-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-link-travis";
@@ -50629,8 +50860,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "cc631078ad0ad5def8b726d98c49927232edc5b7";
-          sha256 = "12zcvjkn07i738wjyzv1yiyqgavlxbyxhpq8viy26i3kvnckzgv6";
+          rev = "379a22c9c6f785a4b250a5225ebe8dc958bc8f6f";
+          sha256 = "1i6in0f56kxp8mn8wfz5rfx2vxf4br47vaswxwb3nyvcqnhx41wz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -50649,8 +50880,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "cc631078ad0ad5def8b726d98c49927232edc5b7";
-          sha256 = "12zcvjkn07i738wjyzv1yiyqgavlxbyxhpq8viy26i3kvnckzgv6";
+          rev = "379a22c9c6f785a4b250a5225ebe8dc958bc8f6f";
+          sha256 = "1i6in0f56kxp8mn8wfz5rfx2vxf4br47vaswxwb3nyvcqnhx41wz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51099,12 +51330,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170623.523";
+        version = "20170626.1834";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "5f2f596eccd776e21c98f68e9b11013c4ea54a75";
-          sha256 = "0qriaj0kycygbf2b25nr3nxqwa44j8gzm9lmd35w3h21vh97p66d";
+          rev = "6abe56f638562cc683d866f209387c9d30a32299";
+          sha256 = "08rnqk4iwg86gndbra4f78qnxadbn0cyd2h3dffx30cl6y23w2vz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51212,6 +51443,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-static-blog";
+        version = "20170621.2328";
+        src = fetchFromGitHub {
+          owner = "bastibe";
+          repo = "org-static-blog";
+          rev = "e9ba61e8bbe6e2bd1cb5fe2e507d066fa05cabd9";
+          sha256 = "1ng94m39r7g573l7zl7561zchz5m5mzlf8a0ym2hj1cdf98x5ziv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog";
+          sha256 = "07vh2k7cj0cs1yzfmrrz9p03x5mbfh0bigbl93s72h1wf7i05rkw";
+          name = "org-static-blog";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-static-blog";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-sticky-header";
@@ -51572,12 +51824,12 @@
     org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
     melpaBuild {
         pname = "org2blog";
-        version = "20170617.1730";
+        version = "20170627.1750";
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "ba2a943af674fc0703e3b81fc591d8f48758e05d";
-          sha256 = "1fgz884m51nmg6ynpzxpblf5bbipzmrz15hhakprr9fr2grp3qzh";
+          rev = "e266ff4296661de520b73e6e18f201fb6378ba05";
+          sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -52290,8 +52542,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "68859169a416700bf031ab696fceac50008c8e7b";
-          sha256 = "1cn4h6f0grz461bhjvmvxzqx5ccnyqd9pc7k60549p3p9yw5r735";
+          rev = "82375dba2d7c5fcc1ddce4579a3b44aaa1afa84e";
+          sha256 = "007s3x4111zlinicxarsibkhcykdy71219417rwvdhdj29ick2jg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -52832,12 +53084,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170617.2227";
+        version = "20170624.1712";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "1c92011b1a78b043054f7d725a281b5ec5bd46e9";
-          sha256 = "0k23bwbxwn7ll9k7fqbv4mr6f4bbrli2xh1d6ix9x6z3nkn8iq4s";
+          rev = "08affd2ae70f245f2697cdbf5c7a5f72fb325ce0";
+          sha256 = "1rfi1qgwn7ngg3s6hpkqgaz2iygq0iv6y6vjzvbbmk1i9s8f51qz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -53434,6 +53686,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pasp-mode";
+        version = "20170615.605";
+        src = fetchFromGitHub {
+          owner = "santifa";
+          repo = "pasp-mode";
+          rev = "77bde345cfb3822c86eb9b1aa8cca4e8fcc38420";
+          sha256 = "1x9ms4aljpbz9nfv4lrrlkvqb3a127sfd0a865lphdyivqrai3j3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode";
+          sha256 = "0aix8siyd5yhgxq94k1sl64a9q2xlfrz6cj9y5mcqhb6qjgmrnva";
+          name = "pasp-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pasp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
@@ -55282,12 +55555,12 @@
     plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "plain-theme";
-        version = "20170505.800";
+        version = "20170625.1100";
         src = fetchFromGitHub {
           owner = "yegortimoshenko";
           repo = "plain-theme";
-          rev = "1e484668cf272ab1883cb3c1ad9e1e8639de395d";
-          sha256 = "0qhr8mch5fvy5gck5prradlrnx84h6n8nvrcqk6ynqd1nh0pnnzd";
+          rev = "7c376f5bf9d653bf12e414176284736cbdd19108";
+          sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme";
@@ -56904,12 +57177,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170602.336";
+        version = "20170626.653";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "4e864c75bfbee4a5a1a9c76d3d2a77b2da01fa5f";
-          sha256 = "1a0a3hay6ixplk0q6jd2s0hbwxm36zxd5vng3k769cjc8nrsnbix";
+          rev = "28df7d105cbfde2d9fbf322325a15edd85ced77a";
+          sha256 = "0v2x7psx7zgwpmxvqx7yq38vhsikrlnzlr798y8p1aqx6k4y9xfd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -57202,8 +57475,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "eca0f4ee919480a4f516b825cf6809c6a7df4f50";
-          sha256 = "1qs2y4nahs8a22hc0cd436l6gf28q5g5jq8q53zhjc6209i0lbkc";
+          rev = "12acbc2678073c3439b427be0b713b97e2074bfb";
+          sha256 = "1rb2055zrv956z0sl1q2g88xnn82yns9vacjrg9ab2466amdcmjw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57966,8 +58239,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "59ce0c377c1b72d4496a483cc00716848047530c";
-          sha256 = "0pxg3zmxha9x47nzgfnczx2h8wn6l4ybphiznbxvrwgaakby0bd6";
+          rev = "d4b0bdaec9042333f9d75688b3145658adef9f91";
+          sha256 = "0ik86kp7rmg0zyw3471pj82x5w9hpg6w3k3cvv4zjgfrhilxb9z1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -58109,12 +58382,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170605.123";
+        version = "20170626.1017";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "17747eaca4e75e17e29fbdceab9380cd4772c4ad";
-          sha256 = "0j4xq66gdwnz94wm68xzc88gbaigfxhc035whijl43yxkf9mc14y";
+          rev = "11c6a487b2a3a22d1fbb7ae16bf3b7a5dabdeadb";
+          sha256 = "1yk4rrpfrqmq6cm9fg64qh7zzwrvwfpbixfp0352c0jplzxqgxqp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -59564,8 +59837,8 @@
         src = fetchFromGitHub {
           owner = "RedPRL";
           repo = "sml-redprl";
-          rev = "de1239ac489ec2c03801c5a92ad716c82140d3ae";
-          sha256 = "04dfir58zhd244a8kci3xs31i691wiqldkfay6819lqvq5pfna5j";
+          rev = "e136fe3e11d6cb46166c49999d57f6f50bac9d3d";
+          sha256 = "1adwv5p8rk1b146vg76lpnfrkj19mdzn5l5ghsls197n2j9q00x4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -59828,27 +60101,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "relative-line-numbers";
-        version = "20161112.2151";
-        src = fetchFromGitHub {
-          owner = "Fanael";
-          repo = "relative-line-numbers";
-          rev = "38b5f9065aec008d9ad94fe5597338463aa1aa63";
-          sha256 = "00ixh7siyc8m7j6hfaxnnl3ynfhzkccpjfc89v8bp3z83m4v269w";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2901c841d221bd782dae9059a070ae8130e1ae/recipes/relative-line-numbers";
-          sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
-          name = "relative-line-numbers";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/relative-line-numbers";
-          license = lib.licenses.free;
-        };
-      }) {};
     relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "relax";
@@ -60165,12 +60417,12 @@
     resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "resize-window";
-        version = "20170329.1644";
+        version = "20170624.1658";
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d";
-          sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7";
+          rev = "274a96e9754b606d85c9dd62cfed628ff4f736df";
+          sha256 = "0ax18sflqh9wg938gaz9m5r1i45761qym7r1lyqqxp24jzp4wa6j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
@@ -60207,12 +60459,12 @@
     restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restclient";
-        version = "20170516.137";
+        version = "20170627.153";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "07a3888bb36d0e29608142ebe743b4362b800f40";
-          sha256 = "00lmjhb5im1kgrp54yipf1h9pshxzgjlg71yf2rq5n973gvb0w0q";
+          rev = "8292fe68c73561413cebff88008509180768718d";
+          sha256 = "16c2g8s64lxav5r5v8cqv5ihlskvz22kld5d1vzf3vzr2c9c4dwx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -60232,8 +60484,8 @@
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "07a3888bb36d0e29608142ebe743b4362b800f40";
-          sha256 = "00lmjhb5im1kgrp54yipf1h9pshxzgjlg71yf2rq5n973gvb0w0q";
+          rev = "8292fe68c73561413cebff88008509180768718d";
+          sha256 = "16c2g8s64lxav5r5v8cqv5ihlskvz22kld5d1vzf3vzr2c9c4dwx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -60310,12 +60562,12 @@
     reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "reverse-im";
-        version = "20170614.230";
+        version = "20170623.640";
         src = fetchFromGitHub {
           owner = "a13";
           repo = "reverse-im.el";
-          rev = "59368a504a67d1a93f56cd6e58797ca19ab578b4";
-          sha256 = "0xsmz92f8bcyq3nq7fwca1x1brrgvd1cg1x6f7j939wmcqql5mnf";
+          rev = "da6a4d2fdc1019e7fcd050db6c5344fdad1e2286";
+          sha256 = "1vsfxy4scknn5142mn4v1hkj2qbphmwdj175prd1aj1gk8cbzw9v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
@@ -60899,7 +61151,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59162";
+          rev = "59201";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -60980,7 +61232,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "59162";
+          rev = "59201";
           sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
         };
         recipeFile = fetchurl {
@@ -61417,12 +61669,12 @@
     salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
     melpaBuild {
         pname = "salt-mode";
-        version = "20170620.1518";
+        version = "20170626.444";
         src = fetchFromGitHub {
           owner = "glynnforrest";
           repo = "salt-mode";
-          rev = "624603a87aa21a388fdb17daf48e7184ee6e0222";
-          sha256 = "14pr58rgrg8v8j594lrkfpwnf98g11jkpfn4n2bfzir100vgxi5k";
+          rev = "3a570369c9ed4e04a9bffa7e79ced0c8bd7f99b1";
+          sha256 = "1d4fk1387xjch3a8xrij8knvrs18c7iq7m9jclzy2v6bp9ml2lnb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -62272,12 +62524,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "20170309.543";
+        version = "20170618.500";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916";
-          sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7";
+          rev = "282bb04ed524ceff2a7a13cee118ec6df55b2323";
+          sha256 = "1g15lrx3ik6539vc5f8v3x0va6k02zz5l13jnqlzs1fl4inxk35v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -63275,12 +63527,12 @@
     shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shx";
-        version = "20170613.1717";
+        version = "20170624.1454";
         src = fetchFromGitHub {
           owner = "riscy";
           repo = "shx-for-emacs";
-          rev = "ff8e0a6d36cd84408dfaa2040cc0fa16db14b531";
-          sha256 = "1rf4816278cfzm0w21j5v9abb2icqr0m4iyhgg7k4pl92db79hrx";
+          rev = "23d6d213a90e031dec8dbbaaeac5ddbe2cf050de";
+          sha256 = "0y96l6m7lnw2wsi5zbla88xgxmw3zksblnk36bgr153bik14waxf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -64573,12 +64825,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170619.149";
+        version = "20170624.504";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "a806e2fd18e3b9923f570a2ad2ba6323a38a43b5";
-          sha256 = "1wfaihamb2h5bf8z8fs2xpm4fxzfhlm4s1j0yv6b6dw2b6g2bx7c";
+          rev = "0f32a87ae7a70c4a39debe4aa4585029f35ea30a";
+          sha256 = "0gdskz49lqm20prhanqcldfz6sbiqpdfpn6xl5p3yqskdz4b4pdp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -66275,12 +66527,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170520.26";
+        version = "20170628.52";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "5e86b22d14e34207bf9c0888ac5fe2e782dcf5cb";
-          sha256 = "0pirqgvvl7dyhfk5c3hk419mb67qhmgz1qvp124aprdwhnmjd153";
+          rev = "c8b322a248ea8089eb26f2c5cee58ed47e5f43d3";
+          sha256 = "1iyvdbwm7v1acb2mjqz51c7ksi5169mg3kiksg3q5bhvmfjy6s3r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -67462,8 +67714,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "f0426613062ba8305ebac41672d853a95cd9bbca";
-          sha256 = "0mjh89snhm8lzy52k4wb352k8zljs2mkmx5w92ddhlzsfaf3hdd8";
+          rev = "d020a7ba446d518f8fea5cab34410328fe1d3a74";
+          sha256 = "1vk9r896nwci2fd2wkrw8c3msax3wpjdqvp1ivq0d4p3k49hz5g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67875,12 +68127,12 @@
     system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "system-packages";
-        version = "20170311.2357";
+        version = "20170627.1127";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "ebfb6f9eb46c006a4488c1fbf9f46de48f5a788a";
-          sha256 = "199bmzxw6lrby6l9fgm01i92lvzzbz7sqpjrn9jjmpiwr718qxcf";
+          rev = "170f07c3cdf2859efaedc60c7013f6d72e009468";
+          sha256 = "06knc4vy6lskp8jgfjg33v089kf8pm0lmqp9114apa6hwwqx9fd9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -68210,12 +68462,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170419.1308";
+        version = "20170624.1300";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "9d2973b20b414cafe6df917bbe4599310d67170b";
-          sha256 = "1s5lpba1zn4f48jzbchal6wpm8jz666bmr37l0si04fi4019har1";
+          rev = "bf6d718955d56b7cf824f7a60803c94a676ccb95";
+          sha256 = "0hkni0dm4s7sgx7zzk88kls8qzmz47b5g1gskp3kxg88b1nbghcw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -69194,8 +69446,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "c55fdb95340417a4ba2dda41e9e872a4bcc63459";
-          sha256 = "13x72ksfpq047xr74v86ycfa6qwymx91bp4r7j08a1qlgw4adgdq";
+          rev = "4aaa92ece8503a6da9bc6701604f69acf2b99d07";
+          sha256 = "1my582c0ln1byxid5acdd6dk7lvi7lwd6gka10s4bp4w3xrd55x8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -70121,12 +70373,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170326.1044";
+        version = "20170330.2125";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "5b88e643e93115af3a96c8cf558eb506b34a64fc";
-          sha256 = "1zcpy3628s9cm9am92imwhp31fdnd6146hz0x4qaazia4gbhp66z";
+          rev = "3d44f4e916257855e5f0c3d06ebe78c2637c9b0c";
+          sha256 = "0dmydawpdjh821sfaki2km1sff5f2kspbhi9wkcss12m8kkz6fg4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -70226,12 +70478,12 @@
     treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
     melpaBuild {
         pname = "treemacs";
-        version = "20170622.1241";
+        version = "20170625.1509";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "b517e31c63239d20055462bd8a1b4f594d7351c3";
-          sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd";
+          rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
+          sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@@ -70247,12 +70499,12 @@
     treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
     melpaBuild {
         pname = "treemacs-evil";
-        version = "20170615.336";
+        version = "20170625.1401";
         src = fetchFromGitHub {
           owner = "Alexander-Miller";
           repo = "treemacs";
-          rev = "b517e31c63239d20055462bd8a1b4f594d7351c3";
-          sha256 = "1k5bph4wmxdz354gxmvbjc3q6rgvqjyqc1mwid24qn9rmnl3v9vd";
+          rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
+          sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71973,8 +72225,8 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "a1e6ea3ed5faaf70667c62bc5591dc810331cb1a";
-          sha256 = "1z8q3akm0hq7z7nqclra1wv7a6m0cbskhnd3ca4v9wf9dajiwnsb";
+          rev = "72399f5e09f53aa25a068be8689cb711b8accf08";
+          sha256 = "1xlzm2c6wcmrjjwl61552yaijjsiazbs2lxn1y5p7xbj9x7jrkn9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
@@ -74602,12 +74854,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170620.1932";
+        version = "20170627.1123";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "b18be452791b1468ecdd84aea7cac772519218e9";
-          sha256 = "00ncmin6azfkfhi4ns39wpjprfgc0bfiqvd5ccapbn12x48y2hra";
+          rev = "dba445db28d3c1d0e2d0a9924ab96061850bb00c";
+          sha256 = "03wcifmmianrh0qp7p2pvhbpnzh0yjh5ys7x7qv3ywr62bnv4akh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -75257,8 +75509,8 @@
         src = fetchFromGitHub {
           owner = "drdv";
           repo = "yahtzee";
-          rev = "d7dcf24c1b9a04f4eb482b6c9cc29f80cff3a733";
-          sha256 = "1kf2szbiz3fkm72zrjcidwx4cphrwi7gjs24pnh0mii7dxkvmwhg";
+          rev = "ebb1349c55dadd9aa1a87a80f3392023a1fbad43";
+          sha256 = "0zijnhjjdppwmy69bdh1wvqfmkvijqpazvk71b3b3ns6w8cln582";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -75524,12 +75776,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170605.1940";
+        version = "20170624.803";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "e8ed276e2cba90126f694a90df28b5f5eca66376";
-          sha256 = "0ripg5bvj4hj0y7qb35fdfg38fkqsvcxa977d24wbswmgcj08bjs";
+          rev = "65952e30547754eb5ed11750f0cd736095fd6700";
+          sha256 = "1iycbb9rbyks860bigywy9h1607m67aq606068vlq13ivhz18b9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
-- 
GitLab


From 49347667a879991e4593c38ca18d7297f248b05c Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 15:59:14 -0400
Subject: [PATCH 1378/1490] gcc-wrapper-old: Don't use stdenv.cross

Take the dynamic linker logic for cc-wrapper for now
---
 .../build-support/gcc-wrapper-old/default.nix | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix
index f8a7c62edc7..a37d94c36e0 100644
--- a/pkgs/build-support/gcc-wrapper-old/default.nix
+++ b/pkgs/build-support/gcc-wrapper-old/default.nix
@@ -8,6 +8,7 @@
 { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? ""
 , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? ""
 , zlib ? null
+, hostPlatform, targetPlatform
 }:
 
 assert nativeTools -> nativePrefix != "";
@@ -69,9 +70,9 @@ stdenv.mkDerivation {
     # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I
     # do this sufficient if/else.
     dynamicLinker =
-      (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else
-       if stdenv.cross.arch == "mips" then "ld.so.1" else
-       if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else
+      (if hostPlatform.arch == "arm" then "ld-linux.so.3" else
+       if hostPlatform.arch == "mips" then "ld.so.1" else
+       if stdenv.lib.hasSuffix "pc-gnu" hostPlatform.config then "ld.so.1" else
        abort "don't know the name of the dynamic linker for this platform");
   };
 
@@ -85,15 +86,20 @@ stdenv.mkDerivation {
         + " (wrapper script)";
     };
 
-  # The dynamic linker has different names on different Linux platforms.
+  # The dynamic linker has different names on different platforms.
   dynamicLinker =
     if !nativeLibc then
-      (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
-       if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
+      (if targetPlatform.system == "i686-linux"     then "ld-linux.so.2" else
+       if targetPlatform.system == "x86_64-linux"   then "ld-linux-x86-64.so.2" else
        # ARM with a wildcard, which can be "" or "-armhf".
-       if stdenv.isArm then "ld-linux*.so.3" else
-       if stdenv.system == "powerpc-linux" then "ld.so.1" else
-       if stdenv.system == "mips64el-linux" then "ld.so.1" else
-       abort "don't know the name of the dynamic linker for this platform")
+       if targetPlatform.isArm32                    then "ld-linux*.so.3" else
+       if targetPlatform.system == "aarch64-linux"  then "ld-linux-aarch64.so.1" else
+       if targetPlatform.system == "powerpc-linux"  then "ld.so.1" else
+       if targetPlatform.system == "mips64el-linux" then "ld.so.1" else
+       if targetPlatform.system == "x86_64-darwin"  then "/usr/lib/dyld" else
+       if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else
+       builtins.trace
+         "Don't know the name of the dynamic linker for platform ${targetPlatform.config}, so guessing instead."
+         null)
     else "";
 }
-- 
GitLab


From 784ffeaabda2d1b77d5d7c4d33e4d78297c16877 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:00:28 -0400
Subject: [PATCH 1379/1490] SDL: Don't use stdenv ? cross

Simplify and finess logic a bit in a way that doesn't affect the
default native build, too.
---
 pkgs/development/libraries/SDL/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index eb470519b4e..e71ad14b11f 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
 , openglSupport ? false, mesa_noglu, mesa_glu
 , alsaSupport ? true, alsaLib
-, x11Support ? true, libXext, libICE, libXrandr
+, x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr
 , pulseaudioSupport ? true, libpulseaudio
 , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa
-, hostPlatform
+, hostPlatform, buildPlatform
 }:
 
 # OSS is no longer supported, for it's much crappier than ALSA and
 # PulseAudio.
-assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
+assert hostPlatform.isLinux -> alsaSupport || pulseaudioSupport;
 
 let
   inherit (stdenv.lib) optional optionals;
@@ -53,9 +53,8 @@ stdenv.mkDerivation rec {
     "--enable-rpath"
     "--disable-pulseaudio-shared"
     "--disable-osmesa-shared"
-  ] ++ optionals (stdenv ? cross) ([
-    "--without-x"
-  ] ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib");
+  ] ++ optional (!x11Support) "--without-x"
+    ++ optional (alsaSupport && hostPlatform != buildPlatform) "--with-alsa-prefix=${alsaLib.out}/lib";
 
   patches = [
     # Fix window resizing issues, e.g. for xmonad
-- 
GitLab


From 67ae0f03700d1ad9a9a9f2f0812141ca8a7825f8 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:01:43 -0400
Subject: [PATCH 1380/1490] boehm-gc: Don't use stdenv ? cross

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

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 96e41790aac..d32ec6cbf58 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false }:
+{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "boehm-gc-7.6.0";
@@ -20,7 +22,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Don't run the native `strip' when cross-compiling.
-  dontStrip = stdenv ? cross;
+  dontStrip = hostPlatform != buildPlatform;
 
   postInstall =
     ''
-- 
GitLab


From df8c390a5a9398c51d8e9651b7f856f03eb6fdac Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:02:40 -0400
Subject: [PATCH 1381/1490] boost: Don't use stdenv ? cross

---
 pkgs/development/libraries/boost/generic.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 14d0c251c96..9a6c5d7b413 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
-, hostPlatform
+, buildPlatform, hostPlatform
 , toolset ? if stdenv.cc.isClang then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
@@ -148,13 +148,13 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   buildInputs = [ expat zlib bzip2 libiconv ]
-    ++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ]
+    ++ stdenv.lib.optionals (hostPlatform == buildPlatform) [ python icu ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   configureScript = "./bootstrap.sh";
   configureFlags = commonConfigureFlags
     ++ [ "--with-python=${python.interpreter}" ]
-    ++ optional (! stdenv ? cross) "--with-icu=${icu.dev}"
+    ++ optional (hostPlatform == buildPlatform) "--with-icu=${icu.dev}"
     ++ optional (toolset != null) "--with-toolset=${toolset}";
 
   buildPhase = builder nativeB2Args;
-- 
GitLab


From 0fa3d99f4ee17dc9a639b9535aaa2df8f242f453 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:07:38 -0400
Subject: [PATCH 1382/1490] fontconfig 2.10: Don't use stdenv.cross

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

diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix
index 302992fc8c8..7eaba8f75ec 100644
--- a/pkgs/development/libraries/fontconfig/2.10.nix
+++ b/pkgs/development/libraries/fontconfig/2.10.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, freetype, expat }:
+{ stdenv, fetchurl, pkgconfig, freetype, expat
+, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "fontconfig-2.10.2";
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   # We should find a better way to access the arch reliably.
-  crossArch = stdenv.cross.arch or null;
+  crossArch = hostPlatform.arch or null;
 
   preConfigure = ''
     if test -n "$crossConfig"; then
-- 
GitLab


From 9b2d1cbc7042056dd475f4c5aa41b04c992b9495 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:09:01 -0400
Subject: [PATCH 1383/1490] fontconfig default: Don't use stdenv.cross

---
 pkgs/development/libraries/fontconfig/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 14983b744df..f176aa0878c 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts
-, substituteAll }:
+{ stdenv, substituteAll, fetchurl, fetchpatch
+, pkgconfig, freetype, expat, libxslt, dejavu_fonts
+, hostPlatform
+}:
 
 /** Font configuration scheme
  - ./config-compat.patch makes fontconfig try the following root configs, in order:
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
   ];
 
   # We should find a better way to access the arch reliably.
-  crossArch = stdenv.cross.arch or null;
+  crossArch = hostPlatform.arch or null;
 
   preConfigure = ''
     if test -n "$crossConfig"; then
-- 
GitLab


From cebe4ee5c99d50eaff7d0ffb280a17ff8d471c81 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:10:03 -0400
Subject: [PATCH 1384/1490] freetype default: Don't use stdenv.cross

---
 pkgs/development/libraries/freetype/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 9b2c6fe11e1..8f16f85cabf 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,12 +1,12 @@
-{
-  stdenv, lib, fetchurl, copyPathsToStore,
-  pkgconfig, which,
-  zlib, bzip2, libpng, gnumake, glib,
+{ stdenv, lib, fetchurl, copyPathsToStore
+, hostPlatform
+, pkgconfig, which
+, zlib, bzip2, libpng, gnumake, glib
 
-  # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
+, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering).
   # LCD filtering is also known as ClearType and covered by several Microsoft patents.
   # This option allows it to be disabled. See http://www.freetype.org/patents.html.
-  useEncumberedCode ? true,
+  useEncumberedCode ? true
 }:
 
 let
@@ -67,7 +67,7 @@ in stdenv.mkDerivation {
 
   postInstall = glib.flattenInclude;
 
-  crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc or null != "msvcrt") {
+  crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") {
     # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
     # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't
     # know why it's on the PATH.
-- 
GitLab


From ade488c52a32433b1dc4d20f39fead75bcc4ee3d Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:11:06 -0400
Subject: [PATCH 1385/1490] glew 1.10: Don't use stdenv ? cross

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

diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix
index 8500a54f970..b2e1b26704f 100644
--- a/pkgs/development/libraries/glew/1.10.nix
+++ b/pkgs/development/libraries/glew/1.10.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i 's|lib64|lib|' config/Makefile.linux
-    ${optionalString (stdenv ? cross) ''
+    ${optionalString (hostPlatform != buildPlatform) ''
     sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
     ''}
   '';
-- 
GitLab


From de1125ea2caca9ca76dc1b4ade84565b5547ca0c Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:12:05 -0400
Subject: [PATCH 1386/1490] glew default: Don't use stdenv ? cross

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

diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index f8df5d5baf0..ecf1e914a7b 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i 's|lib64|lib|' config/Makefile.linux
-    ${optionalString (stdenv ? cross) ''
+    ${optionalString (hostPlatform != buildPlatform) ''
     sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile
     ''}
   '';
-- 
GitLab


From 58196b607e18c3c99268d40a0fee60462dccbdaf Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:13:11 -0400
Subject: [PATCH 1387/1490] libav: Don't use stdenv.cross

---
 pkgs/development/libraries/libav/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 785e3599bf1..3d4fbab3e42 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -13,6 +13,7 @@
 , SDL # only for avplay in $bin, adds nontrivial closure to it
 , enableGPL ? true # ToDo: some additional default stuff may need GPL
 , enableUnfree ? faacSupport
+, hostPlatform
 }:
 
 assert faacSupport -> enableUnfree;
@@ -107,10 +108,10 @@ let
     crossAttrs = {
       configurePlatforms = [];
       configureFlags = configureFlags ++ [
-        "--cross-prefix=${stdenv.cross.config}-"
+        "--cross-prefix=${stdenv.cc.prefix}"
         "--enable-cross-compile"
         "--target_os=linux"
-        "--arch=${stdenv.cross.arch}"
+        "--arch=${hostPlatform.arch}"
         ];
     };
 
-- 
GitLab


From 5a21bb6917abc75f294b49b7902bc9b5545aad82 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:13:56 -0400
Subject: [PATCH 1388/1490] libffi: Don't use stdenv ? cross

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

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index b203f634647..ca149bd3db3 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv, dejagnu, doCheck ? false }:
+{ fetchurl, stdenv, dejagnu, doCheck ? false
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "libffi-3.2.1";
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
 
   inherit doCheck;
 
-  dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
+  dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling.
 
   # Install headers and libs in the right places.
   postFixup = ''
-- 
GitLab


From db0af50973c11fbd3a402ad703012d4af8c70be9 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:14:36 -0400
Subject: [PATCH 1389/1490] libiconv: Don't use stdenv ? cross

---
 pkgs/development/libraries/libiconv/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 4c634de9246..a056f148683 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -1,6 +1,8 @@
-{ fetchurl, stdenv, lib }:
+{ fetchurl, stdenv, lib
+, buildPlatform, hostPlatform
+}:
 
-assert !stdenv.isLinux || stdenv ? cross; # TODO: improve on cross
+assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross
 
 stdenv.mkDerivation rec {
   name = "libiconv-${version}";
@@ -17,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   postPatch =
-    lib.optionalString ((stdenv ? cross && stdenv.cross.libc == "msvcrt") || stdenv.cc.nativeLibc)
+    lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc)
       ''
         sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
       '';
-- 
GitLab


From 737e344e503df91aef707649e82b1294e709f960 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:16:39 -0400
Subject: [PATCH 1390/1490] libjpeg-turbo: Don't use stdenv.cross

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

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index a59a1702e17..cd8484170bd 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, nasm }:
+{ stdenv, fetchurl, nasm
+, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "libjpeg-turbo-${version}";
@@ -10,7 +12,7 @@ stdenv.mkDerivation rec {
   }; # github releases still need autotools, surprisingly
 
   patches =
-    stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt")
+    stdenv.lib.optional (hostPlatform.libc or null == "msvcrt")
       ./mingw-boolean.patch;
 
   outputs = [ "bin" "dev" "out" "doc" ];
-- 
GitLab


From a9c90df12ef0d462e42363e9613d7517ae333e53 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:17:38 -0400
Subject: [PATCH 1391/1490] libmsgpack generic: Don't use stdenv.cross

---
 pkgs/development/libraries/libmsgpack/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix
index 2da703da4cf..c6870f77f1f 100644
--- a/pkgs/development/libraries/libmsgpack/generic.nix
+++ b/pkgs/development/libraries/libmsgpack/generic.nix
@@ -1,5 +1,6 @@
 { stdenv, cmake
 , version, src, patches ? [ ]
+, hostPlatform
 , ...
 }:
 
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   crossAttrs = {
-  } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
+  } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
     cmakeFlags = "-DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=Windows";
   };
 
-- 
GitLab


From bdbdb08eef9b0407fe16fac2ec9efb5b8cf5d867 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:20:55 -0400
Subject: [PATCH 1392/1490] libpng 12: Don't use stdenv ? cross

---
 pkgs/development/libraries/libpng/12.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index b3f7f96e936..457f99ef13b 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, zlib
+, buildPlatform, hostPlatform
+}:
 
-assert !(stdenv ? cross) -> zlib != null;
+assert hostPlatform == buildPlatform -> zlib != null;
 
 stdenv.mkDerivation rec {
   name = "libpng-1.2.57";
@@ -16,7 +18,7 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit zlib; };
 
-  crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
+  crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc == "libSystem") {
     propagatedBuildInputs = [];
     passthru = {};
   };
-- 
GitLab


From a850ddbefc28f947833abb021aa2eb1390c900d4 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:21:38 -0400
Subject: [PATCH 1393/1490] libpng default: Don't use stdenv.cross

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

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 92e0fa339b2..c2f50af84ca 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, zlib, apngSupport ? true }:
+{ stdenv, fetchurl, zlib, apngSupport ? true
+, buildPlatform, hostPlatform
+}:
 
 assert zlib != null;
 
@@ -29,7 +31,7 @@ in stdenv.mkDerivation rec {
 
   # it's hard to cross-run tests and some check programs didn't compile anyway
   makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
-  doCheck = ! stdenv ? cross;
+  doCheck = hostPlatform == buildPlatform;
 
   passthru = { inherit zlib; };
 
-- 
GitLab


From 9d56714419208e598f8c0b66024e419912d2c24b Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:22:12 -0400
Subject: [PATCH 1394/1490] libssh2: Don't use stdenv.cross

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

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 4320cacc590..4d754dc8086 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchurlBoot, openssl, zlib, windows}:
+{ stdenv, fetchurlBoot, openssl, zlib, windows
+, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "libssh2-1.8.0";
@@ -20,7 +22,7 @@ stdenv.mkDerivation rec {
       "--with-libz"
       "--with-libz-prefix=${zlib.crossDrv}"
     ];
-  } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
+  } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
     # mingw needs import library of ws2_32 to build the shared library
     preConfigure = ''
       export LDFLAGS="-L${windows.mingw_w64}/lib $LDFLAGS"
-- 
GitLab


From 8b726dc11654901224b3142348b8a55460fae550 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:22:44 -0400
Subject: [PATCH 1395/1490] newt: Don't use stdenv.cross

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

diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index 8a4b793cad7..9002d06693e 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lncurses";
 
   crossAttrs = {
-    makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-";
+    makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 51856df2a1b465eb93d5966f2013f64a916d5a65 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:23:34 -0400
Subject: [PATCH 1396/1490] nlohmann_json: Don't use stdenv.cross

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

diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index a5a808c1f61..9fb614cd071 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake
+, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "nlohmann_json-${version}";
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
   crossAttrs = {
     cmakeFlags = "-DBuildTests=OFF";
     doCheck = false;
-  } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
+  } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
     cmakeFlags = "-DBuildTests=OFF -DCMAKE_SYSTEM_NAME=Windows";
   };
 
-- 
GitLab


From d28eb3b7a04dc7b057e3f0ee77cc7e07cfc7cf61 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:24:16 -0400
Subject: [PATCH 1397/1490] poppler: Don't use stdenv.cross

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

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 20e35fa3e08..856c7bac8ce 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -6,6 +6,7 @@
 , introspectionSupport ? false, gobjectIntrospection ? null
 , utils ? false
 , minimal ? false, suffix ? "glib"
+, hostPlatform
 }:
 
 let # beware: updates often break cups-filters build
@@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
 
   crossAttrs.postPatch =
     # there are tests using `strXXX_s` functions that are missing apparently
-    stdenv.lib.optionalString (stdenv.cross.libc or null == "msvcrt")
+    stdenv.lib.optionalString (hostPlatform.libc or null == "msvcrt")
       "sed '/^SUBDIRS =/s/ test / /' -i Makefile.in";
 
   meta = with lib; {
-- 
GitLab


From a46b063ac1038be9e52b97714d7a1a090d53545f Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:25:05 -0400
Subject: [PATCH 1398/1490] readline 6.2: Don't use stdenv ? cross

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

diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix
index 65ab4ed24ce..2c800e23b27 100644
--- a/pkgs/development/libraries/readline/6.2.nix
+++ b/pkgs/development/libraries/readline/6.2.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchurl, stdenv, ncurses
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation (rec {
   name = "readline-6.2";
@@ -57,6 +59,6 @@ stdenv.mkDerivation (rec {
 //
 
 # Don't run the native `strip' when cross-compiling.
-(if (stdenv ? cross)
+(if hostPlatform != buildPlatform
  then { dontStrip = true; }
  else { }))
-- 
GitLab


From 45272c98f5c0cfe90176b706de9384e4c2803afb Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:26:37 -0400
Subject: [PATCH 1399/1490] readline 6.3: Don't use stdenv ? cross

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

diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index 80cc7e923b8..822ce7b0055 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchurl, stdenv, ncurses
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "readline-6.3p08";
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
        import ./readline-6.3-patches.nix patch);
 
   # Don't run the native `strip' when cross-compiling.
-  dontStrip = stdenv ? cross;
+  dontStrip = hostPlatform != buildPlatform;
   bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
 
   meta = with stdenv.lib; {
-- 
GitLab


From f9730bc8dadd9f4d170a5f3ac3cfb7dedd08250f Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:27:22 -0400
Subject: [PATCH 1400/1490] readline 7.0: Don't use stdenv ? cross

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

diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 9d1c1c57f8c..7cc76e08768 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchurl, stdenv, ncurses
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "readline-${version}";
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
     */
 
   # Don't run the native `strip' when cross-compiling.
-  dontStrip = stdenv ? cross;
+  dontStrip = hostPlatform != buildPlatform;
   bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
 
   meta = with stdenv.lib; {
-- 
GitLab


From 3e69864717c89aa8cef18f17bcb1f8f16a6fdf1f Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:28:34 -0400
Subject: [PATCH 1401/1490] cmake 2.8: Don't use stdenv ? cross

---
 pkgs/development/tools/build-managers/cmake/2.8.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index 590de68d52f..fb38e52811c 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2
 , useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
+, buildPlatform, hostPlatform
 }:
 
 with stdenv.lib;
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
     })] ++
     # Don't search in non-Nix locations such as /usr, but do search in our libc.
     [ ./search-path.patch ] ++
-    optional (stdenv ? cross) (fetchurl {
+    optional (hostPlatform != buildPlatform) (fetchurl {
       name = "fix-darwin-cross-compile.patch";
       url = "http://public.kitware.com/Bug/file_download.php?"
           + "file_id=4981&type=bug";
-- 
GitLab


From 9cd606467fa0648e851bf8c5436bc773b6a1c5bc Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:29:17 -0400
Subject: [PATCH 1402/1490] libtool2: Don't use stdenv ? cross

---
 pkgs/development/tools/misc/libtool/libtool2.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index a81255212da..f25fbcd00d8 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, m4, perl, help2man }:
+{ stdenv, fetchurl, m4, perl, help2man
+, buildPlatform, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "libtool-2.4.6";
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
 
   # Don't run the native `strip' when cross-compiling.  This breaks at least
   # with `.a' files for MinGW.
-  dontStrip = stdenv ? cross;
+  dontStrip = hostPlatform != buildPlatform;
 
   meta = {
     description = "GNU Libtool, a generic library support script";
-- 
GitLab


From a7f81284a5adac45370a876c98e628b2ef7156d3 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:30:13 -0400
Subject: [PATCH 1403/1490] uboot: Don't use stdenv.cross

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

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 07ccd419f4b..a3e4f12cd89 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, bc, dtc, python2 }:
+{ stdenv, fetchurl, bc, dtc, python2
+, hostPlatform
+}:
 
 let
   buildUBoot = { targetPlatforms
@@ -43,8 +45,8 @@ let
 
     crossAttrs = {
       makeFlags = [
-        "ARCH=${stdenv.cross.platform.kernelArch}"
-        "CROSS_COMPILE=${stdenv.cross.config}-"
+        "ARCH=${hostPlatform.platform.kernelArch}"
+        "CROSS_COMPILE=${stdenv.cc.prefix}"
       ];
     };
 
-- 
GitLab


From c5b4b6c911a2965bd616370ec79262df3a4036f5 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:30:50 -0400
Subject: [PATCH 1404/1490] kernel-headers: Don't use stdenv.cross

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

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index a33d24fc847..da67747b8b2 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, kernel, perl }:
+{ stdenv, kernel, perl
+, hostPlatform
+}:
 
 let
   baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ];
@@ -13,7 +15,7 @@ in stdenv.mkDerivation {
 
   crossAttrs = {
     inherit (kernel.crossDrv) src patches;
-    buildFlags = [ "ARCH=${stdenv.cross.platform.kernelArch}" ] ++ baseBuildFlags;
+    buildFlags = [ "ARCH=${hostPlatform.platform.kernelArch}" ] ++ baseBuildFlags;
   };
 
   installPhase = ''
-- 
GitLab


From b0a4c2c33f7004be50284186b314255b47554edd Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 27 Jun 2017 19:35:55 -0400
Subject: [PATCH 1405/1490] nixos: installer.nix test: test ZFS install use
 case

---
 nixos/release-combined.nix |  1 +
 nixos/tests/installer.nix  | 39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index eca2d281342..49ddd95887b 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,6 +52,7 @@ in rec {
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
+        (all nixos.tests.installer.zfsroot)
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.luksroot)
         (all nixos.tests.installer.separateBoot)
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 85d31334d6b..a6afe8a4b72 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -171,6 +171,7 @@ let
 
   makeInstallerTest = name:
     { createPartitions, preBootCommands ? "", extraConfig ? ""
+    , extraInstallerConfig ? {}
     , bootLoader ? "grub" # either "grub" or "systemd-boot"
     , grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid"
     , enableOCR ? false, meta ? {}
@@ -192,6 +193,7 @@ let
           { imports =
               [ ../modules/profiles/installation-device.nix
                 ../modules/profiles/base.nix
+                extraInstallerConfig
               ];
 
             virtualisation.diskSize = 8 * 1024;
@@ -332,6 +334,43 @@ in {
         '';
     };
 
+  # zfs on / with swap
+  zfsroot = makeInstallerTest "zfs-root"
+    {
+      extraInstallerConfig = {
+        boot.supportedFilesystems = [ "zfs" ];
+      };
+
+      extraConfig = ''
+        boot.supportedFilesystems = [ "zfs" ];
+
+        # Using by-uuid overrides the default of by-id, and is unique
+        # to the qemu disks, as they don't produce by-id paths for
+        # some reason.
+        boot.zfs.devNodes = "/dev/disk/by-uuid/";
+        networking.hostId = "00000000";
+      '';
+
+      createPartitions =
+        ''
+          $machine->succeed(
+              "parted /dev/vda mklabel msdos",
+              "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
+              "parted /dev/vda -- mkpart primary 1024M -1s",
+              "udevadm settle",
+
+              "mkswap /dev/vda1 -L swap",
+              "swapon -L swap",
+
+              "zpool create rpool /dev/vda2",
+              "zfs create -o mountpoint=legacy rpool/root",
+              "mount -t zfs rpool/root /mnt",
+
+              "udevadm settle"
+          );
+        '';
+    };
+
   # Create two physical LVM partitions combined into one volume group
   # that contains the logical swap and root partitions.
   lvm = makeInstallerTest "lvm"
-- 
GitLab


From 4f3f9269061c3a724d142451f38775f9c0c1556a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 28 Jun 2017 11:42:14 -0400
Subject: [PATCH 1406/1490] nixos manual: Remove trailing newline in version
 XML

---
 nixos/doc/manual/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 40d49f1541b..7e0d4ad92b0 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -65,7 +65,7 @@ let
       chmod -R u+w .
       ln -s ${modulesDoc} configuration/modules.xml
       ln -s ${optionsDocBook} options-db.xml
-      echo "${version}" > version
+      printf "%s" "${version}" > version
     '';
 
   toc = builtins.toFile "toc.xml"
-- 
GitLab


From 459d07d41cccbfecf3f1b313dd93fe33e38ff153 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:32:25 -0400
Subject: [PATCH 1407/1490] kernel generic: Don't use stdenv.cross

---
 pkgs/os-specific/linux/kernel/generic.nix                   | 5 +++--
 pkgs/os-specific/linux/kernel/linux-3.10.nix                | 2 +-
 pkgs/os-specific/linux/kernel/linux-4.11.nix                | 2 +-
 pkgs/os-specific/linux/kernel/linux-4.4.nix                 | 2 +-
 pkgs/os-specific/linux/kernel/linux-4.9.nix                 | 2 +-
 pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix     | 2 +-
 pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 2 +-
 pkgs/os-specific/linux/kernel/linux-mptcp.nix               | 2 +-
 pkgs/os-specific/linux/kernel/linux-rpi.nix                 | 2 +-
 pkgs/os-specific/linux/kernel/linux-testing.nix             | 2 +-
 10 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 16b35e9aa3e..bbe86792692 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -25,6 +25,7 @@
   kernelPatches ? []
 , ignoreConfigErrors ? stdenv.platform.name != "pc"
 , extraMeta ? {}
+, hostPlatform
 , ...
 }:
 
@@ -59,7 +60,7 @@ let
     arch = stdenv.platform.kernelArch;
 
     crossAttrs = let
-        cp = stdenv.cross.platform;
+        cp = hostPlatform.platform;
       in {
         arch = cp.kernelArch;
         platformName = cp.name;
@@ -128,7 +129,7 @@ let
     };
 
   config = configWithPlatform stdenv.platform;
-  configCross = configWithPlatform stdenv.cross.platform;
+  configCross = configWithPlatform hostPlatform.platform;
 
   nativeDrv = lib.addPassthru kernel.nativeDrv passthru;
 
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 8ab879f7b00..9587ba356ff 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "3.10.105";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index f74b8f62120..3019c6fcb96 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "4.11.7";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 5328bb9a043..4f272c2e43f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "4.4.73";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 38d63a22f70..a45ba31c0a9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "4.9.34";
diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
index b80c9acd659..e27b2afb200 100644
--- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, perl, buildLinux, ncurses, ... } @ args:
+{ stdenv, hostPlatform, fetchgit, perl, buildLinux, ncurses, ... } @ args:
 
 # ChromiumOS requires a 64bit build host
 assert stdenv.is64bit;
diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 36a01921512..7f4a89dc51e 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
+{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
   version = "4.11.7";
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index 3d244b794e9..7e6110bf4a3 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   mptcpVersion = "0.91.3";
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 9bc6feb3de2..0e7f332e617 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
+{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
   modDirVersion = "4.9.24";
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 6bde598c47a..45c6a5bf0e8 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
   version = "4.12-rc6";
-- 
GitLab


From 1e3b45cfdb17d6d83229c2ae677d31f8736d90f0 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:33:04 -0400
Subject: [PATCH 1408/1490] kernel manual-config: Don't use stdenv.cross

---
 pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 3466cafa266..c295293fa2c 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -1,5 +1,6 @@
 { stdenv, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl
 , writeTextFile, ubootChooser
+, hostPlatform
 }:
 
 let
@@ -232,7 +233,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe
 
   karch = stdenv.platform.kernelArch;
 
-  crossAttrs = let cp = stdenv.cross.platform; in
+  crossAttrs = let cp = hostPlatform.platform; in
     (drvAttrs crossConfig cp (kernelPatches ++ crossKernelPatches) crossConfigfile) // {
       makeFlags = commonMakeFlags ++ [
         "ARCH=${cp.kernelArch}"
-- 
GitLab


From 16781a389237acac3342f8440f5afd282627448f Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:37:58 -0400
Subject: [PATCH 1409/1490] kernel perf: Don't use stdenv.cross

---
 pkgs/os-specific/linux/kernel/perf.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 0a3b4070be1..3fbad924568 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
     /* I don't want cross-python or cross-perl -
        I don't know if cross-python even works */
     propagatedBuildInputs = [ elfutils.crossDrv newt.crossDrv ];
-    makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-";
+    makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}";
     elfutils = elfutils.crossDrv;
     inherit (kernel.crossDrv) src patches;
   };
-- 
GitLab


From 8461e31dc95f8092d4645021e049f0d164e008f4 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 28 Jun 2017 14:32:13 +0200
Subject: [PATCH 1410/1490] mergerfs: 2.16.1 -> 2.22.1

---
 lib/maintainers.nix                         |  1 +
 pkgs/tools/filesystems/mergerfs/default.nix | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 03785e791ba..c5985b12104 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -247,6 +247,7 @@
   jensbin = "Jens Binkert <jensbin@protonmail.com>";
   jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
   jfb = "James Felix Black <james@yamtime.com>";
+  jfrankenau = "Johannes Frankenau <johannes@frankenau.net>";
   jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
   jgertm = "Tim Jaeger <jger.tm@gmail.com>";
   jgillich = "Jakob Gillich <jakob@gillich.me>";
diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix
index 81f82108995..0259af7a63e 100644
--- a/pkgs/tools/filesystems/mergerfs/default.nix
+++ b/pkgs/tools/filesystems/mergerfs/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchgit, fuse, pkgconfig, which, attr, pandoc, git }:
+{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "mergerfs-${version}";
-  version = "2.16.1";
+  version = "2.22.1";
 
   # not using fetchFromGitHub because of changelog being built with git log
   src = fetchgit {
     url = "https://github.com/trapexit/mergerfs";
     rev = "refs/tags/${version}";
-    sha256 = "12fqgk54fnnibqiq82p4g2k6qnw3iy6dd64csmlf73yi67za5iwf";
+    sha256 = "12dm64l74wyagbwxsz57p8j3dwl9hgi0j3b6i0pn9m5ar7qrnv00";
     deepClone = true;
+    leaveDotGit = true;
   };
 
-  buildInputs = [ fuse pkgconfig which attr pandoc git ];
+  nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ];
+  buildInputs = [ attr libiconv ];
 
   makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ];
 
@@ -21,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/trapexit/mergerfs;
     license = stdenv.lib.licenses.isc;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ makefu ];
+    maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ];
   };
 }
-- 
GitLab


From a210b08d188404c13498ff075b9a3b28d063642d Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:38:33 -0400
Subject: [PATCH 1411/1490] klibc: Don't use crossAttrs

---
 pkgs/os-specific/linux/klibc/default.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 84b66ac0d9c..92ac1a77898 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, linuxHeaders, perl }:
+{ stdenv, fetchurl, linuxHeaders, perl
+, buildPlatform, hostPlatform
+}:
 
 let
   commonMakeFlags = [
@@ -23,17 +25,12 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" "stackprotector" ];
 
   makeFlags = commonMakeFlags ++ [
-    "KLIBCARCH=${stdenv.platform.kernelArch}"
+    "KLIBCARCH=${hostPlatform.platform.kernelArch}"
     "KLIBCKERNELSRC=${linuxHeaders}"
-  ] ++ stdenv.lib.optional (stdenv.platform.kernelArch == "arm") "CONFIG_AEABI=y";
-
-  crossAttrs = {
-    makeFlags = commonMakeFlags ++ [
-      "KLIBCARCH=${stdenv.cross.platform.kernelArch}"
-      "KLIBCKERNELSRC=${linuxHeaders.crossDrv}"
-      "CROSS_COMPILE=${stdenv.cross.config}-"
-    ] ++ stdenv.lib.optional (stdenv.cross.platform.kernelArch == "arm") "CONFIG_AEABI=y";
-  };
+  ] # TODO(@Ericson2314): We now can get the ABI from
+    # `hostPlatform.parsed.abi`, is this still a good idea?
+    ++ stdenv.lib.optional (hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y"
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform) "CROSS_COMPILE=${stdenv.cc.prefix}";
 
   # Install static binaries as well.
   postInstall = ''
-- 
GitLab


From 5d83d36389f5dbd84913e8f582e126bedd278fbe Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:39:12 -0400
Subject: [PATCH 1412/1490] mdadm: Don't use stdenv.cross

---
 pkgs/os-specific/linux/mdadm/4.nix       | 9 ++++++---
 pkgs/os-specific/linux/mdadm/default.nix | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix
index 05d98de0b23..a83e7c852ee 100644
--- a/pkgs/os-specific/linux/mdadm/4.nix
+++ b/pkgs/os-specific/linux/mdadm/4.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, groff }:
+{ stdenv
+, fetchurl, groff
+, buildPlatform, hostPlatform
+}:
 
 assert stdenv.isLinux;
 
@@ -19,8 +22,8 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
     "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
-  ] ++ stdenv.lib.optionals (stdenv ? cross) [
-    "CROSS_COMPILE=${stdenv.cross.config}-"
+  ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.prefix}"
   ];
 
   nativeBuildInputs = [ groff ];
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index e0109791ef2..589099c911c 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, groff }:
+{ stdenv
+, fetchurl, groff
+, buildPlatform, hostPlatform
+}:
 
 assert stdenv.isLinux;
 
@@ -19,8 +22,8 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
     "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
-  ] ++ stdenv.lib.optionals (stdenv ? cross) [
-    "CROSS_COMPILE=${stdenv.cross.config}-"
+  ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.prefix}"
   ];
 
   nativeBuildInputs = [ groff ];
-- 
GitLab


From 66e22e1229fc6d544381d4450425d8bd5dc3f2ac Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:40:25 -0400
Subject: [PATCH 1413/1490] mingetty: Rely on cc-wrapper to export this env var

---
 pkgs/os-specific/linux/mingetty/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix
index 4e2888fa942..a8348acd5d7 100644
--- a/pkgs/os-specific/linux/mingetty/default.nix
+++ b/pkgs/os-specific/linux/mingetty/default.nix
@@ -8,10 +8,6 @@ stdenv.mkDerivation {
     sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g";
   };
 
-  crossAttrs = {
-    makeFlags = "CC=${stdenv.cross.config}-gcc";
-  };
-
   preInstall = ''
     mkdir -p $out/sbin $out/share/man/man8
     makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8)
-- 
GitLab


From b8ed3c65bb23aeb845b45bafd44d920219d891a3 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:41:06 -0400
Subject: [PATCH 1414/1490] propcps: Rely on cc-wrapper to export this env var

---
 pkgs/os-specific/linux/procps-ng/default.nix | 4 ----
 pkgs/os-specific/linux/procps/watch.nix      | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index c52dfbe461a..bccae52c367 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -15,10 +15,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  crossAttrs = {
-    CC = stdenv.cross.config + "-gcc";
-  };
-
   # Too red
   configureFlags = [ "--disable-modern-top" ];
 
diff --git a/pkgs/os-specific/linux/procps/watch.nix b/pkgs/os-specific/linux/procps/watch.nix
index 2547e26def4..5fdd1287a64 100644
--- a/pkgs/os-specific/linux/procps/watch.nix
+++ b/pkgs/os-specific/linux/procps/watch.nix
@@ -15,10 +15,6 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  crossAttrs = {
-    CC = stdenv.cross.config + "-gcc";
-  };
-
   installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin";
 
   meta = {
-- 
GitLab


From a291194d2f38a7cf300d29ddd4a928409769a508 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:42:27 -0400
Subject: [PATCH 1415/1490] shadow: Don't use stdenv ? cross

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

diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 6d83c98a422..0c0edde05e2 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -1,11 +1,13 @@
 { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2
 , docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison
-, pam ? null, glibcCross ? null }:
+, pam ? null, glibcCross ? null
+, buildPlatform, hostPlatform
+}:
 
 let
 
   glibc =
-    if stdenv ? cross
+    if hostPlatform != buildPlatform
     then glibcCross
     else assert stdenv ? glibc; stdenv.glibc;
 
-- 
GitLab


From 14d3ed8c386d8444e59b342617f9ccef343382a2 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:43:18 -0400
Subject: [PATCH 1416/1490] sysvinit: Rely on cc-wrapper to export this env var

---
 pkgs/os-specific/linux/sysvinit/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 042e601ec14..6ec8abdc176 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -15,11 +15,7 @@ stdenv.mkDerivation {
     sed -i -e "s,/sbin/,$out/sbin/," src/halt.c src/init.c src/paths.h
   '';
 
-  makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man";
-
-  crossAttrs = {
-    makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man CC=${stdenv.cross.config}-gcc";
-  };
+  makeFlags = [ "SULOGINLIBS=-lcrypt" "ROOT=$(out)" "MANDIR=/share/man" ];
 
   preInstall =
     ''
-- 
GitLab


From c4ab3ef580704a00e2de00180de089043da2e0e2 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:44:00 -0400
Subject: [PATCH 1417/1490] jom: Don't use stdenc.cross

---
 pkgs/os-specific/windows/jom/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix
index 6537503add8..b2b23f20045 100644
--- a/pkgs/os-specific/windows/jom/default.nix
+++ b/pkgs/os-specific/windows/jom/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   QTDIR = qt48;
   
   crossAttrs = {
-    # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cross.config}-windres";
+    # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.prefix}windres";
     QTDIR = qt48.crossDrv;
     preBuild = ''
       export NIX_CROSS_CFLAGS_COMPILE=-fpermissive
-- 
GitLab


From 2f37cad1b976ceec47d92dc1e3bc9456cf49ea1f Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:44:54 -0400
Subject: [PATCH 1418/1490] wxMSW-2.8: Don't use stdenv ? cross

---
 pkgs/os-specific/windows/pthread-w32/default.nix | 2 +-
 pkgs/os-specific/windows/wxMSW-2.8/default.nix   | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index dde4f5d7371..f0b6852d5bf 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, mingw_headers }:
 
 # This file is tweaked for cross-compilation only.
-assert stdenv ? cross;
+assert hostPlatform != buildPlatform;
 
 stdenv.mkDerivation {
   name = "pthread-w32-1.10.0";
diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
index 5c79460060a..6c52ce1e6f3 100644
--- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix
+++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true,
+, hostPlatform
 }:
 
-assert stdenv ? cross -> stdenv.cross.libc == "msvcrt";
+assert hostPlatform.isWindows;
 
 stdenv.mkDerivation {
   name = "wxMSW-2.8.11";
@@ -19,12 +20,6 @@ stdenv.mkDerivation {
     "--with-opengl"
   ];
 
-  # Cross build only tested for mingw32
-  checkCross = throw "This package can only be cross-built" false;
-  crossAttrs = {
-    checkCross = true;
-  };
-
   preConfigure = "
     substituteInPlace configure --replace /usr /no-such-path
   ";
-- 
GitLab


From 1b882edf780a6260cb0a5288a3582ca4d9db82cf Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:46:25 -0400
Subject: [PATCH 1419/1490] mtdutils: Rely on cc-wrapper to export this env var

---
 pkgs/tools/filesystems/mtdutils/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index ed3850b9fdd..d0ceaf94a75 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -15,10 +15,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libuuid lzo zlib acl ];
 
-  crossAttrs = {
-    makeFlags = "CC=${stdenv.cross.config}-gcc";
-  };
-
   meta = {
     description = "Tools for MTD filesystems";
     license = stdenv.lib.licenses.gpl2Plus;
-- 
GitLab


From 822084fa37192b41fb234e01a220efa064c0d64b Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:47:36 -0400
Subject: [PATCH 1420/1490] tcpdump: Don't use stdenv.cross

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

diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 42cb3867e05..a7130a3891b 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libpcap, enableStatic ? false }:
+{ stdenv, fetchurl, libpcap, enableStatic ? false
+, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "tcpdump-${version}";
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
   crossAttrs = {
     LDFLAGS = if enableStatic then "-static" else "";
     configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional
-      (stdenv.cross.platform.kernelMajor == "2.4") "--disable-ipv6");
+      (hostPlatform.platform.kernelMajor == "2.4") "--disable-ipv6");
   };
 
   meta = {
-- 
GitLab


From 40be9738abfcde500937f1d7e2356164e77658e8 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:48:43 -0400
Subject: [PATCH 1421/1490] nix: Don't use stdenv.cross

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3aa18fad942..45dfd52dba1 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -2,6 +2,7 @@
 , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline
 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
 , libseccomp, busybox
+, hostPlatform
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
@@ -95,8 +96,8 @@ let
           --disable-init-state
           --enable-gc
         '' + stdenv.lib.optionalString (
-            stdenv.cross ? nix && stdenv.cross.nix ? system
-        ) ''--with-system=${stdenv.cross.nix.system}'';
+            hostPlatform ? nix && hostPlatform.nix ? system
+        ) ''--with-system=${hostPlatform.nix.system}'';
 
       doInstallCheck = false;
     };
-- 
GitLab


From 82a09181a4bac183b98084d7e1f463d8c98afff6 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:55:16 -0400
Subject: [PATCH 1422/1490] tm: Rely on cc-wrapper to export this env var

---
 pkgs/tools/system/tm/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix
index 3326f535b5f..3442dbb62b0 100644
--- a/pkgs/tools/system/tm/default.nix
+++ b/pkgs/tools/system/tm/default.nix
@@ -10,10 +10,6 @@ stdenv.mkDerivation {
     sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile
   '';
 
-  crossAttrs = {
-    makeFlags = "CC=${stdenv.cross.config}-gcc";
-  };
-
   src = fetchurl {
     url = http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz;
     sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0";
-- 
GitLab


From 60ce1e3b901013f5e5715c51a799940efc6cc2a4 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:55:50 -0400
Subject: [PATCH 1423/1490] ts: Rely on cc-wrapper to export this env var

---
 pkgs/tools/system/ts/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 97b35378673..cce18b5d54b 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -1,5 +1,6 @@
-{stdenv, fetchurl,
-sendmailPath ? "/run/wrappers/bin/sendmail" }:
+{ stdenv, fetchurl
+, sendmailPath ? "/run/wrappers/bin/sendmail"
+}:
 
 stdenv.mkDerivation rec {
 
@@ -7,10 +8,6 @@ stdenv.mkDerivation rec {
 
   installPhase=''make install "PREFIX=$out"'';
 
-  crossAttrs = {
-    makeFlags = "CC=${stdenv.cross.config}-gcc";
-  };
-
   patchPhase = ''
     sed -i s,/usr/sbin/sendmail,${sendmailPath}, mail.c ts.1
   '';
-- 
GitLab


From 936196129d0cf8500106bbd66c25d18b19dae3ec Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:56:12 -0400
Subject: [PATCH 1424/1490] html-tidy: Don't use stdenv.cross

---
 pkgs/tools/text/html-tidy/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index 1a264885b48..cc3283cf854 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, libxslt }:
+{ stdenv, fetchFromGitHub, cmake, libxslt
+, hostPlatform
+}:
 
 stdenv.mkDerivation rec {
   name = "html-tidy-${version}";
@@ -14,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake libxslt/*manpage*/ ];
 
   cmakeFlags = stdenv.lib.optional
-    (stdenv.cross.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows";
+    (hostPlatform.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows";
 
   # ATM bin/tidy is statically linked, as upstream provides no other option yet.
   # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107
-- 
GitLab


From 10685e395655b0ccf5e863d948c79dd153db923e Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 16:57:08 -0400
Subject: [PATCH 1425/1490] replace: Rely on cc-wrapper to export env var

---
 pkgs/tools/text/replace/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix
index 40728c2c3ec..18ef074c8a5 100644
--- a/pkgs/tools/text/replace/default.nix
+++ b/pkgs/tools/text/replace/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "replace-2.24";
@@ -10,10 +10,6 @@ stdenv.mkDerivation {
 
   makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man";
 
-  crossAttrs = {
-    makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc";
-  };
-
   preBuild = ''
     sed -e "s@/bin/mv@$(type -P mv)@" -i replace.h
   '';
-- 
GitLab


From 9f156f4a8a945dee1beeb49f6c2acb395c0af9c8 Mon Sep 17 00:00:00 2001
From: hsloan <ishaqsloan@gmail.com>
Date: Wed, 28 Jun 2017 17:39:33 -0400
Subject: [PATCH 1426/1490] top-level: stdenv.cross vanquished

---
 doc/cross-compilation.xml | 5 -----
 pkgs/top-level/stage.nix  | 2 --
 2 files changed, 7 deletions(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 7ff35437611..650db718665 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -79,11 +79,6 @@
         </listitem>
       </varlistentry>
     </variablelist>
-    <note><para>
-      If you dig around nixpkgs, you may notice there is also <varname>stdenv.cross</varname>.
-      This field defined as <varname>hostPlatform</varname> when the host and build platforms differ, but otherwise not defined at all.
-      This field is obsolete and will soon disappear—please do not use it.
-    </para></note>
     <para>
       The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
       You can see examples of ones used in practice in <literal>lib.systems.examples</literal>; note how they are not all very consistent.
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index f6e7f41ed88..2a8f4ff4b3c 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -110,8 +110,6 @@ let
   in {
     stdenv = super.stdenv // {
       inherit (buildPlatform) platform;
-    } // lib.optionalAttrs (hostPlatform != buildPlatform) {
-      cross = hostPlatform;
     };
     inherit (buildPlatform) system platform;
   };
-- 
GitLab


From f57fadc5366e18289cdde3c69658bb89644feab8 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Wed, 28 Jun 2017 20:19:02 +0200
Subject: [PATCH 1427/1490] sbcl: 1.3.18 -> 1.3.19

Updated sbcl with new version released today.  Tested on nixos 17.03
x86_64, sbcl executable runs.  Thanks.

From 36da6ad6eac68fdf2c8876c0a35642aa3e5c9d96 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Wed, 28 Jun 2017 20:12:58 +0200
Subject: [PATCH] sbcl: 1.3.18 -> 1.3.19
---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 036a3b9f3d4..3bd1982baa5 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.18";
+  version = "1.3.19";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "13irc67v02xa861n9g4lq7q80pnd8drkrgmigqdl9b2mp8n64bgv";
+    sha256 = "0660gw43myikpa6n2qjhjxz61ilqazva4v8shljgwymag99risxm";
   };
 
   patchPhase = ''
-- 
GitLab


From 312c2f7961c2907d521e11438e176e33f563f5af Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 28 Jun 2017 22:24:19 -0400
Subject: [PATCH 1428/1490] virtualbox: Add ability to disable 32-bit guest
 support

---
 pkgs/applications/virtualization/virtualbox/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 7567b3d3511..73ba76676b9 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -9,6 +9,7 @@
 , pulseSupport ? false, libpulseaudio ? null
 , enableHardening ? false
 , headless ? false
+, enable32bitGuests ? true
 , patchelfUnstable # needed until 0.10 is released
 }:
 
@@ -128,6 +129,7 @@ in stdenv.mkDerivation {
       ${optionalString (!pythonBindings) "--disable-python"} \
       ${optionalString (!pulseSupport) "--disable-pulse"} \
       ${optionalString (!enableHardening) "--disable-hardening"} \
+      ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \
       --disable-kmods --with-mkisofs=${xorriso}/bin/xorrisofs
     sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
         -i AutoConfig.kmk
-- 
GitLab


From 226aadd6b07de3576c05b977dcf51070def050f9 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 28 Jun 2017 08:42:37 -0300
Subject: [PATCH 1429/1490] monoid: init at 2016-07-21

---
 pkgs/data/fonts/monoid/default.nix | 41 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/data/fonts/monoid/default.nix

diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix
new file mode 100644
index 00000000000..5e9a2c21916
--- /dev/null
+++ b/pkgs/data/fonts/monoid/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, python, fontforge }:
+
+stdenv.mkDerivation rec {
+  name = "monoid-${version}";
+  version = "2016-07-21";
+
+  src = fetchFromGitHub {
+    owner = "larsenwork";
+    repo = "monoid";
+    rev = "e9d77ec18c337dc78ceae787a673328615f0b120";
+    sha256 = "07h5q6cn6jjpmxp9vyag1bxx481waz344sr2kfs7d37bba8yjydj";
+  };
+
+  nativeBuildInputs = [ python fontforge ];
+
+  enableParallelBuilding = true;
+
+  buildPhase = ''
+    local _d=""
+    local _l=""
+    for _d in {Monoisome,Source}/*.sfdir; do
+      _l="''${_d##*/}.log"
+      echo "Building $_d (log at $_l)"
+      python Scripts/build.py ${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} 0 $_d > $_l
+    done
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/{doc,fonts/truetype}
+    cp -va _release/* $out/share/fonts/truetype
+    cp -va Readme.md $out/share/doc
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://larsenwork.com/monoid;
+    description = "Customisable coding font with alternates, ligatures and contextual positioning";
+    license = [ licenses.ofl licenses.mit ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff58787a286..1ea4f77a23f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12860,6 +12860,8 @@ with pkgs;
 
   mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { };
 
+  monoid = callPackage ../data/fonts/monoid { };
+
   mononoki = callPackage ../data/fonts/mononoki { };
 
   moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
-- 
GitLab


From b0ada07f36abc21c990000b5cdbe780157d6b92b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 28 Jun 2017 22:31:24 -0400
Subject: [PATCH 1430/1490] wxMSW: Fix syntax --- travis eval did not catch

---
 pkgs/os-specific/windows/wxMSW-2.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
index 6c52ce1e6f3..8770140cc63 100644
--- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix
+++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true,
+{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true
 , hostPlatform
 }:
 
-- 
GitLab


From f4e04c3e44ff49898fdb9b258e40d2dafd6bed4f Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Wed, 28 Jun 2017 22:44:42 -0400
Subject: [PATCH 1431/1490] clac: 20170416 -> 20170503

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

diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix
index 48f3b613564..55aa438226f 100644
--- a/pkgs/tools/misc/clac/default.nix
+++ b/pkgs/tools/misc/clac/default.nix
@@ -2,13 +2,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "clac";
-  version = "0.0.0.20170416";
+  version = "0.0.0.20170503";
 
   src = fetchFromGitHub {
     owner = "soveran";
     repo = "clac";
-    rev = "828600b01e80166bc435d4d73506f0c3e16f2459";
-    sha256 = "08fhhvjrc7rn5fjjdqlallr76m6ybj3wm5gx407jbgfbky0fj7mb";
+    rev = "e92bd5cbab0d694cef945e3478820c9505e06f04";
+    sha256 = "0j8p1npgq32s377c9lw959h5i2csq4yb27cvg7av17bji46816bv";
   };
 
   buildInputs = [];
-- 
GitLab


From 815764096bd06d365bf526a1c1513dfb4926faf8 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@skami.org>
Date: Thu, 29 Jun 2017 04:51:20 +0000
Subject: [PATCH 1432/1490] Fix akonadi build.

Patch applied by James Cook <james.cook@utoronto.ca>.
---
 pkgs/applications/kde/akonadi/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index a264ebc9f09..c2e34428474 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -2,8 +2,8 @@
   mkDerivation, copyPathsToStore, lib,
   extra-cmake-modules,
   kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
-  kio,
-  boost, kitemmodels,
+  kwindowsystem, kcrash, kio,
+  boost, kitemmodels, shared_mime_info,
   mysql
 }:
 
@@ -17,6 +17,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
+    kwindowsystem kcrash shared_mime_info
   ];
   propagatedBuildInputs = [ boost kitemmodels ];
   cmakeFlags = [
-- 
GitLab


From 13ab06b05a2f288dd73d3ecf02be4481cfc521c7 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@skami.org>
Date: Thu, 29 Jun 2017 05:01:46 +0000
Subject: [PATCH 1433/1490] kde applications : fix builds by adding missing
 dependencies

Patch applied by James Cook <james.cook@utoronto.ca>.
---
 pkgs/applications/kde/akonadi-mime.nix | 6 ++++--
 pkgs/applications/kde/kig.nix          | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index 1fb50756665..98a341da6b6 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,7 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
+  akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime,
+  shared_mime_info
 }:
 
 mkDerivation {
@@ -11,6 +12,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
+  buildInputs = [ akonadi shared_mime_info
+                  kdbusaddons ki18n kio kitemmodels kmime ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index f2a1d275f6e..34b32896209 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,7 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
+  kparts, qtsvg, qtxmlpatterns, ktexteditor, boost,
+  karchive, kcrash
 }:
 
 mkDerivation {
@@ -13,7 +14,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ boost ];
   propagatedBuildInputs = [
-    kparts qtsvg qtxmlpatterns ktexteditor
+    kparts qtsvg qtxmlpatterns ktexteditor karchive kcrash
   ];
 }
 
-- 
GitLab


From da012dda0107ac8a651d76428edf1a32c7663668 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 29 Jun 2017 08:44:43 +0200
Subject: [PATCH 1434/1490] adbfs-rootless: init at 2016-10-02

---
 .../mobile/adbfs-rootless/default.nix         | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/mobile/adbfs-rootless/default.nix

diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix
new file mode 100644
index 00000000000..588b10d45a1
--- /dev/null
+++ b/pkgs/development/mobile/adbfs-rootless/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }:
+
+stdenv.mkDerivation rec {
+  name = "adbfs-rootless-${version}";
+  version = "2016-10-02";
+
+  src = fetchFromGitHub {
+    owner = "spion";
+    repo = "adbfs-rootless";
+    rev = "b58963430e40c9246710a16cec58e7ffc88baa48";
+    sha256 = "1kjibl86k6pf7vciwaaxwv5m4q28zdpd2g7yhp71av32jq6j3wm8";
+  };
+
+  patches = [
+    (fetchpatch {
+      # https://github.com/spion/adbfs-rootless/issues/14
+      url = "https://github.com/kronenpj/adbfs-rootless/commit/35f87ce0a7aeddaaad118daed3022e01453b838d.patch";
+      sha256 = "1iigla74n3hphnyx9ffli9wqk7v71ylvsxama868czlg7851jqj9";
+    })
+  ];
+
+  buildInputs = [ fuse pkgconfig ];
+
+  postPatch = ''
+    # very ugly way of replacing the adb calls
+    sed -e 's|"adb |"${stdenv.lib.getBin adb}/bin/adb |g' \
+        -i adbfs.cpp
+  '';
+
+  installPhase = ''
+    install -D adbfs $out/bin/adbfs
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Mount Android phones on Linux with adb, no root required";
+    inherit (src.meta) homepage;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ profpatsch ];
+  };
+
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25839328c5a..1e6cdd2f6b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -579,6 +579,10 @@ with pkgs;
     pkgs_i686 = pkgsi686Linux;
   };
 
+  adbfs-rootless = callPackage ../development/mobile/adbfs-rootless {
+    adb = androidenv.platformTools;
+  };
+
   adb-sync = callPackage ../development/mobile/adb-sync { };
 
   androidenv = callPackage ../development/mobile/androidenv {
-- 
GitLab


From 05e9c47dc3c164417803ec9c769043da7575d5f5 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Thu, 29 Jun 2017 08:47:08 +0200
Subject: [PATCH 1435/1490] skopeo: 0.1.18 -> 0.1.22 fix certs.d permission
 error

the dependency docker_client.go tries to read /etc/docker/certs.d/
and fails if this is not readable.

the original code silently ignores this directory if it is not present
so path.patch adds the logic to ignore it in case of a permission error.
---
 pkgs/development/tools/skopeo/path.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch
index 22a74ac944b..35dec5aecbf 100644
--- a/pkgs/development/tools/skopeo/path.patch
+++ b/pkgs/development/tools/skopeo/path.patch
@@ -22,3 +22,17 @@ index 50e29b2..7108df5 100644
  	if c.GlobalBool("insecure-policy") {
  		policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}
  	} else if policyPath == "" {
+diff --git a/vendor/github.com/containers/image/docker/docker_client.go b/vendor/github.com/containers/image/docker/docker_client.go
+index b989770..697d2ee 100644
+--- a/vendor/github.com/containers/image/docker/docker_client.go
++++ b/vendor/github.com/containers/image/docker/docker_client.go
+@@ -154,6 +154,9 @@ func setupCertificates(dir string, tlsc *tls.Config) error {
+ 		if os.IsNotExist(err) {
+ 			return nil
+ 		}
++		if os.IsPermission(err) {
++			return nil
++		}
+ 		return err
+ 	}
+ 
-- 
GitLab


From dd484418a194c46a861dae83cfd59671154dd1e2 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Thu, 29 Jun 2017 08:54:52 +0200
Subject: [PATCH 1436/1490] skopeo: 0.1.18 -> 0.1.22 fix whitespace

---
 pkgs/development/tools/skopeo/path.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch
index 35dec5aecbf..eb3c54ae66c 100644
--- a/pkgs/development/tools/skopeo/path.patch
+++ b/pkgs/development/tools/skopeo/path.patch
@@ -6,7 +6,7 @@ index 50e29b2..7108df5 100644
  import (
  	"fmt"
  	"os"
-+        "path/filepath"
++	"path/filepath"
  
  	"github.com/Sirupsen/logrus"
  	"github.com/containers/image/signature"
@@ -14,11 +14,11 @@ index 50e29b2..7108df5 100644
  	policyPath := c.GlobalString("policy")
  	var policy *signature.Policy // This could be cached across calls, if we had an application context.
  	var err error
-+        var dir string
-+        if policyPath == "" {
-+              dir, err = filepath.Abs(filepath.Dir(os.Args[0]))
-+              policyPath = dir + "/../etc/default-policy.json"
-+        }
++	var dir string
++	if policyPath == "" {
++		dir, err = filepath.Abs(filepath.Dir(os.Args[0]))
++		policyPath = dir + "/../etc/default-policy.json"
++	}
  	if c.GlobalBool("insecure-policy") {
  		policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}
  	} else if policyPath == "" {
-- 
GitLab


From f14cd40c4b232cdfd49913e7d77789797eb7243f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 29 Jun 2017 08:12:32 +0100
Subject: [PATCH 1437/1490] gogs: remove old deps.nix

gogs code is now fully vendored.
---
 .../version-management/gogs/default.nix       |   1 -
 .../version-management/gogs/deps.nix          | 443 ------------------
 2 files changed, 444 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gogs/deps.nix

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index bdbd7566166..7d1e3710ac0 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -38,7 +38,6 @@ buildGoPackage rec {
   '';
 
   goPackagePath = "github.com/gogits/gogs";
-  goDeps = ./deps.nix;
 
   meta = {
     description = "A painless self-hosted Git service";
diff --git a/pkgs/applications/version-management/gogs/deps.nix b/pkgs/applications/version-management/gogs/deps.nix
deleted file mode 100644
index 4596eb1d243..00000000000
--- a/pkgs/applications/version-management/gogs/deps.nix
+++ /dev/null
@@ -1,443 +0,0 @@
-[
-  {
-    goPackagePath = "github.com/Unknwon/cae";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Unknwon/cae";
-      rev = "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c";
-      sha256 = "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s";
-    };
-  }
-  {
-    goPackagePath = "github.com/Unknwon/com";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Unknwon/com";
-      rev = "28b053d5a2923b87ce8c5a08f3af779894a72758";
-      sha256 = "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2";
-    };
-  }
-  {
-    goPackagePath = "github.com/Unknwon/i18n";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Unknwon/i18n";
-      rev = "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d";
-      sha256 = "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7";
-    };
-  }
-  {
-    goPackagePath = "github.com/Unknwon/paginater";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Unknwon/paginater";
-      rev = "701c23f468663c34d1b1768c3ae1bcc57e11c5b3";
-      sha256 = "09h3gyd9wyzgbkny5g5ihd4ckmv0bams8g5y2xfkd55gizlmx07p";
-    };
-  }
-  {
-    goPackagePath = "github.com/bradfitz/gomemcache";
-    fetch = {
-      type = "git";
-      url = "https://github.com/bradfitz/gomemcache";
-      rev = "2fafb84a66c4911e11a8f50955b01e74fe3ab9c5";
-      sha256 = "1k3vqmq008gad1cq1gaqa35k5ldn0z8fcx07c15x9v8p9xjbhkc9";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-macaron/binding";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-macaron/binding";
-      rev = "48920167fa152d02f228cfbece7e0f1e452d200a";
-      sha256 = "00h4mdyhqkh75vgafyyyn54kdpwj82ifg9l6lxv9gnkw6frxhkan";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-macaron/cache";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-macaron/cache";
-      rev = "56173531277692bc2925924d51fda1cd0a6b8178";
-      sha256 = "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-macaron/captcha";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-macaron/captcha";
-      rev = "8aa5919789ab301e865595eb4b1114d6b9847deb";
-      sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-macaron/csrf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-macaron/csrf";
-      rev = "6a9a7df172cc1fcd81e4585f44b09200b6087cc0";
-      sha256 = "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-macaron/gzip";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-macaron/gzip";
-      rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854";
-      sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-macaron/i18n";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-macaron/i18n";
-      rev = "ef57533c3b0fc2d8581deda14937e52f11a203ab";
-      sha256 = "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-macaron/inject";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-macaron/inject";
-      rev = "d8a0b8677191f4380287cfebd08e462217bac7ad";
-      sha256 = "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-macaron/session";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-macaron/session";
-      rev = "b8a2b5ef7fb4c91c1c8ca23e2a52e29a4bcbb22f";
-      sha256 = "1nz823fn23wp87pzzhpxlbr6j7q4khywa9n0h1kpdikiy87z5k5m";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-macaron/toolbox";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-macaron/toolbox";
-      rev = "99a42f20e9e88daec5c0d7beb4e7eac134680ab0";
-      sha256 = "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-sql-driver/mysql";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-sql-driver/mysql";
-      rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
-      sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-xorm/builder";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-xorm/builder";
-      rev = "db75972580de4a7c6c20fff5b16a924c3de3fa12";
-      sha256 = "0qgrvjfghkgfhbrm989yhrwgs36d6wxcap012glpmd2ddp5klw46";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-xorm/core";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-xorm/core";
-      rev = "2fbe2c76c6781d9e1c0398fc25386426e611f975";
-      sha256 = "1rfry5md6g8b6d6vyqpqys3wl2mxf6v55d2aapxlx3hqn6lz0lax";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-xorm/xorm";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-xorm/xorm";
-      rev = "2189b36884a485d1d609fc5690bfc71a8a7de8c3";
-      sha256 = "02z140xbwqins6ql8hwdr6ar3d67jqrkm22bamqbj2rmfl7z0846";
-    };
-  }
-  {
-    goPackagePath = "github.com/gogits/chardet";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogits/chardet";
-      rev = "2404f777256163ea3eadb273dada5dcb037993c0";
-      sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd";
-    };
-  }
-  {
-    goPackagePath = "github.com/gogits/cron";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogits/cron";
-      rev = "2fc07a4c4f1e3c4d2301c5ed578d5e2c31c70421";
-      sha256 = "0a153pspisnhjpxjsryqdb29y6b8ics0203icbq5lps2g5jyaiw0";
-    };
-  }
-  {
-    goPackagePath = "github.com/gogits/git-module";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogits/git-module";
-      rev = "df1013f8eb4dc70de90bc5597bf560a4b7da802e";
-      sha256 = "1vnfiwdwp210hn7z7fgi5i80mggk76blbhykqg8wvx8bi0wxlrs8";
-    };
-  }
-  {
-    goPackagePath = "github.com/gogits/go-gogs-client";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogits/go-gogs-client";
-      rev = "98046bb98061fc6baa5bb86359af0b7c300d384a";
-      sha256 = "1wsg70irk4lwyak4kn2ml64j1fglqkyzs2lgc2mk4n4j5kn9hs1k";
-    };
-  }
-  {
-    goPackagePath = "github.com/gogits/go-libravatar";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogits/go-libravatar";
-      rev = "cd1abbd55d09b793672732a7a1dfdaa12a40dfd0";
-      sha256 = "00xvnddfh1m5g17mrnvp505i4sgwpk1r0wqz6a15bp6lvadwwlnj";
-    };
-  }
-  {
-    goPackagePath = "github.com/issue9/identicon";
-    fetch = {
-      type = "git";
-      url = "https://github.com/issue9/identicon";
-      rev = "d36b54562f4cf70c83653e13dc95c220c79ef521";
-      sha256 = "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l";
-    };
-  }
-  {
-    goPackagePath = "github.com/jaytaylor/html2text";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jaytaylor/html2text";
-      rev = "4b9124c9b0a2279e2092c4a9aaf1c83bbd2dcffc";
-      sha256 = "1yp0rawzziia9diffxs6k5g85acq3a62yb5ajbvy04r2p04dv85h";
-    };
-  }
-  {
-    goPackagePath = "github.com/klauspost/compress";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/compress";
-      rev = "e3b7981a12dd3cab49afa1d3a50e715846f23732";
-      sha256 = "0hxciiaqrbf7rr112r7rwk7jcwhvjpbhnp8ikszp56zwqd64k9vn";
-    };
-  }
-  {
-    goPackagePath = "github.com/klauspost/cpuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/cpuid";
-      rev = "09cded8978dc9e80714c4d85b0322337b0a1e5e0";
-      sha256 = "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq";
-    };
-  }
-  {
-    goPackagePath = "github.com/klauspost/crc32";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/crc32";
-      rev = "cb6bfca970f6908083f26f39a79009d608efd5cd";
-      sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n";
-    };
-  }
-  {
-    goPackagePath = "github.com/lib/pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lib/pq";
-      rev = "8df6253d1317616f36b0c3740eb30c239a7372cb";
-      sha256 = "0djs6k6rdh06v8bz0msn0lv532hk2vrljj1pz4kgmbqcmd17y31k";
-    };
-  }
-  {
-    goPackagePath = "github.com/mcuadros/go-version";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mcuadros/go-version";
-      rev = "257f7b9a7d87427c8d7f89469a5958d57f8abd7c";
-      sha256 = "0mpbcc698503hbrlc74l3nqd6hdr0n6vybfzw10pg7qx3cpmn512";
-    };
-  }
-  {
-    goPackagePath = "github.com/microcosm-cc/bluemonday";
-    fetch = {
-      type = "git";
-      url = "https://github.com/microcosm-cc/bluemonday";
-      rev = "e79763773ab6222ca1d5a7cbd9d62d83c1f77081";
-      sha256 = "04rd8jzy8kzzm0j0k7wy90pykl8ws43yhhwl2gkyz6rak10jhqpz";
-    };
-  }
-  {
-    goPackagePath = "github.com/nfnt/resize";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nfnt/resize";
-      rev = "891127d8d1b52734debe1b3c3d7e747502b6c366";
-      sha256 = "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw";
-    };
-  }
-  {
-    goPackagePath = "github.com/russross/blackfriday";
-    fetch = {
-      type = "git";
-      url = "https://github.com/russross/blackfriday";
-      rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70";
-      sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k";
-    };
-  }
-  {
-    goPackagePath = "github.com/satori/go.uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/satori/go.uuid";
-      rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a";
-      sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k";
-    };
-  }
-  {
-    goPackagePath = "github.com/sergi/go-diff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sergi/go-diff";
-      rev = "83532ca1c1caa393179c677b6facf48e61f4ca5d";
-      sha256 = "08niiivkn9a1hdl738w2sq4vq6csqhw91an8wq83dk40q62f4sq8";
-    };
-  }
-  {
-    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shurcooL/sanitized_anchor_name";
-      rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2";
-      sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg";
-    };
-  }
-  {
-    goPackagePath = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
-      sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "cb497ae8f18e3c55f81bc9f3876c8f4c3d8a2813";
-      sha256 = "0zah08y0a9rqk1ggp0ylkpycr3amrc22ncsppyrymry44g56xyfj";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "ae05321a78c1401cec22ba7bc203b597ea372496";
-      sha256 = "1fzbijklrmhwj4mlwrnrxbbrhlzpgrsbv05zldbkvhic14g0ii2c";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "44f4f658a783b0cee41fe0a23b8fc91d9c120558";
-      sha256 = "1hgwc2p5azfyzvl7i47my3wnbp2g7814a2sshqw63dvggs9mszcx";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/asn1-ber.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/asn1-ber.v1";
-      rev = "4e86f4367175e39f69d9358a5f17b4dda270378d";
-      sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/bufio.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/bufio.v1";
-      rev = "567b2bfa514e796916c4747494d6ff5132a1dfce";
-      sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/editorconfig/editorconfig-core-go.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/editorconfig/editorconfig-core-go.v1";
-      rev = "a872f05c2e34b37b567401384d202aff11ba06d4";
-      sha256 = "17mc7rm0fl5vi7ky95c2bd7c8ck0ms5bghzmgx9qk7x1zrw91335";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/gomail.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/gomail.v2";
-      rev = "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1";
-      sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/ini.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/ini.v1";
-      rev = "6f66b0e091edb3c7b380f7c4f0f884274d550b67";
-      sha256 = "1n09b7ypbayhk6x7qi3g3hrqjlmj5yszwl5d8jykjd5azp6h8sb8";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/ldap.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/ldap.v2";
-      rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f";
-      sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/macaron.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/macaron.v1";
-      rev = "ddb19a9f3e8cedd44696b9dd5854dc8a43f3dd6c";
-      sha256 = "0riggdq8zxy5x6zhks66slvsg22b9i4399f7ns2l6daj79myqyvy";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/redis.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/redis.v2";
-      rev = "e6179049628164864e6e84e973cfb56335748dea";
-      sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-sqlite3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-sqlite3";
-      rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
-      sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
-    };
-  }
-]
-- 
GitLab


From fa685441569bfe2ed037fe10ff52825b6a637010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 29 Jun 2017 08:20:54 +0100
Subject: [PATCH 1438/1490] adbfs-rootless: limit platform to linux

---
 pkgs/development/mobile/adbfs-rootless/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix
index 588b10d45a1..38ecfcdf9a9 100644
--- a/pkgs/development/mobile/adbfs-rootless/default.nix
+++ b/pkgs/development/mobile/adbfs-rootless/default.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     license = licenses.bsd3;
     maintainers = with maintainers; [ profpatsch ];
+    platforms = platforms.linux;
   };
-
-
 }
-- 
GitLab


From 5559e1c860035fd571ecf8ff2b15571ff59dec77 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 29 Jun 2017 09:27:29 +0200
Subject: [PATCH 1439/1490] go2nix: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index a6f5d62e29e..9a3ff192ba9 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "go2nix-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/kamilchm/go2nix";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "kamilchm";
     repo = "go2nix";
-    sha256 = "1hlanw56r1phj89sicpsfcz6sdjba9qjwhiblcsqka4wfqkai8pn";
+    sha256 = "0fr9aa50yvchfhv6h6zqblx8ynxk41i2hmv87b344zr2rz6rms72";
   };
 
   goDeps = ./deps.nix;
-- 
GitLab


From 8439131b5adc32f28fa0c5b2c0279def4ad67513 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 28 Jun 2017 17:07:15 +0200
Subject: [PATCH 1440/1490] plowshare: 1.1.0 -> 2.1.6

---
 pkgs/tools/misc/plowshare/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index d1b5481ad01..8282c2a1cd9 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, makeWrapper, curl, spidermonkey }:
+{ stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey }:
 
 stdenv.mkDerivation rec {
 
-  name = "plowshare4-${version}";
-  version = "1.1.0";
+  name = "plowshare-${version}";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "mcrapet";
     repo = "plowshare";
     rev = "v${version}";
-    sha256 = "1xxkdv4q97dfzbcdnmy5079a59fwh8myxlvdr2dlxdv70fb72sq9";
+    sha256 = "116291w0z1r61xm3a3zjlh85f05pk4ng9f1wbj9kv1j3xrjn4v4c";
   };
 
   buildInputs = [ makeWrapper ];
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make PREFIX="$out" install
 
-    for fn in plow{del,down,list,up}; do
-      wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl spidermonkey ]}"
+    for fn in plow{del,down,list,mod,probe,up}; do
+      wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl recode spidermonkey ]}"
     done
   '';
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       A command-line download/upload tool for popular file sharing websites
     '';
     license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.aforemny ];
+    maintainers = with stdenv.lib.maintainers; [ aforemny jfrankenau ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
GitLab


From 3107f33c9dfc9444bbe2d26ccda6a266ba31d666 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 28 Jun 2017 15:44:30 +0200
Subject: [PATCH 1441/1490] buku: 2.9 -> 3.0

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

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 117313a3266..72ba96ad701 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -2,14 +2,14 @@
 }:
 
 with pythonPackages; buildPythonApplication rec {
-  version = "2.9";
+  version = "3.0";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "0ylq0j5w8jvzys4bj9m08bfr1sgf8h2b4fiax6hs6lcwn2882jbr";
+    sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax";
   };
 
   propagatedBuildInputs = [
-- 
GitLab


From fbce96014f250118a3a3d02ea5eb05e8f4ab740d Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 29 Jun 2017 09:50:46 +0200
Subject: [PATCH 1442/1490] jd: init at 0.3.1

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

diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix
new file mode 100644
index 00000000000..3fe55de2ec8
--- /dev/null
+++ b/pkgs/development/tools/jd/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "jd-${version}";
+  version = "0.3.1";
+  rev = "2729b5af166cfd72bd953ef8959b456c4db940fc";
+
+  goPackagePath = "github.com/tidwall/jd";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/tidwall/jd";
+    sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Interactive JSON Editor";
+    license = licenses.mit;
+    maintainers = [ maintainers.np ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e6cdd2f6b0..ab4ebf2213b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2562,6 +2562,8 @@ with pkgs;
 
   jade = callPackage ../tools/text/sgml/jade { };
 
+  jd = callPackage ../development/tools/jd { };
+
   jd-gui = callPackage_i686 ../tools/security/jd-gui { };
 
   jdiskreport = callPackage ../tools/misc/jdiskreport { };
-- 
GitLab


From e795cd9b187fc5fcce8da580545e5954a77a7408 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 29 Jun 2017 09:51:54 +0200
Subject: [PATCH 1443/1490] screen: 4.5.1 -> 4.6.0

See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00015.html
for release information
---
 pkgs/tools/misc/screen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 7af602106ff..45b04828b30 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "screen-${version}";
-  version = "4.5.1";
+  version = "4.6.0";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${name}.tar.gz";
-    sha256 = "0bbv16gpxrh64sn4bvjy3qjy7jsxjlqlilyysin02fwnvla23nwp";
+    sha256 = "1m7yd2bs1i623kk27nfy3qa2mgjp5qjqxwj5qz21r51ycmmp0cwl";
   };
 
   configureFlags= [
-- 
GitLab


From 6db9cbfa4c497ff6f535e0932f645653a98dc535 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 29 Jun 2017 10:07:49 +0200
Subject: [PATCH 1444/1490] electrum-{ltc,dash}: use protobuf3_2

---
 pkgs/applications/misc/electrum-dash/default.nix | 2 +-
 pkgs/applications/misc/electrum-ltc/default.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix
index 917d32e74af..8752bafbe73 100644
--- a/pkgs/applications/misc/electrum-dash/default.nix
+++ b/pkgs/applications/misc/electrum-dash/default.nix
@@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec {
     dns
     ecdsa
     pbkdf2
-    protobuf3_0
+    protobuf3_2
     pyasn1
     pyasn1-modules
     pycrypto
diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix
index 50cc434f631..25c96322378 100644
--- a/pkgs/applications/misc/electrum-ltc/default.nix
+++ b/pkgs/applications/misc/electrum-ltc/default.nix
@@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec {
     requests
     qrcode
     ltc_scrypt
-    protobuf3_0
+    protobuf3_2
     dns
     jsonrpclib
   ];
-- 
GitLab


From ce782c58073df7fc8b02342619a0805aefe68a78 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Wed, 28 Jun 2017 22:27:17 +0200
Subject: [PATCH 1445/1490] beets: 1.4.3 -> 1.4.5

---
 pkgs/tools/audio/beets/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 35b4557a33c..ff033e62a8b 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -8,7 +8,9 @@
 , enableDiscogs        ? true
 , enableEmbyupdate     ? true
 , enableFetchart       ? true
+, enableGmusic         ? true
 , enableKeyfinder      ? true, keyfinder-cli ? null
+, enableKodiupdate     ? true
 , enableLastfm         ? true
 , enableMpd            ? true
 , enableReplaygain     ? true, bs1770gain ? null
@@ -27,9 +29,10 @@ assert enableBadfiles    -> flac != null && mp3val != null;
 assert enableConvert     -> ffmpeg != null;
 assert enableDiscogs     -> pythonPackages.discogs_client != null;
 assert enableFetchart    -> pythonPackages.responses      != null;
+assert enableGmusic      -> pythonPackages.gmusicapi      != null;
 assert enableKeyfinder   -> keyfinder-cli != null;
 assert enableLastfm      -> pythonPackages.pylast         != null;
-assert enableMpd         -> pythonPackages.mpd            != null;
+assert enableMpd         -> pythonPackages.mpd2           != null;
 assert enableReplaygain  -> bs1770gain                    != null;
 assert enableThumbnails  -> pythonPackages.pyxdg          != null;
 assert enableWeb         -> pythonPackages.flask          != null;
@@ -45,7 +48,9 @@ let
     discogs = enableDiscogs;
     embyupdate = enableEmbyupdate;
     fetchart = enableFetchart;
+    gmusic = enableGmusic;
     keyfinder = enableKeyfinder;
+    kodiupdate = enableKodiupdate;
     lastgenre = enableLastfm;
     lastimport = enableLastfm;
     mpdstats = enableMpd;
@@ -74,13 +79,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "beets-${version}";
-  version = "1.4.3";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "beetbox";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "0sh2ap7jbqh7p8h63kgrx1ja9lyqlxjpfnh6axxw9p1mh78cgc1v";
+    sha256 = "0fvfp9ckq3dhs4f8abg9fprfppyf0g6mv8br2xz99plg4wnffzmy";
   };
 
   propagatedBuildInputs = [
@@ -99,13 +104,15 @@ in pythonPackages.buildPythonApplication rec {
   ] ++ optional enableAcoustid     pythonPackages.pyacoustid
     ++ optional (enableFetchart
               || enableEmbyupdate
+              || enableKodiupdate
               || enableAcousticbrainz)
                                    pythonPackages.requests
     ++ optional enableConvert      ffmpeg
     ++ optional enableDiscogs      pythonPackages.discogs_client
+    ++ optional enableGmusic       pythonPackages.gmusicapi
     ++ optional enableKeyfinder    keyfinder-cli
     ++ optional enableLastfm       pythonPackages.pylast
-    ++ optional enableMpd          pythonPackages.mpd
+    ++ optional enableMpd          pythonPackages.mpd2
     ++ optional enableThumbnails   pythonPackages.pyxdg
     ++ optional enableWeb          pythonPackages.flask
     ++ optional enableAlternatives (import ./alternatives-plugin.nix {
@@ -146,7 +153,7 @@ in pythonPackages.buildPythonApplication rec {
       s,"mp3val","${mp3val}/bin/mp3val",
     }' beetsplug/badfiles.py
   '' + optionalString enableConvert ''
-    sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py 
+    sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py
   '' + optionalString enableReplaygain ''
     sed -i -re '
       s!^( *cmd *= *b?['\'''"])(bs1770gain['\'''"])!\1${bs1770gain}/bin/\2!
-- 
GitLab


From 9d9c12249d13f2c830eb772f693c31aca411f46b Mon Sep 17 00:00:00 2001
From: 239 <239@users.noreply.github.com>
Date: Thu, 29 Jun 2017 11:48:57 +0200
Subject: [PATCH 1446/1490] Opera: 45.0.2552.812 -> 45.0.2552.898

---
 pkgs/applications/networking/browsers/opera/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 270089b9936..26e3d2de7a9 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -37,7 +37,7 @@
 let
 
   mirror = https://get.geo.opera.com/pub/opera/desktop;
-  version = "45.0.2552.812";
+  version = "45.0.2552.898";
 
   rpath = stdenv.lib.makeLibraryPath [
 
@@ -91,12 +91,12 @@ in stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
-        sha256 = "0qhh7wwj3v8adz7ppjkpmfc04rxfjjhnnkawfvghlv77sjgnyml2";
+        sha256 = "1a7y13mgc8g7swdg0x2l9h6cmqw74h2wxizi3vmlgz2fj5zlkn0g";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
-        sha256 = "0xf1j8abk8f0kbjarsk1y1yna1zwrn0qc4fi1swjsxf5rx027fir";
+        sha256 = "0rmagj0s1j3a6rpyrs29xnbngsq700rgaqkph108fbnj80hif1ia";
       }
     else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 
-- 
GitLab


From 6b35f22e281a1218f9add3fc40940356042b1662 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Jun 2017 08:20:06 -0400
Subject: [PATCH 1447/1490] linux: 4.4.74 -> 4.4.75

---
 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 aa73d3bff3b..8c05fdc711b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4.74";
+  version = "4.4.75";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "13l0axybmr0lz1br9kxyc6s3mzgais32f54xii7vs4nia1hss6f3";
+    sha256 = "0l3rklx1957czsddg3jb5xw5rvw8bf58s4yrkswikphv7j5crzjg";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From d1aff8d2e5610d1026a5a2f0e6ff8653a4123efe Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Jun 2017 08:26:25 -0400
Subject: [PATCH 1448/1490] linux: 4.9.34 -> 4.9.35

Also, remove XSA-216 patches, the fixes are now integrated upstream
---
 pkgs/os-specific/linux/kernel/linux-4.9.nix |  4 ++--
 pkgs/os-specific/linux/kernel/patches.nix   | 17 -----------------
 pkgs/top-level/all-packages.nix             |  6 +-----
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index a45ba31c0a9..f1bdb3c2cb9 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.9.34";
+  version = "4.9.35";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0ij55aqdhqf92a79n9xqw0p32bsksw4zxpn2zhcylhgsn78mkl8k";
+    sha256 = "0dklbr686ygvpbjs6chra9vycfvp8xjgkvapai14lglzsx72749l";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cbba50710b5..1747d34fe11 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -156,21 +156,4 @@ rec {
         sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
       };
     };
-
-  # https://xenbits.xen.org/xsa/advisory-216.html
-  xen_XSA_216 =
-    { name = "xen_XSA-216";
-      patch = fetchpatch {
-        url = "https://xenbits.xen.org/xsa/xsa216-linux-4.11.patch";
-        sha256 = "14h017n6qwnraw5bv72q9xkg2w7xvx290505kny5zfwx891xahs8";
-      };
-    };
-
-  xen_XSA_216_4-4 =
-    { name = "xen_XSA-216-4.4";
-      patch = fetchpatch {
-        url = "https://xenbits.xen.org/xsa/xsa216-linux-4.4.patch";
-        sha256 = "1lv50wpr4lr49i4vp04vl778wcs9xn1jm51hp91h87jr0g3pbvi2";
-      };
-    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e6cdd2f6b0..0e27e56d83e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11930,7 +11930,6 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.p9_fixes
         kernelPatches.cpu-cgroup-v2."4.4"
-        kernelPatches.xen_XSA_216_4-4
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11945,7 +11944,6 @@ with pkgs;
         kernelPatches.p9_fixes
         kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.xen_XSA_216
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11962,7 +11960,6 @@ with pkgs;
         # when adding a new linux version
         kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.xen_XSA_216
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11976,7 +11973,6 @@ with pkgs;
       kernelPatches.bridge_stp_helper
       kernelPatches.p9_fixes
       kernelPatches.modinst_arg_list_too_long
-      kernelPatches.xen_XSA_216
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu
       kernelPatches.mips_fpu_sigill
@@ -13610,7 +13606,7 @@ with pkgs;
   doodle = callPackage ../applications/search/doodle { };
 
   draftsight = callPackage ../applications/graphics/draftsight { };
-  
+
   droopy = callPackage ../applications/networking/droopy {
     inherit (python3Packages) wrapPython;
   };
-- 
GitLab


From 37bc49494963e68de489272f675fb8c49f789051 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Jun 2017 08:29:04 -0400
Subject: [PATCH 1449/1490] linux: 4.11.7 -> 4.11.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index 3019c6fcb96..afdb1427e85 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,12 +1,12 @@
 { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.11.7";
+  version = "4.11.8";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1v94lkc4lzb2k9c3y7j6h4zx827abcy7jqm9jlp5n15dlbmj6bsk";
+    sha256 = "1f4x4wym6kr57zhjpmvj9p7z2j43zcvpyvkh2nnhsb4yxg5qszcf";
   };
 
   kernelPatches = args.kernelPatches;
-- 
GitLab


From 6feedb44925b4fbcf5508c4fc8678a7549140ef0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 29 Jun 2017 15:00:23 +0200
Subject: [PATCH 1450/1490] Forks::Super: Build on Hydra

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fe6e513dec9..31399388fca 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5772,6 +5772,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Extensions and convenience methods to manage background processes";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      platforms = stdenv.lib.platforms.linux;
     };
   };
 
-- 
GitLab


From 9a9294a9707f1a9268331fa79583ead19ce5e130 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 29 Jun 2017 17:14:05 +0200
Subject: [PATCH 1451/1490] libgcrypt: 1.7.7 -> 1.7.8

See http://lists.gnu.org/archive/html/info-gnu/2017-06/msg00016.html
for release information
---
 pkgs/development/libraries/libgcrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 1903787149c..ac54858b1de 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   name = "libgcrypt-${version}";
-  version = "1.7.7";
+  version = "1.7.8";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "16ndaj93asw122mwjz172x2ilpm03w1yp5mqcrp3xslk0yx5xf5r";
+    sha256 = "16f1rsv4y4w2pk1il2jbcqggsb6mrlfva5vayd205fp68zm7d0ll";
   };
 
   outputs = [ "out" "dev" "info" ];
-- 
GitLab


From 1eb979db0e472557897405474288e9dae502a4f7 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 28 Jun 2017 13:02:33 -0400
Subject: [PATCH 1452/1490] nixos manual: combine XML and validate separately

---
 nixos/doc/manual/default.nix | 69 ++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 7e0d4ad92b0..9413d71a34c 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -94,25 +94,43 @@ let
     "--stringparam chunk.toc ${toc}"
   ];
 
-  olinkDB = runCommand "manual-olinkdb"
+  manual-combined = runCommand "nixos-manual-combined"
     { inherit sources;
       buildInputs = [ libxml2 libxslt ];
+      meta.description = "The NixOS manual as plain docbook XML";
     }
     ''
       ${copySources}
 
+      xmllint --xinclude --output ./manual-combined.xml ./manual.xml
+      xmllint --xinclude --noxincludenode \
+         --output ./man-pages-combined.xml ./man-pages.xml
+
+      xmllint --debug --noout --nonet \
+        --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
+        manual-combined.xml
+      xmllint --debug --noout --nonet \
+        --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
+        man-pages-combined.xml
+
+
+      mkdir $out
+      cp manual-combined.xml $out/
+      cp man-pages-combined.xml $out/
+    '';
+
+  olinkDB = runCommand "manual-olinkdb"
+    { inherit sources;
+      buildInputs = [ libxml2 libxslt ];
+    }
+    ''
       xsltproc \
         ${manualXsltprocOptions} \
         --stringparam collect.xref.targets only \
         --stringparam targets.filename "$out/manual.db" \
-        --nonet --xinclude \
+        --nonet \
         ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \
-        ./manual.xml
-
-      # Check the validity of the man pages sources.
-      xmllint --noout --nonet --xinclude --noxincludenode \
-        --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
-        ./man-pages.xml
+        ${manual-combined}/manual-combined.xml
 
       cat > "$out/olinkdb.xml" <<EOF
       <?xml version="1.0" encoding="utf-8"?>
@@ -158,21 +176,15 @@ in rec {
       allowedReferences = ["out"];
     }
     ''
-      ${copySources}
-
-      # Check the validity of the manual sources.
-      xmllint --noout --nonet --xinclude --noxincludenode \
-        --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
-        manual.xml
-
       # Generate the HTML manual.
       dst=$out/share/doc/nixos
       mkdir -p $dst
       xsltproc \
         ${manualXsltprocOptions} \
         --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
-        --nonet --xinclude --output $dst/ \
-        ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl ./manual.xml
+        --nonet --output $dst/ \
+        ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \
+        ${manual-combined}/manual-combined.xml
 
       mkdir -p $dst/images/callouts
       cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/
@@ -190,13 +202,6 @@ in rec {
       buildInputs = [ libxml2 libxslt zip ];
     }
     ''
-      ${copySources}
-
-      # Check the validity of the manual sources.
-      xmllint --noout --nonet --xinclude --noxincludenode \
-        --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
-        manual.xml
-
       # Generate the epub manual.
       dst=$out/share/doc/nixos
 
@@ -204,10 +209,11 @@ in rec {
         ${manualXsltprocOptions} \
         --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
         --nonet --xinclude --output $dst/epub/ \
-        ${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl ./manual.xml
+        ${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \
+        ${manual-combined}/manual-combined.xml
 
       mkdir -p $dst/epub/OEBPS/images/callouts
-      cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/epub/OEBPS/images/callouts
+      cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/epub/OEBPS/images/callouts # */
       echo "application/epub+zip" > mimetype
       manual="$dst/nixos-manual.epub"
       zip -0Xq "$manual" mimetype
@@ -227,23 +233,16 @@ in rec {
       allowedReferences = ["out"];
     }
     ''
-      ${copySources}
-
-      # Check the validity of the man pages sources.
-      xmllint --noout --nonet --xinclude --noxincludenode \
-        --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \
-        ./man-pages.xml
-
       # Generate manpages.
       mkdir -p $out/share/man
-      xsltproc --nonet --xinclude \
+      xsltproc --nonet \
         --param man.output.in.separate.dir 1 \
         --param man.output.base.dir "'$out/share/man/'" \
         --param man.endnotes.are.numbered 0 \
         --param man.break.after.slash 1 \
         --stringparam target.database.document "${olinkDB}/olinkdb.xml" \
         ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \
-        ./man-pages.xml
+        ${manual-combined}/man-pages-combined.xml
     '';
 
 }
-- 
GitLab


From 78377ae5cf156841415d4e116eb1bde6ab70e5ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Jun 2017 18:50:08 +0200
Subject: [PATCH 1453/1490] haskell: fix builds of hledger-iadd, opencv-extra,
 and logging-facade-syslog

---
 pkgs/development/haskell-modules/configuration-nix.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 89827e8c9d9..34048c0b439 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -464,4 +464,13 @@ self: super: builtins.intersectAttrs super {
   # Haskell OpenCV bindings need contrib code enabled in the C++ library.
   opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; };
 
+  # Without this override, the builds lacks pkg-config.
+  opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; });
+
+  # Needs a newer version of brick than lts-8.x provides.
+  hledger-iadd = super.hledger-iadd.override { brick = self.brick_0_19; };
+
+  # Needs a newer version of hsyslog than lts-8.x provides.
+  logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5; };
+
 }
-- 
GitLab


From 46fe4bd8f3dd0eb4cbb31e11c0852679c0862132 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 28 Jun 2017 18:54:27 +0200
Subject: [PATCH 1454/1490] ghc-syb-utils: disable test suite for GHC 8.x or
 later

The test suite fails when compiling with GHC 8.x. This seems to be a known issue.

Cc: https://github.com/nominolo/ghc-syb/issues/20, https://github.com/NixOS/nixpkgs/issues/26689
---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index d91d25b8d31..e82e10edc58 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -55,5 +55,7 @@ self: super: {
   # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
   yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
 
+  # https://github.com/nominolo/ghc-syb/issues/20
+  ghc-syb-utils = dontCheck super.ghc-syb-utils;
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index e1bdfb776f3..35cd857b662 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -56,5 +56,7 @@ self: super: {
   # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
   yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
 
+  # https://github.com/nominolo/ghc-syb/issues/20
+  ghc-syb-utils = dontCheck super.ghc-syb-utils;
 
 }
-- 
GitLab


From ad6c2358578340694a30b0f4baa90c5f4d71ec80 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Jun 2017 03:01:17 +0200
Subject: [PATCH 1455/1490] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-13-g5c18fb5 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/68ba901b903a1ee5323fe16caceea823c0bc836c.
---
 .../haskell-modules/hackage-packages.nix      | 204 +++++++++++++-----
 1 file changed, 152 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d5d196f4a3d..1b72b9020b0 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17945,20 +17945,20 @@ self: {
      , case-insensitive, clock, containers, data-default-class
      , directory, filepath, http-client, http-client-tls, http-types
      , mtl, network-uri, optparse-applicative, parsec, pipes, pipes-http
-     , pretty-show, regexpr, split, taglib, tagsoup, text, time
+     , pretty-show, regexpr, scientific, split, tagsoup, text, time
      , utf8-string, vector
      }:
      mkDerivation {
        pname = "VKHS";
-       version = "1.7.3";
-       sha256 = "151ib508i8wf5c63c46ic1sy5lif8s4dx5s8jhwcwv8305bbsiiy";
+       version = "1.8.3";
+       sha256 = "1rj1vi804g6dfzl730lfgcpycw348pcvvs0209qhwdhyn6mrdqgw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring case-insensitive clock
          containers data-default-class directory filepath http-client
          http-client-tls http-types mtl network-uri optparse-applicative
-         parsec pipes pipes-http pretty-show split taglib tagsoup time
+         parsec pipes pipes-http pretty-show scientific split tagsoup time
          utf8-string vector
        ];
        executableHaskellDepends = [ regexpr text ];
@@ -27448,8 +27448,8 @@ self: {
      }:
      mkDerivation {
        pname = "astro";
-       version = "0.4.1.2";
-       sha256 = "0zbrfw24rxp2hi2prq109ms5ppfvbhwrnzb8hybfqbxzc4l6ihjq";
+       version = "0.4.1.3";
+       sha256 = "1zakvwzdrlpqb8rx1bypb59gra3kxwb5yjwxgphzi9icgmd7y07p";
        libraryHaskellDepends = [ base matrix time ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -36055,8 +36055,8 @@ self: {
      }:
      mkDerivation {
        pname = "btree";
-       version = "0.1.0.0";
-       sha256 = "1l5dgaf3jwaan9mjncjgffr0dhjd225lbnrmxhrz3iiamiz7xizz";
+       version = "0.2";
+       sha256 = "02qypsanm4pnc7jiwjwak9xi7mfz4dlmfirdwvbxnjz48nqch7x2";
        libraryHaskellDepends = [
          base compact-mutable ghc-prim prim-array primitive
        ];
@@ -70892,8 +70892,8 @@ self: {
      }:
      mkDerivation {
        pname = "fswait";
-       version = "1.0.0";
-       sha256 = "0w29f6qwks54zxi8x9wd9s4k5ryb6fz9flip9clm4l53vkx1s3b0";
+       version = "1.1.0";
+       sha256 = "1iqnawsxrx21q9g34dc1pp451z9s37m7z3fswrwd8bs3fw9mgbb3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -75130,7 +75130,8 @@ self: {
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, text, transformers, webkitgtk24x-gtk3
+     , haskell-gi-base, text, transformers, webkitgtk24x
+     , webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
@@ -75141,13 +75142,13 @@ self: {
          base bytestring containers haskell-gi haskell-gi-base text
          transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
+       libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x-gtk3;};
+     }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;};
 
   "gi-javascriptcore_4_0_12" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
@@ -75356,7 +75357,7 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
-     , text, transformers, webkitgtk24x-gtk3
+     , text, transformers, webkitgtk24x, webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "gi-webkit";
@@ -75368,13 +75369,13 @@ self: {
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
          haskell-gi haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
+       libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x-gtk3;};
+     }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;};
 
   "gi-webkit2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -76572,13 +76573,13 @@ self: {
      }:
      mkDerivation {
        pname = "gitter";
-       version = "0.1";
-       sha256 = "0jijcqnmwap22lgvwkzqclhp51p30b1fsqih3s0hkmhmcc2720v4";
+       version = "0.3.0";
+       sha256 = "13mi1c4z80nmj00adikbkdjijkciy2zkkyqbvf10r5zilqhdbaw1";
        libraryHaskellDepends = [
          aeson base bytestring exceptions lens lens-aeson mtl text wreq
        ];
        description = "Gitter.im API client";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -94151,8 +94152,8 @@ self: {
      }:
      mkDerivation {
        pname = "hfmt";
-       version = "0.1.0";
-       sha256 = "13dcywy7i9r8silc6rpm6pqj3zs2cq2zqzpz015563rkbwmi42zy";
+       version = "0.1.1";
+       sha256 = "0cg5vaihyrdsigpvj82a2xdmq6wj1vbqg10ldcp4c2pxwsgz97mh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95949,8 +95950,8 @@ self: {
        pname = "hjsonpointer";
        version = "1.2.0";
        sha256 = "06rppqd9nnch3hmjv1izh7lkdrm54nywjg7p27wfar3ak1saw71g";
-       revision = "2";
-       editedCabalFile = "0clin0rbsjhj1dasha3di8as3chi4i7xvp2d54b4qk2bxs4bzcm2";
+       revision = "3";
+       editedCabalFile = "0rdnm2fvj2c9pjdrcpizgc2kyl6fivijfzs60z5mkagv3h7pkkq4";
        libraryHaskellDepends = [
          aeson base hashable QuickCheck semigroups text unordered-containers
          vector
@@ -99137,6 +99138,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpio_0_8_0_10" = callPackage
+    ({ mkDerivation, async, base, base-compat, bytestring, containers
+     , directory, doctest, exceptions, filepath, hlint, hspec, mtl
+     , mtl-compat, optparse-applicative, QuickCheck, text, transformers
+     , transformers-compat, unix, unix-bytestring
+     }:
+     mkDerivation {
+       pname = "hpio";
+       version = "0.8.0.10";
+       sha256 = "05cpfym6jb27z557i1954jnz9v3ghjg45h4rjfl9ql54cx6bx429";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat bytestring containers directory exceptions
+         filepath mtl mtl-compat QuickCheck text transformers
+         transformers-compat unix unix-bytestring
+       ];
+       executableHaskellDepends = [
+         async base base-compat exceptions mtl mtl-compat
+         optparse-applicative transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         async base base-compat bytestring containers directory doctest
+         exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
+         transformers transformers-compat unix unix-bytestring
+       ];
+       homepage = "https://github.com/quixoftic/hpio";
+       description = "Monads for GPIO in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hplayground" = callPackage
     ({ mkDerivation, base, containers, data-default, haste-compiler
      , haste-perch, monads-tf, transformers
@@ -110856,8 +110889,8 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "0.9";
-       sha256 = "03kal9yaqcl37zfkng35cl0lnlrdmqigp248lwjak71zcwdrry8r";
+       version = "0.9.1";
+       sha256 = "10pvs70car553ykpzhgk8zxqpl6a8vlirbw7c9xx0g1lhf3hmvhi";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -118441,6 +118474,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lattices_1_6_0" = callPackage
+    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
+     , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty
+     , tasty-quickcheck, transformers, universe-base
+     , universe-instances-base, universe-reverse-instances
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "lattices";
+       version = "1.6.0";
+       sha256 = "0v0nl212cawd2pwbka7w8vl0gmrf1r0yv40dmwl5ffq33v5ihxd0";
+       libraryHaskellDepends = [
+         base base-compat containers deepseq hashable semigroupoids tagged
+         universe-base universe-reverse-instances unordered-containers
+       ];
+       testHaskellDepends = [
+         base base-compat containers QuickCheck quickcheck-instances tasty
+         tasty-quickcheck transformers universe-instances-base
+         unordered-containers
+       ];
+       homepage = "http://github.com/phadej/lattices/";
+       description = "Fine-grained library for constructing and manipulating lattices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "launchpad-control" = callPackage
     ({ mkDerivation, array, base, containers, hmidi, mtl, transformers
      }:
@@ -129612,17 +129671,17 @@ self: {
      }) {};
 
   "miso" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, lucid
-     , network-uri, text, vector
+    ({ mkDerivation, aeson, base, bytestring, containers, lucid, text
+     , vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.1.0.1";
-       sha256 = "1wg02nc8qa3f2dgfh0704cw0d4c5jnaqsz3iyf2s7xb8krivvkiz";
+       version = "0.1.0.4";
+       sha256 = "12q0jg51rlc1jsqwshxp55v1ddsb9zapq0lz9f300cyd9xg5rcvg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers lucid network-uri text vector
+         aeson base bytestring containers lucid text vector
        ];
        homepage = "http://github.com/dmjio/miso";
        description = "A tasty Haskell front-end framework";
@@ -129785,20 +129844,20 @@ self: {
 
   "mltool" = callPackage
     ({ mkDerivation, ascii-progress, base, deepseq, hmatrix
-     , hmatrix-gsl, hmatrix-gsl-stats, HUnit, MonadRandom, QuickCheck
-     , random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, vector
+     , hmatrix-gsl, hmatrix-gsl-stats, HUnit, MonadRandom, random
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , vector
      }:
      mkDerivation {
        pname = "mltool";
-       version = "0.1.0.0";
-       sha256 = "1wybicf7j412avj200ygl48kskb1q3607614h0cqbh7nd09svyks";
+       version = "0.1.0.1";
+       sha256 = "14b8an1kba1xqnm9ay0y0pw9vam1hsviiwqbz6id5vrbldhwsfd7";
        libraryHaskellDepends = [
          ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-gsl-stats
          MonadRandom random vector
        ];
        testHaskellDepends = [
-         base hmatrix hmatrix-gsl-stats HUnit MonadRandom QuickCheck random
+         base hmatrix hmatrix-gsl-stats HUnit MonadRandom random
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
        ];
@@ -130461,8 +130520,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-dijkstra";
-       version = "0.1.0.0";
-       sha256 = "0cgwgjx9h8vwlpzdzc6438flzgsdriaalv277yv5bpchdydyc418";
+       version = "0.1.1.0";
+       sha256 = "1vchyiaxawjgixxc9b3pssdrdmsy5ji0f3gwwgjr8gp0dp73yki4";
        libraryHaskellDepends = [ base free mtl psqueues transformers ];
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        homepage = "https://github.com/ennocramer/monad-dijkstra";
@@ -130830,8 +130889,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-mock";
-       version = "0.1.1.0";
-       sha256 = "0h09pm5db9wshl4lxwx7rppzafch8jwipjr3qijdnpzga2bad1ll";
+       version = "0.1.1.1";
+       sha256 = "1ja9s1z4y1vrk01bgav83cj95hzp8mrwil74b7lmc4fmdmr7a5y3";
        libraryHaskellDepends = [
          base constraints exceptions haskell-src-exts haskell-src-meta
          monad-control mtl template-haskell th-orphans transformers-base
@@ -137127,13 +137186,15 @@ self: {
      }) {};
 
   "ngx-export" = callPackage
-    ({ mkDerivation, async, base, bytestring, template-haskell, unix }:
+    ({ mkDerivation, async, base, binary, bytestring, template-haskell
+     , unix
+     }:
      mkDerivation {
        pname = "ngx-export";
-       version = "0.3.2.2";
-       sha256 = "1755v5gjbygiywb91a071iys69rp240pl6p2k3w18qm8z74zk7gp";
+       version = "0.4.0.0";
+       sha256 = "1cp77flxddnxiln2x1iy9f0ijrim9ai7xry87h23y8xn1zgwvyh4";
        libraryHaskellDepends = [
-         async base bytestring template-haskell unix
+         async base binary bytestring template-haskell unix
        ];
        homepage = "http://github.com/lyokha/nginx-haskell-module";
        description = "Helper module for Nginx haskell module";
@@ -150139,6 +150200,8 @@ self: {
        pname = "potrace-diagrams";
        version = "0.1.0.0";
        sha256 = "0ys70a5k384czz0c6bpyy0cqrk35wa1yg6ph19smhm3ag9d8161v";
+       revision = "1";
+       editedCabalFile = "1iwsxi5zkqqjf9wr460bqjpghcvjhpgqgk27a11ji6bpdf6gnhga";
        libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Potrace bindings for the diagrams library";
@@ -167199,6 +167262,8 @@ self: {
        pname = "servant";
        version = "0.11";
        sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5";
+       revision = "1";
+       editedCabalFile = "1az9id2dl7psc8lknf7y9cvzkivcjzw7g27yyp40flb6bfvmaqp3";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring case-insensitive
@@ -167724,6 +167789,8 @@ self: {
        pname = "servant-client";
        version = "0.11";
        sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga";
+       revision = "1";
+       editedCabalFile = "0ymiqsn6451znpn524w1wn129plnqbplbvwxwjpp1drz3ab6xk6b";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat base64-bytestring bytestring
          exceptions generics-sop http-api-data http-client http-client-tls
@@ -168543,6 +168610,8 @@ self: {
        pname = "servant-server";
        version = "0.11";
        sha256 = "1c821ia2741v7nxbv651hcj21dmcqnqf4ix198is5b63sj4ff3ib";
+       revision = "1";
+       editedCabalFile = "04s8kzc1jzarxg68nqgdckv0ajw846a1byqjksgzlqlmfqm0l32l";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -168797,8 +168866,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
-       revision = "15";
-       editedCabalFile = "0wbgbp0la0a8jg0g4xkx6cq47zgg5wpqhp1jkhbfr81x9xjmn3hk";
+       revision = "16";
+       editedCabalFile = "1szf52wk171jzm1vrs6lby7b7wijmfid3ar6wb960v9kq7g9k3iy";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -189690,6 +189759,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tls_1_3_11" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
+     , cereal, criterion, cryptonite, data-default-class, hourglass
+     , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
+     , transformers, x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "tls";
+       version = "1.3.11";
+       sha256 = "00r7zfkdzy7hi6nhzkirp8jjims4kikgjcm3z4a82kw78awqw01z";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types async base bytestring cereal cryptonite
+         data-default-class memory mtl network transformers x509 x509-store
+         x509-validation
+       ];
+       testHaskellDepends = [
+         base bytestring cereal cryptonite data-default-class hourglass mtl
+         QuickCheck tasty tasty-quickcheck x509 x509-validation
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptonite data-default-class hourglass
+         mtl QuickCheck tasty-quickcheck x509 x509-validation
+       ];
+       homepage = "http://github.com/vincenthz/hs-tls";
+       description = "TLS/SSL protocol native implementation (Server and Client)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tls-debug" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, pem, time, tls, x509, x509-store, x509-system
@@ -201602,7 +201700,7 @@ self: {
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib
      , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers
-     , webkitgtk24x-gtk3
+     , webkitgtk24x, webkitgtk24x-gtk3
      }:
      mkDerivation {
        pname = "webkitgtk3";
@@ -201612,26 +201710,28 @@ self: {
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
-       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
+       libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x-gtk3;};
+     }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;};
 
   "webkitgtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3 }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x
+     , webkitgtk24x-gtk3
+     }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
        version = "0.14.2.1";
        sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
-       libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
+       libraryPkgconfigDepends = [ webkitgtk24x webkitgtk24x-gtk3 ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) webkitgtk24x-gtk3;};
+     }) {inherit (pkgs) webkitgtk24x; webkitgtk24x-gtk3 = null;};
 
   "webpage" = callPackage
     ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
-- 
GitLab


From 10fe275ae4a3db11c553d2d5585bff040d72bdf1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Jun 2017 16:24:24 +0000
Subject: [PATCH 1456/1490] ocamlPackages.uutf: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix
index feb197defc3..93e3fd9c9d2 100644
--- a/pkgs/development/ocaml-modules/uutf/default.nix
+++ b/pkgs/development/ocaml-modules/uutf/default.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-${pname}-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "08i0cw02cxw4mi2rs01v9xi307qshs6fnd1dlqyb52kcxzblpp37";
+    sha256 = "1gp96dcggq7s84934vimxh89caaxa77lqiff1yywbwkilkkjcfqj";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ];
-- 
GitLab


From 4a60c51f5d02e7e9e53c0ab08b5c4aa45a053b9a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Jun 2017 16:31:35 +0000
Subject: [PATCH 1457/1490] ocamlPackages.uunf: 2.0.0 -> 10.0.0

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

diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index a9c7add6129..d65f002ebef 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -8,11 +8,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01";
 
 stdenv.mkDerivation rec {
   name = "ocaml-${pname}-${version}";
-  version = "2.0.0";
+  version = "10.0.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "1i132168949vdc8magycgf9mdysf50vvr7zngnjl4vi3zdayq20c";
+    sha256 = "0c5lwica5668ybsffllk6x4p921nw4pljimgqikhf17k5hvyjsbr";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf cmdliner ];
-- 
GitLab


From 52ecd549ecd375ef11d72c9395173fc575ae2131 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Jun 2017 16:37:46 +0000
Subject: [PATCH 1458/1490] ocamlPackages.uuseg: 1.0.0 -> 10.0.0

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

diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix
index d1e95814461..f55b757eb26 100644
--- a/pkgs/development/ocaml-modules/uuseg/default.nix
+++ b/pkgs/development/ocaml-modules/uuseg/default.nix
@@ -8,11 +8,11 @@ in
 stdenv.mkDerivation rec {
 
   name = "ocaml${ocaml.version}-${pname}-${version}";
-  version = "1.0.0";
+  version = "10.0.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "0m5n0kn70w862g5dhfkfvrnmb98z1r02g21ap7l81hy8sn08cbsz";
+    sha256 = "01q8ljjgi7d73x7ms489b5my83xds4jax1vbjhwwjdai01friscc";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild opam cmdliner topkg uutf ];
-- 
GitLab


From 5ab2a51884074256b2957fb3ac9d831a826959b4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Jun 2017 17:22:32 +0000
Subject: [PATCH 1459/1490] ocamlPackages.uucd: 4.0.0 -> 10.0.0

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

diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix
index d44309b266a..89d9d545e57 100644
--- a/pkgs/development/ocaml-modules/uucd/default.nix
+++ b/pkgs/development/ocaml-modules/uucd/default.nix
@@ -6,11 +6,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "ocaml-${pname}-${version}";
-  version = "4.0.0";
+  version = "10.0.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "11cjfwa4wjhsyvzq4wl9z44xi28n49drz8nbfpx754vyfzwj3yc6";
+    sha256 = "0cdyg6vaic4n58w80qriwvaq1c40ng3fh74ilxrwajbq163k055q";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
-- 
GitLab


From e10e3c1d1aaa8d4ba15468d0351af370a663cbc9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 29 Jun 2017 17:45:11 +0000
Subject: [PATCH 1460/1490] ocamlPackages.uucp: 2.0.0 -> 10.0.1

---
 pkgs/development/ocaml-modules/uucp/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix
index db0b29d94c5..cf5b0549233 100644
--- a/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/pkgs/development/ocaml-modules/uucp/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, uunf }:
 
 let
   pname = "uucp";
-  version = "2.0.0";
+  version = "10.0.1";
   webpage = "http://erratique.ch/software/${pname}";
 in
 
@@ -14,10 +14,10 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "07m7pfpcf03dqsbvqpq88y9hzic8fighlp4fgbav6n6xla35mk5k";
+    sha256 = "0qgbrx3lnrzii8a9f0hv4kp73y57q6fr79hskxxxs70q68j2xpfm";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf uunf ];
 
   propagatedBuildInputs = [ uchar ];
 
@@ -25,7 +25,9 @@ stdenv.mkDerivation {
 
   unpackCmd = "tar xjf $src";
 
-  inherit (topkg) buildPhase installPhase;
+  buildPhase = "${topkg.buildPhase} --with-cmdliner false";
+
+  inherit (topkg) installPhase;
 
   meta = with stdenv.lib; {
     description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database";
-- 
GitLab


From 8d4e8a73bde2c3e689d9d34dbecaca5911936fdf Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 30 Jun 2017 03:23:51 +0900
Subject: [PATCH 1461/1490] firefox-bin: 54.0 -> 54.0.1

---
 .../browsers/firefox-bin/release_sources.nix  | 754 +++++++++---------
 1 file changed, 377 insertions(+), 377 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 7bc97b093a4..33591b5365a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,945 +1,945 @@
 {
-  version = "54.0";
+  version = "54.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ach/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ach/firefox-54.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "d6ba946848d9e771def1a4cf28a7a43c3dca0d6f1bed0a51c6ebeaef59fc8df808c8cc9bd8d016c2ce9e21e8dee35989ed6575f6047735a7ebe62e75f68fbefe";
+      sha512 = "60057e48d8bda98dc63597aa795899ca1fa856f8a9f9380a8de91d0ca0641dd291a3fb27bd1f69b1effebc5288575c0a0661199e8e8e95ef8d924fad25831678";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/af/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/af/firefox-54.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "23564ab7f741ed5eccc2178a5fa3f72941bc843dbd0ad4f265467cf6fe6fb3afe65238d9026a5dc036e91aa0fcc32c8aa8a56d9d514df9c02642fa61c00360ab";
+      sha512 = "08a2cb7ee7bfdd4a5c205a38e1d966bbf8c67a3a5abf52bdfc73dcb527cf0dbe361bec4996d52e33321180f5c1778e8304f1b377bce04e62fca7457df8ee69b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/an/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/an/firefox-54.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "22c2ff25acc8b573fa975ad0a002cc1babda188c60635c75a618d8ec008a14c79d62bec4a432a3b18b11cf38836a70c62156aa7f6991fac50f744ab5141ad52b";
+      sha512 = "200f10de4f714afb10a9c6d1b4ac8488d5bdc18673b8db9aae51b8d0e8b14fc3f5f6211447abd10e13704b07499fc1a273d9ee060329d8337cc413d7ed6d19b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ar/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ar/firefox-54.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "8ebb9385e8a988c5c1215030833b694300df4f6415b592059fc286fd2b8ddc5e2b7b3e0ed09514c4b97cbeb96d6b463a1105b70f9a7a18833ff4142b4de01661";
+      sha512 = "564c72c485c593342c7056bec7dfa7a0cafbfb26eff278e08b0938194b311633b3e3275fd0eeaabc63eace36712efb194ecb700f61957bf0553b79a71977132f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/as/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/as/firefox-54.0.1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "2c51fed49a6be6f8162a8b67a851d8ce5ddc438a7c10dbb77cd3ab3d839d7737839ee0104d8a11dad8ed98923346d7658305ab291b8843e87a653f33fe342a60";
+      sha512 = "84d14f6152bbc17caaf4ac8d421835032da45dfbb34dd198ea5ec65d972e10a774aeba830eba5256933f3df395b5aef71aede2e334fb35aee8f9f27771d65dce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ast/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ast/firefox-54.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "a2d9c266dadc87aa7c3a0d57b31b4dc28ae674fb19a6ceafbf936f6fcb7ee86eda5f2ff2ad52b1567376aaf637c77bbcfcae62b8c526c62c2d7ebc87c8a2501b";
+      sha512 = "f5851e28972b5e87b48e8498a01c685790e4ace5e3d0f4c286953d6fe417495a9fb26ca3bd962d1f798a178115d2bb60367c48057c55b2e601dcf208ad146cb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/az/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/az/firefox-54.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "af5617504e53c360a9b1a2d40dc9231d3518115f3d8149e9e7aff8eabed4d1c86467d3634c8c2278e7e10039952feca0513a62934e52645410aa85069123efaf";
+      sha512 = "6ed4bb73da6362ed4598d5c6de8b072e919894778ecdec49b2e8e406d0c68b88c32f0b208a546834cba7ebbbee9a09595a67473e29a5c11bc2390d3a1721aa42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bg/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bg/firefox-54.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "2f13be1e976b02769e1c47ea1dfee7e8bc940c524c4881daeffe10500d7fcc662f00273156699ba37d82fe4f52dded2e2b34cba1caa22fa6fb9184d4ed7d2ea5";
+      sha512 = "bbcd618c9bf86c7ee49a3ee1a3aa799c72ffb048d694ba0e97ca8c4a9341d1ee109265529aeb23f578aaf66d34ef3a81a7031033421933c0f6d5d0ce136c3d68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bn-BD/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-BD/firefox-54.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "c4f9f249788df7e10fc226cd10ba8d4638743b65b46cc87b97460e7e551cff8d814a93ba41da294f409b032fdc05b19ab9774a09d6b62458a1ab695805757dd4";
+      sha512 = "9c3114291cac3b6df9bb92b398ed644f4851baaf99b6db9959e5fa841dd535da39cd3aae343226ae5fd713ab872efb4d4902f4a4f85e836372c67a416134c03c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bn-IN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-IN/firefox-54.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "bb6d4dfe207bd7fb018a6a473ac1c3c63d13e4c4aeb152174579c85a29b503d382c02df420028f1b98335fbef5ccb1a712e72cf0eca889f841e3b45a30d98db3";
+      sha512 = "5662dc48972153cc67034b148d96e120c802ade4d7ef532fb2964f8ffcbec30878489c81d758e729135488d39123bd404ab53e1ae1389b0c4e22303096c7e3cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/br/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/br/firefox-54.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "1c8c98dded57330c5008cff959da2fb23808aec2397b0b5d2b9dd2b190c73e113d9b599ab243e500dcf94aa81f3497f91b205067de2d0f766a1d801bc2f9fb76";
+      sha512 = "166dca485d947bb42b1b5ac9781d48104d876f952cd8ceb4006f7e0f79773aa2f285413088cc535610e6209538c03bbeb63f91255712466a50a12cddf747f0bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bs/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bs/firefox-54.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "89e51b99c1386567a09a78927945f1a7157064d34b3b0f8972893be491fe04033da92a68690a9d81ee9578f1b35af34eb57cea29a403b1d399f8dd50934bb24b";
+      sha512 = "81226d4550310d61d2198298bbc859406ee7f14e98ccab326b83bd51c8c33305771e9353d0609477eb381083f1e0f1a8bc0c0bbd085a738cfe00697877051516";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ca/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ca/firefox-54.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "650f81422fa74dee6d12db5e3e66056ffdad669c110633b796e59c7fddbac96e042f4e4eb11c2146f3f4f9625ce9e283aa4309aa8e6f814567be8c5a3bece3e6";
+      sha512 = "833096d35ca517d21b45e78d895bd4f535a55fff7a9990e22c684fba8549d2207317a715e2a42b7ecebf1ab474df262f2c25c9e44863cf167dad70f191ad39c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cak/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cak/firefox-54.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "9b76e8827814e487b4d240a77b2c5bf9900bc0476073bbe9e7d0f7f90120906021b33e74ee92677deb33c84a5eb11c4fd4cc81a330140b8f5f0002795ca6ef81";
+      sha512 = "5b05bf2b0a256e135e7d687520b901caaedd66593ca3cb458c01f8ddf85149144f75c24f8b0fd4bbe2d9cbeafedbb569f080970601c40895db96e7a14aa3c5d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cs/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cs/firefox-54.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "9c450275e7b8abad2e2cd96a4cc4b97deab479d30540687227802084890e33b69dad96a0389f43fc49dccf86269b3830f35ec810cc87d92b3e0642c71bf3b6f6";
+      sha512 = "63ea3c524c3e91504fe1b0d5cd1b74fbfe9b22cbfb18d9aec73569452a2766b90f29e2793f6bd235d68854d16b8862f46bf3ead132cd693866bd70502e0b8b39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cy/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cy/firefox-54.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "aa6f96cc78054703f474a2a386fa4d76604e9f38c682647d27f987013225244e0e62e23523132fbad2ec021c5795f23c3fdccd76c43f560882581a2847205705";
+      sha512 = "c804908472ab1a59b6a24e448b9bf37ded669dbf2d0a4fe0993ff2dba666e804b0fb846efe6c7f1923e4472a3735f9f33876dc015826b03790f4c445ab6215e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/da/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/da/firefox-54.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "c4270c94ea2a9d864ec7b19b94279c9f260afb99c3c70d6b5a2cd24d3cf05a709dcf5b14f977a197f0460a33ba5f0f70311a4d581f1e21dce863182e8213d961";
+      sha512 = "c289354eb5443b9f5e3027e80974af9aa9a5da045034ee147cf75d52de16a1e35328027fdcde149f2ef1d3a72213e3837668fdab4b610949b36e180aaa1dac56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/de/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/de/firefox-54.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "e254eaa1fce2385fc7fb564b8342529b23b9004156104e35da963fe166cbdf89f1079a966e818bd57386def6436c4894fca4de7876e31452763e66ea7aa74968";
+      sha512 = "99f214b83822243530a8194edbf50284bb703ba07695c1c5f7bd3cfe87fce64477806cbff852af92ad6eef16c85329c1b04608490fda12bac27300daef23778a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/dsb/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/dsb/firefox-54.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "f1c13a53ee4a86d3e88020babd3cbabc4be84595f51d7060be531d3f02a4eadd0db398b17539b877dd1de3c9b29bbec21a810c42bd430421c66d1e9d4e17b346";
+      sha512 = "96682d6d27e4d2c57930059a6cabe2649d4a52e006eddcfd4f940ed816f448e3d476488ab23de6a1106c66007268aaaea21ce3f621ce7e21aabca1ec00a5f0bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/el/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/el/firefox-54.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "3449ea6101a16f78e0f36a4fe85b993f70b5e77e6e7bf2a30dd2a2f1dec85af5627681825d0ee2cc47feae1b22d979257b77b59d61371c5cac7a27b90f9cd1ed";
+      sha512 = "122c72046a3cc621da62432fbaea9ef690a5e1930e8ca3214333fd05cc397419eeb8e7f46e7998fd12f2fa17fa780d7a0df0cebd50ab81a677a363855f4dd818";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-GB/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-GB/firefox-54.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "01f521f407cceefe3f8ea432fb66f8f554791c9f5ba5bedc9eff08039c02c637af5e725e3cf9e9b74b7c071d8479472a4abf7e9ecae8cc85188dfa5fced9a1d8";
+      sha512 = "bfcde5aefcfbbf6021f6c3085f27a5c9b88cb11b33a132d0a05c6b6f39a32aae8e140b3e73d2e09d6719d00fbb9c9998a27cd6897bb7e2e5c01f37190522320f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-US/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-US/firefox-54.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "96e4f085134296203e4c42db570e9b38e61e08766966d71ef6863bb695ff80f37c1839f44a1bb1257ba35fe9fcec9f403c1e259e93147d54cf2b8a4561c0cfae";
+      sha512 = "59416ec212626d225db0f12037eb68c98f564252c5f62743ec884af259d705a9310d9758bfd37bfb33c792eebb37d07824a197aff1261aa0496896482f6539cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-ZA/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-ZA/firefox-54.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "5789e07d2b90f63aafcce9ba8ef8469a420ac03fb4b98f3bab19d7bf51a37b7796215f0cb5614e3dc490d3724dd01f3dbfa26030659b66ea9390fb452d3dac49";
+      sha512 = "a03e96de441a3f390c96b1bf2484dde6d423fe1f0b9d7e518d8d6d99a6e61d6e44dca2cdd212a74f935c8e94aee00c3bd48b7fba9624ff17cfbcceea70802637";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/eo/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eo/firefox-54.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "c76ecdce017ffe7688383295155687a30034461affaa405ad37e477ef634f7c6dd0f9e07594aeae3f9a61fa5698346f9970fa8effdfec55d9fdc95e5ed67d66b";
+      sha512 = "e54744f4d412f2db9f78f518479cd457953f9a29c6ce0fd32aead8c04951337b72c6fb149c0d90ec3dd1e93bb6dbfff57d46c29dd526e1b9c406a3018677a65e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-AR/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-AR/firefox-54.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "f993cbbdeb2a8a065f827a4eb4152b3537af84fb95d0876dd363b1c04cd57634c2b24466e2a03432ee29e1615e7b5d1bd13ba20f844b347f0f9efe504d48efa9";
+      sha512 = "d9d3cdd8c38605f0738ff95f5f2cd2188f1058709fc63f21d06c14f6e593150918b793c8f3c291c8d208afb398efbfc7ffc2509f5f47091abcb804fc7b47df5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-CL/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-CL/firefox-54.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "75557b6731be41d435a0e962117a01c078f36a1d385816a05e15dc3c0148d89c7901af7471da64ded327972d9e73a50e49668b7b3b30c89e2b6aea2068b35ed7";
+      sha512 = "ceaa8bc10238996fdbc0552e4eda3edbfbb5e89b70166393e638cf4267d8077df0179213e1e692cb5798e6fb77f590f151535d2e40b4c278cccee9df8a776057";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-ES/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-ES/firefox-54.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "1aadd468b2328379b7958a5ede8f9658f4521ab877ca86e7e2bb7ff04a13294b5e0f6be510068fecb94603d4f81c5f51584db308711043f0bde36ce72723417c";
+      sha512 = "a75745381f0ff97fb298923a6c2c83a734ae1ab7b873e22e9d840cd5854ab8af01269214b844d0fbe1cb1ae4cd083c2c4e02779088280e82310535d9359a83de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-MX/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-MX/firefox-54.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "de5e95e50b7f04572f7812bd4cff5a724dd32b9ccc389eb61eb258fde4dff651df7ad0fcee78f78692413e73381b1711cfd80200be66d4b1c5e87a5cbe19da42";
+      sha512 = "381ae266297cfc6fd0d05785b2a6c945da20d368754521cf358ae4c4e7dda3a473086bf9a2679716f2b15b01413574ed413fd7f610a795a3536baadaabc926d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/et/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/et/firefox-54.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "0889d3884a01e6e69f67197f1b86bae4fc506064fdb40c082e9b9892e4b42d9f13f61d41cc55063b9d4fa51f45b96f5ed7c8a50070b9af4b8e9be94e7aea73ec";
+      sha512 = "7c0151ada40b55e96ea2c36a98ef6de954287e2ee808e0387080816fec1329313e0e8ae5b613300c806c17f6b31752443e7f1f4ca6782b96826af23d3173abe7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/eu/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eu/firefox-54.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "353e2230c1bedea7b805a2ada15ab863591b92c9a8bfa0e47464fb0d0f2f2601d086a71679dc5c1f560bfa6ae9bc428026eeb88a0d8a2b04318d38c8183ccb9b";
+      sha512 = "a080119cbd5c60499c7e9fcd55275f37d771ac4a352ef48088352b59bf86858b3cf70a5f6ef5b1b0e9e90ad9058e548393e9739cbfadbce1eaa95b39240c0a76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fa/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fa/firefox-54.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "e09d1adfba848d46e55102c0e5c366237d9e273646a82a03609fe70c13e38ae28f5029515e8656d1a0634574dddd557f9427bc26b8d5b2fce1d873a3cb2a69c3";
+      sha512 = "aa537898df126eb699dd91146e579afceaa9283c15d7b4d436f2078363a7b9b7dd63e0278d197d8efe004ea81fb0401653395f8d7550da884d0af80c32baa981";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ff/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ff/firefox-54.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "cc998af1b778a4c9688001ac139f1018d723bea35cb6149ef16516998f46f0f9addec295d2b377ff1f47d26bef27722b9300b28d5dd5f1eb860816b279c7cba9";
+      sha512 = "2998dcbead43b03d7e1b2cb9e6318aef185425de3401f89c875736fb124af2d126d482bdabb81535e5b5a46d68213574515d55410a6c6d9a60fe71afff64efe3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fi/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fi/firefox-54.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "e976095a009d5a51439d6fbdf81e84679c1a1d7ad2db4fc027cf52b4a8c9fa188fe337d0d08cb42d415a2132b8a38dd03698e3fa53605db221c781025c1a0437";
+      sha512 = "9ab8eeceb5f22e138550ef149cbd8c46e0c09bbf32e07ebc0b5abd3e5a460bf5f58608fa8e92401f68e915de7e83bfc592b5e3680f779a5b514fe4c71be56cfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fr/firefox-54.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "7d3346a00e4ea36d438f4ac42bb840ae070cae87a68a773d63319b06308a25650c3a69d97631f30552ff53ba992389ef1d5e62781bf5eb257a9286eb66f15afb";
+      sha512 = "bddc6e30f0d210009aa5d2d76ea15d9dd429c1b027f1d6104a51a69f364c8d9e985c33816daacaf2712c34c6743ea14197ea28934eb37340ccda21e2c3bfcf4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fy-NL/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fy-NL/firefox-54.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "39e670e2f5e6956bce1ca4c8b4fcef4893e47c102988880ba546b91e5055fe9438c6c8cedf69aae922d64af0ce427f6fa66456bcbd907a75be7e4360cd86d2f5";
+      sha512 = "9fbc84c8aa485f55319138518eba1bd020870193432cafd0ed01e08663298ec29b21a571b808fcb90d73ed052554defb11796d1fb1dec016472ebb79afd78e17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ga-IE/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ga-IE/firefox-54.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "a6815ecf3c1660aa7fe9c32ef3335ed4227649545bf5316aefaf1767559604b282412d2541a0be266121a75fea770790ea419d91359a97e25d9fd31334fe8532";
+      sha512 = "4188f5c0eb666cccccb3e343cd3e4921bb168107e63727d67aa040b002f544724fba25a17d787cf8e1377f5947ba8fc124512e651ef3acf8157c072f5f02a4fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gd/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gd/firefox-54.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "9d7a273e3717d21eb2316fc073f4270ec904a9182fc4a2b8b5fb01b90bda20f63a9886b427ae7fe5b3ac0107c7a1316578f42b2ff85fc3b9baa3721d1616e11c";
+      sha512 = "2e3407d0d1c22f4b451b1c56a871f94deee43d0d4aed22ad90dd0643dd75b7d512c58a6245b51dde6a19330ee154304e6b577b82f01869d222bf89fb8cd6b9b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gl/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gl/firefox-54.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "bbcf4690ed439d3214ccd2387b4fde5b5252b2039dad168b67f5103ec0407fe040bf263185e54b360e0c9875b972827937a6a634cd928d817e09b10c7cc50103";
+      sha512 = "5fc10425d2f8bb1d53d2e5f9b9d65f0ffb01609c018a06b850195f01f8feb200e15ac36fb2e03031bc776453220fd2af200ce26a21c9a30eb4b4f54caaa6de34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gn/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gn/firefox-54.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cf82a08458e6182ec8c320e5dab4e1629b86efc6f68c26b967fc646d91bc8f3a394849de50c4f960df75bdc88b884c8b59181238302262e864eeca60181c285f";
+      sha512 = "92f46e7931cbc8a7d4786800838fa9f4af9baae2d8a4aecef82034a9875b8f16fc813781146dabd7c31ea1e0a3505bf3b2040ed305bee17a3dac9a00eb3560ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gu-IN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gu-IN/firefox-54.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "3b1c8246364405574c4ce064969b69704141cb8fda339d1064c3e1499563f5ea2fd5b3749077aaa6fae1cc98c610ac0fafc1e0129e49f064f3603e2e6097f81e";
+      sha512 = "e1e41c981d4f690c0b239917e06b1405a796e43d5ea419287cd353ee2bb0f8bbe04f0f7c94ea4b3a600e362577dfeefb12f286c311becbaef1ff840b20fd766b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/he/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/he/firefox-54.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "3171dd501918aad9a612a679d9f0ca2c682b5e4f49b5249ac74890df6e8e98520afb724791f9c610c90135623c414e8da667e1e4777c1fb6a6e4b52495a9d905";
+      sha512 = "11545bc832cec83171a00c7500a220fb64815e514cce017fb6e60e549e43472aff8914e19818401aca20730fd8d063a05051fd53ecaffc790b982ac9bd63463e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hi-IN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hi-IN/firefox-54.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "cb72f0f30d029968a80ea775661dddd255d7c3520895c3241e5f309c6fe52399fef4f7b904009237ee047ad16fe6e893fd008fdfde852b39dff2878de454df45";
+      sha512 = "63507d0994eb52893daedfa3fadcdc9ae1ca27608149d51132fda86616a45aaf4d114936fb6305ce12d75a9aa5ee5779db6def3866a8037c18e055734b0ddda6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hr/firefox-54.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "7a4a9989416fb270a861b2ca5738ddecae4fd28d050cae482f096b9b8d497e4109687eb3f1f7f5bec52fc5255a11c9248564677896e803dafc260d2460573618";
+      sha512 = "8274ba4fd8bb881bbb788cd402a3fa49cdbec8d777e003c63dd425ba8693fd8e26a88533dc7c839f0bfbc47d16a72105e4099e67c0473e6b8c6aa29ce75a6b83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hsb/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hsb/firefox-54.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "33e1ac831c8aa44675b76259ee90836db8c6dc22c012a1235aa3b4f8715b59a47a5afe73f7f2cd0d160f4026799d2ed8635a289c17fd8424edbc8e3f7e4aae2b";
+      sha512 = "c956043fdde6ff492a687447c01ab15e874756d6c249c7751d4255f99ad60b21bb898c1472eaea73c91a1467e6a6b239ff60a36333da1fee21bb3dc5d2da1a37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hu/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hu/firefox-54.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "357c9ef51cf8c55b0b651f6208afe47caa3972e59183d4cbd9173c4825f6b1a1a831bd148455078bc2899732e094eeb6997954465311a04ffdd52a1add5d90c4";
+      sha512 = "28efaf842c1afd6ccd7882dd257ee9234015e641091c39c1b954d458a543fd9e0d6ac472d23953948fca69f5a62583b5120093f7186d1cc36a345adb166b4d17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hy-AM/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hy-AM/firefox-54.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "0baf66276422e646dc0085ace17b0ce6c9da5ce690d78388c2d8658cf79837658bbba045d2fc98a50c8d0f3b8f6895889687605c458fae1f1f7894e880dae2dd";
+      sha512 = "2aba8bced1431caee4d9d70d515027e3d08a7175b1d28b9f743e63d25983a52a8934e7e3155a5b220d0cbfdd61c76438bde56ed2c29ff2eaa46afcef6db75117";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/id/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/id/firefox-54.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "658bef583f93bbc91c2a1f4106987e0099089f88d6537c23f6cf53757cba8886b2b59175a6b99b4abeeb6462b59951cd4fe15feaa69d73e9948e91246f3c1119";
+      sha512 = "e2925f40f632aa14ba25bc40246a9c06b833062bf30d5e9666c87c22db436229f2b36730f6330a77fad58ec05a1589efd8353c2000cae45c7b322b32d1823559";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/is/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/is/firefox-54.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "63eba83cc9c8d601c8916d1fe5ad2fc08f9177334df66f299deaa1a25bd15c61656e7f22c68db4717928c75d6e2efb9127e818da631c24432a106e255afcd695";
+      sha512 = "0e56ab6054de54804a1f094f81c9180c58116e6786de47306f000e69f656e039aacd447d74f2119836c0f4d4d65e6841f94e527f8524ab7529461ab35b0e55c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/it/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/it/firefox-54.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "0adbc77efaaf4f666f650bfaaa0371aaed517c172086e9c6977b4e44a7eb359f460cbdf52293151cb7aa44461cd1f0867e35b30845d544279b95c93911f3082c";
+      sha512 = "449bdbc26af56503bc1a480baa7a98d4de9f745e85c443d2d0726bed16a676f4ba8bcf738c94aab42d4e79c96f1dc9de7b1117d72a953bafa9bb24f87fcef25c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ja/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ja/firefox-54.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "3b4b6a3428c2eb5a733807e659c5de44f4731a39c5e18845851b9d5f5b812ca86ef9bb0100218fa6a158f0da5094b1035ceba9c54011b7bf2af0f168e3242069";
+      sha512 = "47b417a6683be3329218c0b0894086acf588eb15a979e65f7102540d51e59b744878d2b5802036f5bc4534f8b253e26b6a947fa49a18e6f659122f2f193e18e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ka/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ka/firefox-54.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "bf978f673c00f0f56d99291e2ab47581bfc5373b95831ea097b96866705517eb126853e14b74f677b887016cdbe7120a0b2cc57f4dd2f1ccb892022d1acd5f14";
+      sha512 = "4796dacf4b8d180e0995b1b743d8d076d68c23031407f8d475107bc79c7773734e80c37d870c38f60de4115873fb872bbcf7e7862526aa5101c3b1a6d8e720f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kab/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kab/firefox-54.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "3bd525ac91d472f6b9001a9074963cb3fe3ca6ed6b9a8fa48c90425b1305302f0ac8ff3155282025fbcb0df65ae63864bb86c23ad6506d0f34ad49b9feeb1664";
+      sha512 = "674b955f5f474c2d76efae044d1ff95069315447d370cad182e09b0a2b5360efaa1eeeb33e59adfc7754619538ec6acac661f61c805e04b94c5092999f68edd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kk/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kk/firefox-54.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "590e66e973f822f4823f2b0a333c955555080a0dde0e3931d93c398fe2121156d93e0b779fdc71fa952261d3fcec75899c127854f62ac68ed88867fc6591b8c2";
+      sha512 = "a647e65b76c203a42a8edd47c67b849877f2ea4cee467ee3203554cf02de5787b72cc245e4f83ba0bc8011b26bfc6991326c2593973b746cdb69762e35fcd5da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/km/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/km/firefox-54.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "1e88844f2164de5725d9ed694b25c702feea980cb3cb3a1750ec0876296da4687b56f167fb9dc89bb2cc84a1439b22db5fa40ff42a506426e71cb4016fb04b38";
+      sha512 = "c644399b50b16ecc3b021fcd8325a18f7fe293155187d59ed99768756f9e493c51e54e5b77ab38485f4479b09af396355340ebb2e597cda9d9780532b7a5ebd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kn/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kn/firefox-54.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "29d306c15e87feb3740a146614a01d113cde8621930ca4b97c64c42fe761409f50d8d05e7953dbf3e8b3f971479b2bb6826cc9d7ae83d87ab9d3cf8959ad4fee";
+      sha512 = "7991b8118e773c1adc0473ed2b08ae50fcac57c9ca3b5bee67779f64c8034bca64500db90efa052547a05866d5f5f6f5156db18d3ee84a54cf8562187bb3fbc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ko/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ko/firefox-54.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "79aed8d95b7680a8ba634cb2016c7aafc9cdac723bfa291bde7d3a9929ed6716376b02db523e544842862782ab0c6157edd2e747d461bcfe10495eb09d2cf85d";
+      sha512 = "98bc9ef98c94c9e4c7746fcbb8f45c5e24bd01280c2573e2a0019ccbfcadb4689b93c183abd8afdecd97f490342295c278282beb0b2d3fb2bc14d988fc5048a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lij/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lij/firefox-54.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "d0c57332f12b617e8a0f819b6aac170f0a253a13f1bf9ca2e43435c8edfd6c6d16a3bb4746349cd92097dd4b94aa131b4fc3d01a4b088444881284c7bb355f12";
+      sha512 = "f7e82f1ea02935eabf2b9f525f89d14bace88069bc5f3572202c2795cfda4bff25d2edc89c31ae0edce7d16ec127941a64f362f8899bbabadd5a7d871447bd47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lt/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lt/firefox-54.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "7e4f74337824f52bafaae0b72c4d250bd5d6b023dfb13724af63f27e43db082a9a46d30654944124379553545d2bdd7c345685fe91a249ec6fc837a54e1681f9";
+      sha512 = "8b19b7e8134772186a14f0880f96f4af407dd6c081f9995d032c66cf1c9776529b5d5a08cd3a0f2a42f63cedb5b2ef94da0414fd194c19d6976f3ac4e22d0470";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lv/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lv/firefox-54.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "e1a794ffdefb6f05d4c8c775f1352396ae66bf4f09ef10cfec166cddc98808b35a286997f5dc7df9515cd31c9012801c749c79b07c50091218159fce38caf5c4";
+      sha512 = "3e4f978cb253014cf3a46747c11606a2be484f5e4866ce26a979329a4c5f9256135d40e0596d1a9c23bd6fe51a27019d23599a8535c71a1e0ec3e9a26eee95e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mai/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mai/firefox-54.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "af68ec14dbe6136d40e43f408fffb2e1fd481231ee2fc0925ccc63abc59c2c737446b34342b90b71e740ff3de4431e0c39c3f6e626e0b5bb196c92a865bd0414";
+      sha512 = "9a1205743ad46b39e6e05860d6152004fe6c5995d2817416020574b706ce194ff44414c7e5ea5c3c2b39f62fcc6d17b2bd2f85b249aea9803b1a1722b9d91c2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mk/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mk/firefox-54.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "7a898ea167773d30af253bffd3806ebf65ac65622f9da5bbca7b4f39eb6b98e728a06bb19894fd8f6306a830755b0947956be34dda96af4e1a14b96f5948c758";
+      sha512 = "96bae83111abc01ac9a20a1f55a990f3c856fdc5f4302215e861457e737e2ba5de40af76a2024fa6878c129a3864b0c689fbdf5e6c2c67c0a1e06fb594997f96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ml/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ml/firefox-54.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "cbb924b17d93794d2c1b457fae63f75a77f70d42b95d55288f34f232d50323ae49b19689b71254e8c94f02c6347745ba99b847ebdffda99cf645e2ab38db058b";
+      sha512 = "b55f6b4eae279811e461a84cbd32c78827090f8950af4327c0fa31056c04b7105757f6cbd70034c6c12887a0e60a326ae6635179c289ee0890446dd8404136a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mr/firefox-54.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "0d92711677ade6316b06cf6ba2a5f0eac11d3e31c852204e12c4b9b77de0d1e3cb29be798bdcc2eeafe9201a6b59dbd7b9c12cd30331fcd031230acde54e4fe4";
+      sha512 = "3b3f98606d66e68a4d45f5029eae89d7a1e838c6f0bfdef5a551d11b9fc28c64455b28d742705bdce8748844cb869fab21c5b2164bd441a78998bdd1efe9d6fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ms/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ms/firefox-54.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "a5eaa800c71d623aaab224cf61e97565f49382d382c05a097c19eba4ae4f0f655f268237a8bb2e42ffe01ba82045fe50a13c94ee45912c80351c883502280be6";
+      sha512 = "6619ffd4aa274511a7b10c6c3d869045f1b394b286001cad53f3f8f7fbf797a1d0d3e1c099e9cd95edf678c4e2f49251a5eecb94b6c0821d84ba075f04d1574b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/my/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/my/firefox-54.0.1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "9e2e6b85fe3d6ecdea000fe87c1060d7ab954cceea3b6b93386c77012e108b8bdb7aeed18506964e58297a0c513b734462982047b1d3afc1ef4945beae76f574";
+      sha512 = "ee500522c7fcbf4b8e9b86162c869c6238978b0b9e68b3588d79f1030f304c5d56a37db0775b9aa5edc40e1571d10245ee805bb8a90fff2dab436742676dd4f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nb-NO/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nb-NO/firefox-54.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "1885b3d94e505d68cf84cafb86b72a5fbe8b787ed2b274ab607fda3320daabf096793e16b330262110c606d3aa9802cee01e8529a3f7387b8923f44f9afa85fe";
+      sha512 = "780dcdee5c19295e367d659820e59a9f60fc712c00214f9d8caa64647cf399411cb74460b88ac521a1c23738357770cad1def1c1bf840a3676db5819272ed8c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nl/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nl/firefox-54.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "769939416b77471e735533c562767ad2234bd3700c766cbaf3c365d49c55f4f84c426050d8c19a59d0cef9ea6d4456830d73ed201611e960c21e3d4ac8511b5c";
+      sha512 = "487685f711257e285bf1f8a508d4167e6bdfd081ea30f560a5700b9ca487e110463ae6d8d607cfdff9349d7c1f2dd3c8e57e8fb30b49200e17754a596d2716f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nn-NO/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nn-NO/firefox-54.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "fecf58250fc95780305e2424e15b1b792fd319418ab378974ed2f1fe2d12d66ec2237db278aacd32201f04164ba77364effa5b83832859f599f494a1bf19dfef";
+      sha512 = "5db13d9e1db3331943c19be06849dee993726e99e519e1c03f8e3db9e44f9a4d2d8ef7c82e77c814654e66991352c94979754ef4f8b18295fe9c4ef0bf965bbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/or/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/or/firefox-54.0.1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "4f5c95899185a2836f51bb1e46581a6c3a983935d2a51a2877caa6e275b94d576e2d09c1ad5ef1c586d5b862b7318d013160e21a466ad122b147a06e118791d0";
+      sha512 = "98c90abd9abb1d34816fcd98ba96bb9f4fdec070d9a37b536bca1f7fbd75f95c7b0e58b7a02725e4f8b3a1b545e6da54cb7ff0b716319bb25e4ca64da616fe6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pa-IN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pa-IN/firefox-54.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "f67051953287c794eee5223739d637557b287dc0edc91b24a4cebac84e106d9a1c1b670c763da7a4b15a3204fb7292e8c436b51d8b45af22f4c4c726f45aea05";
+      sha512 = "01e67b60bf6d2b7a8ab6dbba92678af6102173443ee938ca3f236403169b90d00aa3696af2ae445d0a21f25695e768968bd4f7769c9b63dd5c2ec06b7320459c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pl/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pl/firefox-54.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "ac3e10595201713e06a80554732a7ec53334f288b223fe04ab388b83d3190bd4046c82ce60d934b15245964de68ac2a1d1923362025209e5c0ac683dcaa0b6e6";
+      sha512 = "af44cadc8a4032c5ec6e6cb2d502e59f11d43a474806c4f7b98259023ceac8d196633f4a6f6c6f247a042eabcf204ac4310b885d0d47a42e58cf91d81626f3b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pt-BR/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-BR/firefox-54.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "cff8e41d257181bdc2dceaa301b3d38b51157690d4b4ab78506353f3f0f883547aa688a74de643d82851619388ee37407ef48d3578a397d9ef352ceb08d112d5";
+      sha512 = "24d95447c5d4d117b1ccdd415157015b473e01489cc768403edb794eb409fbeba0e35ed74f2d6c5668d9853ada5ea04bb94fc2240d01252f7f51c3982896601f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pt-PT/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-PT/firefox-54.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "156516df4abe22265eb9f7b8515a7ace20a0d35c6e460f10ba5ce9a96b428deac0c72ac22b61c2bd95b0da9dae52c1cb055730720c5fe0c42314f83b838950c6";
+      sha512 = "7d6871788279c9ccb54a62a8eac5a6dcd69481a993a8c76dd3a31bf94e2cd5e8c4abeafee5bc6e0f0724419d7a38d6680720bb9ba8c68c8dbccd2dff46be6fcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/rm/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/rm/firefox-54.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "738716a0580928ef597b64f3cfccd73a38ff42b7d4f5ea18bf3425dbdb262fb7beb99ec11b31acf1d2ee321af4b4ab25ecc554c819223a84aea7722d14ee3246";
+      sha512 = "be2420b9cb9956a7c8145bbb5ec0fa841621cb0672141ddc0c8c0c3135c9372e7e5b82387a2a123c5f838393bf5e22e14edf127325e6767461e758a4aee6fb36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ro/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ro/firefox-54.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "6c5f8e0eeda88f40765ede24c75b3f0fb70f9e90af30767d8fe4d08cb49be64a389a0e7b4e141031d15e2def42074bac0c64d2cf5b650587f898e6be981c9756";
+      sha512 = "65dd955dec8460892869e3fcc555e153bc51af059fafaa1cd7a250441f166ad2c5aac2cfbb573f7320badde424c84007d121b88bbcff09ca2f474db84524de53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ru/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ru/firefox-54.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "7ddb1a185465980310695ac06794a8d659da3eef8c451f0e0c75588fcce9a1af65e75a0ebfc0dd583f0a6e6e511b03108e6d9923a2f6488da2276018d7ad2c04";
+      sha512 = "ebb48f14805236b8cd36de37e514b0738f7d49b93713d536b1f2deafc1abdb67ebfce74629c131304eb440032563f17260ee319be133f0fdeadbae5bd93cd2ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/si/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/si/firefox-54.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "16d516cad8e6ae86eea95d0c4bbd8eaa56afbb74f5d6db82452176394c723c4e2b821616ca76186c990a78d30e208554e7eaf7deb82e7a3d78c97cb2c1338b45";
+      sha512 = "5be8bfe9ef8f1096983d087c1e61ec197c2b1cf0388175724480898ab48ea0511127356a041045ddef7afc61d65e568b8c19bc5041a06b575f76338c88d1130c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sk/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sk/firefox-54.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "e6175dd3316c7b05f95e075ea5966b50e243b83d281bbc87f6a4dace16c708560bbaec8fb0700823ddf1b55d27f7f64450254a40570616a9bba0d2497bea1a08";
+      sha512 = "b70627c2fa4d5b4bb90b919cf1324b3463e28ebf918b000a64ffb0ac64c997a370042d8e7029dd2fa749206645a381126ec5d24a952226c876d788d0af6f9cb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sl/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sl/firefox-54.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "4e78e2d9808b88c191f51f8cf0d83f1762d743b4bc736d469bc145056af2207bdd8c3dbef7283a730486b041826bb25fb4816017786b0bc7515238b67a285062";
+      sha512 = "a0ba640ba12ad5b0477942e4eb91c9e9ee1f602d5e51999ced88be2f150311b15e72d70d0de2295916b82ea577d8e07cc33b7ff4a8425a886ea4dc3a6f6634bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/son/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/son/firefox-54.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "6ee8a87158c2f7cc8bc38aa59959644514888bf683b7fbc3c703ae596fc6260190cea141b5f4d6aa72b21484b4a4218850d7d0c72cbe83b8329352de64b19e3f";
+      sha512 = "e2dfc2ff732a3ded0465ae50879e4ac6c180040a24391b8e7e879051edd7b67c4022eaf03d5abbb21d0baccec795ca10b811fb14a5ffc823d860255871265873";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sq/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sq/firefox-54.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "1dd34fd13cb790a91f0592af0e21ecc815820ff4fe6d0c07c27b5efd82b37aa6c9526f5af9a444a1911b249651c17d9b367c02bdc5ccb420c80718f01bcae925";
+      sha512 = "3e56f0d47c77c6cfc65f40088cad10bf513369a78b1d2a1ceff7e92e798f136f93333dcec4bf780598b3e8ce47a55cdd47696f20337d27ad2e2908bb6c047052";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sr/firefox-54.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "869e31f47498ef748557c7bc0b9d49b893826b785112b5e152bac46a9260877f9d73740ad36fa139452074cc9b0bd23880d7a046eedc0bd652ca44eb5188e035";
+      sha512 = "aae94358f83f888c3ff8fab2a55e4239d2f280813534d21f199f89b8fd95cd7a37b2862becfb7e1c14a9b180cf1844df59689fe818df8ae490786a5dd65921f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sv-SE/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sv-SE/firefox-54.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "94601f07bfe9e13872cad9a0273c669d4a8a44b3c8f654aa866b703e325a0f1b6313cbce70fada7bd2bbc074d6d51ad28e829c6afba59d0e7d95645c276c2594";
+      sha512 = "5c672bc0ea10b65eb93077e0f23e52fa081b49e12760e2d9167026d8d208710916b38b56dc24c5a78378e3f7646dffb77b3cef49923028889324ec7da39bd842";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ta/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ta/firefox-54.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "0ca3d09ceb89ece40b8f6825ee7f46d4ba2a546204ab185b82e32d9206e428e8818ca0478d8b54fabe6ceef4641e8411a1490d862bf53964e0ab269bb2bdfe1a";
+      sha512 = "6649f6153c6b173d13dfa5f6bf7017102645b54d9c847bdc01d155ac005fa2ee5c997eeec13fe7897b55468912b70105c449e51947af270ceb44fa1ad02fb1f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/te/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/te/firefox-54.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "58e6e95a7972f2c5b4ad8f3428b95c82434d9041dc8879ff1fe961adc6baff87584011296621f07ac9f1277f6392d1f230310a65d64f245c7bc3494872dc0248";
+      sha512 = "5c0836df0350d5b282420d96ea2886c2343641c3ecb2daf91a81b67dcdda6145532f2efd480fbc7be412bb8332247a49ef48958157b33c33c444c55ce85c06a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/th/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/th/firefox-54.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "da0c6bd3cde25ab20eec1e31538dd93d4aabd5659af3a00da1279a7ed37a30f5321f8260dc684610f37e7f744ca70bdf882c9db3d66b2988a7231ed4f07f6232";
+      sha512 = "6c0a888749580afef4946b4037d722d736d654f2748827af42794ae452c6ba4eed6b0889dd20435201e19f629d5104389f42a384b637d6241fc9c0b8f22935d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/tr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/tr/firefox-54.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "fa98f5488afce2b1b7f27810bc9fb8bf6d45e09137bd7a5dae89adcfa77f3f1eeef9ae593d037614197524128c317549edfd8b692b25ac6a79005f49f8deab4d";
+      sha512 = "1301f85151378f74a7de1a33c42373feebca433f1cd6d0aa5daae229271741561bef2bbb214a104195d93664f802fc8b233d5b60913f901583eee68827643537";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/uk/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uk/firefox-54.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2ba13913b317f059093abd6407f9c4f798dc82491375fe8cd5ba21cd6f92f7144496f9f879b3f34eae7d41bd6a5e5a66efd57c19a76f1f89a266c2d50069f01d";
+      sha512 = "d178ac2bd9b3c7a29b14effb005d046f43e78867e560ae38be3f5f55c39447d100d18958aeb9c4894579fce4a46849d7dd8a5c4951ee1bbcc4ccf4fa269da744";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ur/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ur/firefox-54.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b3c9ee474325b2afad9380896f2f785949170bf32582187afb414b4052bf6ec55e1ec7ee974a980f6256b178621abecf6e87a24c23d7df8c9faeb486cdf9aedf";
+      sha512 = "2de7c4b29a6f897fe2df48e070164b2963a8117c1628f233d6ab93b1dc32660d957ba557f78344ab1588acb5144460068d34e4c804475813e9a39f4fed6780dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/uz/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uz/firefox-54.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "1b419fd85815927410a43aca976074965953eb217596b6273fbdbdffaa71b0a87786a266a27fb9db11acf25df539c45807d780ec9af0c2e05fdb8b43e12833dc";
+      sha512 = "a3b720e1c50bfded6d44dab4044fe283b1f718e600879663658d5d99fdc5ca36a996b79149434c71dfb951523525b59757b84dcb383ee7673c3e6e2d719048ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/vi/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/vi/firefox-54.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "74be717bec52c300b7accc9a31012c2a6483d4f5060315326aed2cbdf500d627fbb101d9cbe0e19f7a3ad76029a88e42e815118683fb5b32d6ea855c5044bfc6";
+      sha512 = "6e53d4418ce4d325e705e32ca215e12c97daecb81ae5a2bd0531ae4043878a9c2fab006652f08e0eaf8ddb2893fdf4aef8b0157f04e6b9be4b63e5e191028f24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/xh/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/xh/firefox-54.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "9b5e7428042d619f61f45ca58092247462bd683060772fa7c32d862aff7882a402a10bd0ebed940d31871bfc0212b3555fc5c99b1470d590e7b9d3d614351a3a";
+      sha512 = "fec4dd19fd5e109d1fcbb62538d1a0b9ad7867b111effba8fa4ca09921cc0d3d224e33016a60056e2d556c2cac4127587fcd379f8b023749355eb47ca92dc337";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/zh-CN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-CN/firefox-54.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "e86dc80340a30a89cff1063dd9559156c7a8713228d1f5bdd660a203373bf1ae99f682fbc29f8ce2de65d48eb5380e748b5484f20e1d73cb52f719327274d90a";
+      sha512 = "78c162de2ecd7e698ae59f7d814f333885fdb4d5bbce2890f493008c709a3057524f098a36f437ffce0ffd7856ce5ca527bd2c03265abbf76c106ac8446d4442";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/zh-TW/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-TW/firefox-54.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "bd412bb36f6c41293ef68f38609ef0554d492aa92b6ae74e318cde23e9fe13b8e8d4d5e3d46a95020951c0dbe64ff83df0987b166d8de6afce14b6f4ca09d3ac";
+      sha512 = "2e6e0084a37129adbafd524f0a8353ff0e26c4a59726be90a7c8bbedcba84d20a72d3c66c21335e302d929c5ed5aae9b67134a840a31c887c45363f957172f1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ach/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ach/firefox-54.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "bcf4707a88b8e40ce98ff2f6dfd9bd219d567e9595b1686485f6229c3644528320e2f4639752e4144493fd6066996235a850ca5539b67f2dfe07902ce4759b13";
+      sha512 = "2710b4a940c3df0eb4f4a5a00e857b030ea4126bfd1d1154f169865e31597ef0f17c8e328d87bc68afbdc19a0dfd980464c1254df15dc69eed952da2c57f947d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/af/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/af/firefox-54.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "f527c2f0cf5b7585f00f1c897a178e2f526db0ed126ff8616da7ea86f1dede94b3e5e011622886323fc1245c935d362f96c8bcb792043b05febb4a8dc01c2a50";
+      sha512 = "aae3f0465180bb14983d6fcbcf29d2f361e4c9703f37806889c35e60d7645dfd344aaf33a2fbac276ced63d906eb29452303ded125d86878d6c3492077d8868f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/an/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/an/firefox-54.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "b99880f2b69a44b24750642a67db2d617c237483b5da6da10b18250b419aa54b0809052ea7d09bba8e66bb8047a65f4ad3a371bdc8a016d800b24b5ef1a453f5";
+      sha512 = "7f02c46293d5c6baeb75b80f3d5fdeeba5112ea350c5b04dc5750f5410be39fe4d0b9f03d21e8855922b97e1a6684b90f6eccd06d198c9f9b259b42fc51d9e46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ar/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ar/firefox-54.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "b9792beb0db0e1555e9bebf33fe5912abdecaf54302a6573d8d1a7dd3b362b4bf364e13f38c1aa326cbcb80c16ad2ce2f6ca7557f1eb8afcd3aa37c0c5272823";
+      sha512 = "7c4fc8f0276029deab6756a6442cc29d75e8a31a0d62d045023c68c4f80878b920a34faee8a3e40f823de67015aca6f32567b6cf57f9a593aa1ce6ed5fbabae4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/as/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/as/firefox-54.0.1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "f215bc4be896f04a867d516dd2dfcbe2965428306bf5faeda66981d80171d66bdf7363175fc0ab15d41ee54ce064d5f4d662518d41731b569b89fafad959b19c";
+      sha512 = "e6825cbb7d228a1b8354b6030724f9e3407b7e5a33f1fe59e7b19fc71f0c28bab2db649314edff5bfab3c37b154ba9847b77fbe8e0038a7a3565c3136115862e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ast/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ast/firefox-54.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "aef5200ea3333c899e206667de6333405d8605a502ac2c1d08f9ce6609939c347d5e19c4475da3476623657e6dcf9eb92b72698901ac38eed3704fe15684d31d";
+      sha512 = "8a1e64a1afe3b22349b1cad0d51ec299e02c5a9ed330792d4820bd0be4ab33cff6f05d03ce4441e2b2b757f45d23e6760d2bc370fb13d8dd1417cf562e82f331";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/az/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/az/firefox-54.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "f5dc2d4218f1433c4ec5c0e363f78ee445ad9afe70be3f019ca206fa873d6905d553b3ce6b8227f02d00353b3d4db349a2a8ef2354c5a740a799774be1ec4fbe";
+      sha512 = "cf72d9045c2dd9e9c6da619ccf9fe537ae4823b3623e9873bb8ea12ba1881fdff3b05264908fa5738e0c2ee0d119ebb5799b32c90ae37186284a60cacd75b7b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bg/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bg/firefox-54.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "57b7e5c479e092bceae1633f6e117db0a3652d3a037667a97d9f5283cf390df731e6b67105b4c59296c4843e1f98624030a7bd72ba8812488094ebd1336ebfb4";
+      sha512 = "686ca0b866d1e9504f21adec227396ebb6c6957b6d4aa9a3a74249d4ac8c23f1556bd1282f54abd82ffedf89e2852794014c5bf7bc46bd1d0df4dd5352e34725";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bn-BD/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-BD/firefox-54.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "dcb2f5c033648cf5a887cabd1ac70d4a569bf1af965e3c0eebe2c1a2b746be007b3e76cff666288b29279246b005e2309c7b5e48df20955ee9b685a0d9548636";
+      sha512 = "f0e7bc6ae6297cf9e83cbdb8366def1885b96ff64a855b312d31346e9fc476f4f80877f9251520c77845fe1f695f39a757dbab2411a42e694de27f1772cba085";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bn-IN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-IN/firefox-54.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "5cb248381eb1c67f0d18d2a9fef63ecea7bc8b3cf6f3db2aede0e9c25dfd6d0eb8aabc4d9177f2f174f2718e4361166bc5045e815ebbebbb613bf79de3345060";
+      sha512 = "6caf0d5f71c1135272072439c0e2c84bdcd967cb23c51d980c47d3c6a3748e90e041e89eeaa88a42063dfa0d3369597c8eface6593d91ba1d604882e16b4cd5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/br/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/br/firefox-54.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "5e0693d9cf46a78cf5f1581e5a18d3ad56f072f975e9169c6505715dc054819fe6773196b9d71e46c40b1757ea2060d8d5365b98550fa068d4f27f63e89ebc1c";
+      sha512 = "10cc66d62e68346b896c0fa081f8d8c1ebbfbfa364a52bbef5c7f368aa854afb7e968cfc344378707b93b2cf478fd74d4ee97f9b7bd160199533f26df222ea66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bs/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bs/firefox-54.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "71e79a378d6ff2a29a2c3e20f0595688dcb344829e6b241fe97ba6ac0dbf27b982966168a691e0293d8625459f89dbb4c7cb6072547934aba2410dc20b525f3e";
+      sha512 = "6c87de221bbda9639d5751f8e8ea2f4aa5be191dce18f0b4f038f8a2fec989eb4cd3ae3b2ff36ca13c168a8ce92b6ac6a60b46ec6cb022ce6a95e921856973b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ca/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ca/firefox-54.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "5a40bf62d0d6691df4588e4db7e9e48d64922d1d81f94d383873588abbd4541a7589ee662c9624b5a9d1c70fffe3e3a468af420e54fef119d1b66c5eac9bea52";
+      sha512 = "67ca5ea84b6243bc8869b96fb9dcecbc0a8e7018e256101874791444d57b5fd61a69d7ed064df41faf9ef3cc9059777412fa86ed445e9e40a3570d030f776d68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cak/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cak/firefox-54.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "65e760fe89659181582f86424d44406e0a2e4d033b5ae030f199564fe1666a5a85e77839ea9458c474e4c7f26b1ae6656c071c7c27553c53d276cf5a5aa976fc";
+      sha512 = "b343dea962cd69bcec30b5a274a118e6ed2740120cd09d8155d0ad32e55730d9bc223a213df447ae50ec6bab67f5be2b910feebb73b4b57b30ecef49a3b0803c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cs/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cs/firefox-54.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "5b9e2c3d30d316ed7c013d49ff0524497ce76c02f2bc5d33254c561d94fcac5be8bc4cf269b6239399b22aa9d9c466698499149dd895644d17a65e2960d1b6bf";
+      sha512 = "e4f55216ef51ba1232e15b1b842c3964a49aa31a9bff2cf292bb7cb913891057ab4cb3e351ceb57d3024f2854defd693a75aeb23431a7b7e8fb82c41f500507d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cy/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cy/firefox-54.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "85ca010fce9e7a15891ff51e1c69a2ddcc686857e0958495b7f7eb8ed59e2faad7de5c81453d2ad901de3db2695f8dde0c3bf4a182cd4b8ad6ce94895669ccb1";
+      sha512 = "4d4340737549368855b21f11a27073c60112cfb7aa0b5e1329b27402ffcdd222eb009bb13e81a8403a72ed67b57d2ba2ff349fe0255d1cf11f32f4f32a73986d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/da/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/da/firefox-54.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "22913845f9bc2ad7eb58c0d556b2dcc139b98b37ffc3606bf4595d748890e094968adbd4f888117a2ac163ed0dcba2c5a4ab97105ffc48cfef38accc15c06ad1";
+      sha512 = "4ab3cd2e39cd13608331c13bf788ebb5a75600cdc3e5bcced2adeaee3d1c70fde0b57e93be9d8ecc72bedcf14560129246baa8b6fe5549de5614dcd14bbd76a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/de/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/de/firefox-54.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "8a650095e1c80dbf8f931b8dd7f883312f52f76f2743a6428d0a5d7526946247e3ae87512454ac77a2601fdec05abc8ae16957d09ce440e02ecdefda243d4a86";
+      sha512 = "5b4ec879e8bab2bb4233da0745a4e905736d98816377458333d0d5a9b8a72e6cec8f450e8a4ed49f69d75b3a5b1c223bfe96844cadad2919044c637d78a13f04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/dsb/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/dsb/firefox-54.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "7d673a98260823cdec8cd44dd564c4dbd0e6f4cbafe1b1234eb4c631dd07edbe34ec6aadc5863d62030271c1d4fb39a7f8be1036ed5048ce98d2af85d4999e09";
+      sha512 = "0ff0443ec9dcd3cb11978bf8689d41ef69db93d8b50b6dd53f4d31fcbdab2e459aa93427bce476ec989e907d743fd392add82426c002aa604fbe251ae438e912";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/el/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/el/firefox-54.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "fddc48117e63558a7a8cbe83ecdd937cf5d3d444c1d58f016026b51ae46cb7a0c4a44f04474d285b8681a985c59c1962c39a8171802821702d6ed4744ab39390";
+      sha512 = "5cc24ec6bd4823e5360b56ce78a97319e15c8f2a47f7138033dbc52e7df001d09577de3d9e8cac6314cb7809da0e7674faf8845e4610d6ea08e47cbc9fde7f03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-GB/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-GB/firefox-54.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0f27b44e13c620a22ddb24adb03aa504ea48ba1674d25272ad5dff86cd59554b66c517cb378a6d2668d6c9014fbbb4fc9e56565ee943c608479a6c6ab577dd50";
+      sha512 = "0b8a1576ce8b112ae35ef388191d2308aa2c7222f575bf354d3d6654c05f073429af8ec9b1a1a77a268b9191d2fb8b758a38609c6432dbe827b739b3ba25ec61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-US/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-US/firefox-54.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "727ad142bc3861407552a0c4438911493381ca5def555b3ceeb2b15d6a66cb4ef97c05dbace932b06048b3a5636f6568e3940cc8ef45af28a9797b738f2510cf";
+      sha512 = "9b28b30e136b9bd89b4b374a9a6c8e6efef936354b7eaaecfaee2efca6381abec646627c57856f64b96ba5a8f771a411c4164f3a54b783a8e3e197c0a78d1622";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-ZA/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-ZA/firefox-54.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "47f1385a47014a0517a15dcdd1ec93752207992de077a89742ca1b6998ea49e9d07b1ca12cee02c3b8381be674e9687cb403d620231003bf8b683e279d281b69";
+      sha512 = "360a4048ea81b10b5b834f3c2ef21776cfbaf372f3a329ec9da016728e1b83f956476ec98295e70ae3a9fe63a5f4f87b6be8d47627d6f36eff9b2909073fa70a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/eo/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eo/firefox-54.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "b3d941ca034a50f2f998ca6827682cfb18a9a3e280696951dae1964980e153bb2a0461fa33c21109b5aec1f12514bfcb9eb89376df6d8e4d87f81fcf5f9b7d9d";
+      sha512 = "23e95684f5bbf6b209a3077e173c3212b77e89dd64f22fd378ddbb8eaa43682c50f4021e743e25189b2d1cc6754bce6d0c8604d3884ec1b32cd7c51c0dee5f0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-AR/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-AR/firefox-54.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "39f930dab3f08441b6dbeb08d85803ace7e81e43208a03fc820c6245ae66de183f3759081c4f2ea4dae9ea8724f8fe5081123cd4b82bfe695e1bf0afe34407fa";
+      sha512 = "88b7085fa2b4b1013a7242ca293197d0d26916f2ffbe1f1a4e8a1d2000e45705301ee83b0de8daa271111f586c3e5fad54c8e241da17f3f8cb9912b50e61538d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-CL/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-CL/firefox-54.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "469a2e7af658fb21f41cdaad5bcd77610e031c965cc5e8e1e6abb32c2553f68a6c7b60eceec56a3eed99f65dce34b09046748e0551bf95f0bf98cfe97a3f726e";
+      sha512 = "990214ab2abaee7b607ac0a46fadc7c8be0fa12ecc5c0819f58324175381309742e0972ba54c144ad1dbbe0ceca076621aee0480e9e954f593c841d58f1a174f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-ES/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-ES/firefox-54.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "1e33b0a7dce58908bf98b63e3248628a8d62e5c980555b4385ffa990d8401cdeb14240f4a79eeaf6e3f5f0830455aa00009c142dd499714bf50209d10a083f51";
+      sha512 = "7dce1007e0c52e048d441405a1a6c02863da24b8b8c4b7f3afd61f2c866ee6b19f29c82dd6efe34badf52df9a66c76fd56e788d047c3eac0503e3a74e41240a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-MX/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-MX/firefox-54.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "8d847605bd336079728087716b781fea40d256304c8f5bd839d83c0e5b4062ee13f30fd257da84bbe4203656aa31c8acd570c400ae04f39107f6c56f7d2ebb09";
+      sha512 = "80b3ebb80a3682b6588175fee7243bbed87312463ea4bfa02d52be21b1e889208e8aedded74e9a94968969a2ede82fe63c83f742ed7c5754984f38b3f83a379f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/et/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/et/firefox-54.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "9502f47b30053aa89d0a79f6fc88a698e4206bd7cc37a2befed76d7811c5d758d61716f949de21e73c5690fb348ee26df7bd6eaa05473e4b257e4e9d6721ea77";
+      sha512 = "0d31b34100214a588fc2ce5a217fde7a41f484344662e3402b69daca937e73213ae7ecfcd081437f3f4afd4bb8ad2f3810ee9e6cc160c24d81b81e20013176dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/eu/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eu/firefox-54.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "7bbf574f723999e238ca8daff96a81dc124545046e6a0143c95ac6ea05ee3aefec86dc33b588fe206c862d2fdbc882112fe0cc1d30ac5e4b215f16f41957413f";
+      sha512 = "b8ee5dc7124e8115af11d58770562d51bf7356992e84c443e4974b096dbe2e47f4f57f90ad238a68d712d9fc7c27c399719a8c4f8a4726fafb9220e448ee69ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fa/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fa/firefox-54.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "05ff15f72e785af68f91a890a72982c218e0dd8075e7ab5a43f11d9a0ea03b67535b5a7b088a6ebe1ef97bb6f08a1ead394fde51dc708e8aec8843c611765e3f";
+      sha512 = "5bf7b9f0db610f5e1033f38e65bc86308b26c1dd6f51b0ba01064b9a0e0debc288aa5f34e7346aa68bb8eec6b81d104ee84d475968cb0a3946767f311dd85332";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ff/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ff/firefox-54.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b70de55bcb1e582fbafe6ff7a61da548300e0c21c78ba80178e07540dda9088024e3286c3c9dd8d5473e02a1692916adf0417baae8c949ee19a8f00f6882cb65";
+      sha512 = "f7d57a36612a82f94aaa5a05ee6764863ecc7c769880aceffe572ddb738cc899cfdfc68aa15cffbbe687d0413d38cd87483e78711f075eaac063d7f5f0b2d29b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fi/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fi/firefox-54.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "fd895e153156ebe879115c24e6e35d3983dc0e8968a061de017584f6c255d4b9aefda19ac244eca5e8b833e9a7836df2bff4e61a39ea71dadec1242431202971";
+      sha512 = "9f58c3a937ea4d7eaca80c63c2ec822511335f27c254fd086ab2583a55e457dd1da98fc1e2bb8d299010e59c982b54441cf157afe3aefb9778877d25f43f545b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fr/firefox-54.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "ec36040ceb536d4b99da9b9b5b300b066f4e54b29faacd248c7d29834e1e902da446fdcbb3972b4a07c1bab71bc144f53650e0ace150ecb3e659cc8fc15be71b";
+      sha512 = "8179c3840850a6c353834f052fd8d4529423311385fc39d0d73d6c97082573c5035cf7714a167bb3d9f0c77e64c9fbecac30bf53a03f6c01c338ac538a23e0f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fy-NL/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fy-NL/firefox-54.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "085a76fdf7def5a9bde73b7d92369fe577b448b8fb829445ddccf15fa3918f9fd1a6cdcea68376ec0c0b716592c8148b1ab638f5cdbe22e0a6ba7135e9702c2b";
+      sha512 = "819d140b832ea5820804b0d888f96b82737926a08854c4e93d133636c633a52433e8246a0ce187cfbfa56ab4bf09a4b4c000efea697c0d50f22edb02ef756f87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ga-IE/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ga-IE/firefox-54.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "c344ca0fcdc266361ce5dde1e8adda69c9bf0ca093538ae339e520035c5cbd16906e4b40db03098647511071f6e11df819bbbf07661fb61edf8cd14662429374";
+      sha512 = "c71d04d8ec3e7dc07eb909192c176b456daae54cc105199f675fd8e612c0f6527cda0635c0e1aa6221e2d5ef3f6c8168491b02571054ab0d4b7beab59ef692f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gd/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gd/firefox-54.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "4d44ef6abde187c2546b01bb59a1453bff07491152a9e08abc8674f72fdb201d0ca84bde913f0de7f46a69d6687affb419060994f49f5f934628456964eae075";
+      sha512 = "98bc4b44b2075d615e682b7649a0a0cc696013b908aaef11a60bb299881e0ba243e70ec2e6e9205c965d31c68c6a8a66e9826fdb711676aa0cc3c8f4c44935d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gl/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gl/firefox-54.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c3f3d6de8511b7f782a57d99a368ad82f8caecf86caf88508f01e4c86cda35504bc99eba89b007ed1b79e089863a3ba8a93efd348e13ed64cf2ac6b9501da65f";
+      sha512 = "034b22ffe1a16ee330a8c85c18975d541b27d5ae1e5e3cba3796307c641af14797b329162a6e3f4f642de711a9f0ffe5b2fd274a90a396190ba176c5c26790e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gn/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gn/firefox-54.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "126c042e28e2aaa6ea6d36a52ee5d80a0700f4660d5ead0a7d756e59a1aa42044e67e2dd297d95282b71b94fe9ede9ec8ccd1a553c1e03ac2217769ea407d09a";
+      sha512 = "85ba634e0b991b582ad0795c368d5df28d5e2fe773525792ab071752ac773d0d81dd3991996d6e9db7745707cbea8ccf86784b6a8f117d97e08b5ac88902d5bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gu-IN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gu-IN/firefox-54.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "ec796a9f4b1d8e8c5b2c16d96efeaf1841aec9e66429f0ec2aa87b81281c29e7f99b94228a3963dd81e30685d1125d673d8b0f287593cecdbd64563353a0420d";
+      sha512 = "92561dd2d270c01d9e2a1568fa9fa0e75bed2d5ac2ea49d965fa2aed6f32bfa8639cd57d564d310198796621fc1696444f976e12a26fa96b55aa7b445f81afe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/he/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/he/firefox-54.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "1fde862295fe781992694670e015e1b3baf717032d2c8f3ce7cdf3d4a97e708c2fc7e3d0aebe2bd46b960c108f2a7843e69cdea2c0bbfc29f36f10b1a7895f89";
+      sha512 = "d1f67f3e34bd67f993177ea9cc62ba432eebdd1169ded1b6ef58e9cb07a62a0ce38afecf001680b8ff6a401950ce9c13834345d7481301d59d024572fd2b8ed3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hi-IN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hi-IN/firefox-54.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "f06fb8d9e06e02b9292000556a3c3e7b7076fcb832fee023411a53acb7e8a6292d5bd25afb19d840424623213149432bab52edff0976a7a05ae70a340927480f";
+      sha512 = "8a10d69c6baebd21b2988a42979ec675e6ca29c96299407bd307a33c0bda11b6626cbb69bd6ab64a55f347be30d5fbbc64078b6e33209c26139efa050050541c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hr/firefox-54.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "7c7ddabc990da13351a2796bcd8797d67200076d3bc4df772f1db1d6b894832d54b3cb6d491d928a4266b32716a27a5dd4bb5a70e8e5b008ae72613e65894cab";
+      sha512 = "667411553ac3e00e7040ff2b6f350a6586498a38409380d5c822bd1bdf2989e2e34b9b83ac2ffb00c7d3cbd57d2cae4450cd208ca1fb89480d91df1981d2802f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hsb/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hsb/firefox-54.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "304907257fa32adfa16afa23743f7c4f8dda5b79f92c99bbebbd971965376a2fa81995873ca13ad85698117404ae3ddc60f29b1aa19d1a54e0441eced35e56e3";
+      sha512 = "8becf0d2f7a0c208ac38d390be0114159d208931da07b996e1f05138fa06f07f027c1ea429153823c580217a5d3e855f50570a5c5c2e4f264164d59b0f5cc9bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hu/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hu/firefox-54.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "4f9cadd48ddc7a4e25d79388a833d74418b013346a597edff0b9a7f418fe899f2ada685406fd02d0d4912126fd35c31ee51772cdab0951aaa2a38da3cef4dfc5";
+      sha512 = "494144c9c2a3d06d4bc8126e106e74d72b3ec5992dbbd47a4b618a1a30905ef59e550bb4bf8a698c69d4dac09a1bb7c78b5580f77d00f103918d6d58ae74be73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hy-AM/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hy-AM/firefox-54.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "d8b57889da068cb0aa8c5bd8b3900d81b2944795dca03e09abc2803b985d0bf5b8ec183493ff51423bebee7ce3294ae8e9c5c3feec3e2af4c20627c4ee2f20e3";
+      sha512 = "4d8160d109ccd6fdd407673c855b445eb287aaaf09c55e11b277249b54129721c60596139860cd578b297415383ebc83a9f95feec3b5deb229e5f5834df5f94a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/id/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/id/firefox-54.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "9f37f651b8fea3bab155550923a8bb6baf1d0a887f2a21c01da3c15c7935d176d7b63abfeef0fcd883807017aef39d66bf2cf5e80dbf3a42e8fe1691c12f965f";
+      sha512 = "faf8df37c2b7ff621d9dc73fa225ffeb9263a6de05ce540fa4f7482b26df153c75cad46e395cd4c3994598dd42943eae7e552836d3afdb1fab56bd55e73f7207";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/is/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/is/firefox-54.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "2d98104a4b4c000416cbf3fd9fbf03e2923b502ff32cfc8e94aa10a6f86170b0ee1a6a3caa2ad6974203a3ec81b7ba17a55c7d7935170eaf67e8f59c29973d78";
+      sha512 = "a0a5fdfa889d61365c9da182ab7364f3eef51ce7bfe75273a9cc50b948cb5b979629972171dfa3812edeafba76ab71b3780f11265b2026cbb70fb8c2e1bbc7a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/it/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/it/firefox-54.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "0ae1021ec2e8ad2a4c028c44fa568f3561dce73feca12245b033650a9df023a7eb957fa748159fccc0735e16b227caaf019f738094ecf06d2c09dd537a8a7adb";
+      sha512 = "59530850ea817f7bcf0ebe8813aa9b653fca3127139e8b97ba7f9fcca16848c272681b59409c0dfd1b10a1e75ae6b1d0bb46bae628fb0c95daeb198189c8a173";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ja/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ja/firefox-54.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "9f555cdf704922c3151ae41bda1222371c149aa7ba1f8f6ac61962a7f296effc337ed3579a7aad4eb187bd2a7fb40a5374342ea87112589dd4a9d9335a4b8f35";
+      sha512 = "67501fac457e820f2e731a77095f37817e8a44693d740cfb540d48dda8e1b10d93eb578b7d94c5efb0812688728745cbb508f497c02bc74b50fb514f8da4551b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ka/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ka/firefox-54.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "9b4a943cca2841617fd4e62cbd6e5b696282903e540f7d177e790da5ff388b1af2e2397f27b82af136fee37149bfbcd6b18906996f383f14a0bc79351efe8ffe";
+      sha512 = "dd9dc48dd50cce43b48dd1a17aef95c89dbdda8e4b670044c422085ceaebca7410c24b157213acf4592c007ada45e6fdb154e690f6ba626b81ec3f8a099f205d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kab/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kab/firefox-54.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "39688e228149ccf9f0435fe1bc2c04bfaa3ea4da66eb0310b9eb2d757ecabbcf157ff8af7821565b2d78743f9075e398a76024854815427bc04ac99148634d01";
+      sha512 = "51dd94346d62fe810208e6bcfb930880ef14fafe2b859af80da4b494563db38b4226ad43b602ac86f426c6a731cb135ac674ef65bdb2039e0aaccde0956c616f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kk/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kk/firefox-54.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "46c7f12f73a4fa5d7835e957ea7179b81438132fdc3683b4fd61bf68aeb78fe3cfbdcf5c92b77dfb2eea1e5e3c249e03dc5c0d9adeca75417938ddf8f8be9dff";
+      sha512 = "604b59670103ce78e3ef4db5a209d68981e1168415ca4512a1edf15fb4b2554b9f655985b2a0921cca44a4c51742155822b0b6514e91b1a5fec43be57b36bc44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/km/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/km/firefox-54.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "de65d654b3381b111694134697866e6c9924e42e2957449cafbd50fa67d1330c53ee1dcad21e59dcb9993d706ca08fa0e82bbce4cb2e48d318bba46134a12a59";
+      sha512 = "a81f6b44bbc9669af09b212d1960ca93e70ac085d20c37db52a474b81072a06165312207567ca4351bd110ee7e4125fbfd67981996c08b0a19c7c6669db16cb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kn/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kn/firefox-54.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "10c8be44d567ef6dbd5030611a3bf72604485504033d27df336e7db6e44b9e319771026dfef3db666c7107e6c9e53e57e7923b9059091ea288f44a594dba1953";
+      sha512 = "7a54f78285290d3a9062d71a5b1de69a3a98ea95a1593b5a0a0c2b69098c55ec054c8575361bd5cfb67b7558b411b8b83861ecd5605906b15a06311f477bb0c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ko/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ko/firefox-54.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "d0a3a812c96990eacc2b332696b6f17a602b65691fff54d8e1511b5261cd8d482e590abaa93e56ef801388b02cb8dcb20575658d7429ceb1dba24bc2e30cd8e7";
+      sha512 = "6a97670f62f70422f0d5d02091fa6ccda700705a248831d55c95034a1a63bced1bd0f282e938855a751eedf0f897be71f7257aa5ab3f8f7162ec756511f15830";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lij/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lij/firefox-54.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "700991c2ff12ecca4f11540a563b3cfa72c928fcb864471d638777ed53eaee105c62f62e6de768df895d54c2718cb4dc0ae1648e4869d5af102eb567d6fccaf2";
+      sha512 = "c4b4bd74169731d6909acc76c40ceaaddd853e03eefad27233c05dc869ab66a208f072dfe538f1f8e2323feba021f6b3aef73d81d02ff69d31feab688838424b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lt/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lt/firefox-54.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "488b215810ee0672b0a0f44a3891881df312095537f6f7936ae4fcb17b211a6675080ef720b977c1a35ea2fdae38b1e0393aab57dc2a008705d6a8d27560b0c2";
+      sha512 = "319bb6442b6dfa25551dfcb5704241de8b248659cfdbcfa0124c6332ff828e793ddc007f3be57d51033e334c3bf504d0a1330b1cc539e8a5a0d2587bf14604cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lv/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lv/firefox-54.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b5ab118ebb407c17dabbcd32ae297fd22b663bed8f9feff40d442a9a24f2dc0c5a2762cb5136ef8910820014f404fd9ef4160a413c70bc2840ffcf11578ed56a";
+      sha512 = "cd255f0922a1cd2c13baddb350082b3ef7fa130e28cf5bb1811345bce3a9d4e65aeba188304c8fdc8336b5e35c280d2a298bea39567d5309fa37e35d191ac18c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mai/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mai/firefox-54.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "b77d5a3b1d57ddeb45bb765610901ba6c142a125450d5a247088ec2b113ffcdce33341ddcbad277a9789972297f98bb9c120501bcd47578d9d633697bded8af3";
+      sha512 = "5f44ecbd0dc239f3ed77871d548a894996192398dd845882a7c6cdaeeeb18dfde369b2e8e6d0b56883b494f537f5e0b115665d1411c1de4295c5cacb07021c54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mk/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mk/firefox-54.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "180a9730ffed7c69db3fe5deb0496d077a655106c06492e0da3611c5775acadc62c5ebf47e525aeb3cb51a0beb7f8599aafdb725884ffb2a9a9a5a8b61d7c032";
+      sha512 = "de8a9ea6a75a4d597442e0116c70de5342f7270b2f41e9a889c7f71a44f41753d1fd0d1c029cb86a5958f8a2642ad8bd8943c30f5f3534d38d0428c83697a351";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ml/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ml/firefox-54.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "07a29dda4ab7aee1a67b8d832e5237ba5bcec6be8fc848985428f7385687269b798530582788e11cc7858a1e0be0cfba5a134d0ac164bfa61c0e2cffc5640c82";
+      sha512 = "86f7a299f66f4d5c074b59f5512571c78fe924792815a0dc2ecb9b2f5e1c0a10d798bbb16c03f912051ab014c102b8e428f98ca29eeff2c30ce72962b50109f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mr/firefox-54.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "18b6d2f31c180ddf27082bc7d15f84c605004641bc6e48277ea061d0cddf02dee872657febab9fd84149688beb36a359864da22d9dd3ff3cfccd05dfbfe8b44b";
+      sha512 = "a3e79a8f6b03e63f91c69232467704e91c73e1a4b6085a0b979f15bfb67b63bac7637130783d47755b50179a15f894223b76f572941464963bfd61e073ed1886";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ms/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ms/firefox-54.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "3ad92632ab4858581d1a3039c7ba73c94de38af920f95dd3eaff637d84d25b6925af04fddf400f2e33c5821ef9ba40b431eb66b2fac117aad56ad52850a651c2";
+      sha512 = "65ca4ef417722cf12b3c7dc7081b374caa3626ddaef5ff2a0b929fd5d1b6716c4e020ac8eab9cdd4dd161d990d0bb3633757c03995426e18e0d23b1e20e0e21b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/my/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/my/firefox-54.0.1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "e99437ff5a9417b15eaaed82c68d49712d212b2062924f84857e80b030668654e423a270199e6d8b60eaa34918c935614e4a85020e2e93f963c37781e1e059cf";
+      sha512 = "200008b97d3a811533d97e96cdbe8b7f1ce30ea5b7cebe3a77f58269d2ee871b8591907f2975377e655fb01bf267e69851ec3b3680de2796183b3ceccec8f471";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nb-NO/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nb-NO/firefox-54.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c342735a2470fe7e932c66e6a423bcf4b092966c9c89b1a2283a20583cec5f4d878ea35523e74c1405f69702339c453f96d3a52b3bbb851b9b1bf2ab2e304a21";
+      sha512 = "03d502600bf3edd8890a6d3bb394acd4c2f310d762870784192e3515b9908f14c2db4b7e5762a323b73b4c68c13cdcee9bb952fc503421f41b59f9d2bdd3e617";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nl/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nl/firefox-54.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "e4a68a804e0607431ec387faf5acce61d66e8bd7f39eb6834a3eceb43349f7b2bbc70fd5939dbaaf26b72232e3d1ffb1a71ad9cecdfc9e58afe2e332e67be4f9";
+      sha512 = "4bbdc99d32f2d576db66e2aa5a12d568e17f3d544e5ef613286e2d3620d4f833ed4b7385a9091fbb72e8bbc423e8e383c9b4e616f562a83c2dbfc606056f97ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nn-NO/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nn-NO/firefox-54.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "8df06d7a97df865099fa00b3c247bade0ea43975fe13d12904da62e0a84931a91e6555d96a5632ade139956837298b66c4b496cb6568e5794caf09236e23e64d";
+      sha512 = "e0267e22ed0041d8a436bb38b9641481889b716632cdeb50bc1761bceda8d0dc6065937d15be56622cee5d4c73ba3e6f96c7fc00ceeef85ea9d852954ebf2d16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/or/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/or/firefox-54.0.1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "8db56055a775654b83cf0ff02f9c3c46296245c1a6c3544297495904ca632288bc96f4aecef6439d85706189be3ad1c6cfd6df1c113535dfb9af281a34fcf3e2";
+      sha512 = "faef925bcd51fa0851e2583e590bfe6c194c8f64f8d13a3a3f13f2129571ba7d9a403c0caefd933e94e1d312b39d1d051c5e2a1e6bdcf4b7a1962080d3874dae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pa-IN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pa-IN/firefox-54.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "a3aee571e2d4d5e4c198a58c4e0cf140fc7db77f8a86aca77166b1eda04117456f1518f79d8000ea961e9a2c7c54fba5db5838bd380724c29260cc494c81a978";
+      sha512 = "e95ba361380a8061fdcb4fd336fc5bd906666873f4ea84af6b5d21c05fa1691fa395bd0fe4529778d91e5d500aa162da09660854867ccf4734c737b0b4ccbd55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pl/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pl/firefox-54.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "39a69b56e20f6436e1dea3eba50d816c4aac496107da5a06f093e9f177eb3e11efb169cb25f27766c87f3347d00d9ac63c4028246ea31871b6861ecabccf511d";
+      sha512 = "780079a117734ed5528b8efea3d0a7914cb8e8e1e81aaef33f877317bc18fafea8ce2433ffb69bccff01fa75e97e40048ed22805bcf781216116a76472f3260d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pt-BR/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-BR/firefox-54.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "02d450c530e1f219d97b894d2c3c9d2f376aeafb89edba9b2f65d5db5ef7ddf90f43fb4aecb98c0253777158f96b3f49b6adcb9c3fdbd1adf1448fb57420c401";
+      sha512 = "d0243251d0793d5e3202e45e596eecde6362af25d95b8640fc5d69d3983ac4899249da9a1d5099522fbae9fd5ccb08d024ecab018fac8f0858a4f1bf201e00f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pt-PT/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-PT/firefox-54.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "319b5e765a3a561e54aa9ec967246e335e080c0008a102b1f023725f0905cb624e90dc5afa65e8a6d2209d9b04e59df50a6229f40c590041a5ad9abce9701ef0";
+      sha512 = "337c792cd35fcc6bde89fbba2da9a42846af371b741c79e1226adbdfa801914bc39323b0ba2e600ebe1b12191f746b524421c8ea6e5a03f1875cf4ba24369d9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/rm/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/rm/firefox-54.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "66e70a6969a28f55276ec1a50e581b96b585b671bac733ebcdc5045c4c8473fb8c191ffcf43813cc0eeccd5dfe1068215c4731923a2e5fead423eb52ebd4724d";
+      sha512 = "e316df164058d8f380274958b17a3812a6e31d9da6eb2fd0373e7bf2befc45a668a572ad4f8f8c33a7aafb5d1f8b7331fca00e12d7ef511017b1a002811040e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ro/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ro/firefox-54.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "2372437efb96d9e62215d191d3201ea2ea54bb7a328137ceb0532ce08638aa67bd88573e8a2c9746074a91717f431acf68782b75773a81a34ece7ecb117c1c12";
+      sha512 = "04717cd979c8440639b407e919bf2d61814d24ea9969438397fa56fc73b5a8104d8a448c40cb0b3923ece0a61b5d232a8b94eab456f1b89fb4e24bcb0a525b64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ru/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ru/firefox-54.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "aa8c61333efdd8808819c07b00301db4a16aff10a2cd2fb57f172df538ed58148e32b9be87ff0cff69a09306036df1aff13c55532c8a63aceeee93c7692ce8c3";
+      sha512 = "e0f76ebbe996f9989b00faabc08931873490c4048453ed4f32f0461c6ee977cbcf4b2ff4ff650a39e1a536f7bb214c6821c099a1f212cb4600187c698130bb2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/si/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/si/firefox-54.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "5f2ed1bc75093da1b3bd2355170575127709f61fd627e84c0170950e9991efe7d6511a29b20907f694fc797cc824fdbe793087e28dd998bd4aacab328151457f";
+      sha512 = "f98a42fa1faee4be0a141d2dcd5e88641e89baae55d70440c1fc7f92cd12bf9f3d7954c23b42b16c02052f79f9451f76074c1a7aa0993ff84bde64ae12267e68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sk/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sk/firefox-54.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "9eb52821878542601040b926ac80035f92cbc9b568d5fba5c79e49d53245b4e4480b5e1ece0b671d0d77e86d3596758f5defd2f87e640836d1722341f24eed15";
+      sha512 = "fad8a8c70e8f354e87b19fa9387c81b685c79b133ab03dad937e84e2c927d814844d281e39c45016a51056bca56cfca357ec10250035dc07b831a4e4c83ff147";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sl/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sl/firefox-54.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "0f0d38df630f9e501e074d7fa1c0d7e8f4841a0e7a17aaee9d369432f2a7a14321011759c843fba3cea41f24a5aa929f94b47be8b76409d3b8931cb660dfe938";
+      sha512 = "39f8670cbcf942210336477cb153b7b2b39a7692103a76a476a820f2b8b9809da65351e02b4f80da7ccae3e9cd18ecb7fa1af292f507e9920f50261ab67b81d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/son/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/son/firefox-54.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "1a68b374225b6dfe831ad090c26985abf309b788ac418baba20ba9296dd647e0d66ed6563235918dcba80839f06ec8f3e64e1d54b8d8baef9a10275f860b99bb";
+      sha512 = "7eb79e3638c0820b1db421e13f71805d24e2147ebe78f48497ff574058a3da91f9afb40d050801711550283b692972f4b973ea8579376bea03059d70557c20f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sq/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sq/firefox-54.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "382fa3024f3a776ba18e10a66d6dd6b5b9640dab2b1f1088f1e6f385332dccf1fd5acf2f77881128444c36bdd4e82a311327755c8d469e7e02360b054a7b3c20";
+      sha512 = "84c410d7f7dc4524c4e8a7ff3fc186afcf922d8ca843bd81de83c1ce1d22aa2c07fdd57d1594a49aab014b07f1902c929bb9aa8d55b00b323f06ee70907b4a08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sr/firefox-54.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "e31e17699727e40eb3be4f21b483163edc385c5ab19f1fe6bbe51b50525f17ff126d94937e2faf31d2c993730697d5911703bf6b9519338a995c1694a016da22";
+      sha512 = "9f91c5c33e3d0f01ab28601fa41c02a048a3ef3899481c6ff5858a176b72e05f8113c2fa2dfff2527ad3477a7d2bc7df5fbaa1096b1765113da855da710d7abc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sv-SE/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sv-SE/firefox-54.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "a7ec76ad1db4e9d0a472625ba476f410018f0df6a9c76b81079cff894300ef21b489e0be73107e349982aeb3fa496ac6aad99651228b001422270d97e8caf1a4";
+      sha512 = "35c8fd0980cc641fd7bd4fd084f3d308840279ece55a33243396bbd0a3d9e500a3aab797fda63ff5d551acd82e21e48c152ff218e1a97ab395b009bea124df43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ta/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ta/firefox-54.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "cd47c0d9cdc92f91ec284aeb2f858317c6fc52afa183ebd2bdc6c038a8dc1d343f7881ceec53844c821c5a6786fc05b5344cd2e213f4ba598d5ae23a78c7a6a1";
+      sha512 = "037257799dd7cd3383a35c334ec99f53be8682ac14020c7f96426a7885d9257519e3d5ab8643045e97df703a4bc63424db9dfa29cd65d6291402a034000fcf21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/te/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/te/firefox-54.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "bd0b47f0f85a5b05bbc1a7640da9ce79f018cd7daee8d5fa2b011f8c91ded499305c4bb53290ec0a0224e69f500e5b9ad173898d10a4071e425c7004ed8fe5ad";
+      sha512 = "f0216fd72eba20ae094c54a4654356947441564661f6ecf5de399f55f05f7cb60370ac0072b2721d74cb40cf4c938cd3736cbd9b3a93cd641e3ef1a9089b4502";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/th/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/th/firefox-54.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "ecdbf45a5a5b1fdcbdc3fe52a69f7310dc3b1b76c758ed5a055daebe7b0aa47be398ad8cc6df403db93a9b49b85eba5611debeb6abceff4511a58ce6d71632c8";
+      sha512 = "ff62cc5280928c0d9aad58c3b7fc52435f09e08d65e89ab0b7fb7280f3e61289d513f893dca2746e913121753c0f15e5a34c675c4074a0ff159e790d2bfad0f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/tr/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/tr/firefox-54.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "dad56a8230094269fcc64d01f33b38d399fbbcedcafec26ea34e2c6edd6caac2f821b3aa2ba755ae9222400076f1753ed5a31c374a1c858cb53151a5af9614e9";
+      sha512 = "fc7f8d5120fb3b3c3699f13870fadf265ce7a43a1adadee89457a7df863d6da0f4d64b7f0b633d3526da39d825f30fbec3b9f1ae09bffb4c61681f4105bb5db7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/uk/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uk/firefox-54.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "3ec96ff7b5ae14eb7331970899138c9cb12e3d369c48df1af970cf4805be9fb232c9197b0956dc69b48470eef29f85b6507dd7707da78c64611ee5229c82dd3f";
+      sha512 = "f0fb3de841925f81c64877efbc8b151cec744bd0b4997bdb9a086413e7106cf05c1dca49ee797dbd2d80bd1603554e006f47b21217e60d390ae91c6a1badac47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ur/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ur/firefox-54.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "b02959b4f8c456fbc1017b36d468449aab678008e05bf73dbeed4b69becdc9688bdc6f1c404cd749327b7cabf44c4b969c2f851402ab9ac7196ab53b5c974c26";
+      sha512 = "3480fca8ef85b5db62b471c2986f124b92bd17c5682d57276b3f30fe0d3fde02f3d2a6e044f6c5157fc2bd3ab882e235f264aaeb319e09d234492c1aed674b92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/uz/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uz/firefox-54.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "bff5034a765276f48aa43c0cf72ce1fc29ac8c39a296f72b330668ba6dd28cc32abf7eec4c31b247f12e7458f8f4640978fe0dc5a2d4a883b13e3335ede042a3";
+      sha512 = "2460a419db6406542279daae938882fcc3ac29446b88a6315f3f7626925b906aed2d8a6250dfcc50c7eb87da3d57d231e4fcb5659a0fdc84ac188d4bbaf436aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/vi/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/vi/firefox-54.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "172665812d4c239ab8d9bc7610744fd88e721801d1939eff27dd8f7bc1614ca09bbc67d0de2518b76617cc804c7b98080b4a4c673b0dcf880fe57e58f8e75dff";
+      sha512 = "0e54d8a00a734b4fee5ef7cc2a831453c732573d53477e53bb202311de5524839ed2290f5ed6d93a20d5b63da765f7a621d8bafaf0150d522c755347ca49ff6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/xh/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/xh/firefox-54.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "1a238fa435714d9e83a4d3e0d31f33350e40b2617d0b72698a6e381e7a8ece884a129fea5b7803b3564625089f26b4760e7547f497c964a9fce66fff11bbbd43";
+      sha512 = "67950de9da98ae7bf867079f831cdcdcb5aca1f9caf951813f394e1e266787d90777e95fb33f46351086b25927ef108ee78f34b8152084410f8727ad7f3579ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/zh-CN/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-CN/firefox-54.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "60fea3731a2d67b9480158011a2ea9df119b4db54018e0ac4194a1e86312f495647ee1861aa8ae1b9f6ff6cee28f925c061064c035f1fd23d37495211ad8744c";
+      sha512 = "56b6bf4bdb5994f2550a47a0d6a6e5bf4eb5d456fc30e3472adb3efa909aeea17b86e24d799bc5eea11e60046afcb0eac61fe601c6e1c795ebb5a5440fc32738";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/zh-TW/firefox-54.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-TW/firefox-54.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "0462e6b2ba08a09ec422aadcef76ed2f406f57addd4ae4a8469e4801010d7a5fe89a69e9f201cdd2c5258cad4e381f2f0616dc1c1daed07d8ebf7fc1c036e143";
+      sha512 = "22fff4e32f6451b4378b45007c0fa7a1170a6897d13dfa1b0f814ac0ec9f48ea4dd5439a14aa7e9b1dabea19d0dbacd22f23dc431c38e023958692c5073147fb";
     }
     ];
 }
-- 
GitLab


From 2330b54470044aaadca2ed73ac16e79ac45601e0 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 30 Jun 2017 03:23:58 +0900
Subject: [PATCH 1462/1490] firefox: 54.0 -> 54.0.1

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index bf33595b54c..789a771b3d7 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -6,10 +6,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "54.0";
+    version = "54.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "0ff6960804e7f6d3e15faeb14b237fee45acae31b4652a6cc5cafa1a1b1eab3537616c3e8ea6d8f3109c87dcc8f86f0df3da2627903b80061c8a62fb11598ed9";
+      sha512 = "43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2";
     };
 
     meta = {
-- 
GitLab


From c4430ba2489bae21a3502e7fc859199fafbe0d36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 29 Jun 2017 22:15:01 +0200
Subject: [PATCH 1463/1490] bind: update to version 9.10.5-P2 to fix
 CVE-2017-3142 and CVE-2017-3143

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index c18b7c46376..61f9604b925 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -3,14 +3,14 @@
 
 assert enableSeccomp -> libseccomp != null;
 
-let version = "9.10.5-P1"; in
+let version = "9.10.5-P2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "1kg59a9118460k5wznqayxzqb6l3vbpybd8b1bdv9z97x5fqiyw2";
+    sha256 = "0cwrwlkfd6wnkw2ylkz2iyqlz73s3kf6q0fxsfwnh3fhxps2i90r";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
-- 
GitLab


From 9ffccc77d98934f155b1013499a90a140c2e627b Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 29 Jun 2017 22:27:52 +0200
Subject: [PATCH 1464/1490] wireguard: 0.0.20170613 -> 0.0.20170629

Simple version bump.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 pkgs/os-specific/linux/wireguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 3ccf703370c..9677339d915 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170613";
+  version = "0.0.20170629";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "88ac77569eeb79c517318d58a0954caa0a4d2a6a1694e74c2a3b1c14438ac941";
+    sha256 = "51c44624f20eaff96780845214f85491c0c7330598633cd180bb2a6547e5d2b2";
   };
 
   meta = with stdenv.lib; {
-- 
GitLab


From 6344c22b78452ec939577c8725483562e7021c16 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Thu, 29 Jun 2017 23:02:24 +0200
Subject: [PATCH 1465/1490] radarr: 0.2.0.696 -> 0.2.0.778

---
 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 861aaa71cde..23969dc2a23 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.696";
+  version = "0.2.0.778";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "0rqxhzn8hmg6a8di1gaxlrfp5f7mykf2lxrzhri10zqs975i3a29";
+    sha256 = "0145nsdnhsd3nbg2nml5malm4kn28k2siaimqb41dcmc88fws015";
   };
 
   buildInputs = [ makeWrapper ];
-- 
GitLab


From 22216c574e53c3dbe795d745532106edb6ed7d5a Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Thu, 29 Jun 2017 23:13:08 +0200
Subject: [PATCH 1466/1490] emby: 3.2.19.0 -> 3.2.20.0

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

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 1bf92b2247c..24e6def856d 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.2.19.0";
+  version = "3.2.20.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "14gwkglngaf29zzjqyph8pqz8i8i9j2vha9g2m17slgdxif4ijzc";
+    sha256 = "0n5b40vl0dg2pd0j7rzbck62cji6ws91jgsh8r1maig9p00xmwv7";
   };
 
   buildInputs = with pkgs; [
-- 
GitLab


From ad8d8fb2f5f42414bb84feaed450ef6e24d89281 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 2 Jun 2017 12:22:36 -0400
Subject: [PATCH 1467/1490] stdenv: Simplify dependency code

This is a bit simpler now, but more importantly it scales better when I
double the number of sorts of dependencies as part of my cross
compilation work.
---
 pkgs/stdenv/generic/default.nix | 69 ++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 8b85c5372fd..ce9beb2bbc6 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -126,10 +126,12 @@ let
   # * https://nixos.org/nix/manual/#ssec-derivation
   #   Explanation about derivations in general
   mkDerivation =
-    { buildInputs ? []
-    , nativeBuildInputs ? []
-    , propagatedBuildInputs ? []
+    { nativeBuildInputs ? []
+    , buildInputs ? []
+
     , propagatedNativeBuildInputs ? []
+    , propagatedBuildInputs ? []
+
     , crossConfig ? null
     , meta ? {}
     , passthru ? {}
@@ -141,18 +143,15 @@ let
     , sandboxProfile ? ""
     , propagatedSandboxProfile ? ""
     , ... } @ attrs:
-    let # Rename argumemnts to avoid cycles
-      buildInputs__ = buildInputs;
-      nativeBuildInputs__ = nativeBuildInputs;
-      propagatedBuildInputs__ = propagatedBuildInputs;
-      propagatedNativeBuildInputs__ = propagatedNativeBuildInputs;
-    in let
-      getNativeDrv = drv: drv.nativeDrv or drv;
-      getCrossDrv = drv: drv.crossDrv or drv;
-      nativeBuildInputs = map getNativeDrv nativeBuildInputs__;
-      buildInputs = map getCrossDrv buildInputs__;
-      propagatedBuildInputs = map getCrossDrv propagatedBuildInputs__;
-      propagatedNativeBuildInputs = map getNativeDrv propagatedNativeBuildInputs__;
+    let
+      dependencies = [
+        (map (drv: drv.nativeDrv or drv) nativeBuildInputs)
+        (map (drv: drv.crossDrv or drv) buildInputs)
+      ];
+      propagatedDependencies = [
+        (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs)
+        (map (drv: drv.crossDrv or drv) propagatedBuildInputs)
+      ];
     in let
       pos' =
         if pos != null then
@@ -281,13 +280,16 @@ let
         outputs ++
         (if separateDebugInfo then assert targetPlatform.isLinux; [ "debug" ] else []);
 
-      buildInputs' = lib.chooseDevOutputs buildInputs ++
-        (if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []);
-
-      nativeBuildInputs' = lib.chooseDevOutputs nativeBuildInputs;
-      propagatedBuildInputs' = lib.chooseDevOutputs propagatedBuildInputs;
-      propagatedNativeBuildInputs' = lib.chooseDevOutputs propagatedNativeBuildInputs;
+      dependencies' = let
+          justMap = map lib.chooseDevOutputs dependencies;
+          nativeBuildInputs = lib.elemAt justMap 0
+            ++ lib.optional targetPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh;
+          buildInputs = lib.elemAt justMap 1
+               # TODO(@Ericson2314): Should instead also be appended to `nativeBuildInputs`.
+            ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh;
+        in [ nativeBuildInputs buildInputs ];
 
+      propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies;
     in
 
       # Throw an error if trying to evaluate an non-valid derivation
@@ -302,14 +304,15 @@ let
            "__impureHostDeps" "__propagatedImpureHostDeps"
            "sandboxProfile" "propagatedSandboxProfile"])
         // (let
+          # TODO(@Ericson2314): Reversing of dep lists is just temporary to avoid Darwin mass rebuild.
           computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs' ++ nativeBuildInputs');
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies'));
           computedPropagatedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (propagatedBuildInputs' ++ propagatedNativeBuildInputs');
+            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists (lib.reverseList propagatedDependencies'));
           computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs' ++ nativeBuildInputs'));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ lib.concatLists (lib.reverseList dependencies')));
           computedPropagatedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs' ++ propagatedNativeBuildInputs'));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists (lib.reverseList propagatedDependencies')));
         in
         {
           builder = attrs.realBuilder or shell;
@@ -319,17 +322,11 @@ let
           userHook = config.stdenv.userHook or null;
           __ignoreNulls = true;
 
-          # Inputs built by the cross compiler.
-          buildInputs = buildInputs';
-          propagatedBuildInputs = propagatedBuildInputs';
-          # Inputs built by the usual native compiler.
-          nativeBuildInputs = nativeBuildInputs'
-            ++ lib.optional
-                (hostPlatform.isCygwin
-                  || (crossConfig != null && lib.hasSuffix "mingw32" crossConfig))
-                ../../build-support/setup-hooks/win-dll-link.sh
-            ;
-          propagatedNativeBuildInputs = propagatedNativeBuildInputs';
+          nativeBuildInputs = lib.elemAt dependencies' 0;
+          buildInputs = lib.elemAt dependencies' 1;
+
+          propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0;
+          propagatedBuildInputs = lib.elemAt propagatedDependencies' 1;
         } // ifDarwin {
           # TODO: remove lib.unique once nix has a list canonicalization primitive
           __sandboxProfile =
-- 
GitLab


From 4ecba3751d71f7dd4810ddb342c237d3fa1b5266 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Thu, 29 Jun 2017 23:45:53 +0200
Subject: [PATCH 1468/1490] cjdns: 19.1 -> 20

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

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 3f2d81249d1..12a8a1a184f 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }:
 
-let version = "19.1"; in
+let version = "20"; in
 stdenv.mkDerivation {
   name = "cjdns-"+version;
 
   src = fetchurl {
     url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz";
-    sha256 = "53c568a500215b055a9894178eb4477bd93a6e1abf751d0bc5ef2a03ea01a188";
+    sha256 = "1dyqxi9l2pmrgm16a161909rg3vfzvib40frr7p6ddpk8yfh5888";
   };
 
   buildInputs = [ which python27 nodejs ] ++
-- 
GitLab


From 69c90a1344e63d9f6c890e5b17aed22e555d3f07 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Fri, 30 Jun 2017 06:24:36 +0800
Subject: [PATCH 1469/1490] crystal: 0.22.0 -> 0.23.0

---
 pkgs/development/compilers/crystal/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 8bad8f6f4d3..115c686d7de 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }:
+{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_4, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "0.22.0";
+  version = "0.23.0";
   name = "crystal-${version}-1";
   arch =
     {
@@ -14,20 +14,20 @@ stdenv.mkDerivation rec {
     url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz";
     sha256 =
       {
-        "x86_64-linux" = "03c1nmjibz8f7yhrczd49gmccx4ivqz121c64hl384w69227p7bq";
-        "i686-linux" = "1s8gpmxa9wpcc2a9csl205lcpipn1i7gwybapby3q34y7xnq9160";
-        "x86_64-darwin" = "1bnfxb0hbkx4qlkc1l88sdhcnhacqzy31hh7ksz0prah83g6vbxa";
+        "x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx";
+        "i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a";
+        "x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz";
       }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   };
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "0iw5i4hjzfxykwfdyzix23pgm3gxd79r9yss3abvva8cf7ci37sv";
+    sha256 = "05ymwmjkl1b4m888p725kybpiap5ag2vj8l07d59j02inm5r0rcv";
   };
 
   # crystal on Darwin needs libiconv to build
   buildInputs = [
-    boehmgc libatomic_ops pcre libevent llvm_39 makeWrapper
+    boehmgc libatomic_ops pcre libevent llvm_4 makeWrapper
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     libiconv
   ];
@@ -86,6 +86,8 @@ stdenv.mkDerivation rec {
     install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal
     install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal
 
+    install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1
+
     install -Dm644 LICENSE $out/share/licenses/crystal/LICENSE
   '';
 
-- 
GitLab


From 63fa3e7c6209dacc00b465614acae303839b68ff Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Thu, 29 Jun 2017 15:32:47 +0200
Subject: [PATCH 1470/1490] nsswitch: fix typo specifying nss-resolve module
 this had the effect of not being able to load nss-resolve and falling back to
 dns module in all cases.

---
 nixos/modules/config/nsswitch.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index d541fff140e..16a0bfb5693 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -15,7 +15,7 @@ let
   hostArray = [ "files" "mymachines" ]
     ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ]
     ++ optionals nsswins [ "wins" ]
-    ++ optionals resolved ["resolv [!UNAVAIL=return]"]
+    ++ optionals resolved ["resolve [!UNAVAIL=return]"]
     ++ [ "dns" ]
     ++ optionals nssmdns [ "mdns" ]
     ++ ["myhostname" ];
-- 
GitLab


From 7410b0c82c2fe57460d5ad3f1b2e1476d7b39c43 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Fri, 30 Jun 2017 02:20:09 +0200
Subject: [PATCH 1471/1490] nsswitch: add assertions for enabled nscd

---
 nixos/modules/config/nsswitch.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 16a0bfb5693..52d9944a3f2 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -11,6 +11,8 @@ let
   ldap = (config.users.ldap.enable && config.users.ldap.nsswitch);
   sssd = config.services.sssd.enable;
   resolved = config.services.resolved.enable;
+  # only with nscd up and running we can load NSS modules that are not integrated in NSS
+  canLoadExternalModules = config.services.nscd.enable;
 
   hostArray = [ "files" "mymachines" ]
     ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ]
@@ -36,6 +38,7 @@ in {
   options = {
 
     # NSS modules.  Hacky!
+    # Only works with nscd!
     system.nssModules = mkOption {
       type = types.listOf types.path;
       internal = true;
@@ -55,6 +58,18 @@ in {
   };
 
   config = {
+    assertions = [
+      {
+        # generic catch if the NixOS module adding to nssModules does not prevent it with specific message.
+        assertion = config.system.nssModules.path != "" -> canLoadExternalModules;
+        message = "Loading NSS modules from path ${config.system.nssModules.path} requires nscd being enabled.";
+      }
+      {
+        # resolved does not need to add to nssModules, therefore needs an extra assertion
+        assertion = resolved -> canLoadExternalModules;
+        message = "Loading systemd-resolved's nss-resolve NSS module requires nscd being enabled.";
+      }
+    ];
 
     # Name Service Switch configuration file.  Required by the C
     # library.  !!! Factor out the mdns stuff.  The avahi module
@@ -78,7 +93,7 @@ in {
     # configured IP addresses, or ::1 and 127.0.0.2 as
     # fallbacks. Systemd also provides nss-mymachines to return IP
     # addresses of local containers.
-    system.nssModules = [ config.systemd.package.out ];
+    system.nssModules = optionals canLoadExternalModules [ config.systemd.package.out ];
 
   };
 }
-- 
GitLab


From e370e97f3dab410ac460af3cb9974b8df7b3214d Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Fri, 30 Jun 2017 02:20:50 +0200
Subject: [PATCH 1472/1490] nsswitch: only add modules to nsswitch.conf if they
 can be loaded

---
 nixos/modules/config/nsswitch.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 52d9944a3f2..16c43a99ad5 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -6,26 +6,29 @@ with lib;
 
 let
 
-  inherit (config.services.avahi) nssmdns;
-  inherit (config.services.samba) nsswins;
-  ldap = (config.users.ldap.enable && config.users.ldap.nsswitch);
-  sssd = config.services.sssd.enable;
-  resolved = config.services.resolved.enable;
   # only with nscd up and running we can load NSS modules that are not integrated in NSS
   canLoadExternalModules = config.services.nscd.enable;
-
-  hostArray = [ "files" "mymachines" ]
+  myhostname = canLoadExternalModules;
+  mymachines = canLoadExternalModules;
+  nssmdns = canLoadExternalModules && config.services.avahi.nssmdns;
+  nsswins = canLoadExternalModules && config.services.samba.nsswins;
+  ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch);
+  sssd = canLoadExternalModules && config.services.sssd.enable;
+  resolved = canLoadExternalModules && config.services.resolved.enable;
+
+  hostArray = [ "files" ]
+    ++ optionals mymachines [ "mymachines" ]
     ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ]
     ++ optionals nsswins [ "wins" ]
     ++ optionals resolved ["resolve [!UNAVAIL=return]"]
     ++ [ "dns" ]
     ++ optionals nssmdns [ "mdns" ]
-    ++ ["myhostname" ];
+    ++ optionals myhostname ["myhostname" ];
 
   passwdArray = [ "files" ]
     ++ optional sssd "sss"
     ++ optionals ldap [ "ldap" ]
-    ++ [ "mymachines" ];
+    ++ optionals mymachines [ "mymachines" ];
 
   shadowArray = [ "files" ]
     ++ optional sssd "sss"
-- 
GitLab


From 3130f3ed0acc5d8cb44fd375e4c251396e938c8b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 29 Jun 2017 23:16:52 -0400
Subject: [PATCH 1473/1490] linux-copperhead: 4.11.7.a -> 4.11.8.a

Fixes #26790 by properly including built modules
---
 pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++--
 pkgs/top-level/all-packages.nix                             | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
index 7f4a89dc51e..b779e8298c0 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -1,9 +1,9 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  version = "4.11.7";
+  version = "4.11.8";
   revision = "a";
-  sha256 = "0gvg0gnhl2hi0zw705zh1a8wrwm9831jmw5llr1miq6av7hgxw7n";
+  sha256 = "02wy5gpgl2hz06dlqcgg9i3ydnxkyw0m1350vc5xyh6ld5r7jnn5";
 in
 
 import ./generic.nix (args // {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e27e56d83e..9bef34a4ae3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11884,6 +11884,8 @@ with pkgs;
     kernelPatches = with kernelPatches; [
       kernelPatches.bridge_stp_helper
       kernelPatches.p9_fixes
+      kernelPatches.modinst_arg_list_too_long
+      kernelPatches.cpu-cgroup-v2."4.11"
     ];
     extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
       inherit stdenv;
-- 
GitLab


From 2dae6e0b5f855a9ce2dbec118ddc8f5716ce4184 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 30 Jun 2017 07:19:52 +0000
Subject: [PATCH 1474/1490] ocamlPackages.findlib: 1.7.1 -> 1.7.3

---
 pkgs/development/tools/ocaml/findlib/default.nix           | 4 ++--
 pkgs/development/tools/ocaml/findlib/install_topfind.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 71da6dd6d32..846546ae769 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ocaml-findlib-${version}";
-  version = "1.7.1";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";
-    sha256 = "1vsys5gpahi36nxv5yx29zhwn8b2d7sqqswza05vxy5bx5wrljsx";
+    sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni";
   };
 
   buildInputs = [m4 ncurses ocaml];
diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
index 096330a31ae..7cd32991d0e 100644
--- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch
+++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
@@ -1,12 +1,12 @@
 --- a/src/findlib/Makefile
 +++ b/src/findlib/Makefile
-@@ -114,7 +114,7 @@ clean:
+@@ -123,7 +123,7 @@ clean:
  install: all
  	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
  	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
 -	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
 +	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
-	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
+	files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
 	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
 	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
 
-- 
GitLab


From 3d48fa72d362653aadb585fa23a735aa2f22d345 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 29 Jun 2017 14:51:45 +0200
Subject: [PATCH 1475/1490] elm-github-install: init at 1.0.1

---
 .../elm-github-install/Gemfile                |   2 +
 .../elm-github-install/Gemfile.lock           |  39 ++++++
 .../elm-github-install/default.nix            |  17 +++
 .../elm-github-install/gemset.nix             | 114 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 174 insertions(+)
 create mode 100644 pkgs/tools/package-management/elm-github-install/Gemfile
 create mode 100644 pkgs/tools/package-management/elm-github-install/Gemfile.lock
 create mode 100644 pkgs/tools/package-management/elm-github-install/default.nix
 create mode 100644 pkgs/tools/package-management/elm-github-install/gemset.nix

diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile b/pkgs/tools/package-management/elm-github-install/Gemfile
new file mode 100644
index 00000000000..b97eab9777d
--- /dev/null
+++ b/pkgs/tools/package-management/elm-github-install/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'elm_install'
diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile.lock b/pkgs/tools/package-management/elm-github-install/Gemfile.lock
new file mode 100644
index 00000000000..a551368eade
--- /dev/null
+++ b/pkgs/tools/package-management/elm-github-install/Gemfile.lock
@@ -0,0 +1,39 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    adts (0.1.2)
+    commander (4.4.3)
+      highline (~> 1.7.2)
+    contracts (0.16.0)
+    elm_install (1.0.1)
+      adts (~> 0.1.2)
+      commander (~> 4.4, >= 4.4.2)
+      contracts (~> 0.16.0)
+      git (~> 1.3)
+      git_clone_url (~> 2.0)
+      hashdiff (~> 0.3.1)
+      indentation (~> 0.1.1)
+      smart_colored (~> 1.1, >= 1.1.1)
+      solve (~> 3.1)
+    git (1.3.0)
+    git_clone_url (2.0.0)
+      uri-ssh_git (>= 2.0)
+    hashdiff (0.3.4)
+    highline (1.7.8)
+    indentation (0.1.1)
+    molinillo (0.5.7)
+    semverse (2.0.0)
+    smart_colored (1.1.1)
+    solve (3.1.0)
+      molinillo (>= 0.5)
+      semverse (>= 1.1, < 3.0)
+    uri-ssh_git (2.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  elm_install
+
+BUNDLED WITH
+   1.14.4
diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/pkgs/tools/package-management/elm-github-install/default.nix
new file mode 100644
index 00000000000..1f70dc1c8c8
--- /dev/null
+++ b/pkgs/tools/package-management/elm-github-install/default.nix
@@ -0,0 +1,17 @@
+{ lib, bundlerEnv, ruby }:
+
+bundlerEnv rec {
+  name = "elm-github-install-${version}";
+
+  version = (import ./gemset.nix).elm_install.version;
+  inherit ruby;
+  gemdir = ./.;
+
+  meta = with lib; {
+    description = "Install Elm packages from git repositories.";
+    homepage    = https://github.com/gdotdesign/elm-github-install;
+    license     = licenses.unfree;
+    maintainers = [ maintainers.roberth ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/tools/package-management/elm-github-install/gemset.nix b/pkgs/tools/package-management/elm-github-install/gemset.nix
new file mode 100644
index 00000000000..d310b41d7aa
--- /dev/null
+++ b/pkgs/tools/package-management/elm-github-install/gemset.nix
@@ -0,0 +1,114 @@
+{
+  adts = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1793bfsgg8ca58b70xas9rglnspig41ih0iwqcad62s0grxzrjwz";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  commander = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01qx76y05v29kgyjsfkai73gwfnqhypp1k8v024m9w7qzpv4mpxf";
+      type = "gem";
+    };
+    version = "4.4.3";
+  };
+  contracts = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "119f5p1n6r5svbx8h09za6a4vrsnj5i1pzr9cqdn9hj3wrxvyl3a";
+      type = "gem";
+    };
+    version = "0.16.0";
+  };
+  elm_install = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0d3fwhj54madabmzamss865kj8czicgaq5fbdll9kpapqvy6a2j5";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  git = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  git_clone_url = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qgq7pjl461si3m2gr28vwbx47dcbpyy682mcwra5y1klpkbcvr5";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  hashdiff = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
+      type = "gem";
+    };
+    version = "0.3.4";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      type = "gem";
+    };
+    version = "1.7.8";
+  };
+  indentation = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ix64qgmm91xm1yiqxdcn9bqb1l6gwvkv7322yni34b3bd16lgvc";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  molinillo = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758";
+      type = "gem";
+    };
+    version = "0.5.7";
+  };
+  semverse = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cf6iv5wgwb7b8jf7il751223k9yahz9aym06s9r0prda5mwddyy";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  smart_colored = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hccah5iwsvn9rf7zdgl7mdbh0h63vfwy1c6d280cb9qkfj8rdny";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
+  solve = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bbzny2bl94mv1xwcfrxbi3fjhxxawlz6la7mip2wwz9kkaf376h";
+      type = "gem";
+    };
+    version = "3.1.0";
+  };
+  uri-ssh_git = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0klyyvivbjll2ry18d8fhm1rbxbzd4kqa9lskxyiha4ndlb22cqj";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e6cdd2f6b0..47a518ada39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -957,6 +957,8 @@ with pkgs;
 
   elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { };
 
+  elm-github-install = callPackage ../tools/package-management/elm-github-install { };
+
   emby = callPackage ../servers/emby { };
 
   enca = callPackage ../tools/text/enca { };
-- 
GitLab


From 4540eaf578dab5415e1cdbb99739534ee1fcf4ac Mon Sep 17 00:00:00 2001
From: Robin Stumm <serverkorken@gmail.com>
Date: Tue, 13 Jun 2017 01:03:02 +0200
Subject: [PATCH 1476/1490] browserpass: 2017-04-11 -> 1.0.5

---
 nixos/modules/programs/browserpass.nix      | 18 ++++++---------
 pkgs/tools/security/browserpass/default.nix | 25 +++++++++++----------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix
index 2b7ec185643..a073c7e66eb 100644
--- a/nixos/modules/programs/browserpass.nix
+++ b/nixos/modules/programs/browserpass.nix
@@ -6,21 +6,17 @@ with lib;
 
   ###### interface
   options = {
-    programs.browserpass = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Whether to install the NativeMessaging configuration for installed browsers.
-        '';
-      };
-    };
+    programs.browserpass.enable = mkEnableOption "the NativeMessaging configuration for Chromium, Chrome, and Vivaldi.";
   };
 
   ###### implementation
   config = mkIf config.programs.browserpass.enable {
     environment.systemPackages = [ pkgs.browserpass ];
-    environment.etc."chromium/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json";
-    environment.etc."opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json";
+    environment.etc = {
+      "chromium/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json";
+      "chromium/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json";
+      "opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json";
+      "opt/chrome/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json";
+    };
   };
 }
diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
index edc46fee582..9f8a00c5956 100644
--- a/pkgs/tools/security/browserpass/default.nix
+++ b/pkgs/tools/security/browserpass/default.nix
@@ -1,17 +1,17 @@
 # This file was generated by https://github.com/kamilchm/go2nix v1.2.0
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "browserpass-${version}";
-  version = "2017-04-11";
-  rev = "e0fe250ed8fd061125746f5d99a1f9a678d21004";
+  version = "1.0.5";
 
   goPackagePath = "github.com/dannyvankooten/browserpass";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/dannyvankooten/browserpass";
-    sha256 = "0khwlh5agdd2mm2yzklg8r2h084n8j7jbjjxsiaj67zm8zz6b39c";
+  src = fetchFromGitHub {
+    repo = "browserpass";
+    owner = "dannyvankooten";
+    rev = version;
+    sha256 = "1r9x1asgblay7pry2jpgfisfgb3423x3cqd3g68q8b98zvc9l9lz";
   };
 
   postInstall = ''
@@ -21,14 +21,15 @@ buildGoPackage rec {
       sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/chrome/host.json > chrome-host.json
       sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/firefox/host.json > firefox-host.json
 
-      install -D chrome-host.json $bin/etc/chrome-host.json
+      install chrome-host.json $bin/etc/
       install -D firefox-host.json $bin/lib/mozilla/native-messaging-hosts/com.dannyvankooten.browserpass.json
+      install go/src/${goPackagePath}/chrome/policy.json $bin/etc/chrome-policy.json
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Chrome & Firefox extension for zx2c4's pass";
-    homepage = "https://github.com/dannyvankooten/browserpass";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    homepage = https://github.com/dannyvankooten/browserpass;
+    license = licenses.mit;
+    platforms = with platforms; linux ++ darwin ++ openbsd;
   };
 }
-- 
GitLab


From 4c5577b504ee4d01a4fb027269cfb510368dd701 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 30 Jun 2017 13:37:26 +0200
Subject: [PATCH 1477/1490] R: update to version 3.4.1

---
 pkgs/applications/science/math/R/default.nix  |  6 +--
 .../science/math/R/fix-sweave-exit-code.patch | 52 -------------------
 2 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/applications/science/math/R/fix-sweave-exit-code.patch

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 285673baa3c..e75ae2222ae 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.4.0";
+  name = "R-3.4.1";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "14cb8bwi3akvdb6934kqic2862f2qgav6cq4g0h7gi2p4ka9x3i8";
+    sha256 = "0y7wlfk3cn1dxn2mpnxwvsk31s0599crbsyah8srm5pa2mfi7c82";
   };
 
   buildInputs = [
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
 
-  patches = [ ./no-usr-local-search-paths.patch ./fix-sweave-exit-code.patch ];
+  patches = [ ./no-usr-local-search-paths.patch ];
 
   preConfigure = ''
     configureFlagsArray=(
diff --git a/pkgs/applications/science/math/R/fix-sweave-exit-code.patch b/pkgs/applications/science/math/R/fix-sweave-exit-code.patch
deleted file mode 100644
index 8ca1be750a5..00000000000
--- a/pkgs/applications/science/math/R/fix-sweave-exit-code.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0ff560ba912fad126576818519035c8d3c693bed Mon Sep 17 00:00:00 2001
-From: maechler <maechler@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Mon, 24 Apr 2017 14:24:11 +0000
-Subject: [PATCH] R CMD Sweave status bug fix
-
-git-svn-id: https://svn.r-project.org/R/trunk@72612 00db46b3-68df-0310-9c12-caf00c1e9a41
-
-diff --git a/src/library/utils/R/Sweave.R b/src/library/utils/R/Sweave.R
-index 2beb094..8d4950b 100644
---- a/src/library/utils/R/Sweave.R
-+++ b/src/library/utils/R/Sweave.R
-@@ -1,7 +1,7 @@
- #   File src/library/utils/R/Sweave.R
- #  Part of the R package, https://www.R-project.org
- #
--#  Copyright (C) 1995-2016 The R Core Team
-+#  Copyright (C) 1995-2017 The R Core Team
- #
- #  This program is free software; you can redistribute it and/or modify
- #  it under the terms of the GNU General Public License as published by
-@@ -452,10 +452,10 @@ SweaveHooks <- function(options, run = FALSE, envir = .GlobalEnv)
-     }
-     do_exit <-
- 	if(no.q)
--	    function(status = 1L) (if(status) stop else message)(
-+	    function(status = 0L) (if(status) stop else message)(
- 		".Sweave() exit status ", status)
- 	else
--	    function(status = 1L) q("no", status = status, runLast = FALSE)
-+	    function(status = 0L) q("no", status = status, runLast = FALSE)
- 
-     if (!length(args)) {
-         Usage()
-@@ -577,16 +577,15 @@ SweaveHooks <- function(options, run = FALSE, envir = .GlobalEnv)
-     }
-     do_exit <-
- 	if(no.q)
--	    function(status = 1L) (if(status) stop else message)(
-+	    function(status = 0L) (if(status) stop else message)(
- 		".Stangle() exit status ", status)
- 	else
--	    function(status = 1L) q("no", status = status, runLast = FALSE)
-+	    function(status = 0L) q("no", status = status, runLast = FALSE)
- 
-     if (!length(args)) {
-         Usage()
-         do_exit(1L)
-     }
--
-     file <- character()
-     encoding <- options <- ""
-     engine <- NULL
-- 
GitLab


From f8559ace7169748f9e663920d2c392fc1080d893 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 30 Jun 2017 03:24:00 +0900
Subject: [PATCH 1478/1490] firefox-esr: 52.2.0esr -> 52.2.1esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 789a771b3d7..11d9324c042 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -25,10 +25,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.2.0esr";
+    version = "52.2.1esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "62a2bd47c9f4b325199b8a0b155a7a412ffbd493e8ca6ff246ade5b10aacea22bc806bc646824059f7c97b71d27e167025c600293c781fbad3fdefb8bbc8d18e";
+      sha512 = "1d79e6e4625cf7994f6d6bbdf227e483fc407bcdb20e0296ea604969e701f551b5df32f578d4669cf654b65927328c8eb0f717c7a12399bf1b02a6ac7a0cd1d3";
     };
 
     meta = firefox.meta // {
-- 
GitLab


From 98bd25a02e140ac65ff1ef1fb5339fc04d839db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 30 Jun 2017 16:30:12 +0200
Subject: [PATCH 1479/1490] autotrace: build with pstoedit

---
 .../applications/graphics/autotrace/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index f5f81a262f3..2131589339c 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -1,9 +1,6 @@
 { stdenv, fetchurl, callPackage, libpng12, imagemagick,
   autoreconfHook, glib, pstoedit, pkgconfig, gettext, darwin }:
 
-# TODO: Solve that it cannot find pstoedit (as it is unable to find
-# pstoedit-config)
-
 # TODO: Figure out why the resultant binary is somehow linked against
 # libpng16.so.16 rather than libpng12.
 
@@ -49,7 +46,19 @@ stdenv.mkDerivation rec {
 
   # This complains about various m4 files, but it appears to not be an
   # actual error.
-  preConfigure = "glib-gettextize --copy --force";
+  preConfigure = ''
+    glib-gettextize --copy --force
+    # pstoedit-config no longer exists, it was replaced with pkg-config
+    mkdir wrappers
+    cat >wrappers/pstoedit-config <<'EOF'
+    #!${stdenv.shell}
+    # replace --version with --modversion for pkg-config
+    args=''${@/--version/--modversion}
+    exec pkg-config pstoedit "''${args[@]}"
+    EOF
+    chmod +x wrappers/pstoedit-config
+    export PATH="$PATH:$PWD/wrappers"
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://autotrace.sourceforge.net/;
-- 
GitLab


From 3ab280808c9e5ea0c62be05bda47a5d137baf862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 30 Jun 2017 16:27:12 +0200
Subject: [PATCH 1480/1490] pstoedit: fix pkgconfig file

---
 pkgs/tools/graphics/pstoedit/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index 170dfdac2b6..9fdf0ad0465 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -13,11 +13,17 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] 
+  buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ]
   ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     libiconv ApplicationServices
   ]);
 
+  # '@LIBPNG_LDFLAGS@' is no longer substituted by autoconf (the code is commented out)
+  # so we need to remove it from the pkg-config file as well
+  preConfigure = ''
+    substituteInPlace config/pstoedit.pc.in --replace '@LIBPNG_LDFLAGS@' ""
+  '';
+
   meta = with stdenv.lib; {
     description = "Translates PostScript and PDF graphics into other vector formats";
     homepage = https://sourceforge.net/projects/pstoedit/;
-- 
GitLab


From 2260d2dd241429b9007aee5ae59eb826ecd45423 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 30 Jun 2017 13:19:09 -0300
Subject: [PATCH 1481/1490] catch: 1.9.5 -> 1.9.6

---
 pkgs/development/libraries/catch/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 66ed90a90b3..1c55aa7f834 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-
   name = "catch-${version}";
-  version = "1.9.5";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "philsquared";
     repo = "Catch";
     rev = "v${version}";
-    sha256 = "1in4f6w1pja8m1hvyiwx7s7gxnj6nlj1fgxw9blldffh09ikgpm2";
+    sha256 = "0nqnyw6haa2771748ycag4hhjb8ni32cv4f7w3h0pji212542xan";
   };
 
   nativeBuildInputs = [ cmake ];
-- 
GitLab


From ea052b6f6ba58142b7f939ffb9daf8461ae894fc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 30 Jun 2017 16:38:57 +0000
Subject: [PATCH 1482/1490] ocamlPackages.js_of_ocaml: 2.8.3 -> 2.8.4

---
 pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 81cd2caf7ee..ab2ef4d9c5e 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild
-, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar
+, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson
 }:
 
 let version = if stdenv.lib.versionAtLeast ocaml.version "4.02"
-  then "2.8.3" else "2.7";
+  then "2.8.4" else "2.7";
 in
 
 stdenv.mkDerivation {
@@ -12,15 +12,15 @@ stdenv.mkDerivation {
     url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz";
     sha256 = {
       "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj";
-      "2.8.3" = "0xrw215w5saqdcdd9ipjhvg8f982z63znsds9ih445s3jr49szm7";
+      "2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl";
     }."${version}";
   };
 
   buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild
                  cmdliner reactivedata cppo which base64 ]
-  ++ stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.02") tyxml;
+  ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ];
   propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ]
-  ++ stdenv.lib.optional (version == "2.8.3") uchar;
+  ++ stdenv.lib.optional (version == "2.8.4") uchar;
 
   patches = [ ./Makefile.conf.diff ];
 
-- 
GitLab


From e521b75b9ed9a7962d0928d6bd3dfc47226e3239 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 30 Jun 2017 14:01:25 -0300
Subject: [PATCH 1483/1490] mkvtoolnix: 12.0.0 -> 13.0.0

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 8650142f8b4..0877df0a68c 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -10,13 +10,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "12.0.0";
+  version = "13.0.0";
 
   src = fetchFromGitHub {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "1xn24f9046q2lr1xbl02cpmqa4fhhxqjc14j14c9r6qfc4ix4n9w";
+    sha256 = "0dz86fzv19wknd8p31nnx2imj80v7m944ssapp8fmq9hkc36m777";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
-- 
GitLab


From f97766566a339d390de56fd3a646d10b91006d3f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 30 Jun 2017 16:55:04 +0000
Subject: [PATCH 1484/1490] ocamlPackages.javalib: 2.3 -> 2.3.3

ocamlPackages.sawja: 1.5 -> 1.5.2
---
 pkgs/development/ocaml-modules/javalib/default.nix | 12 ++++++++----
 pkgs/development/ocaml-modules/sawja/default.nix   |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index c0b1c32553e..843cf44a153 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -1,16 +1,20 @@
 {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4"
+then throw "javalib not supported for ocaml ${ocaml.version}"
+else
+
 let
   pname = "javalib";
   webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
-  name = "ocaml-${pname}-${version}";
-  version = "2.3";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "2.3.3";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2";
-    sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j";
+    url = https://gforge.inria.fr/frs/download.php/file/36307/javalib-2.3.3.tar.bz2;
+    sha256 = "0427n3vfb2h51gy2p4878gdwlp0mb03asn3g9kp9v4wfxmksjj11";
   };
 
   buildInputs = [ which ocaml findlib camlp4 ];
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index cfc74ad1668..b6c66c82811 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -4,16 +4,16 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
 
 let
   pname = "sawja";
-  version = "1.5";
+  version = "1.5.2";
   webpage = "http://sawja.inria.fr/";
 in
 stdenv.mkDerivation rec {
 
-  name = "ocaml-${pname}-${version}";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33091/${pname}-${version}.tar.bz2";
-    sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm";
+    url = https://gforge.inria.fr/frs/download.php/file/36093/sawja-1.5.2.tar.bz2;
+    sha256 = "12046arkxiy4gf1s17hyc0yzydjzpzwqxn13sbkbxl8xzvmankx4";
   };
 
   buildInputs = [ which perl ocaml findlib camlp4 ];
-- 
GitLab


From 89c5413b58a9c62d9491a7c850ef76d838039e6c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 30 Jun 2017 13:14:10 -0400
Subject: [PATCH 1485/1490] google-cloud-sdk: 159.0.0 -> 161.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 4a30b68ecaf..d13bcecb993 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden
 
 stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
-  version = "159.0.0";
+  version = "161.0.0";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
-        sha256 = "12mksd9fj1106zj6k2knlfc3knzm5kkf0s85l5l9zr6f7n0jabpd";
+        sha256 = "43a78a9d2c3ee9d9e50200b1e90512cd53ded40b56e05effe31fe9847b1bdd4c";
       }
     else if stdenv.system == "x86_64-darwin" then
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
-        sha256 = "160zdf7rr2f43qv12yr9c682kk0dh3rlcdqzb2ahpqpajqmcz4qw";
+        sha256 = "0706dbea1279be2bc98a497d1bfed61a9cc29c305d908a376bcdb4403035b323";
       }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
-        sha256 = "0ai2rvk47gsb96k80w6wim04cjxyj5lhrg8kv6dgj53m81sqah2v";
+        sha256 = "7aa6094d1f9c87f4c2c4a6bdad6a1113aac5e72ea673e659d9acbb059dfd037e";
       };
 
   buildInputs = [python27 makeWrapper];
-- 
GitLab


From 171c088754dbbc2bfd37ea6e826904f8c945158a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 30 Jun 2017 13:52:04 -0400
Subject: [PATCH 1486/1490] bind: 9.10.5-P2 -> 9.11.1-P2

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 61f9604b925..45abcff2776 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -3,14 +3,14 @@
 
 assert enableSeccomp -> libseccomp != null;
 
-let version = "9.10.5-P2"; in
+let version = "9.11.1-P2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0cwrwlkfd6wnkw2ylkz2iyqlz73s3kf6q0fxsfwnh3fhxps2i90r";
+    sha256 = "19gyh7yij6cpvk5b199ghhns5wmsz67d2rpgvl91dbkm2m1wclxz";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
-- 
GitLab


From 36f52e5ea0a17b7d71d5b43dd904c08398f48114 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 30 Jun 2017 13:56:31 -0400
Subject: [PATCH 1487/1490] oh-my-zsh: 2017-05-03 -> 2017-06-22

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

diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 41b834c18eb..22f5aa48d61 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2017-05-03";
+  version = "2017-06-22";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "291e96dcd034750fbe7473482508c08833b168e3";
-    sha256 = "0xy6ka5c8h3rh4n0436cn2f6zrbf959l2ypnnx5ddd0l723p1dzc";
+    rev = "d848c94804918138375041a9f800f401bec12068";
+    sha256 = "0mxmqkdpimwrskqjri3lp3haj1hzf583g7psnv34y3hyymzcx1h6";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];
-- 
GitLab


From 5eb08b5c68667e3d10b6e767d9327ae54bca8ef1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 30 Jun 2017 14:00:14 -0400
Subject: [PATCH 1488/1490] redis: 3.2.8 -> 3.2.9

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

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index d87aefd37fb..2666ddc5a43 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.8";
+  version = "3.2.9";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "0b28d0fpkvf4m186gr2k53f1cqkccxzspmb959swrrhq7p177cv1";
+    sha256 = "09pzb468jfps1w7bx2xpsvalj5r3q8hav7l3s10f91xjhflwzakf";
   };
 
   buildInputs = [ lua ];
-- 
GitLab


From 5fd4ae36e2b19d4c1c97284817a8767017b82cb1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 30 Jun 2017 15:21:30 -0400
Subject: [PATCH 1489/1490] nixos release-combined: only build zfsroot tests on
 x86_64-linux

---
 nixos/release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 49ddd95887b..ecbd317cb9a 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -52,7 +52,7 @@ in rec {
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
-        (all nixos.tests.installer.zfsroot)
+        nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only
         (all nixos.tests.installer.lvm)
         (all nixos.tests.installer.luksroot)
         (all nixos.tests.installer.separateBoot)
-- 
GitLab


From f6e1d929a0a917e02428a921784315563a94b2a3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 30 Jun 2017 19:51:28 +0000
Subject: [PATCH 1490/1490] ocamlPackages.ocplib-json-typed: init at 0.5

---
 .../ocplib-json-typed/default.nix             | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocplib-json-typed/default.nix

diff --git a/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
new file mode 100644
index 00000000000..cadb65bcbed
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocplib-endian, js_of_ocaml, uri }:
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-ocplib-json-typed-${version}";
+	version = "0.5";
+	src = fetchFromGitHub {
+		owner = "OCamlPro";
+		repo = "ocplib-json-typed";
+		rev = "v${version}";
+		sha256 = "02c600wm2wdpzb66pivxzwjhqa2dm7dqyfvw3mbvkv1g2jj7kn2q";
+	};
+
+	buildInputs = [ ocaml findlib ocplib-endian js_of_ocaml ];
+	propagatedBuildInputs = [ uri ];
+
+	createFindlibDestdir = true;
+
+	meta = {
+		description = "A collection of type-aware JSON utilities for OCaml";
+		license = stdenv.lib.licenses.lgpl21;
+		maintainers = [ stdenv.lib.maintainers.vbgl ];
+		inherit (src.meta) homepage;
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 96adaff03dc..617a9a378dd 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -395,6 +395,8 @@ let
 
     ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { };
 
+    ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { };
+
     ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
 
     ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
-- 
GitLab